From 51f6d22d5152152f1ef98f09e2801e978d4db0f5 Mon Sep 17 00:00:00 2001
From: Aniket <30843294+Aniket-Engg@users.noreply.github.com>
Date: Tue, 21 Dec 2021 23:00:55 +0530
Subject: [PATCH 01/43] Update README.md

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

diff --git a/README.md b/README.md
index 57cf2b34b4..b8f700f796 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,7 @@ git clone https://github.com/ethereum/remix-project.git
 ```bash
 cd remix-project
 npm install
+npm run build:libs // Build remix libs
 nx build
 nx serve
 ```

From b53591f99daaca7103d1955e3bf5b68e07ca101b Mon Sep 17 00:00:00 2001
From: Josel95 <jose.lopezh95@gmail.com>
Date: Tue, 16 Nov 2021 13:29:16 -0300
Subject: [PATCH 02/43] terminal dragging refactor

---
 .../src/lib/custom-hooks/useDragTerminal.tsx  | 67 +++++++++++++
 .../terminal/src/lib/remix-ui-terminal.tsx    | 95 ++++++-------------
 2 files changed, 97 insertions(+), 65 deletions(-)
 create mode 100644 libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx

diff --git a/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx b/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx
new file mode 100644
index 0000000000..4a269d4d31
--- /dev/null
+++ b/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx
@@ -0,0 +1,67 @@
+import { useEffect, useState } from 'react'
+
+export const useDragTerminal = (offsetHeight: number) => {
+    const [isOpen, setIsOpen] = useState(true)
+    const [lastYPosition, setLastYPosition] = useState(0)
+    const [terminalPosition, setTerminalPosition] = useState(offsetHeight)
+    const [isDragging, setIsDragging] = useState(false)
+
+    const handleDraggingStart = (event: React.MouseEvent) => {
+        setLastYPosition(event.clientY)
+        setIsDragging(true)
+    }
+
+    const handleDragging = (event: MouseEvent) => {
+        event.preventDefault()
+
+        if (isDragging) {
+            const mouseYPosition = event.clientY
+            const difference = lastYPosition - mouseYPosition
+            const newTerminalPosition = terminalPosition + difference
+            setTerminalPosition(newTerminalPosition)
+            setLastYPosition(mouseYPosition)
+        }
+    }
+
+    const handleDraggingEnd = () => {
+        if(!isDragging) return
+
+        setIsDragging(false)
+
+        // Check terminal position to determine if it should be open or closed
+        setIsOpen(terminalPosition > offsetHeight)
+    }
+
+    const handleToggleTerminal = (event: React.MouseEvent<HTMLElement>) => {
+        event.preventDefault()
+        event.stopPropagation()
+
+        setIsOpen(!isOpen)
+    }
+
+    // Add event listeners for dragging
+    useEffect(() => {
+        document.addEventListener('mousemove', handleDragging)
+        document.addEventListener('mouseup', handleDraggingEnd)
+
+        return () => {
+            document.removeEventListener('mousemove', handleDragging)
+            document.removeEventListener('mouseup', handleDraggingEnd)
+        }
+    }, [handleDragging, handleDraggingEnd])
+
+    // Reset terminal position
+    useEffect(() => {
+        if(!terminalPosition){
+            setTerminalPosition(offsetHeight)
+        }
+    }, [terminalPosition, setTerminalPosition])
+
+    return {
+        isOpen,
+        terminalPosition,
+        isDragging,
+        handleDraggingStart,
+        handleToggleTerminal,
+    }
+}
\ No newline at end of file
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
index 6225e4f50e..54c10f39c5 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -17,6 +17,7 @@ import RenderKnownTransactions from './components/RenderKnownTransactions' // es
 import parse from 'html-react-parser'
 import { EMPTY_BLOCK, KNOWN_TRANSACTION, RemixUiTerminalProps, UNKNOWN_TRANSACTION } from './types/terminalTypes'
 import { wrapScript } from './utils/wrapScript'
+import { useDragTerminal } from './custom-hooks/useDragTerminal'
 
 /* eslint-disable-next-line */
 export interface ClipboardEvent<T = Element> extends SyntheticEvent<T, any> {
@@ -25,13 +26,8 @@ export interface ClipboardEvent<T = Element> extends SyntheticEvent<T, any> {
 
 export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
   const { call, _deps, on, config, event, gistHandler, version } = props.plugin
-  const [toggleDownUp, setToggleDownUp] = useState('fa-angle-double-down')
   const [_cmdIndex, setCmdIndex] = useState(-1)
   const [_cmdTemp, setCmdTemp] = useState('')
-  // dragable state
-  const [leftHeight, setLeftHeight] = useState<undefined | number>(undefined)
-  const [separatorYPosition, setSeparatorYPosition] = useState<undefined | number>(undefined)
-  const [dragging, setDragging] = useState(false)
 
   const [newstate, dispatch] = useReducer(registerCommandReducer, initialState)
   const [cmdHistory, cmdHistoryDispatch] = useReducer(addCommandHistoryReducer, initialState)
@@ -78,6 +74,30 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
   // terminal dragable
   const leftRef = useRef(null)
   const panelRef = useRef(null)
+  const terminalMenu = useRef(null)
+
+  const {
+    isOpen,
+    isDragging,
+    terminalPosition,
+    handleDraggingStart,
+    handleToggleTerminal
+  } = useDragTerminal((terminalMenu.current && terminalMenu.current.offsetHeight) || 0)
+
+  // Check open state
+  useEffect(() => {
+    const resizeValue = isOpen ? [config.get('terminal-top-offset')] : []
+    event.trigger('resize', resizeValue)
+  }, [isOpen])
+
+  useEffect(() => {
+    leftRef.current.style.backgroundColor = isDragging ? '#007AA6' : ''
+    leftRef.current.style.border = isDragging ? '2px solid #007AA6' : ''
+  }, [isDragging])
+
+  useEffect(() => {
+    event.trigger('resize', [terminalPosition + 32])
+  } , [terminalPosition])
 
   const scrollToBottom = () => {
     messagesEndRef.current.scrollIntoView({ behavior: 'smooth' })
@@ -193,18 +213,8 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
     }
   }
 
-  const handleMinimizeTerminal = (e) => {
-    e.preventDefault()
-    e.stopPropagation()
-    if (toggleDownUp === 'fa-angle-double-down') {
-      setToggleDownUp('fa-angle-double-up')
-      event.trigger('resize', [])
-    } else {
-      const terminalTopOffset = config.get('terminal-top-offset')
-      event.trigger('resize', [terminalTopOffset])
-      setToggleDownUp('fa-angle-double-down')
-    }
-  }
+
+
 
   const focusinput = () => {
     inputEl.current.focus()
@@ -277,51 +287,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
     }
   }
 
-  /* start of mouse events */
-
-  const mousedown = (event: MouseEvent) => {
-    setSeparatorYPosition(event.clientY)
-    setDragging(true)
-  }
-
-  const onMouseMove: any = (e: MouseEvent) => {
-    e.preventDefault()
-    if (dragging && leftHeight && separatorYPosition) {
-      const newLeftHeight = leftHeight + separatorYPosition - e.clientY
-      setSeparatorYPosition(e.clientY)
-      setLeftHeight(newLeftHeight)
-      event.trigger('resize', [newLeftHeight + 32])
-    }
-  }
-
-  const onMouseUp = () => {
-    leftRef.current.style.backgroundColor = ''
-    leftRef.current.style.border = ''
-    setDragging(false)
-  }
-
-  /* end of mouse event */
-
-  useEffect(() => {
-    document.addEventListener('mousemove', onMouseMove)
-    document.addEventListener('mouseup', onMouseUp)
-
-    return () => {
-      document.removeEventListener('mousemove', onMouseMove)
-      document.removeEventListener('mouseup', onMouseUp)
-    }
-  }, [onMouseMove, onMouseUp])
-
-  React.useEffect(() => {
-    if (panelRef) {
-      if (!leftHeight) {
-        setLeftHeight(panelRef.current.offsetHeight)
-        return
-      }
-      panelRef.current.style.height = `${leftHeight}px`
-    }
-  }, [leftHeight, setLeftHeight, panelRef])
-
   /* block contents that gets rendered from scriptRunner */
 
   const _blocksRenderer = (mode) => {
@@ -463,9 +428,9 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
   return (
     <div style={{ height: '323px', flexGrow: 1 }} className='panel' ref={panelRef}>
       <div className="bar">
-        <div className="dragbarHorizontal" onMouseDown={mousedown} ref={leftRef}></div>
-        <div className="menu border-top border-dark bg-light" data-id="terminalToggleMenu">
-          <i className={`mx-2 toggleTerminal fas ${toggleDownUp}`} data-id="terminalToggleIcon" onClick={ handleMinimizeTerminal }></i>
+        <div className="dragbarHorizontal" onMouseDown={handleDraggingStart} ref={leftRef}></div>
+        <div className="menu border-top border-dark bg-light" ref={terminalMenu} data-id="terminalToggleMenu">
+          <i className={`mx-2 toggleTerminal fas ${isOpen ? 'fa-angle-double-down' : 'fa-angle-double-up'}`} data-id="terminalToggleIcon" onClick={handleToggleTerminal}></i>
           <div className="mx-2 console" id="clearConsole" data-id="terminalClearConsole" onClick={handleClearConsole} >
             <i className="fas fa-ban" aria-hidden="true" title="Clear console"
             ></i>

From cc5a763083f2efa5f34d32c89d8cfe6c47d53122 Mon Sep 17 00:00:00 2001
From: Josel95 <jose.lopezh95@gmail.com>
Date: Tue, 16 Nov 2021 13:39:27 -0300
Subject: [PATCH 03/43] fixed bug when scrolling terminal when is closed

---
 .../terminal/src/lib/custom-hooks/useDragTerminal.tsx  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx b/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx
index 4a269d4d31..89d24f6f19 100644
--- a/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx
@@ -4,6 +4,8 @@ export const useDragTerminal = (offsetHeight: number) => {
     const [isOpen, setIsOpen] = useState(true)
     const [lastYPosition, setLastYPosition] = useState(0)
     const [terminalPosition, setTerminalPosition] = useState(offsetHeight)
+    // Used to save position of the terminal when it is closed
+    const [lastTerminalPosition, setLastTerminalPosition] = useState(offsetHeight)
     const [isDragging, setIsDragging] = useState(false)
 
     const handleDraggingStart = (event: React.MouseEvent) => {
@@ -36,6 +38,14 @@ export const useDragTerminal = (offsetHeight: number) => {
         event.preventDefault()
         event.stopPropagation()
 
+        if(isOpen) {
+            setLastTerminalPosition(terminalPosition)
+            setLastYPosition(0)
+            setTerminalPosition(offsetHeight)
+        } else {
+            setTerminalPosition(lastTerminalPosition)
+        }
+
         setIsOpen(!isOpen)
     }
 

From ce5552b7676798852a1915b9cc33127aab17c14c Mon Sep 17 00:00:00 2001
From: Josel95 <jose.lopezh95@gmail.com>
Date: Tue, 16 Nov 2021 13:45:03 -0300
Subject: [PATCH 04/43] get saved terminal position

---
 .../src/lib/custom-hooks/useDragTerminal.tsx     | 16 ++++++++--------
 .../terminal/src/lib/remix-ui-terminal.tsx       |  7 +++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx b/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx
index 89d24f6f19..cdd4f6dc6a 100644
--- a/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx
@@ -1,11 +1,11 @@
 import { useEffect, useState } from 'react'
 
-export const useDragTerminal = (offsetHeight: number) => {
-    const [isOpen, setIsOpen] = useState(true)
+export const useDragTerminal = (minHeight: number, defaultPosition: number) => {
+    const [isOpen, setIsOpen] = useState(defaultPosition > minHeight)
     const [lastYPosition, setLastYPosition] = useState(0)
-    const [terminalPosition, setTerminalPosition] = useState(offsetHeight)
+    const [terminalPosition, setTerminalPosition] = useState(defaultPosition)
     // Used to save position of the terminal when it is closed
-    const [lastTerminalPosition, setLastTerminalPosition] = useState(offsetHeight)
+    const [lastTerminalPosition, setLastTerminalPosition] = useState(defaultPosition)
     const [isDragging, setIsDragging] = useState(false)
 
     const handleDraggingStart = (event: React.MouseEvent) => {
@@ -31,7 +31,7 @@ export const useDragTerminal = (offsetHeight: number) => {
         setIsDragging(false)
 
         // Check terminal position to determine if it should be open or closed
-        setIsOpen(terminalPosition > offsetHeight)
+        setIsOpen(terminalPosition > minHeight)
     }
 
     const handleToggleTerminal = (event: React.MouseEvent<HTMLElement>) => {
@@ -41,9 +41,9 @@ export const useDragTerminal = (offsetHeight: number) => {
         if(isOpen) {
             setLastTerminalPosition(terminalPosition)
             setLastYPosition(0)
-            setTerminalPosition(offsetHeight)
+            setTerminalPosition(minHeight)
         } else {
-            setTerminalPosition(lastTerminalPosition)
+            setTerminalPosition(lastTerminalPosition <= minHeight ? 323 : lastTerminalPosition)
         }
 
         setIsOpen(!isOpen)
@@ -63,7 +63,7 @@ export const useDragTerminal = (offsetHeight: number) => {
     // Reset terminal position
     useEffect(() => {
         if(!terminalPosition){
-            setTerminalPosition(offsetHeight)
+            setTerminalPosition(defaultPosition)
         }
     }, [terminalPosition, setTerminalPosition])
 
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
index 54c10f39c5..5c3cd54c33 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -76,13 +76,16 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
   const panelRef = useRef(null)
   const terminalMenu = useRef(null)
 
+  const terminalMenuOffsetHeight = (terminalMenu.current && terminalMenu.current.offsetHeight) || 35
+  const terminalDefaultPosition = config.get('terminal-top-offset')
+
   const {
     isOpen,
     isDragging,
     terminalPosition,
     handleDraggingStart,
     handleToggleTerminal
-  } = useDragTerminal((terminalMenu.current && terminalMenu.current.offsetHeight) || 0)
+  } = useDragTerminal(terminalMenuOffsetHeight, terminalDefaultPosition)
 
   // Check open state
   useEffect(() => {
@@ -96,7 +99,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
   }, [isDragging])
 
   useEffect(() => {
-    event.trigger('resize', [terminalPosition + 32])
+    event.trigger('resize', [terminalPosition])
   } , [terminalPosition])
 
   const scrollToBottom = () => {

From a6cab250d648127ca34cf395dbd338cc0649d602 Mon Sep 17 00:00:00 2001
From: Josel95 <jose.lopezh95@gmail.com>
Date: Thu, 25 Nov 2021 08:29:20 -0300
Subject: [PATCH 05/43] changed terminal dragbar styles

---
 libs/remix-ui/terminal/src/lib/remix-ui-terminal.css | 5 +++++
 libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx | 7 +------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css
index ca50eee4dc..74b88d8b76 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css
@@ -151,6 +151,11 @@ element.style {
     cursor            : row-resize;
     z-index           : 999;
   }
+
+  .dragbarDragging {
+    background-color: var(--primary);
+    border: 2px solid var(--primary);
+  }
   
   .console {
     cursor           : pointer;
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
index 5c3cd54c33..420ec850bf 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -93,11 +93,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
     event.trigger('resize', resizeValue)
   }, [isOpen])
 
-  useEffect(() => {
-    leftRef.current.style.backgroundColor = isDragging ? '#007AA6' : ''
-    leftRef.current.style.border = isDragging ? '2px solid #007AA6' : ''
-  }, [isDragging])
-
   useEffect(() => {
     event.trigger('resize', [terminalPosition])
   } , [terminalPosition])
@@ -431,7 +426,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
   return (
     <div style={{ height: '323px', flexGrow: 1 }} className='panel' ref={panelRef}>
       <div className="bar">
-        <div className="dragbarHorizontal" onMouseDown={handleDraggingStart} ref={leftRef}></div>
+        <div className={`dragbarHorizontal ${isDragging ? 'dragbarDragging' : ''}`} onMouseDown={handleDraggingStart} ref={leftRef}></div>
         <div className="menu border-top border-dark bg-light" ref={terminalMenu} data-id="terminalToggleMenu">
           <i className={`mx-2 toggleTerminal fas ${isOpen ? 'fa-angle-double-down' : 'fa-angle-double-up'}`} data-id="terminalToggleIcon" onClick={handleToggleTerminal}></i>
           <div className="mx-2 console" id="clearConsole" data-id="terminalClearConsole" onClick={handleClearConsole} >

From b53a178e6970801be6c5bf71691749a7f9d64a67 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Fri, 17 Dec 2021 11:02:49 +0100
Subject: [PATCH 06/43] creating the remix-ui-home-tab lib

---
 nx.json            |  3 +++
 tsconfig.base.json |  1 +
 workspace.json     | 17 +++++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/nx.json b/nx.json
index 89415d9af6..8bc14e4e9d 100644
--- a/nx.json
+++ b/nx.json
@@ -139,6 +139,9 @@
     "remix-ui-vertical-icons-panel": {
       "tags": []
     },
+    "remix-ui-home-tab": {
+      "tags": []
+    },
     "remix-ui-tabs": {
       "tags": []
     },
diff --git a/tsconfig.base.json b/tsconfig.base.json
index a0aa90a641..fcb8955cab 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -65,6 +65,7 @@
       "@remix-ui/terminal": ["libs/remix-ui/terminal/src/index.ts"],
       "@remix-ui/plugin-manager": ["libs/remix-ui/plugin-manager/src/index.ts"],
       "@remix-ui/editor": ["libs/remix-ui/editor/src/index.ts"],
+      "@remix-project/remix-ui/home-tab": ["libs/remix-ui/home-tab/src/index.ts"],
       "@remix-ui/tabs": ["libs/remix-ui/tabs/src/index.ts"],
       "@remix-ui/helper": ["libs/remix-ui/helper/src/index.ts"],
       "@remix-ui/app": ["libs/remix-ui/app/src/index.ts"],
diff --git a/workspace.json b/workspace.json
index a6845d74a1..8ce5f9f9ce 100644
--- a/workspace.json
+++ b/workspace.json
@@ -1007,6 +1007,23 @@
         }
       }
     },
+    "remix-ui-home-tab": {
+      "root": "libs/remix-ui/home-tab",
+      "sourceRoot": "libs/remix-ui/home-tab/src",
+      "projectType": "library",
+      "schematics": {},
+      "architect": {
+        "lint": {
+          "builder": "@nrwl/linter:lint",
+          "options": {
+            "linter": "eslint",
+            "tsConfig": ["libs/remix-ui/home-tab/tsconfig.lib.json"],
+            "exclude": ["**/node_modules/**", "!libs/remix-ui/home-tab/**/*"]
+          }
+
+        }
+      }
+    },
     "remix-ui-editor": {
       "root": "libs/remix-ui/editor",
       "sourceRoot": "libs/remix-ui/editor/src",

From 7b2ec3491ed696c4941e2333b19098752499add4 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Thu, 16 Sep 2021 18:58:27 +0200
Subject: [PATCH 07/43] home-tab react lib added

---
 .../src/app/ui/landing-page/landing-page.js   | 573 +-----------------
 apps/remix-ide/src/assets/img/solhintLogo.png | Bin 3400 -> 0 bytes
 .../remix-ide/src/assets/img/solhintLogo.webp | Bin 0 -> 1584 bytes
 libs/remix-ui/home-tab/.babelrc               |   4 +
 libs/remix-ui/home-tab/.eslintrc              | 248 ++++++++
 libs/remix-ui/home-tab/README.md              |   7 +
 libs/remix-ui/home-tab/src/index.ts           |   1 +
 .../src/lib/components/pluginButton.tsx       |  27 +
 .../home-tab/src/lib/remix-ui-home-tab.css    |  86 +++
 .../home-tab/src/lib/remix-ui-home-tab.tsx    | 278 +++++++++
 .../home-tab/src/lib/themeContext.tsx         |  16 +
 libs/remix-ui/home-tab/tsconfig.json          |  16 +
 libs/remix-ui/home-tab/tsconfig.lib.json      |  13 +
 13 files changed, 718 insertions(+), 551 deletions(-)
 delete mode 100644 apps/remix-ide/src/assets/img/solhintLogo.png
 create mode 100644 apps/remix-ide/src/assets/img/solhintLogo.webp
 create mode 100644 libs/remix-ui/home-tab/.babelrc
 create mode 100644 libs/remix-ui/home-tab/.eslintrc
 create mode 100644 libs/remix-ui/home-tab/README.md
 create mode 100644 libs/remix-ui/home-tab/src/index.ts
 create mode 100644 libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx
 create mode 100644 libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
 create mode 100644 libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
 create mode 100644 libs/remix-ui/home-tab/src/lib/themeContext.tsx
 create mode 100644 libs/remix-ui/home-tab/tsconfig.json
 create mode 100644 libs/remix-ui/home-tab/tsconfig.lib.json

diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
index 744b5c988b..bd66f66054 100644
--- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js
+++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
@@ -1,110 +1,14 @@
+/* global */
+import React from 'react' // eslint-disable-line
+import ReactDOM from 'react-dom'
 import * as packageJson from '../../../../../../package.json'
 import { ViewPlugin } from '@remixproject/engine-web'
-import { migrateToWorkspace } from '../../../migrateFileSystem'
-import JSZip from 'jszip'
+import { RemixUiHomeTab } from '@remix-ui/home-tab' // eslint-disable-line
+import { id } from '@ethersproject/hash'
 
 const yo = require('yo-yo')
-const csjs = require('csjs-inject')
 const globalRegistry = require('../../../global/registry')
-const modalDialogCustom = require('../modal-dialog-custom')
-const modalDialog = require('../modaldialog')
-const tooltip = require('../tooltip')
 const GistHandler = require('../../../lib/gist-handler')
-const QueryParams = require('../../../lib/query-params.js')
-const _paq = window._paq = window._paq || []
-
-const css = csjs`
-  .text {
-    cursor: pointer;
-    font-weight: normal;
-    max-width: 300px;
-    user-select: none;
-  }
-  .text:hover {
-    cursor: pointer;
-    text-decoration: underline;
-  }
-  .homeContainer {
-    user-select: none;
-    overflow-y: hidden;
-  }
-  .mainContent {
-    overflow-y: auto;
-    flex-grow: 3;
-  }
-  .hpLogoContainer {
-    margin: 30px;
-    padding-right: 90px;
-  }
-  .mediaBadge {
-   font-size: 2em;
-   height: 2em;
-   width: 2em;
-  }
-  .mediaBadge:focus {
-    outline: none;
-  }
-  .image {
-    height: 1em;
-    width: 1em;
-    text-align: center;
-  }
-  .logoImg {
-    height: 10em;
-  }
-  .hpSections {
-  }
-  .rightPanel {
-    right: 0;
-    position: absolute;
-    z-index: 3;
-  }
-  .remixHomeMedia {
-    overflow-y: auto;
-    overflow-x: hidden;
-    max-height: 720px;
-  }
-  .panels {
-    box-shadow: 0px 0px 13px -7px;
-  }
-  .labelIt {
-    margin-bottom: 0;
-  }
-  .bigLabelSize {
-    font-size: 13px;
-  }
-  .seeAll {
-    margin-top: 7px;
-    white-space: nowrap;
-  }
-  .importFrom p {
-    margin-right: 10px;
-  }
-  .logoContainer img{
-    height: 150px;
-    opacity: 0.7;
-  }
-  .envLogo {
-    height: 16px;
-  }
-  .cursorStyle {
-    cursor: pointer;
-  }
-  .envButton {
-    width: 120px;
-    height: 70px;
-  }
-  .media {
-    overflow: hidden;
-    width: 400px;
-    transition: .5s ease-out;
-    z-index: 1000;
-  }
-  .migrationBtn {
-    width: 100px;
-  }
-}
-`
 
 const profile = {
   name: 'home',
@@ -116,7 +20,6 @@ const profile = {
   location: 'mainPanel',
   version: packageJson.version
 }
-
 export class LandingPage extends ViewPlugin {
   constructor (appManager, verticalIcons, fileManager, filePanel, contentImport) {
     super(profile)
@@ -127,459 +30,27 @@ export class LandingPage extends ViewPlugin {
     this.appManager = appManager
     this.verticalIcons = verticalIcons
     this.gistHandler = new GistHandler()
-    const themeQuality = globalRegistry.get('themeModule').api.currentTheme().quality
-    window.addEventListener('resize', () => this.adjustMediaPanel())
-    window.addEventListener('click', (e) => this.hideMediaPanel(e))
-    this.twitterFrame = yo`
-      <div class="px-2 ${css.media}">
-        <a class="twitter-timeline"
-          data-width="350"
-          data-theme="${themeQuality}"
-          data-chrome="nofooter noheader transparent"
-          data-tweet-limit="8"
-          href="https://twitter.com/EthereumRemix"
-        >
-        </a>
-        <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
-      </div>
-    `
-    this.badgeTwitter = yo`<button
-      class="btn-info p-2 m-1 border rounded-circle ${css.mediaBadge} fab fa-twitter"
-      id="remixIDEHomeTwitterbtn"
-      onclick=${(e) => this.showMediaPanel(e)}
-    ></button>`
-    this.badgeMedium = yo`<button
-      class="btn-danger p-2 m-1 border rounded-circle ${css.mediaBadge} fab fa-medium"
-      id="remixIDEHomeMediumbtn"
-      onclick=${(e) => this.showMediaPanel(e)}
-    ></button>`
-    this.twitterPanel = yo`
-      <div id="remixIDE_TwitterBlock" class="p-2 mx-0 mb-0 d-none ${css.remixHomeMedia}">
-        ${this.twitterFrame}
-      </div>
-    `
-    this.mediumPanel = yo`
-      <div id="remixIDE_MediumBlock" class="p-2 mx-0 mb-0 d-none ${css.remixHomeMedia}">
-        <div id="medium-widget" class="p-3 ${css.media}">
-          <div
-            id="retainable-rss-embed"
-            data-rss="https://medium.com/feed/remix-ide"
-            data-maxcols="1"
-            data-layout="grid"
-            data-poststyle="external"
-            data-readmore="More..."
-            data-buttonclass="btn mb-3"
-            data-offset="-100"
-          >
--        </div>
-        </div>
-      </div>
-    `
-    this.adjustMediaPanel()
-    globalRegistry.get('themeModule').api.events.on('themeChanged', (theme) => {
-      this.onThemeChanged(theme.quality)
-    })
-  }
-
-  adjustMediaPanel () {
-    this.twitterPanel.style.maxHeight = Math.max(window.innerHeight - 150, 200) + 'px'
-    this.mediumPanel.style.maxHeight = Math.max(window.innerHeight - 150, 200) + 'px'
-  }
-
-  hideMediaPanel (e) {
-    const mediaPanelsTitle = document.getElementById('remixIDEMediaPanelsTitle')
-    const mediaPanels = document.getElementById('remixIDEMediaPanels')
-    if (!mediaPanelsTitle || !mediaPanels) return
-    if (!mediaPanelsTitle.contains(e.target) && !mediaPanels.contains(e.target)) {
-      this.mediumPanel.classList.remove('d-block')
-      this.mediumPanel.classList.add('d-none')
-      this.twitterPanel.classList.remove('d-block')
-      this.twitterPanel.classList.add('d-none')
-    }
-  }
-
-  onThemeChanged (themeQuality) {
-    const twitterFrame = yo`
-      <div class="px-2 ${css.media}">
-        <a class="twitter-timeline"
-          data-width="350"
-          data-theme="${themeQuality}"
-          data-chrome="nofooter noheader transparent"
-          data-tweet-limit="8"
-          href="https://twitter.com/EthereumRemix"
-        >
-        </a>
-        <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
-      </div>
-    `
-    yo.update(this.twitterFrame, twitterFrame)
-
-    const invertNum = (themeQuality === 'dark') ? 1 : 0
-    if (this.solEnv.getElementsByTagName('img')[0]) this.solEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
-    if (this.optimismEnv.getElementsByTagName('img')[0]) this.optimismEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
-    if (this.solhintEnv.getElementsByTagName('img')[0]) this.solhintEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
-    if (this.learnEthEnv.getElementsByTagName('img')[0]) this.learnEthEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
-    if (this.sourcifyEnv.getElementsByTagName('img')[0]) this.sourcifyEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
-    if (this.moreEnv.getElementsByTagName('img')[0]) this.moreEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
-    if (this.websiteIcon) this.websiteIcon.style.filter = `invert(${invertNum})`
-  }
+    this.el = document.createElement('div')
+    this.el.setAttribute('id', 'landingPageHomeContainer')
+    this.el.setAttribute('class', 'remixui_homeContainer justify-content-between bg-light d-flex')
+    this.el.setAttribute('data-id', 'landingPageHomeContainer')
+    // to retrieve medium posts
+    document.body.appendChild(yo`<script src="https://www.twilik.com/assets/retainable/rss-embed/retainable-rss-embed.js"></script>`)
+    document.body.appendChild(yo`<script async src="https://platform.twitter.com/widgets.js" charSet="utf-8"></script>`)
 
-  showMediaPanel (e) {
-    if (e.target.id === 'remixIDEHomeTwitterbtn') {
-      this.mediumPanel.classList.remove('d-block')
-      this.mediumPanel.classList.add('d-none')
-      this.twitterPanel.classList.toggle('d-block')
-      _paq.push(['trackEvent', 'pluginManager', 'media', 'twitter'])
-    } else {
-      this.twitterPanel.classList.remove('d-block')
-      this.twitterPanel.classList.add('d-none')
-      this.mediumPanel.classList.toggle('d-block')
-      _paq.push(['trackEvent', 'pluginManager', 'media', 'medium'])
-    }
   }
 
   render () {
-    const load = (service, item, examples, info) => {
-      const contentImport = this.contentImport
-      const fileProviders = globalRegistry.get('fileproviders').api
-      const msg = yo`
-        <div class="p-2">
-          <span>Enter the ${item} you would like to load.</span>
-          <div>${info}</div>
-          <div>e.g ${examples.map((url) => { return yo`<div class="p-1"><a>${url}</a></div>` })}</div>
-        </div>`
-
-      const title = `Import from ${service}`
-      modalDialogCustom.prompt(title, msg, null, (target) => {
-        if (target !== '') {
-          contentImport.import(
-            target,
-            (loadingMsg) => { tooltip(loadingMsg) },
-            (error, content, cleanUrl, type, url) => {
-              if (error) {
-                modalDialogCustom.alert(title, error.message || error)
-              } else {
-                try {
-                  fileProviders.workspace.addExternal(type + '/' + cleanUrl, content, url)
-                  this.verticalIcons.select('filePanel')
-                } catch (e) {
-                  modalDialogCustom.alert(title, e.message)
-                }
-              }
-            }
-          )
-        }
-      })
-    }
-
-    const startSolidity = async () => {
-      await this.appManager.activatePlugin(['solidity', 'udapp', 'solidityStaticAnalysis', 'solidityUnitTesting'])
-      this.verticalIcons.select('solidity')
-      _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'solidity'])
-    }
-    const startOptimism = async () => {
-      await this.appManager.activatePlugin('optimism-compiler')
-      this.verticalIcons.select('optimism-compiler')
-      _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'optimism-compiler'])
-    }
-    const startSolhint = async () => {
-      await this.appManager.activatePlugin(['solidity', 'solhint'])
-      this.verticalIcons.select('solhint')
-      _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'solhint'])
-    }
-    const startLearnEth = async () => {
-      await this.appManager.activatePlugin(['solidity', 'LearnEth', 'solidityUnitTesting'])
-      this.verticalIcons.select('LearnEth')
-      _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'learnEth'])
-    }
-    const startSourceVerify = async () => {
-      await this.appManager.activatePlugin(['solidity', 'source-verification'])
-      this.verticalIcons.select('source-verification')
-      _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'source-verification'])
-    }
-    const startPluginManager = async () => {
-      await this.appManager.activatePlugin('pluginManager')
-      this.verticalIcons.select('pluginManager')
-    }
-    const startRestoreBackupZip = async () => {
-      await this.appManager.activatePlugin(['restorebackupzip'])
-      this.verticalIcons.select('restorebackupzip')
-      _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'restorebackupzip'])
-    }
-
-    const createNewFile = () => {
-      this.call('filePanel', 'createNewFile')
-    }
-
-    const saveAs = (blob, name) => {
-      const node = document.createElement('a')
-      node.download = name
-      node.rel = 'noopener'
-      node.href = URL.createObjectURL(blob)
-      setTimeout(function () { URL.revokeObjectURL(node.href) }, 4E4) // 40s
-      setTimeout(function () {
-        try {
-          node.dispatchEvent(new MouseEvent('click'))
-        } catch (e) {
-          var evt = document.createEvent('MouseEvents')
-          evt.initMouseEvent('click', true, true, window, 0, 0, 0, 80,
-            20, false, false, false, false, 0, null)
-          node.dispatchEvent(evt)
-        }
-      }, 0) // 40s
-    }
-
-    const downloadFiles = async () => {
-      try {
-        tooltip('preparing files for download, please wait..')
-        const fileProviders = globalRegistry.get('fileproviders').api
-        const zip = new JSZip()
-        await fileProviders.browser.copyFolderToJson('/', ({ path, content }) => {
-          zip.file(`remixbackup${path}`, content)
-        })
-        zip.generateAsync({ type: 'blob' }).then(function (blob) {
-          saveAs(blob, 'remixbackup.zip')
-        }).catch((e) => {
-          tooltip(e.message)
-        })
-      } catch (e) {
-        tooltip(e.message)
-      }
-    }
-
-    const uploadFile = (target) => {
-      this.call('filePanel', 'uploadFile', target)
-    }
-
-    const connectToLocalhost = () => {
-      this.appManager.activatePlugin('remixd')
-    }
-    const importFromGist = () => {
-      this.gistHandler.loadFromGist({ gist: '' }, globalRegistry.get('filemanager').api)
-      this.verticalIcons.select('filePanel')
-    }
-
-    globalRegistry.get('themeModule').api.events.on('themeChanged', (theme) => {
-      globalRegistry.get('themeModule').api.fixInvert(document.getElementById('remixLogo'))
-      globalRegistry.get('themeModule').api.fixInvert(document.getElementById('solidityLogo'))
-      globalRegistry.get('themeModule').api.fixInvert(document.getElementById('debuggerLogo'))
-      globalRegistry.get('themeModule').api.fixInvert(document.getElementById('learnEthLogo'))
-      globalRegistry.get('themeModule').api.fixInvert(document.getElementById('workshopLogo'))
-      globalRegistry.get('themeModule').api.fixInvert(document.getElementById('moreLogo'))
-      globalRegistry.get('themeModule').api.fixInvert(document.getElementById('solhintLogo'))
-    })
-
-    const createLargeButton = (imgPath, envID, envText, callback) => {
-      return yo`
-        <button
-          class="btn border-secondary d-flex mr-3 text-nowrap justify-content-center flex-column align-items-center ${css.envButton}"
-          data-id="landingPageStartSolidity"
-          onclick=${() => callback()}
-        >
-          <img class="m-2 align-self-center ${css.envLogo}" id=${envID} src="${imgPath}">
-          <label class="text-uppercase text-dark ${css.cursorStyle}">${envText}</label>
-        </button>
-      `
-    }
-
-    // main
-    this.solEnv = createLargeButton('assets/img/solidityLogo.webp', 'solidityLogo', 'Solidity', startSolidity)
-    // Featured
-    this.optimismEnv = createLargeButton('assets/img/optimismLogo.webp', 'optimismLogo', 'Optimism', startOptimism)
-    this.solhintEnv = createLargeButton('assets/img/solhintLogo.png', 'solhintLogo', 'Solhint linter', startSolhint)
-    this.learnEthEnv = createLargeButton('assets/img/learnEthLogo.webp', 'learnEthLogo', 'LearnEth', startLearnEth)
-    this.sourcifyEnv = createLargeButton('assets/img/sourcifyLogo.webp', 'sourcifyLogo', 'Sourcify', startSourceVerify)
-    this.moreEnv = createLargeButton('assets/img/moreLogo.webp', 'moreLogo', 'More', startPluginManager)
-    this.websiteIcon = yo`<img id='remixHhomeWebsite' class="mr-1 ${css.image}" src="${profile.icon}"></img>`
-
-    const themeQuality = globalRegistry.get('themeModule').api.currentTheme().quality
-    const invertNum = (themeQuality === 'dark') ? 1 : 0
-    this.solEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
-    this.optimismEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
-    this.solhintEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
-    this.learnEthEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
-    this.sourcifyEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
-    this.moreEnv.getElementsByTagName('img')[0].style.filter = `invert(${invertNum})`
-    this.websiteIcon.style.filter = `invert(${invertNum})`
-
-    const switchToPreviousVersion = () => {
-      const query = new QueryParams()
-      query.update({ appVersion: '0.7.7' })
-      _paq.push(['trackEvent', 'LoadingType', 'oldExperience_0.7.7'])
-      document.location.reload()
-    }
-
-    const migrate = async () => {
-      try {
-        setTimeout(() => {
-          tooltip('migrating workspace...')
-        }, 500)
-        const workspaceName = await migrateToWorkspace(this.fileManager, this.filePanel)
-        tooltip('done. ' + workspaceName + ' created.')
-      } catch (e) {
-        setTimeout(() => {
-          tooltip(e.message)
-        }, 1000)
-      }
-    }
-    const onAcceptDownloadn = async () => {
-      await downloadFiles()
-      const el = document.getElementById('modal-dialog')
-      el.parentElement.removeChild(el)
-      migrate()
-    }
-
-    const onDownload = () => {
-      const el = document.getElementById('modal-dialog')
-      el.parentElement.removeChild(el)
-      migrate()
-    }
-
-    const onCancel = () => {
-      const el = document.getElementById('modal-dialog')
-      el.parentElement.removeChild(el)
-    }
-
-    const migrateWorkspace = async () => {
-      modalDialog(
-        'File system Migration',
-        yo`
-          <span>Do you want to download your files to local device first?</span>
-          <div class="d-flex justify-content-around pt-3 mt-3 border-top">
-            <button class="btn btn-sm btn-primary" onclick=${async () => onAcceptDownloadn()}>Download and Migrate</button>
-            <button class="btn btn-sm btn-secondary ${css.migrationBtn}" onclick=${() => onDownload()}>Migrate</button>
-            <button class="btn btn-sm btn-secondary ${css.migrationBtn}" onclick=${() => onCancel()}>Cancel</button>
-          </div>
-        `,
-        {
-          label: '',
-          fn: null
-        },
-        {
-          label: '',
-          fn: null
-        }
-      )
-    }
-
-    const img = yo`<img class="m-4 ${css.logoImg}" src="assets/img/guitarRemiCroped.webp" onclick="${() => playRemi()}"></img>`
-    const playRemi = async () => { await document.getElementById('remiAudio').play() }
-    // to retrieve medium posts
-    document.body.appendChild(yo`<script src="https://www.twilik.com/assets/retainable/rss-embed/retainable-rss-embed.js"></script>`)
-    const container = yo`
-      <div class="${css.homeContainer} d-flex" data-id="landingPageHomeContainer">
-        <div class="${css.mainContent} bg-light">
-          <div class="d-flex justify-content-between">
-            <div class="d-flex flex-column">
-              <div class="border-bottom d-flex justify-content-between clearfix py-3 mb-4">
-                <div class="mx-4 w-100 d-flex">
-                  ${img}
-                  <audio id="remiAudio" muted=false src="assets/audio/remiGuitar-single-power-chord-A-minor.wav"></audio>
-                  <div class="w-80 pl-5 ml-5">
-                    <h5 class="mb-1">Quicklinks</h5>
-                    <a class="${css.text} mr-1" target="__blank" href="https://medium.com/remix-ide/migrating-files-to-workspaces-8e34737c751c?source=friends_link&sk=b75cfd9093aa23c78be13cce49e4a5e8">Guide </a>for migrating the old File System
-                    <p class="font-weight-bold mb-0 py-1">Migration tools:</p>
-                    <li class="pl-1">
-                      <spam class="pl-0">
-                        <u class="${css.text} pr-1" onclick=${() => migrateWorkspace()}>Basic migration</u>
-                      </spam>
-                    </li>
-                    <li class="pl-1">
-                      <u class="${css.text} pr-1" onclick=${() => downloadFiles()}>Download all Files</u>
-                      as a backup zip
-                    </li>
-                    <li class="pl-1">
-                      <u class="${css.text} pr-1" onclick=${() => startRestoreBackupZip()}>Restore files</u>from backup zip
-                     </li>
-                    <p class="font-weight-bold mb-0 mt-2">Help:</p>
-                    <dir class="d-flex flex-column mt-1 pl-0">
-                      <a class="${css.text} mx-1" target="__blank" href="https://gitter.im/ethereum/remix">Gitter channel</a>
-                      <a class="${css.text} mx-1" target="__blank" href="https://github.com/ethereum/remix-project/issues">Report on Github</a>
-                    </dir>
-                  </div>
-                </div>
-              </div>
-              <div class="row ${css.hpSections} mx-4" data-id="landingPageHpSections">
-                <div class="ml-3">
-                  <div class="plugins mb-5">
-                    <h4>Featured Plugins</h4>
-                    <div class="d-flex flex-row pt-2">
-                      ${this.solEnv}
-                      ${this.optimismEnv}
-                      ${this.learnEthEnv}
-                      ${this.solhintEnv}
-                      ${this.sourcifyEnv}                      
-                      ${this.moreEnv}
-                    </div>
-                  </div>
-                  <div class="d-flex">
-                    <div class="file">
-                      <h4>File</h4>
-                      <p class="mb-1">
-                        <i class="mr-1 far fa-file"></i>
-                        <span class="ml-1 mb-1 ${css.text}" onclick=${() => createNewFile()}>New File</span>
-                      </p>
-                      <p class="mb-1">
-                        <i class="mr-1 far fa-file-alt"></i>
-                        <label class="ml-1 ${css.labelIt} ${css.bigLabelSize} ${css.text}">
-                          Open Files
-                          <input title="open file" type="file" onchange="${(event) => {
-                            event.stopPropagation()
-                            uploadFile(event.target)
-                          }
-                        }" multiple />
-                        </label>
-                      </p>
-                      <p class="mb-1">
-                        <i class="far fa-hdd"></i>
-                        <span class="ml-1 ${css.text}" onclick=${() => connectToLocalhost()}>Connect to Localhost</span>
-                      </p>
-                      <p class="mt-3 mb-0"><label>LOAD FROM:</label></p>
-                      <div class="btn-group">
-                        <button class="btn mr-1 btn-secondary" data-id="landingPageImportFromGistButton" onclick="${() => importFromGist()}">Gist</button>
-                        <button class="btn mx-1 btn-secondary" onclick="${() => load('Github', 'github URL', ['https://github.com/0xcert/ethereum-erc721/src/contracts/tokens/nf-token-metadata.sol', 'https://github.com/OpenZeppelin/openzeppelin-solidity/blob/67bca857eedf99bf44a4b6a0fc5b5ed553135316/contracts/access/Roles.sol'])}">GitHub</button>
-                        <button class="btn mx-1 btn-secondary" onclick="${() => load('Ipfs', 'ipfs URL', ['ipfs://<ipfs-hash>'])}">Ipfs</button>
-                        <button class="btn mx-1 btn-secondary" onclick="${() => load('Https', 'http/https raw content', ['https://raw.githubusercontent.com/OpenZeppelin/openzeppelin-contracts/master/contracts/token/ERC20/ERC20.sol'])}">https</button>
-                      </div><!-- end of btn-group -->
-                    </div><!-- end of div.file -->
-                    <div class="ml-4 pl-4">
-                      <h4>Resources</h4>
-                      <p class="mb-1">
-                        <i class="mr-1 fas fa-book"></i>
-                        <a class="${css.text}" target="__blank" href="https://remix-ide.readthedocs.io/en/latest/#">Documentation</a>
-                      </p>
-                      <p class="mb-1">
-                        <i class="mr-1 fab fa-gitter"></i>
-                        <a class="${css.text}" target="__blank" href="https://gitter.im/ethereum/remix">Gitter channel</a>
-                      </p>
-                      <p class="mb-1">
-                        ${this.websiteIcon}
-                        <a class="${css.text}" target="__blank" href="https://remix-project.org">Featuring website</a>
-                      </p>
-                      <p class="mb-1">
-                        <i class="fab fa-ethereum ${css.image}"></i>
-                        <span class="${css.text}" onclick=${() => switchToPreviousVersion()}>Old experience</span>
-                      </p>
-                    </div>
-                  </div>
-                </div>
-              </div><!-- end of hpSections -->
-            </div>
-            <div class="d-flex flex-column ${css.rightPanel}">
-              <div class="d-flex pr-3 py-2 align-self-end"  id="remixIDEMediaPanelsTitle">
-                ${this.badgeTwitter}
-                ${this.badgeMedium}
-              </div>
-              <div class="mr-3 d-flex bg-light ${css.panels}" id="remixIDEMediaPanels">
-                ${this.mediumPanel}
-                ${this.twitterPanel}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    `
+    this.renderComponent()
+    return this.el
+  }
 
-    return container
+  renderComponent () {
+    ReactDOM.render(
+      <RemixUiHomeTab
+        plugin={this}
+        registry={globalRegistry}
+      />
+      , this.el)
   }
 }
diff --git a/apps/remix-ide/src/assets/img/solhintLogo.png b/apps/remix-ide/src/assets/img/solhintLogo.png
deleted file mode 100644
index eab3cbb63b568c94be0388a0928739ecac5abf11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3400
zcmbVP2{_d0A0JdimP8x>jcJS{V@@-U$&idN8I5H`r)loYWoG2IvO?(^Dmm7D#Uwep
z6iRHA-Gn4kX-g_a5j&3lzv=Mo{-6C{`+J`E_rAaP{k)&={e7O_0gAV~wx*FL2n5ph
z^dNo@%v9yjSOmONXM;L{X{pE~PyzyJtxygXP-gZj5NNRh*DpXCK=#7Zg?t2!A>7SG
zg!4rJ8U%854j0kr!AvQ5H<Qg35Fl^s8zEpWg8<orBcsS7S0;z+5h-T+Mtb|vBZKJ<
z42ZK6*fAUr5b&8&8aSNK6G-sk1jr{|Jg`=7BO%~V5NR+0;-VA?4j@y&u0k;rY>Pm_
z=_nKiZ0CSL+hVb{C~GhVg+U=vI3yYaN8932SUlPe{N;fF(!>lF{(IuaFS39y0)!)#
zittEeSXdY$%myJ8vyo^A2L~hygT!Fq00J(F5J+j^aDl}1D+7@!p^Ld9DOV@}D;a6K
zg`rXc1km)e34GB4tw8d{O@PCY;WQBvjX)_)`UGUq7jU9bG4GRb1|7-dG5Jh^R03ep
z3s@0HC>2UL!hb`(aQr6$fNRO*1sQ*-3!lFrLLznB3z+f6A%BUM_(h1A$nTjFVW^nS
zblVH4X{xkFgm)D)X;PusPblPl4HV_8%3ur{fdN~RX>_hYX~fz;TwxMvQYHZc#0?Ec
zq2U;`9~uanJsyRDq0o2~>NAuqWN=v#e+9*$@K~EaL4l-U(4@5g3TDvpETNcB15D=f
zX>2A^Bw$0p3y#FQ3VA{?AQ;dN{l|SzS67Ny$l~&V1ENq0cBgR#K;D^s(v(cbdkQ2{
znt;yqBoZKiXAoR215dMKVIAzSC^(CWqrtHl8U}99qA}oh7zbM$x}6OR!@zvKPZZKa
zmGS?2pYea*-z??=^+)6VZ60M+Dia6q!Ic0ZjrdYGzRZv>D;^j8DOd0`y0Qic5V|t>
zOa|o3HurCP;4^I)hY67Whm`mXlL%STFq)X@!UnwcKO`LzP#>wR*Uy$9|JBG(XMd>e
zuW+DYD3=SJ3iw#)bxZ-!;KV>DqiJRD1A)~0Jc%xToWYK)4uP+`{?ET2d;Qezg{l3~
zpgJ8&Xg?zPTQGIQv9dj<*B>wN*XS<SO&}HXZWqYg)b!oPR3}X*w67GkOnD7Q{c=0w
zQbTW!2UN^^tsCp`-udJEki&7$P2R42CnC&9dlbV5?>Uc+s#dB>H)Y41SCskS$`&nM
z{aAc9gyA-mT%dTZU%9;@H>N>h=|d+L$M;+i^x+Z=&Y12Q8WHsj>t$X$=$|)a73rw{
z%C!EGhJUT<r0B!gx+I?9mQD?Fi^*cEw#cLhiy7*2d2m=jr>6cIP4I>#LB)M%H(qzj
z1q}q?Tsw{$yUt7Q&-ut=oUUmtjjGXrAuKZN<q37wmBAJHc@JAothE$2=mojKOj>UE
zFrO?p>e#tUJH^rqmyLirRTpTN-Nt4%KOm-UtjP)@aHd5vgL)GJdNwCHariiEhLLx4
zr&rf7k8xo`3>!l7<#d1xw;Eo#`}$1J^TH|36W{prbTZ9-b39%g8JNdErtob{)2mgZ
z6onTzk9xM=%t;>4tA1QKTeT*_Oc57Vt8Z|hU6LMTf)pAb;74O|kzPj#L<Dq&o?m<g
zc3V=<I229IGwrfk?56tEG{ZP-k-F-#{DJnq(ZQSe05!ZOuE&z)>DploTVB_sE8i6S
zVTOzm<(X2h5{jJ;dipV!koK$Gps#7&62U_9K&ubEOk5|Hzbc4QJz$5*QcYz&2`%ok
zvL@cySB8Dn$<?#bfg3h3rslWAO%L3Pa_`7opX;^!Y&XFzio|cDcfOs>q&km0({Xn-
zvrPPvbWhe^KHfWY(0j>BeRX#!$cmpW3!RQYk7~x9PG#QsE@VQD@?I~~_Lqn^=`OOl
zz7Z*ugWPk7!`54R_X$F6W1|0c?Gda|tvZ!WfU+J@>r1=cyPCaCwXX*Lz`jd(xGwgh
z(SFiD*fVvoRjJnZ6w_AFQIh4NP)ZNzrRIlQdr;+ev#SU>UamOO(_q}z^QHA^ll!wX
zGtZju*ORZpAi@l?kZu9y&kV%KvbdMYB*KTj#(X30H!#Iz3!Q`VoTp96q`ST@Z#%b9
za>FTc26c6Gr+aH)N7i!Q6nV6l!i(pO-1=Yr*x1`Kl}0tF<4xC*y3JZvtccoNGw9e=
z;iEBLJN3Nea^<7;{u9^&Y{oGlsO2A~0~%V@+Kh&aqRJn1?T}1xEau~07U$7&$3`_x
z+}gF0p)$Y9o!jO@lD~bI=bzza;!ife(zI4LKb#`6QtyE{d0v1Gj?H|lI}%gc&9G1m
zC*8gFPVXRLd7ZmS)&{Vu#!+hgPpzXQW1n@s>2_vZV)Jb5#fCUFW1l{)@@3APKq&rj
zQ;_^s#>2{@itz^z&{-LJ6q{=>!^bYxxgShkN2a#12xJTJ)I^EJem0E8HjlhN*{<J!
z{Ejd;J*m6Qn&|vcG!X&$-M-a*mA}i3&G-l5T>m&fM~=Poe7tS4)GWbWbLBTz)(Ofc
z*ZVxZ3Ql@UxR?A?Yn%n?7T#C6H0U?*f;m(AdvA(ftE+kn!K|A_a1M{07(W*kI=?%=
zR*^oav-!PG(GM4WJ98hEHIWwgPj*LUdEpLM7xwOY-iXXryOJ@>hTNL+UTv5j_|c&;
zFkx;)_sE;oI%<m{YCb6yD%uT^PJK4i!oj0=hYXi-W3Q|lY)Ri_NiBJyV%GCATGe|=
z^qFR@-~jjAjfNUoVVmVcE5=T3-CDTc__5<D3??d`2-5v6f5q$i77@i`PfV;DBmr9>
zufgZe1_zx>B|STFB>U0MWdy~<9ocV}k`4vt##hHqZY~UL+dDI2ul{=pBbJReFW4@_
zw9U`HfcZATiUYHsH}7x?-F+{$Y4%Nl&haf_mA-kT4#?JwGdm4CPEHkuJb|V0k9$|m
zq>ydWpj6Ani+Zb$A8laoj=@C;GnY2BrDUl*-et(M&JRGBIZo{}>uM!5WvsnWcf$MB
zNw95*;#K7Qdk8#V++GpA6I-+OSM24Gda<qS8ruw}oholn<#XdE=PZTUk{^f6q!Yiq
z<h@%nZ4K>rJRe=u^gb!Yukfa(IWjNCXm#yUM~M^cAp?}514@f0SIzbA7=Q8pP|{A5
z)t7b=e%c;#)n(5|zkG(-6XC}ui-ECQHC-hPqjPmmxGjW;HF-@wGL0+k=}qEWXDzzQ
zf>lZd<0sCBraCwu2plLpm=n1<$Zn%_%;03#oqw!9ZzCgCG_{vlpCk`xO2<Mgel8hM
z-R9D+YTkp^ug$<kskyjs*N!fVUYYhpyJii-c|H~18LPi>-;v9$iu=<%<KBTGv*VIR
z=zesb>Dleh7@JeKQ<rMJydfvE9>$#O2v(e|QfJAp-Bww2+T%rDRS?N_6K92=cE9ZA
z26W{yDD`xRvCie5b@9fQxh-o)lNp`md5=rp^vT>Co3~wmldw_-8A>c+)H5C|r#82v
z5^vO*R@*upu38naA*(>q6Amw++;=%3b9%6h>b{q}#L>7jn!9A(zBkj}w}dB_4Kcq9
zw4dKm(_mPh*uuM-hJ<Y0XB)m{>_S_1Zr`kb-TYk&?lpejvy^wEH4SL1rUOww6j@^}
z?m!DVC^-2JZ;ix$&Dtj)&)fT8bbT)m^>vIPm-k%1Y-fT!%AxzkZDSRxlG8>~DJlXZ
x!`kZ7O>T8nR@EIYNEK>x?5V5a59f#Hbqt|az1H@(4=De2Jl(vBl^cTM{|O$!in#y)

diff --git a/apps/remix-ide/src/assets/img/solhintLogo.webp b/apps/remix-ide/src/assets/img/solhintLogo.webp
new file mode 100644
index 0000000000000000000000000000000000000000..cc9ecb3bea44a9ca63e0af309c1ddc3df9d66201
GIT binary patch
literal 1584
zcmV-02G99YNk&E}1^@t8MM6+kP&iB*1^@srQ~(ta&3u3$qW?j}gW1`(<&h*gvfyBw
z`>2?4&&<rs%#fWCi~l#I(+6-#h0Dg2^(-uPK{PY@k-B?$reSy{m5N?u3{NpywJIqi
z9MrZNHq60C!R8>1gUtyNDxnT0A(@j&cu_*CfC-p9EbX)A!SSW{WLvohHffjU9tT=I
zy4NOoiiuXvp2^Xd@+6<qia9Wiqs#NN9IuohwL6iY;&^qWq6xc${20e8qyn|O?jyWk
ztD%inE8^&e53*eeBq6BS?dAJ;pBDF8om-Zqg{mla_q?0!qRzdVQ~zaYq7qS2?5=w|
zZ_#4Ty^4EwS&CBHs$mEx+9ml`-mFEOySSe_?J|r;1cg$&JKxNG^PRhR{)ozH3z4D-
zgwUh&Z{W-Goco{iM@D;kBC1IdQ(MEMllfX+rP<D1Jip5zPJbYVMJqHSyE`vlIn%4I
z^G8%DlX)6iM2$v?s-m)+<SV&y7JDzF2ZqV-!or%MkO4_Wg3vlT|1z$e1rfO8!Xy?p
zUPU$95RD=cN7uZV7il(yJ1*R1!I>f|20^8Q(y;sY7x6;PhTd`EE(@+IF}<dSYS7}K
zP4fB7b;pIfEG!L8Q4yt4L|PHUqf@zWbKG&^E(?yvFd~K_WI&=+BaZfelVd&8U3Xb<
z6D_TxD6JZngrH4&;Vw%X5!7fQp`tBnH14vLtw2SDBtmO6L6eGF(j=x9qH6Xc1hJ%T
zX_}x~L`ev((KghQMu@bC7>%h-j7HV$pVO!2C$+GuQqxNfi=>sYG@0%5`m<l(ebN>s
zr9nnwyl5p#X|<i{3;MI`_S>e5Y9de_C=JvwG;015NB2CHXJ`?L@j^8rg&3B!fn>H}
z?S6g3H|8s}k_@DcsUry@V(wJb(REMeDOyZaWh91)qJ>b>&J+!T-92|cRddADs3<gb
zuqL0qyCfq>D`v}x;;X-Y65pLArq?jl0snQ=UZ31BmPTsUYEZ*Cy6(X|TvJjyh@hy^
zGU29!esI@}Y0R3UBC6!*x(D%4jWh(Q=`kAk-AyO@k7lTOqtOsi?9M-shiHU~#xP?U
zjQ{SYpWH`_r1MmzMMdcD*AL)M&zxza6fs(*o#J;l{nLF=joBMo(Lzb>e*NE%J-0~>
z6je34JBVq1chi3VQIp2Z6-i>W#AtWdJ>t6dI86}aA;IK(P~Vy6cQ^ff|8CmZQZ-B>
z(1vi+dVS!NRiY{~Ldf3OtGlN8-A$AJqnN!h(i*L#s9<}kAFGIJN{zOE|Lgsj=65&!
zd~eS&H9<*;8Q0q{`k^95QjO8SKT+SA=693RtWh#(iJE`C-S<PYMrf!`#-#RQ+U$iA
zqm8!Bpi`{3d%nL&2Cb4p<R^bR5eq>=JEmehW?XMC^}nv^1GK69{rO8`zMw^<gJ@D>
z&h_@BACs}s#Aqku*LTfRBt}D!7S%bdw-*m91VxRe`TK9)I0tP_uOc*J?)CPB9~%!%
z8Z_i!eDhSy5rGsD(ul>bx0m{{(xOeZX;uFIPxsCeDO%MUrrHHrZ%_FlL81gHVlwvY
z^D!mV^dJ<`1zB$=emEki5;U9`C+qe>N+2YI8m405>+Su2jT$CtqfzqrU#!mtRZWYi
zLPwm|_4YD97D;0~h1O3#SD%U`G*LA*8JzC*_V<U{Xd4Yu!|aVyxvv_H2ue$P+N`%1
zkCCL53Td$SL{L;D5)wUa*4z6JX@e$3RU|?aMYXMH#S*T!m-%thBq|kAS|ufd#B#5<
z7Z0guX(|X*RYjX9SsLr@e;y8!P=Qi0jA7e|<<2SVX0y5CiYqo7MT`bj5oy~c)6Er|
z%@v!?W|P5aN+YU~gf5vcSi8BR-Bi<xR>Wwu5X*nX6`NjhMMDrlRj4z#o6TlZG2S4C
zq4dmHZ`w^!HD1Fi;!NFa1|c1r8c}C#+A57<6j8((+|7ohhLuoJXZSyCv{6B87%OmZ
z8CFWgioC=R2ct2_O4wfNe}N_nt*(N}-u~yIC=_BPuDACelR&J__4e$cDvhoT>+RXU
ifK;r|_4e!`rB>>Cd-gaHD|Wp-du#=-w?8@9%LD*8xDY@9

literal 0
HcmV?d00001

diff --git a/libs/remix-ui/home-tab/.babelrc b/libs/remix-ui/home-tab/.babelrc
new file mode 100644
index 0000000000..09d67939cc
--- /dev/null
+++ b/libs/remix-ui/home-tab/.babelrc
@@ -0,0 +1,4 @@
+{
+  "presets": ["@nrwl/react/babel"],
+  "plugins": []
+}
diff --git a/libs/remix-ui/home-tab/.eslintrc b/libs/remix-ui/home-tab/.eslintrc
new file mode 100644
index 0000000000..977f139a09
--- /dev/null
+++ b/libs/remix-ui/home-tab/.eslintrc
@@ -0,0 +1,248 @@
+{
+  "rules": {
+    "array-callback-return": "warn",
+    "dot-location": ["warn", "property"],
+    "eqeqeq": ["warn", "smart"],
+    "new-parens": "warn",
+    "no-caller": "warn",
+    "no-cond-assign": ["warn", "except-parens"],
+    "no-const-assign": "warn",
+    "no-control-regex": "warn",
+    "no-delete-var": "warn",
+    "no-dupe-args": "warn",
+    "no-dupe-keys": "warn",
+    "no-duplicate-case": "warn",
+    "no-empty-character-class": "warn",
+    "no-empty-pattern": "warn",
+    "no-eval": "warn",
+    "no-ex-assign": "warn",
+    "no-extend-native": "warn",
+    "no-extra-bind": "warn",
+    "no-extra-label": "warn",
+    "no-fallthrough": "warn",
+    "no-func-assign": "warn",
+    "no-implied-eval": "warn",
+    "no-invalid-regexp": "warn",
+    "no-iterator": "warn",
+    "no-label-var": "warn",
+    "no-labels": ["warn", { "allowLoop": true, "allowSwitch": false }],
+    "no-lone-blocks": "warn",
+    "no-loop-func": "warn",
+    "no-mixed-operators": [
+      "warn",
+      {
+        "groups": [
+          ["&", "|", "^", "~", "<<", ">>", ">>>"],
+          ["==", "!=", "===", "!==", ">", ">=", "<", "<="],
+          ["&&", "||"],
+          ["in", "instanceof"]
+        ],
+        "allowSamePrecedence": false
+      }
+    ],
+    "no-multi-str": "warn",
+    "no-native-reassign": "warn",
+    "no-negated-in-lhs": "warn",
+    "no-new-func": "warn",
+    "no-new-object": "warn",
+    "no-new-symbol": "warn",
+    "no-new-wrappers": "warn",
+    "no-obj-calls": "warn",
+    "no-octal": "warn",
+    "no-octal-escape": "warn",
+    "no-redeclare": "warn",
+    "no-regex-spaces": "warn",
+    "no-restricted-syntax": ["warn", "WithStatement"],
+    "no-script-url": "warn",
+    "no-self-assign": "warn",
+    "no-self-compare": "warn",
+    "no-sequences": "warn",
+    "no-shadow-restricted-names": "warn",
+    "no-sparse-arrays": "warn",
+    "no-template-curly-in-string": "warn",
+    "no-this-before-super": "warn",
+    "no-throw-literal": "warn",
+    "no-restricted-globals": [
+      "error",
+      "addEventListener",
+      "blur",
+      "close",
+      "closed",
+      "confirm",
+      "defaultStatus",
+      "defaultstatus",
+      "event",
+      "external",
+      "find",
+      "focus",
+      "frameElement",
+      "frames",
+      "history",
+      "innerHeight",
+      "innerWidth",
+      "length",
+      "location",
+      "locationbar",
+      "menubar",
+      "moveBy",
+      "moveTo",
+      "name",
+      "onblur",
+      "onerror",
+      "onfocus",
+      "onload",
+      "onresize",
+      "onunload",
+      "open",
+      "opener",
+      "opera",
+      "outerHeight",
+      "outerWidth",
+      "pageXOffset",
+      "pageYOffset",
+      "parent",
+      "print",
+      "removeEventListener",
+      "resizeBy",
+      "resizeTo",
+      "screen",
+      "screenLeft",
+      "screenTop",
+      "screenX",
+      "screenY",
+      "scroll",
+      "scrollbars",
+      "scrollBy",
+      "scrollTo",
+      "scrollX",
+      "scrollY",
+      "self",
+      "status",
+      "statusbar",
+      "stop",
+      "toolbar",
+      "top"
+    ],
+    "no-unexpected-multiline": "warn",
+    "no-unreachable": "warn",
+    "no-unused-expressions": [
+      "error",
+      {
+        "allowShortCircuit": true,
+        "allowTernary": true,
+        "allowTaggedTemplates": true
+      }
+    ],
+    "no-unused-labels": "warn",
+    "no-useless-computed-key": "warn",
+    "no-useless-concat": "warn",
+    "no-useless-escape": "warn",
+    "no-useless-rename": [
+      "warn",
+      {
+        "ignoreDestructuring": false,
+        "ignoreImport": false,
+        "ignoreExport": false
+      }
+    ],
+    "no-with": "warn",
+    "no-whitespace-before-property": "warn",
+    "react-hooks/exhaustive-deps": "warn",
+    "require-yield": "warn",
+    "rest-spread-spacing": ["warn", "never"],
+    "strict": ["warn", "never"],
+    "unicode-bom": ["warn", "never"],
+    "use-isnan": "warn",
+    "valid-typeof": "warn",
+    "no-restricted-properties": [
+      "error",
+      {
+        "object": "require",
+        "property": "ensure",
+        "message": "Please use import() instead. More info: https://facebook.github.io/create-react-app/docs/code-splitting"
+      },
+      {
+        "object": "System",
+        "property": "import",
+        "message": "Please use import() instead. More info: https://facebook.github.io/create-react-app/docs/code-splitting"
+      }
+    ],
+    "getter-return": "warn",
+    "import/first": "error",
+    "import/no-amd": "error",
+    "import/no-webpack-loader-syntax": "error",
+    "react/forbid-foreign-prop-types": ["warn", { "allowInPropTypes": true }],
+    "react/jsx-no-comment-textnodes": "warn",
+    "react/jsx-no-duplicate-props": "warn",
+    "react/jsx-no-target-blank": "warn",
+    "react/jsx-no-undef": "error",
+    "react/jsx-pascal-case": ["warn", { "allowAllCaps": true, "ignore": [] }],
+    "react/jsx-uses-react": "warn",
+    "react/jsx-uses-vars": "warn",
+    "react/no-danger-with-children": "warn",
+    "react/no-direct-mutation-state": "warn",
+    "react/no-is-mounted": "warn",
+    "react/no-typos": "error",
+    "react/react-in-jsx-scope": "error",
+    "react/require-render-return": "error",
+    "react/style-prop-object": "warn",
+    "react/jsx-no-useless-fragment": "warn",
+    "jsx-a11y/accessible-emoji": "warn",
+    "jsx-a11y/alt-text": "warn",
+    "jsx-a11y/anchor-has-content": "warn",
+    "jsx-a11y/anchor-is-valid": [
+      "warn",
+      { "aspects": ["noHref", "invalidHref"] }
+    ],
+    "jsx-a11y/aria-activedescendant-has-tabindex": "warn",
+    "jsx-a11y/aria-props": "warn",
+    "jsx-a11y/aria-proptypes": "warn",
+    "jsx-a11y/aria-role": "warn",
+    "jsx-a11y/aria-unsupported-elements": "warn",
+    "jsx-a11y/heading-has-content": "warn",
+    "jsx-a11y/iframe-has-title": "warn",
+    "jsx-a11y/img-redundant-alt": "warn",
+    "jsx-a11y/no-access-key": "warn",
+    "jsx-a11y/no-distracting-elements": "warn",
+    "jsx-a11y/no-redundant-roles": "warn",
+    "jsx-a11y/role-has-required-aria-props": "warn",
+    "jsx-a11y/role-supports-aria-props": "warn",
+    "jsx-a11y/scope": "warn",
+    "react-hooks/rules-of-hooks": "error",
+    "default-case": "off",
+    "no-dupe-class-members": "off",
+    "no-undef": "off",
+    "@typescript-eslint/consistent-type-assertions": "warn",
+    "no-array-constructor": "off",
+    "@typescript-eslint/no-array-constructor": "warn",
+    "@typescript-eslint/no-namespace": "error",
+    "no-use-before-define": "off",
+    "@typescript-eslint/no-use-before-define": [
+      "warn",
+      {
+        "functions": false,
+        "classes": false,
+        "variables": false,
+        "typedefs": false
+      }
+    ],
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": [
+      "warn",
+      { "args": "none", "ignoreRestSiblings": true }
+    ],
+    "no-useless-constructor": "off",
+    "@typescript-eslint/no-useless-constructor": "warn"
+  },
+  "env": {
+    "browser": true,
+    "commonjs": true,
+    "es6": true,
+    "jest": true,
+    "node": true
+  },
+  "settings": { "react": { "version": "detect" } },
+  "plugins": ["import", "jsx-a11y", "react", "react-hooks"],
+  "extends": ["../../../.eslintrc"],
+  "ignorePatterns": ["!**/*"]
+}
diff --git a/libs/remix-ui/home-tab/README.md b/libs/remix-ui/home-tab/README.md
new file mode 100644
index 0000000000..27f152a0ae
--- /dev/null
+++ b/libs/remix-ui/home-tab/README.md
@@ -0,0 +1,7 @@
+# remix-ui-home-tab
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test remix-ui-home-tab` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/libs/remix-ui/home-tab/src/index.ts b/libs/remix-ui/home-tab/src/index.ts
new file mode 100644
index 0000000000..ab0129545e
--- /dev/null
+++ b/libs/remix-ui/home-tab/src/index.ts
@@ -0,0 +1 @@
+export * from './lib/remix-ui-home-tab'
diff --git a/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx b/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx
new file mode 100644
index 0000000000..ec0e02b2bd
--- /dev/null
+++ b/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx
@@ -0,0 +1,27 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import React, { useContext } from 'react'
+import { ThemeContext } from '../themeContext'
+
+interface PluginButtonProps {
+  imgPath: string,
+  envID: string,
+  envText: string,
+  callback: any
+}
+
+function PluginButton ({ imgPath, envID, envText, callback }: PluginButtonProps) {
+  const themeFilter = useContext(ThemeContext)
+
+  return (
+    <button
+      className="btn border-secondary d-flex mr-3 text-nowrap justify-content-center flex-column align-items-center remixui_envButton"
+      data-id="landingPageStart{envText"
+      onClick={() => callback()}
+    >
+      <img className="m-2 align-self-center remixui_envLogo" id={envID} src={imgPath} alt="" style={ { filter: themeFilter.filter } } />
+      <label className="text-uppercase text-dark remixui_cursorStyle">{envText}</label>
+    </button>
+  )
+}
+
+export default PluginButton
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
new file mode 100644
index 0000000000..224bda49e8
--- /dev/null
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
@@ -0,0 +1,86 @@
+.remixui_text {
+    cursor: pointer;
+    font-weight: normal;
+    max-width: 300px;
+    user-select: none;
+  }
+  .remixui_text:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+  .remixui_homeContainer {
+    user-select: none;
+    overflow-y: hidden;
+    overflow-y: auto;
+    flex-grow: 3;
+  }
+  .remixui_hpLogoContainer {
+    margin: 30px;
+    padding-right: 90px;
+  }
+  .remixui_mediaBadge {
+   font-size: 2em;
+   height: 2em;
+   width: 2em;
+  }
+  .remixui_mediaBadge:focus {
+    outline: none;
+  }
+  .remixui_image {
+    height: 1em;
+    width: 1em;
+    text-align: center;
+  }
+  .remixui_logoImg {
+    height: 10em;
+  }
+  .remixui_rightPanel {
+    right: 0;
+    position: absolute;
+    z-index: 3;
+  }
+  .remixui_remixHomeMedia {
+    overflow-y: auto;
+    overflow-x: hidden;
+    max-height: 720px;
+  }
+  .remixui_panels {
+    box-shadow: 0px 0px 13px -7px;
+  }
+  .remixui_labelIt {
+    margin-bottom: 0;
+  }
+  .remixui_bigLabelSize {
+    font-size: 13px;
+  }
+  .remixui_seeAll {
+    margin-top: 7px;
+    white-space: nowrap;
+  }
+  .remixui_importFrom p {
+    margin-right: 10px;
+  }
+  .remixui_logoContainer img{
+    height: 150px;
+    opacity: 0.7;
+  }
+  .remixui_envLogo {
+    height: 16px;
+    width: 16px;
+  }
+  .remixui_cursorStyle {
+    cursor: pointer;
+  }
+  .remixui_envButton {
+    width: 120px;
+    height: 70px;
+  }
+  .remixui_media {
+    overflow: hidden;
+    width: 400px;
+    transition: .5s ease-out;
+    z-index: 1000;
+  }
+  .remixui_migrationBtn {
+    width: 100px;
+  }
\ No newline at end of file
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
new file mode 100644
index 0000000000..dc993eccbb
--- /dev/null
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
@@ -0,0 +1,278 @@
+import React, { useState, useRef, useEffect } from 'react' // eslint-disable-line
+
+import './remix-ui-home-tab.css'
+import { ModalDialog } from '@remix-ui/modal-dialog' // eslint-disable-line
+import PluginButton from './components/pluginButton' // eslint-disable-line
+import QueryParams from '../../../../../apps/remix-ide/src/lib/query-params'
+import { ThemeContext, themes } from './themeContext'
+import { stat } from 'fs'
+
+declare global {
+  interface Window {
+    _paq: any
+  }
+}
+const _paq = window._paq = window._paq || [] //eslint-disable-line
+
+/* eslint-disable-next-line */
+export interface RemixUiHomeTabProps {
+  plugin: any,
+  registry: any
+}
+
+export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
+  const { plugin, registry } = props
+  const [state, setState] = useState<{
+    showBasicMigration: boolean,
+    themeQuality: { filter: string, name: string },
+    showMediaPanel: 'none' | 'twitter' | 'medium'
+  }>({
+    showBasicMigration: false,
+    themeQuality: registry.get('themeModule').api.currentTheme().quality === 'dark' ? themes.dark : themes.light,
+    showMediaPanel: 'none'
+  })
+
+  const playRemi = async () => {
+    remiAudioEl.current.play()
+  }
+
+  const remiAudioEl = useRef(null)
+
+  useEffect(() => {
+    registry.get('themeModule').api.events.on('themeChanged', (theme) => {
+      // update theme quality. To be used for for images
+      setState(prevState => {
+        return { ...prevState, themeQuality: theme.quality === 'dark' ? themes.dark : themes.light }
+      })
+    })
+    window.addEventListener('click', (e) => {
+      if (e.target.id !== 'remixIDEHomeTwitterbtn' && e.target.id !== 'remixIDEHomeMediumbtn') {
+        // todo check event.target
+        setState(prevState => { return { ...prevState, showMediaPanel: 'none' } })
+      }
+    })
+  }, [])
+
+  const createNewFile = () => {
+    plugin.call('filePanel', 'createNewFile')
+  }
+
+  const uploadFile = (target) => {
+    plugin.call('filePanel', 'uploadFile', target)
+  }
+
+  const connectToLocalhost = () => {
+    plugin.appManager.activatePlugin('remixd')
+  }
+  const importFromGist = () => {
+    plugin.gistHandler.loadFromGist({ gist: '' }, registry.get('filemanager').api)
+    plugin.verticalIcons.select('filePanel')
+  }
+  const switchToPreviousVersion = () => {
+    const query = new QueryParams()
+    query.update({ appVersion: '0.7.7' })
+    _paq.push(['trackEvent', 'LoadingType', 'oldExperience_0.7.7'])
+    document.location.reload()
+  }
+  const startSolidity = async () => {
+    await plugin.appManager.activatePlugin(['solidity', 'udapp', 'solidityStaticAnalysis', 'solidityUnitTesting'])
+    plugin.verticalIcons.select('solidity')
+    _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'solidity'])
+  }
+  const startOptimism = async () => {
+    await plugin.appManager.activatePlugin('optimism-compiler')
+    plugin.verticalIcons.select('optimism-compiler')
+    _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'optimism-compiler'])
+  }
+  const startSolhint = async () => {
+    await plugin.appManager.activatePlugin(['solidity', 'solhint'])
+    plugin.verticalIcons.select('solhint')
+    _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'solhint'])
+  }
+  const startLearnEth = async () => {
+    await plugin.appManager.activatePlugin(['solidity', 'LearnEth', 'solidityUnitTesting'])
+    plugin.verticalIcons.select('LearnEth')
+    _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'learnEth'])
+  }
+  const startSourceVerify = async () => {
+    await plugin.appManager.activatePlugin(['solidity', 'source-verification'])
+    plugin.verticalIcons.select('source-verification')
+    _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'source-verification'])
+  }
+  const startPluginManager = async () => {
+    await plugin.appManager.activatePlugin('pluginManager')
+    plugin.verticalIcons.select('pluginManager')
+  }
+
+  const load = (service, item, examples, info = '') => {/*
+    const contentImport = this.contentImport
+    const fileProviders = registry.get('fileproviders').api
+    const msg = yo`
+      <div class="p-2">
+        <span>Enter the ${item} you would like to load.</span>
+        <div>${info}</div>
+        <div>e.g ${examples.map((url) => { return yo`<div class="p-1"><a>${url}</a></div>` })}</div>
+      </div>`
+
+    const title = `Import from ${service}`
+    modalDialogCustom.prompt(title, msg, null, (target) => {
+      if (target !== '') {
+        contentImport.import(
+          target,
+          (loadingMsg) => { tooltip(loadingMsg) },
+          (error, content, cleanUrl, type, url) => {
+            if (error) {
+              modalDialogCustom.alert(title, error.message || error)
+            } else {
+              try {
+                fileProviders.workspace.addExternal(type + '/' + cleanUrl, content, url)
+                this.verticalIcons.select('filePanel')
+              } catch (e) {
+                modalDialogCustom.alert(title, e.message)
+              }
+            }
+          }
+        )
+      }
+    })*/
+  }
+  const maxHeight = Math.max(window.innerHeight - 150, 200) + 'px'
+  return (
+    <div className="d-flex flex-column" id="remixUiRightPanel">
+      <div className="border-bottom d-flex flex-column justify-content-between clearfix py-3 mb-4">
+        <div className="mx-4 w-100 d-flex">
+          <img className="m-4 remixui_logoImg" src="assets/img/guitarRemiCroped.webp" onClick={ () => playRemi() } alt=""></img>
+          <audio
+            id="remiAudio"
+            muted={false}
+            src="assets/audio/remiGuitar-single-power-chord-A-minor.wav"
+            ref={remiAudioEl}
+          ></audio>
+        </div>
+      </div>
+      <div className="row remixui_hpSections mx-4" data-id="landingPageHpSections">
+        <div className="ml-3">
+          <div className="mb-5">
+            <h4>Featured Plugins</h4>
+            <div className="d-flex flex-row pt-2">
+              <ThemeContext.Provider value={ state.themeQuality }>
+                <PluginButton imgPath="assets/img/solidityLogo.webp" envID="solidityLogo" envText="Solidity" callback={startSolidity} />
+                <PluginButton imgPath="assets/img/optimismLogo.webp" envID="optimismLogo" envText="Optimism" callback={startOptimism} />
+                <PluginButton imgPath="assets/img/solhintLogo.webp" envID="solhintLogo" envText="Solhint linter" callback={startSolhint} />
+                <PluginButton imgPath="assets/img/learnEthLogo.webp" envID="learnEthLogo" envText="LearnEth" callback={startLearnEth} />
+                <PluginButton imgPath="assets/img/sourcifyLogo.webp" envID="sourcifyLogo" envText="Sourcify" callback={startSourceVerify} />
+                <PluginButton imgPath="assets/img/moreLogo.webp" envID="moreLogo" envText="More" callback={startPluginManager} />
+              </ThemeContext.Provider>
+            </div>
+          </div>
+          <div className="d-flex">
+            <div className="file">
+              <h4>File</h4>
+              <p className="mb-1">
+                <i className="mr-2 far fa-file"></i>
+                <span className="ml-1 mb-1 remixui_text" onClick={() => createNewFile()}>New File</span>
+              </p>
+              <p className="mb-1">
+                <i className="mr-2 far fa-file-alt"></i>
+                <label className="ml-1 remixui_labelIt remixui_bigLabelSize} remixui_text">
+                  Open Files
+                  <input title="open file" type="file" onChange={(event) => {
+                    event.stopPropagation()
+                    uploadFile(event.target)
+                  }} multiple />
+                </label>
+              </p>
+              <p className="mb-1">
+                <i className="mr-1 far fa-hdd"></i>
+                <span className="ml-1 remixui_text" onClick={() => connectToLocalhost()}>Connect to Localhost</span>
+              </p>
+              <p className="mt-3 mb-0"><label>LOAD FROM:</label></p>
+              <div className="btn-group">
+                <button className="btn mr-1 btn-secondary" data-id="landingPageImportFromGistButton" onClick={() => importFromGist()}>Gist</button>
+                <button className="btn mx-1 btn-secondary" onClick={() => load('Github', 'github URL', ['https://github.com/0xcert/ethereum-erc721/src/contracts/tokens/nf-token-metadata.sol', 'https://github.com/OpenZeppelin/openzeppelin-solidity/blob/67bca857eedf99bf44a4b6a0fc5b5ed553135316/contracts/access/Roles.sol'])}>GitHub</button>
+                <button className="btn mx-1 btn-secondary" onClick={() => load('Ipfs', 'ipfs URL', ['ipfs://<ipfs-hash>'])}>Ipfs</button>
+                <button className="btn mx-1 btn-secondary" onClick={() => load('Https', 'http/https raw content', ['https://raw.githubusercontent.com/OpenZeppelin/openzeppelin-contracts/master/contracts/token/ERC20/ERC20.sol'])}>https</button>
+              </div>
+            </div>
+            <div className="ml-4 pl-4">
+              <h4>Resources</h4>
+              <p className="mb-1">
+                <i className="mr-2 fas fa-book"></i>
+                <a className="remixui_text" target="__blank" href="https://remix-ide.readthedocs.io/en/latest/#">Documentation</a>
+              </p>
+              <p className="mb-1">
+                <i className="mr-2 fab fa-gitter"></i>
+                <a className="remixui_text" target="__blank" href="https://gitter.im/ethereum/remix">Gitter channel</a>
+              </p>
+              <p className="mb-1">
+                <img id='remixHhomeWebsite' className="mr-2 remixui_image" src={ plugin.profile.icon } style={ { filter: state.themeQuality.filter } } alt=''></img>
+                <a className="remixui_text" target="__blank" href="https://remix-project.org">Featuring website</a>
+              </p>
+              <p className="mb-1">
+                <i className="mr-2 fab fa-ethereum remixui_image"></i>
+                <span className="remixui_text" onClick={() => switchToPreviousVersion()}>Old experience</span>
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div className="d-flex flex-column remixui_rightPanel">
+        <div className="d-flex pr-3 py-2 align-self-end" id="remixIDEMediaPanelsTitle">
+          <button
+            className="btn-info p-2 m-1 border rounded-circle remixui_mediaBadge fab fa-twitter"
+            id="remixIDEHomeTwitterbtn"
+            title="Medium blogs"
+            onClick={(e) => {
+              setState(prevState => {
+                return { ...prevState, showMediaPanel: state.showMediaPanel === 'twitter' ? 'none' : 'twitter' }
+              })
+              _paq.push(['trackEvent', 'pluginManager', 'media', 'twitter'])
+            }}
+          ></button>
+          <button
+            className="btn-danger p-2 m-1 border rounded-circle remixui_mediaBadge fab fa-medium"
+            id="remixIDEHomeMediumbtn"
+            title="Twitter"
+            onClick={(e) => {
+              setState(prevState => {
+                return { ...prevState, showMediaPanel: state.showMediaPanel === 'medium' ? 'none' : 'medium' }
+              })
+              _paq.push(['trackEvent', 'pluginManager', 'media', 'medium'])
+            }}
+          ></button>
+        </div>
+        <div className="mr-3 d-flex bg-light remixui_panels" id="remixIDEMediaPanels">
+          { (state.showMediaPanel === 'medium') && <div id="remixIDE_MediumBlock" className="p-2 mx-0 mb-0 remixui_remixHomeMedia">
+            <div id="medium-widget" className="p-3 remixui_media" style={ { maxHeight: maxHeight } }>
+              <div
+                id="retainable-rss-embed"
+                data-rss="https://medium.com/feed/remix-ide"
+                data-maxcols="1"
+                data-layout="grid"
+                data-poststyle="external"
+                data-readmore="More..."
+                data-buttonclass="btn mb-3"
+                data-offset="-100"
+              >
+              </div>
+            </div>
+          </div> }
+          { (state.showMediaPanel === 'twitter') && <div id="remixIDE_TwitterBlock" className="p-2 mx-0 mb-0 remixui_remixHomeMedia">
+            <div className="px-2 remixui_media" style={ { maxHeight: maxHeight } } >
+              <a className="twitter-timeline"
+                data-width="350"
+                data-theme={ state.themeQuality.name }
+                data-chrome="nofooter noheader transparent"
+                data-tweet-limit="8"
+                href="https://twitter.com/EthereumRemix"
+              >
+              </a>
+            </div>
+          </div> }
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default RemixUiHomeTab
diff --git a/libs/remix-ui/home-tab/src/lib/themeContext.tsx b/libs/remix-ui/home-tab/src/lib/themeContext.tsx
new file mode 100644
index 0000000000..fc67007dac
--- /dev/null
+++ b/libs/remix-ui/home-tab/src/lib/themeContext.tsx
@@ -0,0 +1,16 @@
+import React from 'react' // eslint-disable-line
+
+export const themes = {
+  light: {
+    filter: 'invert(0)',
+    name: 'light'
+  },
+  dark: {
+    filter: 'invert(1)',
+    name: 'dark'
+  }
+}
+
+export const ThemeContext = React.createContext(
+  themes.dark // default value
+)
diff --git a/libs/remix-ui/home-tab/tsconfig.json b/libs/remix-ui/home-tab/tsconfig.json
new file mode 100644
index 0000000000..d52e31ad74
--- /dev/null
+++ b/libs/remix-ui/home-tab/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "jsx": "react",
+    "allowJs": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
+}
diff --git a/libs/remix-ui/home-tab/tsconfig.lib.json b/libs/remix-ui/home-tab/tsconfig.lib.json
new file mode 100644
index 0000000000..b560bc4dec
--- /dev/null
+++ b/libs/remix-ui/home-tab/tsconfig.lib.json
@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "types": ["node"]
+  },
+  "files": [
+    "../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
+    "../../../node_modules/@nrwl/react/typings/image.d.ts"
+  ],
+  "exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
+  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+}

From 25f9f1958f479f9e5ebc7dda43cbf6e173478b94 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Mon, 4 Oct 2021 12:38:54 +0200
Subject: [PATCH 08/43] adding the modal dialog

---
 .../src/app/ui/landing-page/landing-page.js   |   2 -
 .../home-tab/src/lib/remix-ui-home-tab.css    |   3 +-
 .../home-tab/src/lib/remix-ui-home-tab.tsx    | 347 ++++++++++--------
 3 files changed, 189 insertions(+), 163 deletions(-)

diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
index bd66f66054..81efff22c3 100644
--- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js
+++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
@@ -4,7 +4,6 @@ import ReactDOM from 'react-dom'
 import * as packageJson from '../../../../../../package.json'
 import { ViewPlugin } from '@remixproject/engine-web'
 import { RemixUiHomeTab } from '@remix-ui/home-tab' // eslint-disable-line
-import { id } from '@ethersproject/hash'
 
 const yo = require('yo-yo')
 const globalRegistry = require('../../../global/registry')
@@ -37,7 +36,6 @@ export class LandingPage extends ViewPlugin {
     // to retrieve medium posts
     document.body.appendChild(yo`<script src="https://www.twilik.com/assets/retainable/rss-embed/retainable-rss-embed.js"></script>`)
     document.body.appendChild(yo`<script async src="https://platform.twitter.com/widgets.js" charSet="utf-8"></script>`)
-
   }
 
   render () {
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
index 224bda49e8..80fb6d7d39 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
@@ -83,4 +83,5 @@
   }
   .remixui_migrationBtn {
     width: 100px;
-  }
\ No newline at end of file
+  }
+  
\ No newline at end of file
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
index dc993eccbb..208af4e9d7 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
@@ -25,11 +25,15 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
   const [state, setState] = useState<{
     showBasicMigration: boolean,
     themeQuality: { filter: string, name: string },
-    showMediaPanel: 'none' | 'twitter' | 'medium'
+    showMediaPanel: 'none' | 'twitter' | 'medium',
+    showModalDialog: boolean,
+    modalInfo: { title: string, loadItem: string, examples: Array<string> }
   }>({
     showBasicMigration: false,
     themeQuality: registry.get('themeModule').api.currentTheme().quality === 'dark' ? themes.dark : themes.light,
-    showMediaPanel: 'none'
+    showMediaPanel: 'none',
+    showModalDialog: false,
+    modalInfo: { title: '', loadItem: '', examples: []}
   })
 
   const playRemi = async () => {
@@ -45,20 +49,21 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
         return { ...prevState, themeQuality: theme.quality === 'dark' ? themes.dark : themes.light }
       })
     })
-    window.addEventListener('click', (e) => {
-      if (e.target.id !== 'remixIDEHomeTwitterbtn' && e.target.id !== 'remixIDEHomeMediumbtn') {
+    window.addEventListener('click', (event) => {
+      const { id } = (event.target as HTMLButtonElement).dataset
+      if ( id !== 'remixIDEHomeTwitterbtn' && id!== 'remixIDEHomeMediumbtn') {
         // todo check event.target
         setState(prevState => { return { ...prevState, showMediaPanel: 'none' } })
       }
     })
   }, [])
 
-  const createNewFile = () => {
-    plugin.call('filePanel', 'createNewFile')
+  const createNewFile = async () => {
+    await plugin.call('filePanel', 'createNewFile')
   }
 
-  const uploadFile = (target) => {
-    plugin.call('filePanel', 'uploadFile', target)
+  const uploadFile = async (target) => {
+    await plugin.call('filePanel', 'uploadFile', target)
   }
 
   const connectToLocalhost = () => {
@@ -104,174 +109,196 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
     plugin.verticalIcons.select('pluginManager')
   }
 
-  const load = (service, item, examples, info = '') => {/*
-    const contentImport = this.contentImport
-    const fileProviders = registry.get('fileproviders').api
-    const msg = yo`
-      <div class="p-2">
-        <span>Enter the ${item} you would like to load.</span>
-        <div>${info}</div>
-        <div>e.g ${examples.map((url) => { return yo`<div class="p-1"><a>${url}</a></div>` })}</div>
-      </div>`
+  const showFullMessage = (title: string, loadItem: string, examples: Array<string>) => {
+    setState(prevState => {
+      return { ...prevState, modalInfo: { title: title, loadItem: loadItem , examples: examples } }
+    })
+  }
+
+  const hideFullMessage = () => { //eslint-disable-line
+    setState(prevState => {
+      return { ...prevState, showModalDialog: false }
+    })
+  }
 
-    const title = `Import from ${service}`
-    modalDialogCustom.prompt(title, msg, null, (target) => {
-      if (target !== '') {
-        contentImport.import(
-          target,
-          (loadingMsg) => { tooltip(loadingMsg) },
-          (error, content, cleanUrl, type, url) => {
-            if (error) {
-              modalDialogCustom.alert(title, error.message || error)
-            } else {
-              try {
-                fileProviders.workspace.addExternal(type + '/' + cleanUrl, content, url)
-                this.verticalIcons.select('filePanel')
-              } catch (e) {
-                modalDialogCustom.alert(title, e.message)
-              }
-            }
+  const processLoading = () => {
+    const contentImport = plugin.contentImport
+    const fileProviders = registry.get('fileproviders').api
+    contentImport.import(
+      null,//target,
+      (loadingMsg) => { setState(prevState => { return { ...prevState, tooltip: loadingMsg } }) },
+      (error, content, cleanUrl, type, url) => {
+        if (error) {
+          //modalDialogCustom.alert(state.modalInfo.title, error.message || error)
+        } else {
+          try {
+            fileProviders.workspace.addExternal(type + '/' + cleanUrl, content, url)
+            plugin.call('menuicons', 'select', 'filePanel')
+          } catch (e) {
+            //modalDialogCustom.alert(state.modalInfo.title, e.message)
           }
-        )
+        }
       }
-    })*/
+    )
   }
+
   const maxHeight = Math.max(window.innerHeight - 150, 200) + 'px'
   return (
-    <div className="d-flex flex-column" id="remixUiRightPanel">
-      <div className="border-bottom d-flex flex-column justify-content-between clearfix py-3 mb-4">
-        <div className="mx-4 w-100 d-flex">
-          <img className="m-4 remixui_logoImg" src="assets/img/guitarRemiCroped.webp" onClick={ () => playRemi() } alt=""></img>
-          <audio
-            id="remiAudio"
-            muted={false}
-            src="assets/audio/remiGuitar-single-power-chord-A-minor.wav"
-            ref={remiAudioEl}
-          ></audio>
-        </div>
-      </div>
-      <div className="row remixui_hpSections mx-4" data-id="landingPageHpSections">
-        <div className="ml-3">
-          <div className="mb-5">
-            <h4>Featured Plugins</h4>
-            <div className="d-flex flex-row pt-2">
-              <ThemeContext.Provider value={ state.themeQuality }>
-                <PluginButton imgPath="assets/img/solidityLogo.webp" envID="solidityLogo" envText="Solidity" callback={startSolidity} />
-                <PluginButton imgPath="assets/img/optimismLogo.webp" envID="optimismLogo" envText="Optimism" callback={startOptimism} />
-                <PluginButton imgPath="assets/img/solhintLogo.webp" envID="solhintLogo" envText="Solhint linter" callback={startSolhint} />
-                <PluginButton imgPath="assets/img/learnEthLogo.webp" envID="learnEthLogo" envText="LearnEth" callback={startLearnEth} />
-                <PluginButton imgPath="assets/img/sourcifyLogo.webp" envID="sourcifyLogo" envText="Sourcify" callback={startSourceVerify} />
-                <PluginButton imgPath="assets/img/moreLogo.webp" envID="moreLogo" envText="More" callback={startPluginManager} />
-              </ThemeContext.Provider>
+    <>
+      <ModalDialog
+        title={ 'Import from ' +  state.modalInfo.title }
+        cancelLabel='Close'
+        cancelFn={ () => {} }
+        hide={ !state.showModalDialog }
+        handleHide={ () => hideFullMessage() }
+        okFn={ () => processLoading() }
+      >
+        <div className="p-2">
+        { state.modalInfo.loadItem !== '' && <span>Enter the { state.modalInfo.loadItem } you would like to load.</span> }
+        { state.modalInfo.examples.length !== 0 && 
+          <>
+            <div>e.g </div>
+            <div>
+            { state.modalInfo.examples.map((url) => { return `<div className="p-1"><a>${url}</a></div>` }) }
             </div>
+          </> }
+        </div>
+      </ModalDialog>
+      <div className="d-flex flex-column" id="remixUiRightPanel">
+        <div className="border-bottom d-flex flex-column justify-content-between clearfix py-3 mb-4">
+          <div className="mx-4 w-100 d-flex">
+            <img className="m-4 remixui_logoImg" src="assets/img/guitarRemiCroped.webp" onClick={ () => playRemi() } alt=""></img>
+            <audio
+              id="remiAudio"
+              muted={false}
+              src="assets/audio/remiGuitar-single-power-chord-A-minor.wav"
+              ref={remiAudioEl}
+            ></audio>
           </div>
-          <div className="d-flex">
-            <div className="file">
-              <h4>File</h4>
-              <p className="mb-1">
-                <i className="mr-2 far fa-file"></i>
-                <span className="ml-1 mb-1 remixui_text" onClick={() => createNewFile()}>New File</span>
-              </p>
-              <p className="mb-1">
-                <i className="mr-2 far fa-file-alt"></i>
-                <label className="ml-1 remixui_labelIt remixui_bigLabelSize} remixui_text">
-                  Open Files
-                  <input title="open file" type="file" onChange={(event) => {
-                    event.stopPropagation()
-                    uploadFile(event.target)
-                  }} multiple />
-                </label>
-              </p>
-              <p className="mb-1">
-                <i className="mr-1 far fa-hdd"></i>
-                <span className="ml-1 remixui_text" onClick={() => connectToLocalhost()}>Connect to Localhost</span>
-              </p>
-              <p className="mt-3 mb-0"><label>LOAD FROM:</label></p>
-              <div className="btn-group">
-                <button className="btn mr-1 btn-secondary" data-id="landingPageImportFromGistButton" onClick={() => importFromGist()}>Gist</button>
-                <button className="btn mx-1 btn-secondary" onClick={() => load('Github', 'github URL', ['https://github.com/0xcert/ethereum-erc721/src/contracts/tokens/nf-token-metadata.sol', 'https://github.com/OpenZeppelin/openzeppelin-solidity/blob/67bca857eedf99bf44a4b6a0fc5b5ed553135316/contracts/access/Roles.sol'])}>GitHub</button>
-                <button className="btn mx-1 btn-secondary" onClick={() => load('Ipfs', 'ipfs URL', ['ipfs://<ipfs-hash>'])}>Ipfs</button>
-                <button className="btn mx-1 btn-secondary" onClick={() => load('Https', 'http/https raw content', ['https://raw.githubusercontent.com/OpenZeppelin/openzeppelin-contracts/master/contracts/token/ERC20/ERC20.sol'])}>https</button>
+        </div>
+        <div className="row remixui_hpSections mx-4" data-id="landingPageHpSections">
+          <div className="ml-3">
+            <div className="mb-5">
+              <h4>Featured Plugins</h4>
+              <div className="d-flex flex-row pt-2">
+                <ThemeContext.Provider value={ state.themeQuality }>
+                  <PluginButton imgPath="assets/img/solidityLogo.webp" envID="solidityLogo" envText="Solidity" callback={() => startSolidity()} />
+                  <PluginButton imgPath="assets/img/optimismLogo.webp" envID="optimismLogo" envText="Optimism" callback={() => startOptimism()} />
+                  <PluginButton imgPath="assets/img/solhintLogo.webp" envID="solhintLogo" envText="Solhint linter" callback={() => startSolhint()} />
+                  <PluginButton imgPath="assets/img/learnEthLogo.webp" envID="learnEthLogo" envText="LearnEth" callback={() => startLearnEth()} />
+                  <PluginButton imgPath="assets/img/sourcifyLogo.webp" envID="sourcifyLogo" envText="Sourcify" callback={() => startSourceVerify()} />
+                  <PluginButton imgPath="assets/img/moreLogo.webp" envID="moreLogo" envText="More" callback={startPluginManager} />
+                </ThemeContext.Provider>
               </div>
             </div>
-            <div className="ml-4 pl-4">
-              <h4>Resources</h4>
-              <p className="mb-1">
-                <i className="mr-2 fas fa-book"></i>
-                <a className="remixui_text" target="__blank" href="https://remix-ide.readthedocs.io/en/latest/#">Documentation</a>
-              </p>
-              <p className="mb-1">
-                <i className="mr-2 fab fa-gitter"></i>
-                <a className="remixui_text" target="__blank" href="https://gitter.im/ethereum/remix">Gitter channel</a>
-              </p>
-              <p className="mb-1">
-                <img id='remixHhomeWebsite' className="mr-2 remixui_image" src={ plugin.profile.icon } style={ { filter: state.themeQuality.filter } } alt=''></img>
-                <a className="remixui_text" target="__blank" href="https://remix-project.org">Featuring website</a>
-              </p>
-              <p className="mb-1">
-                <i className="mr-2 fab fa-ethereum remixui_image"></i>
-                <span className="remixui_text" onClick={() => switchToPreviousVersion()}>Old experience</span>
-              </p>
+            <div className="d-flex">
+              <div className="file">
+                <h4>File</h4>
+                <p className="mb-1">
+                  <i className="mr-2 far fa-file"></i>
+                  <span className="ml-1 mb-1 remixui_text" onClick={() => createNewFile()}>New File</span>
+                </p>
+                <p className="mb-1">
+                  <i className="mr-2 far fa-file-alt"></i>
+                  <label className="ml-1 remixui_labelIt remixui_bigLabelSize} remixui_text">
+                    Open Files
+                    <input title="open file" type="file" onChange={(event) => {
+                      event.stopPropagation()
+                      uploadFile(event.target)
+                    }} multiple />
+                  </label>
+                </p>
+                <p className="mb-1">
+                  <i className="mr-1 far fa-hdd"></i>
+                  <span className="ml-1 remixui_text" onClick={() => connectToLocalhost()}>Connect to Localhost</span>
+                </p>
+                <p className="mt-3 mb-0"><label>LOAD FROM:</label></p>
+                <div className="btn-group">
+                  <button className="btn mr-1 btn-secondary" data-id="landingPageImportFromGistButton" onClick={() => importFromGist()}>Gist</button>
+                  <button className="btn mx-1 btn-secondary" onClick={() => showFullMessage('Github', 'github URL', ['https://github.com/0xcert/ethereum-erc721/src/contracts/tokens/nf-token-metadata.sol', 'https://github.com/OpenZeppelin/openzeppelin-solidity/blob/67bca857eedf99bf44a4b6a0fc5b5ed553135316/contracts/access/Roles.sol'])}>GitHub</button>
+                  <button className="btn mx-1 btn-secondary" onClick={() => showFullMessage('Ipfs', 'ipfs URL', ['ipfs://<ipfs-hash>'])}>Ipfs</button>
+                  <button className="btn mx-1 btn-secondary" onClick={() => showFullMessage('Https', 'http/https raw content', ['https://raw.githubusercontent.com/OpenZeppelin/openzeppelin-contracts/master/contracts/token/ERC20/ERC20.sol'])}>https</button>
+                </div>
+              </div>
+              <div className="ml-4 pl-4">
+                <h4>Resources</h4>
+                <p className="mb-1">
+                  <i className="mr-2 fas fa-book"></i>
+                  <a className="remixui_text" target="__blank" href="https://remix-ide.readthedocs.io/en/latest/#">Documentation</a>
+                </p>
+                <p className="mb-1">
+                  <i className="mr-2 fab fa-gitter"></i>
+                  <a className="remixui_text" target="__blank" href="https://gitter.im/ethereum/remix">Gitter channel</a>
+                </p>
+                <p className="mb-1">
+                  <img id='remixHhomeWebsite' className="mr-2 remixui_image" src={ plugin.profile.icon } style={ { filter: state.themeQuality.filter } } alt=''></img>
+                  <a className="remixui_text" target="__blank" href="https://remix-project.org">Featuring website</a>
+                </p>
+                <p className="mb-1">
+                  <i className="mr-2 fab fa-ethereum remixui_image"></i>
+                  <span className="remixui_text" onClick={() => switchToPreviousVersion()}>Old experience</span>
+                </p>
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div className="d-flex flex-column remixui_rightPanel">
-        <div className="d-flex pr-3 py-2 align-self-end" id="remixIDEMediaPanelsTitle">
-          <button
-            className="btn-info p-2 m-1 border rounded-circle remixui_mediaBadge fab fa-twitter"
-            id="remixIDEHomeTwitterbtn"
-            title="Medium blogs"
-            onClick={(e) => {
-              setState(prevState => {
-                return { ...prevState, showMediaPanel: state.showMediaPanel === 'twitter' ? 'none' : 'twitter' }
-              })
-              _paq.push(['trackEvent', 'pluginManager', 'media', 'twitter'])
-            }}
-          ></button>
-          <button
-            className="btn-danger p-2 m-1 border rounded-circle remixui_mediaBadge fab fa-medium"
-            id="remixIDEHomeMediumbtn"
-            title="Twitter"
-            onClick={(e) => {
-              setState(prevState => {
-                return { ...prevState, showMediaPanel: state.showMediaPanel === 'medium' ? 'none' : 'medium' }
-              })
-              _paq.push(['trackEvent', 'pluginManager', 'media', 'medium'])
-            }}
-          ></button>
-        </div>
-        <div className="mr-3 d-flex bg-light remixui_panels" id="remixIDEMediaPanels">
-          { (state.showMediaPanel === 'medium') && <div id="remixIDE_MediumBlock" className="p-2 mx-0 mb-0 remixui_remixHomeMedia">
-            <div id="medium-widget" className="p-3 remixui_media" style={ { maxHeight: maxHeight } }>
-              <div
-                id="retainable-rss-embed"
-                data-rss="https://medium.com/feed/remix-ide"
-                data-maxcols="1"
-                data-layout="grid"
-                data-poststyle="external"
-                data-readmore="More..."
-                data-buttonclass="btn mb-3"
-                data-offset="-100"
-              >
+        <div className="d-flex flex-column remixui_rightPanel">
+          <div className="d-flex pr-3 py-2 align-self-end" id="remixIDEMediaPanelsTitle">
+            <button
+              className="btn-info p-2 m-1 border rounded-circle remixui_mediaBadge fab fa-twitter"
+              id="remixIDEHomeTwitterbtn"
+              title="Medium blogs"
+              onClick={(e) => {
+                setState(prevState => {
+                  return { ...prevState, showMediaPanel: state.showMediaPanel === 'twitter' ? 'none' : 'twitter' }
+                })
+                _paq.push(['trackEvent', 'pluginManager', 'media', 'twitter'])
+              }}
+            ></button>
+            <button
+              className="btn-danger p-2 m-1 border rounded-circle remixui_mediaBadge fab fa-medium"
+              id="remixIDEHomeMediumbtn"
+              title="Twitter"
+              onClick={(e) => {
+                setState(prevState => {
+                  return { ...prevState, showMediaPanel: state.showMediaPanel === 'medium' ? 'none' : 'medium' }
+                })
+                _paq.push(['trackEvent', 'pluginManager', 'media', 'medium'])
+              }}
+            ></button>
+          </div>
+          <div className="mr-3 d-flex bg-light remixui_panels" id="remixIDEMediaPanels">
+            { (state.showMediaPanel === 'medium') && <div id="remixIDE_MediumBlock" className="p-2 mx-0 mb-0 remixui_remixHomeMedia">
+              <div id="medium-widget" className="p-3 remixui_media" style={ { maxHeight: maxHeight } }>
+                <div
+                  id="retainable-rss-embed"
+                  data-rss="https://medium.com/feed/remix-ide"
+                  data-maxcols="1"
+                  data-layout="grid"
+                  data-poststyle="external"
+                  data-readmore="More..."
+                  data-buttonclass="btn mb-3"
+                  data-offset="-100"
+                >
+                </div>
               </div>
-            </div>
-          </div> }
-          { (state.showMediaPanel === 'twitter') && <div id="remixIDE_TwitterBlock" className="p-2 mx-0 mb-0 remixui_remixHomeMedia">
-            <div className="px-2 remixui_media" style={ { maxHeight: maxHeight } } >
-              <a className="twitter-timeline"
-                data-width="350"
-                data-theme={ state.themeQuality.name }
-                data-chrome="nofooter noheader transparent"
-                data-tweet-limit="8"
-                href="https://twitter.com/EthereumRemix"
-              >
-              </a>
-            </div>
-          </div> }
+            </div> }
+            { (state.showMediaPanel === 'twitter') && <div id="remixIDE_TwitterBlock" className="p-2 mx-0 mb-0 remixui_remixHomeMedia">
+              <div className="px-2 remixui_media" style={ { maxHeight: maxHeight } } >
+                <a className="twitter-timeline"
+                  data-width="350"
+                  data-theme={ state.themeQuality.name }
+                  data-chrome="nofooter noheader transparent"
+                  data-tweet-limit="8"
+                  href="https://twitter.com/EthereumRemix"
+                >
+                </a>
+              </div>
+            </div> }
+          </div>
         </div>
       </div>
-    </div>
+    </>
   )
 }
 

From c6bf48e29f7eef9eb63693e18c4455945cef56ac Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Wed, 6 Oct 2021 11:38:37 +0200
Subject: [PATCH 09/43] import files are fixed

---
 .../home-tab/src/lib/remix-ui-home-tab.css    |  2 -
 .../home-tab/src/lib/remix-ui-home-tab.tsx    | 69 +++++++++++++++----
 2 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
index 80fb6d7d39..689efed837 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
@@ -2,14 +2,12 @@
     cursor: pointer;
     font-weight: normal;
     max-width: 300px;
-    user-select: none;
   }
   .remixui_text:hover {
     cursor: pointer;
     text-decoration: underline;
   }
   .remixui_homeContainer {
-    user-select: none;
     overflow-y: hidden;
     overflow-y: auto;
     flex-grow: 3;
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
index 208af4e9d7..60f606c60e 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
@@ -2,6 +2,7 @@ import React, { useState, useRef, useEffect } from 'react' // eslint-disable-lin
 
 import './remix-ui-home-tab.css'
 import { ModalDialog } from '@remix-ui/modal-dialog' // eslint-disable-line
+import { Toaster } from '@remix-ui/toaster' // eslint-disable-line
 import PluginButton from './components/pluginButton' // eslint-disable-line
 import QueryParams from '../../../../../apps/remix-ide/src/lib/query-params'
 import { ThemeContext, themes } from './themeContext'
@@ -27,13 +28,17 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
     themeQuality: { filter: string, name: string },
     showMediaPanel: 'none' | 'twitter' | 'medium',
     showModalDialog: boolean,
-    modalInfo: { title: string, loadItem: string, examples: Array<string> }
+    modalInfo: { title: string, loadItem: string, examples: Array<string> },
+    importSource: string,
+    toasterMsg: string
   }>({
     showBasicMigration: false,
     themeQuality: registry.get('themeModule').api.currentTheme().quality === 'dark' ? themes.dark : themes.light,
     showMediaPanel: 'none',
     showModalDialog: false,
-    modalInfo: { title: '', loadItem: '', examples: []}
+    modalInfo: { title: '', loadItem: '', examples: []},
+    importSource: '',
+    toasterMsg: ''
   })
 
   const playRemi = async () => {
@@ -41,6 +46,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
   }
 
   const remiAudioEl = useRef(null)
+  const inputValue = useRef(null)
 
   useEffect(() => {
     registry.get('themeModule').api.events.on('themeChanged', (theme) => {
@@ -51,13 +57,19 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
     })
     window.addEventListener('click', (event) => {
       const { id } = (event.target as HTMLButtonElement).dataset
-      if ( id !== 'remixIDEHomeTwitterbtn' && id!== 'remixIDEHomeMediumbtn') {
+      if ( id !== 'remixIDEHomeTwitterbtn' && id !== 'remixIDEHomeMediumbtn') {
         // todo check event.target
         setState(prevState => { return { ...prevState, showMediaPanel: 'none' } })
       }
     })
   }, [])
 
+  const toast = (message: string) => {
+    setState(prevState => {
+      return { ...prevState, toasterMsg: message }
+    })
+  }
+
   const createNewFile = async () => {
     await plugin.call('filePanel', 'createNewFile')
   }
@@ -110,14 +122,15 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
   }
 
   const showFullMessage = (title: string, loadItem: string, examples: Array<string>) => {
+    console.log('showFullMessage')
     setState(prevState => {
-      return { ...prevState, modalInfo: { title: title, loadItem: loadItem , examples: examples } }
+      return { ...prevState, showModalDialog: true, modalInfo: { title: title, loadItem: loadItem , examples: examples } }
     })
   }
 
   const hideFullMessage = () => { //eslint-disable-line
     setState(prevState => {
-      return { ...prevState, showModalDialog: false }
+      return { ...prevState, showModalDialog: false, importSource: '' }
     })
   }
 
@@ -125,45 +138,71 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
     const contentImport = plugin.contentImport
     const fileProviders = registry.get('fileproviders').api
     contentImport.import(
-      null,//target,
+      state.importSource,
       (loadingMsg) => { setState(prevState => { return { ...prevState, tooltip: loadingMsg } }) },
       (error, content, cleanUrl, type, url) => {
         if (error) {
           //modalDialogCustom.alert(state.modalInfo.title, error.message || error)
+          toast(error.message || error)
         } else {
           try {
             fileProviders.workspace.addExternal(type + '/' + cleanUrl, content, url)
             plugin.call('menuicons', 'select', 'filePanel')
           } catch (e) {
             //modalDialogCustom.alert(state.modalInfo.title, e.message)
+            toast(e.message)
+
           }
         }
       }
     )
+    setState(prevState => {
+      return { ...prevState, showModalDialog: false }
+    })
   }
 
   const maxHeight = Math.max(window.innerHeight - 150, 200) + 'px'
+  const examples = state.modalInfo.examples.map((urlEl, key) => (<div key={key} className="p-1 user-select-auto"><a>{urlEl}</a></div>))
   return (
     <>
       <ModalDialog
-        title={ 'Import from ' +  state.modalInfo.title }
-        cancelLabel='Close'
-        cancelFn={ () => {} }
+        title={ 'Import from ' + state.modalInfo.title }
+        okLabel='Import'
         hide={ !state.showModalDialog }
         handleHide={ () => hideFullMessage() }
-        okFn={ () => processLoading() }
+        okFn={ () => {
+          processLoading()
+          setState(prevState => {
+            return { ...prevState, importSource: '' }
+          })}
+        }
       >
-        <div className="p-2">
-        { state.modalInfo.loadItem !== '' && <span>Enter the { state.modalInfo.loadItem } you would like to load.</span> }
-        { state.modalInfo.examples.length !== 0 && 
+        <div className="p-2 user-select-auto">
+          { state.modalInfo.loadItem !== '' && <span>Enter the { state.modalInfo.loadItem } you would like to load.</span> }
+          { state.modalInfo.examples.length !== 0 &&
           <>
-            <div>e.g </div>
+            <div>e.g</div>
             <div>
-            { state.modalInfo.examples.map((url) => { return `<div className="p-1"><a>${url}</a></div>` }) }
+              { examples }
             </div>
           </> }
+          <input
+            ref={inputValue}
+            type='text'
+            name='prompt_text'
+            id='prompt_text'
+            className="w-100 form-control"
+            data-id="modalDialogCustomPromptText"
+            value={state.importSource}
+            onInput={(e) => {
+              setState(prevState => {
+                return { ...prevState, importSource: inputValue.current.value }
+              })
+            }}
+          />
         </div>
       </ModalDialog>
+      <Toaster message={state.toasterMsg} />
       <div className="d-flex flex-column" id="remixUiRightPanel">
         <div className="border-bottom d-flex flex-column justify-content-between clearfix py-3 mb-4">
           <div className="mx-4 w-100 d-flex">

From 018e5d4a37fab1659559a4e4bd64d35a37c86510 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Wed, 6 Oct 2021 11:53:04 +0200
Subject: [PATCH 10/43] icon size fixed

---
 libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
index 689efed837..7aff9a02db 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
@@ -64,7 +64,6 @@
   }
   .remixui_envLogo {
     height: 16px;
-    width: 16px;
   }
   .remixui_cursorStyle {
     cursor: pointer;

From ebc82298695d66f7d0eed45682d915fadcd231fc Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Thu, 7 Oct 2021 12:33:55 +0200
Subject: [PATCH 11/43] twitter panel fixed

---
 .../src/app/ui/landing-page/landing-page.js   |    3 +-
 .../home-tab/src/lib/remix-ui-home-tab.css    |    1 -
 .../home-tab/src/lib/remix-ui-home-tab.tsx    |   55 +-
 package-lock.json                             | 1811 +++++++++++------
 package.json                                  |    3 +-
 5 files changed, 1228 insertions(+), 645 deletions(-)

diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
index 81efff22c3..af3ad9dc04 100644
--- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js
+++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
@@ -34,8 +34,7 @@ export class LandingPage extends ViewPlugin {
     this.el.setAttribute('class', 'remixui_homeContainer justify-content-between bg-light d-flex')
     this.el.setAttribute('data-id', 'landingPageHomeContainer')
     // to retrieve medium posts
-    document.body.appendChild(yo`<script src="https://www.twilik.com/assets/retainable/rss-embed/retainable-rss-embed.js"></script>`)
-    document.body.appendChild(yo`<script async src="https://platform.twitter.com/widgets.js" charSet="utf-8"></script>`)
+    //document.body.appendChild(yo`<script src="https://www.twilik.com/assets/retainable/rss-embed/retainable-rss-embed.js"></script>`)
   }
 
   render () {
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
index 7aff9a02db..045719e03a 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
@@ -40,7 +40,6 @@
   .remixui_remixHomeMedia {
     overflow-y: auto;
     overflow-x: hidden;
-    max-height: 720px;
   }
   .remixui_panels {
     box-shadow: 0px 0px 13px -7px;
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
index 60f606c60e..6ebb414806 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
@@ -3,9 +3,11 @@ import React, { useState, useRef, useEffect } from 'react' // eslint-disable-lin
 import './remix-ui-home-tab.css'
 import { ModalDialog } from '@remix-ui/modal-dialog' // eslint-disable-line
 import { Toaster } from '@remix-ui/toaster' // eslint-disable-line
+import Mediumfeed from './components/mediumFeed' // eslint-disable-line
 import PluginButton from './components/pluginButton' // eslint-disable-line
 import QueryParams from '../../../../../apps/remix-ide/src/lib/query-params'
 import { ThemeContext, themes } from './themeContext'
+import { TwitterTimelineEmbed } from 'react-twitter-embed'
 import { stat } from 'fs'
 
 declare global {
@@ -56,8 +58,9 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
       })
     })
     window.addEventListener('click', (event) => {
-      const { id } = (event.target as HTMLButtonElement).dataset
-      if ( id !== 'remixIDEHomeTwitterbtn' && id !== 'remixIDEHomeMediumbtn') {
+      const target = event.target as Element
+      const id = target.id
+      if (id !== 'remixIDEHomeTwitterbtn' && id !== 'remixIDEHomeMediumbtn') {
         // todo check event.target
         setState(prevState => { return { ...prevState, showMediaPanel: 'none' } })
       }
@@ -142,14 +145,12 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
       (loadingMsg) => { setState(prevState => { return { ...prevState, tooltip: loadingMsg } }) },
       (error, content, cleanUrl, type, url) => {
         if (error) {
-          //modalDialogCustom.alert(state.modalInfo.title, error.message || error)
           toast(error.message || error)
         } else {
           try {
             fileProviders.workspace.addExternal(type + '/' + cleanUrl, content, url)
             plugin.call('menuicons', 'select', 'filePanel')
           } catch (e) {
-            //modalDialogCustom.alert(state.modalInfo.title, e.message)
             toast(e.message)
 
           }
@@ -161,8 +162,9 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
     })
   }
 
-  const maxHeight = Math.max(window.innerHeight - 150, 200) + 'px'
+  const maxHeight = Math.max(window.innerHeight - 150, 250) + 'px'
   const examples = state.modalInfo.examples.map((urlEl, key) => (<div key={key} className="p-1 user-select-auto"><a>{urlEl}</a></div>))
+  const elHeight = '4000px'
   return (
     <>
       <ModalDialog
@@ -286,7 +288,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
             <button
               className="btn-info p-2 m-1 border rounded-circle remixui_mediaBadge fab fa-twitter"
               id="remixIDEHomeTwitterbtn"
-              title="Medium blogs"
+              title="Twitter"
               onClick={(e) => {
                 setState(prevState => {
                   return { ...prevState, showMediaPanel: state.showMediaPanel === 'twitter' ? 'none' : 'twitter' }
@@ -297,7 +299,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
             <button
               className="btn-danger p-2 m-1 border rounded-circle remixui_mediaBadge fab fa-medium"
               id="remixIDEHomeMediumbtn"
-              title="Twitter"
+              title="Medium blogs"
               onClick={(e) => {
                 setState(prevState => {
                   return { ...prevState, showMediaPanel: state.showMediaPanel === 'medium' ? 'none' : 'medium' }
@@ -307,33 +309,24 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
             ></button>
           </div>
           <div className="mr-3 d-flex bg-light remixui_panels" id="remixIDEMediaPanels">
-            { (state.showMediaPanel === 'medium') && <div id="remixIDE_MediumBlock" className="p-2 mx-0 mb-0 remixui_remixHomeMedia">
-              <div id="medium-widget" className="p-3 remixui_media" style={ { maxHeight: maxHeight } }>
-                <div
-                  id="retainable-rss-embed"
-                  data-rss="https://medium.com/feed/remix-ide"
-                  data-maxcols="1"
-                  data-layout="grid"
-                  data-poststyle="external"
-                  data-readmore="More..."
-                  data-buttonclass="btn mb-3"
-                  data-offset="-100"
-                >
-                </div>
+            { (state.showMediaPanel === 'medium') && <div id="remixIDE_MediumBlock" className="p-2 mx-0 mb-0 remixui_remixHomeMedia" style={ { maxHeight: maxHeight } }>
+              <div id="medium-widget" className="p-3 remixui_media" style={ { maxHeight: elHeight } }>
+                <Mediumfeed userName="remix-ide" postN="6"/>
               </div>
             </div> }
-            { (state.showMediaPanel === 'twitter') && <div id="remixIDE_TwitterBlock" className="p-2 mx-0 mb-0 remixui_remixHomeMedia">
-              <div className="px-2 remixui_media" style={ { maxHeight: maxHeight } } >
-                <a className="twitter-timeline"
-                  data-width="350"
-                  data-theme={ state.themeQuality.name }
-                  data-chrome="nofooter noheader transparent"
-                  data-tweet-limit="8"
-                  href="https://twitter.com/EthereumRemix"
-                >
-                </a>
+            { (state.showMediaPanel === 'twitter') && <div id="remixIDE_TwitterBlock" className="p-2 mx-0 mb-0 remixui_remixHomeMedia" style={ { maxHeight: maxHeight } } >
+              <div className="px-2 remixui_media" style={ { minHeight: elHeight } } >
+                <TwitterTimelineEmbed
+                  sourceType="profile"
+                  screenName="EthereumRemix"
+                  options={{ tweetLimit: 18, width: 350 }}
+                  transparent={true}
+                  noHeader={true}
+                  noFooter={true}
+                  theme={ state.themeQuality.name }
+                />
               </div>
-            </div> }
+            </div>}
           </div>
         </div>
       </div>
diff --git a/package-lock.json b/package-lock.json
index 58d4cbed00..b645b66c46 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1517,14 +1517,6 @@
       "requires": {
         "core-js": "^2.6.5",
         "regenerator-runtime": "^0.13.4"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-          "dev": true
-        }
       }
     },
     "@babel/preset-env": {
@@ -12885,12 +12877,6 @@
         "regenerator-runtime": "^0.11.0"
       },
       "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-          "dev": true
-        },
         "regenerator-runtime": {
           "version": "0.11.1",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
@@ -19423,7 +19409,8 @@
       "dependencies": {
         "@types/bn.js": {
           "version": "4.11.6",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
           "dev": true,
           "requires": {
             "@types/node": "*"
@@ -19431,12 +19418,14 @@
         },
         "@types/node": {
           "version": "14.11.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==",
           "dev": true
         },
         "@types/pbkdf2": {
           "version": "3.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==",
           "dev": true,
           "requires": {
             "@types/node": "*"
@@ -19444,7 +19433,8 @@
         },
         "@types/secp256k1": {
           "version": "4.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-+ZjSA8ELlOp8SlKi0YLB2tz9d5iPNEmOBd+8Rz21wTMdaXQIa9b6TEnD6l5qKOCypE7FSyPyck12qZJxSDNoog==",
           "dev": true,
           "requires": {
             "@types/node": "*"
@@ -19452,12 +19442,14 @@
         },
         "ansi-regex": {
           "version": "4.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
         "ansi-styles": {
           "version": "3.2.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
             "color-convert": "^1.9.0"
@@ -19465,7 +19457,8 @@
         },
         "base-x": {
           "version": "3.0.8",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA==",
           "dev": true,
           "requires": {
             "safe-buffer": "^5.0.1"
@@ -19473,22 +19466,26 @@
         },
         "blakejs": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-ad+S75U6qIylGjLfarHFShVfx6U=",
           "dev": true
         },
         "bn.js": {
           "version": "4.11.9",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
           "dev": true
         },
         "brorand": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
           "dev": true
         },
         "browserify-aes": {
           "version": "1.2.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
           "dev": true,
           "requires": {
             "buffer-xor": "^1.0.3",
@@ -19501,7 +19498,8 @@
         },
         "bs58": {
           "version": "4.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=",
           "dev": true,
           "requires": {
             "base-x": "^3.0.2"
@@ -19509,7 +19507,8 @@
         },
         "bs58check": {
           "version": "2.1.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
           "dev": true,
           "requires": {
             "bs58": "^4.0.0",
@@ -19519,22 +19518,26 @@
         },
         "buffer-from": {
           "version": "1.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
           "dev": true
         },
         "buffer-xor": {
           "version": "1.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
           "dev": true
         },
         "camelcase": {
           "version": "5.3.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
           "dev": true
         },
         "cipher-base": {
           "version": "1.0.4",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
           "dev": true,
           "requires": {
             "inherits": "^2.0.1",
@@ -19543,7 +19546,8 @@
         },
         "cliui": {
           "version": "5.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
           "dev": true,
           "requires": {
             "string-width": "^3.1.0",
@@ -19553,7 +19557,8 @@
         },
         "color-convert": {
           "version": "1.9.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
           "dev": true,
           "requires": {
             "color-name": "1.1.3"
@@ -19561,12 +19566,14 @@
         },
         "color-name": {
           "version": "1.1.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
           "dev": true
         },
         "create-hash": {
           "version": "1.2.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
           "dev": true,
           "requires": {
             "cipher-base": "^1.0.1",
@@ -19578,7 +19585,8 @@
         },
         "create-hmac": {
           "version": "1.1.7",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
           "dev": true,
           "requires": {
             "cipher-base": "^1.0.3",
@@ -19591,7 +19599,8 @@
         },
         "cross-spawn": {
           "version": "6.0.5",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
             "nice-try": "^1.0.4",
@@ -19603,12 +19612,14 @@
         },
         "decamelize": {
           "version": "1.2.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
           "dev": true
         },
         "elliptic": {
           "version": "6.5.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
           "dev": true,
           "requires": {
             "bn.js": "^4.4.0",
@@ -19622,12 +19633,14 @@
         },
         "emoji-regex": {
           "version": "7.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
           "dev": true
         },
         "end-of-stream": {
           "version": "1.4.4",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
           "dev": true,
           "requires": {
             "once": "^1.4.0"
@@ -19635,7 +19648,8 @@
         },
         "ethereum-cryptography": {
           "version": "0.1.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==",
           "dev": true,
           "requires": {
             "@types/pbkdf2": "^3.0.0",
@@ -19657,7 +19671,8 @@
         },
         "ethereumjs-util": {
           "version": "6.2.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
           "dev": true,
           "requires": {
             "@types/bn.js": "^4.11.3",
@@ -19671,7 +19686,8 @@
         },
         "ethjs-util": {
           "version": "0.1.6",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==",
           "dev": true,
           "requires": {
             "is-hex-prefixed": "1.0.0",
@@ -19680,7 +19696,8 @@
         },
         "evp_bytestokey": {
           "version": "1.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
           "dev": true,
           "requires": {
             "md5.js": "^1.3.4",
@@ -19689,7 +19706,8 @@
         },
         "execa": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
           "dev": true,
           "requires": {
             "cross-spawn": "^6.0.0",
@@ -19703,7 +19721,8 @@
         },
         "find-up": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
             "locate-path": "^3.0.0"
@@ -19711,12 +19730,14 @@
         },
         "get-caller-file": {
           "version": "2.0.5",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
           "dev": true
         },
         "get-stream": {
           "version": "4.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
           "dev": true,
           "requires": {
             "pump": "^3.0.0"
@@ -19724,7 +19745,8 @@
         },
         "hash-base": {
           "version": "3.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
           "dev": true,
           "requires": {
             "inherits": "^2.0.4",
@@ -19734,7 +19756,8 @@
         },
         "hash.js": {
           "version": "1.1.7",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
           "dev": true,
           "requires": {
             "inherits": "^2.0.3",
@@ -19743,7 +19766,8 @@
         },
         "hmac-drbg": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
           "dev": true,
           "requires": {
             "hash.js": "^1.0.3",
@@ -19753,37 +19777,44 @@
         },
         "inherits": {
           "version": "2.0.4",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
           "dev": true
         },
         "invert-kv": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
           "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
         "is-hex-prefixed": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=",
           "dev": true
         },
         "is-stream": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
           "dev": true
         },
         "isexe": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
           "dev": true
         },
         "keccak": {
           "version": "3.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA==",
           "dev": true,
           "requires": {
             "node-addon-api": "^2.0.0",
@@ -19792,7 +19823,8 @@
         },
         "lcid": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
             "invert-kv": "^2.0.0"
@@ -19800,7 +19832,8 @@
         },
         "locate-path": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
             "p-locate": "^3.0.0",
@@ -19809,7 +19842,8 @@
         },
         "map-age-cleaner": {
           "version": "0.1.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
           "dev": true,
           "requires": {
             "p-defer": "^1.0.0"
@@ -19817,7 +19851,8 @@
         },
         "md5.js": {
           "version": "1.3.5",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
           "dev": true,
           "requires": {
             "hash-base": "^3.0.0",
@@ -19827,7 +19862,8 @@
         },
         "mem": {
           "version": "4.3.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
           "dev": true,
           "requires": {
             "map-age-cleaner": "^0.1.1",
@@ -19837,37 +19873,44 @@
         },
         "mimic-fn": {
           "version": "2.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
           "dev": true
         },
         "minimalistic-assert": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
           "dev": true
         },
         "minimalistic-crypto-utils": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
           "dev": true
         },
         "nice-try": {
           "version": "1.0.5",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
           "dev": true
         },
         "node-addon-api": {
           "version": "2.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==",
           "dev": true
         },
         "node-gyp-build": {
           "version": "4.2.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==",
           "dev": true
         },
         "npm-run-path": {
           "version": "2.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
           "dev": true,
           "requires": {
             "path-key": "^2.0.0"
@@ -19875,7 +19918,8 @@
         },
         "once": {
           "version": "1.4.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
           "requires": {
             "wrappy": "1"
@@ -19883,7 +19927,8 @@
         },
         "os-locale": {
           "version": "3.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
           "dev": true,
           "requires": {
             "execa": "^1.0.0",
@@ -19893,22 +19938,26 @@
         },
         "p-defer": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
           "dev": true
         },
         "p-finally": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
           "dev": true
         },
         "p-is-promise": {
           "version": "2.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
           "dev": true
         },
         "p-limit": {
           "version": "2.3.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -19916,7 +19965,8 @@
         },
         "p-locate": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
             "p-limit": "^2.0.0"
@@ -19924,22 +19974,26 @@
         },
         "p-try": {
           "version": "2.2.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
           "dev": true
         },
         "path-exists": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
           "dev": true
         },
         "path-key": {
           "version": "2.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
           "dev": true
         },
         "pbkdf2": {
           "version": "3.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
           "dev": true,
           "requires": {
             "create-hash": "^1.1.2",
@@ -19951,7 +20005,8 @@
         },
         "pump": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
             "end-of-stream": "^1.1.0",
@@ -19960,7 +20015,8 @@
         },
         "randombytes": {
           "version": "2.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
           "dev": true,
           "requires": {
             "safe-buffer": "^5.1.0"
@@ -19968,7 +20024,8 @@
         },
         "readable-stream": {
           "version": "3.6.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
           "dev": true,
           "requires": {
             "inherits": "^2.0.3",
@@ -19978,17 +20035,20 @@
         },
         "require-directory": {
           "version": "2.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
           "dev": true
         },
         "require-main-filename": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
           "dev": true
         },
         "ripemd160": {
           "version": "2.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
           "dev": true,
           "requires": {
             "hash-base": "^3.0.0",
@@ -19997,7 +20057,8 @@
         },
         "rlp": {
           "version": "2.2.6",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-HAfAmL6SDYNWPUOJNrM500x4Thn4PZsEy5pijPh40U9WfNk0z15hUYzO9xVIMAdIHdFtD8CBDHd75Td1g36Mjg==",
           "dev": true,
           "requires": {
             "bn.js": "^4.11.1"
@@ -20005,17 +20066,20 @@
         },
         "safe-buffer": {
           "version": "5.2.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
           "dev": true
         },
         "scrypt-js": {
           "version": "3.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==",
           "dev": true
         },
         "secp256k1": {
           "version": "4.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg==",
           "dev": true,
           "requires": {
             "elliptic": "^6.5.2",
@@ -20025,22 +20089,26 @@
         },
         "semver": {
           "version": "5.7.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         },
         "set-blocking": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
           "dev": true
         },
         "setimmediate": {
           "version": "1.0.5",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
           "dev": true
         },
         "sha.js": {
           "version": "2.4.11",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
           "dev": true,
           "requires": {
             "inherits": "^2.0.1",
@@ -20049,7 +20117,8 @@
         },
         "shebang-command": {
           "version": "1.2.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
           "dev": true,
           "requires": {
             "shebang-regex": "^1.0.0"
@@ -20057,22 +20126,26 @@
         },
         "shebang-regex": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
           "dev": true
         },
         "signal-exit": {
           "version": "3.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
           "dev": true
         },
         "source-map": {
           "version": "0.6.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "source-map-support": {
           "version": "0.5.12",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
           "dev": true,
           "requires": {
             "buffer-from": "^1.0.0",
@@ -20081,7 +20154,8 @@
         },
         "string-width": {
           "version": "3.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "dev": true,
           "requires": {
             "emoji-regex": "^7.0.1",
@@ -20091,7 +20165,8 @@
         },
         "string_decoder": {
           "version": "1.3.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.2.0"
@@ -20099,7 +20174,8 @@
         },
         "strip-ansi": {
           "version": "5.2.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
             "ansi-regex": "^4.1.0"
@@ -20107,12 +20183,14 @@
         },
         "strip-eof": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
           "dev": true
         },
         "strip-hex-prefix": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=",
           "dev": true,
           "requires": {
             "is-hex-prefixed": "1.0.0"
@@ -20120,12 +20198,14 @@
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
           "dev": true
         },
         "which": {
           "version": "1.3.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
           "dev": true,
           "requires": {
             "isexe": "^2.0.0"
@@ -20133,12 +20213,14 @@
         },
         "which-module": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
           "dev": true
         },
         "wrap-ansi": {
           "version": "5.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
           "dev": true,
           "requires": {
             "ansi-styles": "^3.2.0",
@@ -20148,17 +20230,20 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
           "dev": true
         },
         "y18n": {
           "version": "4.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
           "dev": true
         },
         "yargs": {
           "version": "13.2.4",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
           "dev": true,
           "requires": {
             "cliui": "^5.0.0",
@@ -20176,7 +20261,8 @@
         },
         "yargs-parser": {
           "version": "13.1.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -32174,7 +32260,8 @@
       "dependencies": {
         "JSONStream": {
           "version": "1.3.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
           "requires": {
             "jsonparse": "^1.2.0",
             "through": ">=2.2.7 <3"
@@ -32182,57 +32269,70 @@
           "dependencies": {
             "jsonparse": {
               "version": "1.3.0",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-hfwkWx2SWazGlBlguQWt9k594Og="
             },
             "through": {
               "version": "2.3.8",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
             }
           }
         },
         "abbrev": {
           "version": "1.1.0",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8="
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         },
         "ansicolors": {
           "version": "0.3.2",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk="
         },
         "ansistyles": {
           "version": "0.1.3",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-XeYEFb2gcbs3EnhUyGT0GyMlRTk="
         },
         "aproba": {
           "version": "1.1.1",
-          "bundled": true
+          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz",
+          "integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s="
         },
         "archy": {
           "version": "1.0.0",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA="
         },
         "asap": {
           "version": "2.0.5",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-UidltQw1EEkOUtfc/ghe+bqWlY8="
         },
         "bluebird": {
           "version": "3.5.0",
-          "bundled": true
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+          "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
         },
         "call-limit": {
           "version": "1.1.0",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-b9YbA/PaQqLNDsK2DwK9DnGZH+o="
         },
         "chownr": {
           "version": "1.0.1",
-          "bundled": true
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
+          "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
         },
         "cmd-shim": {
           "version": "2.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-b8vamUg6j9FdfTChlspp1oii79s=",
           "requires": {
             "graceful-fs": "^4.1.2",
             "mkdirp": "~0.5.0"
@@ -32240,7 +32340,8 @@
         },
         "columnify": {
           "version": "1.5.4",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=",
           "requires": {
             "strip-ansi": "^3.0.0",
             "wcwidth": "^1.0.0"
@@ -32248,21 +32349,24 @@
           "dependencies": {
             "wcwidth": {
               "version": "1.0.0",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-AtBZ/3qPx0Hg9rXaHmmytA2uym8=",
               "requires": {
                 "defaults": "^1.0.0"
               },
               "dependencies": {
                 "defaults": {
                   "version": "1.0.3",
-                  "bundled": true,
+                  "resolved": false,
+                  "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
                   "requires": {
                     "clone": "^1.0.2"
                   },
                   "dependencies": {
                     "clone": {
                       "version": "1.0.2",
-                      "bundled": true
+                      "resolved": false,
+                      "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk="
                     }
                   }
                 }
@@ -32272,7 +32376,8 @@
         },
         "config-chain": {
           "version": "1.1.11",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
           "requires": {
             "ini": "^1.3.4",
             "proto-list": "~1.2.1"
@@ -32280,17 +32385,20 @@
           "dependencies": {
             "proto-list": {
               "version": "1.2.4",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk="
             }
           }
         },
         "debuglog": {
           "version": "1.0.1",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI="
         },
         "dezalgo": {
           "version": "1.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
           "requires": {
             "asap": "^2.0.0",
             "wrappy": "1"
@@ -32298,11 +32406,13 @@
         },
         "editor": {
           "version": "1.0.0",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-YMf4e9YrzGqJT6jM1q+3gjok90I="
         },
         "fs-vacuum": {
           "version": "1.2.10",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-t2Kb7AekAxolSP35n17PHMizHjY=",
           "requires": {
             "graceful-fs": "^4.1.2",
             "path-is-inside": "^1.0.1",
@@ -32311,7 +32421,8 @@
         },
         "fs-write-stream-atomic": {
           "version": "1.0.10",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
           "requires": {
             "graceful-fs": "^4.1.2",
             "iferr": "^0.1.5",
@@ -32321,7 +32432,8 @@
         },
         "fstream": {
           "version": "1.0.11",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
           "requires": {
             "graceful-fs": "^4.1.2",
             "inherits": "~2.0.0",
@@ -32331,7 +32443,8 @@
         },
         "fstream-npm": {
           "version": "1.2.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-0sPIkQE0aYLWTlcJHDhIe9qRb84=",
           "requires": {
             "fstream-ignore": "^1.0.0",
             "inherits": "2"
@@ -32339,7 +32452,8 @@
           "dependencies": {
             "fstream-ignore": {
               "version": "1.0.5",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
               "requires": {
                 "fstream": "^1.0.0",
                 "inherits": "2",
@@ -32348,14 +32462,16 @@
               "dependencies": {
                 "minimatch": {
                   "version": "3.0.3",
-                  "bundled": true,
+                  "resolved": false,
+                  "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=",
                   "requires": {
                     "brace-expansion": "^1.0.0"
                   },
                   "dependencies": {
                     "brace-expansion": {
                       "version": "1.1.6",
-                      "bundled": true,
+                      "resolved": false,
+                      "integrity": "sha1-cZfX6qm4fmSDkOph/GbIRCdCDfk=",
                       "requires": {
                         "balanced-match": "^0.4.1",
                         "concat-map": "0.0.1"
@@ -32363,11 +32479,13 @@
                       "dependencies": {
                         "balanced-match": {
                           "version": "0.4.2",
-                          "bundled": true
+                          "resolved": false,
+                          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
                         },
                         "concat-map": {
                           "version": "0.0.1",
-                          "bundled": true
+                          "resolved": false,
+                          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
                         }
                       }
                     }
@@ -32379,7 +32497,8 @@
         },
         "glob": {
           "version": "7.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
           "requires": {
             "fs.realpath": "^1.0.0",
             "inflight": "^1.0.4",
@@ -32391,18 +32510,21 @@
           "dependencies": {
             "fs.realpath": {
               "version": "1.0.0",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
             },
             "minimatch": {
               "version": "3.0.3",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=",
               "requires": {
                 "brace-expansion": "^1.0.0"
               },
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.6",
-                  "bundled": true,
+                  "resolved": false,
+                  "integrity": "sha1-cZfX6qm4fmSDkOph/GbIRCdCDfk=",
                   "requires": {
                     "balanced-match": "^0.4.1",
                     "concat-map": "0.0.1"
@@ -32410,11 +32532,13 @@
                   "dependencies": {
                     "balanced-match": {
                       "version": "0.4.2",
-                      "bundled": true
+                      "resolved": false,
+                      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
                     },
                     "concat-map": {
                       "version": "0.0.1",
-                      "bundled": true
+                      "resolved": false,
+                      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
                     }
                   }
                 }
@@ -32422,33 +32546,40 @@
             },
             "path-is-absolute": {
               "version": "1.0.1",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
             }
           }
         },
         "graceful-fs": {
           "version": "4.1.11",
-          "bundled": true
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
         },
         "has-unicode": {
           "version": "2.0.1",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
         },
         "hosted-git-info": {
           "version": "2.4.2",
-          "bundled": true
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz",
+          "integrity": "sha1-AHa59GonBQbduq6lZJaJdGBhKmc="
         },
         "iferr": {
           "version": "0.1.5",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
         },
         "imurmurhash": {
           "version": "0.1.4",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
         },
         "inflight": {
           "version": "1.0.6",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "requires": {
             "once": "^1.3.0",
             "wrappy": "1"
@@ -32456,15 +32587,18 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
         },
         "ini": {
           "version": "1.3.4",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
         },
         "init-package-json": {
           "version": "1.10.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-zYc6FneWvvuZYSsodioLY5P9j2o=",
           "requires": {
             "glob": "^7.1.1",
             "npm-package-arg": "^4.0.0 || ^5.0.0",
@@ -32478,7 +32612,8 @@
           "dependencies": {
             "promzard": {
               "version": "0.3.0",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=",
               "requires": {
                 "read": "1"
               }
@@ -32487,19 +32622,23 @@
         },
         "lazy-property": {
           "version": "1.0.0",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-hN3Es3Bnm6i9TNz6TAa0PVcREUc="
         },
         "lockfile": {
           "version": "1.0.3",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-Jjj8OaAzHpysGgS3F5mTHJxQ33k="
         },
         "lodash._baseindexof": {
           "version": "3.1.0",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw="
         },
         "lodash._baseuniq": {
           "version": "4.6.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-DrtE5FaBSveQXGIS+iybLVG4Qeg=",
           "requires": {
             "lodash._createset": "~4.0.0",
             "lodash._root": "~3.0.0"
@@ -32507,56 +32646,68 @@
           "dependencies": {
             "lodash._createset": {
               "version": "4.0.3",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY="
             },
             "lodash._root": {
               "version": "3.0.1",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI="
             }
           }
         },
         "lodash._bindcallback": {
           "version": "3.0.1",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4="
         },
         "lodash._cacheindexof": {
           "version": "3.0.2",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI="
         },
         "lodash._createcache": {
           "version": "3.1.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=",
           "requires": {
             "lodash._getnative": "^3.0.0"
           }
         },
         "lodash._getnative": {
           "version": "3.9.1",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
         },
         "lodash.clonedeep": {
           "version": "4.5.0",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
         },
         "lodash.restparam": {
           "version": "3.6.1",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
         },
         "lodash.union": {
           "version": "4.6.0",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg="
         },
         "lodash.uniq": {
           "version": "4.5.0",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
         },
         "lodash.without": {
           "version": "4.4.0",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-PNRXSgC2e643OpS3SHcmQFB7eqw="
         },
         "mississippi": {
           "version": "1.3.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz",
+          "integrity": "sha1-0gFYPrEjJ+PFwWQqQEqcrPlONPU=",
           "requires": {
             "concat-stream": "^1.5.0",
             "duplexify": "^3.4.2",
@@ -32572,7 +32723,8 @@
           "dependencies": {
             "concat-stream": {
               "version": "1.6.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
+              "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
               "requires": {
                 "inherits": "^2.0.3",
                 "readable-stream": "^2.2.2",
@@ -32581,13 +32733,15 @@
               "dependencies": {
                 "typedarray": {
                   "version": "0.0.6",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+                  "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
                 }
               }
             },
             "duplexify": {
               "version": "3.5.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz",
+              "integrity": "sha1-GqdzAC4VeEV+nZ1KULDMquvL1gQ=",
               "requires": {
                 "end-of-stream": "1.0.0",
                 "inherits": "^2.0.1",
@@ -32597,14 +32751,16 @@
               "dependencies": {
                 "end-of-stream": {
                   "version": "1.0.0",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
+                  "integrity": "sha1-1FlucCc0qT5A6a+GQxnqvZn/Lw4=",
                   "requires": {
                     "once": "~1.3.0"
                   },
                   "dependencies": {
                     "once": {
                       "version": "1.3.3",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                      "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
                       "requires": {
                         "wrappy": "1"
                       }
@@ -32613,20 +32769,23 @@
                 },
                 "stream-shift": {
                   "version": "1.0.0",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+                  "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
                 }
               }
             },
             "end-of-stream": {
               "version": "1.1.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz",
+              "integrity": "sha1-6TUyWLqpEIll78QcsO+K3i88+wc=",
               "requires": {
                 "once": "~1.3.0"
               },
               "dependencies": {
                 "once": {
                   "version": "1.3.3",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                  "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
                   "requires": {
                     "wrappy": "1"
                   }
@@ -32635,7 +32794,8 @@
             },
             "flush-write-stream": {
               "version": "1.0.2",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz",
+              "integrity": "sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc=",
               "requires": {
                 "inherits": "^2.0.1",
                 "readable-stream": "^2.0.4"
@@ -32643,7 +32803,8 @@
             },
             "from2": {
               "version": "2.3.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+              "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
               "requires": {
                 "inherits": "^2.0.1",
                 "readable-stream": "^2.0.0"
@@ -32651,7 +32812,8 @@
             },
             "parallel-transform": {
               "version": "1.1.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
+              "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
               "requires": {
                 "cyclist": "~0.2.2",
                 "inherits": "^2.0.3",
@@ -32660,13 +32822,15 @@
               "dependencies": {
                 "cyclist": {
                   "version": "0.2.2",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
+                  "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA="
                 }
               }
             },
             "pump": {
               "version": "1.0.2",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
+              "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
               "requires": {
                 "end-of-stream": "^1.1.0",
                 "once": "^1.3.1"
@@ -32674,7 +32838,8 @@
             },
             "pumpify": {
               "version": "1.3.5",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
+              "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
               "requires": {
                 "duplexify": "^3.1.2",
                 "inherits": "^2.0.1",
@@ -32683,7 +32848,8 @@
             },
             "stream-each": {
               "version": "1.2.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz",
+              "integrity": "sha1-HpXUdXP1gNgU3A/4zQ9m8c5TyZE=",
               "requires": {
                 "end-of-stream": "^1.1.0",
                 "stream-shift": "^1.0.0"
@@ -32691,13 +32857,15 @@
               "dependencies": {
                 "stream-shift": {
                   "version": "1.0.0",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+                  "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
                 }
               }
             },
             "through2": {
               "version": "2.0.3",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+              "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
               "requires": {
                 "readable-stream": "^2.1.5",
                 "xtend": "~4.0.1"
@@ -32705,7 +32873,8 @@
               "dependencies": {
                 "xtend": {
                   "version": "4.0.1",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+                  "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
                 }
               }
             }
@@ -32713,20 +32882,23 @@
         },
         "mkdirp": {
           "version": "0.5.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "requires": {
             "minimist": "0.0.8"
           },
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
             }
           }
         },
         "move-concurrently": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
           "requires": {
             "aproba": "^1.1.1",
             "copy-concurrently": "^1.0.0",
@@ -32738,7 +32910,8 @@
           "dependencies": {
             "copy-concurrently": {
               "version": "1.0.3",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-Rft4ZiSaHKiJqlcI5svSc+dbslA=",
               "requires": {
                 "aproba": "^1.1.1",
                 "fs-write-stream-atomic": "^1.0.8",
@@ -32750,7 +32923,8 @@
             },
             "run-queue": {
               "version": "1.0.3",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
               "requires": {
                 "aproba": "^1.1.1"
               }
@@ -32759,7 +32933,8 @@
         },
         "node-gyp": {
           "version": "3.6.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.0.tgz",
+          "integrity": "sha1-dHT2OjoFARYd2gtjQfAi8UxCP6Y=",
           "requires": {
             "fstream": "^1.0.0",
             "glob": "^7.0.3",
@@ -32778,14 +32953,16 @@
           "dependencies": {
             "minimatch": {
               "version": "3.0.3",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
+              "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=",
               "requires": {
                 "brace-expansion": "^1.0.0"
               },
               "dependencies": {
                 "brace-expansion": {
                   "version": "1.1.6",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
+                  "integrity": "sha1-cZfX6qm4fmSDkOph/GbIRCdCDfk=",
                   "requires": {
                     "balanced-match": "^0.4.1",
                     "concat-map": "0.0.1"
@@ -32793,11 +32970,13 @@
                   "dependencies": {
                     "balanced-match": {
                       "version": "0.4.2",
-                      "bundled": true
+                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+                      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
                     },
                     "concat-map": {
                       "version": "0.0.1",
-                      "bundled": true
+                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
                     }
                   }
                 }
@@ -32805,7 +32984,8 @@
             },
             "nopt": {
               "version": "3.0.6",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+              "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
               "requires": {
                 "abbrev": "1"
               }
@@ -32814,7 +32994,8 @@
         },
         "nopt": {
           "version": "4.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
           "requires": {
             "abbrev": "1",
             "osenv": "^0.1.4"
@@ -32822,7 +33003,8 @@
           "dependencies": {
             "osenv": {
               "version": "0.1.4",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+              "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
               "requires": {
                 "os-homedir": "^1.0.0",
                 "os-tmpdir": "^1.0.0"
@@ -32830,11 +33012,13 @@
               "dependencies": {
                 "os-homedir": {
                   "version": "1.0.2",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+                  "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
                 },
                 "os-tmpdir": {
                   "version": "1.0.2",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+                  "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
                 }
               }
             }
@@ -32842,11 +33026,13 @@
         },
         "normalize-git-url": {
           "version": "3.0.2",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-jl8Uvgva7bc+ByADEKpBbCc1D8Q="
         },
         "normalize-package-data": {
           "version": "2.3.8",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz",
+          "integrity": "sha1-2Bntoqne29H/pWPqQHHZNngilbs=",
           "requires": {
             "hosted-git-info": "^2.1.4",
             "is-builtin-module": "^1.0.0",
@@ -32856,14 +33042,16 @@
           "dependencies": {
             "is-builtin-module": {
               "version": "1.0.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+              "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
               "requires": {
                 "builtin-modules": "^1.0.0"
               },
               "dependencies": {
                 "builtin-modules": {
                   "version": "1.1.1",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+                  "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
                 }
               }
             }
@@ -32871,18 +33059,20 @@
         },
         "npm-cache-filename": {
           "version": "1.0.2",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-3tMGxbC/yHCp6fr4I7xfKD4FrhE="
         },
         "npm-install-checks": {
           "version": "3.0.0",
-          "bundled": true,
+          "integrity": "sha1-1K7N/VGlPjcjt7L5Oy7ijjB7wNc=",
           "requires": {
             "semver": "^2.3.0 || 3.x || 4 || 5"
           }
         },
         "npm-package-arg": {
           "version": "4.2.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz",
+          "integrity": "sha1-WTMD/eqF98Qid18X+et2cPaA4+w=",
           "requires": {
             "hosted-git-info": "^2.1.5",
             "semver": "^5.1.0"
@@ -32890,7 +33080,8 @@
         },
         "npm-registry-client": {
           "version": "8.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-gxR2RVQjygomXG/9thAPzAQrNs8=",
           "requires": {
             "concat-stream": "^1.5.2",
             "graceful-fs": "^4.1.6",
@@ -32906,7 +33097,8 @@
           "dependencies": {
             "concat-stream": {
               "version": "1.6.0",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
               "requires": {
                 "inherits": "^2.0.3",
                 "readable-stream": "^2.2.2",
@@ -32915,7 +33107,8 @@
               "dependencies": {
                 "typedarray": {
                   "version": "0.0.6",
-                  "bundled": true
+                  "resolved": false,
+                  "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
                 }
               }
             }
@@ -32923,11 +33116,13 @@
         },
         "npm-user-validate": {
           "version": "0.1.5",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-UkZdUMLSApSlcSW5lrrtv1bFAEs="
         },
         "npmlog": {
           "version": "4.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz",
+          "integrity": "sha1-0DlQ4OeM4VJ7om0qdZLpNIrD518=",
           "requires": {
             "are-we-there-yet": "~1.1.2",
             "console-control-strings": "~1.1.0",
@@ -32937,7 +33132,8 @@
           "dependencies": {
             "are-we-there-yet": {
               "version": "1.1.4",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+              "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
               "requires": {
                 "delegates": "^1.0.0",
                 "readable-stream": "^2.0.6"
@@ -32945,17 +33141,20 @@
               "dependencies": {
                 "delegates": {
                   "version": "1.0.0",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+                  "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
                 }
               }
             },
             "console-control-strings": {
               "version": "1.1.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+              "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
             },
             "gauge": {
               "version": "2.7.4",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+              "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
               "requires": {
                 "aproba": "^1.0.3",
                 "console-control-strings": "^1.0.0",
@@ -32969,15 +33168,18 @@
               "dependencies": {
                 "object-assign": {
                   "version": "4.1.1",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+                  "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
                 },
                 "signal-exit": {
                   "version": "3.0.2",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+                  "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
                 },
                 "string-width": {
                   "version": "1.0.2",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+                  "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
                   "requires": {
                     "code-point-at": "^1.0.0",
                     "is-fullwidth-code-point": "^1.0.0",
@@ -32986,18 +33188,21 @@
                   "dependencies": {
                     "code-point-at": {
                       "version": "1.1.0",
-                      "bundled": true
+                      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+                      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
                     },
                     "is-fullwidth-code-point": {
                       "version": "1.0.0",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+                      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
                       "requires": {
                         "number-is-nan": "^1.0.0"
                       },
                       "dependencies": {
                         "number-is-nan": {
                           "version": "1.0.1",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+                          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
                         }
                       }
                     }
@@ -33005,7 +33210,8 @@
                 },
                 "wide-align": {
                   "version": "1.1.0",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz",
+                  "integrity": "sha1-QO3egCpx/qHwcNo+YtzaLnrdlq0=",
                   "requires": {
                     "string-width": "^1.0.1"
                   }
@@ -33014,24 +33220,28 @@
             },
             "set-blocking": {
               "version": "2.0.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+              "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
             }
           }
         },
         "once": {
           "version": "1.4.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "requires": {
             "wrappy": "1"
           }
         },
         "opener": {
           "version": "1.4.3",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-XG2ixdflgx6P+jlklQ+NZnSskLg="
         },
         "osenv": {
           "version": "0.1.4",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
           "requires": {
             "os-homedir": "^1.0.0",
             "os-tmpdir": "^1.0.0"
@@ -33039,41 +33249,48 @@
           "dependencies": {
             "os-homedir": {
               "version": "1.0.2",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
             },
             "os-tmpdir": {
               "version": "1.0.2",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
             }
           }
         },
         "path-is-inside": {
           "version": "1.0.2",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
         },
         "read": {
           "version": "1.0.7",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
           "requires": {
             "mute-stream": "~0.0.4"
           },
           "dependencies": {
             "mute-stream": {
               "version": "0.0.5",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA="
             }
           }
         },
         "read-cmd-shim": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-LV0Vd4ajfAVdIgd8MsU/gynpHHs=",
           "requires": {
             "graceful-fs": "^4.1.2"
           }
         },
         "read-installed": {
           "version": "4.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=",
           "requires": {
             "debuglog": "^1.0.1",
             "graceful-fs": "^4.1.2",
@@ -33086,13 +33303,15 @@
           "dependencies": {
             "util-extend": {
               "version": "1.0.3",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-p8IW0mdUUWljeztu3GypEZ4v+T8="
             }
           }
         },
         "read-package-json": {
           "version": "2.0.5",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.5.tgz",
+          "integrity": "sha1-+Tpk5kFSnfaKCMZN5GOJ6KP4iEU=",
           "requires": {
             "glob": "^7.1.1",
             "graceful-fs": "^4.1.2",
@@ -33102,14 +33321,16 @@
           "dependencies": {
             "json-parse-helpfulerror": {
               "version": "1.0.3",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+              "integrity": "sha1-E/FM4C7tTpgSl7ZOueO5MuLdE9w=",
               "requires": {
                 "jju": "^1.1.0"
               },
               "dependencies": {
                 "jju": {
                   "version": "1.3.0",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz",
+                  "integrity": "sha1-2t2e8BkkvHKLA/L3l5vb1i96Kqo="
                 }
               }
             }
@@ -33117,7 +33338,8 @@
         },
         "read-package-tree": {
           "version": "5.1.5",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.5.tgz",
+          "integrity": "sha1-rOfmOBx2hPlwqqmPx8XStmat2rY=",
           "requires": {
             "debuglog": "^1.0.1",
             "dezalgo": "^1.0.0",
@@ -33128,7 +33350,8 @@
         },
         "readable-stream": {
           "version": "2.2.9",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
+          "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
           "requires": {
             "buffer-shims": "~1.0.0",
             "core-util-is": "~1.0.0",
@@ -33141,36 +33364,43 @@
           "dependencies": {
             "buffer-shims": {
               "version": "1.0.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+              "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
             },
             "core-util-is": {
               "version": "1.0.2",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+              "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
             },
             "isarray": {
               "version": "1.0.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
             },
             "process-nextick-args": {
               "version": "1.0.7",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+              "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
             },
             "string_decoder": {
               "version": "1.0.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz",
+              "integrity": "sha1-8G9BFXtmTYYGn4S9vcmw2KsoFmc=",
               "requires": {
                 "buffer-shims": "~1.0.0"
               }
             },
             "util-deprecate": {
               "version": "1.0.2",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+              "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
             }
           }
         },
         "readdir-scoped-modules": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-n6+jfShr5dksuuve4DDcm19AZ0c=",
           "requires": {
             "debuglog": "^1.0.1",
             "dezalgo": "^1.0.0",
@@ -33180,7 +33410,8 @@
         },
         "realize-package-specifier": {
           "version": "3.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-0N74gpUrjeP2frpekRmWYScfQfQ=",
           "requires": {
             "dezalgo": "^1.0.1",
             "npm-package-arg": "^4.1.1"
@@ -33188,7 +33419,8 @@
         },
         "request": {
           "version": "2.81.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+          "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
           "requires": {
             "aws-sign2": "~0.6.0",
             "aws4": "^1.2.1",
@@ -33216,40 +33448,48 @@
           "dependencies": {
             "aws-sign2": {
               "version": "0.6.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+              "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
             },
             "aws4": {
               "version": "1.6.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+              "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
             },
             "caseless": {
               "version": "0.12.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+              "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
             },
             "combined-stream": {
               "version": "1.0.5",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+              "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
               "requires": {
                 "delayed-stream": "~1.0.0"
               },
               "dependencies": {
                 "delayed-stream": {
                   "version": "1.0.0",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+                  "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
                 }
               }
             },
             "extend": {
               "version": "3.0.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
+              "integrity": "sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ="
             },
             "forever-agent": {
               "version": "0.6.1",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+              "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
             },
             "form-data": {
               "version": "2.1.2",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz",
+              "integrity": "sha1-icNTQAi5fq2ky7FX1Y9vXfAl6uQ=",
               "requires": {
                 "asynckit": "^0.4.0",
                 "combined-stream": "^1.0.5",
@@ -33258,13 +33498,15 @@
               "dependencies": {
                 "asynckit": {
                   "version": "0.4.0",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+                  "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
                 }
               }
             },
             "har-validator": {
               "version": "4.2.1",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+              "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
               "requires": {
                 "ajv": "^4.9.1",
                 "har-schema": "^1.0.5"
@@ -33272,7 +33514,8 @@
               "dependencies": {
                 "ajv": {
                   "version": "4.11.4",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.4.tgz",
+                  "integrity": "sha1-6/OlXUsTLqYP9YR66F0u8GmWC0U=",
                   "requires": {
                     "co": "^4.6.0",
                     "json-stable-stringify": "^1.0.1"
@@ -33280,18 +33523,21 @@
                   "dependencies": {
                     "co": {
                       "version": "4.6.0",
-                      "bundled": true
+                      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+                      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
                     },
                     "json-stable-stringify": {
                       "version": "1.0.1",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+                      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
                       "requires": {
                         "jsonify": "~0.0.0"
                       },
                       "dependencies": {
                         "jsonify": {
                           "version": "0.0.0",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+                          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
                         }
                       }
                     }
@@ -33299,13 +33545,15 @@
                 },
                 "har-schema": {
                   "version": "1.0.5",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+                  "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
                 }
               }
             },
             "hawk": {
               "version": "3.1.3",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+              "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
               "requires": {
                 "boom": "2.x.x",
                 "cryptiles": "2.x.x",
@@ -33315,25 +33563,29 @@
               "dependencies": {
                 "boom": {
                   "version": "2.10.1",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+                  "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
                   "requires": {
                     "hoek": "2.x.x"
                   }
                 },
                 "cryptiles": {
                   "version": "2.0.5",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+                  "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
                   "requires": {
                     "boom": "2.x.x"
                   }
                 },
                 "hoek": {
                   "version": "2.16.3",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+                  "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
                 },
                 "sntp": {
                   "version": "1.0.9",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+                  "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
                   "requires": {
                     "hoek": "2.x.x"
                   }
@@ -33342,7 +33594,8 @@
             },
             "http-signature": {
               "version": "1.1.1",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+              "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
               "requires": {
                 "assert-plus": "^0.2.0",
                 "jsprim": "^1.2.2",
@@ -33351,11 +33604,13 @@
               "dependencies": {
                 "assert-plus": {
                   "version": "0.2.0",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+                  "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
                 },
                 "jsprim": {
                   "version": "1.3.1",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz",
+                  "integrity": "sha1-KnJW9wQSop7jZwqspiWZTE3P8lI=",
                   "requires": {
                     "extsprintf": "1.0.2",
                     "json-schema": "0.2.3",
@@ -33364,15 +33619,18 @@
                   "dependencies": {
                     "extsprintf": {
                       "version": "1.0.2",
-                      "bundled": true
+                      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
+                      "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA="
                     },
                     "json-schema": {
                       "version": "0.2.3",
-                      "bundled": true
+                      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+                      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
                     },
                     "verror": {
                       "version": "1.3.6",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
+                      "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
                       "requires": {
                         "extsprintf": "1.0.2"
                       }
@@ -33381,7 +33639,8 @@
                 },
                 "sshpk": {
                   "version": "1.11.0",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz",
+                  "integrity": "sha1-LY1eu0pvqyj/ujf6YqkPSj6lnXc=",
                   "requires": {
                     "asn1": "~0.2.3",
                     "assert-plus": "^1.0.0",
@@ -33396,15 +33655,18 @@
                   "dependencies": {
                     "asn1": {
                       "version": "0.2.3",
-                      "bundled": true
+                      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+                      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
                     },
                     "assert-plus": {
                       "version": "1.0.0",
-                      "bundled": true
+                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+                      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
                     },
                     "bcrypt-pbkdf": {
                       "version": "1.0.1",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+                      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
                       "optional": true,
                       "requires": {
                         "tweetnacl": "^0.14.3"
@@ -33412,14 +33674,16 @@
                     },
                     "dashdash": {
                       "version": "1.14.1",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+                      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
                       "requires": {
                         "assert-plus": "^1.0.0"
                       }
                     },
                     "ecc-jsbn": {
                       "version": "0.1.1",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+                      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
                       "optional": true,
                       "requires": {
                         "jsbn": "~0.1.0"
@@ -33427,14 +33691,16 @@
                     },
                     "getpass": {
                       "version": "0.1.6",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
+                      "integrity": "sha1-KD/9n8ElaECHUxHBtg6MQBhxEOY=",
                       "requires": {
                         "assert-plus": "^1.0.0"
                       }
                     },
                     "jodid25519": {
                       "version": "1.0.2",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
+                      "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=",
                       "optional": true,
                       "requires": {
                         "jsbn": "~0.1.0"
@@ -33442,12 +33708,14 @@
                     },
                     "jsbn": {
                       "version": "0.1.1",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+                      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
                       "optional": true
                     },
                     "tweetnacl": {
                       "version": "0.14.5",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+                      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
                       "optional": true
                     }
                   }
@@ -33456,65 +33724,78 @@
             },
             "is-typedarray": {
               "version": "1.0.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+              "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
             },
             "isstream": {
               "version": "0.1.2",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+              "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
             },
             "json-stringify-safe": {
               "version": "5.0.1",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+              "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
             },
             "mime-types": {
               "version": "2.1.14",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz",
+              "integrity": "sha1-9+99l1g/yvO30oK2+LVnnaselO4=",
               "requires": {
                 "mime-db": "~1.26.0"
               },
               "dependencies": {
                 "mime-db": {
                   "version": "1.26.0",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz",
+                  "integrity": "sha1-6v/NDk/Gk1z4E02iRuLmw1MFrf8="
                 }
               }
             },
             "oauth-sign": {
               "version": "0.8.2",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+              "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
             },
             "performance-now": {
               "version": "0.2.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+              "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
             },
             "qs": {
               "version": "6.4.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+              "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
             },
             "safe-buffer": {
               "version": "5.0.1",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+              "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c="
             },
             "stringstream": {
               "version": "0.0.5",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+              "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
             },
             "tough-cookie": {
               "version": "2.3.2",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+              "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
               "requires": {
                 "punycode": "^1.4.1"
               },
               "dependencies": {
                 "punycode": {
                   "version": "1.4.1",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+                  "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
                 }
               }
             },
             "tunnel-agent": {
               "version": "0.6.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+              "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
               "requires": {
                 "safe-buffer": "^5.0.1"
               }
@@ -33523,22 +33804,26 @@
         },
         "retry": {
           "version": "0.10.1",
-          "bundled": true
+          "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
+          "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q="
         },
         "rimraf": {
           "version": "2.6.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+          "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
           "requires": {
             "glob": "^7.0.5"
           }
         },
         "semver": {
           "version": "5.3.0",
-          "bundled": true
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
         },
         "sha": {
           "version": "2.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-YDCCL70smCOUn49y7WQR7lzyWq4=",
           "requires": {
             "graceful-fs": "^4.1.2",
             "readable-stream": "^2.0.2"
@@ -33546,15 +33831,18 @@
         },
         "slide": {
           "version": "1.1.6",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc="
         },
         "sorted-object": {
           "version": "2.0.1",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-fWMfS9OnmKJK8d/8+/6DM3pd9fw="
         },
         "sorted-union-stream": {
           "version": "2.1.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-x3lMfgd4gAUv9xqNSi27Sppjisc=",
           "requires": {
             "from2": "^1.3.0",
             "stream-iterate": "^1.1.0"
@@ -33562,7 +33850,8 @@
           "dependencies": {
             "from2": {
               "version": "1.3.0",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-iEE7qqX5pZfP3pIh2GmGzTwGHf0=",
               "requires": {
                 "inherits": "~2.0.1",
                 "readable-stream": "~1.1.10"
@@ -33570,7 +33859,8 @@
               "dependencies": {
                 "readable-stream": {
                   "version": "1.1.14",
-                  "bundled": true,
+                  "resolved": false,
+                  "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
                   "requires": {
                     "core-util-is": "~1.0.0",
                     "inherits": "~2.0.1",
@@ -33580,15 +33870,18 @@
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.2",
-                      "bundled": true
+                      "resolved": false,
+                      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "bundled": true
+                      "resolved": false,
+                      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "bundled": true
+                      "resolved": false,
+                      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
                     }
                   }
                 }
@@ -33596,20 +33889,23 @@
             },
             "stream-iterate": {
               "version": "1.1.1",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-XX0ZeqUryeJxtEVHyeOIsrGzODY="
             }
           }
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "requires": {
             "ansi-regex": "^2.0.0"
           }
         },
         "tar": {
           "version": "2.2.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+          "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
           "requires": {
             "block-stream": "*",
             "fstream": "^1.0.2",
@@ -33618,7 +33914,8 @@
           "dependencies": {
             "block-stream": {
               "version": "0.0.8",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz",
+              "integrity": "sha1-Boj0baK7+c/wxPaCJaDLlcvopGs=",
               "requires": {
                 "inherits": "~2.0.0"
               }
@@ -33627,26 +33924,31 @@
         },
         "text-table": {
           "version": "0.2.0",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
         },
         "uid-number": {
           "version": "0.0.6",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
         },
         "umask": {
           "version": "1.1.0",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0="
         },
         "unique-filename": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
           "requires": {
             "unique-slug": "^2.0.0"
           },
           "dependencies": {
             "unique-slug": {
               "version": "2.0.0",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
               "requires": {
                 "imurmurhash": "^0.1.4"
               }
@@ -33655,11 +33957,13 @@
         },
         "unpipe": {
           "version": "1.0.0",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
         },
         "update-notifier": {
           "version": "2.1.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz",
+          "integrity": "sha1-7AweU1NrdmR6JLd8uDlm2TFRI9k=",
           "requires": {
             "boxen": "^1.0.0",
             "chalk": "^1.0.0",
@@ -33673,7 +33977,8 @@
           "dependencies": {
             "boxen": {
               "version": "1.0.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.0.0.tgz",
+              "integrity": "sha1-smlLrx9gX3CP8Bd8Ehk7IvKaqqs=",
               "requires": {
                 "ansi-align": "^1.1.0",
                 "camelcase": "^4.0.0",
@@ -33686,14 +33991,16 @@
               "dependencies": {
                 "ansi-align": {
                   "version": "1.1.0",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz",
+                  "integrity": "sha1-LwwWWIKXOa3V67FeawxuNCPwFro=",
                   "requires": {
                     "string-width": "^1.0.1"
                   },
                   "dependencies": {
                     "string-width": {
                       "version": "1.0.2",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+                      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
                       "requires": {
                         "code-point-at": "^1.0.0",
                         "is-fullwidth-code-point": "^1.0.0",
@@ -33702,18 +34009,21 @@
                       "dependencies": {
                         "code-point-at": {
                           "version": "1.1.0",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+                          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
                         },
                         "is-fullwidth-code-point": {
                           "version": "1.0.0",
-                          "bundled": true,
+                          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+                          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
                           "requires": {
                             "number-is-nan": "^1.0.0"
                           },
                           "dependencies": {
                             "number-is-nan": {
                               "version": "1.0.1",
-                              "bundled": true
+                              "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+                              "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
                             }
                           }
                         }
@@ -33723,15 +34033,18 @@
                 },
                 "camelcase": {
                   "version": "4.0.0",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.0.0.tgz",
+                  "integrity": "sha1-iw+Q1Evl4oG5A7mIc0m5JZXvB/I="
                 },
                 "cli-boxes": {
                   "version": "1.0.0",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
+                  "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM="
                 },
                 "string-width": {
                   "version": "2.0.0",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz",
+                  "integrity": "sha1-Y1xUNsxypuDDh87KJ41OLuxSaH4=",
                   "requires": {
                     "is-fullwidth-code-point": "^2.0.0",
                     "strip-ansi": "^3.0.0"
@@ -33739,20 +34052,23 @@
                   "dependencies": {
                     "is-fullwidth-code-point": {
                       "version": "2.0.0",
-                      "bundled": true
+                      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+                      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
                     }
                   }
                 },
                 "term-size": {
                   "version": "0.1.1",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz",
+                  "integrity": "sha1-hzYLljlsq1dgljcUzaDQy+7K2co=",
                   "requires": {
                     "execa": "^0.4.0"
                   },
                   "dependencies": {
                     "execa": {
                       "version": "0.4.0",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz",
+                      "integrity": "sha1-TrZGejaglfq7KXD/nV4/t7zm68M=",
                       "requires": {
                         "cross-spawn-async": "^2.1.1",
                         "is-stream": "^1.1.0",
@@ -33764,7 +34080,8 @@
                       "dependencies": {
                         "cross-spawn-async": {
                           "version": "2.2.5",
-                          "bundled": true,
+                          "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz",
+                          "integrity": "sha1-hF/wwINKPe2dFg2sptOQkGuyiMw=",
                           "requires": {
                             "lru-cache": "^4.0.0",
                             "which": "^1.2.8"
@@ -33772,7 +34089,8 @@
                           "dependencies": {
                             "lru-cache": {
                               "version": "4.0.2",
-                              "bundled": true,
+                              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz",
+                              "integrity": "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=",
                               "requires": {
                                 "pseudomap": "^1.0.1",
                                 "yallist": "^2.0.0"
@@ -33780,11 +34098,13 @@
                               "dependencies": {
                                 "pseudomap": {
                                   "version": "1.0.2",
-                                  "bundled": true
+                                  "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+                                  "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
                                 },
                                 "yallist": {
                                   "version": "2.0.0",
-                                  "bundled": true
+                                  "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz",
+                                  "integrity": "sha1-MGxUODXwnuGkyyO3vOmrNByRzdQ="
                                 }
                               }
                             }
@@ -33792,26 +34112,31 @@
                         },
                         "is-stream": {
                           "version": "1.1.0",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+                          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
                         },
                         "npm-run-path": {
                           "version": "1.0.0",
-                          "bundled": true,
+                          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz",
+                          "integrity": "sha1-9cMr9ZX+ga6Sfa7FLoL4sACsPI8=",
                           "requires": {
                             "path-key": "^1.0.0"
                           }
                         },
                         "object-assign": {
                           "version": "4.1.1",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+                          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
                         },
                         "path-key": {
                           "version": "1.0.0",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz",
+                          "integrity": "sha1-XVPVeAGWRsDWiADbThRua9wqx68="
                         },
                         "strip-eof": {
                           "version": "1.0.0",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+                          "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
                         }
                       }
                     }
@@ -33819,14 +34144,16 @@
                 },
                 "widest-line": {
                   "version": "1.0.0",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",
+                  "integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=",
                   "requires": {
                     "string-width": "^1.0.1"
                   },
                   "dependencies": {
                     "string-width": {
                       "version": "1.0.2",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+                      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
                       "requires": {
                         "code-point-at": "^1.0.0",
                         "is-fullwidth-code-point": "^1.0.0",
@@ -33835,18 +34162,21 @@
                       "dependencies": {
                         "code-point-at": {
                           "version": "1.1.0",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+                          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
                         },
                         "is-fullwidth-code-point": {
                           "version": "1.0.0",
-                          "bundled": true,
+                          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+                          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
                           "requires": {
                             "number-is-nan": "^1.0.0"
                           },
                           "dependencies": {
                             "number-is-nan": {
                               "version": "1.0.1",
-                              "bundled": true
+                              "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+                              "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
                             }
                           }
                         }
@@ -33858,7 +34188,8 @@
             },
             "chalk": {
               "version": "1.1.3",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+              "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
               "requires": {
                 "ansi-styles": "^2.2.1",
                 "escape-string-regexp": "^1.0.2",
@@ -33869,28 +34200,33 @@
               "dependencies": {
                 "ansi-styles": {
                   "version": "2.2.1",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+                  "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
                 },
                 "escape-string-regexp": {
                   "version": "1.0.5",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+                  "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
                 },
                 "has-ansi": {
                   "version": "2.0.0",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                  "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
                   "requires": {
                     "ansi-regex": "^2.0.0"
                   }
                 },
                 "supports-color": {
                   "version": "2.0.0",
-                  "bundled": true
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+                  "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
                 }
               }
             },
             "configstore": {
               "version": "3.0.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.0.0.tgz",
+              "integrity": "sha1-4bhmnBgDzMULVF6S+ObnmqgOAZY=",
               "requires": {
                 "dot-prop": "^4.1.0",
                 "graceful-fs": "^4.1.2",
@@ -33902,27 +34238,31 @@
               "dependencies": {
                 "dot-prop": {
                   "version": "4.1.1",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz",
+                  "integrity": "sha1-qEk/C3te7sglJbXHWH+n3nyoWcE=",
                   "requires": {
                     "is-obj": "^1.0.0"
                   },
                   "dependencies": {
                     "is-obj": {
                       "version": "1.0.1",
-                      "bundled": true
+                      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+                      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
                     }
                   }
                 },
                 "unique-string": {
                   "version": "1.0.0",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+                  "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
                   "requires": {
                     "crypto-random-string": "^1.0.0"
                   },
                   "dependencies": {
                     "crypto-random-string": {
                       "version": "1.0.0",
-                      "bundled": true
+                      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+                      "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
                     }
                   }
                 }
@@ -33930,18 +34270,21 @@
             },
             "is-npm": {
               "version": "1.0.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
+              "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ="
             },
             "latest-version": {
               "version": "3.0.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.0.0.tgz",
+              "integrity": "sha1-MQTwCMDDkQhBB/haNEvGHjiXBkk=",
               "requires": {
                 "package-json": "^3.0.0"
               },
               "dependencies": {
                 "package-json": {
                   "version": "3.1.0",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/package-json/-/package-json-3.1.0.tgz",
+                  "integrity": "sha1-zigZAP6AUhUMxnCcbABsGP2y83k=",
                   "requires": {
                     "got": "^6.7.1",
                     "registry-auth-token": "^3.0.1",
@@ -33951,7 +34294,8 @@
                   "dependencies": {
                     "got": {
                       "version": "6.7.1",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+                      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
                       "requires": {
                         "create-error-class": "^3.0.0",
                         "duplexer3": "^0.1.4",
@@ -33968,63 +34312,76 @@
                       "dependencies": {
                         "create-error-class": {
                           "version": "3.0.2",
-                          "bundled": true,
+                          "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+                          "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
                           "requires": {
                             "capture-stack-trace": "^1.0.0"
                           },
                           "dependencies": {
                             "capture-stack-trace": {
                               "version": "1.0.0",
-                              "bundled": true
+                              "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
+                              "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0="
                             }
                           }
                         },
                         "duplexer3": {
                           "version": "0.1.4",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+                          "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
                         },
                         "get-stream": {
                           "version": "3.0.0",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+                          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
                         },
                         "is-redirect": {
                           "version": "1.0.0",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+                          "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
                         },
                         "is-retry-allowed": {
                           "version": "1.1.0",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+                          "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ="
                         },
                         "is-stream": {
                           "version": "1.1.0",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+                          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
                         },
                         "lowercase-keys": {
                           "version": "1.0.0",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
+                          "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY="
                         },
                         "safe-buffer": {
                           "version": "5.0.1",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+                          "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c="
                         },
                         "timed-out": {
                           "version": "4.0.1",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+                          "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
                         },
                         "unzip-response": {
                           "version": "2.0.1",
-                          "bundled": true
+                          "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+                          "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c="
                         },
                         "url-parse-lax": {
                           "version": "1.0.0",
-                          "bundled": true,
+                          "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+                          "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
                           "requires": {
                             "prepend-http": "^1.0.1"
                           },
                           "dependencies": {
                             "prepend-http": {
                               "version": "1.0.4",
-                              "bundled": true
+                              "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+                              "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
                             }
                           }
                         }
@@ -34032,14 +34389,16 @@
                     },
                     "registry-auth-token": {
                       "version": "3.1.0",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz",
+                      "integrity": "sha1-mXwIJW4MeZmDe5DpRNs52KeQJ2s=",
                       "requires": {
                         "rc": "^1.1.6"
                       },
                       "dependencies": {
                         "rc": {
                           "version": "1.1.7",
-                          "bundled": true,
+                          "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz",
+                          "integrity": "sha1-xepWS7B6/5/TpbMukGwdOmWUD+o=",
                           "requires": {
                             "deep-extend": "~0.4.0",
                             "ini": "~1.3.0",
@@ -34049,15 +34408,18 @@
                           "dependencies": {
                             "deep-extend": {
                               "version": "0.4.1",
-                              "bundled": true
+                              "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz",
+                              "integrity": "sha1-7+QRPQgIX05vlod1mBD4B0aeIlM="
                             },
                             "minimist": {
                               "version": "1.2.0",
-                              "bundled": true
+                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+                              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
                             },
                             "strip-json-comments": {
                               "version": "2.0.1",
-                              "bundled": true
+                              "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+                              "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
                             }
                           }
                         }
@@ -34065,14 +34427,16 @@
                     },
                     "registry-url": {
                       "version": "3.1.0",
-                      "bundled": true,
+                      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
+                      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
                       "requires": {
                         "rc": "^1.0.1"
                       },
                       "dependencies": {
                         "rc": {
                           "version": "1.1.7",
-                          "bundled": true,
+                          "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz",
+                          "integrity": "sha1-xepWS7B6/5/TpbMukGwdOmWUD+o=",
                           "requires": {
                             "deep-extend": "~0.4.0",
                             "ini": "~1.3.0",
@@ -34082,15 +34446,18 @@
                           "dependencies": {
                             "deep-extend": {
                               "version": "0.4.1",
-                              "bundled": true
+                              "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz",
+                              "integrity": "sha1-7+QRPQgIX05vlod1mBD4B0aeIlM="
                             },
                             "minimist": {
                               "version": "1.2.0",
-                              "bundled": true
+                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+                              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
                             },
                             "strip-json-comments": {
                               "version": "2.0.1",
-                              "bundled": true
+                              "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+                              "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
                             }
                           }
                         }
@@ -34102,28 +34469,33 @@
             },
             "lazy-req": {
               "version": "2.0.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz",
+              "integrity": "sha1-yUUKNj7N2i5vDHATKtTzf48G8rQ="
             },
             "semver-diff": {
               "version": "2.1.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
+              "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
               "requires": {
                 "semver": "^5.0.3"
               }
             },
             "xdg-basedir": {
               "version": "3.0.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
+              "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
             }
           }
         },
         "uuid": {
           "version": "3.0.1",
-          "bundled": true
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
+          "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
         },
         "validate-npm-package-license": {
           "version": "3.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
           "requires": {
             "spdx-correct": "~1.0.0",
             "spdx-expression-parse": "~1.0.0"
@@ -34131,20 +34503,23 @@
           "dependencies": {
             "spdx-correct": {
               "version": "1.0.2",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
               "requires": {
                 "spdx-license-ids": "^1.0.2"
               },
               "dependencies": {
                 "spdx-license-ids": {
                   "version": "1.2.0",
-                  "bundled": true
+                  "resolved": false,
+                  "integrity": "sha1-tUndD2Pct0Whfi6joHQC4OMy0eI="
                 }
               }
             },
             "spdx-expression-parse": {
               "version": "1.0.2",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-1SsUtelnB3FECvIlvLVjEirEUvY=",
               "requires": {
                 "spdx-exceptions": "^1.0.4",
                 "spdx-license-ids": "^1.0.0"
@@ -34152,11 +34527,12 @@
               "dependencies": {
                 "spdx-exceptions": {
                   "version": "1.0.4",
-                  "bundled": true
+                  "resolved": false,
+                  "integrity": "sha1-IguEI5EZrpBFqJLbgag/TOFvgP0="
                 },
                 "spdx-license-ids": {
                   "version": "1.2.0",
-                  "bundled": true
+                  "resolved": false
                 }
               }
             }
@@ -34164,37 +34540,43 @@
         },
         "validate-npm-package-name": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
           "requires": {
             "builtins": "^1.0.3"
           },
           "dependencies": {
             "builtins": {
               "version": "1.0.3",
-              "bundled": true
+              "resolved": false,
+              "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og="
             }
           }
         },
         "which": {
           "version": "1.2.14",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
+          "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
           "requires": {
             "isexe": "^2.0.0"
           },
           "dependencies": {
             "isexe": {
               "version": "2.0.0",
-              "bundled": true
+              "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+              "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
             }
           }
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "resolved": false,
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
         },
         "write-file-atomic": {
           "version": "1.3.3",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.3.tgz",
+          "integrity": "sha1-gx3SLUkb3BNRgLuZag6z+L9Yd5E=",
           "requires": {
             "graceful-fs": "^4.1.11",
             "imurmurhash": "^0.1.4",
@@ -34335,17 +34717,20 @@
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
           "dev": true
         },
         "cross-spawn": {
           "version": "5.1.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
           "dev": true,
           "requires": {
             "lru-cache": "^4.0.1",
@@ -34355,12 +34740,14 @@
         },
         "decamelize": {
           "version": "1.2.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
           "dev": true
         },
         "execa": {
           "version": "0.7.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
           "dev": true,
           "requires": {
             "cross-spawn": "^5.0.1",
@@ -34374,7 +34761,8 @@
         },
         "find-up": {
           "version": "2.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
           "dev": true,
           "requires": {
             "locate-path": "^2.0.0"
@@ -34382,22 +34770,26 @@
         },
         "get-caller-file": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
           "dev": true
         },
         "get-stream": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
           "dev": true
         },
         "invert-kv": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+          "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
           "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
             "number-is-nan": "^1.0.0"
@@ -34405,17 +34797,20 @@
         },
         "is-stream": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
           "dev": true
         },
         "isexe": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
           "dev": true
         },
         "lcid": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+          "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
           "dev": true,
           "requires": {
             "invert-kv": "^1.0.0"
@@ -34423,7 +34818,8 @@
         },
         "locate-path": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
           "dev": true,
           "requires": {
             "p-locate": "^2.0.0",
@@ -34432,7 +34828,8 @@
         },
         "lru-cache": {
           "version": "4.1.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
+          "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
           "dev": true,
           "requires": {
             "pseudomap": "^1.0.2",
@@ -34441,7 +34838,8 @@
         },
         "mem": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+          "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
           "dev": true,
           "requires": {
             "mimic-fn": "^1.0.0"
@@ -34449,17 +34847,20 @@
         },
         "mimic-fn": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
+          "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
           "dev": true
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
           "dev": true
         },
         "mkdirp": {
           "version": "0.5.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
           "requires": {
             "minimist": "0.0.8"
@@ -34467,7 +34868,8 @@
         },
         "npm-run-path": {
           "version": "2.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
           "dev": true,
           "requires": {
             "path-key": "^2.0.0"
@@ -34475,12 +34877,14 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
           "dev": true
         },
         "os-locale": {
           "version": "2.1.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
           "dev": true,
           "requires": {
             "execa": "^0.7.0",
@@ -34490,17 +34894,20 @@
         },
         "p-finally": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
           "dev": true
         },
         "p-limit": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=",
           "dev": true
         },
         "p-locate": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
           "dev": true,
           "requires": {
             "p-limit": "^1.1.0"
@@ -34508,37 +34915,44 @@
         },
         "path-exists": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
           "dev": true
         },
         "path-key": {
           "version": "2.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
           "dev": true
         },
         "pseudomap": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
           "dev": true
         },
         "require-directory": {
           "version": "2.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
           "dev": true
         },
         "require-main-filename": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
           "dev": true
         },
         "set-blocking": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
           "dev": true
         },
         "shebang-command": {
           "version": "1.2.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
           "dev": true,
           "requires": {
             "shebang-regex": "^1.0.0"
@@ -34546,17 +34960,20 @@
         },
         "shebang-regex": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
           "dev": true
         },
         "signal-exit": {
           "version": "3.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
           "dev": true
         },
         "string-width": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
             "code-point-at": "^1.0.0",
@@ -34566,7 +34983,8 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
             "ansi-regex": "^2.0.0"
@@ -34574,12 +34992,14 @@
         },
         "strip-eof": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
           "dev": true
         },
         "which": {
           "version": "1.3.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
           "dev": true,
           "requires": {
             "isexe": "^2.0.0"
@@ -34587,12 +35007,14 @@
         },
         "which-module": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
           "dev": true
         },
         "wrap-ansi": {
           "version": "2.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
           "dev": true,
           "requires": {
             "string-width": "^1.0.1",
@@ -34601,17 +35023,20 @@
         },
         "y18n": {
           "version": "3.2.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
           "dev": true
         },
         "yallist": {
           "version": "2.1.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
           "dev": true
         },
         "yargs": {
           "version": "10.0.3",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz",
+          "integrity": "sha512-DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw==",
           "dev": true,
           "requires": {
             "cliui": "^3.2.0",
@@ -34630,12 +35055,14 @@
           "dependencies": {
             "ansi-regex": {
               "version": "3.0.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
               "dev": true
             },
             "cliui": {
               "version": "3.2.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+              "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
               "dev": true,
               "requires": {
                 "string-width": "^1.0.1",
@@ -34645,7 +35072,8 @@
               "dependencies": {
                 "string-width": {
                   "version": "1.0.2",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+                  "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
                   "dev": true,
                   "requires": {
                     "code-point-at": "^1.0.0",
@@ -34657,7 +35085,8 @@
             },
             "string-width": {
               "version": "2.1.1",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+              "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
               "dev": true,
               "requires": {
                 "is-fullwidth-code-point": "^2.0.0",
@@ -34666,12 +35095,14 @@
               "dependencies": {
                 "is-fullwidth-code-point": {
                   "version": "2.0.0",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+                  "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
                   "dev": true
                 },
                 "strip-ansi": {
                   "version": "4.0.0",
-                  "bundled": true,
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+                  "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
                   "dev": true,
                   "requires": {
                     "ansi-regex": "^3.0.0"
@@ -34683,7 +35114,8 @@
         },
         "yargs-parser": {
           "version": "8.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.0.0.tgz",
+          "integrity": "sha1-IdR2Mw5agieaS4gTRb8GYQLiGcY=",
           "dev": true,
           "requires": {
             "camelcase": "^4.1.0"
@@ -34691,7 +35123,8 @@
           "dependencies": {
             "camelcase": {
               "version": "4.1.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+              "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
               "dev": true
             }
           }
@@ -34963,12 +35396,14 @@
       "dependencies": {
         "ansi-regex": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
         "append-transform": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==",
           "dev": true,
           "requires": {
             "default-require-extensions": "^2.0.0"
@@ -34976,17 +35411,20 @@
         },
         "archy": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
           "dev": true
         },
         "arrify": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
           "dev": true
         },
         "async": {
           "version": "2.6.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
           "dev": true,
           "requires": {
             "lodash": "^4.17.11"
@@ -34994,12 +35432,14 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
           "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
           "requires": {
             "balanced-match": "^1.0.0",
@@ -35008,7 +35448,8 @@
         },
         "caching-transform": {
           "version": "3.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-Y1KTLNwSPd4ljsDrFOtyXVmm7Gnk42yQitNq43AhE+cwUR/e4T+rmOHs1IPtzBg8066GBJfTOj1rQYFSWSsH2g==",
           "dev": true,
           "requires": {
             "hasha": "^3.0.0",
@@ -35019,12 +35460,14 @@
         },
         "camelcase": {
           "version": "5.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
           "dev": true
         },
         "cliui": {
           "version": "4.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
           "dev": true,
           "requires": {
             "string-width": "^2.1.1",
@@ -35034,28 +35477,33 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
           "dev": true
         },
         "commander": {
           "version": "2.17.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
           "dev": true,
           "optional": true
         },
         "commondir": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
           "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
           "dev": true
         },
         "convert-source-map": {
           "version": "1.6.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
           "dev": true,
           "requires": {
             "safe-buffer": "~5.1.1"
@@ -35063,7 +35511,8 @@
         },
         "cross-spawn": {
           "version": "4.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
+          "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
           "dev": true,
           "requires": {
             "lru-cache": "^4.0.1",
@@ -35072,7 +35521,8 @@
         },
         "debug": {
           "version": "4.1.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -35080,12 +35530,14 @@
         },
         "decamelize": {
           "version": "1.2.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
           "dev": true
         },
         "default-require-extensions": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=",
           "dev": true,
           "requires": {
             "strip-bom": "^3.0.0"
@@ -35093,7 +35545,8 @@
         },
         "end-of-stream": {
           "version": "1.4.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
           "dev": true,
           "requires": {
             "once": "^1.4.0"
@@ -35101,7 +35554,8 @@
         },
         "error-ex": {
           "version": "1.3.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
           "dev": true,
           "requires": {
             "is-arrayish": "^0.2.1"
@@ -35109,12 +35563,14 @@
         },
         "es6-error": {
           "version": "4.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
           "dev": true
         },
         "execa": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
           "dev": true,
           "requires": {
             "cross-spawn": "^6.0.0",
@@ -35128,7 +35584,8 @@
           "dependencies": {
             "cross-spawn": {
               "version": "6.0.5",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
               "dev": true,
               "requires": {
                 "nice-try": "^1.0.4",
@@ -35142,7 +35599,8 @@
         },
         "find-cache-dir": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
           "dev": true,
           "requires": {
             "commondir": "^1.0.1",
@@ -35152,7 +35610,8 @@
         },
         "find-up": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
             "locate-path": "^3.0.0"
@@ -35160,7 +35619,8 @@
         },
         "foreground-child": {
           "version": "1.5.6",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=",
           "dev": true,
           "requires": {
             "cross-spawn": "^4",
@@ -35169,17 +35629,20 @@
         },
         "fs.realpath": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
           "dev": true
         },
         "get-caller-file": {
           "version": "1.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
           "dev": true
         },
         "get-stream": {
           "version": "4.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
           "dev": true,
           "requires": {
             "pump": "^3.0.0"
@@ -35187,7 +35650,8 @@
         },
         "glob": {
           "version": "7.1.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -35200,12 +35664,14 @@
         },
         "graceful-fs": {
           "version": "4.1.15",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
           "dev": true
         },
         "handlebars": {
           "version": "4.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==",
           "dev": true,
           "requires": {
             "async": "^2.5.0",
@@ -35216,19 +35682,22 @@
           "dependencies": {
             "source-map": {
               "version": "0.6.1",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
               "dev": true
             }
           }
         },
         "has-flag": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
         "hasha": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-UqMvq4Vp1BymmmH/GiFPjrfIvTk=",
           "dev": true,
           "requires": {
             "is-stream": "^1.0.1"
@@ -35236,17 +35705,20 @@
         },
         "hosted-git-info": {
           "version": "2.7.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
           "dev": true
         },
         "imurmurhash": {
           "version": "0.1.4",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
           "dev": true
         },
         "inflight": {
           "version": "1.0.6",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "dev": true,
           "requires": {
             "once": "^1.3.0",
@@ -35255,42 +35727,50 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true
         },
         "invert-kv": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
           "dev": true
         },
         "is-arrayish": {
           "version": "0.2.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
           "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
         "is-stream": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
           "dev": true
         },
         "isexe": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
           "dev": true
         },
         "istanbul-lib-coverage": {
           "version": "2.0.3",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+          "integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
           "dev": true
         },
         "istanbul-lib-hook": {
           "version": "2.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-CLmEqwEhuCYtGcpNVJjLV1DQyVnIqavMLFHV/DP+np/g3qvdxu3gsPqYoJMXm15sN84xOlckFB3VNvRbf5yEgA==",
           "dev": true,
           "requires": {
             "append-transform": "^1.0.0"
@@ -35327,7 +35807,8 @@
         },
         "istanbul-lib-report": {
           "version": "2.0.4",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz",
+          "integrity": "sha512-sOiLZLAWpA0+3b5w5/dq0cjm2rrNdAfHWaGhmn7XEFW6X++IV9Ohn+pnELAl9K3rfpaeBfbmH9JU5sejacdLeA==",
           "dev": true,
           "requires": {
             "istanbul-lib-coverage": "^2.0.3",
@@ -35337,7 +35818,8 @@
           "dependencies": {
             "supports-color": {
               "version": "6.1.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+              "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
               "dev": true,
               "requires": {
                 "has-flag": "^3.0.0"
@@ -35347,7 +35829,8 @@
         },
         "istanbul-lib-source-maps": {
           "version": "3.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.2.tgz",
+          "integrity": "sha512-JX4v0CiKTGp9fZPmoxpu9YEkPbEqCqBbO3403VabKjH+NRXo72HafD5UgnjTEqHL2SAjaZK1XDuDOkn6I5QVfQ==",
           "dev": true,
           "requires": {
             "debug": "^4.1.1",
@@ -35359,14 +35842,16 @@
           "dependencies": {
             "source-map": {
               "version": "0.6.1",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
               "dev": true
             }
           }
         },
         "istanbul-reports": {
           "version": "2.1.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.1.1.tgz",
+          "integrity": "sha512-FzNahnidyEPBCI0HcufJoSEoKykesRlFcSzQqjH9x0+LC8tnnE/p/90PBLu8iZTxr8yYZNyTtiAujUqyN+CIxw==",
           "dev": true,
           "requires": {
             "handlebars": "^4.1.0"
@@ -35374,12 +35859,14 @@
         },
         "json-parse-better-errors": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
           "dev": true
         },
         "lcid": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
             "invert-kv": "^2.0.0"
@@ -35387,7 +35874,8 @@
         },
         "load-json-file": {
           "version": "4.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.1.2",
@@ -35398,7 +35886,8 @@
         },
         "locate-path": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
             "p-locate": "^3.0.0",
@@ -35407,17 +35896,20 @@
         },
         "lodash": {
           "version": "4.17.11",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
           "dev": true
         },
         "lodash.flattendeep": {
           "version": "4.4.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
           "dev": true
         },
         "lru-cache": {
           "version": "4.1.5",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
           "dev": true,
           "requires": {
             "pseudomap": "^1.0.2",
@@ -35426,7 +35918,8 @@
         },
         "make-dir": {
           "version": "1.3.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
           "dev": true,
           "requires": {
             "pify": "^3.0.0"
@@ -35434,7 +35927,8 @@
         },
         "map-age-cleaner": {
           "version": "0.1.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
           "dev": true,
           "requires": {
             "p-defer": "^1.0.0"
@@ -35442,7 +35936,8 @@
         },
         "mem": {
           "version": "4.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==",
           "dev": true,
           "requires": {
             "map-age-cleaner": "^0.1.1",
@@ -35452,7 +35947,8 @@
         },
         "merge-source-map": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
+          "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
           "dev": true,
           "requires": {
             "source-map": "^0.6.1"
@@ -35460,19 +35956,22 @@
           "dependencies": {
             "source-map": {
               "version": "0.6.1",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
               "dev": true
             }
           }
         },
         "mimic-fn": {
           "version": "1.2.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
           "dev": true
         },
         "minimatch": {
           "version": "3.0.4",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
           "requires": {
             "brace-expansion": "^1.1.7"
@@ -35480,12 +35979,14 @@
         },
         "minimist": {
           "version": "0.0.10",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
           "dev": true
         },
         "mkdirp": {
           "version": "0.5.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
           "requires": {
             "minimist": "0.0.8"
@@ -35493,24 +35994,28 @@
           "dependencies": {
             "minimist": {
               "version": "0.0.8",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
               "dev": true
             }
           }
         },
         "ms": {
           "version": "2.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
           "dev": true
         },
         "nice-try": {
           "version": "1.0.5",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
           "dev": true
         },
         "normalize-package-data": {
           "version": "2.5.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
           "dev": true,
           "requires": {
             "hosted-git-info": "^2.1.4",
@@ -35521,7 +36026,8 @@
         },
         "npm-run-path": {
           "version": "2.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
           "dev": true,
           "requires": {
             "path-key": "^2.0.0"
@@ -35529,12 +36035,14 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
           "dev": true
         },
         "once": {
           "version": "1.4.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
           "requires": {
             "wrappy": "1"
@@ -35542,7 +36050,8 @@
         },
         "optimist": {
           "version": "0.6.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
           "dev": true,
           "requires": {
             "minimist": "~0.0.1",
@@ -35551,12 +36060,14 @@
         },
         "os-homedir": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
           "dev": true
         },
         "os-locale": {
           "version": "3.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
           "dev": true,
           "requires": {
             "execa": "^1.0.0",
@@ -35566,22 +36077,26 @@
         },
         "p-defer": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
           "dev": true
         },
         "p-finally": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
           "dev": true
         },
         "p-is-promise": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==",
           "dev": true
         },
         "p-limit": {
           "version": "2.1.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
+          "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -35589,7 +36104,8 @@
         },
         "p-locate": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
             "p-limit": "^2.0.0"
@@ -35597,12 +36113,14 @@
         },
         "p-try": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+          "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
           "dev": true
         },
         "package-hash": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-lOtmukMDVvtkL84rJHI7dpTYq+0rli8N2wlnqUcBuDWCfVhRUfOmnR9SsoHFMLpACvEV60dX7rd0rFaYDZI+FA==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.1.15",
@@ -35613,7 +36131,8 @@
         },
         "parse-json": {
           "version": "4.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
             "error-ex": "^1.3.1",
@@ -35622,27 +36141,32 @@
         },
         "path-exists": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
           "dev": true
         },
         "path-is-absolute": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
           "dev": true
         },
         "path-key": {
           "version": "2.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
           "dev": true
         },
         "path-parse": {
           "version": "1.0.6",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
           "dev": true
         },
         "path-type": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
           "dev": true,
           "requires": {
             "pify": "^3.0.0"
@@ -35650,12 +36174,14 @@
         },
         "pify": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
           "dev": true
         },
         "pkg-dir": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
           "dev": true,
           "requires": {
             "find-up": "^3.0.0"
@@ -35663,12 +36189,14 @@
         },
         "pseudomap": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
           "dev": true
         },
         "pump": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
             "end-of-stream": "^1.1.0",
@@ -35677,7 +36205,8 @@
         },
         "read-pkg": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
             "load-json-file": "^4.0.0",
@@ -35687,7 +36216,8 @@
         },
         "read-pkg-up": {
           "version": "4.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
+          "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
           "dev": true,
           "requires": {
             "find-up": "^3.0.0",
@@ -35696,7 +36226,8 @@
         },
         "release-zalgo": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=",
           "dev": true,
           "requires": {
             "es6-error": "^4.0.1"
@@ -35704,17 +36235,20 @@
         },
         "require-directory": {
           "version": "2.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
           "dev": true
         },
         "require-main-filename": {
           "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
           "dev": true
         },
         "resolve": {
           "version": "1.10.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+          "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
           "dev": true,
           "requires": {
             "path-parse": "^1.0.6"
@@ -35722,12 +36256,14 @@
         },
         "resolve-from": {
           "version": "4.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
           "dev": true
         },
         "rimraf": {
           "version": "2.6.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
           "dev": true,
           "requires": {
             "glob": "^7.1.3"
@@ -35735,22 +36271,26 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
           "dev": true
         },
         "semver": {
           "version": "5.6.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
           "dev": true
         },
         "set-blocking": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
           "dev": true
         },
         "shebang-command": {
           "version": "1.2.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
           "dev": true,
           "requires": {
             "shebang-regex": "^1.0.0"
@@ -35758,17 +36298,20 @@
         },
         "shebang-regex": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
           "dev": true
         },
         "signal-exit": {
           "version": "3.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
           "dev": true
         },
         "spawn-wrap": {
           "version": "1.4.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-vMwR3OmmDhnxCVxM8M+xO/FtIp6Ju/mNaDfCMMW7FDcLRTPFWUswec4LXJHTJE2hwTI9O0YBfygu4DalFl7Ylg==",
           "dev": true,
           "requires": {
             "foreground-child": "^1.5.6",
@@ -35781,7 +36324,8 @@
         },
         "spdx-correct": {
           "version": "3.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
           "dev": true,
           "requires": {
             "spdx-expression-parse": "^3.0.0",
@@ -35790,12 +36334,14 @@
         },
         "spdx-exceptions": {
           "version": "2.2.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
           "dev": true
         },
         "spdx-expression-parse": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
           "dev": true,
           "requires": {
             "spdx-exceptions": "^2.1.0",
@@ -35804,12 +36350,14 @@
         },
         "spdx-license-ids": {
           "version": "3.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==",
           "dev": true
         },
         "string-width": {
           "version": "2.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
             "is-fullwidth-code-point": "^2.0.0",
@@ -35818,7 +36366,8 @@
         },
         "strip-ansi": {
           "version": "4.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
             "ansi-regex": "^3.0.0"
@@ -35826,17 +36375,20 @@
         },
         "strip-bom": {
           "version": "3.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
           "dev": true
         },
         "strip-eof": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
           "dev": true
         },
         "test-exclude": {
           "version": "5.1.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.1.0.tgz",
+          "integrity": "sha512-gwf0S2fFsANC55fSeSqpb8BYk6w3FDvwZxfNjeF6FRgvFa43r+7wRiA/Q0IxoRU37wB/LE8IQ4221BsNucTaCA==",
           "dev": true,
           "requires": {
             "arrify": "^1.0.1",
@@ -35847,7 +36399,8 @@
         },
         "uglify-js": {
           "version": "3.4.9",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
+          "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -35857,7 +36410,8 @@
           "dependencies": {
             "source-map": {
               "version": "0.6.1",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
               "dev": true,
               "optional": true
             }
@@ -35865,12 +36419,14 @@
         },
         "uuid": {
           "version": "3.3.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
           "dev": true
         },
         "validate-npm-package-license": {
           "version": "3.0.4",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
           "dev": true,
           "requires": {
             "spdx-correct": "^3.0.0",
@@ -35879,7 +36435,8 @@
         },
         "which": {
           "version": "1.3.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
           "dev": true,
           "requires": {
             "isexe": "^2.0.0"
@@ -35887,17 +36444,20 @@
         },
         "which-module": {
           "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
           "dev": true
         },
         "wordwrap": {
           "version": "0.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
           "dev": true
         },
         "wrap-ansi": {
           "version": "2.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
           "dev": true,
           "requires": {
             "string-width": "^1.0.1",
@@ -35906,12 +36466,14 @@
           "dependencies": {
             "ansi-regex": {
               "version": "2.1.1",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
               "dev": true
             },
             "is-fullwidth-code-point": {
               "version": "1.0.0",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
               "dev": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
@@ -35919,7 +36481,8 @@
             },
             "string-width": {
               "version": "1.0.2",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
               "dev": true,
               "requires": {
                 "code-point-at": "^1.0.0",
@@ -35929,7 +36492,8 @@
             },
             "strip-ansi": {
               "version": "3.0.1",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
               "dev": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
@@ -35939,12 +36503,14 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
           "dev": true
         },
         "write-file-atomic": {
           "version": "2.4.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.2.tgz",
+          "integrity": "sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.1.11",
@@ -35954,17 +36520,20 @@
         },
         "y18n": {
           "version": "4.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
           "dev": true
         },
         "yallist": {
           "version": "2.1.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
           "dev": true
         },
         "yargs": {
           "version": "12.0.5",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
           "dev": true,
           "requires": {
             "cliui": "^4.0.0",
@@ -35983,7 +36552,8 @@
         },
         "yargs-parser": {
           "version": "11.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -39137,9 +39707,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
     },
     "regenerator-transform": {
       "version": "0.14.5",
@@ -40237,12 +40807,12 @@
       "integrity": "sha1-9RWxoWLek8LM7y/AyjPztVQ+OMg="
     },
     "selenium-standalone": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/selenium-standalone/-/selenium-standalone-8.0.4.tgz",
-      "integrity": "sha512-WK94SCjofq/V4uFxeT9yJjyVTpzqpiqhv7UR4Q98n1il9yxNAWsKRtfgT+2DA3Kwv8CZCk9zPWU7kBW5i2oaxw==",
+      "version": "8.0.8",
+      "resolved": "https://registry.npmjs.org/selenium-standalone/-/selenium-standalone-8.0.8.tgz",
+      "integrity": "sha512-2NCHoK12dbLbtXPIdMe1ljiLAMflJDBezPhjJBwmnYz5/yGjCPv2R9ojHO6W1ctD9DOlqyi3AxoAvlT2nmB7Fw==",
       "dev": true,
       "requires": {
-        "commander": "^7.2.0",
+        "commander": "^8.3.0",
         "cross-spawn": "^7.0.3",
         "debug": "^4.3.1",
         "fs-extra": "^10.0.0",
@@ -40289,9 +40859,9 @@
           }
         },
         "commander": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+          "version": "8.3.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+          "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
           "dev": true
         },
         "cross-spawn": {
@@ -46274,6 +46844,27 @@
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
+    "xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "dependencies": {
+        "sax": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+        }
+      }
+    },
+    "xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+    },
     "xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
diff --git a/package.json b/package.json
index e04be0c418..52ce130052 100644
--- a/package.json
+++ b/package.json
@@ -197,7 +197,8 @@
     "tslib": "^2.3.0",
     "web3": "^1.5.1",
     "winston": "^3.3.3",
-    "ws": "^7.3.0"
+    "ws": "^7.3.0",
+    "xml2js": "^0.4.23"
   },
   "devDependencies": {
     "@babel/core": "^7.4.5",

From d2a2e89a52b3872801f7ed61108bcb78081c48c0 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 26 Oct 2021 12:29:50 +0200
Subject: [PATCH 12/43] using old medium scripts

---
 .../src/app/ui/landing-page/landing-page.js   |  2 -
 .../home-tab/src/lib/remix-ui-home-tab.css    |  2 +-
 .../home-tab/src/lib/remix-ui-home-tab.tsx    | 72 ++++++++++++-------
 3 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
index af3ad9dc04..825948cf6c 100644
--- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js
+++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
@@ -33,8 +33,6 @@ export class LandingPage extends ViewPlugin {
     this.el.setAttribute('id', 'landingPageHomeContainer')
     this.el.setAttribute('class', 'remixui_homeContainer justify-content-between bg-light d-flex')
     this.el.setAttribute('data-id', 'landingPageHomeContainer')
-    // to retrieve medium posts
-    //document.body.appendChild(yo`<script src="https://www.twilik.com/assets/retainable/rss-embed/retainable-rss-embed.js"></script>`)
   }
 
   render () {
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
index 045719e03a..1f92cdd9e5 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
@@ -73,7 +73,7 @@
   }
   .remixui_media {
     overflow: hidden;
-    width: 400px;
+    max-width: 400px;
     transition: .5s ease-out;
     z-index: 1000;
   }
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
index 6ebb414806..8af8978080 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
@@ -3,11 +3,9 @@ import React, { useState, useRef, useEffect } from 'react' // eslint-disable-lin
 import './remix-ui-home-tab.css'
 import { ModalDialog } from '@remix-ui/modal-dialog' // eslint-disable-line
 import { Toaster } from '@remix-ui/toaster' // eslint-disable-line
-import Mediumfeed from './components/mediumFeed' // eslint-disable-line
 import PluginButton from './components/pluginButton' // eslint-disable-line
 import QueryParams from '../../../../../apps/remix-ide/src/lib/query-params'
 import { ThemeContext, themes } from './themeContext'
-import { TwitterTimelineEmbed } from 'react-twitter-embed'
 import { stat } from 'fs'
 
 declare global {
@@ -65,6 +63,20 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
         setState(prevState => { return { ...prevState, showMediaPanel: 'none' } })
       }
     })
+    // to retrieve twitter feed
+    const scriptTwitter = document.createElement('script')
+    scriptTwitter.src = 'https://platform.twitter.com/widgets.js'
+    scriptTwitter.async = true
+    document.body.appendChild(scriptTwitter)
+    // to retrieve medium publications
+    const scriptMedium = document.createElement('script')
+    scriptMedium.src = 'https://www.twilik.com/assets/retainable/rss-embed/retainable-rss-embed.js'
+    scriptMedium.async = true
+    document.body.appendChild(scriptMedium)
+    return () => {
+      document.body.removeChild(scriptTwitter)
+      document.body.removeChild(scriptMedium)
+    }
   }, [])
 
   const toast = (message: string) => {
@@ -205,10 +217,13 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
         </div>
       </ModalDialog>
       <Toaster message={state.toasterMsg} />
-      <div className="d-flex flex-column" id="remixUiRightPanel">
-        <div className="border-bottom d-flex flex-column justify-content-between clearfix py-3 mb-4">
-          <div className="mx-4 w-100 d-flex">
-            <img className="m-4 remixui_logoImg" src="assets/img/guitarRemiCroped.webp" onClick={ () => playRemi() } alt=""></img>
+      <div className="d-flex flex-column ml-4" id="remixUiRightPanel">
+        <div className="border-bottom d-flex justify-content-between mr-4 py-3 mb-4">
+          <div className="mx-4 my-4 d-flex">
+            <label style={ { fontSize: 'xxx-large', height: 'auto', alignSelf: 'flex-end' } }>Remix IDE</label>
+          </div>
+          <div className="mr-2 d-flex">
+            <img className="mt-4 mb-2 remixui_logoImg" src="assets/img/guitarRemiCroped.webp" onClick={ () => playRemi() } alt=""></img>
             <audio
               id="remiAudio"
               muted={false}
@@ -217,7 +232,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
             ></audio>
           </div>
         </div>
-        <div className="row remixui_hpSections mx-4" data-id="landingPageHpSections">
+        <div className="row remixui_hpSections mx-2 mr-4" data-id="landingPageHpSections">
           <div className="ml-3">
             <div className="mb-5">
               <h4>Featured Plugins</h4>
@@ -308,25 +323,34 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
               }}
             ></button>
           </div>
-          <div className="mr-3 d-flex bg-light remixui_panels" id="remixIDEMediaPanels">
-            { (state.showMediaPanel === 'medium') && <div id="remixIDE_MediumBlock" className="p-2 mx-0 mb-0 remixui_remixHomeMedia" style={ { maxHeight: maxHeight } }>
-              <div id="medium-widget" className="p-3 remixui_media" style={ { maxHeight: elHeight } }>
-                <Mediumfeed userName="remix-ide" postN="6"/>
+          <div className="mr-3 d-flex bg-light remixui_panels" style={ { visibility: state.showMediaPanel === 'none' ? 'hidden' : 'visible' } } id="remixIDEMediaPanels">
+            <div id="remixIDE_MediumBlock" className="p-2 mx-1 mt-3 mb-0 remixui_remixHomeMedia" style={ { maxHeight: maxHeight } }>
+              <div id="medium-widget" className="px-3 remixui_media" hidden={state.showMediaPanel !== 'medium'} style={ { maxHeight: elHeight } }>
+                <div
+                  id="retainable-rss-embed"
+                  data-rss="https://medium.com/feed/remix-ide"
+                  data-maxcols="1"
+                  data-layout="grid"
+                  data-poststyle="external"
+                  data-readmore="More..."
+                  data-buttonclass="btn mb-3"
+                  data-offset="-100"
+                >
+                </div>
               </div>
-            </div> }
-            { (state.showMediaPanel === 'twitter') && <div id="remixIDE_TwitterBlock" className="p-2 mx-0 mb-0 remixui_remixHomeMedia" style={ { maxHeight: maxHeight } } >
-              <div className="px-2 remixui_media" style={ { minHeight: elHeight } } >
-                <TwitterTimelineEmbed
-                  sourceType="profile"
-                  screenName="EthereumRemix"
-                  options={{ tweetLimit: 18, width: 350 }}
-                  transparent={true}
-                  noHeader={true}
-                  noFooter={true}
-                  theme={ state.themeQuality.name }
-                />
+            </div>
+            <div id="remixIDE_TwitterBlock" className="p-2 mx-1 mt-3 mb-0 remixui_remixHomeMedia" hidden={state.showMediaPanel !== 'twitter'} style={ { maxHeight: maxHeight, marginRight: '28px' } } >
+              <div className="remixui_media" style={ { minHeight: elHeight } } >
+                <a className="twitter-timeline"
+                  data-width="330"
+                  data-theme={ state.themeQuality.name }
+                  data-chrome="nofooter noheader transparent"
+                  data-tweet-limit="18"
+                  href="https://twitter.com/EthereumRemix"
+                >
+                </a>
               </div>
-            </div>}
+            </div>
           </div>
         </div>
       </div>

From 9c48b3f9bf855309f3657d00c8f452b3d5682205 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 26 Oct 2021 13:09:00 +0200
Subject: [PATCH 13/43] fix the layout

---
 .../src/app/ui/landing-page/landing-page.js   |  1 -
 .../home-tab/src/lib/remix-ui-home-tab.tsx    |  4 +---
 package-lock.json                             | 21 -------------------
 package.json                                  |  3 +--
 4 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
index 825948cf6c..8393bdd407 100644
--- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js
+++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
@@ -5,7 +5,6 @@ import * as packageJson from '../../../../../../package.json'
 import { ViewPlugin } from '@remixproject/engine-web'
 import { RemixUiHomeTab } from '@remix-ui/home-tab' // eslint-disable-line
 
-const yo = require('yo-yo')
 const globalRegistry = require('../../../global/registry')
 const GistHandler = require('../../../lib/gist-handler')
 
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
index 8af8978080..6ebdabdf20 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
@@ -6,8 +6,6 @@ import { Toaster } from '@remix-ui/toaster' // eslint-disable-line
 import PluginButton from './components/pluginButton' // eslint-disable-line
 import QueryParams from '../../../../../apps/remix-ide/src/lib/query-params'
 import { ThemeContext, themes } from './themeContext'
-import { stat } from 'fs'
-
 declare global {
   interface Window {
     _paq: any
@@ -222,7 +220,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
           <div className="mx-4 my-4 d-flex">
             <label style={ { fontSize: 'xxx-large', height: 'auto', alignSelf: 'flex-end' } }>Remix IDE</label>
           </div>
-          <div className="mr-2 d-flex">
+          <div className="mr-4 d-flex">
             <img className="mt-4 mb-2 remixui_logoImg" src="assets/img/guitarRemiCroped.webp" onClick={ () => playRemi() } alt=""></img>
             <audio
               id="remiAudio"
diff --git a/package-lock.json b/package-lock.json
index b645b66c46..cd8459e63d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46844,27 +46844,6 @@
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
-    "xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-      "requires": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
-      },
-      "dependencies": {
-        "sax": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-        }
-      }
-    },
-    "xmlbuilder": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
-    },
     "xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
diff --git a/package.json b/package.json
index 52ce130052..e04be0c418 100644
--- a/package.json
+++ b/package.json
@@ -197,8 +197,7 @@
     "tslib": "^2.3.0",
     "web3": "^1.5.1",
     "winston": "^3.3.3",
-    "ws": "^7.3.0",
-    "xml2js": "^0.4.23"
+    "ws": "^7.3.0"
   },
   "devDependencies": {
     "@babel/core": "^7.4.5",

From 7bcb280e535e19f1076f1f15ad32b9d5dab837de Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Wed, 27 Oct 2021 13:42:30 +0200
Subject: [PATCH 14/43] e2e test

---
 libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx b/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx
index ec0e02b2bd..468afc8756 100644
--- a/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx
@@ -15,7 +15,7 @@ function PluginButton ({ imgPath, envID, envText, callback }: PluginButtonProps)
   return (
     <button
       className="btn border-secondary d-flex mr-3 text-nowrap justify-content-center flex-column align-items-center remixui_envButton"
-      data-id="landingPageStart{envText"
+      data-id={'landingPageStart' + envText}
       onClick={() => callback()}
     >
       <img className="m-2 align-self-center remixui_envLogo" id={envID} src={imgPath} alt="" style={ { filter: themeFilter.filter } } />

From aca577276251ab8db8c919015042f531594c05ea Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 2 Nov 2021 12:42:19 +0100
Subject: [PATCH 15/43] used reducer

---
 .../home-tab/src/lib/remix-ui-home-tab.tsx    | 73 ++++++++++---------
 .../src/lib/remix-ui-modal-dialog.tsx         |  4 +-
 2 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
index 6ebdabdf20..59fc4f98c3 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useRef, useEffect } from 'react' // eslint-disable-line
+import React, { useState, useRef, useEffect, useReducer } from 'react' // eslint-disable-line
 
 import './remix-ui-home-tab.css'
 import { ModalDialog } from '@remix-ui/modal-dialog' // eslint-disable-line
@@ -19,10 +19,19 @@ export interface RemixUiHomeTabProps {
   registry: any
 }
 
+const loadingInitialState = {
+  tooltip: '',
+  showModalDialog: false,
+  importSource: ''
+}
+
+const loadingReducer = (state = loadingInitialState, action) => {
+  return {...state, tooltip: action.tooltip, showModalDialog: false, importSource: ''}
+}
+
 export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
   const { plugin, registry } = props
   const [state, setState] = useState<{
-    showBasicMigration: boolean,
     themeQuality: { filter: string, name: string },
     showMediaPanel: 'none' | 'twitter' | 'medium',
     showModalDialog: boolean,
@@ -30,7 +39,6 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
     importSource: string,
     toasterMsg: string
   }>({
-    showBasicMigration: false,
     themeQuality: registry.get('themeModule').api.currentTheme().quality === 'dark' ? themes.dark : themes.light,
     showMediaPanel: 'none',
     showModalDialog: false,
@@ -39,6 +47,32 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
     toasterMsg: ''
   })
 
+  const processLoading = () => {
+    const contentImport = plugin.contentImport
+    const fileProviders = registry.get('fileproviders').api
+    contentImport.import(
+      state.importSource,
+      (loadingMsg) => dispatch({tooltip: loadingMsg}),
+      (error, content, cleanUrl, type, url) => {
+        if (error) {
+          toast(error.message || error)
+        } else {
+          try {
+            fileProviders.workspace.addExternal(type + '/' + cleanUrl, content, url)
+            plugin.call('menuicons', 'select', 'filePanel')
+          } catch (e) {
+            toast(e.message)
+          }
+        }
+      }
+    )
+    setState(prevState => {
+      return { ...prevState, showModalDialog: false, importSource: '' }
+    })
+  }
+
+  const [state1, dispatch] = useReducer(loadingReducer, loadingInitialState)
+
   const playRemi = async () => {
     remiAudioEl.current.play()
   }
@@ -135,7 +169,6 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
   }
 
   const showFullMessage = (title: string, loadItem: string, examples: Array<string>) => {
-    console.log('showFullMessage')
     setState(prevState => {
       return { ...prevState, showModalDialog: true, modalInfo: { title: title, loadItem: loadItem , examples: examples } }
     })
@@ -147,31 +180,6 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
     })
   }
 
-  const processLoading = () => {
-    const contentImport = plugin.contentImport
-    const fileProviders = registry.get('fileproviders').api
-    contentImport.import(
-      state.importSource,
-      (loadingMsg) => { setState(prevState => { return { ...prevState, tooltip: loadingMsg } }) },
-      (error, content, cleanUrl, type, url) => {
-        if (error) {
-          toast(error.message || error)
-        } else {
-          try {
-            fileProviders.workspace.addExternal(type + '/' + cleanUrl, content, url)
-            plugin.call('menuicons', 'select', 'filePanel')
-          } catch (e) {
-            toast(e.message)
-
-          }
-        }
-      }
-    )
-    setState(prevState => {
-      return { ...prevState, showModalDialog: false }
-    })
-  }
-
   const maxHeight = Math.max(window.innerHeight - 150, 250) + 'px'
   const examples = state.modalInfo.examples.map((urlEl, key) => (<div key={key} className="p-1 user-select-auto"><a>{urlEl}</a></div>))
   const elHeight = '4000px'
@@ -182,12 +190,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
         okLabel='Import'
         hide={ !state.showModalDialog }
         handleHide={ () => hideFullMessage() }
-        okFn={ () => {
-          processLoading()
-          setState(prevState => {
-            return { ...prevState, importSource: '' }
-          })}
-        }
+        okFn={ () => processLoading() }
       >
         <div className="p-2 user-select-auto">
           { state.modalInfo.loadItem !== '' && <span>Enter the { state.modalInfo.loadItem } you would like to load.</span> }
diff --git a/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx b/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
index 6e5eb36723..bd3a07cf00 100644
--- a/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
+++ b/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
@@ -34,7 +34,9 @@ export const ModalDialog = (props: ModalDialogProps) => {
       modal.current.addEventListener('blur', handleBlur)
 
       return () => {
-        modal.current.removeEventListener('blur', handleBlur)
+        if (modal.current) {
+          modal.current.removeEventListener('blur', handleBlur)
+        }
       }
     }
   }, [modal.current])

From f8d2541c8d3e99cfd6b65941ef23d21993574957 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Fri, 17 Dec 2021 11:09:51 +0100
Subject: [PATCH 16/43] lib added

---
 .../home-tab/src/lib/remix-ui-home-tab.css    |  163 +-
 .../home-tab/src/lib/remix-ui-home-tab.tsx    |   22 +-
 package-lock.json                             | 2473 +++++++++++------
 tsconfig.base.json                            |    1 +
 4 files changed, 1721 insertions(+), 938 deletions(-)

diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
index 1f92cdd9e5..6644f4988e 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
@@ -1,83 +1,82 @@
 .remixui_text {
-    cursor: pointer;
-    font-weight: normal;
-    max-width: 300px;
-  }
-  .remixui_text:hover {
-    cursor: pointer;
-    text-decoration: underline;
-  }
-  .remixui_homeContainer {
-    overflow-y: hidden;
-    overflow-y: auto;
-    flex-grow: 3;
-  }
-  .remixui_hpLogoContainer {
-    margin: 30px;
-    padding-right: 90px;
-  }
-  .remixui_mediaBadge {
-   font-size: 2em;
-   height: 2em;
-   width: 2em;
-  }
-  .remixui_mediaBadge:focus {
-    outline: none;
-  }
-  .remixui_image {
-    height: 1em;
-    width: 1em;
-    text-align: center;
-  }
-  .remixui_logoImg {
-    height: 10em;
-  }
-  .remixui_rightPanel {
-    right: 0;
-    position: absolute;
-    z-index: 3;
-  }
-  .remixui_remixHomeMedia {
-    overflow-y: auto;
-    overflow-x: hidden;
-  }
-  .remixui_panels {
-    box-shadow: 0px 0px 13px -7px;
-  }
-  .remixui_labelIt {
-    margin-bottom: 0;
-  }
-  .remixui_bigLabelSize {
-    font-size: 13px;
-  }
-  .remixui_seeAll {
-    margin-top: 7px;
-    white-space: nowrap;
-  }
-  .remixui_importFrom p {
-    margin-right: 10px;
-  }
-  .remixui_logoContainer img{
-    height: 150px;
-    opacity: 0.7;
-  }
-  .remixui_envLogo {
-    height: 16px;
-  }
-  .remixui_cursorStyle {
-    cursor: pointer;
-  }
-  .remixui_envButton {
-    width: 120px;
-    height: 70px;
-  }
-  .remixui_media {
-    overflow: hidden;
-    max-width: 400px;
-    transition: .5s ease-out;
-    z-index: 1000;
-  }
-  .remixui_migrationBtn {
-    width: 100px;
-  }
-  
\ No newline at end of file
+  cursor: pointer;
+  font-weight: normal;
+  max-width: 300px;
+}
+.remixui_text:hover {
+  cursor: pointer;
+  text-decoration: underline;
+}
+.remixui_homeContainer {
+  overflow-y: hidden;
+  overflow-y: auto;
+  flex-grow: 3;
+}
+.remixui_hpLogoContainer {
+  margin: 30px;
+  padding-right: 90px;
+}
+.remixui_mediaBadge {
+  font-size: 2em;
+  height: 2em;
+  width: 2em;
+}
+.remixui_mediaBadge:focus {
+  outline: none;
+}
+.remixui_image {
+  height: 1em;
+  width: 1em;
+  text-align: center;
+}
+.remixui_logoImg {
+  height: 10em;
+}
+.remixui_rightPanel {
+  right: 0;
+  position: absolute;
+  z-index: 3;
+}
+.remixui_remixHomeMedia {
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+.remixui_panels {
+  box-shadow: 0px 0px 13px -7px;
+}
+.remixui_labelIt {
+  margin-bottom: 0;
+}
+.remixui_bigLabelSize {
+  font-size: 13px;
+}
+.remixui_seeAll {
+  margin-top: 7px;
+  white-space: nowrap;
+}
+.remixui_importFrom p {
+  margin-right: 10px;
+}
+.remixui_logoContainer img{
+  height: 150px;
+  opacity: 0.7;
+}
+.remixui_envLogo {
+  height: 16px;
+}
+.remixui_cursorStyle {
+  cursor: pointer;
+}
+.remixui_envButton {
+  width: 120px;
+  height: 70px;
+}
+.remixui_media {
+  overflow: hidden;
+  max-width: 400px;
+  transition: .5s ease-out;
+  z-index: 1000;
+}
+.remixui_migrationBtn {
+  width: 100px;
+}
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
index 59fc4f98c3..ec004e5098 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
@@ -26,7 +26,7 @@ const loadingInitialState = {
 }
 
 const loadingReducer = (state = loadingInitialState, action) => {
-  return {...state, tooltip: action.tooltip, showModalDialog: false, importSource: ''}
+  return { ...state, tooltip: action.tooltip, showModalDialog: false, importSource: '' }
 }
 
 export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
@@ -42,7 +42,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
     themeQuality: registry.get('themeModule').api.currentTheme().quality === 'dark' ? themes.dark : themes.light,
     showMediaPanel: 'none',
     showModalDialog: false,
-    modalInfo: { title: '', loadItem: '', examples: []},
+    modalInfo: { title: '', loadItem: '', examples: [] },
     importSource: '',
     toasterMsg: ''
   })
@@ -52,7 +52,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
     const fileProviders = registry.get('fileproviders').api
     contentImport.import(
       state.importSource,
-      (loadingMsg) => dispatch({tooltip: loadingMsg}),
+      (loadingMsg) => dispatch({ tooltip: loadingMsg }),
       (error, content, cleanUrl, type, url) => {
         if (error) {
           toast(error.message || error)
@@ -71,7 +71,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
     })
   }
 
-  const [state1, dispatch] = useReducer(loadingReducer, loadingInitialState)
+  const [, dispatch] = useReducer(loadingReducer, loadingInitialState)
 
   const playRemi = async () => {
     remiAudioEl.current.play()
@@ -170,7 +170,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
 
   const showFullMessage = (title: string, loadItem: string, examples: Array<string>) => {
     setState(prevState => {
-      return { ...prevState, showModalDialog: true, modalInfo: { title: title, loadItem: loadItem , examples: examples } }
+      return { ...prevState, showModalDialog: true, modalInfo: { title: title, loadItem: loadItem, examples: examples } }
     })
   }
 
@@ -205,9 +205,9 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
             ref={inputValue}
             type='text'
             name='prompt_text'
-            id='prompt_text'
-            className="w-100 form-control"
-            data-id="modalDialogCustomPromptText"
+            id='inputPrompt_text'
+            className="w-100 mt-1 form-control"
+            data-id="importModalDialogCustomPromptText"
             value={state.importSource}
             onInput={(e) => {
               setState(prevState => {
@@ -219,7 +219,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
       </ModalDialog>
       <Toaster message={state.toasterMsg} />
       <div className="d-flex flex-column ml-4" id="remixUiRightPanel">
-        <div className="border-bottom d-flex justify-content-between mr-4 py-3 mb-4">
+        <div className="border-bottom d-flex justify-content-between mr-4 pb-3 mb-3">
           <div className="mx-4 my-4 d-flex">
             <label style={ { fontSize: 'xxx-large', height: 'auto', alignSelf: 'flex-end' } }>Remix IDE</label>
           </div>
@@ -257,13 +257,13 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
                 </p>
                 <p className="mb-1">
                   <i className="mr-2 far fa-file-alt"></i>
-                  <label className="ml-1 remixui_labelIt remixui_bigLabelSize} remixui_text">
+                  <span className="ml-1 remixui_labelIt remixui_bigLabelSize} remixui_text">
                     Open Files
                     <input title="open file" type="file" onChange={(event) => {
                       event.stopPropagation()
                       uploadFile(event.target)
                     }} multiple />
-                  </label>
+                  </span>
                 </p>
                 <p className="mb-1">
                   <i className="mr-1 far fa-hdd"></i>
diff --git a/package-lock.json b/package-lock.json
index cd8459e63d..ecc8e4454f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,35 +5,32 @@
   "requires": true,
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
-      "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
-      "dev": true,
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz",
+      "integrity": "sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==",
       "requires": {
-        "@babel/highlight": "^7.16.0"
+        "@babel/highlight": "^7.14.5"
       }
     },
     "@babel/compat-data": {
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.0.tgz",
-      "integrity": "sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew==",
-      "dev": true
+      "integrity": "sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew=="
     },
     "@babel/core": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.0.tgz",
-      "integrity": "sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.16.0",
-        "@babel/generator": "^7.16.0",
-        "@babel/helper-compilation-targets": "^7.16.0",
-        "@babel/helper-module-transforms": "^7.16.0",
-        "@babel/helpers": "^7.16.0",
-        "@babel/parser": "^7.16.0",
-        "@babel/template": "^7.16.0",
-        "@babel/traverse": "^7.16.0",
-        "@babel/types": "^7.16.0",
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz",
+      "integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==",
+      "requires": {
+        "@babel/code-frame": "^7.15.8",
+        "@babel/generator": "^7.15.8",
+        "@babel/helper-compilation-targets": "^7.15.4",
+        "@babel/helper-module-transforms": "^7.15.8",
+        "@babel/helpers": "^7.15.4",
+        "@babel/parser": "^7.15.8",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.6",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -43,12 +40,11 @@
       }
     },
     "@babel/generator": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz",
-      "integrity": "sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==",
-      "dev": true,
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
+      "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
       "requires": {
-        "@babel/types": "^7.16.0",
+        "@babel/types": "^7.15.6",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       }
@@ -222,12 +218,35 @@
       "version": "7.16.3",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz",
       "integrity": "sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==",
-      "dev": true,
       "requires": {
         "@babel/compat-data": "^7.16.0",
         "@babel/helper-validator-option": "^7.14.5",
         "browserslist": "^4.17.5",
         "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "browserslist": {
+          "version": "4.19.1",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+          "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
+          "requires": {
+            "caniuse-lite": "^1.0.30001286",
+            "electron-to-chromium": "^1.4.17",
+            "escalade": "^3.1.1",
+            "node-releases": "^2.0.1",
+            "picocolors": "^1.0.0"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001287",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001287.tgz",
+          "integrity": "sha512-4udbs9bc0hfNrcje++AxBuc6PfLNHwh3PO9kbwnfCQWyqtlzg3py0YgFu8jyRTTo85VAz4U+VLxSlID09vNtWA=="
+        },
+        "electron-to-chromium": {
+          "version": "1.4.23",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.23.tgz",
+          "integrity": "sha512-q3tB59Api3+DMbLnDPkW/UBHBO7KTGcF+rDCeb0GAGyqFj562s6y+c/2tDKTS/y5lbC+JOvT4MSUALJLPqlcSA=="
+        }
       }
     },
     "@babel/helper-create-class-features-plugin": {
@@ -358,6 +377,15 @@
         "semver": "^6.1.2"
       }
     },
+    "@babel/helper-environment-visitor": {
+      "version": "7.16.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz",
+      "integrity": "sha512-ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.16.0"
+      }
+    },
     "@babel/helper-explode-assignable-expression": {
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz",
@@ -371,7 +399,6 @@
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz",
       "integrity": "sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==",
-      "dev": true,
       "requires": {
         "@babel/helper-get-function-arity": "^7.16.0",
         "@babel/template": "^7.16.0",
@@ -382,7 +409,6 @@
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz",
       "integrity": "sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.16.0"
       }
@@ -391,7 +417,6 @@
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz",
       "integrity": "sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.16.0"
       }
@@ -400,7 +425,6 @@
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz",
       "integrity": "sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.16.0"
       }
@@ -409,32 +433,29 @@
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz",
       "integrity": "sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.16.0"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz",
-      "integrity": "sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.16.0",
-        "@babel/helper-replace-supers": "^7.16.0",
-        "@babel/helper-simple-access": "^7.16.0",
-        "@babel/helper-split-export-declaration": "^7.16.0",
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz",
+      "integrity": "sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.15.4",
+        "@babel/helper-replace-supers": "^7.15.4",
+        "@babel/helper-simple-access": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4",
         "@babel/helper-validator-identifier": "^7.15.7",
-        "@babel/template": "^7.16.0",
-        "@babel/traverse": "^7.16.0",
-        "@babel/types": "^7.16.0"
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.6"
       }
     },
     "@babel/helper-optimise-call-expression": {
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz",
       "integrity": "sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.16.0"
       }
@@ -468,7 +489,6 @@
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz",
       "integrity": "sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA==",
-      "dev": true,
       "requires": {
         "@babel/helper-member-expression-to-functions": "^7.16.0",
         "@babel/helper-optimise-call-expression": "^7.16.0",
@@ -480,7 +500,6 @@
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz",
       "integrity": "sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.16.0"
       }
@@ -498,7 +517,6 @@
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz",
       "integrity": "sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.16.0"
       }
@@ -511,8 +529,7 @@
     "@babel/helper-validator-option": {
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
-      "dev": true
+      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="
     },
     "@babel/helper-wrap-function": {
       "version": "7.16.0",
@@ -530,7 +547,6 @@
       "version": "7.16.3",
       "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.3.tgz",
       "integrity": "sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w==",
-      "dev": true,
       "requires": {
         "@babel/template": "^7.16.0",
         "@babel/traverse": "^7.16.3",
@@ -541,7 +557,6 @@
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz",
       "integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==",
-      "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.15.7",
         "chalk": "^2.0.0",
@@ -549,19 +564,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.3.tgz",
-      "integrity": "sha512-dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw==",
-      "dev": true
-    },
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.16.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz",
-      "integrity": "sha512-h37CvpLSf8gb2lIJ2CgC3t+EjFbi0t8qS7LCS1xcJIlEXE4czlofwaW7W1HA8zpgOCzI9C1nmoqNR1zWkk0pQg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz",
+      "integrity": "sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA=="
     },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
       "version": "7.16.0",
@@ -575,13 +580,13 @@
       }
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.0.tgz",
-      "integrity": "sha512-nyYmIo7ZqKsY6P4lnVmBlxp9B3a96CscbLotlsNuktMHahkDwoPYEjXrZHU0Tj844Z9f1IthVxQln57mhkcExw==",
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz",
+      "integrity": "sha512-2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-remap-async-to-generator": "^7.16.0",
+        "@babel/helper-remap-async-to-generator": "^7.15.4",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
@@ -1241,6 +1246,68 @@
         "@babel/helper-module-transforms": "^7.16.0",
         "@babel/helper-plugin-utils": "^7.14.5",
         "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.16.0",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
+          "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.16.0"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.16.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz",
+          "integrity": "sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.16.0",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.16.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz",
+          "integrity": "sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-environment-visitor": "^7.16.5",
+            "@babel/helper-module-imports": "^7.16.0",
+            "@babel/helper-simple-access": "^7.16.0",
+            "@babel/helper-split-export-declaration": "^7.16.0",
+            "@babel/helper-validator-identifier": "^7.15.7",
+            "@babel/template": "^7.16.0",
+            "@babel/traverse": "^7.16.5",
+            "@babel/types": "^7.16.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.16.6",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz",
+          "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.16.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.5.tgz",
+          "integrity": "sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.16.0",
+            "@babel/generator": "^7.16.5",
+            "@babel/helper-environment-visitor": "^7.16.5",
+            "@babel/helper-function-name": "^7.16.0",
+            "@babel/helper-hoist-variables": "^7.16.0",
+            "@babel/helper-split-export-declaration": "^7.16.0",
+            "@babel/parser": "^7.16.5",
+            "@babel/types": "^7.16.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        }
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
@@ -1253,6 +1320,68 @@
         "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/helper-simple-access": "^7.16.0",
         "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.16.0",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
+          "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.16.0"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.16.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz",
+          "integrity": "sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.16.0",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.16.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz",
+          "integrity": "sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-environment-visitor": "^7.16.5",
+            "@babel/helper-module-imports": "^7.16.0",
+            "@babel/helper-simple-access": "^7.16.0",
+            "@babel/helper-split-export-declaration": "^7.16.0",
+            "@babel/helper-validator-identifier": "^7.15.7",
+            "@babel/template": "^7.16.0",
+            "@babel/traverse": "^7.16.5",
+            "@babel/types": "^7.16.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.16.6",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz",
+          "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.16.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.5.tgz",
+          "integrity": "sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.16.0",
+            "@babel/generator": "^7.16.5",
+            "@babel/helper-environment-visitor": "^7.16.5",
+            "@babel/helper-function-name": "^7.16.0",
+            "@babel/helper-hoist-variables": "^7.16.0",
+            "@babel/helper-split-export-declaration": "^7.16.0",
+            "@babel/parser": "^7.16.5",
+            "@babel/types": "^7.16.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        }
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
@@ -1266,6 +1395,68 @@
         "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/helper-validator-identifier": "^7.15.7",
         "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.16.0",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
+          "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.16.0"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.16.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz",
+          "integrity": "sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.16.0",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.16.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz",
+          "integrity": "sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-environment-visitor": "^7.16.5",
+            "@babel/helper-module-imports": "^7.16.0",
+            "@babel/helper-simple-access": "^7.16.0",
+            "@babel/helper-split-export-declaration": "^7.16.0",
+            "@babel/helper-validator-identifier": "^7.15.7",
+            "@babel/template": "^7.16.0",
+            "@babel/traverse": "^7.16.5",
+            "@babel/types": "^7.16.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.16.6",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz",
+          "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.16.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.5.tgz",
+          "integrity": "sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.16.0",
+            "@babel/generator": "^7.16.5",
+            "@babel/helper-environment-visitor": "^7.16.5",
+            "@babel/helper-function-name": "^7.16.0",
+            "@babel/helper-hoist-variables": "^7.16.0",
+            "@babel/helper-split-export-declaration": "^7.16.0",
+            "@babel/parser": "^7.16.5",
+            "@babel/types": "^7.16.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        }
       }
     },
     "@babel/plugin-transform-modules-umd": {
@@ -1276,6 +1467,68 @@
       "requires": {
         "@babel/helper-module-transforms": "^7.16.0",
         "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.16.0",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
+          "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.16.0"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.16.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz",
+          "integrity": "sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.16.0",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.16.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz",
+          "integrity": "sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-environment-visitor": "^7.16.5",
+            "@babel/helper-module-imports": "^7.16.0",
+            "@babel/helper-simple-access": "^7.16.0",
+            "@babel/helper-split-export-declaration": "^7.16.0",
+            "@babel/helper-validator-identifier": "^7.15.7",
+            "@babel/template": "^7.16.0",
+            "@babel/traverse": "^7.16.5",
+            "@babel/types": "^7.16.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.16.6",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz",
+          "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.16.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.5.tgz",
+          "integrity": "sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.16.0",
+            "@babel/generator": "^7.16.5",
+            "@babel/helper-environment-visitor": "^7.16.5",
+            "@babel/helper-function-name": "^7.16.0",
+            "@babel/helper-hoist-variables": "^7.16.0",
+            "@babel/helper-split-export-declaration": "^7.16.0",
+            "@babel/parser": "^7.16.5",
+            "@babel/types": "^7.16.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        }
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
@@ -1420,17 +1673,29 @@
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.0.tgz",
-      "integrity": "sha512-zlPf1/XFn5+vWdve3AAhf+Sxl+MVa5VlwTwWgnLx23u4GlatSRQJ3Eoo9vllf0a9il3woQsT4SK+5Z7c06h8ag==",
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.8.tgz",
+      "integrity": "sha512-+6zsde91jMzzvkzuEA3k63zCw+tm/GvuuabkpisgbDMTPQsIMHllE3XczJFFtEHLjjhKQFZmGQVRdELetlWpVw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.16.0",
+        "@babel/helper-module-imports": "^7.15.4",
         "@babel/helper-plugin-utils": "^7.14.5",
-        "babel-plugin-polyfill-corejs2": "^0.2.3",
-        "babel-plugin-polyfill-corejs3": "^0.3.0",
-        "babel-plugin-polyfill-regenerator": "^0.2.3",
+        "babel-plugin-polyfill-corejs2": "^0.2.2",
+        "babel-plugin-polyfill-corejs3": "^0.2.5",
+        "babel-plugin-polyfill-regenerator": "^0.2.2",
         "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "babel-plugin-polyfill-corejs3": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz",
+          "integrity": "sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-define-polyfill-provider": "^0.2.2",
+            "core-js-compat": "^3.16.2"
+          }
+        }
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
@@ -1443,13 +1708,13 @@
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.0.tgz",
-      "integrity": "sha512-Ao4MSYRaLAQczZVp9/7E7QHsCuK92yHRrmVNRe/SlEJjhzivq0BSn8mEraimL8wizHZ3fuaHxKH0iwzI13GyGg==",
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.15.8.tgz",
+      "integrity": "sha512-/daZ8s2tNaRekl9YJa9X4bzjpeRZLt122cpgFnQPLGUe61PH8zMEBmYqKkW5xF5JUEh5buEGXJoQpqBmIbpmEQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
@@ -1480,14 +1745,14 @@
       }
     },
     "@babel/plugin-transform-typescript": {
-      "version": "7.16.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.1.tgz",
-      "integrity": "sha512-NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg==",
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.8.tgz",
+      "integrity": "sha512-ZXIkJpbaf6/EsmjeTbiJN/yMxWPFWvlr7sEG1P95Xb4S4IBcrf2n7s/fItIhsAmOf8oSh3VJPDppO6ExfAfKRQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.16.0",
+        "@babel/helper-create-class-features-plugin": "^7.15.4",
         "@babel/helper-plugin-utils": "^7.14.5",
-        "@babel/plugin-syntax-typescript": "^7.16.0"
+        "@babel/plugin-syntax-typescript": "^7.14.5"
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
@@ -1520,32 +1785,31 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.0.tgz",
-      "integrity": "sha512-cdTu/W0IrviamtnZiTfixPfIncr2M1VqRrkjzZWlr1B4TVYimCFK5jkyOdP4qw2MrlKHi+b3ORj6x8GoCew8Dg==",
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.8.tgz",
+      "integrity": "sha512-rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.16.0",
-        "@babel/helper-compilation-targets": "^7.16.0",
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-compilation-targets": "^7.15.4",
         "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/helper-validator-option": "^7.14.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.0",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.0",
-        "@babel/plugin-proposal-async-generator-functions": "^7.16.0",
-        "@babel/plugin-proposal-class-properties": "^7.16.0",
-        "@babel/plugin-proposal-class-static-block": "^7.16.0",
-        "@babel/plugin-proposal-dynamic-import": "^7.16.0",
-        "@babel/plugin-proposal-export-namespace-from": "^7.16.0",
-        "@babel/plugin-proposal-json-strings": "^7.16.0",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.0",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.0",
-        "@babel/plugin-proposal-object-rest-spread": "^7.16.0",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.0",
-        "@babel/plugin-proposal-private-methods": "^7.16.0",
-        "@babel/plugin-proposal-private-property-in-object": "^7.16.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.16.0",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.15.4",
+        "@babel/plugin-proposal-async-generator-functions": "^7.15.8",
+        "@babel/plugin-proposal-class-properties": "^7.14.5",
+        "@babel/plugin-proposal-class-static-block": "^7.15.4",
+        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
+        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
+        "@babel/plugin-proposal-json-strings": "^7.14.5",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
+        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
+        "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+        "@babel/plugin-proposal-private-methods": "^7.14.5",
+        "@babel/plugin-proposal-private-property-in-object": "^7.15.4",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
@@ -1560,45 +1824,57 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.16.0",
-        "@babel/plugin-transform-async-to-generator": "^7.16.0",
-        "@babel/plugin-transform-block-scoped-functions": "^7.16.0",
-        "@babel/plugin-transform-block-scoping": "^7.16.0",
-        "@babel/plugin-transform-classes": "^7.16.0",
-        "@babel/plugin-transform-computed-properties": "^7.16.0",
-        "@babel/plugin-transform-destructuring": "^7.16.0",
-        "@babel/plugin-transform-dotall-regex": "^7.16.0",
-        "@babel/plugin-transform-duplicate-keys": "^7.16.0",
-        "@babel/plugin-transform-exponentiation-operator": "^7.16.0",
-        "@babel/plugin-transform-for-of": "^7.16.0",
-        "@babel/plugin-transform-function-name": "^7.16.0",
-        "@babel/plugin-transform-literals": "^7.16.0",
-        "@babel/plugin-transform-member-expression-literals": "^7.16.0",
-        "@babel/plugin-transform-modules-amd": "^7.16.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.16.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.16.0",
-        "@babel/plugin-transform-modules-umd": "^7.16.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.0",
-        "@babel/plugin-transform-new-target": "^7.16.0",
-        "@babel/plugin-transform-object-super": "^7.16.0",
-        "@babel/plugin-transform-parameters": "^7.16.0",
-        "@babel/plugin-transform-property-literals": "^7.16.0",
-        "@babel/plugin-transform-regenerator": "^7.16.0",
-        "@babel/plugin-transform-reserved-words": "^7.16.0",
-        "@babel/plugin-transform-shorthand-properties": "^7.16.0",
-        "@babel/plugin-transform-spread": "^7.16.0",
-        "@babel/plugin-transform-sticky-regex": "^7.16.0",
-        "@babel/plugin-transform-template-literals": "^7.16.0",
-        "@babel/plugin-transform-typeof-symbol": "^7.16.0",
-        "@babel/plugin-transform-unicode-escapes": "^7.16.0",
-        "@babel/plugin-transform-unicode-regex": "^7.16.0",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.16.0",
-        "babel-plugin-polyfill-corejs2": "^0.2.3",
-        "babel-plugin-polyfill-corejs3": "^0.3.0",
-        "babel-plugin-polyfill-regenerator": "^0.2.3",
-        "core-js-compat": "^3.19.0",
+        "@babel/plugin-transform-arrow-functions": "^7.14.5",
+        "@babel/plugin-transform-async-to-generator": "^7.14.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
+        "@babel/plugin-transform-block-scoping": "^7.15.3",
+        "@babel/plugin-transform-classes": "^7.15.4",
+        "@babel/plugin-transform-computed-properties": "^7.14.5",
+        "@babel/plugin-transform-destructuring": "^7.14.7",
+        "@babel/plugin-transform-dotall-regex": "^7.14.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
+        "@babel/plugin-transform-for-of": "^7.15.4",
+        "@babel/plugin-transform-function-name": "^7.14.5",
+        "@babel/plugin-transform-literals": "^7.14.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
+        "@babel/plugin-transform-modules-amd": "^7.14.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.15.4",
+        "@babel/plugin-transform-modules-systemjs": "^7.15.4",
+        "@babel/plugin-transform-modules-umd": "^7.14.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
+        "@babel/plugin-transform-new-target": "^7.14.5",
+        "@babel/plugin-transform-object-super": "^7.14.5",
+        "@babel/plugin-transform-parameters": "^7.15.4",
+        "@babel/plugin-transform-property-literals": "^7.14.5",
+        "@babel/plugin-transform-regenerator": "^7.14.5",
+        "@babel/plugin-transform-reserved-words": "^7.14.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
+        "@babel/plugin-transform-spread": "^7.15.8",
+        "@babel/plugin-transform-sticky-regex": "^7.14.5",
+        "@babel/plugin-transform-template-literals": "^7.14.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
+        "@babel/plugin-transform-unicode-regex": "^7.14.5",
+        "@babel/preset-modules": "^0.1.4",
+        "@babel/types": "^7.15.6",
+        "babel-plugin-polyfill-corejs2": "^0.2.2",
+        "babel-plugin-polyfill-corejs3": "^0.2.5",
+        "babel-plugin-polyfill-regenerator": "^0.2.2",
+        "core-js-compat": "^3.16.0",
         "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "babel-plugin-polyfill-corejs3": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz",
+          "integrity": "sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-define-polyfill-provider": "^0.2.2",
+            "core-js-compat": "^3.16.2"
+          }
+        }
       }
     },
     "@babel/preset-es2015": {
@@ -2355,24 +2631,45 @@
       "requires": {
         "core-js-pure": "^3.19.0",
         "regenerator-runtime": "^0.13.4"
+      },
+      "dependencies": {
+        "core-js-pure": {
+          "version": "3.20.0",
+          "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.20.0.tgz",
+          "integrity": "sha512-qsrbIwWSEEYOM7z616jAVgwhuDDtPLwZSpUsU3vyUkHYqKTf/uwOJBZg2V7lMurYWkpVlaVOxBrfX0Q3ppvjfg==",
+          "dev": true
+        }
       }
     },
     "@babel/template": {
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz",
       "integrity": "sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==",
-      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.16.0",
         "@babel/parser": "^7.16.0",
         "@babel/types": "^7.16.0"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.16.0",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
+          "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
+          "requires": {
+            "@babel/highlight": "^7.16.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.16.6",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz",
+          "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ=="
+        }
       }
     },
     "@babel/traverse": {
       "version": "7.16.3",
       "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz",
       "integrity": "sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==",
-      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.16.0",
         "@babel/generator": "^7.16.0",
@@ -2383,13 +2680,37 @@
         "@babel/types": "^7.16.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.16.0",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
+          "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
+          "requires": {
+            "@babel/highlight": "^7.16.0"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.16.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz",
+          "integrity": "sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==",
+          "requires": {
+            "@babel/types": "^7.16.0",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.16.6",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz",
+          "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ=="
+        }
       }
     },
     "@babel/types": {
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz",
       "integrity": "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==",
-      "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.15.7",
         "to-fast-properties": "^2.0.0"
@@ -3563,7 +3884,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
       "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
       "requires": {
         "camelcase": "^5.3.1",
         "find-up": "^4.1.0",
@@ -3576,7 +3896,6 @@
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
           "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
           "requires": {
             "locate-path": "^5.0.0",
             "path-exists": "^4.0.0"
@@ -3586,7 +3905,6 @@
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
           "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
           "requires": {
             "p-locate": "^4.1.0"
           }
@@ -3595,7 +3913,6 @@
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
           "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
           "requires": {
             "p-try": "^2.0.0"
           }
@@ -3604,7 +3921,6 @@
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
           "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
           "requires": {
             "p-limit": "^2.2.0"
           }
@@ -3612,40 +3928,36 @@
         "p-try": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
         },
         "path-exists": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
         },
         "resolve-from": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-          "dev": true
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
         }
       }
     },
     "@istanbuljs/schema": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="
     },
     "@jest/console": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.3.1.tgz",
-      "integrity": "sha512-RkFNWmv0iui+qsOr/29q9dyfKTTT5DCuP31kUwg7rmOKPT/ozLeGLKJKVIiOfbiKyleUZKIrHwhmiZWVe8IMdw==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.2.5.tgz",
+      "integrity": "sha512-smtlRF9vNKorRMCUtJ+yllIoiY8oFmfFG7xlzsAE76nKEwXNhjPOJIsc7Dv+AUitVt76t+KjIpUP9m98Crn2LQ==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^27.3.1",
-        "jest-util": "^27.3.1",
+        "jest-message-util": "^27.2.5",
+        "jest-util": "^27.2.5",
         "slash": "^3.0.0"
       },
       "dependencies": {
@@ -3717,17 +4029,26 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
@@ -3743,15 +4064,15 @@
       }
     },
     "@jest/core": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.3.1.tgz",
-      "integrity": "sha512-DMNE90RR5QKx0EA+wqe3/TNEwiRpOkhshKNxtLxd4rt3IZpCt+RSL+FoJsGeblRZmqdK4upHA/mKKGPPRAifhg==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.2.5.tgz",
+      "integrity": "sha512-VR7mQ+jykHN4WO3OvusRJMk4xCa2MFLipMS+43fpcRGaYrN1KwMATfVEXif7ccgFKYGy5D1TVXTNE4mGq/KMMA==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.3.1",
-        "@jest/reporters": "^27.3.1",
-        "@jest/test-result": "^27.3.1",
-        "@jest/transform": "^27.3.1",
+        "@jest/console": "^27.2.5",
+        "@jest/reporters": "^27.2.5",
+        "@jest/test-result": "^27.2.5",
+        "@jest/transform": "^27.2.5",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
@@ -3759,19 +4080,19 @@
         "emittery": "^0.8.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^27.3.0",
-        "jest-config": "^27.3.1",
-        "jest-haste-map": "^27.3.1",
-        "jest-message-util": "^27.3.1",
+        "jest-changed-files": "^27.2.5",
+        "jest-config": "^27.2.5",
+        "jest-haste-map": "^27.2.5",
+        "jest-message-util": "^27.2.5",
         "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.3.1",
-        "jest-resolve-dependencies": "^27.3.1",
-        "jest-runner": "^27.3.1",
-        "jest-runtime": "^27.3.1",
-        "jest-snapshot": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "jest-validate": "^27.3.1",
-        "jest-watcher": "^27.3.1",
+        "jest-resolve": "^27.2.5",
+        "jest-resolve-dependencies": "^27.2.5",
+        "jest-runner": "^27.2.5",
+        "jest-runtime": "^27.2.5",
+        "jest-snapshot": "^27.2.5",
+        "jest-util": "^27.2.5",
+        "jest-validate": "^27.2.5",
+        "jest-watcher": "^27.2.5",
         "micromatch": "^4.0.4",
         "rimraf": "^3.0.0",
         "slash": "^3.0.0",
@@ -3779,9 +4100,9 @@
       },
       "dependencies": {
         "@jest/transform": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.3.1.tgz",
-          "integrity": "sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.2.5.tgz",
+          "integrity": "sha512-29lRtAHHYGALbZOx343v0zKmdOg4Sb0rsA1uSv0818bvwRhs3TyElOmTVXlrw0v1ZTqXJCAH/cmoDXimBhQOJQ==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.1.0",
@@ -3791,9 +4112,9 @@
             "convert-source-map": "^1.4.0",
             "fast-json-stable-stringify": "^2.0.0",
             "graceful-fs": "^4.2.4",
-            "jest-haste-map": "^27.3.1",
+            "jest-haste-map": "^27.2.5",
             "jest-regex-util": "^27.0.6",
-            "jest-util": "^27.3.1",
+            "jest-util": "^27.2.5",
             "micromatch": "^4.0.4",
             "pirates": "^4.0.1",
             "slash": "^3.0.0",
@@ -3913,6 +4234,15 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "is-number": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -3920,9 +4250,9 @@
           "dev": true
         },
         "jest-haste-map": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.3.1.tgz",
-          "integrity": "sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.2.5.tgz",
+          "integrity": "sha512-pzO+Gw2WLponaSi0ilpzYBE0kuVJstoXBX8YWyUebR8VaXuX4tzzn0Zp23c/WaETo7XYTGv2e8KdnpiskAFMhQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -3934,8 +4264,8 @@
             "graceful-fs": "^4.2.4",
             "jest-regex-util": "^27.0.6",
             "jest-serializer": "^27.0.6",
-            "jest-util": "^27.3.1",
-            "jest-worker": "^27.3.1",
+            "jest-util": "^27.2.5",
+            "jest-worker": "^27.2.5",
             "micromatch": "^4.0.4",
             "walker": "^1.0.7"
           }
@@ -3947,20 +4277,20 @@
           "dev": true
         },
         "jest-resolve": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.3.1.tgz",
-          "integrity": "sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.2.5.tgz",
+          "integrity": "sha512-q5irwS3oS73SKy3+FM/HL2T7WJftrk9BRzrXF92f7net5HMlS7lJMg/ZwxLB4YohKqjSsdksEw7n/jvMxV7EKg==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "chalk": "^4.0.0",
+            "escalade": "^3.1.1",
             "graceful-fs": "^4.2.4",
-            "jest-haste-map": "^27.3.1",
+            "jest-haste-map": "^27.2.5",
             "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^27.3.1",
-            "jest-validate": "^27.3.1",
+            "jest-util": "^27.2.5",
+            "jest-validate": "^27.2.5",
             "resolve": "^1.20.0",
-            "resolve.exports": "^1.1.0",
             "slash": "^3.0.0"
           }
         },
@@ -3975,23 +4305,23 @@
           }
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
         "jest-worker": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
-          "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.5.tgz",
+          "integrity": "sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==",
           "dev": true,
           "requires": {
             "@types/node": "*",
@@ -4062,15 +4392,15 @@
       }
     },
     "@jest/environment": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.3.1.tgz",
-      "integrity": "sha512-BCKCj4mOVLme6Tanoyc9k0ultp3pnmuyHw73UHRPeeZxirsU/7E3HC4le/VDb/SMzE1JcPnto+XBKFOcoiJzVw==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.2.5.tgz",
+      "integrity": "sha512-XvUW3q6OUF+54SYFCgbbfCd/BKTwm5b2MGLoc2jINXQLKQDTCS2P2IrpPOtQ08WWZDGzbhAzVhOYta3J2arubg==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^27.3.1",
+        "@jest/fake-timers": "^27.2.5",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
-        "jest-mock": "^27.3.0"
+        "jest-mock": "^27.2.5"
       },
       "dependencies": {
         "@jest/types": {
@@ -4114,6 +4444,11 @@
             "supports-color": "^7.1.0"
           }
         },
+        "ci-info": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
+          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A=="
+        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -4147,24 +4482,23 @@
       }
     },
     "@jest/fake-timers": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.3.1.tgz",
-      "integrity": "sha512-M3ZFgwwlqJtWZ+QkBG5NmC23A9w+A6ZxNsO5nJxJsKYt4yguBd3i8TpjQz5NfCX91nEve1KqD9RA2Q+Q1uWqoA==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.2.5.tgz",
+      "integrity": "sha512-ZGUb6jg7BgwY+nmO0TW10bc7z7Hl2G/UTAvmxEyZ/GgNFoa31tY9/cgXmqcxnnZ7o5Xs7RAOz3G1SKIj8IVDlg==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "@sinonjs/fake-timers": "^8.0.1",
         "@types/node": "*",
-        "jest-message-util": "^27.3.1",
-        "jest-mock": "^27.3.0",
-        "jest-util": "^27.3.1"
+        "jest-message-util": "^27.2.5",
+        "jest-mock": "^27.2.5",
+        "jest-util": "^27.2.5"
       },
       "dependencies": {
         "@jest/types": {
           "version": "27.2.5",
           "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
           "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
-          "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
@@ -4177,7 +4511,6 @@
           "version": "16.0.4",
           "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
           "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
           }
@@ -4186,7 +4519,6 @@
           "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"
           }
@@ -4195,7 +4527,6 @@
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
@@ -4211,7 +4542,6 @@
           "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"
           }
@@ -4219,26 +4549,88 @@
         "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
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
         },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
-        "jest-util": {
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
+        "istanbul-lib-instrument": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+          "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+          "requires": {
+            "@babel/core": "^7.7.5",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.0.0",
+            "semver": "^6.3.0"
+          }
+        },
+        "jest-haste-map": {
           "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.3.1.tgz",
+          "integrity": "sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg==",
+          "requires": {
+            "@jest/types": "^27.2.5",
+            "@types/graceful-fs": "^4.1.2",
+            "@types/node": "*",
+            "fb-watchman": "^2.0.0",
+            "graceful-fs": "^4.2.4",
+            "jest-regex-util": "^27.0.6",
+            "jest-serializer": "^27.0.6",
+            "walker": "^1.0.7"
+          }
+        },
+        "jest-regex-util": {
+          "version": "27.0.6",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.6.tgz",
+          "integrity": "sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ=="
+        },
+        "jest-resolve": {
+          "version": "27.3.1",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.3.1.tgz",
+          "integrity": "sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw==",
+          "requires": {
+            "@jest/types": "^27.2.5",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "jest-haste-map": "^27.3.1",
+            "jest-pnp-resolver": "^1.2.2",
+            "resolve": "^1.20.0",
+            "resolve.exports": "^1.1.0",
+            "slash": "^3.0.0"
+          }
+        },
+        "jest-serializer": {
+          "version": "27.0.6",
+          "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.0.6.tgz",
+          "integrity": "sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA==",
+          "requires": {
+            "@types/node": "*",
+            "graceful-fs": "^4.2.4"
+          }
+        },
+        "jest-util": {
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
@@ -4246,7 +4638,6 @@
           "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"
           }
@@ -4254,14 +4645,14 @@
       }
     },
     "@jest/globals": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.3.1.tgz",
-      "integrity": "sha512-Q651FWiWQAIFiN+zS51xqhdZ8g9b88nGCobC87argAxA7nMfNQq0Q0i9zTfQYgLa6qFXk2cGANEqfK051CZ8Pg==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.2.5.tgz",
+      "integrity": "sha512-naRI537GM+enFVJQs6DcwGYPn/0vgJNb06zGVbzXfDfe/epDPV73hP1vqO37PqSKDeOXM2KInr6ymYbL1HTP7g==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.3.1",
+        "@jest/environment": "^27.2.5",
         "@jest/types": "^27.2.5",
-        "expect": "^27.3.1"
+        "expect": "^27.2.5"
       },
       "dependencies": {
         "@jest/types": {
@@ -4338,15 +4729,15 @@
       }
     },
     "@jest/reporters": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.3.1.tgz",
-      "integrity": "sha512-m2YxPmL9Qn1emFVgZGEiMwDntDxRRQ2D58tiDQlwYTg5GvbFOKseYCcHtn0WsI8CG4vzPglo3nqbOiT8ySBT/w==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.2.5.tgz",
+      "integrity": "sha512-zYuR9fap3Q3mxQ454VWF8I6jYHErh368NwcKHWO2uy2fwByqBzRHkf9j2ekMDM7PaSTWcLBSZyd7NNxR1iHxzQ==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^27.3.1",
-        "@jest/test-result": "^27.3.1",
-        "@jest/transform": "^27.3.1",
+        "@jest/console": "^27.2.5",
+        "@jest/test-result": "^27.2.5",
+        "@jest/transform": "^27.2.5",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -4359,10 +4750,10 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^27.3.1",
-        "jest-resolve": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "jest-worker": "^27.3.1",
+        "jest-haste-map": "^27.2.5",
+        "jest-resolve": "^27.2.5",
+        "jest-util": "^27.2.5",
+        "jest-worker": "^27.2.5",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
         "string-length": "^4.0.1",
@@ -4371,9 +4762,9 @@
       },
       "dependencies": {
         "@jest/transform": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.3.1.tgz",
-          "integrity": "sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.2.5.tgz",
+          "integrity": "sha512-29lRtAHHYGALbZOx343v0zKmdOg4Sb0rsA1uSv0818bvwRhs3TyElOmTVXlrw0v1ZTqXJCAH/cmoDXimBhQOJQ==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.1.0",
@@ -4383,9 +4774,9 @@
             "convert-source-map": "^1.4.0",
             "fast-json-stable-stringify": "^2.0.0",
             "graceful-fs": "^4.2.4",
-            "jest-haste-map": "^27.3.1",
+            "jest-haste-map": "^27.2.5",
             "jest-regex-util": "^27.0.6",
-            "jest-util": "^27.3.1",
+            "jest-util": "^27.2.5",
             "micromatch": "^4.0.4",
             "pirates": "^4.0.1",
             "slash": "^3.0.0",
@@ -4496,6 +4887,15 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "is-number": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -4515,9 +4915,9 @@
           }
         },
         "jest-haste-map": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.3.1.tgz",
-          "integrity": "sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.2.5.tgz",
+          "integrity": "sha512-pzO+Gw2WLponaSi0ilpzYBE0kuVJstoXBX8YWyUebR8VaXuX4tzzn0Zp23c/WaETo7XYTGv2e8KdnpiskAFMhQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -4529,8 +4929,8 @@
             "graceful-fs": "^4.2.4",
             "jest-regex-util": "^27.0.6",
             "jest-serializer": "^27.0.6",
-            "jest-util": "^27.3.1",
-            "jest-worker": "^27.3.1",
+            "jest-util": "^27.2.5",
+            "jest-worker": "^27.2.5",
             "micromatch": "^4.0.4",
             "walker": "^1.0.7"
           }
@@ -4542,20 +4942,20 @@
           "dev": true
         },
         "jest-resolve": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.3.1.tgz",
-          "integrity": "sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.2.5.tgz",
+          "integrity": "sha512-q5irwS3oS73SKy3+FM/HL2T7WJftrk9BRzrXF92f7net5HMlS7lJMg/ZwxLB4YohKqjSsdksEw7n/jvMxV7EKg==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "chalk": "^4.0.0",
+            "escalade": "^3.1.1",
             "graceful-fs": "^4.2.4",
-            "jest-haste-map": "^27.3.1",
+            "jest-haste-map": "^27.2.5",
             "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^27.3.1",
-            "jest-validate": "^27.3.1",
+            "jest-util": "^27.2.5",
+            "jest-validate": "^27.2.5",
             "resolve": "^1.20.0",
-            "resolve.exports": "^1.1.0",
             "slash": "^3.0.0"
           }
         },
@@ -4570,23 +4970,23 @@
           }
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
         "jest-worker": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
-          "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.5.tgz",
+          "integrity": "sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==",
           "dev": true,
           "requires": {
             "@types/node": "*",
@@ -4661,12 +5061,12 @@
       }
     },
     "@jest/test-result": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.3.1.tgz",
-      "integrity": "sha512-mLn6Thm+w2yl0opM8J/QnPTqrfS4FoXsXF2WIWJb2O/GBSyResL71BRuMYbYRsGt7ELwS5JGcEcGb52BNrumgg==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.2.5.tgz",
+      "integrity": "sha512-ub7j3BrddxZ0BdSnM5JCF6cRZJ/7j3wgdX0+Dtwhw2Po+HKsELCiXUTvh+mgS4/89mpnU1CPhZxe2mTvuLPJJg==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.3.1",
+        "@jest/console": "^27.2.5",
         "@jest/types": "^27.2.5",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
@@ -4746,15 +5146,15 @@
       }
     },
     "@jest/test-sequencer": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.3.1.tgz",
-      "integrity": "sha512-siySLo07IMEdSjA4fqEnxfIX8lB/lWYsBPwNFtkOvsFQvmBrL3yj3k3uFNZv/JDyApTakRpxbKLJ3CT8UGVCrA==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.2.5.tgz",
+      "integrity": "sha512-8j8fHZRfnjbbdMitMAGFKaBZ6YqvFRFJlMJzcy3v75edTOqc7RY65S9JpMY6wT260zAcL2sTQRga/P4PglCu3Q==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^27.3.1",
+        "@jest/test-result": "^27.2.5",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.3.1",
-        "jest-runtime": "^27.3.1"
+        "jest-haste-map": "^27.2.5",
+        "jest-runtime": "^27.2.5"
       },
       "dependencies": {
         "@jest/types": {
@@ -4860,6 +5260,15 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "is-number": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -4867,9 +5276,9 @@
           "dev": true
         },
         "jest-haste-map": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.3.1.tgz",
-          "integrity": "sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.2.5.tgz",
+          "integrity": "sha512-pzO+Gw2WLponaSi0ilpzYBE0kuVJstoXBX8YWyUebR8VaXuX4tzzn0Zp23c/WaETo7XYTGv2e8KdnpiskAFMhQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -4881,8 +5290,8 @@
             "graceful-fs": "^4.2.4",
             "jest-regex-util": "^27.0.6",
             "jest-serializer": "^27.0.6",
-            "jest-util": "^27.3.1",
-            "jest-worker": "^27.3.1",
+            "jest-util": "^27.2.5",
+            "jest-worker": "^27.2.5",
             "micromatch": "^4.0.4",
             "walker": "^1.0.7"
           }
@@ -4904,23 +5313,23 @@
           }
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
         "jest-worker": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
-          "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.5.tgz",
+          "integrity": "sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==",
           "dev": true,
           "requires": {
             "@types/node": "*",
@@ -7834,10 +8243,19 @@
             "@babel/plugin-transform-react-pure-annotations": "^7.12.1"
           }
         },
+        "debug": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
         "eslint-plugin-import": {
-          "version": "2.25.3",
-          "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz",
-          "integrity": "sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==",
+          "version": "2.25.1",
+          "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.1.tgz",
+          "integrity": "sha512-YiQtY+ehqQXb6dvdrFUVdl3hsTvl+g3aKoTLZFIy1j/mKxjrLcRISI2rA7dNmEReJdr5xzjLld6vJ8pC1bfCfw==",
           "dev": true,
           "requires": {
             "array-includes": "^3.1.4",
@@ -7845,9 +8263,9 @@
             "debug": "^2.6.9",
             "doctrine": "^2.1.0",
             "eslint-import-resolver-node": "^0.3.6",
-            "eslint-module-utils": "^2.7.1",
+            "eslint-module-utils": "^2.6.2",
             "has": "^1.0.3",
-            "is-core-module": "^2.8.0",
+            "is-core-module": "^2.7.0",
             "is-glob": "^4.0.3",
             "minimatch": "^3.0.4",
             "object.values": "^1.1.5",
@@ -7863,13 +8281,19 @@
               "requires": {
                 "ms": "2.0.0"
               }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "dev": true
             }
           }
         },
         "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "semver": {
@@ -7897,9 +8321,9 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "3.19.1",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.1.tgz",
-          "integrity": "sha512-Tnc7E9iKd/b/ff7GFbhwPVzJzPztGrChB8X8GLqoYGdEOG8IpLnK1xPyo3ZoO3HsK6TodJS58VGPOxA+hLHQMg==",
+          "version": "3.18.2",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.2.tgz",
+          "integrity": "sha512-zNhPOUoSgoizoSQFdX1MeZO16ORRb9FFQLts8gSYbZU5FcgXhp24iMWMxnOQo5uIaIG7/6FA/IqJPwev1o9ZXQ==",
           "dev": true
         },
         "json5": {
@@ -8529,9 +8953,9 @@
           "dev": true
         },
         "core-js": {
-          "version": "3.19.1",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.1.tgz",
-          "integrity": "sha512-Tnc7E9iKd/b/ff7GFbhwPVzJzPztGrChB8X8GLqoYGdEOG8IpLnK1xPyo3ZoO3HsK6TodJS58VGPOxA+hLHQMg==",
+          "version": "3.18.2",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.2.tgz",
+          "integrity": "sha512-zNhPOUoSgoizoSQFdX1MeZO16ORRb9FFQLts8gSYbZU5FcgXhp24iMWMxnOQo5uIaIG7/6FA/IqJPwev1o9ZXQ==",
           "dev": true
         },
         "fill-range": {
@@ -10023,9 +10447,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "16.11.7",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
-          "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
+          "version": "16.10.3",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz",
+          "integrity": "sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ=="
         }
       }
     },
@@ -10069,9 +10493,9 @@
       }
     },
     "@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
       "dev": true,
       "requires": {
         "@types/minimatch": "*",
@@ -10082,7 +10506,6 @@
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
       "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
-      "dev": true,
       "requires": {
         "@types/node": "*"
       }
@@ -10116,14 +10539,12 @@
     "@types/istanbul-lib-coverage": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
-      "dev": true
+      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="
     },
     "@types/istanbul-lib-report": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
       "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-      "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "*"
       }
@@ -10132,7 +10553,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
       "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
-      "dev": true,
       "requires": {
         "@types/istanbul-lib-report": "*"
       }
@@ -10218,9 +10638,9 @@
           "dev": true
         },
         "pretty-format": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
-          "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.5.tgz",
+          "integrity": "sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -10283,9 +10703,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "16.11.7",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
-          "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
+          "version": "16.10.3",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz",
+          "integrity": "sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ=="
         }
       }
     },
@@ -10322,8 +10742,7 @@
     "@types/node": {
       "version": "8.9.5",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz",
-      "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==",
-      "dev": true
+      "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ=="
     },
     "@types/normalize-package-data": {
       "version": "2.4.1",
@@ -10346,9 +10765,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "16.11.7",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
-          "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
+          "version": "16.10.3",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz",
+          "integrity": "sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ=="
         }
       }
     },
@@ -10370,9 +10789,9 @@
       "dev": true
     },
     "@types/react": {
-      "version": "17.0.34",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.34.tgz",
-      "integrity": "sha512-46FEGrMjc2+8XhHXILr+3+/sTe3OfzSPU9YGKILLrUYbQ1CLQC9Daqo1KzENGXAWwrFwiY0l4ZbF20gRvgpWTg==",
+      "version": "17.0.28",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.28.tgz",
+      "integrity": "sha512-6OmflHgk2DlnsFi49kBW3/Dql1GT32bYSk+A6tFBDAt0T0bxotBdQwXkm77lVlczHwY6+Wu6IfpsGqArjOYtaA==",
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -10397,17 +10816,6 @@
         "@types/react": "*"
       }
     },
-    "@types/react-redux": {
-      "version": "7.1.20",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.20.tgz",
-      "integrity": "sha512-q42es4c8iIeTgcnB+yJgRTTzftv3eYYvCZOh1Ckn2eX/3o5TdsQYKUWpLoLuGlcY/p+VAhV9IOEZJcWk/vfkXw==",
-      "requires": {
-        "@types/hoist-non-react-statics": "^3.3.0",
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0",
-        "redux": "^4.0.0"
-      }
-    },
     "@types/react-router": {
       "version": "5.1.17",
       "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.17.tgz",
@@ -10419,9 +10827,9 @@
       }
     },
     "@types/react-router-dom": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.2.tgz",
-      "integrity": "sha512-ELEYRUie2czuJzaZ5+ziIp9Hhw+juEw8b7C11YNA4QdLCVbQ3qLi2l4aq8XnlqM7V31LZX8dxUuFUCrzHm6sqQ==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.1.tgz",
+      "integrity": "sha512-UvyRy73318QI83haXlaMwmklHHzV9hjl3u71MmM6wYNu0hOVk9NLTa0vGukf8zXUqnwz4O06ig876YSPpeK28A==",
       "dev": true,
       "requires": {
         "@types/history": "*",
@@ -10494,9 +10902,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "16.11.7",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
-          "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
+          "version": "16.10.3",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz",
+          "integrity": "sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ=="
         }
       }
     },
@@ -10572,8 +10980,7 @@
     "@types/yargs-parser": {
       "version": "20.2.1",
       "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
-      "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
-      "dev": true
+      "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="
     },
     "@typescript-eslint/eslint-plugin": {
       "version": "4.33.0",
@@ -11312,7 +11719,6 @@
       "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"
       }
@@ -11689,6 +12095,33 @@
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
         "postcss-value-parser": "^4.1.0"
+      },
+      "dependencies": {
+        "browserslist": {
+          "version": "4.19.1",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+          "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "^1.0.30001286",
+            "electron-to-chromium": "^1.4.17",
+            "escalade": "^3.1.1",
+            "node-releases": "^2.0.1",
+            "picocolors": "^1.0.0"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001287",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001287.tgz",
+          "integrity": "sha512-4udbs9bc0hfNrcje++AxBuc6PfLNHwh3PO9kbwnfCQWyqtlzg3py0YgFu8jyRTTo85VAz4U+VLxSlID09vNtWA==",
+          "dev": true
+        },
+        "electron-to-chromium": {
+          "version": "1.4.23",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.23.tgz",
+          "integrity": "sha512-q3tB59Api3+DMbLnDPkW/UBHBO7KTGcF+rDCeb0GAGyqFj562s6y+c/2tDKTS/y5lbC+JOvT4MSUALJLPqlcSA==",
+          "dev": true
+        }
       }
     },
     "available-typed-arrays": {
@@ -12203,7 +12636,6 @@
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
       "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
@@ -12291,16 +12723,6 @@
         "semver": "^6.1.1"
       }
     },
-    "babel-plugin-polyfill-corejs3": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.3.0.tgz",
-      "integrity": "sha512-JLwi9vloVdXLjzACL80j24bG6/T1gYxwowG44dg6HN/7aTPdyPbJJidf6ajoA3RPHHtW0j9KMrSOLpIZpAnPpg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.2.4",
-        "core-js-compat": "^3.18.0"
-      }
-    },
     "babel-plugin-polyfill-regenerator": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz",
@@ -13844,16 +14266,30 @@
       }
     },
     "browserslist": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.0.tgz",
-      "integrity": "sha512-ER2M0g5iAR84fS/zjBDqEgU6iO5fS9JI2EkHr5zxDxYEFk3LjhU9Vpp/INb6RMQphxko7PDV1FH38H/qVP5yCA==",
+      "version": "4.17.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz",
+      "integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001280",
-        "electron-to-chromium": "^1.3.896",
+        "caniuse-lite": "^1.0.30001264",
+        "electron-to-chromium": "^1.3.857",
         "escalade": "^3.1.1",
-        "node-releases": "^2.0.1",
-        "picocolors": "^1.0.0"
+        "node-releases": "^1.1.77",
+        "picocolors": "^0.2.1"
+      },
+      "dependencies": {
+        "node-releases": {
+          "version": "1.1.77",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz",
+          "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==",
+          "dev": true
+        },
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        }
       }
     },
     "bs-logger": {
@@ -13887,7 +14323,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dev": true,
       "requires": {
         "node-int64": "^0.4.0"
       }
@@ -14231,8 +14666,7 @@
     "camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
     },
     "camelcase-keys": {
       "version": "6.2.2",
@@ -14258,9 +14692,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001280",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001280.tgz",
-      "integrity": "sha512-kFXwYvHe5rix25uwueBxC569o53J6TpnGu0BEEn+6Lhl2vsnAumRFWEBhDft1fwyo6m1r4i+RqA4+163FpeFcA==",
+      "version": "1.0.30001265",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz",
+      "integrity": "sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==",
       "dev": true
     },
     "capital-case": {
@@ -15407,7 +15841,6 @@
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
       "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dev": true,
       "requires": {
         "safe-buffer": "~5.1.1"
       },
@@ -15415,8 +15848,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
         }
       }
     },
@@ -15606,12 +16038,12 @@
       "integrity": "sha512-LeLBMgEGSsG7giquSzvgBrTS7V5UL6ks3eQlUSbN8dJStlLFiRzUm5iqsRyzUB8carhfKjkJ2vzKqE6z1Vga9g=="
     },
     "core-js-compat": {
-      "version": "3.19.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.1.tgz",
-      "integrity": "sha512-Q/VJ7jAF/y68+aUsQJ/afPOewdsGkDtcMb40J8MbuWKlK3Y+wtHq8bTHKPj2WKWLIqmS5JhHs4CzHtz6pT2W6g==",
+      "version": "3.18.2",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.18.2.tgz",
+      "integrity": "sha512-25VJYCJtGjZwLguj7d66oiHfmnVw3TMOZ0zV8DyMJp/aeQ3OjR519iOOeck08HMyVVRAqXxafc2Hl+5QstJrsQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.17.6",
+        "browserslist": "^4.17.3",
         "semver": "7.0.0"
       },
       "dependencies": {
@@ -15624,9 +16056,9 @@
       }
     },
     "core-js-pure": {
-      "version": "3.19.1",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.1.tgz",
-      "integrity": "sha512-Q0Knr8Es84vtv62ei6/6jXH/7izKmOrtrxH9WJTHLCMAVeU+8TF8z8Nr08CsH4Ot0oJKzBzJJL9SJBYIv7WlfQ=="
+      "version": "3.18.2",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.18.2.tgz",
+      "integrity": "sha512-4hMMLUlZhKJKOWbbGD1/VDUxGPEhEoN/T01k7bx271WiBKCvCfkgPzy0IeRS4PB50p6/N1q/SZL4B/TRsTE5bA=="
     },
     "core-util-is": {
       "version": "1.0.3",
@@ -16145,7 +16577,6 @@
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
       "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
@@ -16683,9 +17114,9 @@
       }
     },
     "dom-accessibility-api": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz",
-      "integrity": "sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g==",
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.8.tgz",
+      "integrity": "sha512-rAfghuBPeJldxqsmZQtBbna4TqMgFe4xhYs24vPULNslbmXUdcga+CXiKWzZxyWw0FCkGKPgmizIysIvsAEN8w==",
       "dev": true
     },
     "dom-helpers": {
@@ -16974,9 +17405,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.896",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.896.tgz",
-      "integrity": "sha512-NcGkBVXePiuUrPLV8IxP43n1EOtdg+dudVjrfVEUd/bOqpQUFZ2diL5PPYzbgEhZFEltdXV3AcyKwGnEQ5lhMA==",
+      "version": "1.3.866",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.866.tgz",
+      "integrity": "sha512-iYze6TpDXWxk+sfcpUUdTs6Pv/3kG45Pnjer2DxEeFw0N08bZeNLuz97s2lMgy8yObon48o0WHY2Bkg3xuAPOA==",
       "dev": true
     },
     "elliptic": {
@@ -17237,8 +17668,7 @@
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
     "escape-goat": {
       "version": "2.1.1",
@@ -17270,9 +17700,9 @@
       },
       "dependencies": {
         "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
           "dev": true
         },
         "source-map": {
@@ -17335,6 +17765,15 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
+        "debug": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
         "doctrine": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -17383,6 +17822,12 @@
           "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
           "dev": true
         },
+        "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
+        },
         "regexpp": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
@@ -17443,9 +17888,9 @@
       }
     },
     "eslint-module-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz",
-      "integrity": "sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.0.tgz",
+      "integrity": "sha512-hqSE88MmHl3ru9SYvDyGrlo0JwROlf9fiEMplEV7j/EAuq9iSlIlyCFbBT6pdULQBSnBYtYKiMLps+hKkyP7Gg==",
       "dev": true,
       "requires": {
         "debug": "^3.2.7",
@@ -17688,6 +18133,11 @@
         "string.prototype.matchall": "^4.0.4"
       },
       "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
+        },
         "resolve": {
           "version": "2.0.0-next.3",
           "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
@@ -17765,8 +18215,7 @@
     "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
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "esquery": {
       "version": "1.4.0",
@@ -17778,9 +18227,9 @@
       },
       "dependencies": {
         "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
           "dev": true
         }
       }
@@ -17795,9 +18244,9 @@
       },
       "dependencies": {
         "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
           "dev": true
         }
       }
@@ -18186,16 +18635,16 @@
       }
     },
     "expect": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.3.1.tgz",
-      "integrity": "sha512-MrNXV2sL9iDRebWPGOGFdPQRl2eDQNu/uhxIMShjjx74T6kC6jFIkmQ6OqXDtevjGUkyB2IT56RzDBqXf/QPCg==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-27.2.5.tgz",
+      "integrity": "sha512-ZrO0w7bo8BgGoP/bLz+HDCI+0Hfei9jUSZs5yI/Wyn9VkG9w8oJ7rHRgYj+MA7yqqFa0IwHA3flJzZtYugShJA==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "ansi-styles": "^5.0.0",
-        "jest-get-type": "^27.3.1",
-        "jest-matcher-utils": "^27.3.1",
-        "jest-message-util": "^27.3.1",
+        "jest-get-type": "^27.0.6",
+        "jest-matcher-utils": "^27.2.5",
+        "jest-message-util": "^27.2.5",
         "jest-regex-util": "^27.0.6"
       },
       "dependencies": {
@@ -18705,7 +19154,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
       "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
-      "dev": true,
       "requires": {
         "bser": "2.1.1"
       }
@@ -20364,8 +20812,7 @@
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
     },
     "get-assigned-identifiers": {
       "version": "1.2.0",
@@ -20398,8 +20845,7 @@
     "get-package-type": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "dev": true
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="
     },
     "get-pkg-repo": {
       "version": "1.4.0",
@@ -22230,8 +22676,7 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
     },
     "indent-string": {
       "version": "4.0.0",
@@ -23865,22 +24310,27 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "istanbul-lib-coverage": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
-      "dev": true
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.2.tgz",
+      "integrity": "sha512-o5+eTUYzCJ11/+JhW5/FUCdfsdoYVdQ/8I/OveE2XsjehYn5DdeSnNQAbjYaO8gQ6hvGTN6GM6ddQqpTVG5j8g=="
     },
     "istanbul-lib-instrument": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
       "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
-      "dev": true,
       "requires": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
         "@istanbuljs/schema": "^0.1.2",
         "istanbul-lib-coverage": "^3.2.0",
         "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "istanbul-lib-coverage": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+          "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="
+        }
       }
     },
     "istanbul-lib-report": {
@@ -23940,9 +24390,9 @@
       }
     },
     "istanbul-reports": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.5.tgz",
-      "integrity": "sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-bFjUnc95rHjdCR63WMHUS7yfJJh8T9IPSWavvR02hhjVwezWALZ5axF9EqjmwZHpXqkzbgAMP8DmAtiyNxrdrQ==",
       "dev": true,
       "requires": {
         "html-escaper": "^2.0.0",
@@ -24102,14 +24552,14 @@
       }
     },
     "jest": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.3.1.tgz",
-      "integrity": "sha512-U2AX0AgQGd5EzMsiZpYt8HyZ+nSVIh5ujQ9CPp9EQZJMjXIiSZpJNweZl0swatKRoqHWgGKM3zaSwm4Zaz87ng==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-27.2.5.tgz",
+      "integrity": "sha512-vDMzXcpQN4Ycaqu+vO7LX8pZwNNoKMhc+gSp6q1D8S6ftRk8gNW8cni3YFxknP95jxzQo23Lul0BI2FrWgnwYQ==",
       "dev": true,
       "requires": {
-        "@jest/core": "^27.3.1",
+        "@jest/core": "^27.2.5",
         "import-local": "^3.0.2",
-        "jest-cli": "^27.3.1"
+        "jest-cli": "^27.2.5"
       },
       "dependencies": {
         "@jest/types": {
@@ -24211,37 +24661,46 @@
             "resolve-cwd": "^3.0.0"
           }
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "jest-cli": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.3.1.tgz",
-          "integrity": "sha512-WHnCqpfK+6EvT62me6WVs8NhtbjAS4/6vZJnk7/2+oOr50cwAzG4Wxt6RXX0hu6m1169ZGMlhYYUNeKBXCph/Q==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.2.5.tgz",
+          "integrity": "sha512-XzfcOXi5WQrXqFYsDxq5RDOKY4FNIgBgvgf3ZBz4e/j5/aWep5KnsAYH5OFPMdX/TP/LFsYQMRH7kzJUMh6JKg==",
           "dev": true,
           "requires": {
-            "@jest/core": "^27.3.1",
-            "@jest/test-result": "^27.3.1",
+            "@jest/core": "^27.2.5",
+            "@jest/test-result": "^27.2.5",
             "@jest/types": "^27.2.5",
             "chalk": "^4.0.0",
             "exit": "^0.1.2",
             "graceful-fs": "^4.2.4",
             "import-local": "^3.0.2",
-            "jest-config": "^27.3.1",
-            "jest-util": "^27.3.1",
-            "jest-validate": "^27.3.1",
+            "jest-config": "^27.2.5",
+            "jest-util": "^27.2.5",
+            "jest-validate": "^27.2.5",
             "prompts": "^2.0.1",
             "yargs": "^16.2.0"
           }
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
@@ -24358,9 +24817,9 @@
       }
     },
     "jest-changed-files": {
-      "version": "27.3.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.3.0.tgz",
-      "integrity": "sha512-9DJs9garMHv4RhylUMZgbdCJ3+jHSkpL9aaVKp13xtXAD80qLTLrqcDZL1PHA9dYA0bCI86Nv2BhkLpLhrBcPg==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.2.5.tgz",
+      "integrity": "sha512-jfnNJzF89csUKRPKJ4MwZ1SH27wTmX2xiAIHUHrsb/OYd9Jbo4/SXxJ17/nnx6RIifpthk3Y+LEeOk+/dDeGdw==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
@@ -24536,27 +24995,27 @@
       }
     },
     "jest-circus": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.3.1.tgz",
-      "integrity": "sha512-v1dsM9II6gvXokgqq6Yh2jHCpfg7ZqV4jWY66u7npz24JnhP3NHxI0sKT7+ZMQ7IrOWHYAaeEllOySbDbWsiXw==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.2.5.tgz",
+      "integrity": "sha512-eyL9IcrAxm3Saq3rmajFCwpaxaRMGJ1KJs+7hlTDinXpJmeR3P02bheM3CYohE7UfwOBmrFMJHjgo/WPcLTM+Q==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.3.1",
-        "@jest/test-result": "^27.3.1",
+        "@jest/environment": "^27.2.5",
+        "@jest/test-result": "^27.2.5",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^0.7.0",
-        "expect": "^27.3.1",
+        "expect": "^27.2.5",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.3.1",
-        "jest-matcher-utils": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-runtime": "^27.3.1",
-        "jest-snapshot": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "pretty-format": "^27.3.1",
+        "jest-each": "^27.2.5",
+        "jest-matcher-utils": "^27.2.5",
+        "jest-message-util": "^27.2.5",
+        "jest-runtime": "^27.2.5",
+        "jest-snapshot": "^27.2.5",
+        "jest-util": "^27.2.5",
+        "pretty-format": "^27.2.5",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3",
         "throat": "^6.0.1"
@@ -24630,24 +25089,33 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
         "pretty-format": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
-          "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.5.tgz",
+          "integrity": "sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -24682,38 +25150,38 @@
       }
     },
     "jest-config": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.3.1.tgz",
-      "integrity": "sha512-KY8xOIbIACZ/vdYCKSopL44I0xboxC751IX+DXL2+Wx6DKNycyEfV3rryC3BPm5Uq/BBqDoMrKuqLEUNJmMKKg==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.2.5.tgz",
+      "integrity": "sha512-QdENtn9b5rIIYGlbDNEcgY9LDL5kcokJnXrp7x8AGjHob/XFqw1Z6p+gjfna2sUulQsQ3ce2Fvntnv+7fKYDhQ==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^27.3.1",
+        "@jest/test-sequencer": "^27.2.5",
         "@jest/types": "^27.2.5",
-        "babel-jest": "^27.3.1",
+        "babel-jest": "^27.2.5",
         "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.1",
         "graceful-fs": "^4.2.4",
-        "jest-circus": "^27.3.1",
-        "jest-environment-jsdom": "^27.3.1",
-        "jest-environment-node": "^27.3.1",
-        "jest-get-type": "^27.3.1",
-        "jest-jasmine2": "^27.3.1",
+        "is-ci": "^3.0.0",
+        "jest-circus": "^27.2.5",
+        "jest-environment-jsdom": "^27.2.5",
+        "jest-environment-node": "^27.2.5",
+        "jest-get-type": "^27.0.6",
+        "jest-jasmine2": "^27.2.5",
         "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.3.1",
-        "jest-runner": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "jest-validate": "^27.3.1",
+        "jest-resolve": "^27.2.5",
+        "jest-runner": "^27.2.5",
+        "jest-util": "^27.2.5",
+        "jest-validate": "^27.2.5",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.3.1"
+        "pretty-format": "^27.2.5"
       },
       "dependencies": {
         "@jest/transform": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.3.1.tgz",
-          "integrity": "sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.2.5.tgz",
+          "integrity": "sha512-29lRtAHHYGALbZOx343v0zKmdOg4Sb0rsA1uSv0818bvwRhs3TyElOmTVXlrw0v1ZTqXJCAH/cmoDXimBhQOJQ==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.1.0",
@@ -24723,9 +25191,9 @@
             "convert-source-map": "^1.4.0",
             "fast-json-stable-stringify": "^2.0.0",
             "graceful-fs": "^4.2.4",
-            "jest-haste-map": "^27.3.1",
+            "jest-haste-map": "^27.2.5",
             "jest-regex-util": "^27.0.6",
-            "jest-util": "^27.3.1",
+            "jest-util": "^27.2.5",
             "micromatch": "^4.0.4",
             "pirates": "^4.0.1",
             "slash": "^3.0.0",
@@ -24775,12 +25243,12 @@
           }
         },
         "babel-jest": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.3.1.tgz",
-          "integrity": "sha512-SjIF8hh/ir0peae2D6S6ZKRhUy7q/DnpH7k/V6fT4Bgs/LXXUztOpX4G2tCgq8mLo5HA9mN6NmlFMeYtKmIsTQ==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.2.5.tgz",
+          "integrity": "sha512-GC9pWCcitBhSuF7H3zl0mftoKizlswaF0E3qi+rPL417wKkCB0d+Sjjb0OfXvxj7gWiBf497ldgRMii68Xz+2g==",
           "dev": true,
           "requires": {
-            "@jest/transform": "^27.3.1",
+            "@jest/transform": "^27.2.5",
             "@jest/types": "^27.2.5",
             "@types/babel__core": "^7.1.14",
             "babel-plugin-istanbul": "^6.0.0",
@@ -24894,6 +25362,15 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "is-number": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -24901,9 +25378,9 @@
           "dev": true
         },
         "jest-haste-map": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.3.1.tgz",
-          "integrity": "sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.2.5.tgz",
+          "integrity": "sha512-pzO+Gw2WLponaSi0ilpzYBE0kuVJstoXBX8YWyUebR8VaXuX4tzzn0Zp23c/WaETo7XYTGv2e8KdnpiskAFMhQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -24915,8 +25392,8 @@
             "graceful-fs": "^4.2.4",
             "jest-regex-util": "^27.0.6",
             "jest-serializer": "^27.0.6",
-            "jest-util": "^27.3.1",
-            "jest-worker": "^27.3.1",
+            "jest-util": "^27.2.5",
+            "jest-worker": "^27.2.5",
             "micromatch": "^4.0.4",
             "walker": "^1.0.7"
           }
@@ -24928,20 +25405,20 @@
           "dev": true
         },
         "jest-resolve": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.3.1.tgz",
-          "integrity": "sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.2.5.tgz",
+          "integrity": "sha512-q5irwS3oS73SKy3+FM/HL2T7WJftrk9BRzrXF92f7net5HMlS7lJMg/ZwxLB4YohKqjSsdksEw7n/jvMxV7EKg==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "chalk": "^4.0.0",
+            "escalade": "^3.1.1",
             "graceful-fs": "^4.2.4",
-            "jest-haste-map": "^27.3.1",
+            "jest-haste-map": "^27.2.5",
             "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^27.3.1",
-            "jest-validate": "^27.3.1",
+            "jest-util": "^27.2.5",
+            "jest-validate": "^27.2.5",
             "resolve": "^1.20.0",
-            "resolve.exports": "^1.1.0",
             "slash": "^3.0.0"
           }
         },
@@ -24956,23 +25433,23 @@
           }
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
         "jest-worker": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
-          "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.5.tgz",
+          "integrity": "sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==",
           "dev": true,
           "requires": {
             "@types/node": "*",
@@ -25002,9 +25479,9 @@
           }
         },
         "pretty-format": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
-          "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.5.tgz",
+          "integrity": "sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -25054,15 +25531,15 @@
       }
     },
     "jest-diff": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.3.1.tgz",
-      "integrity": "sha512-PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.2.5.tgz",
+      "integrity": "sha512-7gfwwyYkeslOOVQY4tVq5TaQa92mWfC9COsVYMNVYyJTOYAqbIkoD3twi5A+h+tAPtAelRxkqY6/xu+jwTr0dA==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "diff-sequences": "^27.0.6",
-        "jest-get-type": "^27.3.1",
-        "pretty-format": "^27.3.1"
+        "jest-get-type": "^27.0.6",
+        "pretty-format": "^27.2.5"
       },
       "dependencies": {
         "@jest/types": {
@@ -25128,9 +25605,9 @@
           "dev": true
         },
         "pretty-format": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
-          "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.5.tgz",
+          "integrity": "sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -25174,16 +25651,16 @@
       }
     },
     "jest-each": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.3.1.tgz",
-      "integrity": "sha512-E4SwfzKJWYcvOYCjOxhZcxwL+AY0uFMvdCOwvzgutJiaiodFjkxQQDxHm8FQBeTqDnSmKsQWn7ldMRzTn2zJaQ==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.2.5.tgz",
+      "integrity": "sha512-HUPWIbJT0bXarRwKu/m7lYzqxR4GM5EhKOsu0z3t0SKtbFN6skQhpAUADM4qFShBXb9zoOuag5lcrR1x/WM+Ag==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "pretty-format": "^27.3.1"
+        "jest-get-type": "^27.0.6",
+        "jest-util": "^27.2.5",
+        "pretty-format": "^27.2.5"
       },
       "dependencies": {
         "@jest/types": {
@@ -25254,24 +25731,33 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
         "pretty-format": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
-          "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.5.tgz",
+          "integrity": "sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -25306,17 +25792,17 @@
       }
     },
     "jest-environment-jsdom": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.3.1.tgz",
-      "integrity": "sha512-3MOy8qMzIkQlfb3W1TfrD7uZHj+xx8Olix5vMENkj5djPmRqndMaXtpnaZkxmxM+Qc3lo+yVzJjzuXbCcZjAlg==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.2.5.tgz",
+      "integrity": "sha512-QtRpOh/RQKuXniaWcoFE2ElwP6tQcyxHu0hlk32880g0KczdonCs5P1sk5+weu/OVzh5V4Bt1rXuQthI01mBLg==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.3.1",
-        "@jest/fake-timers": "^27.3.1",
+        "@jest/environment": "^27.2.5",
+        "@jest/fake-timers": "^27.2.5",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
-        "jest-mock": "^27.3.0",
-        "jest-util": "^27.3.1",
+        "jest-mock": "^27.2.5",
+        "jest-util": "^27.2.5",
         "jsdom": "^16.6.0"
       },
       "dependencies": {
@@ -25388,17 +25874,26 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
@@ -25414,17 +25909,17 @@
       }
     },
     "jest-environment-node": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.3.1.tgz",
-      "integrity": "sha512-T89F/FgkE8waqrTSA7/ydMkcc52uYPgZZ6q8OaZgyiZkJb5QNNCF6oPZjH9IfPFfcc9uBWh1574N0kY0pSvTXw==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.2.5.tgz",
+      "integrity": "sha512-0o1LT4grm7iwrS8fIoLtwJxb/hoa3GsH7pP10P02Jpj7Mi4BXy65u46m89vEM2WfD1uFJQ2+dfDiWZNA2e6bJg==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.3.1",
-        "@jest/fake-timers": "^27.3.1",
+        "@jest/environment": "^27.2.5",
+        "@jest/fake-timers": "^27.2.5",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
-        "jest-mock": "^27.3.0",
-        "jest-util": "^27.3.1"
+        "jest-mock": "^27.2.5",
+        "jest-util": "^27.2.5"
       },
       "dependencies": {
         "@jest/types": {
@@ -25495,17 +25990,26 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
@@ -25521,9 +26025,9 @@
       }
     },
     "jest-get-type": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.3.1.tgz",
-      "integrity": "sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg==",
+      "version": "27.0.6",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.6.tgz",
+      "integrity": "sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg==",
       "dev": true
     },
     "jest-haste-map": {
@@ -25712,28 +26216,28 @@
       }
     },
     "jest-jasmine2": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.3.1.tgz",
-      "integrity": "sha512-WK11ZUetDQaC09w4/j7o4FZDUIp+4iYWH/Lik34Pv7ukL+DuXFGdnmmi7dT58J2ZYKFB5r13GyE0z3NPeyJmsg==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.2.5.tgz",
+      "integrity": "sha512-hdxY9Cm/CjLqu2tXeAoQHPgA4vcqlweVXYOg1+S9FeFdznB9Rti+eEBKDDkmOy9iqr4Xfbq95OkC4NFbXXPCAQ==",
       "dev": true,
       "requires": {
         "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^27.3.1",
+        "@jest/environment": "^27.2.5",
         "@jest/source-map": "^27.0.6",
-        "@jest/test-result": "^27.3.1",
+        "@jest/test-result": "^27.2.5",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "expect": "^27.3.1",
+        "expect": "^27.2.5",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.3.1",
-        "jest-matcher-utils": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-runtime": "^27.3.1",
-        "jest-snapshot": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "pretty-format": "^27.3.1",
+        "jest-each": "^27.2.5",
+        "jest-matcher-utils": "^27.2.5",
+        "jest-message-util": "^27.2.5",
+        "jest-runtime": "^27.2.5",
+        "jest-snapshot": "^27.2.5",
+        "jest-util": "^27.2.5",
+        "pretty-format": "^27.2.5",
         "throat": "^6.0.1"
       },
       "dependencies": {
@@ -25805,24 +26309,33 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
         "pretty-format": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
-          "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.5.tgz",
+          "integrity": "sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -25857,13 +26370,13 @@
       }
     },
     "jest-leak-detector": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.3.1.tgz",
-      "integrity": "sha512-78QstU9tXbaHzwlRlKmTpjP9k4Pvre5l0r8Spo4SbFFVy/4Abg9I6ZjHwjg2QyKEAMg020XcjP+UgLZIY50yEg==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.2.5.tgz",
+      "integrity": "sha512-HYsi3GUR72bYhOGB5C5saF9sPdxGzSjX7soSQS+BqDRysc7sPeBwPbhbuT8DnOpijnKjgwWQ8JqvbmReYnt3aQ==",
       "dev": true,
       "requires": {
-        "jest-get-type": "^27.3.1",
-        "pretty-format": "^27.3.1"
+        "jest-get-type": "^27.0.6",
+        "pretty-format": "^27.2.5"
       },
       "dependencies": {
         "@jest/types": {
@@ -25937,9 +26450,9 @@
           "dev": true
         },
         "pretty-format": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
-          "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.5.tgz",
+          "integrity": "sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -25966,15 +26479,15 @@
       }
     },
     "jest-matcher-utils": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.3.1.tgz",
-      "integrity": "sha512-hX8N7zXS4k+8bC1Aj0OWpGb7D3gIXxYvPNK1inP5xvE4ztbz3rc4AkI6jGVaerepBnfWB17FL5lWFJT3s7qo8w==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.2.5.tgz",
+      "integrity": "sha512-qNR/kh6bz0Dyv3m68Ck2g1fLW5KlSOUNcFQh87VXHZwWc/gY6XwnKofx76Qytz3x5LDWT09/2+yXndTkaG4aWg==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^27.3.1",
-        "jest-get-type": "^27.3.1",
-        "pretty-format": "^27.3.1"
+        "jest-diff": "^27.2.5",
+        "jest-get-type": "^27.0.6",
+        "pretty-format": "^27.2.5"
       },
       "dependencies": {
         "@jest/types": {
@@ -26040,9 +26553,9 @@
           "dev": true
         },
         "pretty-format": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
-          "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.5.tgz",
+          "integrity": "sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -26077,9 +26590,9 @@
       }
     },
     "jest-message-util": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.3.1.tgz",
-      "integrity": "sha512-bh3JEmxsTZ/9rTm0jQrPElbY2+y48Rw2t47uMfByNyUVR+OfPh4anuyKsGqsNkXk/TI4JbLRZx+7p7Hdt6q1yg==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.2.5.tgz",
+      "integrity": "sha512-ggXSLoPfIYcbmZ8glgEJZ8b+e0Msw/iddRmgkoO7lDAr9SmI65IIfv7VnvTnV4FGnIIUIjzM+fHRHO5RBvyAbQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
@@ -26088,7 +26601,7 @@
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.3.1",
+        "pretty-format": "^27.2.5",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -26190,9 +26703,9 @@
           }
         },
         "pretty-format": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
-          "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.5.tgz",
+          "integrity": "sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -26236,9 +26749,9 @@
       }
     },
     "jest-mock": {
-      "version": "27.3.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.3.0.tgz",
-      "integrity": "sha512-ziZiLk0elZOQjD08bLkegBzv5hCABu/c8Ytx45nJKkysQwGaonvmTxwjLqEA4qGdasq9o2I8/HtdGMNnVsMTGw==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.2.5.tgz",
+      "integrity": "sha512-HiMB3LqE9RzmeMzZARi2Bz3NoymxyP0gCid4y42ca1djffNtYFKgI220aC1VP1mUZ8rbpqZbHZOJ15093bZV/Q==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
@@ -26321,8 +26834,7 @@
     "jest-pnp-resolver": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "dev": true
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w=="
     },
     "jest-regex-util": {
       "version": "25.2.6",
@@ -26398,14 +26910,14 @@
       }
     },
     "jest-resolve-dependencies": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.3.1.tgz",
-      "integrity": "sha512-X7iLzY8pCiYOnvYo2YrK3P9oSE8/3N2f4pUZMJ8IUcZnT81vlSonya1KTO9ZfKGuC+svE6FHK/XOb8SsoRUV1A==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.2.5.tgz",
+      "integrity": "sha512-BSjefped31bcvvCh++/pN9ueqqN1n0+p8/58yScuWfklLm2tbPbS9d251vJhAy0ZI2pL/0IaGhOTJrs9Y4FJlg==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "jest-regex-util": "^27.0.6",
-        "jest-snapshot": "^27.3.1"
+        "jest-snapshot": "^27.2.5"
       },
       "dependencies": {
         "@jest/types": {
@@ -26488,15 +27000,15 @@
       }
     },
     "jest-runner": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.3.1.tgz",
-      "integrity": "sha512-r4W6kBn6sPr3TBwQNmqE94mPlYVn7fLBseeJfo4E2uCTmAyDFm2O5DYAQAFP7Q3YfiA/bMwg8TVsciP7k0xOww==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.2.5.tgz",
+      "integrity": "sha512-n41vw9RLg5TKAnEeJK9d6pGOsBOpwE89XBniK+AD1k26oIIy3V7ogM1scbDjSheji8MUPC9pNgCrZ/FHLVDNgg==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.3.1",
-        "@jest/environment": "^27.3.1",
-        "@jest/test-result": "^27.3.1",
-        "@jest/transform": "^27.3.1",
+        "@jest/console": "^27.2.5",
+        "@jest/environment": "^27.2.5",
+        "@jest/test-result": "^27.2.5",
+        "@jest/transform": "^27.2.5",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "chalk": "^4.0.0",
@@ -26504,23 +27016,23 @@
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
         "jest-docblock": "^27.0.6",
-        "jest-environment-jsdom": "^27.3.1",
-        "jest-environment-node": "^27.3.1",
-        "jest-haste-map": "^27.3.1",
-        "jest-leak-detector": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-resolve": "^27.3.1",
-        "jest-runtime": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "jest-worker": "^27.3.1",
+        "jest-environment-jsdom": "^27.2.5",
+        "jest-environment-node": "^27.2.5",
+        "jest-haste-map": "^27.2.5",
+        "jest-leak-detector": "^27.2.5",
+        "jest-message-util": "^27.2.5",
+        "jest-resolve": "^27.2.5",
+        "jest-runtime": "^27.2.5",
+        "jest-util": "^27.2.5",
+        "jest-worker": "^27.2.5",
         "source-map-support": "^0.5.6",
         "throat": "^6.0.1"
       },
       "dependencies": {
         "@jest/transform": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.3.1.tgz",
-          "integrity": "sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.2.5.tgz",
+          "integrity": "sha512-29lRtAHHYGALbZOx343v0zKmdOg4Sb0rsA1uSv0818bvwRhs3TyElOmTVXlrw0v1ZTqXJCAH/cmoDXimBhQOJQ==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.1.0",
@@ -26530,9 +27042,9 @@
             "convert-source-map": "^1.4.0",
             "fast-json-stable-stringify": "^2.0.0",
             "graceful-fs": "^4.2.4",
-            "jest-haste-map": "^27.3.1",
+            "jest-haste-map": "^27.2.5",
             "jest-regex-util": "^27.0.6",
-            "jest-util": "^27.3.1",
+            "jest-util": "^27.2.5",
             "micromatch": "^4.0.4",
             "pirates": "^4.0.1",
             "slash": "^3.0.0",
@@ -26643,6 +27155,15 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "is-number": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -26650,9 +27171,9 @@
           "dev": true
         },
         "jest-haste-map": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.3.1.tgz",
-          "integrity": "sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.2.5.tgz",
+          "integrity": "sha512-pzO+Gw2WLponaSi0ilpzYBE0kuVJstoXBX8YWyUebR8VaXuX4tzzn0Zp23c/WaETo7XYTGv2e8KdnpiskAFMhQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -26664,8 +27185,8 @@
             "graceful-fs": "^4.2.4",
             "jest-regex-util": "^27.0.6",
             "jest-serializer": "^27.0.6",
-            "jest-util": "^27.3.1",
-            "jest-worker": "^27.3.1",
+            "jest-util": "^27.2.5",
+            "jest-worker": "^27.2.5",
             "micromatch": "^4.0.4",
             "walker": "^1.0.7"
           }
@@ -26677,20 +27198,20 @@
           "dev": true
         },
         "jest-resolve": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.3.1.tgz",
-          "integrity": "sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.2.5.tgz",
+          "integrity": "sha512-q5irwS3oS73SKy3+FM/HL2T7WJftrk9BRzrXF92f7net5HMlS7lJMg/ZwxLB4YohKqjSsdksEw7n/jvMxV7EKg==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "chalk": "^4.0.0",
+            "escalade": "^3.1.1",
             "graceful-fs": "^4.2.4",
-            "jest-haste-map": "^27.3.1",
+            "jest-haste-map": "^27.2.5",
             "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^27.3.1",
-            "jest-validate": "^27.3.1",
+            "jest-util": "^27.2.5",
+            "jest-validate": "^27.2.5",
             "resolve": "^1.20.0",
-            "resolve.exports": "^1.1.0",
             "slash": "^3.0.0"
           }
         },
@@ -26705,23 +27226,23 @@
           }
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
         "jest-worker": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
-          "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.5.tgz",
+          "integrity": "sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==",
           "dev": true,
           "requires": {
             "@types/node": "*",
@@ -26777,17 +27298,18 @@
       }
     },
     "jest-runtime": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.3.1.tgz",
-      "integrity": "sha512-qtO6VxPbS8umqhEDpjA4pqTkKQ1Hy4ZSi9mDVeE9Za7LKBo2LdW2jmT+Iod3XFaJqINikZQsn2wEi0j9wPRbLg==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.2.5.tgz",
+      "integrity": "sha512-N0WRZ3QszKyZ3Dm27HTBbBuestsSd3Ud5ooVho47XZJ8aSKO/X1Ag8M1dNx9XzfGVRNdB/xCA3lz8MJwIzPLLA==",
       "dev": true,
       "requires": {
-        "@jest/console": "^27.3.1",
-        "@jest/environment": "^27.3.1",
-        "@jest/globals": "^27.3.1",
+        "@jest/console": "^27.2.5",
+        "@jest/environment": "^27.2.5",
+        "@jest/fake-timers": "^27.2.5",
+        "@jest/globals": "^27.2.5",
         "@jest/source-map": "^27.0.6",
-        "@jest/test-result": "^27.3.1",
-        "@jest/transform": "^27.3.1",
+        "@jest/test-result": "^27.2.5",
+        "@jest/transform": "^27.2.5",
         "@jest/types": "^27.2.5",
         "@types/yargs": "^16.0.0",
         "chalk": "^4.0.0",
@@ -26797,23 +27319,23 @@
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-mock": "^27.3.0",
+        "jest-haste-map": "^27.2.5",
+        "jest-message-util": "^27.2.5",
+        "jest-mock": "^27.2.5",
         "jest-regex-util": "^27.0.6",
-        "jest-resolve": "^27.3.1",
-        "jest-snapshot": "^27.3.1",
-        "jest-util": "^27.3.1",
-        "jest-validate": "^27.3.1",
+        "jest-resolve": "^27.2.5",
+        "jest-snapshot": "^27.2.5",
+        "jest-util": "^27.2.5",
+        "jest-validate": "^27.2.5",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0",
         "yargs": "^16.2.0"
       },
       "dependencies": {
         "@jest/transform": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.3.1.tgz",
-          "integrity": "sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.2.5.tgz",
+          "integrity": "sha512-29lRtAHHYGALbZOx343v0zKmdOg4Sb0rsA1uSv0818bvwRhs3TyElOmTVXlrw0v1ZTqXJCAH/cmoDXimBhQOJQ==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.1.0",
@@ -26823,9 +27345,9 @@
             "convert-source-map": "^1.4.0",
             "fast-json-stable-stringify": "^2.0.0",
             "graceful-fs": "^4.2.4",
-            "jest-haste-map": "^27.3.1",
+            "jest-haste-map": "^27.2.5",
             "jest-regex-util": "^27.0.6",
-            "jest-util": "^27.3.1",
+            "jest-util": "^27.2.5",
             "micromatch": "^4.0.4",
             "pirates": "^4.0.1",
             "slash": "^3.0.0",
@@ -26981,6 +27503,15 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "is-number": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -26994,9 +27525,9 @@
           "dev": true
         },
         "jest-haste-map": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.3.1.tgz",
-          "integrity": "sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.2.5.tgz",
+          "integrity": "sha512-pzO+Gw2WLponaSi0ilpzYBE0kuVJstoXBX8YWyUebR8VaXuX4tzzn0Zp23c/WaETo7XYTGv2e8KdnpiskAFMhQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -27008,8 +27539,8 @@
             "graceful-fs": "^4.2.4",
             "jest-regex-util": "^27.0.6",
             "jest-serializer": "^27.0.6",
-            "jest-util": "^27.3.1",
-            "jest-worker": "^27.3.1",
+            "jest-util": "^27.2.5",
+            "jest-worker": "^27.2.5",
             "micromatch": "^4.0.4",
             "walker": "^1.0.7"
           }
@@ -27021,20 +27552,20 @@
           "dev": true
         },
         "jest-resolve": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.3.1.tgz",
-          "integrity": "sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.2.5.tgz",
+          "integrity": "sha512-q5irwS3oS73SKy3+FM/HL2T7WJftrk9BRzrXF92f7net5HMlS7lJMg/ZwxLB4YohKqjSsdksEw7n/jvMxV7EKg==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "chalk": "^4.0.0",
+            "escalade": "^3.1.1",
             "graceful-fs": "^4.2.4",
-            "jest-haste-map": "^27.3.1",
+            "jest-haste-map": "^27.2.5",
             "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^27.3.1",
-            "jest-validate": "^27.3.1",
+            "jest-util": "^27.2.5",
+            "jest-validate": "^27.2.5",
             "resolve": "^1.20.0",
-            "resolve.exports": "^1.1.0",
             "slash": "^3.0.0"
           }
         },
@@ -27049,23 +27580,23 @@
           }
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
         "jest-worker": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
-          "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.5.tgz",
+          "integrity": "sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==",
           "dev": true,
           "requires": {
             "@types/node": "*",
@@ -27228,9 +27759,9 @@
       }
     },
     "jest-snapshot": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.3.1.tgz",
-      "integrity": "sha512-APZyBvSgQgOT0XumwfFu7X3G5elj6TGhCBLbBdn3R1IzYustPGPE38F51dBWMQ8hRXa9je0vAdeVDtqHLvB6lg==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.2.5.tgz",
+      "integrity": "sha512-2/Jkn+VN6Abwz0llBltZaiJMnL8b1j5Bp/gRIxe9YR3FCEh9qp0TXVV0dcpTGZ8AcJV1SZGQkczewkI9LP5yGw==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.7.2",
@@ -27239,30 +27770,30 @@
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/traverse": "^7.7.2",
         "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.3.1",
+        "@jest/transform": "^27.2.5",
         "@jest/types": "^27.2.5",
         "@types/babel__traverse": "^7.0.4",
         "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^27.3.1",
+        "expect": "^27.2.5",
         "graceful-fs": "^4.2.4",
-        "jest-diff": "^27.3.1",
-        "jest-get-type": "^27.3.1",
-        "jest-haste-map": "^27.3.1",
-        "jest-matcher-utils": "^27.3.1",
-        "jest-message-util": "^27.3.1",
-        "jest-resolve": "^27.3.1",
-        "jest-util": "^27.3.1",
+        "jest-diff": "^27.2.5",
+        "jest-get-type": "^27.0.6",
+        "jest-haste-map": "^27.2.5",
+        "jest-matcher-utils": "^27.2.5",
+        "jest-message-util": "^27.2.5",
+        "jest-resolve": "^27.2.5",
+        "jest-util": "^27.2.5",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^27.3.1",
+        "pretty-format": "^27.2.5",
         "semver": "^7.3.2"
       },
       "dependencies": {
         "@jest/transform": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.3.1.tgz",
-          "integrity": "sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.2.5.tgz",
+          "integrity": "sha512-29lRtAHHYGALbZOx343v0zKmdOg4Sb0rsA1uSv0818bvwRhs3TyElOmTVXlrw0v1ZTqXJCAH/cmoDXimBhQOJQ==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.1.0",
@@ -27272,9 +27803,9 @@
             "convert-source-map": "^1.4.0",
             "fast-json-stable-stringify": "^2.0.0",
             "graceful-fs": "^4.2.4",
-            "jest-haste-map": "^27.3.1",
+            "jest-haste-map": "^27.2.5",
             "jest-regex-util": "^27.0.6",
-            "jest-util": "^27.3.1",
+            "jest-util": "^27.2.5",
             "micromatch": "^4.0.4",
             "pirates": "^4.0.1",
             "slash": "^3.0.0",
@@ -27308,7 +27839,6 @@
           "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"
           }
@@ -27352,14 +27882,199 @@
             "fill-range": "^7.0.1"
           }
         },
+        "camelcase": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
+          "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
+          "dev": true
+        },
         "chalk": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "@jest/types": "^27.2.5",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "jest-haste-map": "^27.3.1",
+            "jest-pnp-resolver": "^1.2.2",
+            "jest-util": "^27.3.1",
+            "jest-validate": "^27.3.1",
+            "resolve": "^1.20.0",
+            "resolve.exports": "^1.1.0",
+            "slash": "^3.0.0"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+              "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+              "dev": true
+            },
+            "jest-get-type": {
+              "version": "27.4.0",
+              "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz",
+              "integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==",
+              "dev": true
+            },
+            "jest-haste-map": {
+              "version": "27.4.5",
+              "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.5.tgz",
+              "integrity": "sha512-oJm1b5qhhPs78K24EDGifWS0dELYxnoBiDhatT/FThgB9yxqUm5F6li3Pv+Q+apMBmmPNzOBnZ7ZxWMB1Leq1Q==",
+              "dev": true,
+              "requires": {
+                "@jest/types": "^27.4.2",
+                "@types/graceful-fs": "^4.1.2",
+                "@types/node": "*",
+                "anymatch": "^3.0.3",
+                "fb-watchman": "^2.0.0",
+                "fsevents": "^2.3.2",
+                "graceful-fs": "^4.2.4",
+                "jest-regex-util": "^27.4.0",
+                "jest-serializer": "^27.4.0",
+                "jest-util": "^27.4.2",
+                "jest-worker": "^27.4.5",
+                "micromatch": "^4.0.4",
+                "walker": "^1.0.7"
+              },
+              "dependencies": {
+                "@jest/types": {
+                  "version": "27.4.2",
+                  "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
+                  "integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
+                  "dev": true,
+                  "requires": {
+                    "@types/istanbul-lib-coverage": "^2.0.0",
+                    "@types/istanbul-reports": "^3.0.0",
+                    "@types/node": "*",
+                    "@types/yargs": "^16.0.0",
+                    "chalk": "^4.0.0"
+                  }
+                }
+              }
+            },
+            "jest-regex-util": {
+              "version": "27.4.0",
+              "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz",
+              "integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==",
+              "dev": true
+            },
+            "jest-serializer": {
+              "version": "27.4.0",
+              "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz",
+              "integrity": "sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==",
+              "dev": true,
+              "requires": {
+                "@types/node": "*",
+                "graceful-fs": "^4.2.4"
+              }
+            },
+            "jest-util": {
+              "version": "27.4.2",
+              "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz",
+              "integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==",
+              "dev": true,
+              "requires": {
+                "@jest/types": "^27.4.2",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "ci-info": "^3.2.0",
+                "graceful-fs": "^4.2.4",
+                "picomatch": "^2.2.3"
+              },
+              "dependencies": {
+                "@jest/types": {
+                  "version": "27.4.2",
+                  "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
+                  "integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
+                  "dev": true,
+                  "requires": {
+                    "@types/istanbul-lib-coverage": "^2.0.0",
+                    "@types/istanbul-reports": "^3.0.0",
+                    "@types/node": "*",
+                    "@types/yargs": "^16.0.0",
+                    "chalk": "^4.0.0"
+                  }
+                }
+              }
+            },
+            "jest-validate": {
+              "version": "27.4.2",
+              "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.2.tgz",
+              "integrity": "sha512-hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A==",
+              "dev": true,
+              "requires": {
+                "@jest/types": "^27.4.2",
+                "camelcase": "^6.2.0",
+                "chalk": "^4.0.0",
+                "jest-get-type": "^27.4.0",
+                "leven": "^3.1.0",
+                "pretty-format": "^27.4.2"
+              },
+              "dependencies": {
+                "@jest/types": {
+                  "version": "27.4.2",
+                  "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
+                  "integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
+                  "dev": true,
+                  "requires": {
+                    "@types/istanbul-lib-coverage": "^2.0.0",
+                    "@types/istanbul-reports": "^3.0.0",
+                    "@types/node": "*",
+                    "@types/yargs": "^16.0.0",
+                    "chalk": "^4.0.0"
+                  }
+                }
+              }
+            },
+            "jest-worker": {
+              "version": "27.4.5",
+              "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.5.tgz",
+              "integrity": "sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==",
+              "dev": true,
+              "requires": {
+                "@types/node": "*",
+                "merge-stream": "^2.0.0",
+                "supports-color": "^8.0.0"
+              }
+            },
+            "pretty-format": {
+              "version": "27.4.2",
+              "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz",
+              "integrity": "sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==",
+              "dev": true,
+              "requires": {
+                "@jest/types": "^27.4.2",
+                "ansi-regex": "^5.0.1",
+                "ansi-styles": "^5.0.0",
+                "react-is": "^17.0.1"
+              },
+              "dependencies": {
+                "@jest/types": {
+                  "version": "27.4.2",
+                  "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
+                  "integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
+                  "dev": true,
+                  "requires": {
+                    "@types/istanbul-lib-coverage": "^2.0.0",
+                    "@types/istanbul-reports": "^3.0.0",
+                    "@types/node": "*",
+                    "@types/yargs": "^16.0.0",
+                    "chalk": "^4.0.0"
+                  }
+                }
+              }
+            },
+            "supports-color": {
+              "version": "8.1.1",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+              "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
           }
         },
         "ci-info": {
@@ -27372,16 +28087,15 @@
           "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"
+            "@types/node": "*",
+            "graceful-fs": "^4.2.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
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
         },
         "fill-range": {
           "version": "7.0.1",
@@ -27402,8 +28116,16 @@
         "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
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
         },
         "is-number": {
           "version": "7.0.0",
@@ -27412,9 +28134,9 @@
           "dev": true
         },
         "jest-haste-map": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.3.1.tgz",
-          "integrity": "sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.2.5.tgz",
+          "integrity": "sha512-pzO+Gw2WLponaSi0ilpzYBE0kuVJstoXBX8YWyUebR8VaXuX4tzzn0Zp23c/WaETo7XYTGv2e8KdnpiskAFMhQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -27426,8 +28148,8 @@
             "graceful-fs": "^4.2.4",
             "jest-regex-util": "^27.0.6",
             "jest-serializer": "^27.0.6",
-            "jest-util": "^27.3.1",
-            "jest-worker": "^27.3.1",
+            "jest-util": "^27.2.5",
+            "jest-worker": "^27.2.5",
             "micromatch": "^4.0.4",
             "walker": "^1.0.7"
           }
@@ -27439,20 +28161,20 @@
           "dev": true
         },
         "jest-resolve": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.3.1.tgz",
-          "integrity": "sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.2.5.tgz",
+          "integrity": "sha512-q5irwS3oS73SKy3+FM/HL2T7WJftrk9BRzrXF92f7net5HMlS7lJMg/ZwxLB4YohKqjSsdksEw7n/jvMxV7EKg==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "chalk": "^4.0.0",
+            "escalade": "^3.1.1",
             "graceful-fs": "^4.2.4",
-            "jest-haste-map": "^27.3.1",
+            "jest-haste-map": "^27.2.5",
             "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^27.3.1",
-            "jest-validate": "^27.3.1",
+            "jest-util": "^27.2.5",
+            "jest-validate": "^27.2.5",
             "resolve": "^1.20.0",
-            "resolve.exports": "^1.1.0",
             "slash": "^3.0.0"
           }
         },
@@ -27467,23 +28189,33 @@
           }
         },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "8.1.1",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+              "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
           }
         },
         "jest-worker": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
-          "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.5.tgz",
+          "integrity": "sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==",
           "dev": true,
           "requires": {
             "@types/node": "*",
@@ -27522,9 +28254,9 @@
           }
         },
         "pretty-format": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
-          "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.5.tgz",
+          "integrity": "sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -27566,7 +28298,6 @@
           "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"
           }
@@ -27602,11 +28333,40 @@
         "micromatch": "^4.0.2"
       },
       "dependencies": {
+        "@jest/transform": {
+          "version": "27.3.1",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.3.1.tgz",
+          "integrity": "sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ==",
+          "requires": {
+            "@babel/core": "^7.1.0",
+            "babel-plugin-istanbul": "^6.0.0",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^1.4.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "graceful-fs": "^4.2.4",
+            "micromatch": "^4.0.4",
+            "pirates": "^4.0.1",
+            "slash": "^3.0.0",
+            "write-file-atomic": "^3.0.0"
+          }
+        },
+        "@jest/types": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
         "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"
           }
@@ -27615,7 +28375,6 @@
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
           "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
           "requires": {
             "fill-range": "^7.0.1"
           }
@@ -27624,17 +28383,20 @@
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
+        "ci-info": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
+          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A=="
+        },
         "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"
           }
@@ -27642,14 +28404,12 @@
         "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
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
         },
         "fill-range": {
           "version": "7.0.1",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
           "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
           "requires": {
             "to-regex-range": "^5.0.1"
           }
@@ -27657,20 +28417,17 @@
         "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
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "is-number": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
         },
         "micromatch": {
           "version": "4.0.4",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
           "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-          "dev": true,
           "requires": {
             "braces": "^3.0.1",
             "picomatch": "^2.2.3"
@@ -27680,7 +28437,6 @@
           "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"
           }
@@ -27689,7 +28445,6 @@
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
           "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
           "requires": {
             "is-number": "^7.0.0"
           }
@@ -27697,17 +28452,17 @@
       }
     },
     "jest-validate": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.3.1.tgz",
-      "integrity": "sha512-3H0XCHDFLA9uDII67Bwi1Vy7AqwA5HqEEjyy934lgVhtJ3eisw6ShOF1MDmRPspyikef5MyExvIm0/TuLzZ86Q==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.2.5.tgz",
+      "integrity": "sha512-XgYtjS89nhVe+UfkbLgcm+GgXKWgL80t9nTcNeejyO3t0Sj/yHE8BtIJqjZu9NXQksYbGImoQRXmQ1gP+Guffw==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.2.5",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.3.1",
+        "jest-get-type": "^27.0.6",
         "leven": "^3.1.0",
-        "pretty-format": "^27.3.1"
+        "pretty-format": "^27.2.5"
       },
       "dependencies": {
         "@jest/types": {
@@ -27779,9 +28534,9 @@
           "dev": true
         },
         "pretty-format": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
-          "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.5.tgz",
+          "integrity": "sha512-+nYn2z9GgicO9JiqmY25Xtq8SYfZ/5VCpEU3pppHHNAhd1y+ZXxmNPd1evmNcAd6Hz4iBV2kf0UpGth5A/VJ7g==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
@@ -27816,17 +28571,17 @@
       }
     },
     "jest-watcher": {
-      "version": "27.3.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.3.1.tgz",
-      "integrity": "sha512-9/xbV6chABsGHWh9yPaAGYVVKurWoP3ZMCv6h+O1v9/+pkOroigs6WzZ0e9gLP/njokUwM7yQhr01LKJVMkaZA==",
+      "version": "27.2.5",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.2.5.tgz",
+      "integrity": "sha512-umV4qGozg2Dn6DTTtqAh9puPw+DGLK9AQas7+mWjiK8t0fWMpxKg8ZXReZw7L4C88DqorsGUiDgwHNZ+jkVrkQ==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^27.3.1",
+        "@jest/test-result": "^27.2.5",
         "@jest/types": "^27.2.5",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^27.3.1",
+        "jest-util": "^27.2.5",
         "string-length": "^4.0.1"
       },
       "dependencies": {
@@ -27907,17 +28662,26 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
@@ -28013,7 +28777,6 @@
       "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"
@@ -28191,7 +28954,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
       "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "dev": true,
       "requires": {
         "minimist": "^1.2.5"
       }
@@ -29137,7 +29899,6 @@
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
       "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "dev": true,
       "requires": {
         "tmpl": "1.0.5"
       }
@@ -31061,9 +31822,9 @@
       }
     },
     "nanoid": {
-      "version": "3.1.30",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
-      "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==",
+      "version": "3.1.29",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.29.tgz",
+      "integrity": "sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg==",
       "dev": true
     },
     "nanomatch": {
@@ -31181,10 +31942,9 @@
           "dev": true
         },
         "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
         },
         "cliui": {
           "version": "5.0.0",
@@ -31417,6 +32177,12 @@
             "strip-ansi": "^4.0.0"
           },
           "dependencies": {
+            "ansi-regex": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+              "dev": true
+            },
             "strip-ansi": {
               "version": "4.0.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -31750,8 +32516,7 @@
     "node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-      "dev": true
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
     },
     "node-libs-browser": {
       "version": "2.2.1",
@@ -31861,8 +32626,7 @@
     "node-modules-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-      "dev": true
+      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA="
     },
     "node-notifier": {
       "version": "4.6.1",
@@ -31900,8 +32664,7 @@
     "node-releases": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
-      "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
-      "dev": true
+      "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA=="
     },
     "nodemon": {
       "version": "2.0.15",
@@ -32390,6 +33153,11 @@
             }
           }
         },
+        "core-util-is": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+        },
         "debuglog": {
           "version": "1.0.1",
           "resolved": false,
@@ -33367,11 +34135,6 @@
               "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
               "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
             },
-            "core-util-is": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-              "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-            },
             "isarray": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -33894,6 +34657,11 @@
             }
           }
         },
+        "spdx-license-ids": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.0.tgz",
+          "integrity": "sha1-tUndD2Pct0Whfi6joHQC4OMy0eI="
+        },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": false,
@@ -34529,10 +35297,6 @@
                   "version": "1.0.4",
                   "resolved": false,
                   "integrity": "sha1-IguEI5EZrpBFqJLbgag/TOFvgP0="
-                },
-                "spdx-license-ids": {
-                  "version": "1.2.0",
-                  "resolved": false
                 }
               }
             }
@@ -37935,8 +38699,7 @@
     "picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
     },
     "picomatch": {
       "version": "2.3.0",
@@ -37973,7 +38736,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
       "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dev": true,
       "requires": {
         "node-modules-regexp": "^1.0.0"
       }
@@ -39344,6 +40106,17 @@
         "react-is": "^17.0.2"
       },
       "dependencies": {
+        "@types/react-redux": {
+          "version": "7.1.20",
+          "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.20.tgz",
+          "integrity": "sha512-q42es4c8iIeTgcnB+yJgRTTzftv3eYYvCZOh1Ckn2eX/3o5TdsQYKUWpLoLuGlcY/p+VAhV9IOEZJcWk/vfkXw==",
+          "requires": {
+            "@types/hoist-non-react-statics": "^3.3.0",
+            "@types/react": "*",
+            "hoist-non-react-statics": "^3.3.0",
+            "redux": "^4.0.0"
+          }
+        },
         "react-is": {
           "version": "17.0.2",
           "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -39358,9 +40131,9 @@
       "dev": true
     },
     "react-tabs": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/react-tabs/-/react-tabs-3.2.3.tgz",
-      "integrity": "sha512-jx325RhRVnS9DdFbeF511z0T0WEqEoMl1uCE3LoZ6VaZZm7ytatxbum0B8bCTmaiV0KsU+4TtLGTGevCic7SWg==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/react-tabs/-/react-tabs-3.2.2.tgz",
+      "integrity": "sha512-/o52eGKxFHRa+ssuTEgSM8qORnV4+k7ibW+aNQzKe+5gifeVz8nLxCrsI9xdRhfb0wCLdgIambIpb1qCxaMN+A==",
       "requires": {
         "clsx": "^1.1.0",
         "prop-types": "^15.5.0"
@@ -40033,8 +40806,7 @@
     "resolve.exports": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
-      "dev": true
+      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="
     },
     "responselike": {
       "version": "1.0.2",
@@ -40875,6 +41647,15 @@
             "which": "^2.0.1"
           }
         },
+        "debug": {
+          "version": "4.3.2",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
         "decompress-response": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
@@ -40946,9 +41727,9 @@
           }
         },
         "keyv": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.4.tgz",
-          "integrity": "sha512-vqNHbAc8BBsxk+7QBYLW0Y219rWcClspR6WSeoHYKG5mnsSoOH+BL1pWq02DDCVdvvuUny5rkBlzMRzoqc+GIg==",
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz",
+          "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==",
           "dev": true,
           "requires": {
             "json-buffer": "3.0.1"
@@ -41360,8 +42141,7 @@
     "signal-exit": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
-      "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==",
-      "dev": true
+      "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ=="
     },
     "signale": {
       "version": "1.4.0",
@@ -41421,8 +42201,7 @@
     "slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
     },
     "slide": {
       "version": "1.1.6",
@@ -41873,8 +42652,7 @@
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
     "sshpk": {
       "version": "1.16.1",
@@ -43429,7 +44207,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dev": true,
       "requires": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -43594,8 +44371,7 @@
     "tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-      "dev": true
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
     },
     "to-absolute-glob": {
       "version": "2.0.2",
@@ -43868,17 +44644,26 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^3.1.1"
+          }
+        },
         "jest-util": {
-          "version": "27.3.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.3.1.tgz",
-          "integrity": "sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==",
+          "version": "27.2.5",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.5.tgz",
+          "integrity": "sha512-QRhDC6XxISntMzFRd/OQ6TGsjbzA5ONO0tlAj2ElHs155x1aEr0rkYJBEysG6H/gZVH3oGFzCdAB/GA8leh8NQ==",
           "dev": true,
           "requires": {
             "@jest/types": "^27.2.5",
             "@types/node": "*",
             "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
             "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
             "picomatch": "^2.2.3"
           }
         },
@@ -45160,7 +45945,6 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
       "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "dev": true,
       "requires": {
         "makeerror": "1.0.12"
       }
@@ -45374,9 +46158,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "12.20.37",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz",
-          "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA=="
+          "version": "12.20.28",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.28.tgz",
+          "integrity": "sha512-cBw8gzxUPYX+/5lugXIPksioBSbE42k0fZ39p+4yRzfYjN6++eq9kAPdlY9qm+MXyfbk9EmvCYAYRn380sF46w=="
         }
       }
     },
@@ -45403,9 +46187,9 @@
           }
         },
         "@types/node": {
-          "version": "12.20.37",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz",
-          "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA=="
+          "version": "12.20.28",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.28.tgz",
+          "integrity": "sha512-cBw8gzxUPYX+/5lugXIPksioBSbE42k0fZ39p+4yRzfYjN6++eq9kAPdlY9qm+MXyfbk9EmvCYAYRn380sF46w=="
         }
       }
     },
@@ -45584,9 +46368,9 @@
           }
         },
         "@types/node": {
-          "version": "16.11.7",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
-          "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
+          "version": "16.10.3",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz",
+          "integrity": "sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ=="
         }
       }
     },
@@ -45635,9 +46419,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "12.20.37",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz",
-          "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA=="
+          "version": "12.20.28",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.28.tgz",
+          "integrity": "sha512-cBw8gzxUPYX+/5lugXIPksioBSbE42k0fZ39p+4yRzfYjN6++eq9kAPdlY9qm+MXyfbk9EmvCYAYRn380sF46w=="
         }
       }
     },
@@ -46656,7 +47440,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
       "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4",
         "is-typedarray": "^1.0.0",
diff --git a/tsconfig.base.json b/tsconfig.base.json
index fcb8955cab..61cf768519 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -64,6 +64,7 @@
       "@remix-ui/renderer": ["libs/remix-ui/renderer/src/index.ts"],
       "@remix-ui/terminal": ["libs/remix-ui/terminal/src/index.ts"],
       "@remix-ui/plugin-manager": ["libs/remix-ui/plugin-manager/src/index.ts"],
+      "@remix-ui/home-tab": ["libs/remix-ui/home-tab/src/index.ts"],
       "@remix-ui/editor": ["libs/remix-ui/editor/src/index.ts"],
       "@remix-project/remix-ui/home-tab": ["libs/remix-ui/home-tab/src/index.ts"],
       "@remix-ui/tabs": ["libs/remix-ui/tabs/src/index.ts"],

From 0202cdaca7b3c6d486c1e9c58f9a655e22974b2d Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 21 Dec 2021 12:16:42 +0100
Subject: [PATCH 17/43] an e2e for Import from github

---
 libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
index ec004e5098..8fec99aece 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
@@ -272,7 +272,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
                 <p className="mt-3 mb-0"><label>LOAD FROM:</label></p>
                 <div className="btn-group">
                   <button className="btn mr-1 btn-secondary" data-id="landingPageImportFromGistButton" onClick={() => importFromGist()}>Gist</button>
-                  <button className="btn mx-1 btn-secondary" onClick={() => showFullMessage('Github', 'github URL', ['https://github.com/0xcert/ethereum-erc721/src/contracts/tokens/nf-token-metadata.sol', 'https://github.com/OpenZeppelin/openzeppelin-solidity/blob/67bca857eedf99bf44a4b6a0fc5b5ed553135316/contracts/access/Roles.sol'])}>GitHub</button>
+                  <button className="btn mx-1 btn-secondary" data-id="landingPageImportFromGitHubButton" onClick={() => showFullMessage('Github', 'github URL', ['https://github.com/0xcert/ethereum-erc721/src/contracts/tokens/nf-token-metadata.sol', 'https://github.com/OpenZeppelin/openzeppelin-solidity/blob/67bca857eedf99bf44a4b6a0fc5b5ed553135316/contracts/access/Roles.sol'])}>GitHub</button>
                   <button className="btn mx-1 btn-secondary" onClick={() => showFullMessage('Ipfs', 'ipfs URL', ['ipfs://<ipfs-hash>'])}>Ipfs</button>
                   <button className="btn mx-1 btn-secondary" onClick={() => showFullMessage('Https', 'http/https raw content', ['https://raw.githubusercontent.com/OpenZeppelin/openzeppelin-contracts/master/contracts/token/ERC20/ERC20.sol'])}>https</button>
                 </div>

From 15a1f44dadb5639cb2e4e317c1406cff631208e1 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 21 Dec 2021 12:43:57 +0100
Subject: [PATCH 18/43] added a script to run a new test

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index e04be0c418..693012f115 100644
--- a/package.json
+++ b/package.json
@@ -87,6 +87,7 @@
     "nightwatch_local_fileExplorer": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/fileExplorer.test.js --env=chrome",
     "nightwatch_local_debugger": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/debugger_*.test.js --env=chrome",
     "nightwatch_local_editor": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/editor.test.js --env=chrome",
+    "nightwatch_local_importFromGithub": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/importFromGithub.test.js --env=chrome",
     "nightwatch_local_compiler": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/compiler_api.test.js --env=chrome",
     "nightwatch_local_txListener": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/txListener.test.js --env=chrome",
     "nightwatch_local_fileManager": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/fileManager_api.test.js --env=chrome",

From 7f357733fe39034c1c55742216e454ecedf5513b Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 21 Dec 2021 14:11:31 +0100
Subject: [PATCH 19/43] adding a test file

---
 .../src/tests/importFromGithub.test.ts        | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 apps/remix-ide-e2e/src/tests/importFromGithub.test.ts

diff --git a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
new file mode 100644
index 0000000000..0cc3a0b533
--- /dev/null
+++ b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
@@ -0,0 +1,57 @@
+'use strict'
+import { NightwatchBrowser } from 'nightwatch'
+import init from '../helpers/init'
+
+const testData = {
+  validURL: 'https://github.com/OpenZeppelin/openzeppelin-solidity/blob/67bca857eedf99bf44a4b6a0fc5b5ed553135316/contracts/access/Roles.sol',
+  invalidURL: 'https://github.com/Oppelin/Roles.sol'
+}
+
+module.exports = {
+  before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    init(browser, done)
+  },
+
+  'Import from GitHub Modal': function (browser: NightwatchBrowser) {
+    browser.clickLaunchIcon('home')
+      .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
+      .clickLaunchIcon('filePanel')
+      .click('div[title="home"]')
+      .waitForElementVisible('button[data-id="landingPageImportFromGitHubButton"]')
+      .pause(1000)
+      .scrollAndClick('button[data-id="landingPageImportFromGitHubButton"]')
+      .waitForElementVisible('*[data-id="modalDialogModalTitle"]')
+      .assert.containsText('*[data-id="modalDialogModalTitle"]', 'Import from Github')
+      .waitForElementVisible('*[data-id="modalDialogModalBody"]')
+      .assert.containsText('*[data-id="modalDialogModalBody"]', 'Enter the github URL you would like to load.')
+      .waitForElementVisible('*[data-id="importModalDialogCustomPromptText"]')
+      .modalFooterCancelClick()
+  },
+
+  'Display Error Message For Invalid GitHub URL Modal': function (browser: NightwatchBrowser) {
+    browser
+      .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
+      .clickLaunchIcon('filePanel')
+      .scrollAndClick('*[data-id="landingPageImportFromGitHubButton"]')
+      .waitForElementVisible('*[data-id="importModalDialogCustomPromptText"]')
+      .setValue('*[data-id="importModalDialogCustomPromptText"]', testData.invalidURL)
+      .modalFooterOKClick()
+      .waitForElementVisible('*[data-id="modalDialogModalBody"]')
+      .assert.containsText('*[data-id="modalDialogModalBody"]', 'Not Found')
+      .modalFooterOKClick()
+  },
+
+  'Import From Github For Valid URL': function (browser: NightwatchBrowser) {
+    browser
+      .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
+      .clickLaunchIcon('settings')
+      .clickLaunchIcon('filePanel')
+      .scrollAndClick('*[data-id="landingPageImportFromGitHubButton"]')
+      .waitForElementVisible('*[data-id="importModalDialogCustomPromptText"]')
+      .setValue('*[data-id="importModalDialogCustomPromptText"]', testData.validURL)
+      .modalFooterOKClick()
+      .openFile('default_workspace/github/OpenZeppelin/openzeppelin-solidity/contracts/access/Roles.sol')
+      .waitForElementVisible("div[title='default_workspace/github/OpenZeppelin/openzeppelin-solidity/contracts/access/Roles.sol'")
+      .end()
+  }
+}

From a61d75b8ee92bc005b7846c9fb11482839fe1bf3 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 21 Dec 2021 14:44:26 +0100
Subject: [PATCH 20/43] made id mandatory prop for modal dialog as it is used
 and undefined

---
 .../src/tests/importFromGithub.test.ts        |  31 +++---
 .../home-tab/src/lib/remix-ui-home-tab.tsx    |   3 +-
 .../modal-dialog/src/lib/types/index.ts       |   2 +-
 .../lib/components/permissionsSettings.tsx    |   1 +
 .../terminal/src/lib/remix-ui-terminal.tsx    |   1 +
 libs/remix-ui/toaster/src/lib/toaster.tsx     |   1 +
 package-lock.json                             | 101 +++++++-----------
 7 files changed, 58 insertions(+), 82 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
index 0cc3a0b533..dcd6de5137 100644
--- a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
+++ b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
@@ -20,12 +20,12 @@ module.exports = {
       .waitForElementVisible('button[data-id="landingPageImportFromGitHubButton"]')
       .pause(1000)
       .scrollAndClick('button[data-id="landingPageImportFromGitHubButton"]')
-      .waitForElementVisible('*[data-id="modalDialogModalTitle"]')
-      .assert.containsText('*[data-id="modalDialogModalTitle"]', 'Import from Github')
-      .waitForElementVisible('*[data-id="modalDialogModalBody"]')
-      .assert.containsText('*[data-id="modalDialogModalBody"]', 'Enter the github URL you would like to load.')
-      .waitForElementVisible('*[data-id="importModalDialogCustomPromptText"]')
-      .modalFooterCancelClick()
+      .waitForElementVisible('*[data-id="homeTabModalDialogModalTitle-react"]')
+      .assert.containsText('*[data-id="homeTabModalDialogModalTitle-react"]', 'Import from Github')
+      .waitForElementVisible('*[data-id="homeTabModalDialogModalBody-react"]')
+      .assert.containsText('*[data-id="homeTabModalDialogModalBody-react"]', 'Enter the github URL you would like to load.')
+      .waitForElementVisible('*[data-id="homeTabModalDialogCustomPromptText"]')
+      .refresh()
   },
 
   'Display Error Message For Invalid GitHub URL Modal': function (browser: NightwatchBrowser) {
@@ -33,12 +33,12 @@ module.exports = {
       .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
       .clickLaunchIcon('filePanel')
       .scrollAndClick('*[data-id="landingPageImportFromGitHubButton"]')
-      .waitForElementVisible('*[data-id="importModalDialogCustomPromptText"]')
-      .setValue('*[data-id="importModalDialogCustomPromptText"]', testData.invalidURL)
-      .modalFooterOKClick()
-      .waitForElementVisible('*[data-id="modalDialogModalBody"]')
-      .assert.containsText('*[data-id="modalDialogModalBody"]', 'Not Found')
-      .modalFooterOKClick()
+      .waitForElementVisible('*[data-id="homeTabModalDialogCustomPromptText"]')
+      .setValue('*[data-id="homeTabModalDialogCustomPromptText"]', testData.invalidURL)
+      .waitForElementVisible('*[data-id="homeTab-modal-footer-ok-react"]')
+      .scrollAndClick('[data-id="homeTab-modal-footer-ok-react"]') // submitted
+      .waitForElementVisible('*[data-shared="tooltipPopup"]')
+      .assert.containsText('*[data-shared="tooltipPopup"] span', 'not found ' + testData.invalidURL)
   },
 
   'Import From Github For Valid URL': function (browser: NightwatchBrowser) {
@@ -47,9 +47,10 @@ module.exports = {
       .clickLaunchIcon('settings')
       .clickLaunchIcon('filePanel')
       .scrollAndClick('*[data-id="landingPageImportFromGitHubButton"]')
-      .waitForElementVisible('*[data-id="importModalDialogCustomPromptText"]')
-      .setValue('*[data-id="importModalDialogCustomPromptText"]', testData.validURL)
-      .modalFooterOKClick()
+      .waitForElementVisible('*[data-id="homeTabModalDialogCustomPromptText"]')
+      .setValue('*[data-id="homeTabModalDialogCustomPromptText"]', testData.validURL)
+      .waitForElementVisible('*[data-id="homeTab-modal-footer-ok-react"]')
+      .scrollAndClick('[data-id="homeTab-modal-footer-ok-react"]')
       .openFile('default_workspace/github/OpenZeppelin/openzeppelin-solidity/contracts/access/Roles.sol')
       .waitForElementVisible("div[title='default_workspace/github/OpenZeppelin/openzeppelin-solidity/contracts/access/Roles.sol'")
       .end()
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
index 8fec99aece..28e26657b4 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
@@ -186,6 +186,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
   return (
     <>
       <ModalDialog
+        id='homeTab'
         title={ 'Import from ' + state.modalInfo.title }
         okLabel='Import'
         hide={ !state.showModalDialog }
@@ -207,7 +208,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
             name='prompt_text'
             id='inputPrompt_text'
             className="w-100 mt-1 form-control"
-            data-id="importModalDialogCustomPromptText"
+            data-id="homeTabModalDialogCustomPromptText"
             value={state.importSource}
             onInput={(e) => {
               setState(prevState => {
diff --git a/libs/remix-ui/modal-dialog/src/lib/types/index.ts b/libs/remix-ui/modal-dialog/src/lib/types/index.ts
index ccdd374ef4..b03cb16c94 100644
--- a/libs/remix-ui/modal-dialog/src/lib/types/index.ts
+++ b/libs/remix-ui/modal-dialog/src/lib/types/index.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-undef */
 export interface ModalDialogProps {
-  id?: string
+  id: string
   title?: string,
   message?: string | JSX.Element,
   okLabel?: string,
diff --git a/libs/remix-ui/plugin-manager/src/lib/components/permissionsSettings.tsx b/libs/remix-ui/plugin-manager/src/lib/components/permissionsSettings.tsx
index dd41957fbe..690dadad8a 100644
--- a/libs/remix-ui/plugin-manager/src/lib/components/permissionsSettings.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/permissionsSettings.tsx
@@ -106,6 +106,7 @@ function PermisssionsSettings ({ pluginSettings }: PermissionSettingsProps) {
   return (
     <Fragment>
       <ModalDialog
+        id='permissionsSettings'
         handleHide={closeModal}
         cancelFn={cancel}
         hide={modalVisibility}
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
index 6225e4f50e..270f4a6593 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -558,6 +558,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
         </div>
       </div>
       <ModalDialog
+        id='terminal'
         title={ modalState.title }
         message={ modalState.message }
         hide={ modalState.hide }
diff --git a/libs/remix-ui/toaster/src/lib/toaster.tsx b/libs/remix-ui/toaster/src/lib/toaster.tsx
index 0e916ce314..d31476a424 100644
--- a/libs/remix-ui/toaster/src/lib/toaster.tsx
+++ b/libs/remix-ui/toaster/src/lib/toaster.tsx
@@ -92,6 +92,7 @@ export const Toaster = (props: ToasterProps) => {
   return (
     <>
       <ModalDialog
+        id='toaster'
         message={props.message}
         cancelLabel='Close'
         cancelFn={() => {}}
diff --git a/package-lock.json b/package-lock.json
index ecc8e4454f..bfa28d89a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1782,6 +1782,14 @@
       "requires": {
         "core-js": "^2.6.5",
         "regenerator-runtime": "^0.13.4"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.12",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+          "dev": true
+        }
       }
     },
     "@babel/preset-env": {
@@ -4607,7 +4615,6 @@
             "jest-haste-map": "^27.3.1",
             "jest-pnp-resolver": "^1.2.2",
             "resolve": "^1.20.0",
-            "resolve.exports": "^1.1.0",
             "slash": "^3.0.0"
           }
         },
@@ -11596,8 +11603,7 @@
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -13299,6 +13305,12 @@
         "regenerator-runtime": "^0.11.0"
       },
       "dependencies": {
+        "core-js": {
+          "version": "2.6.12",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+          "dev": true
+        },
         "regenerator-runtime": {
           "version": "0.11.1",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
@@ -27830,7 +27842,6 @@
           "version": "16.0.4",
           "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
           "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
           }
@@ -27847,7 +27858,6 @@
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
           "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-          "dev": true,
           "requires": {
             "normalize-path": "^3.0.0",
             "picomatch": "^2.0.4"
@@ -27877,7 +27887,6 @@
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
           "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
           "requires": {
             "fill-range": "^7.0.1"
           }
@@ -27885,44 +27894,34 @@
         "camelcase": {
           "version": "6.2.1",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
-          "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
-          "dev": true
+          "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA=="
         },
         "chalk": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
           "requires": {
-            "@jest/types": "^27.2.5",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.4",
-            "jest-haste-map": "^27.3.1",
-            "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^27.3.1",
-            "jest-validate": "^27.3.1",
-            "resolve": "^1.20.0",
-            "resolve.exports": "^1.1.0",
-            "slash": "^3.0.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           },
           "dependencies": {
             "ansi-styles": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-              "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-              "dev": true
+              "version": "4.3.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+              "requires": {
+                "color-convert": "^2.0.1"
+              }
             },
             "jest-get-type": {
               "version": "27.4.0",
               "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz",
-              "integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==",
-              "dev": true
+              "integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ=="
             },
             "jest-haste-map": {
               "version": "27.4.5",
               "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.5.tgz",
               "integrity": "sha512-oJm1b5qhhPs78K24EDGifWS0dELYxnoBiDhatT/FThgB9yxqUm5F6li3Pv+Q+apMBmmPNzOBnZ7ZxWMB1Leq1Q==",
-              "dev": true,
               "requires": {
                 "@jest/types": "^27.4.2",
                 "@types/graceful-fs": "^4.1.2",
@@ -27943,7 +27942,6 @@
                   "version": "27.4.2",
                   "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
                   "integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
-                  "dev": true,
                   "requires": {
                     "@types/istanbul-lib-coverage": "^2.0.0",
                     "@types/istanbul-reports": "^3.0.0",
@@ -27957,14 +27955,12 @@
             "jest-regex-util": {
               "version": "27.4.0",
               "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz",
-              "integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==",
-              "dev": true
+              "integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg=="
             },
             "jest-serializer": {
               "version": "27.4.0",
               "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz",
               "integrity": "sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==",
-              "dev": true,
               "requires": {
                 "@types/node": "*",
                 "graceful-fs": "^4.2.4"
@@ -27974,7 +27970,6 @@
               "version": "27.4.2",
               "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz",
               "integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==",
-              "dev": true,
               "requires": {
                 "@jest/types": "^27.4.2",
                 "@types/node": "*",
@@ -27988,7 +27983,6 @@
                   "version": "27.4.2",
                   "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
                   "integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
-                  "dev": true,
                   "requires": {
                     "@types/istanbul-lib-coverage": "^2.0.0",
                     "@types/istanbul-reports": "^3.0.0",
@@ -28003,7 +27997,6 @@
               "version": "27.4.2",
               "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.2.tgz",
               "integrity": "sha512-hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A==",
-              "dev": true,
               "requires": {
                 "@jest/types": "^27.4.2",
                 "camelcase": "^6.2.0",
@@ -28017,7 +28010,6 @@
                   "version": "27.4.2",
                   "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
                   "integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
-                  "dev": true,
                   "requires": {
                     "@types/istanbul-lib-coverage": "^2.0.0",
                     "@types/istanbul-reports": "^3.0.0",
@@ -28032,22 +28024,18 @@
               "version": "27.4.5",
               "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.5.tgz",
               "integrity": "sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==",
-              "dev": true,
               "requires": {
                 "@types/node": "*",
-                "merge-stream": "^2.0.0",
-                "supports-color": "^8.0.0"
+                "merge-stream": "^2.0.0"
               }
             },
             "pretty-format": {
               "version": "27.4.2",
               "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz",
               "integrity": "sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==",
-              "dev": true,
               "requires": {
                 "@jest/types": "^27.4.2",
                 "ansi-regex": "^5.0.1",
-                "ansi-styles": "^5.0.0",
                 "react-is": "^17.0.1"
               },
               "dependencies": {
@@ -28055,7 +28043,6 @@
                   "version": "27.4.2",
                   "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
                   "integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
-                  "dev": true,
                   "requires": {
                     "@types/istanbul-lib-coverage": "^2.0.0",
                     "@types/istanbul-reports": "^3.0.0",
@@ -28067,10 +28054,9 @@
               }
             },
             "supports-color": {
-              "version": "8.1.1",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-              "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-              "dev": true,
+              "version": "7.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
               "requires": {
                 "has-flag": "^4.0.0"
               }
@@ -28080,16 +28066,14 @@
         "ci-info": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
-          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
-          "dev": true
+          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A=="
         },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "requires": {
-            "@types/node": "*",
-            "graceful-fs": "^4.2.4"
+            "color-name": "~1.1.4"
           }
         },
         "color-name": {
@@ -28101,7 +28085,6 @@
           "version": "7.0.1",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
           "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
           "requires": {
             "to-regex-range": "^5.0.1"
           }
@@ -28110,7 +28093,6 @@
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
           "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-          "dev": true,
           "optional": true
         },
         "has-flag": {
@@ -28130,8 +28112,7 @@
         "is-number": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
         },
         "jest-haste-map": {
           "version": "27.2.5",
@@ -28247,7 +28228,6 @@
           "version": "4.0.4",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
           "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-          "dev": true,
           "requires": {
             "braces": "^3.0.1",
             "picomatch": "^2.2.3"
@@ -28276,8 +28256,7 @@
         "react-is": {
           "version": "17.0.2",
           "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-          "dev": true
+          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
         },
         "semver": {
           "version": "7.3.5",
@@ -28306,7 +28285,6 @@
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
           "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
           "requires": {
             "is-number": "^7.0.0"
           }
@@ -29390,8 +29368,7 @@
     "leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
     },
     "levn": {
       "version": "0.3.0",
@@ -30271,8 +30248,7 @@
     "merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
     },
     "merge2": {
       "version": "1.4.1",
@@ -40803,11 +40779,6 @@
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
     },
-    "resolve.exports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="
-    },
     "responselike": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",

From 0778cb871d19cf6c5564b0b771f037cd9e3ffe1b Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 21 Dec 2021 22:02:57 +0100
Subject: [PATCH 21/43] test

---
 apps/remix-ide-e2e/src/tests/importFromGithub.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
index dcd6de5137..124538a708 100644
--- a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
+++ b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
@@ -31,6 +31,7 @@ module.exports = {
   'Display Error Message For Invalid GitHub URL Modal': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
+      .clickLaunchIcon('settings')
       .clickLaunchIcon('filePanel')
       .scrollAndClick('*[data-id="landingPageImportFromGitHubButton"]')
       .waitForElementVisible('*[data-id="homeTabModalDialogCustomPromptText"]')

From a7faa6f6588619282f137347db686646f209e5a9 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 22 Dec 2021 10:57:48 +0100
Subject: [PATCH 22/43] fix test

---
 apps/remix-ide-e2e/src/tests/importFromGithub.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
index 124538a708..56d0de9d6c 100644
--- a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
+++ b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
@@ -52,7 +52,7 @@ module.exports = {
       .setValue('*[data-id="homeTabModalDialogCustomPromptText"]', testData.validURL)
       .waitForElementVisible('*[data-id="homeTab-modal-footer-ok-react"]')
       .scrollAndClick('[data-id="homeTab-modal-footer-ok-react"]')
-      .openFile('default_workspace/github/OpenZeppelin/openzeppelin-solidity/contracts/access/Roles.sol')
+      .openFile('github/OpenZeppelin/openzeppelin-solidity/contracts/access/Roles.sol')
       .waitForElementVisible("div[title='default_workspace/github/OpenZeppelin/openzeppelin-solidity/contracts/access/Roles.sol'")
       .end()
   }

From cf04ebcdc8337eb9cee31f450415255fdc6d64cc Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 22 Dec 2021 11:29:55 +0100
Subject: [PATCH 23/43] fix E2E

---
 apps/remix-ide-e2e/src/tests/importFromGithub.test.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
index 56d0de9d6c..8c8830c067 100644
--- a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
+++ b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
@@ -35,6 +35,7 @@ module.exports = {
       .clickLaunchIcon('filePanel')
       .scrollAndClick('*[data-id="landingPageImportFromGitHubButton"]')
       .waitForElementVisible('*[data-id="homeTabModalDialogCustomPromptText"]')
+      .clearValue('*[data-id="homeTabModalDialogCustomPromptText"]')
       .setValue('*[data-id="homeTabModalDialogCustomPromptText"]', testData.invalidURL)
       .waitForElementVisible('*[data-id="homeTab-modal-footer-ok-react"]')
       .scrollAndClick('[data-id="homeTab-modal-footer-ok-react"]') // submitted
@@ -49,6 +50,7 @@ module.exports = {
       .clickLaunchIcon('filePanel')
       .scrollAndClick('*[data-id="landingPageImportFromGitHubButton"]')
       .waitForElementVisible('*[data-id="homeTabModalDialogCustomPromptText"]')
+      .clearValue('*[data-id="homeTabModalDialogCustomPromptText"]')
       .setValue('*[data-id="homeTabModalDialogCustomPromptText"]', testData.validURL)
       .waitForElementVisible('*[data-id="homeTab-modal-footer-ok-react"]')
       .scrollAndClick('[data-id="homeTab-modal-footer-ok-react"]')

From 1ce0bbb31ad6a155ba45ad8187d6312636917d53 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 22 Dec 2021 12:52:25 +0100
Subject: [PATCH 24/43] fix E2E

---
 .../src/tests/importFromGithub.test.ts          | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
index 8c8830c067..3fc73c2430 100644
--- a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
+++ b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
@@ -34,9 +34,13 @@ module.exports = {
       .clickLaunchIcon('settings')
       .clickLaunchIcon('filePanel')
       .scrollAndClick('*[data-id="landingPageImportFromGitHubButton"]')
-      .waitForElementVisible('*[data-id="homeTabModalDialogCustomPromptText"]')
-      .clearValue('*[data-id="homeTabModalDialogCustomPromptText"]')
-      .setValue('*[data-id="homeTabModalDialogCustomPromptText"]', testData.invalidURL)
+      .waitForElementVisible('input[data-id="homeTabModalDialogCustomPromptText"]')
+      .execute(() => {
+        // browser.setValue(query, content) is not working in this context for chrome.
+        // so we focus on it and use browser.keys()
+        (document.querySelector('input[data-id="homeTabModalDialogCustomPromptText"]') as any).focus()
+      }, [], () => {})
+      .keys(testData.invalidURL)
       .waitForElementVisible('*[data-id="homeTab-modal-footer-ok-react"]')
       .scrollAndClick('[data-id="homeTab-modal-footer-ok-react"]') // submitted
       .waitForElementVisible('*[data-shared="tooltipPopup"]')
@@ -51,7 +55,12 @@ module.exports = {
       .scrollAndClick('*[data-id="landingPageImportFromGitHubButton"]')
       .waitForElementVisible('*[data-id="homeTabModalDialogCustomPromptText"]')
       .clearValue('*[data-id="homeTabModalDialogCustomPromptText"]')
-      .setValue('*[data-id="homeTabModalDialogCustomPromptText"]', testData.validURL)
+      .execute(() => {
+        // browser.setValue(query, content) is not working in this context for chrome.
+        // so we focus on it and use browser.keys()
+        (document.querySelector('input[data-id="homeTabModalDialogCustomPromptText"]') as any).focus()
+      }, [], () => {})
+      .keys(testData.validURL)
       .waitForElementVisible('*[data-id="homeTab-modal-footer-ok-react"]')
       .scrollAndClick('[data-id="homeTab-modal-footer-ok-react"]')
       .openFile('github/OpenZeppelin/openzeppelin-solidity/contracts/access/Roles.sol')

From 9d6f8a413e61a38ff760107cfd2ff41b9fc6a184 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 22 Dec 2021 13:26:21 +0100
Subject: [PATCH 25/43] refactor and remove use of registry

---
 .../src/app/ui/landing-page/landing-page.js   |  2 --
 .../home-tab/src/lib/remix-ui-home-tab.tsx    | 23 ++++++++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
index 8393bdd407..a100c4ea4e 100644
--- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js
+++ b/apps/remix-ide/src/app/ui/landing-page/landing-page.js
@@ -5,7 +5,6 @@ import * as packageJson from '../../../../../../package.json'
 import { ViewPlugin } from '@remixproject/engine-web'
 import { RemixUiHomeTab } from '@remix-ui/home-tab' // eslint-disable-line
 
-const globalRegistry = require('../../../global/registry')
 const GistHandler = require('../../../lib/gist-handler')
 
 const profile = {
@@ -43,7 +42,6 @@ export class LandingPage extends ViewPlugin {
     ReactDOM.render(
       <RemixUiHomeTab
         plugin={this}
-        registry={globalRegistry}
       />
       , this.el)
   }
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
index 28e26657b4..f4b43b98db 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
@@ -15,8 +15,7 @@ const _paq = window._paq = window._paq || [] //eslint-disable-line
 
 /* eslint-disable-next-line */
 export interface RemixUiHomeTabProps {
-  plugin: any,
-  registry: any
+  plugin: any
 }
 
 const loadingInitialState = {
@@ -30,7 +29,9 @@ const loadingReducer = (state = loadingInitialState, action) => {
 }
 
 export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
-  const { plugin, registry } = props
+  const { plugin } = props
+  let fileManager = plugin.fileManager
+  
   const [state, setState] = useState<{
     themeQuality: { filter: string, name: string },
     showMediaPanel: 'none' | 'twitter' | 'medium',
@@ -39,7 +40,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
     importSource: string,
     toasterMsg: string
   }>({
-    themeQuality: registry.get('themeModule').api.currentTheme().quality === 'dark' ? themes.dark : themes.light,
+    themeQuality: themes.light,
     showMediaPanel: 'none',
     showModalDialog: false,
     modalInfo: { title: '', loadItem: '', examples: [] },
@@ -49,7 +50,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
 
   const processLoading = () => {
     const contentImport = plugin.contentImport
-    const fileProviders = registry.get('fileproviders').api
+    const workspace = fileManager.getProvider('workspace')
     contentImport.import(
       state.importSource,
       (loadingMsg) => dispatch({ tooltip: loadingMsg }),
@@ -58,7 +59,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
           toast(error.message || error)
         } else {
           try {
-            fileProviders.workspace.addExternal(type + '/' + cleanUrl, content, url)
+            workspace.addExternal(type + '/' + cleanUrl, content, url)
             plugin.call('menuicons', 'select', 'filePanel')
           } catch (e) {
             toast(e.message)
@@ -81,7 +82,13 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
   const inputValue = useRef(null)
 
   useEffect(() => {
-    registry.get('themeModule').api.events.on('themeChanged', (theme) => {
+    plugin.call('theme', 'currentTheme').then((theme) => {
+      // update theme quality. To be used for for images
+      setState(prevState => {
+        return { ...prevState, themeQuality: theme.quality === 'dark' ? themes.dark : themes.light }
+      })
+    })
+    plugin.on('theme', 'themeChanged', (theme) => {
       // update theme quality. To be used for for images
       setState(prevState => {
         return { ...prevState, themeQuality: theme.quality === 'dark' ? themes.dark : themes.light }
@@ -129,7 +136,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
     plugin.appManager.activatePlugin('remixd')
   }
   const importFromGist = () => {
-    plugin.gistHandler.loadFromGist({ gist: '' }, registry.get('filemanager').api)
+    plugin.gistHandler.loadFromGist({ gist: '' }, fileManager)
     plugin.verticalIcons.select('filePanel')
   }
   const switchToPreviousVersion = () => {

From eb813d4e53556ffb57a8db4fc5bc50e5e7a9a72e Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 22 Dec 2021 13:55:11 +0100
Subject: [PATCH 26/43] linting

---
 libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
index f4b43b98db..13dec9d47d 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
@@ -30,8 +30,8 @@ const loadingReducer = (state = loadingInitialState, action) => {
 
 export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
   const { plugin } = props
-  let fileManager = plugin.fileManager
-  
+  const fileManager = plugin.fileManager
+
   const [state, setState] = useState<{
     themeQuality: { filter: string, name: string },
     showMediaPanel: 'none' | 'twitter' | 'medium',

From e6f1e42dded7b9d715e3d1055195702b754ac9f7 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 22 Dec 2021 14:16:02 +0100
Subject: [PATCH 27/43] fix E2E

---
 apps/remix-ide-e2e/src/tests/importFromGithub.test.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
index 3fc73c2430..036d9ceae9 100644
--- a/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
+++ b/apps/remix-ide-e2e/src/tests/importFromGithub.test.ts
@@ -36,11 +36,9 @@ module.exports = {
       .scrollAndClick('*[data-id="landingPageImportFromGitHubButton"]')
       .waitForElementVisible('input[data-id="homeTabModalDialogCustomPromptText"]')
       .execute(() => {
-        // browser.setValue(query, content) is not working in this context for chrome.
-        // so we focus on it and use browser.keys()
         (document.querySelector('input[data-id="homeTabModalDialogCustomPromptText"]') as any).focus()
       }, [], () => {})
-      .keys(testData.invalidURL)
+      .setValue('input[data-id="homeTabModalDialogCustomPromptText"]', testData.invalidURL)
       .waitForElementVisible('*[data-id="homeTab-modal-footer-ok-react"]')
       .scrollAndClick('[data-id="homeTab-modal-footer-ok-react"]') // submitted
       .waitForElementVisible('*[data-shared="tooltipPopup"]')
@@ -56,11 +54,9 @@ module.exports = {
       .waitForElementVisible('*[data-id="homeTabModalDialogCustomPromptText"]')
       .clearValue('*[data-id="homeTabModalDialogCustomPromptText"]')
       .execute(() => {
-        // browser.setValue(query, content) is not working in this context for chrome.
-        // so we focus on it and use browser.keys()
         (document.querySelector('input[data-id="homeTabModalDialogCustomPromptText"]') as any).focus()
       }, [], () => {})
-      .keys(testData.validURL)
+      .setValue('input[data-id="homeTabModalDialogCustomPromptText"]', testData.validURL)
       .waitForElementVisible('*[data-id="homeTab-modal-footer-ok-react"]')
       .scrollAndClick('[data-id="homeTab-modal-footer-ok-react"]')
       .openFile('github/OpenZeppelin/openzeppelin-solidity/contracts/access/Roles.sol')

From ed7347e294635b818d1a61dea7dce335f6770ada Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 22 Dec 2021 14:38:28 +0100
Subject: [PATCH 28/43] remove unecessary config

---
 tsconfig.base.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tsconfig.base.json b/tsconfig.base.json
index 61cf768519..3633434dce 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -66,7 +66,6 @@
       "@remix-ui/plugin-manager": ["libs/remix-ui/plugin-manager/src/index.ts"],
       "@remix-ui/home-tab": ["libs/remix-ui/home-tab/src/index.ts"],
       "@remix-ui/editor": ["libs/remix-ui/editor/src/index.ts"],
-      "@remix-project/remix-ui/home-tab": ["libs/remix-ui/home-tab/src/index.ts"],
       "@remix-ui/tabs": ["libs/remix-ui/tabs/src/index.ts"],
       "@remix-ui/helper": ["libs/remix-ui/helper/src/index.ts"],
       "@remix-ui/app": ["libs/remix-ui/app/src/index.ts"],

From c8257644514f1a94e81c5a4dc2086c9550a3db52 Mon Sep 17 00:00:00 2001
From: Khachatour <kh.virabyan@gmail.com>
Date: Thu, 23 Dec 2021 11:17:15 +0400
Subject: [PATCH 29/43] feat: add first version for cairo lang support

---
 apps/remix-ide/src/app/editor/editor.js       |   3 +-
 libs/remix-ui/editor/src/lib/cairoSyntax.ts   | 133 ++++++++++++++++++
 .../editor/src/lib/remix-ui-editor.tsx        |  11 +-
 .../helper/src/lib/remix-ui-helper.ts         |   3 +-
 4 files changed, 147 insertions(+), 3 deletions(-)
 create mode 100644 libs/remix-ui/editor/src/lib/cairoSyntax.ts

diff --git a/apps/remix-ide/src/app/editor/editor.js b/apps/remix-ide/src/app/editor/editor.js
index f25b04d21f..295d83fd59 100644
--- a/apps/remix-ide/src/app/editor/editor.js
+++ b/apps/remix-ide/src/app/editor/editor.js
@@ -46,7 +46,8 @@ class Editor extends Plugin {
       txt: 'text',
       json: 'json',
       abi: 'json',
-      rs: 'rust'
+      rs: 'rust',
+      cairo: 'cairo'
     }
 
     this.activated = false
diff --git a/libs/remix-ui/editor/src/lib/cairoSyntax.ts b/libs/remix-ui/editor/src/lib/cairoSyntax.ts
new file mode 100644
index 0000000000..c467b32a64
--- /dev/null
+++ b/libs/remix-ui/editor/src/lib/cairoSyntax.ts
@@ -0,0 +1,133 @@
+/* eslint-disable */
+export const cairoConf = {
+  comments: {
+		lineComment: '#'
+	},
+	brackets: [
+		['{', '}'],
+		['[', ']'],
+		['(', ')'],
+		['%{', '%}']
+	],
+	autoClosingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '%{', close: '%}' },
+		{ open: "'", close: "'", notIn: ['string', 'comment'] }
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '%{', close: '%}' },
+		{ open: "'", close: "'" }
+	]
+}
+
+
+export const cairoLang = {
+  defaultToken: '',
+	tokenPostfix: '.cairo',
+
+	brackets: [
+		{ token: 'delimiter.curly', open: '{', close: '}' },
+		{ token: 'delimiter.parenthesis', open: '(', close: ')' },
+		{ token: 'delimiter.square', open: '[', close: ']' },
+		{ token: 'delimiter.curly', open: '%{', close: '%}' }
+	],
+
+	keywords: [
+		// control
+		'if',
+		'else',
+		'end',
+
+		// meta
+		'alloc_locals',
+		'as',
+		'assert',
+		'cast',
+		'const',
+		'dw',
+		'felt',
+		'from',
+		'func',
+		'import',
+		'let',
+		'local',
+		'member',
+		'nondet',
+		'return',
+		'static_assert',
+		'struct',
+		'tempvar',
+		'with_attr',
+		'with',
+
+		// register
+		'ap',
+		'fp',
+
+		// opcode
+		'call',
+		'jmp',
+		'ret',
+		'abs',
+		'rel'
+	],
+
+	operators: ['=', ':', '==', '++', '+', '-', '*', '**', '/', '&', '%', '_'],
+
+	// we include these common regular expressions
+	symbols: /[=><!~?:&|+\-*\/\^%]+/,
+	numberDecimal: /[+-]?[0-9]+/,
+	numberHex: /[+-]?0x[0-9a-fA-F]+/,
+
+	// The main tokenizer for our languages
+	tokenizer: {
+		root: [
+			// identifiers and keywords
+			[
+				/[a-zA-Z_]\w*/,
+				{
+					cases: {
+						'@keywords': { token: 'keyword.$0' },
+						'@default': 'identifier'
+					}
+				}
+			],
+
+			// whitespace
+			{ include: '@whitespace' },
+
+			// directives
+			[/^%[a-zA-Z]\w*/, 'tag'],
+
+			// delimiters and operators
+			[/[{}()\[\]]/, '@brackets'],
+			[/[<>](?!@symbols)/, '@brackets'],
+			[
+				/@symbols/,
+				{
+					cases: {
+						'@operators': 'delimiter',
+						'@default': ''
+					}
+				}
+			],
+
+			// numbers
+			[/(@numberHex)/, 'number.hex'],
+			[/(@numberDecimal)/, 'number'],
+
+			// strings
+			[/'[^']*'/, 'string']
+		],
+
+		whitespace: [
+			[/\s+/, 'white'],
+			[/(^#.*$)/, 'comment']
+		]
+	}
+}
diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
index 74bb646251..480b548be9 100644
--- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
+++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
@@ -2,6 +2,7 @@ import React, { useState, useRef, useEffect, useReducer } from 'react' // eslint
 import Editor, { loader } from '@monaco-editor/react'
 import { reducerActions, reducerListener, initialState } from './actions/editor'
 import { language, conf } from './syntax'
+import { cairoLang, cairoConf } from './cairoSyntax'
 
 import './remix-ui-editor.css'
 
@@ -273,7 +274,11 @@ export const EditorUI = (props: EditorUIProps) => {
     const file = editorModelsState[props.currentFile]
     editorRef.current.setModel(file.model)
     editorRef.current.updateOptions({ readOnly: editorModelsState[props.currentFile].readOnly })
-    if (file.language === 'sol') monacoRef.current.editor.setModelLanguage(file.model, 'remix-solidity')
+    if (file.language === 'sol') {
+      monacoRef.current.editor.setModelLanguage(file.model, 'remix-solidity')
+    } else if (file.language === 'cairo') {
+      monacoRef.current.editor.setModelLanguage(file.model, 'remix-cairo')
+    }
     setAnnotationsbyFile(props.currentFile)
     setMarkerbyFile(props.currentFile)
   }, [props.currentFile])
@@ -362,9 +367,13 @@ export const EditorUI = (props: EditorUIProps) => {
     monacoRef.current = monaco
     // Register a new language
     monacoRef.current.languages.register({ id: 'remix-solidity' })
+    monacoRef.current.languages.register({ id: 'remix-cairo' })
     // Register a tokens provider for the language
     monacoRef.current.languages.setMonarchTokensProvider('remix-solidity', language)
     monacoRef.current.languages.setLanguageConfiguration('remix-solidity', conf)
+
+    monacoRef.current.languages.setMonarchTokensProvider('remix-cairo', cairoLang)
+    monacoRef.current.languages.setLanguageConfiguration('remix-cairo', cairoConf)
   }
 
   return (
diff --git a/libs/remix-ui/helper/src/lib/remix-ui-helper.ts b/libs/remix-ui/helper/src/lib/remix-ui-helper.ts
index bd8e318366..88cd0ed7a6 100644
--- a/libs/remix-ui/helper/src/lib/remix-ui-helper.ts
+++ b/libs/remix-ui/helper/src/lib/remix-ui-helper.ts
@@ -59,5 +59,6 @@ export const getPathIcon = (path: string) => {
             ? 'fas fa-brackets-curly' : path.endsWith('.vy')
               ? 'fak fa-vyper-mono' : path.endsWith('.lex')
                 ? 'fak fa-lexon' : path.endsWith('.contract')
-                  ? 'fab fa-ethereum' : 'far fa-file'
+                  ? 'fab fa-ethereum' : path.endsWith('.cairo')
+                    ? 'fab fa-ethereum' : 'far fa-file' // TODO: add cairo icon
 }

From c2c26da4bbe809ff5f2c9c8aeabe84ae3c458095 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 24 Nov 2021 11:21:12 +0100
Subject: [PATCH 30/43] context view in react

---
 .../tests/{editor.spec.ts => editor.test.ts}  |  70 ++++++-
 .../src/tests/fileExplorer.test.ts            |   4 +-
 apps/remix-ide/src/app.js                     |   5 +-
 apps/remix-ide/src/app/editor/contextView.js  | 194 ------------------
 apps/remix-ide/src/app/editor/editor.js       |   5 +-
 apps/remix-ide/src/app/panels/main-view.js    |  50 +++--
 libs/remix-core-plugin/src/index.ts           |   1 +
 .../src/lib/compiler-artefacts.ts             |   6 +-
 .../src/lib/editor-context-listener.ts        |  98 ++++-----
 libs/remix-ui/editor-context-view/.babelrc    |   4 +
 libs/remix-ui/editor-context-view/.eslintrc   |  19 ++
 libs/remix-ui/editor-context-view/README.md   |   7 +
 .../remix-ui/editor-context-view/src/index.ts |   1 +
 .../src/lib/remix-ui-editor-context-view.css  |  20 +-
 .../src/lib/remix-ui-editor-context-view.tsx  | 159 ++++++++++++++
 .../editor-context-view/tsconfig.json         |  16 ++
 .../editor-context-view/tsconfig.lib.json     |  13 ++
 nx.json                                       |   3 +
 tsconfig.base.json                            |   7 +-
 workspace.json                                |  96 +++------
 20 files changed, 421 insertions(+), 357 deletions(-)
 rename apps/remix-ide-e2e/src/tests/{editor.spec.ts => editor.test.ts} (71%)
 delete mode 100644 apps/remix-ide/src/app/editor/contextView.js
 rename apps/remix-ide/src/app/editor/contextualListener.js => libs/remix-core-plugin/src/lib/editor-context-listener.ts (64%)
 create mode 100644 libs/remix-ui/editor-context-view/.babelrc
 create mode 100644 libs/remix-ui/editor-context-view/.eslintrc
 create mode 100644 libs/remix-ui/editor-context-view/README.md
 create mode 100644 libs/remix-ui/editor-context-view/src/index.ts
 rename apps/remix-ide/src/app/editor/styles/contextView-styles.js => libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.css (70%)
 create mode 100644 libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
 create mode 100644 libs/remix-ui/editor-context-view/tsconfig.json
 create mode 100644 libs/remix-ui/editor-context-view/tsconfig.lib.json

diff --git a/apps/remix-ide-e2e/src/tests/editor.spec.ts b/apps/remix-ide-e2e/src/tests/editor.test.ts
similarity index 71%
rename from apps/remix-ide-e2e/src/tests/editor.spec.ts
rename to apps/remix-ide-e2e/src/tests/editor.test.ts
index f0e88fe5cc..7b714a432b 100644
--- a/apps/remix-ide-e2e/src/tests/editor.spec.ts
+++ b/apps/remix-ide-e2e/src/tests/editor.test.ts
@@ -6,10 +6,10 @@ import init from '../helpers/init'
 module.exports = {
 
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    init(browser, done)
+    init(browser, done, 'http://127.0.0.1:8080', true)
   },
 
-  'Should zoom in editor ': function (browser: NightwatchBrowser) {
+  'Should zoom in editor #group1': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('div[data-id="mainPanelPluginsContainer"]')
       .clickLaunchIcon('filePanel')
       .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
@@ -22,7 +22,7 @@ module.exports = {
       .checkElementStyle('.view-lines', 'font-size', '16px')
   },
 
-  'Should zoom out editor ': function (browser: NightwatchBrowser) {
+  'Should zoom out editor #group1': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('#editorView')
       .checkElementStyle('.view-lines', 'font-size', '16px')
       .click('*[data-id="tabProxyZoomOut"]')
@@ -30,7 +30,7 @@ module.exports = {
       .checkElementStyle('.view-lines', 'font-size', '14px')
   },
 
-  'Should display compile error in editor ': function (browser: NightwatchBrowser) {
+  'Should display compile error in editor #group1': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('#editorView')
       .setEditorValue(storageContractWithError + 'error')
       .pause(2000)
@@ -42,7 +42,7 @@ module.exports = {
       .checkAnnotations('fa-exclamation-square', 29) // error
   },
 
-  'Should minimize and maximize codeblock in editor ': '' + function (browser: NightwatchBrowser) {
+  'Should minimize and maximize codeblock in editor #group1': '' + function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('#editorView')
       .waitForElementVisible('.ace_open')
       .click('.ace_start:nth-of-type(1)')
@@ -51,7 +51,7 @@ module.exports = {
       .waitForElementVisible('.ace_open')
   },
 
-  'Should add breakpoint to editor ': function (browser: NightwatchBrowser) {
+  'Should add breakpoint to editor #group1': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('#editorView')
       .waitForElementNotPresent('.margin-view-overlays .fa-circle')
       .execute(() => {
@@ -60,7 +60,7 @@ module.exports = {
       .waitForElementVisible('.margin-view-overlays .fa-circle')
   },
 
-  'Should load syntax highlighter for ace light theme': '' + function (browser: NightwatchBrowser) {
+  'Should load syntax highlighter for ace light theme #group1': '' + function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('#editorView')
       .checkElementStyle('.ace_keyword', 'color', aceThemes.light.keyword)
       .checkElementStyle('.ace_comment.ace_doc', 'color', aceThemes.light.comment)
@@ -68,7 +68,7 @@ module.exports = {
       .checkElementStyle('.ace_variable', 'color', aceThemes.light.variable)
   },
 
-  'Should load syntax highlighter for ace dark theme': '' + function (browser: NightwatchBrowser) {
+  'Should load syntax highlighter for ace dark theme #group1': '' + function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="verticalIconsKindsettings"]')
       .click('*[data-id="verticalIconsKindsettings"]')
       .waitForElementVisible('*[data-id="settingsTabThemeLabelDark"]')
@@ -83,7 +83,7 @@ module.exports = {
     */
   },
 
-  'Should highlight source code ': function (browser: NightwatchBrowser) {
+  'Should highlight source code #group1': function (browser: NightwatchBrowser) {
     // include all files here because switching between plugins in side-panel removes highlight
     browser
       .addFile('sourcehighlight.js', sourcehighlightScript)
@@ -101,7 +101,7 @@ module.exports = {
       .checkElementStyle('.highlightLine51', 'background-color', 'rgb(52, 152, 219)')
   },
 
-  'Should remove 1 highlight from source code': '' + function (browser: NightwatchBrowser) {
+  'Should remove 1 highlight from source code #group1': '' + function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('li[data-id="treeViewLitreeViewItemremoveSourcehighlightScript.js"]')
       .click('li[data-id="treeViewLitreeViewItemremoveSourcehighlightScript.js"]')
       .pause(2000)
@@ -115,7 +115,7 @@ module.exports = {
       .checkElementStyle('.highlightLine51', 'background-color', 'rgb(52, 152, 219)')
   },
 
-  'Should remove all highlights from source code ': function (browser: NightwatchBrowser) {
+  'Should remove all highlights from source code #group1': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('li[data-id="treeViewLitreeViewItemremoveAllSourcehighlightScript.js"]')
       .click('li[data-id="treeViewLitreeViewItemremoveAllSourcehighlightScript.js"]')
       .pause(2000)
@@ -126,6 +126,54 @@ module.exports = {
       .waitForElementNotPresent('.highlightLine33', 60000)
       .waitForElementNotPresent('.highlightLine41', 60000)
       .waitForElementNotPresent('.highlightLine51', 60000)
+  },
+
+  'Should display the context view #group2': function (browser: NightwatchBrowser) {
+    browser
+      .openFile('contracts')
+      .openFile('contracts/1_Storage.sol')
+      .waitForElementVisible('#editorView')
+      .setEditorValue(storageContractWithError)
+      .pause(2000)
+      .execute(() => {
+        (document.getElementById('editorView') as any).gotoLine(17, 16)
+      }, [], () => {})
+      .waitForElementVisible('.contextview')
+      .waitForElementContainsText('.contextview .type', 'FunctionDefinition')
+      .waitForElementContainsText('.contextview .name', 'store')
+      .execute(() => {
+        (document.getElementById('editorView') as any).gotoLine(18, 12)
+      }, [], () => {})
+      .waitForElementContainsText('.contextview .type', 'uint256')
+      .waitForElementContainsText('.contextview .name', 'number')
+      .click('.contextview [data-action="previous"]') // declaration
+      .execute(() => {
+        return (document.getElementById('editorView') as any).getCursorPosition()
+      }, [], (result) => {
+        console.log('result', result)
+        browser.assert.equal(result.value, '180')
+      })
+      .click('.contextview [data-action="next"]') // back to the initial state
+      .execute(() => {
+        return (document.getElementById('editorView') as any).getCursorPosition()
+      }, [], (result) => {
+        console.log('result', result)
+        browser.assert.equal(result.value, '323')
+      })
+      .click('.contextview [data-action="next"]') // next reference
+      .execute(() => {
+        return (document.getElementById('editorView') as any).getCursorPosition()
+      }, [], (result) => {
+        console.log('result', result)
+        browser.assert.equal(result.value, '489')
+      })
+      .click('.contextview [data-action="gotoref"]') // back to the declaration
+      .execute(() => {
+        return (document.getElementById('editorView') as any).getCursorPosition()
+      }, [], (result) => {
+        console.log('result', result)
+        browser.assert.equal(result.value, '180')
+      })
       .end()
   }
 }
diff --git a/apps/remix-ide-e2e/src/tests/fileExplorer.test.ts b/apps/remix-ide-e2e/src/tests/fileExplorer.test.ts
index 267daa9e1c..663c1bb791 100644
--- a/apps/remix-ide-e2e/src/tests/fileExplorer.test.ts
+++ b/apps/remix-ide-e2e/src/tests/fileExplorer.test.ts
@@ -4,7 +4,7 @@ import init from '../helpers/init'
 import * as path from 'path'
 
 const testData = {
-  testFile1: path.resolve(__dirname + '/editor.spec.js'), // eslint-disable-line
+  testFile1: path.resolve(__dirname + '/editor.test.js'), // eslint-disable-line
   testFile2: path.resolve(__dirname + '/fileExplorer.test.js'), // eslint-disable-line
   testFile3: path.resolve(__dirname + '/generalSettings.test.js') // eslint-disable-line
 }
@@ -105,7 +105,7 @@ module.exports = {
       .setValue('*[data-id="fileExplorerFileUpload"]', testData.testFile1)
       .setValue('*[data-id="fileExplorerFileUpload"]', testData.testFile2)
       .setValue('*[data-id="fileExplorerFileUpload"]', testData.testFile3)
-      .waitForElementVisible('[data-id="treeViewLitreeViewItemeditor.spec.js"]')
+      .waitForElementVisible('[data-id="treeViewLitreeViewItemeditor.test.js"]')
       .waitForElementVisible('[data-id="treeViewLitreeViewItemfileExplorer.test.js"]')
       .waitForElementVisible('[data-id="treeViewLitreeViewItemgeneralSettings.test.js"]')
       .end()
diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
index e569cc5e15..d2b8a690ae 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -15,7 +15,7 @@ import { FramingService } from './framingService'
 
 import { WalkthroughService } from './walkthroughService'
 
-import { OffsetToLineColumnConverter, CompilerMetadata, CompilerArtefacts, FetchAndCompile, CompilerImports } from '@remix-project/core-plugin'
+import { OffsetToLineColumnConverter, CompilerMetadata, CompilerArtefacts, FetchAndCompile, CompilerImports, EditorContextListener } from '@remix-project/core-plugin'
 
 import migrateFileSystem from './migrateFileSystem'
 
@@ -48,7 +48,6 @@ const TestTab = require('./app/tabs/test-tab')
 const FilePanel = require('./app/panels/file-panel')
 const Editor = require('./app/editor/editor')
 const Terminal = require('./app/panels/terminal')
-const ContextualListener = require('./app/editor/contextualListener')
 
 class AppComponent {
   constructor (api = {}, events = {}, opts = {}) {
@@ -156,7 +155,7 @@ class AppComponent {
         }
       }
     )
-    const contextualListener = new ContextualListener({ editor })
+    const contextualListener = new EditorContextListener()
 
     self.engine.register([
       blockchain,
diff --git a/apps/remix-ide/src/app/editor/contextView.js b/apps/remix-ide/src/app/editor/contextView.js
deleted file mode 100644
index da01321762..0000000000
--- a/apps/remix-ide/src/app/editor/contextView.js
+++ /dev/null
@@ -1,194 +0,0 @@
-'use strict'
-import { sourceMappingDecoder } from '@remix-project/remix-debug'
-const yo = require('yo-yo')
-const globalRegistry = require('../../global/registry')
-
-const css = require('./styles/contextView-styles')
-
-/*
-  Display information about the current focused code:
-   - if it's a reference, display information about the declaration
-   - jump to the declaration
-   - number of references
-   - rename declaration/references
-*/
-class ContextView {
-  constructor (opts, localRegistry) {
-    this._components = {}
-    this._components.registry = localRegistry || globalRegistry
-    this.contextualListener = opts.contextualListener
-    this.editor = opts.editor
-    this._deps = {
-      compilersArtefacts: this._components.registry.get('compilersartefacts').api,
-      offsetToLineColumnConverter: this._components.registry.get('offsettolinecolumnconverter').api,
-      config: this._components.registry.get('config').api,
-      fileManager: this._components.registry.get('filemanager').api
-    }
-    this._view = null
-    this._nodes = null
-    this._current = null
-    this.sourceMappingDecoder = sourceMappingDecoder
-    this.previousElement = null
-    this.contextualListener.event.register('contextChanged', nodes => {
-      this.show()
-      this._nodes = nodes
-      this.update()
-    })
-    this.contextualListener.event.register('stopHighlighting', () => {
-    })
-  }
-
-  render () {
-    const view = yo`
-      <div class="${css.contextview} ${css.contextviewcontainer} bg-light text-dark border-0">
-        <div class=${css.container}>
-          ${this._renderTarget()}
-        </div>
-      </div>`
-    if (!this._view) {
-      this._view = view
-    }
-    return view
-  }
-
-  hide () {
-    if (this._view) {
-      this._view.style.display = 'none'
-    }
-  }
-
-  show () {
-    if (this._view) {
-      this._view.style.display = 'block'
-    }
-  }
-
-  update () {
-    if (this._view) {
-      yo.update(this._view, this.render())
-    }
-  }
-
-  _renderTarget () {
-    let last
-    const previous = this._current
-    if (this._nodes && this._nodes.length) {
-      last = this._nodes[this._nodes.length - 1]
-      if (isDefinition(last)) {
-        this._current = last
-      } else {
-        const target = this.contextualListener.declarationOf(last)
-        if (target) {
-          this._current = target
-        } else {
-          this._current = null
-        }
-      }
-    }
-    if (!this._current || !previous || previous.id !== this._current.id || (this.previousElement && !this.previousElement.children.length)) {
-      this.previousElement = this._render(this._current, last)
-    }
-    return this.previousElement
-  }
-
-  _jumpToInternal (position) {
-    const jumpToLine = (lineColumn) => {
-      if (lineColumn.start && lineColumn.start.line && lineColumn.start.column) {
-        this.editor.gotoLine(lineColumn.start.line, lineColumn.end.column + 1)
-      }
-    }
-    const lastCompilationResult = this._deps.compilersArtefacts.__last
-    if (lastCompilationResult && lastCompilationResult.languageversion.indexOf('soljson') === 0 && lastCompilationResult.data) {
-      const lineColumn = this._deps.offsetToLineColumnConverter.offsetToLineColumn(
-        position,
-        position.file,
-        lastCompilationResult.getSourceCode().sources,
-        lastCompilationResult.getAsts())
-      const filename = lastCompilationResult.getSourceName(position.file)
-      // TODO: refactor with rendererAPI.errorClick
-      if (filename !== this._deps.config.get('currentFile')) {
-        const provider = this._deps.fileManager.fileProviderOf(filename)
-        if (provider) {
-          provider.exists(filename).then(exist => {
-            this._deps.fileManager.open(filename)
-            jumpToLine(lineColumn)
-          }).catch(error => {
-            if (error) return console.log(error)
-          })
-        }
-      } else {
-        jumpToLine(lineColumn)
-      }
-    }
-  }
-
-  _render (node, nodeAtCursorPosition) {
-    if (!node) return yo`<div></div>`
-    let references = this.contextualListener.referencesOf(node)
-    const type = node.typeDescriptions && node.typeDescriptions.typeString ? node.typeDescriptions.typeString : node.nodeType
-    references = `${references ? references.length : '0'} reference(s)`
-
-    let ref = 0
-    const nodes = this.contextualListener.getActiveHighlights()
-    for (const k in nodes) {
-      if (nodeAtCursorPosition.id === nodes[k].nodeId) {
-        ref = k
-        break
-      }
-    }
-
-    // JUMP BETWEEN REFERENCES
-    const jump = (e) => {
-      e.target.dataset.action === 'next' ? ref++ : ref--
-      if (ref < 0) ref = nodes.length - 1
-      if (ref >= nodes.length) ref = 0
-      this._jumpToInternal(nodes[ref].position)
-    }
-
-    const jumpTo = () => {
-      if (node && node.src) {
-        const position = this.sourceMappingDecoder.decode(node.src)
-        if (position) {
-          this._jumpToInternal(position)
-        }
-      }
-    }
-
-    const showGasEstimation = () => {
-      if (node.nodeType === 'FunctionDefinition') {
-        const result = this.contextualListener.gasEstimation(node)
-        const executionCost = ' Execution cost: ' + result.executionCost + ' gas'
-        const codeDepositCost = 'Code deposit cost: ' + result.codeDepositCost + ' gas'
-        const estimatedGas = result.codeDepositCost ? `${codeDepositCost}, ${executionCost}` : `${executionCost}`
-        return yo`
-          <div class=${css.gasEstimation}>
-            <i class="fas fa-gas-pump ${css.gasStationIcon}" title='Gas estimation'></i>
-            <span>${estimatedGas}</span>
-          </div>
-        `
-      }
-    }
-
-    return yo`
-      <div class=${css.line}>${showGasEstimation()}
-        <div title=${type} class=${css.type}>${type}</div>
-        <div title=${node.name} class=${css.name}>${node.name}</div>
-        <i class="fas fa-share ${css.jump}" aria-hidden="true" onclick=${jumpTo}></i>
-        <span class=${css.referencesnb}>${references}</span>
-        <i data-action='previous' class="fas fa-chevron-up ${css.jump}" aria-hidden="true" onclick=${jump}></i>
-        <i data-action='next' class="fas fa-chevron-down ${css.jump}" aria-hidden="true" onclick=${jump}></i>
-      </div>
-    `
-  }
-}
-
-function isDefinition (node) {
-  return node.nodeType === 'ContractDefinition' ||
-  node.nodeType === 'FunctionDefinition' ||
-  node.nodeType === 'ModifierDefinition' ||
-  node.nodeType === 'VariableDeclaration' ||
-  node.nodeType === 'StructDefinition' ||
-  node.nodeType === 'EventDefinition'
-}
-
-module.exports = ContextView
diff --git a/apps/remix-ide/src/app/editor/editor.js b/apps/remix-ide/src/app/editor/editor.js
index 295d83fd59..013b1b9853 100644
--- a/apps/remix-ide/src/app/editor/editor.js
+++ b/apps/remix-ide/src/app/editor/editor.js
@@ -12,7 +12,7 @@ const profile = {
   name: 'editor',
   description: 'service - editor',
   version: packageJson.version,
-  methods: ['highlight', 'discardHighlight', 'clearAnnotations', 'addAnnotation', 'gotoLine']
+  methods: ['highlight', 'discardHighlight', 'clearAnnotations', 'addAnnotation', 'gotoLine', 'getCursorPosition']
 }
 
 class Editor extends Plugin {
@@ -75,7 +75,8 @@ class Editor extends Plugin {
         this._onChange(this.currentFile)
       }
     }
-    this.el.gotoLine = (line) => this.gotoLine(line, 0)
+    this.el.gotoLine = (line, column) => this.gotoLine(line, column || 0)
+    this.el.getCursorPosition = () => this.getCursorPosition()
     return this.el
   }
 
diff --git a/apps/remix-ide/src/app/panels/main-view.js b/apps/remix-ide/src/app/panels/main-view.js
index 537b296796..cad19a58f3 100644
--- a/apps/remix-ide/src/app/panels/main-view.js
+++ b/apps/remix-ide/src/app/panels/main-view.js
@@ -1,11 +1,14 @@
+
+import React from 'react' // eslint-disable-line
+import ReactDOM from 'react-dom'
+import { RemixUiEditorContextView } from '@remix-ui/editor-context-view'
+
 var yo = require('yo-yo')
 var EventManager = require('../../lib/events')
 
 var globalRegistry = require('../../global/registry')
 var { TabProxy } = require('./tab-proxy.js')
 
-var ContextView = require('../editor/contextView')
-
 var csjs = require('csjs-inject')
 
 var css = csjs`
@@ -15,6 +18,10 @@ var css = csjs`
     height            : 100%;
     width             : 100%;
   }
+  .contextview {
+    opacity             : 1;
+    position            : relative;
+  }
 `
 
 // @todo(#650) Extract this into two classes: MainPanel (TabsProxy + Iframe/Editor) & BottomPanel (Terminal)
@@ -25,12 +32,13 @@ export class MainView {
     self._view = {}
     self._components = {}
     self._components.registry = globalRegistry
+    self.contextualListener = contextualListener
+    self.hideContextView = false
     self.editor = editor
     self.fileManager = fileManager
     self.mainPanel = mainPanel
     self.txListener = globalRegistry.get('txlistener').api
     self._components.terminal = terminal
-    self._components.contextualListener = contextualListener
     this.appManager = appManager
     this.init()
   }
@@ -39,7 +47,8 @@ export class MainView {
     this.fileManager.unselectCurrentFile()
     this.mainPanel.showContent(name)
     this._view.editor.style.display = 'none'
-    this._components.contextView.hide()
+    this.hideContextView = true
+    this.renderContextView()
     this._view.mainPanel.style.display = 'block'
   }
 
@@ -63,19 +72,22 @@ export class MainView {
       // we check upstream for "fileChanged"
       self._view.editor.style.display = 'block'
       self._view.mainPanel.style.display = 'none'
-      self._components.contextView.show()
+      this.hideContextView = false
+      this.renderContextView()
     })
     self.tabProxy.event.on('openFile', (file) => {
       self._view.editor.style.display = 'block'
       self._view.mainPanel.style.display = 'none'
-      self._components.contextView.show()
+      this.hideContextView = false
+      this.renderContextView()
     })
     self.tabProxy.event.on('closeFile', (file) => {
     })
     self.tabProxy.event.on('switchApp', self.showApp.bind(self))
     self.tabProxy.event.on('closeApp', (name) => {
       self._view.editor.style.display = 'block'
-      self._components.contextView.show()
+      this.hideContextView = false
+      this.renderContextView()
       self._view.mainPanel.style.display = 'none'
     })
     self.tabProxy.event.on('tabCountChanged', (count) => {
@@ -90,10 +102,6 @@ export class MainView {
       }
     }
 
-    const contextView = new ContextView({ contextualListener: self._components.contextualListener, editor: self.editor })
-
-    self._components.contextView = contextView
-
     self._components.terminal.event.register('resize', delta => self._adjustLayout('top', delta))
     if (self.txListener) {
       self._components.terminal.event.register('listenOnNetWork', (listenOnNetWork) => {
@@ -181,15 +189,17 @@ export class MainView {
     self._view.editor.style.display = 'none'
     self._view.mainPanel = self.mainPanel.render()
     self._view.terminal = self._components.terminal.render()
+
     self._view.mainview = yo`
       <div class=${css.mainview}>
         ${self.tabProxy.renderTabsbar()}
         ${self._view.editor}
         ${self._view.mainPanel}
-        ${self._components.contextView.render()}
+        <div class="${css.contextview} contextview"></div>
         ${self._view.terminal}
       </div>
     `
+
     // INIT
     self._adjustLayout('top', self.data._layout.top.offset)
 
@@ -200,6 +210,22 @@ export class MainView {
     return self._view.mainview
   }
 
+  renderContextView () {
+    if (!this.contextualListener.activated) return
+
+    ReactDOM.render(
+      <RemixUiEditorContextView
+        hide={this.hideContextView}
+        contextualListener={this.contextualListener}
+        gotoLine={(line, column) => this.contextualListener.call('editor', 'gotoLine', line, column)}
+        openFile={(file) => this.contextualListener.call('editor', 'openFile', file)}
+        getLastCompilationResult={_ => { return this.contextualListener.call('compilerArtefacts', 'getLastCompilationResult') } }
+        offsetToLineColumn={(position, file, sources, asts) => { return this.contextualListener.call('offsetToLineColumnConverter', 'offsetToLineColumn', position, file, sources, asts) } }
+        getCurrentFileName={() => { return this.contextualListener.call('fileManager', 'file') } }
+      />
+      , this._view.mainview.querySelector('.contextview'))
+  }
+
   registerCommand (name, command, opts) {
     var self = this
     return self._components.terminal.registerCommand(name, command, opts)
diff --git a/libs/remix-core-plugin/src/index.ts b/libs/remix-core-plugin/src/index.ts
index 73c98a6181..fe8a5c661e 100644
--- a/libs/remix-core-plugin/src/index.ts
+++ b/libs/remix-core-plugin/src/index.ts
@@ -3,3 +3,4 @@ export { CompilerMetadata } from './lib/compiler-metadata'
 export { FetchAndCompile } from './lib/compiler-fetch-and-compile'
 export { CompilerImports } from './lib/compiler-content-imports'
 export { CompilerArtefacts } from './lib/compiler-artefacts'
+export { EditorContextListener } from './lib/editor-context-listener'
diff --git a/libs/remix-core-plugin/src/lib/compiler-artefacts.ts b/libs/remix-core-plugin/src/lib/compiler-artefacts.ts
index 148aa292c7..715bd2e9c4 100644
--- a/libs/remix-core-plugin/src/lib/compiler-artefacts.ts
+++ b/libs/remix-core-plugin/src/lib/compiler-artefacts.ts
@@ -4,7 +4,7 @@ import { CompilerAbstract } from '@remix-project/remix-solidity'
 
 const profile = {
   name: 'compilerArtefacts',
-  methods: ['get', 'addResolvedContract', 'getCompilerAbstract', 'getAllContractDatas'],
+  methods: ['get', 'addResolvedContract', 'getCompilerAbstract', 'getAllContractDatas', 'getLastCompilationResult'],
   events: [],
   version: '0.0.1'
 }
@@ -59,6 +59,10 @@ export class CompilerArtefacts extends Plugin {
     })
   }
 
+  getLastCompilationResult () {
+    return this.compilersArtefacts.__last
+  }
+
   getAllContractDatas () {
     const contractsData = {}
     Object.keys(this.compilersArtefactsPerFile).map((targetFile) => {
diff --git a/apps/remix-ide/src/app/editor/contextualListener.js b/libs/remix-core-plugin/src/lib/editor-context-listener.ts
similarity index 64%
rename from apps/remix-ide/src/app/editor/contextualListener.js
rename to libs/remix-core-plugin/src/lib/editor-context-listener.ts
index 9eea6aeaed..72ccee7457 100644
--- a/apps/remix-ide/src/app/editor/contextualListener.js
+++ b/libs/remix-core-plugin/src/lib/editor-context-listener.ts
@@ -1,47 +1,48 @@
 'use strict'
 import { Plugin } from '@remixproject/engine'
-import * as packageJson from '../../../../../package.json'
 
 import { sourceMappingDecoder } from '@remix-project/remix-debug'
 const { AstWalker } = require('@remix-project/remix-astwalker')
-const EventManager = require('../../lib/events')
-const globalRegistry = require('../../global/registry')
 
 const profile = {
   name: 'contextualListener',
   methods: [],
   events: [],
-  version: packageJson.version
+  version: '0.0.1'
 }
 
 /*
   trigger contextChanged(nodes)
 */
-class ContextualListener extends Plugin {
-  constructor (opts) {
+export class EditorContextListener extends Plugin {
+  _index: any
+  _activeHighlights: Array<any>
+  astWalker: any
+  currentPosition: any
+  currentFile: String
+  nodes: Array<any>
+  results: any
+  estimationObj: any
+  creationCost: any
+  codeDepositCost: any
+  contract: any
+  activated: boolean
+
+  constructor () {
     super(profile)
-    this.event = new EventManager()
-    this._components = {}
-    this._components.registry = globalRegistry
-    this.editor = opts.editor
-    this.pluginManager = opts.pluginManager
-    this._deps = {
-      compilersArtefacts: this._components.registry.get('compilersartefacts').api,
-      config: this._components.registry.get('config').api,
-      offsetToLineColumnConverter: this._components.registry.get('offsettolinecolumnconverter').api
-    }
+    this.activated = false
     this._index = {
       Declarations: {},
       FlatReferences: {}
     }
     this._activeHighlights = []
-    this.editor.event.register('contentChanged', () => { this._stopHighlighting() })
 
-    this.sourceMappingDecoder = sourceMappingDecoder
     this.astWalker = new AstWalker()
   }
 
   onActivation () {
+    this.on('editor', 'contentChanged', () => { this._stopHighlighting() })
+
     this.on('solidity', 'compilationFinished', (file, source, languageVersion, data) => {
       if (languageVersion.indexOf('soljson') !== 0) return
       this._stopHighlighting()
@@ -52,11 +53,18 @@ class ContextualListener extends Plugin {
       this._buildIndex(data, source)
     })
 
-    setInterval(() => {
-      if (this._deps.compilersArtefacts.__last && this._deps.compilersArtefacts.__last.languageversion.indexOf('soljson') === 0) {
-        this._highlightItems(this.editor.getCursorPosition(), this._deps.compilersArtefacts.__last, this._deps.config.get('currentFile'))
+    setInterval(async () => {
+      const compilationResult = await this.call('compilerArtefacts', 'getLastCompilationResult')
+      if (compilationResult && compilationResult.languageversion.indexOf('soljson') === 0) {
+        this._highlightItems(
+          await this.call('editor', 'getCursorPosition'),
+          compilationResult,
+          await this.call('fileManager', 'file')
+        )
       }
     }, 1000)
+
+    this.activated = true
   }
 
   getActiveHighlights () {
@@ -74,7 +82,7 @@ class ContextualListener extends Plugin {
     return this._index.Declarations[node.id]
   }
 
-  _highlightItems (cursorPosition, compilationResult, file) {
+  async _highlightItems (cursorPosition, compilationResult, file) {
     if (this.currentPosition === cursorPosition) return
     if (this.currentFile !== file) {
       this.currentFile = file
@@ -85,12 +93,12 @@ class ContextualListener extends Plugin {
     this.currentPosition = cursorPosition
     this.currentFile = file
     if (compilationResult && compilationResult.data && compilationResult.data.sources[file]) {
-      const nodes = this.sourceMappingDecoder.nodesAtPosition(null, cursorPosition, compilationResult.data.sources[file])
+      const nodes = sourceMappingDecoder.nodesAtPosition(null, cursorPosition, compilationResult.data.sources[file])
       this.nodes = nodes
       if (nodes && nodes.length && nodes[nodes.length - 1]) {
-        this._highlightExpressions(nodes[nodes.length - 1], compilationResult)
+        await this._highlightExpressions(nodes[nodes.length - 1], compilationResult)
       }
-      this.event.trigger('contextChanged', [nodes])
+      this.emit('contextChanged', nodes)
     }
   }
 
@@ -111,21 +119,19 @@ class ContextualListener extends Plugin {
     }
   }
 
-  _highlight (node, compilationResult) {
+  async _highlight (node, compilationResult) {
     if (!node) return
-    const position = this.sourceMappingDecoder.decode(node.src)
-    const eventId = this._highlightInternal(position, node)
-    const lastCompilationResult = this._deps.compilersArtefacts.__last
-    if (eventId && lastCompilationResult && lastCompilationResult.languageversion.indexOf('soljson') === 0) {
-      this._activeHighlights.push({ eventId, position, fileTarget: lastCompilationResult.getSourceName(position.file), nodeId: node.id })
+    const position = sourceMappingDecoder.decode(node.src)
+    await this._highlightInternal(position, node, compilationResult)
+    if (compilationResult && compilationResult.languageversion.indexOf('soljson') === 0) {
+      this._activeHighlights.push({ position, fileTarget: compilationResult.getSourceName(position.file), nodeId: node.id })
     }
   }
 
-  _highlightInternal (position, node) {
+  async _highlightInternal (position, node, compilationResult) {
     if (node.nodeType === 'Block') return
-    const lastCompilationResult = this._deps.compilersArtefacts.__last
-    if (lastCompilationResult && lastCompilationResult.languageversion.indexOf('soljson') === 0) {
-      let lineColumn = this._deps.offsetToLineColumnConverter.offsetToLineColumn(position, position.file, lastCompilationResult.getSourceCode().sources, lastCompilationResult.getAsts())
+    if (compilationResult && compilationResult.languageversion.indexOf('soljson') === 0) {
+      let lineColumn = await this.call('offsetToLineColumnConverter', 'offsetToLineColumn', position, position.file, compilationResult.getSourceCode().sources, compilationResult.getAsts())
       if (node.nodes && node.nodes.length) {
         // If node has children, highlight the entire line. if not, just highlight the current source position of the node.
         lineColumn = {
@@ -139,38 +145,38 @@ class ContextualListener extends Plugin {
           }
         }
       }
-      const fileName = lastCompilationResult.getSourceName(position.file)
+      const fileName = compilationResult.getSourceName(position.file)
       if (fileName) {
-        return this.call('editor', 'highlight', lineColumn, fileName, '', { focus: false })
+        return await this.call('editor', 'highlight', lineColumn, fileName, '', { focus: false })
       }
     }
     return null
   }
 
-  _highlightExpressions (node, compilationResult) {
-    const highlights = (id) => {
+  async _highlightExpressions (node, compilationResult) {
+    const highlights = async (id) => {
       if (this._index.Declarations && this._index.Declarations[id]) {
         const refs = this._index.Declarations[id]
         for (const ref in refs) {
           const node = refs[ref]
-          this._highlight(node, compilationResult)
+          await this._highlight(node, compilationResult)
         }
       }
     }
     if (node && node.referencedDeclaration) {
-      highlights(node.referencedDeclaration)
+      await highlights(node.referencedDeclaration)
       const current = this._index.FlatReferences[node.referencedDeclaration]
-      this._highlight(current, compilationResult)
+      await this._highlight(current, compilationResult)
     } else {
-      highlights(node.id)
-      this._highlight(node, compilationResult)
+      await highlights(node.id)
+      await this._highlight(node, compilationResult)
     }
     this.results = compilationResult
   }
 
   _stopHighlighting () {
     this.call('editor', 'discardHighlight')
-    this.event.trigger('stopHighlighting', [])
+    this.emit('stopHighlighting')
     this._activeHighlights = []
   }
 
@@ -229,5 +235,3 @@ class ContextualListener extends Plugin {
     return '(' + params.toString() + ')'
   }
 }
-
-module.exports = ContextualListener
diff --git a/libs/remix-ui/editor-context-view/.babelrc b/libs/remix-ui/editor-context-view/.babelrc
new file mode 100644
index 0000000000..09d67939cc
--- /dev/null
+++ b/libs/remix-ui/editor-context-view/.babelrc
@@ -0,0 +1,4 @@
+{
+  "presets": ["@nrwl/react/babel"],
+  "plugins": []
+}
diff --git a/libs/remix-ui/editor-context-view/.eslintrc b/libs/remix-ui/editor-context-view/.eslintrc
new file mode 100644
index 0000000000..9d709f91d0
--- /dev/null
+++ b/libs/remix-ui/editor-context-view/.eslintrc
@@ -0,0 +1,19 @@
+{
+  "env": {
+      "browser": true,
+      "es6": true
+  },
+  "extends": "../../../.eslintrc",
+  "globals": {
+      "Atomics": "readonly",
+      "SharedArrayBuffer": "readonly"
+  },
+  "parserOptions": {
+      "ecmaVersion": 11,
+      "sourceType": "module"
+  },
+  "rules": {
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": "error"  
+  }
+}
diff --git a/libs/remix-ui/editor-context-view/README.md b/libs/remix-ui/editor-context-view/README.md
new file mode 100644
index 0000000000..0b9719fedb
--- /dev/null
+++ b/libs/remix-ui/editor-context-view/README.md
@@ -0,0 +1,7 @@
+# remix-ui-editor-context-view
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test remix-ui-editor-context-view` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/libs/remix-ui/editor-context-view/src/index.ts b/libs/remix-ui/editor-context-view/src/index.ts
new file mode 100644
index 0000000000..b595accc41
--- /dev/null
+++ b/libs/remix-ui/editor-context-view/src/index.ts
@@ -0,0 +1 @@
+export * from './lib/remix-ui-editor-context-view';
diff --git a/apps/remix-ide/src/app/editor/styles/contextView-styles.js b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.css
similarity index 70%
rename from apps/remix-ide/src/app/editor/styles/contextView-styles.js
rename to libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.css
index 5303a356fa..f57c88f78f 100644
--- a/apps/remix-ide/src/app/editor/styles/contextView-styles.js
+++ b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.css
@@ -1,17 +1,9 @@
-var csjs = require('csjs-inject')
 
-var css = csjs`
-  .contextview {
-    opacity             : 1;
-    position            : relative;
-    height              : 25px;
-  }
-  .container {
+  .container-context-view {
     padding             : 1px 15px;
   }
   .line {
     display             : flex;
-    justify-content     : flex-end;
     align-items         : center;
     text-overflow       : ellipsis;
     overflow            : hidden;
@@ -48,12 +40,4 @@ var css = csjs`
     z-index           : 50;
     border-radius     : 1px;
     border            : 2px solid var(--secondary);
-  }
-  .contextviewcontainer{
-    z-index           : 50;
-    border-radius     : 1px;
-    border            : 2px solid var(--secondary);
-  }
-`
-
-module.exports = css
+  }
\ No newline at end of file
diff --git a/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
new file mode 100644
index 0000000000..51b6f6bf9d
--- /dev/null
+++ b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
@@ -0,0 +1,159 @@
+import React, { useEffect, useState, useRef } from 'react' // eslint-disable-line
+import { sourceMappingDecoder } from '@remix-project/remix-debug'
+
+import './remix-ui-editor-context-view.css';
+
+/* eslint-disable-next-line */
+export interface RemixUiEditorContextViewProps {
+  hide: boolean,
+  contextualListener: any,
+  gotoLine: (line: number, column: number) => void,
+  openFile: (fileName: string) => void,
+  getLastCompilationResult: () => any,
+  offsetToLineColumn: (position: any, file: any, sources: any, asts: any) => any,
+  getCurrentFileName: () => String
+}
+
+function isDefinition (node: any) {
+  return node.nodeType === 'ContractDefinition' ||
+  node.nodeType === 'FunctionDefinition' ||
+  node.nodeType === 'ModifierDefinition' ||
+  node.nodeType === 'VariableDeclaration' ||
+  node.nodeType === 'StructDefinition' ||
+  node.nodeType === 'EventDefinition'
+}
+
+type astNode = {
+  name: string,
+  id: number,
+  children: Array<any>,
+  typeDescriptions: any,
+  nodeType: String,
+  src: any,
+  nodeId: any,
+  position: any
+}
+
+type nullableAstNode = astNode | null
+
+export function RemixUiEditorContextView(props: RemixUiEditorContextViewProps) {
+  const nodesRef = useRef<Array<astNode>>([])
+  /*
+    gotoLineDisableRef is used to temporarily disable the update of the view. 
+    e.g when the user ask the component to "gotoLine" we don't want to rerender the component (but just to put the mouse on the desired line)
+  */
+  const gotoLineDisableRef = useRef(false)
+  const [nodesState, setNode] = useState<Array<astNode>>([])
+  const contextualListener = props.contextualListener
+
+  useEffect(() => {
+    contextualListener.on('contextualListener', 'contextChanged', (nodes: Array<astNode>) => {      
+      if (gotoLineDisableRef.current) {
+        gotoLineDisableRef.current = false
+        return
+      }
+      nodesRef.current = nodes
+      setNode(nodes)
+    })
+  }, [])
+
+  const _render = (node: nullableAstNode) => {
+    if (!node) return (<div></div>)
+    let references = contextualListener.referencesOf(node)
+    const type = node.typeDescriptions && node.typeDescriptions.typeString ? node.typeDescriptions.typeString : node.nodeType
+    references = `${references ? references.length : '0'} reference(s)`
+
+    let ref = 0
+    const nodes: Array<astNode> = contextualListener.getActiveHighlights()
+        
+     /*
+     * show gas estimation
+     */
+    const gasEstimation = () => {
+      if (node.nodeType === 'FunctionDefinition') {
+        const result = contextualListener.gasEstimation(node)
+        const executionCost = ' Execution cost: ' + result.executionCost + ' gas'
+        const codeDepositCost = 'Code deposit cost: ' + result.codeDepositCost + ' gas'
+        const estimatedGas = result.codeDepositCost ? `${codeDepositCost}, ${executionCost}` : `${executionCost}`
+        return (
+          <div className="gasEstimation">
+            <i className="fas fa-gas-pump gasStationIcon" title='Gas estimation'></i>
+            <span>{estimatedGas}</span>
+          </div>
+        )
+      } else {
+        return (<div></div>)
+      }
+    }
+
+    /*
+     * onClick jump to ast node in the editor
+     */
+    const _jumpToInternal = async (position: any) => {
+      const jumpToLine = async (fileName: string, lineColumn: any) => {
+        if (fileName !== await props.getCurrentFileName()) {
+          await props.openFile(fileName)
+        }
+        if (lineColumn.start && lineColumn.start.line && lineColumn.start.column) {
+          gotoLineDisableRef.current = true     
+          props.gotoLine(lineColumn.start.line, lineColumn.end.column + 1)
+        }
+      }
+      const lastCompilationResult = await props.getLastCompilationResult()
+      if (lastCompilationResult && lastCompilationResult.languageversion.indexOf('soljson') === 0 && lastCompilationResult.data) {
+        const lineColumn = await props.offsetToLineColumn(
+          position,
+          position.file,
+          lastCompilationResult.getSourceCode().sources,
+          lastCompilationResult.getAsts())
+        const filename = lastCompilationResult.getSourceName(position.file)
+        // TODO: refactor with rendererAPI.errorClick
+        jumpToLine(filename, lineColumn)
+      }
+    }
+
+    const jumpTo = () => {
+      if (node && node.src) {
+        const position = sourceMappingDecoder.decode(node.src)
+        if (position) {
+          _jumpToInternal(position)
+        }
+      }
+    }
+
+    // JUMP BETWEEN REFERENCES
+    const jump = (e: any) => {
+      e.target.dataset.action === 'next' ? ref++ : ref--
+      if (ref < 0) ref = nodes.length - 1
+      if (ref >= nodes.length) ref = 0
+      _jumpToInternal(nodes[ref].position)
+    }
+
+    return (
+      <div className="line">{gasEstimation()}
+        <div title={type} className="type">{type}</div>
+        <div title={node.name} className="name mr-2">{node.name}</div>
+        <i className="fas fa-share jump" data-action='gotoref' aria-hidden="true" onClick={jumpTo}></i>
+        <span className="referencesnb">{references}</span>
+        <i data-action='previous' className="fas fa-chevron-up jump" aria-hidden="true" onClick={jump}></i>
+        <i data-action='next' className="fas fa-chevron-down jump" aria-hidden="true" onClick={jump}></i>
+      </div>
+    )
+  }
+
+  let last: nullableAstNode = null
+  if (!props.hide && nodesRef.current && nodesRef.current.length) {
+    last = nodesRef.current[nodesRef.current.length - 1]
+    if (!isDefinition(last)) {
+      last = contextualListener.declarationOf(last)
+    }
+  }
+
+  return (
+    !props.hide && <div className="container-context-view contextviewcontainer bg-light text-dark border-0">
+      {_render(last)}
+    </div>
+  );
+}
+
+export default RemixUiEditorContextView
diff --git a/libs/remix-ui/editor-context-view/tsconfig.json b/libs/remix-ui/editor-context-view/tsconfig.json
new file mode 100644
index 0000000000..d52e31ad74
--- /dev/null
+++ b/libs/remix-ui/editor-context-view/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "jsx": "react",
+    "allowJs": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
+}
diff --git a/libs/remix-ui/editor-context-view/tsconfig.lib.json b/libs/remix-ui/editor-context-view/tsconfig.lib.json
new file mode 100644
index 0000000000..b560bc4dec
--- /dev/null
+++ b/libs/remix-ui/editor-context-view/tsconfig.lib.json
@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "types": ["node"]
+  },
+  "files": [
+    "../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
+    "../../../node_modules/@nrwl/react/typings/image.d.ts"
+  ],
+  "exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
+  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+}
diff --git a/nx.json b/nx.json
index 8bc14e4e9d..a1a7131ff6 100644
--- a/nx.json
+++ b/nx.json
@@ -147,6 +147,9 @@
     },
     "remix-ui-theme-module": {
       "tags": []
+    },
+    "remix-ui-editor-context-view": {
+      "tags": []
     }
   },
   "targetDependencies": {
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 3633434dce..68e1ae5175 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -69,10 +69,9 @@
       "@remix-ui/tabs": ["libs/remix-ui/tabs/src/index.ts"],
       "@remix-ui/helper": ["libs/remix-ui/helper/src/index.ts"],
       "@remix-ui/app": ["libs/remix-ui/app/src/index.ts"],
-      "@remix-ui/vertical-icons-panel": [
-        "libs/remix-ui/vertical-icons-panel/src/index.ts"
-      ],
-      "@remix-ui/theme-module": ["libs/remix-ui/theme-module/src/index.ts"]
+      "@remix-ui/vertical-icons-panel": ["libs/remix-ui/vertical-icons-panel/src/index.ts"],
+      "@remix-ui/theme-module": ["libs/remix-ui/theme-module/src/index.ts"],
+      "@remix-ui/editor-context-view": ["libs/remix-ui/editor-context-view/src/index.ts"]
     }
   },
   "exclude": ["node_modules", "tmp"]
diff --git a/workspace.json b/workspace.json
index 8ce5f9f9ce..8850066499 100644
--- a/workspace.json
+++ b/workspace.json
@@ -1116,80 +1116,48 @@
           }
         }
       }
+    },
+    "remix-ui-editor-context-view": {
+      "root": "libs/remix-ui/editor-context-view",
+      "sourceRoot": "libs/remix-ui/editor-context-view/src",
+      "projectType": "library",
+      "architect": {
+        "lint": {
+          "builder": "@nrwl/linter:lint",
+          "options": {
+            "linter": "eslint",
+            "tsConfig": ["libs/remix-ui/vertical-icons-panel/tsconfig.lib.json"],
+            "exclude": ["**/node_modules/**", "!libs/remix-ui/vertical-icons-panel/**/*"]
+          }
+        }
+      }
     }
   },
-  "remix-ui-editor": {
-    "root": "libs/remix-ui/editor",
-    "sourceRoot": "libs/remix-ui/editor/src",
-    "projectType": "library",
-    "schematics": {},
-    "architect": {
-      "lint": {
-        "builder": "@nrwl/linter:lint",
-        "options": {
-          "linter": "eslint",
-          "babel": true
-        },
-        "component": {
-          "style": "css"
-        },
-        "library": {
-          "style": "css",
-          "linter": "eslint"
-        }
-      },
+  "cli": {
+    "defaultCollection": "@nrwl/react"
+  },
+  "schematics": {
+    "@nrwl/workspace": {
       "library": {
         "linter": "eslint"
       }
     },
-    "@nrwl/nx-plugin": {
-      "plugin": {
+    "@nrwl/cypress": {
+      "cypress-project": {
         "linter": "eslint"
       }
     },
-      "@nrwl/web": {
-        "application": {
-          "linter": "eslint"
-        }
-      },
-      "@nrwl/node": {
-        "application": {
-          "linter": "eslint"
-        },
-        "library": {
-          "linter": "eslint"
-        }
-      }
-    },
-    "cli": {
-      "defaultCollection": "@nrwl/react"
-    },
-    "schematics": {
-      "@nrwl/workspace": {
-        "library": {
-          "linter": "eslint"
-        }
-      },
-      "@nrwl/cypress": {
-        "cypress-project": {
-          "linter": "eslint"
-        }
+    "@nrwl/react": {
+      "application": {
+        "style": "css",
+        "linter": "eslint",
+        "babel": true
       },
-      "@nrwl/react": {
-        "application": {
-          "style": "css",
-          "linter": "eslint",
-          "babel": true
-        },
-        "component": {
-          "style": "css"
-        },
-        "library": {
-          "style": "css",
-          "linter": "eslint"
-        }
+      "component": {
+        "style": "css"
       },
       "library": {
+        "style": "css",
         "linter": "eslint"
       }
     },
@@ -1199,4 +1167,6 @@
       }
     },
     "defaultProject": "remix-ide"
-}
\ No newline at end of file
+ }
+}
+

From 15e49763452803c9d22b73568c8528f7756f0522 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 21 Dec 2021 15:35:17 +0100
Subject: [PATCH 31/43] fix css

---
 .../src/lib/remix-ui-editor-context-view.tsx                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
index 51b6f6bf9d..336c290ffc 100644
--- a/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
+++ b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
@@ -150,7 +150,7 @@ export function RemixUiEditorContextView(props: RemixUiEditorContextViewProps) {
   }
 
   return (
-    !props.hide && <div className="container-context-view contextviewcontainer bg-light text-dark border-0">
+    !props.hide && <div className="container-context-view contextviewcontainer bg-light text-dark border-0 py-1">
       {_render(last)}
     </div>
   );

From 10365638d5a7806d54dd6f1af66de8e629b6a95f Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 21 Dec 2021 17:17:09 +0100
Subject: [PATCH 32/43] refactor contextview to be added in the editor

---
 apps/remix-ide/src/app/panels/main-view.js    | 34 +----------
 .../src/lib/editor-context-listener.ts        |  2 +-
 .../src/lib/remix-ui-editor-context-view.tsx  | 59 ++++++++++++-------
 .../editor/src/lib/remix-ui-editor.css        |  7 ++-
 .../editor/src/lib/remix-ui-editor.tsx        | 20 +++++++
 5 files changed, 67 insertions(+), 55 deletions(-)

diff --git a/apps/remix-ide/src/app/panels/main-view.js b/apps/remix-ide/src/app/panels/main-view.js
index cad19a58f3..cf8009b469 100644
--- a/apps/remix-ide/src/app/panels/main-view.js
+++ b/apps/remix-ide/src/app/panels/main-view.js
@@ -1,7 +1,6 @@
 
 import React from 'react' // eslint-disable-line
 import ReactDOM from 'react-dom'
-import { RemixUiEditorContextView } from '@remix-ui/editor-context-view'
 
 var yo = require('yo-yo')
 var EventManager = require('../../lib/events')
@@ -17,11 +16,7 @@ var css = csjs`
     flex-direction    : column;
     height            : 100%;
     width             : 100%;
-  }
-  .contextview {
-    opacity             : 1;
-    position            : relative;
-  }
+  }  
 `
 
 // @todo(#650) Extract this into two classes: MainPanel (TabsProxy + Iframe/Editor) & BottomPanel (Terminal)
@@ -33,7 +28,6 @@ export class MainView {
     self._components = {}
     self._components.registry = globalRegistry
     self.contextualListener = contextualListener
-    self.hideContextView = false
     self.editor = editor
     self.fileManager = fileManager
     self.mainPanel = mainPanel
@@ -47,8 +41,6 @@ export class MainView {
     this.fileManager.unselectCurrentFile()
     this.mainPanel.showContent(name)
     this._view.editor.style.display = 'none'
-    this.hideContextView = true
-    this.renderContextView()
     this._view.mainPanel.style.display = 'block'
   }
 
@@ -72,22 +64,16 @@ export class MainView {
       // we check upstream for "fileChanged"
       self._view.editor.style.display = 'block'
       self._view.mainPanel.style.display = 'none'
-      this.hideContextView = false
-      this.renderContextView()
     })
     self.tabProxy.event.on('openFile', (file) => {
       self._view.editor.style.display = 'block'
-      self._view.mainPanel.style.display = 'none'
-      this.hideContextView = false
-      this.renderContextView()
+      self._view.mainPanel.style.display = 'none'      
     })
     self.tabProxy.event.on('closeFile', (file) => {
     })
     self.tabProxy.event.on('switchApp', self.showApp.bind(self))
     self.tabProxy.event.on('closeApp', (name) => {
       self._view.editor.style.display = 'block'
-      this.hideContextView = false
-      this.renderContextView()
       self._view.mainPanel.style.display = 'none'
     })
     self.tabProxy.event.on('tabCountChanged', (count) => {
@@ -210,22 +196,6 @@ export class MainView {
     return self._view.mainview
   }
 
-  renderContextView () {
-    if (!this.contextualListener.activated) return
-
-    ReactDOM.render(
-      <RemixUiEditorContextView
-        hide={this.hideContextView}
-        contextualListener={this.contextualListener}
-        gotoLine={(line, column) => this.contextualListener.call('editor', 'gotoLine', line, column)}
-        openFile={(file) => this.contextualListener.call('editor', 'openFile', file)}
-        getLastCompilationResult={_ => { return this.contextualListener.call('compilerArtefacts', 'getLastCompilationResult') } }
-        offsetToLineColumn={(position, file, sources, asts) => { return this.contextualListener.call('offsetToLineColumnConverter', 'offsetToLineColumn', position, file, sources, asts) } }
-        getCurrentFileName={() => { return this.contextualListener.call('fileManager', 'file') } }
-      />
-      , this._view.mainview.querySelector('.contextview'))
-  }
-
   registerCommand (name, command, opts) {
     var self = this
     return self._components.terminal.registerCommand(name, command, opts)
diff --git a/libs/remix-core-plugin/src/lib/editor-context-listener.ts b/libs/remix-core-plugin/src/lib/editor-context-listener.ts
index 72ccee7457..7bde42de11 100644
--- a/libs/remix-core-plugin/src/lib/editor-context-listener.ts
+++ b/libs/remix-core-plugin/src/lib/editor-context-listener.ts
@@ -6,7 +6,7 @@ const { AstWalker } = require('@remix-project/remix-astwalker')
 
 const profile = {
   name: 'contextualListener',
-  methods: [],
+  methods: ['referencesOf', 'getActiveHighlights', 'gasEstimation', 'declarationOf'],
   events: [],
   version: '0.0.1'
 }
diff --git a/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
index 336c290ffc..22672ad539 100644
--- a/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
+++ b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
@@ -3,15 +3,21 @@ import { sourceMappingDecoder } from '@remix-project/remix-debug'
 
 import './remix-ui-editor-context-view.css';
 
+export type onContextListenerChangedListener = (nodes: Array<astNode>) => void
+
 /* eslint-disable-next-line */
 export interface RemixUiEditorContextViewProps {
   hide: boolean,
-  contextualListener: any,
   gotoLine: (line: number, column: number) => void,
   openFile: (fileName: string) => void,
   getLastCompilationResult: () => any,
   offsetToLineColumn: (position: any, file: any, sources: any, asts: any) => any,
   getCurrentFileName: () => String
+  onContextListenerChanged: (listener: onContextListenerChangedListener) => void
+  referencesOf: (nodes: astNode) => Array<astNode>
+  getActiveHighlights: () => Array<astNode>
+  gasEstimation: (node: astNode) => gasEstimation
+  declarationOf: (node: astNode) => astNode
 }
 
 function isDefinition (node: any) {
@@ -23,7 +29,12 @@ function isDefinition (node: any) {
   node.nodeType === 'EventDefinition'
 }
 
-type astNode = {
+export type gasEstimationType = {
+  executionCost: string,
+  codeDepositCost: string
+}
+
+export type astNode = {
   name: string,
   id: number,
   children: Array<any>,
@@ -42,36 +53,50 @@ export function RemixUiEditorContextView(props: RemixUiEditorContextViewProps) {
     gotoLineDisableRef is used to temporarily disable the update of the view. 
     e.g when the user ask the component to "gotoLine" we don't want to rerender the component (but just to put the mouse on the desired line)
   */
-  const gotoLineDisableRef = useRef(false)
+  const referencesRef = useRef([])
+  const activeHighlightsRef = useRef([])
+  const currentNodeRef = useRef(null as nullableAstNode)
+  const gasEstimationRef = useRef({} as gasEstimationType)
+  const gotoLineDisableRef = useRef(false)  
   const [nodesState, setNode] = useState<Array<astNode>>([])
-  const contextualListener = props.contextualListener
-
+  
   useEffect(() => {
-    contextualListener.on('contextualListener', 'contextChanged', (nodes: Array<astNode>) => {      
+    props.onContextListenerChanged(async (nodes: Array<astNode>) => {      
       if (gotoLineDisableRef.current) {
         gotoLineDisableRef.current = false
         return
       }
       nodesRef.current = nodes
+      if (!props.hide && nodesRef.current && nodesRef.current.length) {
+        currentNodeRef.current = nodesRef.current[nodesRef.current.length - 1]
+        if (!isDefinition(currentNodeRef.current)) {
+          currentNodeRef.current = await props.declarationOf(currentNodeRef.current)
+        }
+      }
+      if (currentNodeRef.current) {
+        referencesRef.current = await props.referencesOf(currentNodeRef.current)
+        gasEstimationRef.current =  await props.gasEstimation(currentNodeRef.current)      
+      }
+      activeHighlightsRef.current = await props.getActiveHighlights()      
       setNode(nodes)
     })
   }, [])
 
   const _render = (node: nullableAstNode) => {
     if (!node) return (<div></div>)
-    let references = contextualListener.referencesOf(node)
+    let references = referencesRef.current
     const type = node.typeDescriptions && node.typeDescriptions.typeString ? node.typeDescriptions.typeString : node.nodeType
-    references = `${references ? references.length : '0'} reference(s)`
+    let referencesCount = `${references ? references.length : '0'} reference(s)`
 
     let ref = 0
-    const nodes: Array<astNode> = contextualListener.getActiveHighlights()
+    const nodes: Array<astNode> = activeHighlightsRef.current
         
      /*
      * show gas estimation
      */
     const gasEstimation = () => {
       if (node.nodeType === 'FunctionDefinition') {
-        const result = contextualListener.gasEstimation(node)
+        const result: gasEstimationType = gasEstimationRef.current
         const executionCost = ' Execution cost: ' + result.executionCost + ' gas'
         const codeDepositCost = 'Code deposit cost: ' + result.codeDepositCost + ' gas'
         const estimatedGas = result.codeDepositCost ? `${codeDepositCost}, ${executionCost}` : `${executionCost}`
@@ -134,24 +159,16 @@ export function RemixUiEditorContextView(props: RemixUiEditorContextViewProps) {
         <div title={type} className="type">{type}</div>
         <div title={node.name} className="name mr-2">{node.name}</div>
         <i className="fas fa-share jump" data-action='gotoref' aria-hidden="true" onClick={jumpTo}></i>
-        <span className="referencesnb">{references}</span>
+        <span className="referencesnb">{referencesCount}</span>
         <i data-action='previous' className="fas fa-chevron-up jump" aria-hidden="true" onClick={jump}></i>
         <i data-action='next' className="fas fa-chevron-down jump" aria-hidden="true" onClick={jump}></i>
       </div>
     )
-  }
-
-  let last: nullableAstNode = null
-  if (!props.hide && nodesRef.current && nodesRef.current.length) {
-    last = nodesRef.current[nodesRef.current.length - 1]
-    if (!isDefinition(last)) {
-      last = contextualListener.declarationOf(last)
-    }
-  }
+  }  
 
   return (
     !props.hide && <div className="container-context-view contextviewcontainer bg-light text-dark border-0 py-1">
-      {_render(last)}
+      {_render(currentNodeRef.current)}
     </div>
   );
 }
diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.css b/libs/remix-ui/editor/src/lib/remix-ui-editor.css
index a487d143f8..a078bfd498 100644
--- a/libs/remix-ui/editor/src/lib/remix-ui-editor.css
+++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.css
@@ -8,4 +8,9 @@
     border-radius : 10px;
     height: auto;
     width: auto;
-}
\ No newline at end of file
+}
+
+.contextview {
+    opacity             : 1;
+    position            : relative;
+  }
\ No newline at end of file
diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
index 480b548be9..d731084a59 100644
--- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
+++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useRef, useEffect, useReducer } from 'react' // eslint-disable-line
+import { RemixUiEditorContextView, astNode } from '@remix-ui/editor-context-view'
 import Editor, { loader } from '@monaco-editor/react'
 import { reducerActions, reducerListener, initialState } from './actions/editor'
 import { language, conf } from './syntax'
@@ -49,6 +50,7 @@ loader.config({ paths: { vs: 'assets/js/monaco-editor/dev/vs' } })
 
 /* eslint-disable-next-line */
 export interface EditorUIProps {
+  contextualListener: any
   activated: boolean
   themeType: string
   currentFile: string
@@ -62,6 +64,7 @@ export interface EditorUIProps {
   }
   plugin: {
     on: (plugin: string, event: string, listener: any) => void
+    call: (plugin: string, method: string, arg1?: any, arg2?: any, arg3?: any, arg4?: any) => any
   }
   editorAPI: {
     findMatches: (uri: string, value: string) => any
@@ -377,6 +380,7 @@ export const EditorUI = (props: EditorUIProps) => {
   }
 
   return (
+    <div className="w-100 h-100 position-relative">
     <Editor
       width="100%"
       height="100%"
@@ -386,6 +390,22 @@ export const EditorUI = (props: EditorUIProps) => {
       beforeMount={handleEditorWillMount}
       options={{ glyphMargin: true }}
     />
+      <div className="contextview position-absolute">
+        <RemixUiEditorContextView
+          hide={false}
+          gotoLine={(line, column) => props.plugin.call('editor', 'gotoLine', line, column)}
+          openFile={(file) => props.plugin.call('editor', 'openFile', file)}
+          getLastCompilationResult={() => { return props.plugin.call('compilerArtefacts', 'getLastCompilationResult') } }
+          offsetToLineColumn={(position, file, sources, asts) => { return props.plugin.call('offsetToLineColumnConverter', 'offsetToLineColumn', position, file, sources, asts) } }
+          getCurrentFileName={() => { return props.plugin.call('fileManager', 'file') } }
+          onContextListenerChanged={(listener) => { props.plugin.on('contextualListener', 'contextChanged', listener) }}
+          referencesOf={(node: astNode) => { return props.plugin.call('contextualListener', 'referencesOf', node) }}
+          getActiveHighlights={() => { return props.plugin.call('contextualListener', 'getActiveHighlights') }}
+          gasEstimation={(node: astNode) => { return props.plugin.call('contextualListener', 'gasEstimation', node) }}
+          declarationOf={(node: astNode) => { return props.plugin.call('contextualListener', 'declarationOf', node) }}
+        />
+      </div>
+    </div>
   )
 }
 

From 8422596553122d27f09b916182a56027c1d50656 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 21 Dec 2021 17:43:15 +0100
Subject: [PATCH 33/43] fix css

---
 libs/remix-ui/editor/src/lib/remix-ui-editor.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
index d731084a59..4f3dadd3cf 100644
--- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
+++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
@@ -380,17 +380,16 @@ export const EditorUI = (props: EditorUIProps) => {
   }
 
   return (
-    <div className="w-100 h-100 position-relative">
+    <div className="w-100 h-100 d-flex flex-column">
     <Editor
       width="100%"
-      height="100%"
       path={props.currentFile}
       language={editorModelsState[props.currentFile] ? editorModelsState[props.currentFile].language : 'text'}
       onMount={handleEditorDidMount}
       beforeMount={handleEditorWillMount}
       options={{ glyphMargin: true }}
     />
-      <div className="contextview position-absolute">
+      <div className="contextview">
         <RemixUiEditorContextView
           hide={false}
           gotoLine={(line, column) => props.plugin.call('editor', 'gotoLine', line, column)}

From 4e6667d1937517558b1a6550d72fa363bd91514e Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 21 Dec 2021 21:10:23 +0100
Subject: [PATCH 34/43] fix_build

---
 .../src/lib/remix-ui-editor-context-view.tsx                | 2 +-
 workspace.json                                              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
index 22672ad539..ea99c34b99 100644
--- a/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
+++ b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
@@ -16,7 +16,7 @@ export interface RemixUiEditorContextViewProps {
   onContextListenerChanged: (listener: onContextListenerChangedListener) => void
   referencesOf: (nodes: astNode) => Array<astNode>
   getActiveHighlights: () => Array<astNode>
-  gasEstimation: (node: astNode) => gasEstimation
+  gasEstimation: (node: astNode) => gasEstimationType
   declarationOf: (node: astNode) => astNode
 }
 
diff --git a/workspace.json b/workspace.json
index 8850066499..f728458dbd 100644
--- a/workspace.json
+++ b/workspace.json
@@ -1165,8 +1165,8 @@
       "plugin": {
         "linter": "eslint"
       }
-    },
-    "defaultProject": "remix-ide"
- }
+    }
+  },
+  "defaultProject": "remix-ide"
 }
 

From d92ff59b1bc6e64335a9270119ec37fc46c934b5 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 21 Dec 2021 21:34:04 +0100
Subject: [PATCH 35/43] linting

---
 apps/remix-ide/src/app/panels/main-view.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps/remix-ide/src/app/panels/main-view.js b/apps/remix-ide/src/app/panels/main-view.js
index cf8009b469..1cb3b1ffa5 100644
--- a/apps/remix-ide/src/app/panels/main-view.js
+++ b/apps/remix-ide/src/app/panels/main-view.js
@@ -1,7 +1,3 @@
-
-import React from 'react' // eslint-disable-line
-import ReactDOM from 'react-dom'
-
 var yo = require('yo-yo')
 var EventManager = require('../../lib/events')
 
@@ -67,7 +63,7 @@ export class MainView {
     })
     self.tabProxy.event.on('openFile', (file) => {
       self._view.editor.style.display = 'block'
-      self._view.mainPanel.style.display = 'none'      
+      self._view.mainPanel.style.display = 'none'
     })
     self.tabProxy.event.on('closeFile', (file) => {
     })

From 628aac0778c840506a36d732c6932552f6694dc6 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 21 Dec 2021 23:37:42 +0100
Subject: [PATCH 36/43] linting

---
 libs/remix-ui/editor/src/lib/remix-ui-editor.tsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
index 4f3dadd3cf..16a5e062f1 100644
--- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
+++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
@@ -381,14 +381,14 @@ export const EditorUI = (props: EditorUIProps) => {
 
   return (
     <div className="w-100 h-100 d-flex flex-column">
-    <Editor
-      width="100%"
-      path={props.currentFile}
-      language={editorModelsState[props.currentFile] ? editorModelsState[props.currentFile].language : 'text'}
-      onMount={handleEditorDidMount}
-      beforeMount={handleEditorWillMount}
-      options={{ glyphMargin: true }}
-    />
+      <Editor
+        width="100%"
+        path={props.currentFile}
+        language={editorModelsState[props.currentFile] ? editorModelsState[props.currentFile].language : 'text'}
+        onMount={handleEditorDidMount}
+        beforeMount={handleEditorWillMount}
+        options={{ glyphMargin: true }}
+      />
       <div className="contextview">
         <RemixUiEditorContextView
           hide={false}

From 656a511782e0d0e6f47e89ff6600587b73b14747 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Wed, 22 Dec 2021 11:31:25 +0100
Subject: [PATCH 37/43] linter

---
 .../src/lib/remix-ui-editor-context-view.tsx  | 64 ++++++++++---------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
index ea99c34b99..ca6ca5930c 100644
--- a/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
+++ b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
@@ -1,11 +1,27 @@
 import React, { useEffect, useState, useRef } from 'react' // eslint-disable-line
 import { sourceMappingDecoder } from '@remix-project/remix-debug'
 
-import './remix-ui-editor-context-view.css';
+import './remix-ui-editor-context-view.css'
+
+/* eslint-disable-next-line */
+
+export type astNode = {
+  name: string,
+  id: number,
+  children: Array<any>,
+  typeDescriptions: any,
+  nodeType: String,
+  src: any,
+  nodeId: any,
+  position: any
+}
 
 export type onContextListenerChangedListener = (nodes: Array<astNode>) => void
 
-/* eslint-disable-next-line */
+export type gasEstimationType = {
+  executionCost: string,
+  codeDepositCost: string
+}
 export interface RemixUiEditorContextViewProps {
   hide: boolean,
   gotoLine: (line: number, column: number) => void,
@@ -29,39 +45,25 @@ function isDefinition (node: any) {
   node.nodeType === 'EventDefinition'
 }
 
-export type gasEstimationType = {
-  executionCost: string,
-  codeDepositCost: string
-}
 
-export type astNode = {
-  name: string,
-  id: number,
-  children: Array<any>,
-  typeDescriptions: any,
-  nodeType: String,
-  src: any,
-  nodeId: any,
-  position: any
-}
 
 type nullableAstNode = astNode | null
 
-export function RemixUiEditorContextView(props: RemixUiEditorContextViewProps) {
+export function RemixUiEditorContextView (props: RemixUiEditorContextViewProps) {
   const nodesRef = useRef<Array<astNode>>([])
   /*
-    gotoLineDisableRef is used to temporarily disable the update of the view. 
+    gotoLineDisableRef is used to temporarily disable the update of the view.
     e.g when the user ask the component to "gotoLine" we don't want to rerender the component (but just to put the mouse on the desired line)
   */
   const referencesRef = useRef([])
   const activeHighlightsRef = useRef([])
   const currentNodeRef = useRef(null as nullableAstNode)
   const gasEstimationRef = useRef({} as gasEstimationType)
-  const gotoLineDisableRef = useRef(false)  
-  const [nodesState, setNode] = useState<Array<astNode>>([])
-  
+  const gotoLineDisableRef = useRef(false)
+  const [, setNode] = useState<Array<astNode>>([])
+
   useEffect(() => {
-    props.onContextListenerChanged(async (nodes: Array<astNode>) => {      
+    props.onContextListenerChanged(async (nodes: Array<astNode>) => {
       if (gotoLineDisableRef.current) {
         gotoLineDisableRef.current = false
         return
@@ -75,23 +77,23 @@ export function RemixUiEditorContextView(props: RemixUiEditorContextViewProps) {
       }
       if (currentNodeRef.current) {
         referencesRef.current = await props.referencesOf(currentNodeRef.current)
-        gasEstimationRef.current =  await props.gasEstimation(currentNodeRef.current)      
+        gasEstimationRef.current = await props.gasEstimation(currentNodeRef.current)
       }
-      activeHighlightsRef.current = await props.getActiveHighlights()      
+      activeHighlightsRef.current = await props.getActiveHighlights()
       setNode(nodes)
     })
   }, [])
 
   const _render = (node: nullableAstNode) => {
     if (!node) return (<div></div>)
-    let references = referencesRef.current
+    const references = referencesRef.current
     const type = node.typeDescriptions && node.typeDescriptions.typeString ? node.typeDescriptions.typeString : node.nodeType
-    let referencesCount = `${references ? references.length : '0'} reference(s)`
+    const referencesCount = `${references ? references.length : '0'} reference(s)`
 
     let ref = 0
     const nodes: Array<astNode> = activeHighlightsRef.current
-        
-     /*
+
+    /*
      * show gas estimation
      */
     const gasEstimation = () => {
@@ -120,7 +122,7 @@ export function RemixUiEditorContextView(props: RemixUiEditorContextViewProps) {
           await props.openFile(fileName)
         }
         if (lineColumn.start && lineColumn.start.line && lineColumn.start.column) {
-          gotoLineDisableRef.current = true     
+          gotoLineDisableRef.current = true
           props.gotoLine(lineColumn.start.line, lineColumn.end.column + 1)
         }
       }
@@ -164,13 +166,13 @@ export function RemixUiEditorContextView(props: RemixUiEditorContextViewProps) {
         <i data-action='next' className="fas fa-chevron-down jump" aria-hidden="true" onClick={jump}></i>
       </div>
     )
-  }  
+  }
 
   return (
     !props.hide && <div className="container-context-view contextviewcontainer bg-light text-dark border-0 py-1">
       {_render(currentNodeRef.current)}
     </div>
-  );
+  )
 }
 
 export default RemixUiEditorContextView

From e52145f9eee735e7c5a0a1910413ed55fa3c61ac Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Wed, 22 Dec 2021 13:42:31 +0100
Subject: [PATCH 38/43] fixes the resize of editor div

---
 libs/remix-ui/editor/src/lib/remix-ui-editor.css | 6 +++---
 libs/remix-ui/editor/src/lib/remix-ui-editor.tsx | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.css b/libs/remix-ui/editor/src/lib/remix-ui-editor.css
index a078bfd498..af7cd06bfd 100644
--- a/libs/remix-ui/editor/src/lib/remix-ui-editor.css
+++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.css
@@ -11,6 +11,6 @@
 }
 
 .contextview {
-    opacity             : 1;
-    position            : relative;
-  }
\ No newline at end of file
+    opacity: 1;
+    position: absolute;
+}
\ No newline at end of file
diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
index 16a5e062f1..db1017f0e5 100644
--- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
+++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
@@ -259,7 +259,7 @@ export const EditorUI = (props: EditorUIProps) => {
             range: new monacoRef.current.Range(marker.position.start.line + 1, marker.position.start.column + 1, marker.position.end.line + 1, marker.position.end.column + 1),
             options: {
               isWholeLine,
-              inlineClassName: `bg-info highlightLine${marker.position.start.line + 1}`
+              inlineClassName: `alert-info highlightLine${marker.position.start.line + 1}`
             }
           })
         }
@@ -380,7 +380,7 @@ export const EditorUI = (props: EditorUIProps) => {
   }
 
   return (
-    <div className="w-100 h-100 d-flex flex-column">
+    <div className="w-100 h-100 d-flex flex-column-reverse">
       <Editor
         width="100%"
         path={props.currentFile}

From b1687e0f410dbbcdb0b9a56ccd4990e4311fa488 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Wed, 22 Dec 2021 16:37:17 +0100
Subject: [PATCH 39/43] fixed the colors of editor's content menu

---
 libs/remix-ui/editor/src/lib/remix-ui-editor.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
index db1017f0e5..67df7cd443 100644
--- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
+++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
@@ -210,7 +210,12 @@ export const EditorUI = (props: EditorUIProps) => {
         'editor.lineHighlightBorder': secondaryColor,
         'editor.lineHighlightBackground': textbackground === darkColor ? lightColor : secondaryColor,
         'editorGutter.background': lightColor,
-        'minimap.background': lightColor
+        'minimap.background': lightColor,
+        'menu.foreground': textColor,
+        'menu.background': textbackground,
+        'menu.selectionBackground': secondaryColor,
+        'menu.selectionForeground': textColor,
+        'menu.selectionBorder': secondaryColor
       }
     })
     monacoRef.current.editor.setTheme(themeName)

From 224f6324b9f3bbd3226d2a0df9fbbfddfec87f1f Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 23 Dec 2021 11:03:04 +0100
Subject: [PATCH 40/43] use "useState" instead of "useRef"

---
 .../src/lib/remix-ui-editor-context-view.tsx  | 55 ++++++++++++-------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
index ca6ca5930c..13ceb93426 100644
--- a/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
+++ b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
@@ -50,55 +50,68 @@ function isDefinition (node: any) {
 type nullableAstNode = astNode | null
 
 export function RemixUiEditorContextView (props: RemixUiEditorContextViewProps) {
-  const nodesRef = useRef<Array<astNode>>([])
   /*
     gotoLineDisableRef is used to temporarily disable the update of the view.
     e.g when the user ask the component to "gotoLine" we don't want to rerender the component (but just to put the mouse on the desired line)
   */
-  const referencesRef = useRef([])
-  const activeHighlightsRef = useRef([])
-  const currentNodeRef = useRef(null as nullableAstNode)
-  const gasEstimationRef = useRef({} as gasEstimationType)
   const gotoLineDisableRef = useRef(false)
-  const [, setNode] = useState<Array<astNode>>([])
-
+  const [state, setState] = useState<{
+    nodes: Array<astNode>,
+    references: Array<astNode>,
+    activeHighlights: Array<any>
+    currentNode: nullableAstNode,
+    gasEstimation: gasEstimationType
+  }>({
+    nodes: [],
+    references: [],
+    activeHighlights: [],
+    currentNode: null,
+    gasEstimation: { executionCost: '', codeDepositCost: '' }
+  })
+  
   useEffect(() => {
     props.onContextListenerChanged(async (nodes: Array<astNode>) => {
       if (gotoLineDisableRef.current) {
         gotoLineDisableRef.current = false
         return
       }
-      nodesRef.current = nodes
-      if (!props.hide && nodesRef.current && nodesRef.current.length) {
-        currentNodeRef.current = nodesRef.current[nodesRef.current.length - 1]
-        if (!isDefinition(currentNodeRef.current)) {
-          currentNodeRef.current = await props.declarationOf(currentNodeRef.current)
+      let currentNode
+      if (!props.hide && nodes && nodes.length) {
+        currentNode = nodes[nodes.length - 1]
+        if (!isDefinition(currentNode)) {
+          currentNode = await props.declarationOf(currentNode)
         }
       }
-      if (currentNodeRef.current) {
-        referencesRef.current = await props.referencesOf(currentNodeRef.current)
-        gasEstimationRef.current = await props.gasEstimation(currentNodeRef.current)
+      let references
+      let gasEstimation
+      if (currentNode) {
+        references = await props.referencesOf(currentNode)
+        if (currentNode.nodeType === 'FunctionDefinition') {
+          gasEstimation = await props.gasEstimation(currentNode)
+        }        
       }
-      activeHighlightsRef.current = await props.getActiveHighlights()
-      setNode(nodes)
+      let activeHighlights = await props.getActiveHighlights()
+      setState(prevState => {
+        return { ...prevState, nodes, references, activeHighlights, currentNode, gasEstimation }
+      })
     })
   }, [])
 
   const _render = (node: nullableAstNode) => {
     if (!node) return (<div></div>)
-    const references = referencesRef.current
+    const references = state.references
     const type = node.typeDescriptions && node.typeDescriptions.typeString ? node.typeDescriptions.typeString : node.nodeType
     const referencesCount = `${references ? references.length : '0'} reference(s)`
 
     let ref = 0
-    const nodes: Array<astNode> = activeHighlightsRef.current
+    const nodes: Array<astNode> = state.activeHighlights
 
     /*
      * show gas estimation
      */
     const gasEstimation = () => {
       if (node.nodeType === 'FunctionDefinition') {
-        const result: gasEstimationType = gasEstimationRef.current
+        const result: gasEstimationType = state.gasEstimation
         const executionCost = ' Execution cost: ' + result.executionCost + ' gas'
         const codeDepositCost = 'Code deposit cost: ' + result.codeDepositCost + ' gas'
         const estimatedGas = result.codeDepositCost ? `${codeDepositCost}, ${executionCost}` : `${executionCost}`
@@ -170,7 +183,7 @@ export function RemixUiEditorContextView (props: RemixUiEditorContextViewProps)
 
   return (
     !props.hide && <div className="container-context-view contextviewcontainer bg-light text-dark border-0 py-1">
-      {_render(currentNodeRef.current)}
+      {_render(state.currentNode)}
     </div>
   )
 }

From 1d70aef400c98b9ed85a34f8cb81329931a4f19b Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 27 Dec 2021 10:57:03 +0100
Subject: [PATCH 41/43] put functions at top level

---
 .../src/lib/remix-ui-editor-context-view.tsx  | 94 +++++++++----------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
index 13ceb93426..e0c0898868 100644
--- a/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
+++ b/libs/remix-ui/editor-context-view/src/lib/remix-ui-editor-context-view.tsx
@@ -97,6 +97,52 @@ export function RemixUiEditorContextView (props: RemixUiEditorContextViewProps)
     })
   }, [])
 
+  /*
+   * show gas estimation
+   */
+  const gasEstimation = (node) => {
+    if (node.nodeType === 'FunctionDefinition') {
+      const result: gasEstimationType = state.gasEstimation
+      const executionCost = ' Execution cost: ' + result.executionCost + ' gas'
+      const codeDepositCost = 'Code deposit cost: ' + result.codeDepositCost + ' gas'
+      const estimatedGas = result.codeDepositCost ? `${codeDepositCost}, ${executionCost}` : `${executionCost}`
+      return (
+        <div className="gasEstimation">
+          <i className="fas fa-gas-pump gasStationIcon" title='Gas estimation'></i>
+          <span>{estimatedGas}</span>
+        </div>
+      )
+    } else {
+      return (<div></div>)
+    }
+  }
+
+  /*
+   * onClick jump to ast node in the editor
+   */
+  const _jumpToInternal = async (position: any) => {
+    const jumpToLine = async (fileName: string, lineColumn: any) => {
+      if (fileName !== await props.getCurrentFileName()) {
+        await props.openFile(fileName)
+      }
+      if (lineColumn.start && lineColumn.start.line && lineColumn.start.column) {
+        gotoLineDisableRef.current = true
+        props.gotoLine(lineColumn.start.line, lineColumn.end.column + 1)
+      }
+    }
+    const lastCompilationResult = await props.getLastCompilationResult()
+    if (lastCompilationResult && lastCompilationResult.languageversion.indexOf('soljson') === 0 && lastCompilationResult.data) {
+      const lineColumn = await props.offsetToLineColumn(
+        position,
+        position.file,
+        lastCompilationResult.getSourceCode().sources,
+        lastCompilationResult.getAsts())
+      const filename = lastCompilationResult.getSourceName(position.file)
+      // TODO: refactor with rendererAPI.errorClick
+      jumpToLine(filename, lineColumn)
+    }
+  }
+
   const _render = (node: nullableAstNode) => {
     if (!node) return (<div></div>)
     const references = state.references
@@ -106,52 +152,6 @@ export function RemixUiEditorContextView (props: RemixUiEditorContextViewProps)
     let ref = 0
     const nodes: Array<astNode> = state.activeHighlights
 
-    /*
-     * show gas estimation
-     */
-    const gasEstimation = () => {
-      if (node.nodeType === 'FunctionDefinition') {
-        const result: gasEstimationType = state.gasEstimation
-        const executionCost = ' Execution cost: ' + result.executionCost + ' gas'
-        const codeDepositCost = 'Code deposit cost: ' + result.codeDepositCost + ' gas'
-        const estimatedGas = result.codeDepositCost ? `${codeDepositCost}, ${executionCost}` : `${executionCost}`
-        return (
-          <div className="gasEstimation">
-            <i className="fas fa-gas-pump gasStationIcon" title='Gas estimation'></i>
-            <span>{estimatedGas}</span>
-          </div>
-        )
-      } else {
-        return (<div></div>)
-      }
-    }
-
-    /*
-     * onClick jump to ast node in the editor
-     */
-    const _jumpToInternal = async (position: any) => {
-      const jumpToLine = async (fileName: string, lineColumn: any) => {
-        if (fileName !== await props.getCurrentFileName()) {
-          await props.openFile(fileName)
-        }
-        if (lineColumn.start && lineColumn.start.line && lineColumn.start.column) {
-          gotoLineDisableRef.current = true
-          props.gotoLine(lineColumn.start.line, lineColumn.end.column + 1)
-        }
-      }
-      const lastCompilationResult = await props.getLastCompilationResult()
-      if (lastCompilationResult && lastCompilationResult.languageversion.indexOf('soljson') === 0 && lastCompilationResult.data) {
-        const lineColumn = await props.offsetToLineColumn(
-          position,
-          position.file,
-          lastCompilationResult.getSourceCode().sources,
-          lastCompilationResult.getAsts())
-        const filename = lastCompilationResult.getSourceName(position.file)
-        // TODO: refactor with rendererAPI.errorClick
-        jumpToLine(filename, lineColumn)
-      }
-    }
-
     const jumpTo = () => {
       if (node && node.src) {
         const position = sourceMappingDecoder.decode(node.src)
@@ -170,7 +170,7 @@ export function RemixUiEditorContextView (props: RemixUiEditorContextViewProps)
     }
 
     return (
-      <div className="line">{gasEstimation()}
+      <div className="line">{gasEstimation(node)}
         <div title={type} className="type">{type}</div>
         <div title={node.name} className="name mr-2">{node.name}</div>
         <i className="fas fa-share jump" data-action='gotoref' aria-hidden="true" onClick={jumpTo}></i>

From 2d8ff4baf7182e363bfce57d0b80212ae2d1d4b3 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 27 Dec 2021 11:02:47 +0100
Subject: [PATCH 42/43] linting

---
 .../src/lib/custom-hooks/useDragTerminal.tsx  | 116 +++++++++---------
 .../terminal/src/lib/remix-ui-terminal.tsx    |   5 +-
 2 files changed, 59 insertions(+), 62 deletions(-)

diff --git a/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx b/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx
index cdd4f6dc6a..1416ff2ddb 100644
--- a/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx
@@ -1,77 +1,77 @@
 import { useEffect, useState } from 'react'
 
 export const useDragTerminal = (minHeight: number, defaultPosition: number) => {
-    const [isOpen, setIsOpen] = useState(defaultPosition > minHeight)
-    const [lastYPosition, setLastYPosition] = useState(0)
-    const [terminalPosition, setTerminalPosition] = useState(defaultPosition)
-    // Used to save position of the terminal when it is closed
-    const [lastTerminalPosition, setLastTerminalPosition] = useState(defaultPosition)
-    const [isDragging, setIsDragging] = useState(false)
+  const [isOpen, setIsOpen] = useState(defaultPosition > minHeight)
+  const [lastYPosition, setLastYPosition] = useState(0)
+  const [terminalPosition, setTerminalPosition] = useState(defaultPosition)
+  // Used to save position of the terminal when it is closed
+  const [lastTerminalPosition, setLastTerminalPosition] = useState(defaultPosition)
+  const [isDragging, setIsDragging] = useState(false)
 
-    const handleDraggingStart = (event: React.MouseEvent) => {
-        setLastYPosition(event.clientY)
-        setIsDragging(true)
-    }
+  const handleDraggingStart = (event: React.MouseEvent) => {
+    setLastYPosition(event.clientY)
+    setIsDragging(true)
+  }
 
-    const handleDragging = (event: MouseEvent) => {
-        event.preventDefault()
+  const handleDragging = (event: MouseEvent) => {
+    event.preventDefault()
 
-        if (isDragging) {
-            const mouseYPosition = event.clientY
-            const difference = lastYPosition - mouseYPosition
-            const newTerminalPosition = terminalPosition + difference
-            setTerminalPosition(newTerminalPosition)
-            setLastYPosition(mouseYPosition)
-        }
+    if (isDragging) {
+      const mouseYPosition = event.clientY
+      const difference = lastYPosition - mouseYPosition
+      const newTerminalPosition = terminalPosition + difference
+      setTerminalPosition(newTerminalPosition)
+      setLastYPosition(mouseYPosition)
     }
+  }
 
-    const handleDraggingEnd = () => {
-        if(!isDragging) return
-
-        setIsDragging(false)
+  const handleDraggingEnd = () => {
+    if (!isDragging) return
 
-        // Check terminal position to determine if it should be open or closed
-        setIsOpen(terminalPosition > minHeight)
-    }
+    setIsDragging(false)
 
-    const handleToggleTerminal = (event: React.MouseEvent<HTMLElement>) => {
-        event.preventDefault()
-        event.stopPropagation()
+    // Check terminal position to determine if it should be open or closed
+    setIsOpen(terminalPosition > minHeight)
+  }
 
-        if(isOpen) {
-            setLastTerminalPosition(terminalPosition)
-            setLastYPosition(0)
-            setTerminalPosition(minHeight)
-        } else {
-            setTerminalPosition(lastTerminalPosition <= minHeight ? 323 : lastTerminalPosition)
-        }
+  const handleToggleTerminal = (event: React.MouseEvent<HTMLElement>) => {
+    event.preventDefault()
+    event.stopPropagation()
 
-        setIsOpen(!isOpen)
+    if (isOpen) {
+      setLastTerminalPosition(terminalPosition)
+      setLastYPosition(0)
+      setTerminalPosition(minHeight)
+    } else {
+      setTerminalPosition(lastTerminalPosition <= minHeight ? 323 : lastTerminalPosition)
     }
 
-    // Add event listeners for dragging
-    useEffect(() => {
-        document.addEventListener('mousemove', handleDragging)
-        document.addEventListener('mouseup', handleDraggingEnd)
+    setIsOpen(!isOpen)
+  }
 
-        return () => {
-            document.removeEventListener('mousemove', handleDragging)
-            document.removeEventListener('mouseup', handleDraggingEnd)
-        }
-    }, [handleDragging, handleDraggingEnd])
+  // Add event listeners for dragging
+  useEffect(() => {
+    document.addEventListener('mousemove', handleDragging)
+    document.addEventListener('mouseup', handleDraggingEnd)
 
-    // Reset terminal position
-    useEffect(() => {
-        if(!terminalPosition){
-            setTerminalPosition(defaultPosition)
-        }
-    }, [terminalPosition, setTerminalPosition])
+    return () => {
+      document.removeEventListener('mousemove', handleDragging)
+      document.removeEventListener('mouseup', handleDraggingEnd)
+    }
+  }, [handleDragging, handleDraggingEnd])
 
-    return {
-        isOpen,
-        terminalPosition,
-        isDragging,
-        handleDraggingStart,
-        handleToggleTerminal,
+  // Reset terminal position
+  useEffect(() => {
+    if (!terminalPosition) {
+      setTerminalPosition(defaultPosition)
     }
+  }, [terminalPosition, setTerminalPosition])
+
+  return {
+    isOpen,
+    terminalPosition,
+    isDragging,
+    handleDraggingStart,
+    handleToggleTerminal,
+  }
 }
\ No newline at end of file
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
index de6de4eb23..8cc0829796 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -95,7 +95,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
 
   useEffect(() => {
     event.trigger('resize', [terminalPosition])
-  } , [terminalPosition])
+  }, [terminalPosition])
 
   const scrollToBottom = () => {
     messagesEndRef.current.scrollIntoView({ behavior: 'smooth' })
@@ -211,9 +211,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
     }
   }
 
-
-
-
   const focusinput = () => {
     inputEl.current.focus()
   }

From 34e49bf909edf44d78b7b5947f89e6ec57562132 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 27 Dec 2021 11:11:34 +0100
Subject: [PATCH 43/43] lintig

---
 .../terminal/src/lib/custom-hooks/useDragTerminal.tsx       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx b/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx
index 1416ff2ddb..aba4bbf6a5 100644
--- a/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/custom-hooks/useDragTerminal.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react'
+import React, { useEffect, useState } from 'react'
 
 export const useDragTerminal = (minHeight: number, defaultPosition: number) => {
   const [isOpen, setIsOpen] = useState(defaultPosition > minHeight)
@@ -72,6 +72,6 @@ export const useDragTerminal = (minHeight: number, defaultPosition: number) => {
     terminalPosition,
     isDragging,
     handleDraggingStart,
-    handleToggleTerminal,
+    handleToggleTerminal
   }
-}
\ No newline at end of file
+}