From d64bbc4015119c20531286ee2535b407a0064615 Mon Sep 17 00:00:00 2001
From: Abhinav Jha <abhinav@appsmith.com>
Date: Fri, 22 Nov 2019 14:02:55 +0000
Subject: [PATCH] Use applicationId and pageId to render pages

---
 app/client/.eslintrc.js                       |    2 +-
 app/client/package.json                       |    6 +-
 app/client/src/actions/configsActions.tsx     |    1 -
 app/client/src/actions/initActions.ts         |   12 +-
 app/client/src/actions/pageActions.tsx        |   21 +-
 app/client/src/api/PageApi.tsx                |   15 +-
 app/client/src/assets/icons/control/view.svg  |    2 +-
 .../appsmith/CenteredWrapper.tsx              |    9 +
 .../appsmith/ContainerComponent.tsx           |    2 +-
 .../editorComponents/ContextDropdown.tsx      |    6 +-
 .../editorComponents/PageLoader.tsx           |   37 +
 .../components/editorComponents/Sidebar.tsx   |   34 +-
 .../fields/DatasourcesField.tsx               |    5 +-
 app/client/src/constants/ApiConstants.tsx     |   18 -
 app/client/src/constants/Colors.tsx           |    2 +-
 app/client/src/constants/DefaultTheme.tsx     |    2 +-
 .../src/constants/ReduxActionConstants.tsx    |   16 +-
 app/client/src/constants/WidgetValidation.ts  |    2 +-
 app/client/src/constants/routes.ts            |   60 +-
 app/client/src/index.tsx                      |    6 +-
 .../AppViewer/AppViewerPageContainer.tsx      |   95 ++
 app/client/src/pages/AppViewer/index.tsx      |  168 +--
 .../viewer/AppViewerSideNavWrapper.tsx        |   32 +
 .../src/pages/AppViewer/viewer/SideNav.tsx    |   47 +-
 .../pages/Applications/ApplicationCard.tsx    |   54 +-
 app/client/src/pages/Applications/index.tsx   |   33 +-
 app/client/src/pages/Editor/ApiEditor.tsx     |   30 +-
 app/client/src/pages/Editor/ApiSidebar.tsx    |   31 +-
 app/client/src/pages/Editor/EditorHeader.tsx  |    4 +-
 app/client/src/pages/Editor/PropertyPane.tsx  |    5 +-
 app/client/src/pages/Editor/Sidebar.tsx       |   10 +-
 app/client/src/pages/Editor/WidgetsEditor.tsx |   74 +-
 app/client/src/pages/Editor/index.tsx         |   98 +-
 app/client/src/pages/Editor/routes.tsx        |   31 +-
 app/client/src/pages/common/PageNotFound.tsx  |   28 +-
 .../src/pages/common/ProtectedRoute.tsx       |    1 +
 .../src/reducers/entityReducers/index.tsx     |    3 +
 .../entityReducers/pageListReducer.tsx        |   36 +
 app/client/src/reducers/index.tsx             |    2 +
 .../reducers/uiReducers/appViewReducer.tsx    |   12 +-
 .../src/reducers/uiReducers/editorReducer.tsx |   87 +-
 app/client/src/sagas/ActionSagas.ts           |   10 +-
 app/client/src/sagas/ApplicationSagas.tsx     |   25 +-
 app/client/src/sagas/DatasourcesSagas.ts      |   10 +-
 app/client/src/sagas/InitSagas.ts             |   40 +-
 app/client/src/sagas/PageSagas.tsx            |   52 +-
 app/client/src/sagas/SagaUtils.ts             |   13 +
 app/client/src/sagas/selectors.tsx            |   33 +-
 app/client/src/selectors/appViewSelectors.tsx |   18 +-
 app/client/src/selectors/editorSelectors.tsx  |   30 +-
 app/client/src/utils/WidgetPropsUtils.tsx     |    6 +-
 app/client/src/widgets/BaseWidget.tsx         |    2 +-
 app/client/src/widgets/ContainerWidget.tsx    |    5 +-
 app/client/yarn.lock                          | 1308 +++++++++--------
 54 files changed, 1550 insertions(+), 1141 deletions(-)
 create mode 100644 app/client/src/components/designSystems/appsmith/CenteredWrapper.tsx
 create mode 100644 app/client/src/components/editorComponents/PageLoader.tsx
 create mode 100644 app/client/src/pages/AppViewer/AppViewerPageContainer.tsx
 create mode 100644 app/client/src/pages/AppViewer/viewer/AppViewerSideNavWrapper.tsx
 create mode 100644 app/client/src/reducers/entityReducers/pageListReducer.tsx
 create mode 100644 app/client/src/sagas/SagaUtils.ts

diff --git a/app/client/.eslintrc.js b/app/client/.eslintrc.js
index e1d3677973..805048b859 100644
--- a/app/client/.eslintrc.js
+++ b/app/client/.eslintrc.js
@@ -1,6 +1,6 @@
 module.exports = {
   parser: '@typescript-eslint/parser',
-  plugins: ["react", "@typescript-eslint", "prettier"],
+  plugins: ["react", "@typescript-eslint", "prettier", "react-hooks"],
   extends: [
     "plugin:react/recommended", // Uses the recommended rules from @eslint-plugin-react
     "plugin:@typescript-eslint/recommended",
diff --git a/app/client/package.json b/app/client/package.json
index 3485c4b181..a10c5973dd 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -24,7 +24,7 @@
     "@types/react": "^16.8.2",
     "@types/react-dom": "^16.8.0",
     "@types/react-redux": "^7.0.1",
-    "@types/react-router-dom": "^4.3.5",
+    "@types/react-router-dom": "^5.1.2",
     "@types/styled-components": "^4.1.8",
     "@uppy/core": "^1.5.1",
     "@uppy/file-input": "^1.3.1",
@@ -65,8 +65,8 @@
     "react-netlify-identity": "^0.1.9",
     "react-redux": "^6.0.0",
     "react-rnd": "^10.1.1",
-    "react-router": "^5.0.1",
-    "react-router-dom": "^5.0.1",
+    "react-router": "^5.1.2",
+    "react-router-dom": "^5.1.2",
     "react-scripts": "^3.1.1",
     "react-select": "^3.0.8",
     "redux": "^4.0.1",
diff --git a/app/client/src/actions/configsActions.tsx b/app/client/src/actions/configsActions.tsx
index 6b9b634d70..ad6ba20a5f 100644
--- a/app/client/src/actions/configsActions.tsx
+++ b/app/client/src/actions/configsActions.tsx
@@ -1,7 +1,6 @@
 import { ReduxActionTypes } from "../constants/ReduxActionConstants";
 
 export type EditorConfigIdsType = {
-  propertyPaneConfigsId?: string;
   widgetCardsPaneId?: string;
   widgetConfigsId?: string;
 };
diff --git a/app/client/src/actions/initActions.ts b/app/client/src/actions/initActions.ts
index 8ddc360c78..5cba1f802f 100644
--- a/app/client/src/actions/initActions.ts
+++ b/app/client/src/actions/initActions.ts
@@ -1,8 +1,14 @@
 import {
   ReduxActionTypes,
-  ReduxActionWithoutPayload,
-} from "../constants/ReduxActionConstants";
+  ReduxAction,
+  InitializeEditorPayload,
+} from "constants/ReduxActionConstants";
 
-export const initEditor = (): ReduxActionWithoutPayload => ({
+export const initEditor = (
+  applicationId: string,
+): ReduxAction<InitializeEditorPayload> => ({
   type: ReduxActionTypes.INITIALIZE_EDITOR,
+  payload: {
+    applicationId,
+  },
 });
diff --git a/app/client/src/actions/pageActions.tsx b/app/client/src/actions/pageActions.tsx
index 41916fb110..abd18ddcc8 100644
--- a/app/client/src/actions/pageActions.tsx
+++ b/app/client/src/actions/pageActions.tsx
@@ -7,21 +7,34 @@ import {
   UpdateCanvasPayload,
   SavePagePayload,
   SavePageSuccessPayload,
+  FetchPageListPayload,
 } from "../constants/ReduxActionConstants";
 import { ContainerWidgetProps } from "../widgets/ContainerWidget";
 
-export const fetchPageList = () => ({
-  type: ReduxActionTypes.FETCH_PAGE_LIST_INIT,
-});
+export const fetchPageList = (
+  applicationId: string,
+): ReduxAction<FetchPageListPayload> => {
+  return {
+    type: ReduxActionTypes.FETCH_PAGE_LIST_INIT,
+    payload: {
+      applicationId,
+    },
+  };
+};
 
 export const fetchPage = (pageId: string): ReduxAction<FetchPageRequest> => {
   return {
-    type: ReduxActionTypes.FETCH_PAGE,
+    type: ReduxActionTypes.FETCH_PAGE_INIT,
     payload: {
       pageId: pageId,
     },
   };
 };
+export const fetchPageSuccess = () => {
+  return {
+    type: ReduxActionTypes.FETCH_PAGE_SUCCESS,
+  };
+};
 
 export const addWidget = (
   pageId: string,
diff --git a/app/client/src/api/PageApi.tsx b/app/client/src/api/PageApi.tsx
index 36a7976379..12bfea59e8 100644
--- a/app/client/src/api/PageApi.tsx
+++ b/app/client/src/api/PageApi.tsx
@@ -11,7 +11,6 @@ export interface FetchPageRequest {
 
 export interface FetchPublishedPageRequest {
   pageId: string;
-  layoutId: string;
 }
 
 export interface SavePageRequest {
@@ -70,8 +69,8 @@ class PageApi extends Api {
     return `v1/layouts/${layoutId}/pages/${pageId}`;
   };
 
-  static getPublishedPageURL = (pageId: string, layoutId: string) => {
-    return `v1/layouts/${layoutId}/pages/${pageId}/view`;
+  static getPublishedPageURL = (pageId: string) => {
+    return `v1/pages/${pageId}/view`;
   };
 
   static fetchPage(
@@ -97,9 +96,7 @@ class PageApi extends Api {
   static fetchPublishedPage(
     pageRequest: FetchPublishedPageRequest,
   ): AxiosPromise<FetchPublishedPageResponse> {
-    return Api.get(
-      PageApi.getPublishedPageURL(pageRequest.pageId, pageRequest.layoutId),
-    );
+    return Api.get(PageApi.getPublishedPageURL(pageRequest.pageId));
   }
 
   static createPage(
@@ -108,8 +105,10 @@ class PageApi extends Api {
     return Api.post(PageApi.url, createPageRequest);
   }
 
-  static fetchPageList(): AxiosPromise<FetchPageListResponse> {
-    return Api.get(PageApi.url);
+  static fetchPageList(
+    applicationId: string,
+  ): AxiosPromise<FetchPageListResponse> {
+    return Api.get(PageApi.url + "/application/" + applicationId);
   }
 }
 
diff --git a/app/client/src/assets/icons/control/view.svg b/app/client/src/assets/icons/control/view.svg
index abe8f8eed4..66010d6eed 100644
--- a/app/client/src/assets/icons/control/view.svg
+++ b/app/client/src/assets/icons/control/view.svg
@@ -1,3 +1,3 @@
 <svg width="10" height="12" viewBox="0 0 10 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 6.001C10 6.3 9.695 6.515 9.695 6.515L1.134 11.818C0.51 12.227 0 11.924 0 11.149V0.852C0 0.0749997 0.51 -0.226 1.135 0.182L9.696 5.487C9.695 5.487 10 5.702 10 6.001Z" fill="#A3B3BF"/>
+<path d="M10 6.00102C10 6.30001 9.695 6.51502 9.695 6.51502L1.134 11.818C0.51 12.227 0 11.924 0 11.149V0.852015C0 0.0750149 0.51 -0.225985 1.135 0.182015L9.696 5.48702C9.695 5.48702 10 5.70202 10 6.00102Z" fill="#A3B3BF"/>
 </svg>
diff --git a/app/client/src/components/designSystems/appsmith/CenteredWrapper.tsx b/app/client/src/components/designSystems/appsmith/CenteredWrapper.tsx
new file mode 100644
index 0000000000..e8ae586218
--- /dev/null
+++ b/app/client/src/components/designSystems/appsmith/CenteredWrapper.tsx
@@ -0,0 +1,9 @@
+import styled from "styled-components";
+
+export default styled.div`
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+`;
diff --git a/app/client/src/components/designSystems/appsmith/ContainerComponent.tsx b/app/client/src/components/designSystems/appsmith/ContainerComponent.tsx
index e90b372a4b..b9c2ad6a6f 100644
--- a/app/client/src/components/designSystems/appsmith/ContainerComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/ContainerComponent.tsx
@@ -38,7 +38,7 @@ ContainerComponent.defaultProps = {
   backgroundColor: "white",
 };
 
-type ContainerStyle = "border" | "card" | "rounded-border" | "none";
+export type ContainerStyle = "border" | "card" | "rounded-border" | "none";
 
 export interface ContainerComponentProps extends ComponentProps {
   containerStyle?: ContainerStyle;
diff --git a/app/client/src/components/editorComponents/ContextDropdown.tsx b/app/client/src/components/editorComponents/ContextDropdown.tsx
index a0e454d791..1429ec6d84 100644
--- a/app/client/src/components/editorComponents/ContextDropdown.tsx
+++ b/app/client/src/components/editorComponents/ContextDropdown.tsx
@@ -29,6 +29,7 @@ type ContextDropdownProps = {
   toggle: {
     type: "icon" | "button";
     icon?: ControlIconName;
+    iconSize?: number;
     text?: string;
     placeholder?: string;
   };
@@ -37,7 +38,10 @@ type ContextDropdownProps = {
 export const ContextDropdown = (props: ContextDropdownProps) => {
   let trigger: ReactNode;
   if (props.toggle.type === "icon" && props.toggle.icon)
-    trigger = ControlIcons[props.toggle.icon]();
+    trigger = ControlIcons[props.toggle.icon]({
+      width: props.toggle.iconSize,
+      height: props.toggle.iconSize,
+    });
   if (props.toggle.type === "button" && props.toggle.text)
     trigger = <Button text={props.toggle.text} />;
 
diff --git a/app/client/src/components/editorComponents/PageLoader.tsx b/app/client/src/components/editorComponents/PageLoader.tsx
new file mode 100644
index 0000000000..27a7e4a6c5
--- /dev/null
+++ b/app/client/src/components/editorComponents/PageLoader.tsx
@@ -0,0 +1,37 @@
+import React from "react";
+import { Text, ProgressBar } from "@blueprintjs/core";
+import styled from "styled-components";
+
+const PageLoaderWrapper = styled.div`
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: fixed;
+  left: 0;
+  top: 0;
+  background: white;
+  & > div {
+    width: 100px;
+    height: 100px;
+    text-align: center;
+  }
+`;
+
+type PageLoaderProps = {
+  value?: number;
+};
+
+export const PageLoader = (props: PageLoaderProps) => {
+  return (
+    <PageLoaderWrapper>
+      <div>
+        <ProgressBar value={props.value ? props.value / 100 : undefined} />
+        <Text>Loading</Text>
+      </div>
+    </PageLoaderWrapper>
+  );
+};
+
+export default PageLoader;
diff --git a/app/client/src/components/editorComponents/Sidebar.tsx b/app/client/src/components/editorComponents/Sidebar.tsx
index 9042c524c6..6092e81cfd 100644
--- a/app/client/src/components/editorComponents/Sidebar.tsx
+++ b/app/client/src/components/editorComponents/Sidebar.tsx
@@ -5,31 +5,27 @@ import {
   API_EDITOR_URL,
   BUILDER_URL,
   API_EDITOR_ID_URL,
-} from "../../constants/routes";
-import WidgetSidebar from "../../pages/Editor/WidgetSidebar";
-import ApiSidebar from "../../pages/Editor/ApiSidebar";
+} from "constants/routes";
+import WidgetSidebar from "pages/Editor/WidgetSidebar";
+import ApiSidebar from "pages/Editor/ApiSidebar";
 
 const SidebarWrapper = styled.div`
   background-color: ${props => props.theme.colors.paneBG};
   padding: 5px 10px;
   color: ${props => props.theme.colors.textOnDarkBG};
-  overflow-y: scroll;
+  overflow-y: auto;
 `;
 
-class Sidebar extends React.Component {
-  render() {
-    return (
-      <React.Fragment>
-        <SidebarWrapper>
-          <Switch>
-            <Route exact path={BUILDER_URL} component={WidgetSidebar} />
-            <Route exact path={API_EDITOR_URL} component={ApiSidebar} />
-            <Route exact path={API_EDITOR_ID_URL()} component={ApiSidebar} />
-          </Switch>
-        </SidebarWrapper>
-      </React.Fragment>
-    );
-  }
-}
+export const Sidebar = () => {
+  return (
+    <SidebarWrapper>
+      <Switch>
+        <Route exact path={BUILDER_URL} component={WidgetSidebar} />
+        <Route exact path={API_EDITOR_URL()} component={ApiSidebar} />
+        <Route exact path={API_EDITOR_ID_URL()} component={ApiSidebar} />
+      </Switch>
+    </SidebarWrapper>
+  );
+};
 
 export default Sidebar;
diff --git a/app/client/src/components/editorComponents/fields/DatasourcesField.tsx b/app/client/src/components/editorComponents/fields/DatasourcesField.tsx
index ca9fe70777..fc0dc9da4f 100644
--- a/app/client/src/components/editorComponents/fields/DatasourcesField.tsx
+++ b/app/client/src/components/editorComponents/fields/DatasourcesField.tsx
@@ -64,7 +64,4 @@ const mapDispatchToProps = (dispatch: any): ReduxActionProps => ({
     ),
 });
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps,
-)(DatasourcesField);
+export default connect(mapStateToProps, mapDispatchToProps)(DatasourcesField);
diff --git a/app/client/src/constants/ApiConstants.tsx b/app/client/src/constants/ApiConstants.tsx
index 78caef4ea3..369dc664a2 100644
--- a/app/client/src/constants/ApiConstants.tsx
+++ b/app/client/src/constants/ApiConstants.tsx
@@ -29,21 +29,3 @@ export interface APIHeaders {
 export interface APIRequest {
   requestId?: string;
 }
-
-export const getEditorConfigs = () => {
-  if (process.env.NODE_ENV === "development") {
-    return {
-      currentPageId: "5dcab609312463000408b92b",
-      currentLayoutId: "5dcab609312463000408b92a",
-      currentPageName: "page1",
-      propertyPaneConfigsId: "5d8a04195cf8050004db6e30",
-    };
-  } else {
-    return {
-      currentPageId: "5dcab609312463000408b92b",
-      currentLayoutId: "5dcab609312463000408b92a",
-      currentPageName: "page1",
-      propertyPaneConfigsId: "5d8a04195cf8050004db6e30",
-    };
-  }
-};
diff --git a/app/client/src/constants/Colors.tsx b/app/client/src/constants/Colors.tsx
index 5ce1b34da5..21ea6ac0d5 100644
--- a/app/client/src/constants/Colors.tsx
+++ b/app/client/src/constants/Colors.tsx
@@ -33,4 +33,4 @@ export const Colors: Record<string, string> = {
   CADET_BLUE: "#A3B3BF",
 };
 
-export type Color = (typeof Colors)[keyof typeof Colors];
+export type Color = typeof Colors[keyof typeof Colors];
diff --git a/app/client/src/constants/DefaultTheme.tsx b/app/client/src/constants/DefaultTheme.tsx
index e8286e4edf..db51d0ebdf 100644
--- a/app/client/src/constants/DefaultTheme.tsx
+++ b/app/client/src/constants/DefaultTheme.tsx
@@ -3,7 +3,7 @@ import { Colors, Color } from "./Colors";
 import * as FontFamilies from "./Fonts";
 import _ from "lodash";
 
-export type FontFamily = (typeof FontFamilies)[keyof typeof FontFamilies];
+export type FontFamily = typeof FontFamilies[keyof typeof FontFamilies];
 
 const {
   default: styled,
diff --git a/app/client/src/constants/ReduxActionConstants.tsx b/app/client/src/constants/ReduxActionConstants.tsx
index 140adb9812..afd8fd1864 100644
--- a/app/client/src/constants/ReduxActionConstants.tsx
+++ b/app/client/src/constants/ReduxActionConstants.tsx
@@ -9,7 +9,8 @@ export const ReduxActionTypes: { [key: string]: string } = {
   UPDATE_CANVAS: "UPDATE_CANVAS",
   FETCH_CANVAS: "FETCH_CANVAS",
   CLEAR_CANVAS: "CLEAR_CANVAS",
-  FETCH_PAGE: "FETCH_PAGE",
+  FETCH_PAGE_INIT: "FETCH_PAGE_INIT",
+  FETCH_PAGE_SUCCESS: "FETCH_PAGE_SUCCESS",
   DROP_WIDGET_CANVAS: "DROP_WIDGET_CANVAS",
   REMOVE_WIDGET_CANVAS: "REMOVE_WIDGET_CANVAS",
   LOAD_WIDGET_PANE: "LOAD_WIDGET_PANE",
@@ -83,10 +84,10 @@ export const ReduxActionTypes: { [key: string]: string } = {
   HIDE_PROPERTY_PANE: "HIDE_PROPERTY_PANE",
 };
 
-export type ReduxActionType = (typeof ReduxActionTypes)[keyof typeof ReduxActionTypes];
+export type ReduxActionType = typeof ReduxActionTypes[keyof typeof ReduxActionTypes];
 
 export const ReduxActionErrorTypes: { [key: string]: string } = {
-  INIT_EDITOR_ERROR: "INIT_EDITOR_ERROR",
+  INITIALIZE_EDITOR_ERROR: "INITIALIZE_EDITOR_ERROR",
   API_ERROR: "API_ERROR",
   WIDGET_DELETE_ERROR: "WIDGET_DELETE_ERROR",
   WIDGET_MOVE_ERROR: "WIDGET_MOVE_ERROR",
@@ -117,7 +118,7 @@ export const ReduxActionErrorTypes: { [key: string]: string } = {
   CREATE_APPLICATION_ERROR: "CREATE_APPLICATION_ERROR",
 };
 
-export type ReduxActionErrorType = (typeof ReduxActionErrorTypes)[keyof typeof ReduxActionErrorTypes];
+export type ReduxActionErrorType = typeof ReduxActionErrorTypes[keyof typeof ReduxActionErrorTypes];
 
 export interface ReduxAction<T> {
   type: ReduxActionType | ReduxActionErrorType;
@@ -149,7 +150,6 @@ export interface ShowPropertyPanePayload {
 export type PageListPayload = Array<{
   pageName: string;
   pageId: string;
-  layoutId: string;
 }>;
 
 export type ApplicationPayload = {
@@ -175,3 +175,9 @@ export interface LoadWidgetSidebarPayload {
 export type SavePagePayload = {};
 export type SavePageErrorPayload = {};
 export type SavePageSuccessPayload = {};
+
+export type InitializeEditorPayload = {
+  applicationId: string;
+};
+
+export type FetchPageListPayload = InitializeEditorPayload;
diff --git a/app/client/src/constants/WidgetValidation.ts b/app/client/src/constants/WidgetValidation.ts
index 14a6d6496c..84a9ad3175 100644
--- a/app/client/src/constants/WidgetValidation.ts
+++ b/app/client/src/constants/WidgetValidation.ts
@@ -14,5 +14,5 @@ export type ValidationResponse = {
   parsed: any;
 };
 
-export type ValidationType = (typeof VALIDATION_TYPES)[keyof typeof VALIDATION_TYPES];
+export type ValidationType = typeof VALIDATION_TYPES[keyof typeof VALIDATION_TYPES];
 export type Validator = (value: any) => ValidationResponse;
diff --git a/app/client/src/constants/routes.ts b/app/client/src/constants/routes.ts
index 41ad69ec41..ca3375d6d6 100644
--- a/app/client/src/constants/routes.ts
+++ b/app/client/src/constants/routes.ts
@@ -1,26 +1,62 @@
 import { MenuIcons } from "../icons/MenuIcons";
-
 export const BASE_URL = "/";
 export const LOGIN_URL = "/login";
-export const BUILDER_URL = "/builder";
-export const API_EDITOR_URL = `${BUILDER_URL}/api`;
-export const API_EDITOR_ID_URL = (id = ":id") => `${API_EDITOR_URL}/${id}`;
-export const APP_VIEW_URL = `/view/pages/:pageId`;
 export const APPLICATIONS_URL = `/applications`;
+export const BUILDER_URL = "/applications/:applicationId/pages/:pageId/edit";
 
-// TODO(abhinav): We probably need a utils/routes file for such functions.
-export const getApplicationBuilderURL = (applicationId: string) =>
-  `${BUILDER_URL}/${applicationId}`;
+export type BuilderRouteParams = {
+  applicationId: string;
+  pageId: string;
+};
+
+export type AppViewerRouteParams = {
+  applicationId?: string;
+  pageId?: string;
+};
+
+export type APIEditorRouteParams = {
+  applicationId: string;
+  pageId: string;
+  apiId?: string;
+};
+
+export const BUILDER_BASE_URL = (applicationId = ":applicationId"): string =>
+  `/applications/${applicationId}`;
+
+export const BUILDER_PAGE_URL = (
+  applicationId?: string,
+  pageId?: string,
+): string => {
+  if (!pageId) return APPLICATIONS_URL;
+  return `${BUILDER_BASE_URL(applicationId)}/pages/${pageId}/edit`;
+};
+
+export const API_EDITOR_URL = (
+  applicationId = ":applicationId",
+  pageId = ":pageId",
+): string => `${BUILDER_PAGE_URL(applicationId, pageId)}/api`;
+
+export const API_EDITOR_ID_URL = (
+  applicationId = ":applicationId",
+  pageId = ":pageId",
+  apiId = ":apiId",
+): string => `${API_EDITOR_URL(applicationId, pageId)}/${apiId}`;
+
+export const APP_VIEW_URL = `/applications/:applicationId`;
 
 export const getApplicationViewerURL = (
-  applicationId: string,
-  pageId?: string,
-) => `/view/application/${applicationId}/pages/${pageId}`;
+  applicationId = ":applicationId",
+): string => `/applications/${applicationId}`;
+
+export const getApplicationViewerPageURL = (
+  applicationId = ":applicationId",
+  pageId = ":pageId",
+): string => `/applications/${applicationId}/pages/${pageId}`;
 
 export const EDITOR_ROUTES = [
   {
     icon: MenuIcons.WIDGETS_ICON,
-    path: BUILDER_URL,
+    path: BUILDER_PAGE_URL,
     title: "Widgets",
     exact: true,
   },
diff --git a/app/client/src/index.tsx b/app/client/src/index.tsx
index 00aada55d9..76b9876e40 100755
--- a/app/client/src/index.tsx
+++ b/app/client/src/index.tsx
@@ -49,7 +49,11 @@ ReactDOM.render(
             <Route exact path={BASE_URL} component={App} />
             <ProtectedRoute path={BUILDER_URL} component={Editor} />
             <ProtectedRoute path={APP_VIEW_URL} component={AppViewer} />
-            <ProtectedRoute path={APPLICATIONS_URL} component={Applications} />
+            <ProtectedRoute
+              exact
+              path={APPLICATIONS_URL}
+              component={Applications}
+            />
             <Route exact path={LOGIN_URL} component={LoginPage} />
             <Route component={PageNotFound} />
           </Switch>
diff --git a/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx b/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx
new file mode 100644
index 0000000000..d1184e3bb0
--- /dev/null
+++ b/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx
@@ -0,0 +1,95 @@
+import React, { Component } from "react";
+import { RouteComponentProps, Link } from "react-router-dom";
+import { connect } from "react-redux";
+import { ReduxActionTypes } from "constants/ReduxActionConstants";
+import {
+  getIsFetchingPage,
+  getCurrentPageLayoutDSL,
+} from "selectors/appViewSelectors";
+import { ContainerWidgetProps } from "widgets/ContainerWidget";
+import { WidgetProps } from "widgets/BaseWidget";
+import { AppViewerRouteParams } from "constants/routes";
+import { AppState } from "reducers";
+import { theme } from "constants/DefaultTheme";
+import { NonIdealState, Icon, Spinner } from "@blueprintjs/core";
+import Centered from "components/designSystems/appsmith/CenteredWrapper";
+import AppPage from "./AppPage";
+
+type AppViewerPageContainerProps = {
+  isFetchingPage: boolean;
+  dsl?: ContainerWidgetProps<WidgetProps>;
+  fetchPage: (pageId: string) => void;
+} & RouteComponentProps<AppViewerRouteParams>;
+
+class AppViewerPageContainer extends Component<AppViewerPageContainerProps> {
+  componentDidMount() {
+    const { pageId } = this.props.match.params;
+    if (pageId) {
+      this.props.fetchPage(pageId);
+    }
+  }
+  componentDidUpdate(previously: AppViewerPageContainerProps) {
+    const { pageId } = this.props.match.params;
+    if (
+      pageId &&
+      previously.location.pathname !== this.props.location.pathname
+    ) {
+      this.props.fetchPage(pageId);
+    }
+  }
+  render() {
+    const pageNotFound = (
+      <Centered>
+        <NonIdealState
+          icon={
+            <Icon
+              iconSize={theme.fontSizes[9]}
+              icon="page-layout"
+              color={theme.colors.primary}
+            />
+          }
+          title="This page seems to be blank"
+          description={
+            <p>
+              Please add widgets to this page in the
+              <Link to="/builder"> Appsmith Editor</Link>
+            </p>
+          }
+        />
+      </Centered>
+    );
+    const pageLoading = (
+      <Centered>
+        <Spinner />
+      </Centered>
+    );
+
+    if (this.props.isFetchingPage) {
+      return pageLoading;
+    } else if (!this.props.isFetchingPage && !this.props.dsl) {
+      return pageNotFound;
+    } else if (!this.props.isFetchingPage && this.props.dsl) {
+      return <AppPage dsl={this.props.dsl} />;
+    }
+  }
+}
+
+const mapStateToProps = (state: AppState) => ({
+  isFetchingPage: getIsFetchingPage(state),
+  dsl: getCurrentPageLayoutDSL(state),
+});
+
+const mapDispatchToProps = (dispatch: any) => ({
+  fetchPage: (pageId: string) =>
+    dispatch({
+      type: ReduxActionTypes.FETCH_PUBLISHED_PAGE_INIT,
+      payload: {
+        pageId,
+      },
+    }),
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps,
+)(AppViewerPageContainer);
diff --git a/app/client/src/pages/AppViewer/index.tsx b/app/client/src/pages/AppViewer/index.tsx
index 7e29c09349..ea945607f2 100644
--- a/app/client/src/pages/AppViewer/index.tsx
+++ b/app/client/src/pages/AppViewer/index.tsx
@@ -1,32 +1,31 @@
 import React, { Component } from "react";
 import styled from "styled-components";
 import { connect } from "react-redux";
-import { withRouter } from "react-router";
+import { withRouter, RouteComponentProps } from "react-router";
+import { Switch, Route } from "react-router-dom";
 import { AppState } from "../../reducers";
+import {
+  AppViewerRouteParams,
+  getApplicationViewerPageURL,
+} from "constants/routes";
 import {
   ReduxActionTypes,
   PageListPayload,
 } from "../../constants/ReduxActionConstants";
 import {
-  getCurrentRoutePageId,
-  getCurrentPageLayoutDSL,
   getPageList,
   getIsFetchingPage,
   getCurrentDSLPageId,
 } from "../../selectors/appViewSelectors";
-import { ContainerWidgetProps } from "../../widgets/ContainerWidget";
-import { WidgetProps } from "../../widgets/BaseWidget";
 import { executeAction } from "../../actions/widgetActions";
 import { ActionPayload } from "../../constants/ActionConstants";
-import AppPage from "./AppPage";
-import { Spinner, NonIdealState, Icon } from "@blueprintjs/core";
-import { Link } from "react-router-dom";
-import { theme } from "../../constants/DefaultTheme";
 import SideNav, { SideNavItem } from "./viewer/SideNav";
 import AppViewerHeader from "./viewer/AppViewerHeader";
 import { updateWidgetProperty } from "../../actions/controlActions";
 import { RenderModes } from "../../constants/WidgetConstants";
 import { EditorContext } from "components/editorComponents/EditorContextProvider";
+import AppViewerPageContainer from "./AppViewerPageContainer";
+import AppViewerSideNavWrapper from "./viewer/AppViewerSideNavWrapper";
 
 const AppViewWrapper = styled.div`
   margin-top: ${props => props.theme.headerHeight};
@@ -39,57 +38,13 @@ const AppViewerBody = styled.section`
   justify-content: flex-start;
   height: calc(100vh - ${props => props.theme.headerHeight});
 `;
-const Centered = styled.div`
-  width: 100%;
-  height: 100vh;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-`;
-const SideNavWrapper = styled.div`
-  background: ${props => props.theme.colors.paneBG};
-  & button.sidenav-toggle,
-  & button.sidenav-toggle:hover,
-  & button.sidenav-toggle:active {
-    background: ${props => props.theme.colors.paneBG};
-    outline: none;
-    border: none;
-    border-radius: 0;
-  }
-  & ul {
-    background: ${props => props.theme.colors.paneBG};
-    color: ${props => props.theme.colors.textOnDarkBG};
-    padding: 0;
-    height: 100%;
-    width: 100%;
-    & li {
-      padding: 0;
-    }
-    & li div.bp3-menu-item {
-      width: 100%;
-      font-size: ${props => props.theme.fontSizes[3]}px;
-      &.bp3-intent-primary {
-        background: ${props => props.theme.sideNav.activeItemBGColor};
-      }
-      & div {
-        line-height: ${props => props.theme.lineHeights[6]}px;
-      }
-    }
-  }
-`;
 
 export type AppViewerProps = {
-  currentRoutePageId?: string;
   currentDSLPageId?: string;
   currentLayoutId?: string;
-  fetchPageWidgets: Function;
   pages?: PageListPayload;
-  dsl?: ContainerWidgetProps<WidgetProps>;
   initializeAppViewer: Function;
   isFetching: boolean;
-  match: any;
-  location: any;
-  history: any;
   executeAction: (actionPayloads?: ActionPayload[]) => void;
   updateWidgetProperty: (
     widgetId: string,
@@ -98,25 +53,15 @@ export type AppViewerProps = {
   ) => void;
 };
 
-class AppViewer extends Component<AppViewerProps> {
-  handlePageSelect = (item: SideNavItem) => {
-    this.props.fetchPageWidgets(item.id);
-    this.props.history.push(`/view/pages/${item.id}`);
-  };
-
+class AppViewer extends Component<
+  AppViewerProps & RouteComponentProps<AppViewerRouteParams>
+> {
   componentDidMount() {
-    this.props.initializeAppViewer(this.props.currentRoutePageId);
-  }
-
-  componentDidUpdate(prevProps: AppViewerProps) {
-    if (
-      prevProps.currentRoutePageId !== this.props.currentRoutePageId &&
-      this.props.currentDSLPageId !== this.props.currentRoutePageId
-    ) {
-      this.props.fetchPageWidgets(this.props.currentRoutePageId);
+    const { applicationId } = this.props.match.params;
+    if (this.props.match.params.applicationId) {
+      this.props.initializeAppViewer(applicationId);
     }
   }
-
   public render() {
     const items: SideNavItem[] | undefined =
       this.props.pages &&
@@ -124,13 +69,12 @@ class AppViewer extends Component<AppViewerProps> {
         text: page.pageName,
         id: page.pageId,
         icon: "page-layout", //TODO: get the icon from page.
+        path: getApplicationViewerPageURL(
+          this.props.match.params.applicationId,
+          page.pageId,
+        ),
       }));
 
-    const currentPage =
-      this.props.pages &&
-      this.props.pages.find(
-        page => page.pageId === this.props.currentRoutePageId,
-      );
     return (
       <EditorContext.Provider
         value={{
@@ -141,47 +85,20 @@ class AppViewer extends Component<AppViewerProps> {
         <AppViewWrapper>
           <AppViewerHeader />
           <AppViewerBody>
-            {items && (
-              <SideNavWrapper>
-                <SideNav
-                  items={items}
-                  onSelect={this.handlePageSelect}
-                  iconSize={24}
-                  active={
-                    currentPage && {
-                      text: currentPage.pageName,
-                      id: currentPage.pageId,
-                    }
-                  }
-                />
-              </SideNavWrapper>
-            )}
-            {this.props.isFetching && (
-              <Centered>
-                <Spinner />
-              </Centered>
-            )}
-            {!this.props.isFetching && !this.props.dsl && items && (
-              <Centered>
-                <NonIdealState
-                  icon={
-                    <Icon
-                      iconSize={theme.fontSizes[9]}
-                      icon="page-layout"
-                      color={theme.colors.primary}
-                    />
-                  }
-                  title="This page seems to be blank"
-                  description={
-                    <p>
-                      Please add widgets to this page in the
-                      <Link to="/builder"> Appsmith Editor</Link>
-                    </p>
-                  }
-                />
-              </Centered>
-            )}
-            {this.props.dsl && <AppPage dsl={this.props.dsl} />}
+            <AppViewerSideNavWrapper>
+              <SideNav
+                items={items}
+                iconSize={24}
+                active={this.props.currentDSLPageId}
+              />
+            </AppViewerSideNavWrapper>
+            <Switch>
+              <Route
+                path={getApplicationViewerPageURL()}
+                exact
+                component={AppViewerPageContainer}
+              />
+            </Switch>
           </AppViewerBody>
         </AppViewWrapper>
       </EditorContext.Provider>
@@ -189,10 +106,8 @@ class AppViewer extends Component<AppViewerProps> {
   }
 }
 
-const mapStateToProps = (state: AppState, props: AppViewerProps) => ({
-  currentRoutePageId: getCurrentRoutePageId(state, props),
+const mapStateToProps = (state: AppState) => ({
   currentDSLPageId: getCurrentDSLPageId(state),
-  dsl: getCurrentPageLayoutDSL(state),
   pages: getPageList(state),
   isFetching: getIsFetchingPage(state),
 });
@@ -213,24 +128,13 @@ const mapDispatchToProps = (dispatch: any) => ({
         RenderModes.PAGE,
       ),
     ),
-  fetchPageWidgets: (pageId: string) => {
-    dispatch({
-      type: ReduxActionTypes.FETCH_PUBLISHED_PAGE_INIT,
-      payload: {
-        pageId,
-      },
-    });
-  },
-  initializeAppViewer: (pageId: string) =>
+  initializeAppViewer: (applicationId: string) =>
     dispatch({
       type: ReduxActionTypes.INITIALIZE_PAGE_VIEWER,
-      payload: { pageId },
+      payload: { applicationId },
     }),
 });
 
 export default withRouter(
-  connect(
-    mapStateToProps,
-    mapDispatchToProps,
-  )(AppViewer),
+  connect(mapStateToProps, mapDispatchToProps)(AppViewer),
 );
diff --git a/app/client/src/pages/AppViewer/viewer/AppViewerSideNavWrapper.tsx b/app/client/src/pages/AppViewer/viewer/AppViewerSideNavWrapper.tsx
new file mode 100644
index 0000000000..e1a67c07ee
--- /dev/null
+++ b/app/client/src/pages/AppViewer/viewer/AppViewerSideNavWrapper.tsx
@@ -0,0 +1,32 @@
+import styled from "styled-components";
+export default styled.div`
+  background: ${props => props.theme.colors.paneBG};
+  & button.sidenav-toggle,
+  & button.sidenav-toggle:hover,
+  & button.sidenav-toggle:active {
+    background: ${props => props.theme.colors.paneBG};
+    outline: none;
+    border: none;
+    border-radius: 0;
+  }
+  & ul {
+    background: ${props => props.theme.colors.paneBG};
+    color: ${props => props.theme.colors.textOnDarkBG};
+    padding: 0;
+    height: 100%;
+    width: 100%;
+    & li {
+      padding: 0;
+    }
+    & li div.bp3-menu-item {
+      width: 100%;
+      font-size: ${props => props.theme.fontSizes[3]}px;
+      &.bp3-intent-primary {
+        background: ${props => props.theme.sideNav.activeItemBGColor};
+      }
+      & div {
+        line-height: ${props => props.theme.lineHeights[6]}px;
+      }
+    }
+  }
+`;
diff --git a/app/client/src/pages/AppViewer/viewer/SideNav.tsx b/app/client/src/pages/AppViewer/viewer/SideNav.tsx
index 1b856639e1..dcc688b4fc 100644
--- a/app/client/src/pages/AppViewer/viewer/SideNav.tsx
+++ b/app/client/src/pages/AppViewer/viewer/SideNav.tsx
@@ -1,17 +1,25 @@
 import React, { useState } from "react";
 import styled from "styled-components";
-import { Menu, MenuItem, IconName, Button, Icon } from "@blueprintjs/core";
+import {
+  Menu,
+  MenuItem,
+  IconName,
+  Button,
+  Icon,
+  Classes,
+} from "@blueprintjs/core";
+import { Link } from "react-router-dom";
 
 export type SideNavItem = {
   id: string;
   icon?: string;
   text: string;
+  path: string;
 };
 
 type SideNavProps = {
-  items: SideNavItem[];
-  active?: SideNavItem;
-  onSelect: Function;
+  items?: SideNavItem[];
+  active?: string;
   headeroffset?: number;
   iconSize?: number;
 };
@@ -44,6 +52,7 @@ const SideNavWrapper = styled.div<{
           flex-grow: 0;
           display: inline;
           width: ${props => (props.open ? 100 : 0)}px;
+          color: ${props => props.theme.sideNav.fontColor};
         }
         & > span {
           margin-right: ${props => (props.open ? props.theme.spaces[3] : 0)}px;
@@ -70,23 +79,29 @@ const ToggleButton = styled(Button)<{
 
 export const SideNav = (props: SideNavProps) => {
   const [open, setopen] = useState(true);
-  const select = (item: SideNavItem) => () => {
-    props.onSelect(item);
-  };
-  const renderItems = (items: SideNavItem[]) => {
+  const renderItems = (sideNavItems?: SideNavItem[]) => {
+    let items = sideNavItems;
+    if (!items) {
+      items = [
+        { id: "0", text: "", path: "" },
+        { id: "1", text: "", path: "" },
+        { id: "2", text: "", path: "" },
+      ];
+    }
     return items.map(item => {
       const icon = (
         <Icon iconSize={props.iconSize} icon={item.icon as IconName} />
       );
       return (
-        <MenuItem
-          icon={icon}
-          active={props.active && item.id === props.active.id}
-          key={item.id}
-          onClick={select(item)}
-          text={open ? item.text : undefined}
-          tagName="div"
-        />
+        <Link to={item.path} key={item.id}>
+          <MenuItem
+            className={!sideNavItems ? Classes.SKELETON : undefined}
+            icon={icon}
+            active={props.active === item.id}
+            text={open ? item.text : undefined}
+            tagName="div"
+          />
+        </Link>
       );
     });
   };
diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx
index 615dd191c2..5195f769b6 100644
--- a/app/client/src/pages/Applications/ApplicationCard.tsx
+++ b/app/client/src/pages/Applications/ApplicationCard.tsx
@@ -1,5 +1,10 @@
 import React from "react";
 import styled from "styled-components";
+import { Link } from "react-router-dom";
+import {
+  getApplicationViewerPageURL,
+  BUILDER_PAGE_URL,
+} from "constants/routes";
 import { Card, Tooltip, Classes } from "@blueprintjs/core";
 import { ApplicationPayload } from "constants/ReduxActionConstants";
 import { BaseButton } from "components/designSystems/blueprint/ButtonComponent";
@@ -107,8 +112,9 @@ const Control = styled.button<{ fixed?: boolean }>`
 const APPLICATION_CONTROL_FONTSIZE_INDEX = 6;
 
 const viewControlIcon = ControlIcons.VIEW_CONTROL({
-  width: theme.fontSizes[APPLICATION_CONTROL_FONTSIZE_INDEX],
-  height: theme.fontSizes[APPLICATION_CONTROL_FONTSIZE_INDEX],
+  width: theme.fontSizes[APPLICATION_CONTROL_FONTSIZE_INDEX - 1],
+  height: theme.fontSizes[APPLICATION_CONTROL_FONTSIZE_INDEX - 1],
+  color: theme.colors.secondary,
 });
 
 type ApplicationCardProps = {
@@ -150,33 +156,49 @@ export const ApplicationCard = (props: ApplicationCardProps) => {
       intent: "danger",
     },
   ];
+  const viewApplicationURL = getApplicationViewerPageURL(
+    props.application.id,
+    props.application.defaultPageId,
+  );
+  const editApplicationURL = BUILDER_PAGE_URL(
+    props.application.id,
+    props.application.defaultPageId,
+  );
   return (
     <Wrapper key={props.application.id}>
       <ApplicationTitle
         className={props.loading ? Classes.SKELETON : undefined}
       >
         <span>{props.application.name}</span>
-        <Control className="control">
-          <Tooltip content="View Application" hoverOpenDelay={500}>
-            {viewControlIcon}
-          </Tooltip>
-        </Control>
+        <Link to={viewApplicationURL}>
+          <Control className="control">
+            <Tooltip content="View Application" hoverOpenDelay={500}>
+              {viewControlIcon}
+            </Tooltip>
+          </Control>
+        </Link>
         <ContextDropdown
           options={moreActionItems}
-          toggle={{ type: "icon", icon: "MORE_VERTICAL_CONTROL" }}
+          toggle={{
+            type: "icon",
+            icon: "MORE_VERTICAL_CONTROL",
+            iconSize: theme.fontSizes[APPLICATION_CONTROL_FONTSIZE_INDEX],
+          }}
           className="more"
         />
       </ApplicationTitle>
       <ApplicationImage className="image-container">
         <Control className="control">
-          <Tooltip content="Edit Application" hoverOpenDelay={500}>
-            <BaseButton
-              icon="edit"
-              text="Edit"
-              styleName="primary"
-              filled={true}
-            />
-          </Tooltip>
+          <Link to={editApplicationURL}>
+            <Tooltip content="Edit Application" hoverOpenDelay={500}>
+              <BaseButton
+                icon="edit"
+                text="Edit"
+                styleName="primary"
+                filled={true}
+              />
+            </Tooltip>
+          </Link>
         </Control>
       </ApplicationImage>
     </Wrapper>
diff --git a/app/client/src/pages/Applications/index.tsx b/app/client/src/pages/Applications/index.tsx
index 344d4aac4b..5251b271ad 100644
--- a/app/client/src/pages/Applications/index.tsx
+++ b/app/client/src/pages/Applications/index.tsx
@@ -1,7 +1,6 @@
 import React, { Component } from "react";
 import styled from "styled-components";
 import { connect } from "react-redux";
-import { withRouter } from "react-router";
 import { AppState } from "../../reducers";
 import {
   getApplicationList,
@@ -54,7 +53,6 @@ type ApplicationProps = {
   isCreatingApplication: boolean;
   isFetchingApplications: boolean;
   createApplicationError?: string;
-  history: any;
 };
 
 class Applications extends Component<ApplicationProps> {
@@ -86,16 +84,20 @@ class Applications extends Component<ApplicationProps> {
           />
           <SectionDivider />
           <ApplicationCardsWrapper>
-            {applicationList.map((application: ApplicationPayload) => (
-              <ApplicationCard
-                key={application.id}
-                loading={this.props.isFetchingApplications}
-                application={application}
-                share={noop}
-                duplicate={noop}
-                delete={noop}
-              />
-            ))}
+            {applicationList.map((application: ApplicationPayload) => {
+              return (
+                application.pageCount > 0 && (
+                  <ApplicationCard
+                    key={application.id}
+                    loading={this.props.isFetchingApplications}
+                    application={application}
+                    share={noop}
+                    duplicate={noop}
+                    delete={noop}
+                  />
+                )
+              );
+            })}
           </ApplicationCardsWrapper>
         </ApplicationsBody>
       </ApplicationsPageWrapper>
@@ -123,9 +125,4 @@ const mapDispatchToProps = (dispatch: any) => ({
   },
 });
 
-export default withRouter(
-  connect(
-    mapStateToProps,
-    mapDispatchToProps,
-  )(Applications),
-);
+export default connect(mapStateToProps, mapDispatchToProps)(Applications);
diff --git a/app/client/src/pages/Editor/ApiEditor.tsx b/app/client/src/pages/Editor/ApiEditor.tsx
index 0d0b5a516a..7fa4a52f37 100644
--- a/app/client/src/pages/Editor/ApiEditor.tsx
+++ b/app/client/src/pages/Editor/ApiEditor.tsx
@@ -35,7 +35,7 @@ interface ReduxActionProps {
 
 type Props = ReduxActionProps &
   ReduxStateProps &
-  RouteComponentProps<{ id: string }>;
+  RouteComponentProps<{ apiId: string; applicationId: string; pageId: string }>;
 
 const EmptyStateContainer = styled.div`
   display: flex;
@@ -47,21 +47,26 @@ const EmptyStateContainer = styled.div`
 
 class ApiEditor extends React.Component<Props> {
   componentDidMount(): void {
-    const currentId = this.props.match.params.id;
-    if (!currentId) return;
+    const currentApiId = this.props.match.params.apiId;
+    const currentApplicationId = this.props.match.params.applicationId;
+    const currentPageId = this.props.match.params.pageId;
+
+    if (!currentApiId) return;
     if (!this.props.actions.data.length) {
-      this.props.history.push(API_EDITOR_URL);
+      this.props.history.push(
+        API_EDITOR_URL(currentApplicationId, currentPageId),
+      );
       return;
     }
     const data = this.props.actions.data.filter(
-      action => action.id === currentId,
+      action => action.id === currentApiId,
     )[0];
     this.props.initialize(API_EDITOR_FORM_NAME, data);
   }
 
   componentDidUpdate(prevProps: Readonly<Props>): void {
-    const currentId = this.props.match.params.id;
-    if (currentId && currentId !== prevProps.match.params.id) {
+    const currentId = this.props.match.params.apiId;
+    if (currentId && currentId !== prevProps.match.params.apiId) {
       const data = this.props.actions.data.filter(
         action => action.id === currentId,
       )[0];
@@ -90,7 +95,7 @@ class ApiEditor extends React.Component<Props> {
     this.props.submitForm(API_EDITOR_FORM_NAME);
   };
   handleDeleteClick = () => {
-    this.props.deleteAction(this.props.match.params.id);
+    this.props.deleteAction(this.props.match.params.apiId);
   };
   handleRunClick = () => {
     this.props.runAction();
@@ -100,12 +105,12 @@ class ApiEditor extends React.Component<Props> {
     const {
       apiPane: { isSaving, isRunning, isDeleting },
       match: {
-        params: { id },
+        params: { apiId },
       },
     } = this.props;
     return (
       <React.Fragment>
-        {id ? (
+        {apiId ? (
           <ApiEditorForm
             isSaving={isSaving}
             isRunning={isRunning}
@@ -142,7 +147,4 @@ const mapDispatchToProps = (dispatch: any): ReduxActionProps => ({
   destroy: (formName: string) => dispatch(destroy(formName)),
 });
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps,
-)(ApiEditor);
+export default connect(mapStateToProps, mapDispatchToProps)(ApiEditor);
diff --git a/app/client/src/pages/Editor/ApiSidebar.tsx b/app/client/src/pages/Editor/ApiSidebar.tsx
index a51ca7e8e6..d53de18515 100644
--- a/app/client/src/pages/Editor/ApiSidebar.tsx
+++ b/app/client/src/pages/Editor/ApiSidebar.tsx
@@ -4,7 +4,11 @@ import { RouteComponentProps } from "react-router";
 import styled from "styled-components";
 import { AppState } from "../../reducers";
 import { ActionDataState } from "../../reducers/entityReducers/actionsReducer";
-import { API_EDITOR_ID_URL, API_EDITOR_URL } from "../../constants/routes";
+import {
+  API_EDITOR_ID_URL,
+  API_EDITOR_URL,
+  APIEditorRouteParams,
+} from "../../constants/routes";
 import { BaseButton } from "../../components/designSystems/blueprint/ButtonComponent";
 import { FormIcons } from "../../icons/FormIcons";
 import { Spinner } from "@blueprintjs/core";
@@ -12,6 +16,7 @@ import { ApiPaneReduxState } from "../../reducers/uiReducers/apiPaneReducer";
 import { BaseTextInput } from "../../components/designSystems/appsmith/TextInputComponent";
 import { TICK } from "@blueprintjs/icons/lib/esm/generated/iconNames";
 import { createActionRequest } from "../../actions/actionActions";
+import { RestAction } from "api/ActionAPI";
 import Fuse from "fuse.js";
 
 const LoadingContainer = styled.div`
@@ -134,7 +139,7 @@ interface ReduxDispatchProps {
 
 type Props = ReduxStateProps &
   ReduxDispatchProps &
-  RouteComponentProps<{ id: string }>;
+  RouteComponentProps<APIEditorRouteParams>;
 type State = {
   isCreating: boolean;
   name: string;
@@ -160,7 +165,7 @@ class ApiSidebar extends React.Component<Props, State> {
   }
 
   componentDidUpdate(prevProps: Readonly<Props>): void {
-    if (!prevProps.match.params.id && this.props.match.params.id) {
+    if (!prevProps.match.params.apiId && this.props.match.params.apiId) {
       this.setState({
         isCreating: false,
         name: "",
@@ -170,7 +175,9 @@ class ApiSidebar extends React.Component<Props, State> {
 
   handleCreateNew = () => {
     const { history } = this.props;
-    history.push(API_EDITOR_URL);
+    const { pageId, applicationId } = this.props.match.params;
+
+    history.push(API_EDITOR_URL(applicationId, pageId));
     this.setState({
       isCreating: true,
       name: "",
@@ -202,6 +209,7 @@ class ApiSidebar extends React.Component<Props, State> {
   };
 
   render() {
+    const { applicationId, pageId } = this.props.match.params;
     const {
       apiPane,
       history,
@@ -209,9 +217,9 @@ class ApiSidebar extends React.Component<Props, State> {
       actions: { data },
     } = this.props;
     const { isCreating, search, name } = this.state;
-    const activeActionId = match.params.id;
+    const activeActionId = match.params.apiId;
     const fuse = new Fuse(data, fuseOptions);
-    const actions = search ? fuse.search(search) : data;
+    const actions: RestAction[] = search ? fuse.search(search) : data;
     return (
       <React.Fragment>
         {apiPane.isFetching ? (
@@ -232,7 +240,11 @@ class ApiSidebar extends React.Component<Props, State> {
               {actions.map(action => (
                 <ApiItem
                   key={action.id}
-                  onClick={() => history.push(API_EDITOR_ID_URL(action.id))}
+                  onClick={() =>
+                    history.push(
+                      API_EDITOR_ID_URL(applicationId, pageId, action.id),
+                    )
+                  }
                   isSelected={activeActionId === action.id}
                 >
                   {action.actionConfiguration ? (
@@ -291,7 +303,4 @@ const mapDispatchToProps = (dispatch: Function): ReduxDispatchProps => ({
   createAction: (name: string) => dispatch(createActionRequest({ name })),
 });
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps,
-)(ApiSidebar);
+export default connect(mapStateToProps, mapDispatchToProps)(ApiSidebar);
diff --git a/app/client/src/pages/Editor/EditorHeader.tsx b/app/client/src/pages/Editor/EditorHeader.tsx
index 832e00f87e..cffb106c9b 100644
--- a/app/client/src/pages/Editor/EditorHeader.tsx
+++ b/app/client/src/pages/Editor/EditorHeader.tsx
@@ -39,11 +39,11 @@ const StretchedBreadCrumb = styled(Breadcrumbs)`
 
 type EditorHeaderProps = {
   isSaving?: boolean;
-  pageName: string;
+  pageName?: string;
   onPublish: React.FormEventHandler;
   onCreatePage: (name: string) => void;
   pages?: PageListPayload;
-  currentPageId: string;
+  currentPageId?: string;
   switchToPage: (selectedPage: string) => void;
   isPublishing: boolean;
 };
diff --git a/app/client/src/pages/Editor/PropertyPane.tsx b/app/client/src/pages/Editor/PropertyPane.tsx
index bb532ed338..4aea40e0c5 100644
--- a/app/client/src/pages/Editor/PropertyPane.tsx
+++ b/app/client/src/pages/Editor/PropertyPane.tsx
@@ -197,7 +197,4 @@ export interface PropertyPaneFunctions {
   hidePropertyPane: () => void;
 }
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps,
-)(PropertyPane);
+export default connect(mapStateToProps, mapDispatchToProps)(PropertyPane);
diff --git a/app/client/src/pages/Editor/Sidebar.tsx b/app/client/src/pages/Editor/Sidebar.tsx
index 9e3d0df07d..91128a02a9 100644
--- a/app/client/src/pages/Editor/Sidebar.tsx
+++ b/app/client/src/pages/Editor/Sidebar.tsx
@@ -1,8 +1,9 @@
 import React from "react";
+import { useParams } from "react-router-dom";
 import styled from "styled-components";
 import SidebarComponent from "../../components/editorComponents/Sidebar";
 import NavBarItem from "../../components/editorComponents/NavBarItem";
-import { EDITOR_ROUTES } from "../../constants/routes";
+import { EDITOR_ROUTES, BuilderRouteParams } from "../../constants/routes";
 
 const Wrapper = styled.div`
   display: grid;
@@ -23,11 +24,16 @@ const EditorSidebar = styled(SidebarComponent)`
 `;
 
 const Sidebar = () => {
+  const params = useParams<BuilderRouteParams>();
   return (
     <Wrapper>
       <NavBar>
         {EDITOR_ROUTES.map(config => (
-          <NavBarItem key={config.path} {...config} />
+          <NavBarItem
+            key={config.title}
+            {...config}
+            path={config.path(params.applicationId, params.pageId)}
+          />
         ))}
       </NavBar>
       <EditorSidebar />
diff --git a/app/client/src/pages/Editor/WidgetsEditor.tsx b/app/client/src/pages/Editor/WidgetsEditor.tsx
index 8cba7d25d5..48d8792110 100644
--- a/app/client/src/pages/Editor/WidgetsEditor.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor.tsx
@@ -1,16 +1,23 @@
-import React from "react";
+import React, { useEffect, ReactNode } from "react";
 import { connect } from "react-redux";
+import { useParams } from "react-router-dom";
 import styled from "styled-components";
 import Canvas from "./Canvas";
 import PropertyPane from "./PropertyPane";
 import { AppState } from "../../reducers";
 import { WidgetProps } from "../../widgets/BaseWidget";
 import { savePage } from "../../actions/pageActions";
-import { getDenormalizedDSL } from "../../selectors/editorSelectors";
+import {
+  getDenormalizedDSL,
+  getIsFetchingPage,
+  getCurrentPageId,
+} from "selectors/editorSelectors";
 import { ContainerWidgetProps } from "../../widgets/ContainerWidget";
 import { ReduxActionTypes } from "../../constants/ReduxActionConstants";
-
+import { BuilderRouteParams } from "constants/routes";
+import Centered from "components/designSystems/appsmith/CenteredWrapper";
 import EditorContextProvider from "components/editorComponents/EditorContextProvider";
+import { Spinner } from "@blueprintjs/core";
 
 const EditorWrapper = styled.div`
   display: flex;
@@ -38,31 +45,56 @@ const CanvasContainer = styled.section`
 `;
 
 type EditorProps = {
-  dsl: ContainerWidgetProps<WidgetProps> | any;
+  dsl?: ContainerWidgetProps<WidgetProps>;
   savePageLayout: Function;
   showPropertyPane: (
     widgetId?: string,
     node?: HTMLDivElement,
     toggle?: boolean,
   ) => void;
+  fetchPage: (pageId: string) => void;
+  currentPageId?: string;
+  isFetchingPage: boolean;
 };
 
-const WidgetsEditor = (props: EditorProps) => (
-  <EditorContextProvider>
-    <EditorWrapper>
-      <CanvasContainer>
-        {props.dsl && (
-          <Canvas dsl={props.dsl} showPropertyPane={props.showPropertyPane} />
-        )}
-      </CanvasContainer>
-      <PropertyPane />
-    </EditorWrapper>
-  </EditorContextProvider>
-);
+const WidgetsEditor = (props: EditorProps) => {
+  const params = useParams<BuilderRouteParams>();
+  const { pageId } = params;
+
+  /* eslint-disable react-hooks/exhaustive-deps */
+  useEffect(() => {
+    if (pageId !== props.currentPageId) {
+      props.fetchPage(pageId);
+    }
+  }, [pageId]);
+
+  const pageLoading = (
+    <Centered>
+      <Spinner />
+    </Centered>
+  );
+  let node: ReactNode;
+  if (props.isFetchingPage) {
+    node = pageLoading;
+  }
+  if (!props.isFetchingPage && props.dsl) {
+    node = <Canvas dsl={props.dsl} showPropertyPane={props.showPropertyPane} />;
+  }
+  return (
+    <EditorContextProvider>
+      <EditorWrapper>
+        <CanvasContainer>{node}</CanvasContainer>
+        <PropertyPane />
+      </EditorWrapper>
+    </EditorContextProvider>
+  );
+};
 
 const mapStateToProps = (state: AppState) => {
   return {
     dsl: getDenormalizedDSL(state),
+    isFetchingPage: getIsFetchingPage(state),
+    currentPageId: getCurrentPageId(state),
   };
 };
 
@@ -83,10 +115,12 @@ const mapDispatchToProps = (dispatch: any) => {
         payload: { widgetId, node, toggle },
       });
     },
+    fetchPage: (pageId: string) =>
+      dispatch({
+        type: ReduxActionTypes.FETCH_PAGE_INIT,
+        payload: { pageId },
+      }),
   };
 };
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps,
-)(WidgetsEditor);
+export default connect(mapStateToProps, mapDispatchToProps)(WidgetsEditor);
diff --git a/app/client/src/pages/Editor/index.tsx b/app/client/src/pages/Editor/index.tsx
index 1f9585bac1..c4b850347e 100644
--- a/app/client/src/pages/Editor/index.tsx
+++ b/app/client/src/pages/Editor/index.tsx
@@ -1,5 +1,12 @@
 import React, { Component } from "react";
 import { connect } from "react-redux";
+import { Redirect } from "react-router-dom";
+import { withRouter, RouteComponentProps } from "react-router-dom";
+import {
+  BuilderRouteParams,
+  getApplicationViewerPageURL,
+  BUILDER_PAGE_URL,
+} from "constants/routes";
 import { AppState } from "../../reducers";
 import EditorHeader from "./EditorHeader";
 import MainContainer from "./MainContainer";
@@ -11,20 +18,23 @@ import {
   getIsPublishingApplication,
   getPublishingError,
   getIsPageSaving,
-} from "../../selectors/editorSelectors";
+  getIsEditorLoading,
+  getLoadingError,
+  getPublishedTime,
+} from "selectors/editorSelectors";
 import {
   ReduxActionTypes,
   PageListPayload,
-} from "../../constants/ReduxActionConstants";
+} from "constants/ReduxActionConstants";
 import { Dialog, Classes, AnchorButton } from "@blueprintjs/core";
-import { initEditor } from "../../actions/initActions";
+import { initEditor } from "actions/initActions";
 
 type EditorProps = {
-  currentPageName: string;
+  currentPageName?: string;
   isSaving: boolean;
   currentApplicationId?: string;
-  currentLayoutId: string;
-  currentPageId: string;
+  currentLayoutId?: string;
+  currentPageId?: string;
   publishApplication: Function;
   previewPage: Function;
   initEditor: Function;
@@ -32,8 +42,12 @@ type EditorProps = {
   pages: PageListPayload;
   switchPage: (pageId: string) => void;
   isPublishing: boolean;
+  isEditorLoading: boolean;
+  editorLoadingError: boolean;
   errorPublishing: boolean;
-};
+  publishedTime: string | boolean;
+  isPageSwitching: boolean;
+} & RouteComponentProps<BuilderRouteParams>;
 
 class Editor extends Component<EditorProps> {
   public state = {
@@ -41,20 +55,37 @@ class Editor extends Component<EditorProps> {
   };
 
   componentDidMount() {
-    this.props.initEditor();
-  }
-  componentDidUpdate(currently: EditorProps) {
-    const previously = this.props;
-    if (
-      !currently.isPublishing &&
-      previously.isPublishing &&
-      !currently.errorPublishing
-    ) {
-      this.setState({
-        isDialogOpen: true,
-      });
+    if (this.props.match.params.applicationId) {
+      this.props.initEditor(this.props.match.params.applicationId);
     }
   }
+  componentDidUpdate(previously: EditorProps) {
+    // const currently = this.props;
+    // if (currently.publishedTime !== previously.publishedTime) {
+    //   this.setState({
+    //     isDialogOpen: true,
+    //   });
+    // }
+    // if (
+    //   currently.currentPageId &&
+    //   previously.currentPageId !== currently.currentPageId &&
+    //   currently.currentApplicationId
+    // ) {
+    //   this.props.history.replace(
+    //     BUILDER_PAGE_URL(
+    //       currently.currentApplicationId,
+    //       currently.currentPageId,
+    //     ),
+    //   );
+    // }
+    // if (
+    //   previously.match.params.pageId !== currently.match.params.pageId &&
+    //   currently.currentPageId !== currently.match.params.pageId
+    // ) {
+    //   this.props.switchPage(currently.match.params.pageId);
+    // }
+  }
+
   handleDialogClose = () => {
     this.setState({
       isDialogOpen: false,
@@ -68,7 +99,17 @@ class Editor extends Component<EditorProps> {
   handleCreatePage = (pageName: string) => {
     this.props.createPage(this.props.currentApplicationId, pageName);
   };
+  redirectToPage = (pageId: string) => {
+    if (this.props.currentApplicationId) {
+      this.props.history.push(
+        BUILDER_PAGE_URL(this.props.currentApplicationId, pageId),
+      );
+    }
+  };
   public render() {
+    if (!this.props.match.params.applicationId) {
+      return <Redirect to="/applications" />;
+    }
     return (
       <div>
         <EditorHeader
@@ -78,7 +119,7 @@ class Editor extends Component<EditorProps> {
           onCreatePage={this.handleCreatePage}
           pages={this.props.pages}
           currentPageId={this.props.currentPageId}
-          switchToPage={this.props.switchPage}
+          switchToPage={this.redirectToPage}
           isPublishing={this.props.isPublishing}
         />
         <MainContainer />
@@ -101,7 +142,10 @@ class Editor extends Component<EditorProps> {
             <div className={Classes.DIALOG_FOOTER_ACTIONS}>
               <AnchorButton
                 target="_blank"
-                href={`/view/pages/${this.props.currentPageId}`}
+                href={getApplicationViewerPageURL(
+                  this.props.currentApplicationId,
+                  this.props.currentPageId,
+                )}
                 text="View Application"
               />
             </div>
@@ -121,11 +165,14 @@ const mapStateToProps = (state: AppState) => ({
   pages: getPageList(state),
   errorPublishing: getPublishingError(state),
   isPublishing: getIsPublishingApplication(state),
+  isEditorLoading: getIsEditorLoading(state),
+  editorLoadingError: getLoadingError(state),
+  publishedTime: getPublishedTime(state),
 });
 
 const mapDispatchToProps = (dispatch: any) => {
   return {
-    initEditor: () => dispatch(initEditor()),
+    initEditor: (applicationId: string) => dispatch(initEditor(applicationId)),
     publishApplication: (applicationId: string) => {
       dispatch({
         type: ReduxActionTypes.PUBLISH_APPLICATION_INIT,
@@ -154,7 +201,7 @@ const mapDispatchToProps = (dispatch: any) => {
     },
     switchPage: (pageId: string) => {
       dispatch({
-        type: ReduxActionTypes.FETCH_PAGE,
+        type: ReduxActionTypes.FETCH_PAGE_INIT,
         payload: {
           pageId,
         },
@@ -163,7 +210,4 @@ const mapDispatchToProps = (dispatch: any) => {
   };
 };
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps,
-)(Editor);
+export default withRouter(connect(mapStateToProps, mapDispatchToProps)(Editor));
diff --git a/app/client/src/pages/Editor/routes.tsx b/app/client/src/pages/Editor/routes.tsx
index 5d30fa1130..22cbb925c8 100644
--- a/app/client/src/pages/Editor/routes.tsx
+++ b/app/client/src/pages/Editor/routes.tsx
@@ -9,7 +9,10 @@ import ApiEditor from "./ApiEditor";
 import {
   API_EDITOR_ID_URL,
   API_EDITOR_URL,
-  BUILDER_URL,
+  BUILDER_PAGE_URL,
+  BUILDER_BASE_URL,
+  BuilderRouteParams,
+  APIEditorRouteParams,
 } from "../../constants/routes";
 import styled from "styled-components";
 
@@ -39,27 +42,39 @@ interface RouterState {
   isVisible: boolean;
 }
 
-class EditorsRouter extends React.Component<RouteComponentProps, RouterState> {
-  constructor(props: RouteComponentProps) {
+class EditorsRouter extends React.Component<
+  RouteComponentProps<BuilderRouteParams>,
+  RouterState
+> {
+  constructor(props: RouteComponentProps<APIEditorRouteParams>) {
     super(props);
+    const { applicationId, pageId } = this.props.match.params;
     this.state = {
-      isVisible: this.props.location.pathname !== BUILDER_URL,
+      isVisible:
+        this.props.location.pathname !== BUILDER_BASE_URL(applicationId) &&
+        this.props.location.pathname !==
+          BUILDER_PAGE_URL(applicationId, pageId),
     };
   }
   componentDidUpdate(prevProps: Readonly<RouteComponentProps>): void {
     if (this.props.location.pathname !== prevProps.location.pathname) {
+      const { applicationId, pageId } = this.props.match.params;
       this.setState({
-        isVisible: this.props.location.pathname !== BUILDER_URL,
+        isVisible:
+          this.props.location.pathname !== BUILDER_BASE_URL(applicationId) &&
+          this.props.location.pathname !==
+            BUILDER_PAGE_URL(applicationId, pageId),
       });
     }
   }
 
   handleClose = (e: React.MouseEvent) => {
     e.stopPropagation();
+    const { applicationId, pageId } = this.props.match.params;
     this.setState({
       isVisible: false,
     });
-    this.props.history.replace(BUILDER_URL);
+    this.props.history.replace(BUILDER_PAGE_URL(applicationId, pageId));
   };
 
   preventClose = (e: React.MouseEvent) => {
@@ -74,8 +89,8 @@ class EditorsRouter extends React.Component<RouteComponentProps, RouterState> {
           onClick={this.preventClose}
         >
           <Switch>
-            <Route exact path={API_EDITOR_URL} component={ApiEditor} />
-            <Route path={API_EDITOR_ID_URL()} component={ApiEditor} />
+            <Route exact path={API_EDITOR_URL()} component={ApiEditor} />
+            <Route exact path={API_EDITOR_ID_URL()} component={ApiEditor} />
           </Switch>
         </DrawerWrapper>
       </Wrapper>
diff --git a/app/client/src/pages/common/PageNotFound.tsx b/app/client/src/pages/common/PageNotFound.tsx
index 2401fff88d..d6ff1b6453 100644
--- a/app/client/src/pages/common/PageNotFound.tsx
+++ b/app/client/src/pages/common/PageNotFound.tsx
@@ -1,18 +1,32 @@
-import * as React from "react";
-
+import React from "react";
+import styled from "styled-components";
 import { NonIdealState, Button, Card, Elevation } from "@blueprintjs/core";
 import { RouterProps } from "react-router";
 
+const NotFoundPageWrapper = styled.div`
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+`;
+const Title = styled.div`
+  font-size: ${props => props.theme.fontSizes[10]}px;
+  text-align: center;
+`;
 class PageNotFound extends React.PureComponent<RouterProps> {
   public render() {
     return (
-      <div style={{ textAlign: "center" }}>
+      <NotFoundPageWrapper>
         <Card elevation={Elevation.TWO}>
+          <Title>
+            <span role="img" aria-label="Page Not Found">
+              🙊
+            </span>
+          </Title>
           <NonIdealState
-            icon={"search"}
-            title="Page not found"
             description={
-              "The page you were looking for does not appear to exist"
+              "We didn't mean for you to reach this page. Let's find your way back to building awesome applications."
             }
             action={
               <Button
@@ -25,7 +39,7 @@ class PageNotFound extends React.PureComponent<RouterProps> {
             }
           />
         </Card>
-      </div>
+      </NotFoundPageWrapper>
     );
   }
 }
diff --git a/app/client/src/pages/common/ProtectedRoute.tsx b/app/client/src/pages/common/ProtectedRoute.tsx
index f35dcfcc1f..8c07524ddf 100644
--- a/app/client/src/pages/common/ProtectedRoute.tsx
+++ b/app/client/src/pages/common/ProtectedRoute.tsx
@@ -10,6 +10,7 @@ const ProtectedRoute = ({
 }: {
   path: string;
   component: React.ReactType;
+  exact?: boolean;
 }) => {
   return (
     <Route
diff --git a/app/client/src/reducers/entityReducers/index.tsx b/app/client/src/reducers/entityReducers/index.tsx
index d74c908e30..9e1a3a74b7 100644
--- a/app/client/src/reducers/entityReducers/index.tsx
+++ b/app/client/src/reducers/entityReducers/index.tsx
@@ -7,6 +7,7 @@ import actionsReducer from "./actionsReducer";
 import propertyPaneConfigReducer from "./propertyPaneConfigReducer";
 import datasourceReducer from "./datasourceReducer";
 import bindingsReducer from "./bindingsReducer";
+import pageListReducer from "./pageListReducer";
 
 const entityReducer = combineReducers({
   canvasWidgets: canvasWidgetsReducer,
@@ -17,5 +18,7 @@ const entityReducer = combineReducers({
   propertyConfig: propertyPaneConfigReducer,
   datasources: datasourceReducer,
   nameBindings: bindingsReducer,
+  pageList: pageListReducer,
 });
+
 export default entityReducer;
diff --git a/app/client/src/reducers/entityReducers/pageListReducer.tsx b/app/client/src/reducers/entityReducers/pageListReducer.tsx
new file mode 100644
index 0000000000..d749fa46f1
--- /dev/null
+++ b/app/client/src/reducers/entityReducers/pageListReducer.tsx
@@ -0,0 +1,36 @@
+import { createReducer } from "utils/AppsmithUtils";
+import {
+  ReduxAction,
+  ReduxActionTypes,
+  PageListPayload,
+} from "constants/ReduxActionConstants";
+
+const initialState: PageListReduxState = {
+  pages: [],
+};
+
+const pageListReducer = createReducer(initialState, {
+  [ReduxActionTypes.FETCH_PAGE_LIST_SUCCESS]: (
+    state: PageListReduxState,
+    action: ReduxAction<{ pages: PageListPayload; applicationId: string }>,
+  ) => {
+    return {
+      ...state,
+      ...action.payload,
+    };
+  },
+  [ReduxActionTypes.CREATE_PAGE_SUCCESS]: (
+    state: PageListReduxState,
+    action: ReduxAction<{ pageName: string; pageId: string; layoutId: string }>,
+  ) => {
+    state.pages.push(action.payload);
+    return { ...state };
+  },
+});
+
+export interface PageListReduxState {
+  pages: PageListPayload;
+  applicationId?: string;
+}
+
+export default pageListReducer;
diff --git a/app/client/src/reducers/index.tsx b/app/client/src/reducers/index.tsx
index 23c07c08bd..93648193fc 100644
--- a/app/client/src/reducers/index.tsx
+++ b/app/client/src/reducers/index.tsx
@@ -16,6 +16,7 @@ import { DatasourceDataState } from "./entityReducers/datasourceReducer";
 import { AppViewReduxState } from "./uiReducers/appViewReducer";
 import { ApplicationsReduxState } from "./uiReducers/applicationsReducer";
 import { BindingsDataState } from "./entityReducers/bindingsReducer";
+import { PageListReduxState } from "./entityReducers/pageListReducer";
 import { ApiPaneReduxState } from "./uiReducers/apiPaneReducer";
 
 const appReducer = combineReducers({
@@ -45,6 +46,7 @@ export interface AppState {
     widgetConfig: WidgetConfigReducerState;
     datasources: DatasourceDataState;
     nameBindings: BindingsDataState;
+    pageList: PageListReduxState;
   };
 }
 
diff --git a/app/client/src/reducers/uiReducers/appViewReducer.tsx b/app/client/src/reducers/uiReducers/appViewReducer.tsx
index 76306d1785..20305b6a1b 100644
--- a/app/client/src/reducers/uiReducers/appViewReducer.tsx
+++ b/app/client/src/reducers/uiReducers/appViewReducer.tsx
@@ -9,16 +9,14 @@ import {
 
 const initialState: AppViewReduxState = {
   isFetchingPage: false,
+  loading: false,
   pages: [],
   pageWidgetId: "0",
 };
 
 const appViewReducer = createReducer(initialState, {
-  [ReduxActionTypes.FETCH_PAGE_LIST_SUCCESS]: (
-    state: AppViewReduxState,
-    action: ReduxAction<PageListPayload>,
-  ) => {
-    return { ...state, pages: action.payload };
+  [ReduxActionTypes.INITIALIZE_PAGE_VIEWER]: (state: AppViewReduxState) => {
+    return { ...state, loading: true };
   },
   [ReduxActionTypes.FETCH_PUBLISHED_PAGE_INIT]: (state: AppViewReduxState) => {
     return { ...state, dsl: undefined, isFetchingPage: true };
@@ -30,16 +28,13 @@ const appViewReducer = createReducer(initialState, {
     state: AppViewReduxState,
     action: ReduxAction<{
       pageId: string;
-      layoutId: string;
       dsl: ContainerWidgetProps<WidgetProps>;
       pageWidgetId: string;
     }>,
   ) => {
     return {
-      pages: state.pages,
       dsl: action.payload.dsl,
       currentPageId: action.payload.pageId,
-      currentLayoutId: action.payload.layoutId,
       isFetchingPage: false,
       pageWidgetId: action.payload.pageWidgetId,
     };
@@ -50,6 +45,7 @@ export interface AppViewReduxState {
   dsl?: ContainerWidgetProps<WidgetProps>;
   isFetchingPage: boolean;
   currentPageId?: string;
+  loading: boolean;
   currentLayoutId?: string;
   pages: PageListPayload;
   pageWidgetId: string;
diff --git a/app/client/src/reducers/uiReducers/editorReducer.tsx b/app/client/src/reducers/uiReducers/editorReducer.tsx
index 56a667878e..0f34cf1364 100644
--- a/app/client/src/reducers/uiReducers/editorReducer.tsx
+++ b/app/client/src/reducers/uiReducers/editorReducer.tsx
@@ -1,28 +1,69 @@
 import { createReducer } from "../../utils/AppsmithUtils";
-import { getEditorConfigs } from "../../constants/ApiConstants";
-import { ReduxActionTypes } from "../../constants/ReduxActionConstants";
+import {
+  ReduxActionTypes,
+  ReduxActionErrorTypes,
+} from "../../constants/ReduxActionConstants";
 import { WidgetProps } from "../../widgets/BaseWidget";
 import { ContainerWidgetProps } from "../../widgets/ContainerWidget";
+import moment from "moment";
 import {
   ReduxAction,
   UpdateCanvasPayload,
-  PageListPayload,
-} from "../../constants/ReduxActionConstants";
+} from "constants/ReduxActionConstants";
 
-const editorConfigs = getEditorConfigs();
 const initialState: EditorReduxState = {
-  pageWidgetId: "0",
-  ...editorConfigs,
-  pages: [],
   loadingStates: {
     publishing: false,
     publishingError: false,
+    published: false,
     saving: false,
     savingError: false,
+    loading: false,
+    loadingError: false,
+    pageSwitchingError: false,
+    isPageSwitching: false,
   },
 };
 
 const editorReducer = createReducer(initialState, {
+  [ReduxActionTypes.FETCH_PAGE_INIT]: (state: EditorReduxState) => ({
+    ...state,
+    loadingStates: {
+      ...state.loadingStates,
+      isPageSwitching: true,
+    },
+  }),
+  [ReduxActionTypes.FETCH_PAGE_SUCCESS]: (state: EditorReduxState) => ({
+    ...state,
+    loadingStates: {
+      ...state.loadingStates,
+      isPageSwitching: false,
+    },
+  }),
+  [ReduxActionErrorTypes.FETCH_PAGE_ERROR]: (state: EditorReduxState) => ({
+    ...state,
+    loadingStates: {
+      ...state.loadingStates,
+      isPageSwitching: false,
+    },
+  }),
+  [ReduxActionTypes.INIT_EDITOR]: (state: EditorReduxState) => {
+    state.loadingStates.loading = true;
+    state.loadingStates.loadingError = false;
+    return { ...state };
+  },
+  [ReduxActionTypes.INIT_EDITOR_SUCCESS]: (state: EditorReduxState) => {
+    state.loadingStates.loading = false;
+    state.loadingStates.loadingError = false;
+    return { ...state };
+  },
+  [ReduxActionErrorTypes.INITIALIZE_EDITOR_ERROR]: (
+    state: EditorReduxState,
+  ) => {
+    state.loadingStates.loading = false;
+    state.loadingStates.loadingError = true;
+    return { ...state };
+  },
   [ReduxActionTypes.PUBLISH_APPLICATION_INIT]: (state: EditorReduxState) => {
     state.loadingStates.publishing = true;
     state.loadingStates.publishingError = false;
@@ -36,19 +77,7 @@ const editorReducer = createReducer(initialState, {
   [ReduxActionTypes.PUBLISH_APPLICATION_SUCCESS]: (state: EditorReduxState) => {
     state.loadingStates.publishing = false;
     state.loadingStates.publishingError = false;
-    return { ...state };
-  },
-  [ReduxActionTypes.FETCH_PAGE_LIST_SUCCESS]: (
-    state: EditorReduxState,
-    action: ReduxAction<PageListPayload>,
-  ) => {
-    return { ...state, pages: action.payload };
-  },
-  [ReduxActionTypes.CREATE_PAGE_SUCCESS]: (
-    state: EditorReduxState,
-    action: ReduxAction<{ pageName: string; pageId: string; layoutId: string }>,
-  ) => {
-    state.pages.push(action.payload);
+    state.loadingStates.published = moment().format();
     return { ...state };
   },
   [ReduxActionTypes.SAVE_PAGE_INIT]: (state: EditorReduxState) => {
@@ -86,18 +115,20 @@ const editorReducer = createReducer(initialState, {
 
 export interface EditorReduxState {
   dsl?: ContainerWidgetProps<WidgetProps>;
-  pageWidgetId: string;
-  currentPageId: string;
-  currentLayoutId: string;
-  currentPageName: string;
-  propertyPaneConfigsId: string;
-  currentApplicationId?: string;
-  pages: PageListPayload;
+  pageWidgetId?: string;
+  currentPageId?: string;
+  currentLayoutId?: string;
+  currentPageName?: string;
   loadingStates: {
     saving: boolean;
     savingError: boolean;
     publishing: boolean;
+    published: string | boolean;
     publishingError: boolean;
+    loading: boolean;
+    loadingError: boolean;
+    isPageSwitching: boolean;
+    pageSwitchingError: boolean;
   };
 }
 
diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts
index 4459f8ff4e..d76ab909f9 100644
--- a/app/client/src/sagas/ActionSagas.ts
+++ b/app/client/src/sagas/ActionSagas.ts
@@ -237,9 +237,7 @@ export function* createActionSaga(actionPayload: ReduxAction<RestAction>) {
 
 export function* fetchActionsSaga() {
   try {
-    const response: GenericApiResponse<
-      RestAction[]
-    > = yield ActionAPI.fetchActions();
+    const response: GenericApiResponse<RestAction[]> = yield ActionAPI.fetchActions();
     const isValidResponse = yield validateResponse(response);
     if (isValidResponse) {
       yield put({
@@ -281,9 +279,9 @@ export function* updateActionSaga(
 export function* deleteActionSaga(actionPayload: ReduxAction<{ id: string }>) {
   try {
     const id = actionPayload.payload.id;
-    const response: GenericApiResponse<
-      RestAction
-    > = yield ActionAPI.deleteAction(id);
+    const response: GenericApiResponse<RestAction> = yield ActionAPI.deleteAction(
+      id,
+    );
     const isValidResponse = yield validateResponse(response);
     if (isValidResponse) {
       AppToaster.show({
diff --git a/app/client/src/sagas/ApplicationSagas.tsx b/app/client/src/sagas/ApplicationSagas.tsx
index 60e81ae6ac..749fc0f6b4 100644
--- a/app/client/src/sagas/ApplicationSagas.tsx
+++ b/app/client/src/sagas/ApplicationSagas.tsx
@@ -3,15 +3,17 @@ import {
   ReduxActionErrorTypes,
   ReduxAction,
   ApplicationPayload,
-} from "../constants/ReduxActionConstants";
+} from "constants/ReduxActionConstants";
 import ApplicationApi, {
   PublishApplicationResponse,
   PublishApplicationRequest,
   FetchApplicationsResponse,
   CreateApplicationRequest,
   CreateApplicationResponse,
+  ApplicationResponsePayload,
   ApplicationPagePayload,
-} from "../api/ApplicationApi";
+} from "api/ApplicationApi";
+import { getDefaultPageId } from "./SagaUtils";
 import { call, put, takeLatest, all, select } from "redux-saga/effects";
 
 import { validateResponse } from "./ErrorSagas";
@@ -42,19 +44,6 @@ export function* publishApplicationSaga(
   }
 }
 
-const getDefaultPageId = (
-  pages?: ApplicationPagePayload[],
-): string | undefined => {
-  let defaultPage: ApplicationPagePayload | undefined = undefined;
-  if (pages) {
-    pages.find(page => page.isDefault);
-    if (!defaultPage) {
-      defaultPage = pages[0];
-    }
-  }
-  return defaultPage ? defaultPage.id : undefined;
-};
-
 export function* fetchApplicationListSaga() {
   try {
     const response: FetchApplicationsResponse = yield call(
@@ -63,7 +52,11 @@ export function* fetchApplicationListSaga() {
     const isValidResponse = yield validateResponse(response);
     if (isValidResponse) {
       const applicationListPayload: ApplicationPayload[] = response.data.map(
-        application => ({
+        (
+          application: ApplicationResponsePayload & {
+            pages: ApplicationPagePayload[];
+          },
+        ) => ({
           name: application.name,
           organizationId: application.organizationId,
           id: application.id,
diff --git a/app/client/src/sagas/DatasourcesSagas.ts b/app/client/src/sagas/DatasourcesSagas.ts
index 4b167cf055..9774b0a98e 100644
--- a/app/client/src/sagas/DatasourcesSagas.ts
+++ b/app/client/src/sagas/DatasourcesSagas.ts
@@ -15,9 +15,7 @@ import { validateResponse } from "./ErrorSagas";
 
 function* fetchDatasourcesSaga() {
   try {
-    const response: GenericApiResponse<
-      Datasource[]
-    > = yield DatasourcesApi.fetchDatasources();
+    const response: GenericApiResponse<Datasource[]> = yield DatasourcesApi.fetchDatasources();
     const isValidResponse = yield validateResponse(response);
     if (isValidResponse) {
       yield put({
@@ -37,9 +35,9 @@ function* createDatasourceSaga(
   actionPayload: ReduxAction<CreateDatasourceConfig>,
 ) {
   try {
-    const response: GenericApiResponse<
-      Datasource
-    > = yield DatasourcesApi.createDatasource(actionPayload.payload);
+    const response: GenericApiResponse<Datasource> = yield DatasourcesApi.createDatasource(
+      actionPayload.payload,
+    );
     if (response.responseMeta.success) {
       yield put({
         type: ReduxActionTypes.CREATE_DATASOURCE_SUCCESS,
diff --git a/app/client/src/sagas/InitSagas.ts b/app/client/src/sagas/InitSagas.ts
index 46b396e7a9..590970cd17 100644
--- a/app/client/src/sagas/InitSagas.ts
+++ b/app/client/src/sagas/InitSagas.ts
@@ -1,56 +1,52 @@
-import { all, select, put, takeLatest, take } from "redux-saga/effects";
+import { all, put, takeLatest, take } from "redux-saga/effects";
 import {
   ReduxAction,
   ReduxActionTypes,
-} from "../constants/ReduxActionConstants";
-import { getCurrentPageId } from "../selectors/editorSelectors";
+  InitializeEditorPayload,
+} from "constants/ReduxActionConstants";
+
 import { fetchEditorConfigs } from "../actions/configsActions";
-import { fetchPage, fetchPageList } from "../actions/pageActions";
+import { fetchPageList } from "../actions/pageActions";
 import { fetchActions } from "../actions/actionActions";
 import { fetchDatasources } from "../actions/datasourcesActions";
 import { initBindingMapListener } from "../actions/bindingActions";
 
-function* initializeEditorSaga() {
-  // Step 1: Start getting all the data needed by the app
-  const currentPageId = yield select(getCurrentPageId);
+function* initializeEditorSaga(
+  initializeEditorAction: ReduxAction<InitializeEditorPayload>,
+) {
+  const { applicationId } = initializeEditorAction.payload;
+  // Step 1: Start getting all the data needed by the
   yield all([
-    put(initBindingMapListener()),
-    put(fetchPageList()),
+    put(fetchPageList(applicationId)),
     put(fetchEditorConfigs()),
-    put(fetchPage(currentPageId)),
+    put(initBindingMapListener()),
     put(fetchActions()),
     put(fetchDatasources()),
   ]);
   // Step 2: Wait for all data to be in the state
   yield all([
     take(ReduxActionTypes.FETCH_PAGE_LIST_SUCCESS),
-    take(ReduxActionTypes.UPDATE_CANVAS),
     take(ReduxActionTypes.FETCH_ACTIONS_SUCCESS),
     take(ReduxActionTypes.FETCH_DATASOURCES_SUCCESS),
   ]);
-  // Step 3: Create the success;
+
+  // Step 6: Notify UI that the editor is ready to go
   yield put({
     type: ReduxActionTypes.INITIALIZE_EDITOR_SUCCESS,
   });
 }
 
 export function* initializeAppViewerSaga(
-  action: ReduxAction<{ pageId: string }>,
+  action: ReduxAction<{ pageId: string; applicationId: string }>,
 ) {
+  const { applicationId } = action.payload;
   yield put(initBindingMapListener());
-  yield all([put(fetchPageList()), put(fetchActions())]);
+  yield all([put(fetchPageList(applicationId)), put(fetchActions())]);
+
   yield all([
     take(ReduxActionTypes.FETCH_PAGE_LIST_SUCCESS),
     take(ReduxActionTypes.FETCH_ACTIONS_SUCCESS),
   ]);
-  yield put({
-    type: ReduxActionTypes.FETCH_PUBLISHED_PAGE_INIT,
-    payload: action.payload,
-  });
-  yield take(ReduxActionTypes.UPDATE_CANVAS);
-  yield put({
-    type: ReduxActionTypes.INITIALIZE_EDITOR_SUCCESS,
-  });
 }
 
 export default function* watchInitSagas() {
diff --git a/app/client/src/sagas/PageSagas.tsx b/app/client/src/sagas/PageSagas.tsx
index ad89afcd96..dfcfd801ee 100644
--- a/app/client/src/sagas/PageSagas.tsx
+++ b/app/client/src/sagas/PageSagas.tsx
@@ -5,8 +5,13 @@ import {
   ReduxAction,
   UpdateCanvasPayload,
   PageListPayload,
+  FetchPageListPayload,
 } from "../constants/ReduxActionConstants";
-import { updateCanvas, savePageSuccess } from "../actions/pageActions";
+import {
+  updateCanvas,
+  savePageSuccess,
+  fetchPageSuccess,
+} from "../actions/pageActions";
 import PageApi, {
   FetchPageResponse,
   SavePageResponse,
@@ -26,7 +31,6 @@ import {
   takeEvery,
   all,
 } from "redux-saga/effects";
-import { getPageLayoutId } from "./selectors";
 
 import { extractCurrentDSL } from "../utils/WidgetPropsUtils";
 import { getEditorConfigs, getWidgets } from "./selectors";
@@ -34,19 +38,27 @@ import { validateResponse } from "./ErrorSagas";
 import { RenderModes } from "constants/WidgetConstants";
 import { UpdateWidgetPropertyPayload } from "actions/controlActions";
 
-export function* fetchPageListSaga() {
+export function* fetchPageListSaga(
+  fetchPageListAction: ReduxAction<FetchPageListPayload>,
+) {
   try {
-    const response: FetchPageListResponse = yield call(PageApi.fetchPageList);
+    const { applicationId } = fetchPageListAction.payload;
+    const response: FetchPageListResponse = yield call(
+      PageApi.fetchPageList,
+      applicationId,
+    );
     const isValidResponse = yield validateResponse(response);
     if (isValidResponse) {
-      const pageList: PageListPayload = response.data.map(page => ({
+      const pages: PageListPayload = response.data.map(page => ({
         pageName: page.name,
         pageId: page.id,
-        layoutId: page.layouts[0].id,
       }));
       yield put({
         type: ReduxActionTypes.FETCH_PAGE_LIST_SUCCESS,
-        payload: pageList,
+        payload: {
+          pages,
+          applicationId,
+        },
       });
       return;
     }
@@ -76,21 +88,6 @@ const getCanvasWidgetsPayload = (
   };
 };
 
-// TODO(abhinav): Make this similar for both Render Modes
-const getAppViewWidgetsPayload = (pageResponse: any) => {
-  const normalizedResponse = CanvasWidgetsNormalizer.normalize(
-    pageResponse.data.dsl,
-  );
-  return {
-    pageWidgetId: normalizedResponse.result,
-    currentPageName: pageResponse.data.name,
-    currentPageId: pageResponse.data.id,
-    widgets: normalizedResponse.entities.canvasWidgets,
-    currentLayoutId: pageResponse.data.id,
-    currentApplicationId: pageResponse.data.applicationId,
-  };
-};
-
 export function* fetchPageSaga(
   pageRequestAction: ReduxAction<FetchPageRequest>,
 ) {
@@ -104,6 +101,7 @@ export function* fetchPageSaga(
     if (isValidResponse) {
       const canvasWidgetsPayload = getCanvasWidgetsPayload(fetchPageResponse);
       yield put(updateCanvas(canvasWidgetsPayload));
+      yield put(fetchPageSuccess());
     }
   } catch (error) {
     yield put({
@@ -120,10 +118,8 @@ export function* fetchPublishedPageSaga(
 ) {
   try {
     const { pageId } = pageRequestAction.payload;
-    const layoutId: string = yield select(getPageLayoutId, pageId);
     const request: FetchPublishedPageRequest = {
       pageId,
-      layoutId,
     };
     const response: FetchPublishedPageResponse = yield call(
       PageApi.fetchPublishedPage,
@@ -131,12 +127,12 @@ export function* fetchPublishedPageSaga(
     );
     const isValidResponse = yield validateResponse(response);
     if (isValidResponse) {
-      const canvasWidgetsPayload = getAppViewWidgetsPayload(response);
+      const canvasWidgetsPayload = getCanvasWidgetsPayload(response);
       yield put({
         type: ReduxActionTypes.FETCH_PUBLISHED_PAGE_SUCCESS,
         payload: {
-          dsl: response.data.dsl,
-          layoutId: response.data.id,
+          dsl: response.data.layouts[0].dsl,
+          layoutId: response.data.layouts[0].id,
           pageId: request.pageId,
           pageWidgetId: canvasWidgetsPayload.pageWidgetId,
         },
@@ -248,7 +244,7 @@ export function* createPageSaga(
 
 export default function* pageSagas() {
   yield all([
-    takeLatest(ReduxActionTypes.FETCH_PAGE, fetchPageSaga),
+    takeLatest(ReduxActionTypes.FETCH_PAGE_INIT, fetchPageSaga),
     takeLatest(
       ReduxActionTypes.FETCH_PUBLISHED_PAGE_INIT,
       fetchPublishedPageSaga,
diff --git a/app/client/src/sagas/SagaUtils.ts b/app/client/src/sagas/SagaUtils.ts
new file mode 100644
index 0000000000..a40f6b9558
--- /dev/null
+++ b/app/client/src/sagas/SagaUtils.ts
@@ -0,0 +1,13 @@
+import { ApplicationPagePayload } from "api/ApplicationApi";
+export const getDefaultPageId = (
+  pages?: ApplicationPagePayload[],
+): string | undefined => {
+  let defaultPage: ApplicationPagePayload | undefined = undefined;
+  if (pages) {
+    pages.find(page => page.isDefault);
+    if (!defaultPage) {
+      defaultPage = pages[0];
+    }
+  }
+  return defaultPage ? defaultPage.id : undefined;
+};
diff --git a/app/client/src/sagas/selectors.tsx b/app/client/src/sagas/selectors.tsx
index efd98efc4d..204554b084 100644
--- a/app/client/src/sagas/selectors.tsx
+++ b/app/client/src/sagas/selectors.tsx
@@ -14,12 +14,14 @@ export const getWidget = (state: AppState, widgetId: string): WidgetProps => {
 
 export const getEditorConfigs = (
   state: AppState,
-): { pageId: string; layoutId: string } => {
+): { pageId: string; layoutId: string } | undefined => {
   const { currentLayoutId, currentPageId } = state.ui.editor;
-  return {
-    pageId: currentPageId,
-    layoutId: currentLayoutId,
-  };
+  return currentLayoutId && currentPageId
+    ? {
+        pageId: currentPageId,
+        layoutId: currentLayoutId,
+      }
+    : undefined;
 };
 
 export const getDefaultWidgetConfig = (
@@ -33,11 +35,20 @@ export const getDefaultWidgetConfig = (
   return widgetConfig;
 };
 
-export const getPageLayoutId = (state: AppState, pageId: string): string => {
-  const pages = state.ui.appView.pages;
+// export const getPageLayoutId = (state: AppState, pageId: string): string => {
+//   const { pages } = state.entities.pageList;
+//   const page = pages.find(page => page.pageId === pageId);
+//   if (!page) {
+//     throw Error("Page not found");
+//   }
+//   return page.layoutId;
+// };
+
+//TODO(abhinav): The api will return a default flag in the future. use that
+// Also, check out `sagaUtils.ts` this has a getDefaultPageId. when the flag is available
+// remove that and use this.
+export const getDefaultPageId = (state: AppState, pageId?: string): string => {
+  const { pages } = state.entities.pageList;
   const page = pages.find(page => page.pageId === pageId);
-  if (!page) {
-    throw Error("Page not found");
-  }
-  return page.layoutId;
+  return page ? page.pageId : pages[0].pageId;
 };
diff --git a/app/client/src/selectors/appViewSelectors.tsx b/app/client/src/selectors/appViewSelectors.tsx
index a65eae8b02..4da553958f 100644
--- a/app/client/src/selectors/appViewSelectors.tsx
+++ b/app/client/src/selectors/appViewSelectors.tsx
@@ -1,7 +1,7 @@
 import { createSelector } from "reselect";
 import { AppState, DataTree } from "../reducers";
 import { AppViewReduxState } from "../reducers/uiReducers/appViewReducer";
-import { AppViewerProps } from "../pages/AppViewer";
+import { PageListReduxState } from "reducers/entityReducers/pageListReducer";
 import { getDataTree } from "./entitiesSelector";
 import createCachedSelector from "re-reselect";
 import CanvasWidgetsNormalizer from "normalizers/CanvasWidgetsNormalizer";
@@ -9,13 +9,10 @@ import { getValidatedDynamicProps } from "./editorSelectors";
 import { CanvasWidgetsReduxState } from "../reducers/entityReducers/canvasWidgetsReducer";
 
 const getAppViewState = (state: AppState) => state.ui.appView;
-
-export const getCurrentLayoutId = (state: AppState, props: AppViewerProps) =>
-  state.ui.appView.currentLayoutId || props.match.params.layoutId;
-export const getCurrentPageId = (state: AppState, props: AppViewerProps) =>
-  state.ui.appView.currentPageId || props.match.params.pageId;
-export const getCurrentRoutePageId = (state: AppState, props: AppViewerProps) =>
-  props.match.params.pageId;
+const getPageListState = (state: AppState): PageListReduxState =>
+  state.entities.pageList;
+export const getCurrentPageId = (state: AppState) =>
+  state.ui.appView.currentPageId;
 
 // For the viewer, this does not need to be wrapped in createCachedSelector, as it will not change in subsequent renders.
 // export const getCurrentPageLayoutDSL = createSelector(
@@ -26,8 +23,9 @@ export const getCurrentRoutePageId = (state: AppState, props: AppViewerProps) =>
 // );
 
 export const getPageList = createSelector(
-  getAppViewState,
-  (view: AppViewReduxState) => (view.pages.length > 0 ? view.pages : undefined),
+  getPageListState,
+  (pageList: PageListReduxState) =>
+    pageList.pages.length > 0 ? pageList.pages : undefined,
 );
 
 export const getIsFetchingPage = createSelector(
diff --git a/app/client/src/selectors/editorSelectors.tsx b/app/client/src/selectors/editorSelectors.tsx
index 02bb820d61..3d1f9ba295 100644
--- a/app/client/src/selectors/editorSelectors.tsx
+++ b/app/client/src/selectors/editorSelectors.tsx
@@ -13,6 +13,7 @@ import {
   FlattenedWidgetProps,
   CanvasWidgetsReduxState,
 } from "reducers/entityReducers/canvasWidgetsReducer";
+import { PageListReduxState } from "reducers/entityReducers/pageListReducer";
 
 import { OccupiedSpace } from "constants/editorConstants";
 import { WidgetTypes } from "constants/WidgetConstants";
@@ -20,18 +21,33 @@ import { WidgetTypes } from "constants/WidgetConstants";
 const getEditorState = (state: AppState) => state.ui.editor;
 const getWidgetConfigs = (state: AppState) => state.entities.widgetConfig;
 const getWidgetSideBar = (state: AppState) => state.ui.widgetSidebar;
+const getPageListState = (state: AppState) => state.entities.pageList;
 
 const getWidgets = (state: AppState): CanvasWidgetsReduxState =>
   state.entities.canvasWidgets;
 
-export const getPageList = createSelector(
+export const getIsEditorLoading = createSelector(
   getEditorState,
-  (editor: EditorReduxState) => editor.pages,
+  (editor: EditorReduxState) => editor.loadingStates.loading,
+);
+export const getIsFetchingPage = createSelector(
+  getEditorState,
+  (editor: EditorReduxState) => editor.loadingStates.isPageSwitching,
 );
 
-export const getPropertyPaneConfigsId = createSelector(
+export const getPublishedTime = createSelector(
   getEditorState,
-  (editor: EditorReduxState) => editor.propertyPaneConfigsId,
+  (editor: EditorReduxState) => editor.loadingStates.published,
+);
+
+export const getLoadingError = createSelector(
+  getEditorState,
+  (editor: EditorReduxState) => editor.loadingStates.loadingError,
+);
+
+export const getPageList = createSelector(
+  getPageListState,
+  (pageList: PageListReduxState) => pageList.pages,
 );
 
 export const getCurrentPageId = createSelector(
@@ -46,7 +62,7 @@ export const getCurrentLayoutId = createSelector(
 
 export const getPageWidgetId = createSelector(
   getEditorState,
-  (editor: EditorReduxState) => editor.pageWidgetId,
+  (editor: EditorReduxState) => editor.pageWidgetId || "0",
 );
 
 export const getCurrentPageName = createSelector(
@@ -55,8 +71,8 @@ export const getCurrentPageName = createSelector(
 );
 
 export const getCurrentApplicationId = createSelector(
-  getEditorState,
-  (editor: EditorReduxState) => editor.currentApplicationId,
+  getPageListState,
+  (pageList: PageListReduxState) => pageList.applicationId,
 );
 
 export const getIsPageSaving = createSelector(
diff --git a/app/client/src/utils/WidgetPropsUtils.tsx b/app/client/src/utils/WidgetPropsUtils.tsx
index 82ffd81c44..fe75e7862b 100644
--- a/app/client/src/utils/WidgetPropsUtils.tsx
+++ b/app/client/src/utils/WidgetPropsUtils.tsx
@@ -35,8 +35,8 @@ const defaultDSL = {
   parentColumnSpace: 1,
   parentRowSpace: 1,
   renderMode: "CANVAS",
-  rightColumn: 1300,
-  snapColumns: 16,
+  rightColumn: 1200,
+  snapColumns: 24,
   snapRows: 32,
   topRow: 0,
   type: "CONTAINER_WIDGET",
@@ -47,8 +47,6 @@ export const extractCurrentDSL = (
   fetchPageResponse: FetchPageResponse,
 ): ContainerWidgetProps<WidgetProps> => {
   const currentDSL = fetchPageResponse.data.layouts[0].dsl || defaultDSL;
-  currentDSL.rightColumn = 1200;
-  currentDSL.snapColumns = 24;
   return currentDSL;
 };
 
diff --git a/app/client/src/widgets/BaseWidget.tsx b/app/client/src/widgets/BaseWidget.tsx
index a770dc6dc8..2c21582ce7 100644
--- a/app/client/src/widgets/BaseWidget.tsx
+++ b/app/client/src/widgets/BaseWidget.tsx
@@ -278,6 +278,6 @@ export const WidgetOperations = {
   DELETE: "DELETE",
 };
 
-export type WidgetOperation = (typeof WidgetOperations)[keyof typeof WidgetOperations];
+export type WidgetOperation = typeof WidgetOperations[keyof typeof WidgetOperations];
 
 export default BaseWidget;
diff --git a/app/client/src/widgets/ContainerWidget.tsx b/app/client/src/widgets/ContainerWidget.tsx
index 9fb6b25d27..1322a52f7c 100644
--- a/app/client/src/widgets/ContainerWidget.tsx
+++ b/app/client/src/widgets/ContainerWidget.tsx
@@ -1,7 +1,9 @@
 import React from "react";
 import _ from "lodash";
 
-import ContainerComponent from "../components/designSystems/appsmith/ContainerComponent";
+import ContainerComponent, {
+  ContainerStyle,
+} from "components/designSystems/appsmith/ContainerComponent";
 import { ContainerOrientation, WidgetType } from "constants/WidgetConstants";
 import WidgetFactory from "utils/WidgetFactory";
 import { Color } from "constants/Colors";
@@ -107,6 +109,7 @@ export interface ContainerWidgetProps<T extends WidgetProps>
   snapRows?: number;
   orientation?: ContainerOrientation;
   backgroundColor?: Color;
+  containerStyle?: ContainerStyle;
 }
 
 export default ContainerWidget;
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index 517be4b3ba..d7599069ce 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -30,18 +30,18 @@
     source-map "^0.5.0"
 
 "@babel/core@^7.1.0", "@babel/core@^7.4.4", "@babel/core@^7.4.5":
-  version "7.6.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz#6ebd9fe00925f6c3e177bb726a188b5f578088ff"
-  integrity sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ==
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.2.tgz#ea5b99693bcfc058116f42fa1dd54da412b29d91"
+  integrity sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.6.4"
-    "@babel/helpers" "^7.6.2"
-    "@babel/parser" "^7.6.4"
-    "@babel/template" "^7.6.0"
-    "@babel/traverse" "^7.6.3"
-    "@babel/types" "^7.6.3"
-    convert-source-map "^1.1.0"
+    "@babel/generator" "^7.7.2"
+    "@babel/helpers" "^7.7.0"
+    "@babel/parser" "^7.7.2"
+    "@babel/template" "^7.7.0"
+    "@babel/traverse" "^7.7.2"
+    "@babel/types" "^7.7.2"
+    convert-source-map "^1.7.0"
     debug "^4.1.0"
     json5 "^2.1.0"
     lodash "^4.17.13"
@@ -49,132 +49,140 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.6.0", "@babel/generator@^7.6.3", "@babel/generator@^7.6.4":
-  version "7.6.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.4.tgz#a4f8437287bf9671b07f483b76e3bb731bc97671"
-  integrity sha512-jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w==
+"@babel/generator@^7.4.0", "@babel/generator@^7.6.0", "@babel/generator@^7.7.2":
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.2.tgz#2f4852d04131a5e17ea4f6645488b5da66ebf3af"
+  integrity sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==
   dependencies:
-    "@babel/types" "^7.6.3"
+    "@babel/types" "^7.7.2"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
-  integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==
+"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.0.tgz#efc54032d43891fe267679e63f6860aa7dbf4a5e"
+  integrity sha512-k50CQxMlYTYo+GGyUGFwpxKVtxVJi9yh61sXZji3zYHccK9RYliZGSTOgci85T+r+0VFN2nWbGM04PIqwfrpMg==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.7.0"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
-  integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.0.tgz#32dd9551d6ed3a5fc2edc50d6912852aa18274d9"
+  integrity sha512-Cd8r8zs4RKDwMG/92lpZcnn5WPQ3LAMQbCw42oqUh4s7vsSN5ANUZjMel0OOnxDLq57hoDDbai+ryygYfCTOsw==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-explode-assignable-expression" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-builder-react-jsx@^7.3.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz#a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"
-  integrity sha512-MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw==
+"@babel/helper-builder-react-jsx@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.0.tgz#c6b8254d305bacd62beb648e4dea7d3ed79f352d"
+  integrity sha512-LSln3cexwInTMYYoFeVLKnYPPMfWNJ8PubTBs3hkh7wCu9iBaqq1OOyW+xGmEdLxT1nhsl+9SJ+h2oUDYz0l2A==
   dependencies:
-    "@babel/types" "^7.3.0"
+    "@babel/types" "^7.7.0"
     esutils "^2.0.0"
 
 "@babel/helper-call-delegate@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"
-  integrity sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.7.0.tgz#df8942452c2c1a217335ca7e393b9afc67f668dc"
+  integrity sha512-Su0Mdq7uSSWGZayGMMQ+z6lnL00mMCnGAbO/R0ZO9odIdB/WNU/VfQKqMQU0fdIsxQYbRjDM4BixIa93SQIpvw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.4.4"
-    "@babel/traverse" "^7.4.4"
-    "@babel/types" "^7.4.4"
+    "@babel/helper-hoist-variables" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz#769711acca889be371e9bc2eb68641d55218021f"
-  integrity sha512-O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng==
+"@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.6.0", "@babel/helper-create-class-features-plugin@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.0.tgz#bcdc223abbfdd386f94196ae2544987f8df775e8"
+  integrity sha512-MZiB5qvTWoyiFOgootmRSDV1udjIqJW/8lmxgzKq6oDqxdmHUjeP2ZUOmgHdYjmUVNABqRrHjYAYRvj8Eox/UA==
   dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-member-expression-to-functions" "^7.5.5"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/helper-function-name" "^7.7.0"
+    "@babel/helper-member-expression-to-functions" "^7.7.0"
+    "@babel/helper-optimise-call-expression" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.5.5"
-    "@babel/helper-split-export-declaration" "^7.4.4"
+    "@babel/helper-replace-supers" "^7.7.0"
+    "@babel/helper-split-export-declaration" "^7.7.0"
 
-"@babel/helper-define-map@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369"
-  integrity sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==
+"@babel/helper-create-regexp-features-plugin@^7.7.0":
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.2.tgz#6f20443778c8fce2af2ff4206284afc0ced65db6"
+  integrity sha512-pAil/ZixjTlrzNpjx+l/C/wJk002Wo7XbbZ8oujH/AoJ3Juv0iN/UTcPUHXKMFLqsfS0Hy6Aow8M31brUYBlQQ==
   dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/types" "^7.5.5"
+    "@babel/helper-regex" "^7.4.4"
+    regexpu-core "^4.6.0"
+
+"@babel/helper-define-map@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.0.tgz#60b0e9fd60def9de5054c38afde8c8ee409c7529"
+  integrity sha512-kPKWPb0dMpZi+ov1hJiwse9dWweZsz3V9rP4KdytnX1E7z3cTNmFGglwklzFPuqIcHLIY3bgKSs4vkwXXdflQA==
+  dependencies:
+    "@babel/helper-function-name" "^7.7.0"
+    "@babel/types" "^7.7.0"
     lodash "^4.17.13"
 
-"@babel/helper-explode-assignable-expression@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
-  integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==
+"@babel/helper-explode-assignable-expression@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.0.tgz#db2a6705555ae1f9f33b4b8212a546bc7f9dc3ef"
+  integrity sha512-CDs26w2shdD1urNUAji2RJXyBFCaR+iBEGnFz3l7maizMkQe3saVw9WtjG1tz8CwbjvlFnaSLVhgnu1SWaherg==
   dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-function-name@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
-  integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
+"@babel/helper-function-name@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz#44a5ad151cfff8ed2599c91682dda2ec2c8430a3"
+  integrity sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.0.0"
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-get-function-arity" "^7.7.0"
+    "@babel/template" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-get-function-arity@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
-  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
+"@babel/helper-get-function-arity@^7.0.0", "@babel/helper-get-function-arity@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz#c604886bc97287a1d1398092bc666bc3d7d7aa2d"
+  integrity sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-hoist-variables@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a"
-  integrity sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==
+"@babel/helper-hoist-variables@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.0.tgz#b4552e4cfe5577d7de7b183e193e84e4ec538c81"
+  integrity sha512-LUe/92NqsDAkJjjCEWkNe+/PcpnisvnqdlRe19FahVapa4jndeuJ+FBiTX1rcAKWKcJGE+C3Q3tuEuxkSmCEiQ==
   dependencies:
-    "@babel/types" "^7.4.4"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-member-expression-to-functions@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590"
-  integrity sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==
+"@babel/helper-member-expression-to-functions@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz#472b93003a57071f95a541ea6c2b098398bcad8a"
+  integrity sha512-QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA==
   dependencies:
-    "@babel/types" "^7.5.5"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-module-imports@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
-  integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz#99c095889466e5f7b6d66d98dffc58baaf42654d"
+  integrity sha512-Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz#f84ff8a09038dcbca1fd4355661a500937165b4a"
-  integrity sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==
+"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.0.tgz#154a69f0c5b8fd4d39e49750ff7ac4faa3f36786"
+  integrity sha512-rXEefBuheUYQyX4WjV19tuknrJFwyKw0HgzRwbkyTbB+Dshlq7eqkWbyjzToLrMZk/5wKVKdWFluiAsVkHXvuQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/template" "^7.4.4"
-    "@babel/types" "^7.5.5"
+    "@babel/helper-module-imports" "^7.7.0"
+    "@babel/helper-simple-access" "^7.7.0"
+    "@babel/helper-split-export-declaration" "^7.7.0"
+    "@babel/template" "^7.7.0"
+    "@babel/types" "^7.7.0"
     lodash "^4.17.13"
 
-"@babel/helper-optimise-call-expression@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
-  integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==
+"@babel/helper-optimise-call-expression@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz#4f66a216116a66164135dc618c5d8b7a959f9365"
+  integrity sha512-48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.7.0"
 
 "@babel/helper-plugin-utils@^7.0.0":
   version "7.0.0"
@@ -188,60 +196,60 @@
   dependencies:
     lodash "^4.17.13"
 
-"@babel/helper-remap-async-to-generator@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
-  integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==
+"@babel/helper-remap-async-to-generator@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.0.tgz#4d69ec653e8bff5bce62f5d33fc1508f223c75a7"
+  integrity sha512-pHx7RN8X0UNHPB/fnuDnRXVZ316ZigkO8y8D835JlZ2SSdFKb6yH9MIYRU4fy/KPe5sPHDFOPvf8QLdbAGGiyw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-wrap-function" "^7.1.0"
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-annotate-as-pure" "^7.7.0"
+    "@babel/helper-wrap-function" "^7.7.0"
+    "@babel/template" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-replace-supers@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2"
-  integrity sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==
+"@babel/helper-replace-supers@^7.5.5", "@babel/helper-replace-supers@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz#d5365c8667fe7cbd13b8ddddceb9bd7f2b387512"
+  integrity sha512-5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.5.5"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.5.5"
-    "@babel/types" "^7.5.5"
+    "@babel/helper-member-expression-to-functions" "^7.7.0"
+    "@babel/helper-optimise-call-expression" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-simple-access@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
-  integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==
+"@babel/helper-simple-access@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.0.tgz#97a8b6c52105d76031b86237dc1852b44837243d"
+  integrity sha512-AJ7IZD7Eem3zZRuj5JtzFAptBw7pMlS3y8Qv09vaBWoFsle0d1kAn5Wq6Q9MyBXITPOKnxwkZKoAm4bopmv26g==
   dependencies:
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/template" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-split-export-declaration@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
-  integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==
+"@babel/helper-split-export-declaration@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz#1365e74ea6c614deeb56ebffabd71006a0eb2300"
+  integrity sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==
   dependencies:
-    "@babel/types" "^7.4.4"
+    "@babel/types" "^7.7.0"
 
-"@babel/helper-wrap-function@^7.1.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa"
-  integrity sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==
+"@babel/helper-wrap-function@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.0.tgz#15af3d3e98f8417a60554acbb6c14e75e0b33b74"
+  integrity sha512-sd4QjeMgQqzshSjecZjOp8uKfUtnpmCyQhKQrVJBBgeHAB/0FPi33h3AbVlVp07qQtMD4QgYSzaMI7VwncNK/w==
   dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.2.0"
+    "@babel/helper-function-name" "^7.7.0"
+    "@babel/template" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/helpers@^7.6.0", "@babel/helpers@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.2.tgz#681ffe489ea4dcc55f23ce469e58e59c1c045153"
-  integrity sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==
+"@babel/helpers@^7.6.0", "@babel/helpers@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.0.tgz#359bb5ac3b4726f7c1fde0ec75f64b3f4275d60b"
+  integrity sha512-VnNwL4YOhbejHb7x/b5F39Zdg5vIQpUUNzJwx0ww1EcVRt41bbGRZWhAURrfY32T5zTT3qwNOQFWpn+P0i0a2g==
   dependencies:
-    "@babel/template" "^7.6.0"
-    "@babel/traverse" "^7.6.2"
-    "@babel/types" "^7.6.0"
+    "@babel/template" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
 "@babel/highlight@^7.0.0":
   version "7.5.0"
@@ -252,21 +260,21 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3", "@babel/parser@^7.6.4":
-  version "7.6.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz#cb9b36a7482110282d5cb6dd424ec9262b473d81"
-  integrity sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A==
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2":
+  version "7.7.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.3.tgz#5fad457c2529de476a248f75b0f090b3060af043"
+  integrity sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==
 
-"@babel/plugin-proposal-async-generator-functions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e"
-  integrity sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==
+"@babel/plugin-proposal-async-generator-functions@^7.2.0", "@babel/plugin-proposal-async-generator-functions@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.0.tgz#83ef2d6044496b4c15d8b4904e2219e6dccc6971"
+  integrity sha512-ot/EZVvf3mXtZq0Pd0+tSOfGWMizqmOohXmNZg6LNFjHOV+wOPv7BvVYh8oPR8LhpIP3ye8nNooKL50YRWxpYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.1.0"
+    "@babel/helper-remap-async-to-generator" "^7.7.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
 
-"@babel/plugin-proposal-class-properties@7.5.5", "@babel/plugin-proposal-class-properties@^7.4.4":
+"@babel/plugin-proposal-class-properties@7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4"
   integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==
@@ -274,6 +282,14 @@
     "@babel/helper-create-class-features-plugin" "^7.5.5"
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-proposal-class-properties@^7.4.4":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.0.tgz#ac54e728ecf81d90e8f4d2a9c05a890457107917"
+  integrity sha512-tufDcFA1Vj+eWvwHN+jvMN6QsV5o+vUlytNKrbMiCeDL0F2j92RURzUsUMWE5EJkLyWxjdUslCsMQa9FWth16A==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.7.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-proposal-decorators@7.6.0":
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.6.0.tgz#6659d2572a17d70abd68123e89a12a43d90aa30c"
@@ -283,10 +299,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-decorators" "^7.2.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz#e532202db4838723691b10a67b8ce509e397c506"
-  integrity sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==
+"@babel/plugin-proposal-dynamic-import@^7.5.0", "@babel/plugin-proposal-dynamic-import@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.0.tgz#dc02a8bad8d653fb59daf085516fa416edd2aa7f"
+  integrity sha512-7poL3Xi+QFPC7sGAzEIbXUyYzGJwbc2+gSD0AkiC5k52kH2cqHdqxm5hNFfLW3cRSTcx9bN0Fl7/6zWcLLnKAQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
@@ -323,14 +339,13 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz#05413762894f41bfe42b9a5e80919bd575dcc802"
-  integrity sha512-NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw==
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.0.tgz#549fe1717a1bd0a2a7e63163841cb37e78179d5d"
+  integrity sha512-mk34H+hp7kRBWJOOAR0ZMGCydgKMD4iN9TpDRp3IIcbunltxEY89XSimc6WbtSLCDrwcdy/EEw7h5CFCzxTchw==
   dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.6.0"
 
 "@babel/plugin-syntax-async-generators@^7.2.0":
   version "7.2.0"
@@ -354,9 +369,9 @@
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-syntax-flow@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz#a765f061f803bc48f240c26f8747faf97c26bf7c"
-  integrity sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg==
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.7.0.tgz#5c9465bcd26354d5215294ea90ab1c706a571386"
+  integrity sha512-vQMV07p+L+jZeUnvX3pEJ9EiXGCjB5CTTvsirFD9rpEuATnoAvLBLoYbw1v5tyn3d2XxSuvEKi8cV3KqYUa0vQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -388,6 +403,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-top-level-await@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.0.tgz#f5699549f50bbe8d12b1843a4e82f0a37bb65f4d"
+  integrity sha512-hi8FUNiFIY1fnUI2n1ViB1DR0R4QeK4iHcTlW6aJkrPoTdb8Rf1EMQ6GT3f67DDkYyWgew9DFoOZ6gOoEsdzTA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-syntax-typescript@^7.2.0":
   version "7.3.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz#a7cc3f66119a9f7ebe2de5383cce193473d65991"
@@ -402,14 +424,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-async-to-generator@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e"
-  integrity sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==
+"@babel/plugin-transform-async-to-generator@^7.5.0", "@babel/plugin-transform-async-to-generator@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.0.tgz#e2b84f11952cf5913fe3438b7d2585042772f492"
+  integrity sha512-vLI2EFLVvRBL3d8roAMqtVY0Bm9C1QzLkdS57hiKrjUBSqsQYrBsMCeOg/0KK7B0eK9V71J5mWcha9yyoI2tZw==
   dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/helper-module-imports" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.1.0"
+    "@babel/helper-remap-async-to-generator" "^7.7.0"
 
 "@babel/plugin-transform-block-scoped-functions@^7.2.0":
   version "7.2.0"
@@ -426,18 +448,18 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9"
-  integrity sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==
+"@babel/plugin-transform-classes@^7.5.5", "@babel/plugin-transform-classes@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.0.tgz#b411ecc1b8822d24b81e5d184f24149136eddd4a"
+  integrity sha512-/b3cKIZwGeUesZheU9jNYcwrEA7f/Bo4IdPmvp7oHgvks2majB5BoT5byAql44fiNQYOPzhk2w8DbgfuafkMoA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-define-map" "^7.5.5"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/helper-annotate-as-pure" "^7.7.0"
+    "@babel/helper-define-map" "^7.7.0"
+    "@babel/helper-function-name" "^7.7.0"
+    "@babel/helper-optimise-call-expression" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.5.5"
-    "@babel/helper-split-export-declaration" "^7.4.4"
+    "@babel/helper-replace-supers" "^7.7.0"
+    "@babel/helper-split-export-declaration" "^7.7.0"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.2.0":
@@ -454,14 +476,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz#44abb948b88f0199a627024e1508acaf8dc9b2f9"
-  integrity sha512-KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA==
+"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.0.tgz#c5c9ecacab3a5e0c11db6981610f0c32fd698b3b"
+  integrity sha512-3QQlF7hSBnSuM1hQ0pS3pmAbWLax/uGNCbPBND9y+oJ4Y776jsyujG2k0Sn2Aj2a0QwVOiOFL5QVPA7spjvzSA==
   dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.6.0"
 
 "@babel/plugin-transform-duplicate-keys@^7.5.0":
   version "7.5.0"
@@ -493,12 +514,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-function-name@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad"
-  integrity sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==
+"@babel/plugin-transform-function-name@^7.4.4", "@babel/plugin-transform-function-name@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.0.tgz#0fa786f1eef52e3b7d4fc02e54b2129de8a04c2a"
+  integrity sha512-P5HKu0d9+CzZxP5jcrWdpe7ZlFDe24bmqP6a6X8BHEBl/eizAsY8K6LX8LASZL0Jxdjm5eEfzp+FIrxCm/p8bA==
   dependencies:
-    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-function-name" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-literals@^7.2.0":
@@ -524,39 +545,39 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz#39dfe957de4420445f1fcf88b68a2e4aa4515486"
-  integrity sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g==
+"@babel/plugin-transform-modules-commonjs@^7.6.0", "@babel/plugin-transform-modules-commonjs@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.0.tgz#3e5ffb4fd8c947feede69cbe24c9554ab4113fe3"
+  integrity sha512-KEMyWNNWnjOom8vR/1+d+Ocz/mILZG/eyHHO06OuBQ2aNhxT62fr4y6fGOplRx+CxCSp3IFwesL8WdINfY/3kg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.4.4"
+    "@babel/helper-module-transforms" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
+    "@babel/helper-simple-access" "^7.7.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249"
-  integrity sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==
+"@babel/plugin-transform-modules-systemjs@^7.5.0", "@babel/plugin-transform-modules-systemjs@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.0.tgz#9baf471213af9761c1617bb12fd278e629041417"
+  integrity sha512-ZAuFgYjJzDNv77AjXRqzQGlQl4HdUM6j296ee4fwKVZfhDR9LAGxfvXjBkb06gNETPnN0sLqRm9Gxg4wZH6dXg==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.4.4"
+    "@babel/helper-hoist-variables" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-umd@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae"
-  integrity sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==
+"@babel/plugin-transform-modules-umd@^7.2.0", "@babel/plugin-transform-modules-umd@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.0.tgz#d62c7da16670908e1d8c68ca0b5d4c0097b69966"
+  integrity sha512-u7eBA03zmUswQ9LQ7Qw0/ieC1pcAkbp5OQatbWUzY1PaBccvuJXUkYzoN1g7cqp7dbTu6Dp9bXyalBvD04AANA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-module-transforms" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.6.0", "@babel/plugin-transform-named-capturing-groups-regex@^7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.3.tgz#aaa6e409dd4fb2e50b6e2a91f7e3a3149dbce0cf"
-  integrity sha512-jTkk7/uE6H2s5w6VlMHeWuH+Pcy2lmdwFoeWCVnvIrDUnB5gQqTVI8WfmEAhF2CDEarGrknZcmSFg1+bkfCoSw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.6.0", "@babel/plugin-transform-named-capturing-groups-regex@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.0.tgz#358e6fd869b9a4d8f5cbc79e4ed4fc340e60dcaf"
+  integrity sha512-+SicSJoKouPctL+j1pqktRVCgy+xAch1hWWTMy13j0IflnyNjaoskj+DwRQFimHbLqO3sq2oN2CXMvXq3Bgapg==
   dependencies:
-    regexpu-core "^4.6.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
 
 "@babel/plugin-transform-new-target@^7.4.4":
   version "7.4.4"
@@ -620,19 +641,19 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
-"@babel/plugin-transform-react-jsx@^7.0.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz#f2cab99026631c767e2745a5368b331cfe8f5290"
-  integrity sha512-a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg==
+"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.7.0.tgz#834b0723ba78cd4d24d7d629300c2270f516d0b7"
+  integrity sha512-mXhBtyVB1Ujfy+0L6934jeJcSXj/VCg6whZzEcgiiZHNS0PGC7vUCsZDQCxxztkpIdF+dY1fUMcjAgEOC3ZOMQ==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.3.0"
+    "@babel/helper-builder-react-jsx" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
-"@babel/plugin-transform-regenerator@^7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f"
-  integrity sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==
+"@babel/plugin-transform-regenerator@^7.4.5", "@babel/plugin-transform-regenerator@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.0.tgz#f1b20b535e7716b622c99e989259d7dd942dd9cc"
+  integrity sha512-AXmvnC+0wuj/cFkkS/HFHIojxH3ffSXE+ttulrqWjZZRaUOonfJc60e1wSNT4rV8tIunvu/R3wCp71/tLAa9xg==
   dependencies:
     regenerator-transform "^0.14.0"
 
@@ -691,27 +712,26 @@
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-typescript@^7.6.0":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.6.3.tgz#dddb50cf3b8b2ef70b22e5326e9a91f05a1db13b"
-  integrity sha512-aiWINBrPMSC3xTXRNM/dfmyYuPNKY/aexYqBgh0HBI5Y+WO5oRAqW/oROYeYHrF4Zw12r9rK4fMk/ZlAmqx/FQ==
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.2.tgz#eb9f14c516b5d36f4d6f3a9d7badae6d0fc313d4"
+  integrity sha512-UWhDaJRqdPUtdK1s0sKYdoRuqK0NepjZto2UZltvuCgMoMZmdjhgz5hcRokie/3aYEaSz3xvusyoayVaq4PjRg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.6.0"
+    "@babel/helper-create-class-features-plugin" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-typescript" "^7.2.0"
 
-"@babel/plugin-transform-unicode-regex@^7.4.4", "@babel/plugin-transform-unicode-regex@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz#b692aad888a7e8d8b1b214be6b9dc03d5031f698"
-  integrity sha512-orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw==
+"@babel/plugin-transform-unicode-regex@^7.4.4", "@babel/plugin-transform-unicode-regex@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.0.tgz#743d9bcc44080e3cc7d49259a066efa30f9187a3"
+  integrity sha512-RrThb0gdrNwFAqEAAx9OWgtx6ICK69x7i9tCnMdVrxQwSDp/Abu9DXFU5Hh16VP33Rmxh04+NGW28NsIkFvFKA==
   dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.6.0"
 
 "@babel/polyfill@^7.4.4":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.6.0.tgz#6d89203f8b6cd323e8d946e47774ea35dc0619cc"
-  integrity sha512-q5BZJI0n/B10VaQQvln1IlDK3BTBJFbADx7tv+oXDPIDZuTo37H5Adb9jhlXm/fEN4Y7/64qD9mnrJJG7rmaTw==
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.7.0.tgz#e1066e251e17606ec7908b05617f9b7f8180d8f3"
+  integrity sha512-/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ==
   dependencies:
     core-js "^2.6.5"
     regenerator-runtime "^0.13.2"
@@ -773,55 +793,56 @@
     semver "^5.5.0"
 
 "@babel/preset-env@^7.4.4", "@babel/preset-env@^7.4.5":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz#9e1bf05a2e2d687036d24c40e4639dc46cef2271"
-  integrity sha512-CWQkn7EVnwzlOdR5NOm2+pfgSNEZmvGjOhlCHBDq0J8/EStr+G+FvPEiz9B56dR6MoiUFjXhfE4hjLoAKKJtIQ==
+  version "7.7.1"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.1.tgz#04a2ff53552c5885cf1083e291c8dd5490f744bb"
+  integrity sha512-/93SWhi3PxcVTDpSqC+Dp4YxUu3qZ4m7I76k0w73wYfn7bGVuRIO4QUz95aJksbS+AD1/mT1Ie7rbkT0wSplaA==
   dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/helper-module-imports" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
-    "@babel/plugin-proposal-dynamic-import" "^7.5.0"
+    "@babel/plugin-proposal-async-generator-functions" "^7.7.0"
+    "@babel/plugin-proposal-dynamic-import" "^7.7.0"
     "@babel/plugin-proposal-json-strings" "^7.2.0"
     "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
     "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.6.2"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.7.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
+    "@babel/plugin-syntax-top-level-await" "^7.7.0"
     "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.5.0"
+    "@babel/plugin-transform-async-to-generator" "^7.7.0"
     "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
     "@babel/plugin-transform-block-scoping" "^7.6.3"
-    "@babel/plugin-transform-classes" "^7.5.5"
+    "@babel/plugin-transform-classes" "^7.7.0"
     "@babel/plugin-transform-computed-properties" "^7.2.0"
     "@babel/plugin-transform-destructuring" "^7.6.0"
-    "@babel/plugin-transform-dotall-regex" "^7.6.2"
+    "@babel/plugin-transform-dotall-regex" "^7.7.0"
     "@babel/plugin-transform-duplicate-keys" "^7.5.0"
     "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
     "@babel/plugin-transform-for-of" "^7.4.4"
-    "@babel/plugin-transform-function-name" "^7.4.4"
+    "@babel/plugin-transform-function-name" "^7.7.0"
     "@babel/plugin-transform-literals" "^7.2.0"
     "@babel/plugin-transform-member-expression-literals" "^7.2.0"
     "@babel/plugin-transform-modules-amd" "^7.5.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.6.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.5.0"
-    "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.3"
+    "@babel/plugin-transform-modules-commonjs" "^7.7.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.7.0"
+    "@babel/plugin-transform-modules-umd" "^7.7.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.0"
     "@babel/plugin-transform-new-target" "^7.4.4"
     "@babel/plugin-transform-object-super" "^7.5.5"
     "@babel/plugin-transform-parameters" "^7.4.4"
     "@babel/plugin-transform-property-literals" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.4.5"
+    "@babel/plugin-transform-regenerator" "^7.7.0"
     "@babel/plugin-transform-reserved-words" "^7.2.0"
     "@babel/plugin-transform-shorthand-properties" "^7.2.0"
     "@babel/plugin-transform-spread" "^7.6.2"
     "@babel/plugin-transform-sticky-regex" "^7.2.0"
     "@babel/plugin-transform-template-literals" "^7.4.4"
     "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.6.2"
-    "@babel/types" "^7.6.3"
+    "@babel/plugin-transform-unicode-regex" "^7.7.0"
+    "@babel/types" "^7.7.1"
     browserslist "^4.6.0"
     core-js-compat "^3.1.1"
     invariant "^2.2.2"
@@ -840,13 +861,13 @@
     "@babel/plugin-transform-react-jsx-source" "^7.0.0"
 
 "@babel/preset-react@^7.0.0":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.6.3.tgz#d5242c828322520205ae4eda5d4f4f618964e2f6"
-  integrity sha512-07yQhmkZmRAfwREYIQgW0HEwMY9GBJVuPY4Q12UC72AbfaawuupVWa8zQs2tlL+yun45Nv/1KreII/0PLfEsgA==
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.7.0.tgz#8ab0c4787d98cf1f5f22dabf115552bf9e4e406c"
+  integrity sha512-IXXgSUYBPHUGhUkH+89TR6faMcBtuMW0h5OHbMuVbL3/5wK2g6a2M2BBpkLa+Kw0sAHiZ9dNVgqJMDP/O4GRBA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-react-display-name" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.0.0"
+    "@babel/plugin-transform-react-jsx" "^7.7.0"
     "@babel/plugin-transform-react-jsx-self" "^7.0.0"
     "@babel/plugin-transform-react-jsx-source" "^7.0.0"
 
@@ -865,52 +886,52 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz#935122c74c73d2240cafd32ddb5fc2a6cd35cf1f"
-  integrity sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3":
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.2.tgz#111a78002a5c25fc8e3361bedc9529c696b85a6a"
+  integrity sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4", "@babel/template@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6"
-  integrity sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==
+"@babel/template@^7.4.0", "@babel/template@^7.6.0", "@babel/template@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.0.tgz#4fadc1b8e734d97f56de39c77de76f2562e597d0"
+  integrity sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.6.0"
-    "@babel/types" "^7.6.0"
+    "@babel/parser" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.0", "@babel/traverse@^7.6.2", "@babel/traverse@^7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.3.tgz#66d7dba146b086703c0fb10dd588b7364cec47f9"
-  integrity sha512-unn7P4LGsijIxaAJo/wpoU11zN+2IaClkQAxcJWBNCMS6cmVh802IyLHNkAjQ0iYnRS3nnxk5O3fuXW28IMxTw==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.6.0", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.2.tgz#ef0a65e07a2f3c550967366b3d9b62a2dcbeae09"
+  integrity sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.6.3"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/parser" "^7.6.3"
-    "@babel/types" "^7.6.3"
+    "@babel/generator" "^7.7.2"
+    "@babel/helper-function-name" "^7.7.0"
+    "@babel/helper-split-export-declaration" "^7.7.0"
+    "@babel/parser" "^7.7.2"
+    "@babel/types" "^7.7.2"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0", "@babel/types@^7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.3.tgz#3f07d96f854f98e2fbd45c64b0cb942d11e8ba09"
-  integrity sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==
+"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.6.0", "@babel/types@^7.7.0", "@babel/types@^7.7.1", "@babel/types@^7.7.2":
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.2.tgz#550b82e5571dcd174af576e23f0adba7ffc683f7"
+  integrity sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@blueprintjs/core@^3.18.1", "@blueprintjs/core@^3.19.0":
-  version "3.19.1"
-  resolved "https://registry.yarnpkg.com/@blueprintjs/core/-/core-3.19.1.tgz#22e929e15147a90ca9ad6285b4627c2e8ed1ba33"
-  integrity sha512-O+p/Jbu9kyrTE4Yy5phd7Xp9NJoiHCQ9ycO+QSR2fiuhwnVMO1xjY269QXxylzEswgPyjhST1euqHpyQQ7qnUw==
+"@blueprintjs/core@^3.18.1", "@blueprintjs/core@^3.19.0", "@blueprintjs/core@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@blueprintjs/core/-/core-3.20.0.tgz#2c3fd713ac2dc47df7acec03bb88e53fb335715d"
+  integrity sha512-0ndz/lLMbSgWu1Z5hdpScfMbkQIOFESejsSW7Jjpin7Hmsjr8fRDU1efoVyG1uHBPmA4B6aYh+uShZHcZGJtig==
   dependencies:
-    "@blueprintjs/icons" "^3.11.0"
+    "@blueprintjs/icons" "^3.12.0"
     "@types/dom4" "^2.0.1"
     classnames "^2.2"
     dom4 "^2.1.5"
@@ -923,29 +944,29 @@
     tslib "~1.9.0"
 
 "@blueprintjs/datetime@^3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@blueprintjs/datetime/-/datetime-3.14.0.tgz#a39a1e639dce801627990626b411e57e262f0e4b"
-  integrity sha512-NfCiV19zMPWZ7kcx1A2OympSLy7vp8wFrhMaMAKK6R+ndTUuEDZi3Z5NxoyX2jBJ71F9nhWYFjH1nQVOn/eDaw==
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@blueprintjs/datetime/-/datetime-3.15.0.tgz#6bab30dfc226418fc89970a6f4978574c53b0fdf"
+  integrity sha512-K8MeV/M83hgpAaEjD6oUhBKSa9MAxsZkfWYtfq24wTMF4ROFdY7Z8GIg6nUqH0LMXql9D3UgP0p3QtwDluvnNQ==
   dependencies:
-    "@blueprintjs/core" "^3.19.0"
+    "@blueprintjs/core" "^3.20.0"
     classnames "^2.2"
     react-day-picker "^7.3.2"
     tslib "~1.9.0"
 
-"@blueprintjs/icons@^3.10.0", "@blueprintjs/icons@^3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@blueprintjs/icons/-/icons-3.11.0.tgz#c104cecef6893f8b7b7d8d8951f51d47f3f08403"
-  integrity sha512-HGS652gFc057t9cr8NyuWFyZ1gcSqG3uuexpzhZm81W35hGfh9vdC9GR+mbHJNawAuKXtu+xw4VWWkv1UGQ0Vg==
+"@blueprintjs/icons@^3.10.0", "@blueprintjs/icons@^3.12.0":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@blueprintjs/icons/-/icons-3.12.0.tgz#cea6a6434d9d469e26d87b055e6b6aa5768135b3"
+  integrity sha512-ERIODstzjBzRIHNqAqyXu4gVsdLyvxAZ0Cp7Dr4+d5BdgDbZYzMYf9ll05daQPOBWaFjLh3lhCRhbfk6MXdD7A==
   dependencies:
     classnames "^2.2"
     tslib "~1.9.0"
 
 "@blueprintjs/select@^3.10.0", "@blueprintjs/select@^3.11.0":
-  version "3.11.1"
-  resolved "https://registry.yarnpkg.com/@blueprintjs/select/-/select-3.11.1.tgz#6cb5b70c31013752a0ccfa205996ab6311d74ef3"
-  integrity sha512-J3IfKq+L9JsKQQbrLdJ9K2621FV2K7iptynklSsCP6owlGDDcsbS6JEu/X2B8n7f5v0bez070+fQTa2JxtKRFg==
+  version "3.11.2"
+  resolved "https://registry.yarnpkg.com/@blueprintjs/select/-/select-3.11.2.tgz#3324db0de44a9f386b957aac1ba3ec774b3eb1e7"
+  integrity sha512-fU0Km6QI/ayWhzYeu9N1gTj0+L0XUO4KB3u2LfJXgj648UGY8F4HX2ETdJ+XPdtsu6TesrIL7ghMQhtLcvafBg==
   dependencies:
-    "@blueprintjs/core" "^3.19.0"
+    "@blueprintjs/core" "^3.20.0"
     classnames "^2.2"
     tslib "~1.9.0"
 
@@ -1025,9 +1046,9 @@
   integrity sha512-14ZVlsB9akwvydAdaEnVnvqu6J2P6ySv39hYyl/aoB6w/V+bXX0tay8cF6paqbgZsN2n5Xh15uF4pE+GvE+itw==
 
 "@emotion/is-prop-valid@^0.8.1":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.4.tgz#cf1dcfc1812c226f05e1ba53592eb6b51e734990"
-  integrity sha512-QBW8h6wVQgeQ55F52rNaprEJxtVR+/ScOP8/V1ScSpPzKqHdFB9QVqby0Z50sqS8mcaeIl5vR1vQpKwJbIS6NQ==
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.5.tgz#2dda0791f0eafa12b7a0a5b39858405cc7bde983"
+  integrity sha512-6ZODuZSFofbxSbcxwsFz+6ioPjb0ISJRRPLZ+WIbjcU2IMU0Io+RGQjjaTgOvNQl007KICBm7zXQaYQEC1r6Bg==
   dependencies:
     "@emotion/memoize" "0.7.3"
 
@@ -1083,9 +1104,9 @@
   integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==
 
 "@hapi/hoek@8.x.x", "@hapi/hoek@^8.3.0":
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.4.0.tgz#3f2153d9eea8942dfe217e1642a420f1fe4087f3"
-  integrity sha512-JLK+vNrtZSQy1PiAAvtaPGiZhFQo+BLywJkD4EHG8vCzlW9w7Y9yfb2be1GFKnZKczLgzHBpgMOBUZs1qBNB5g==
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.0.tgz#2f9ce301c8898e1c3248b0a8564696b24d1a9a5a"
+  integrity sha512-7XYT10CZfPsH7j9F1Jmg1+d0ezOux2oM2GfArAzLwWe4mE2Dr3hVjsAL6+TFY49RRJlCdJDMw3nJsLFroTc8Kw==
 
 "@hapi/joi@^15.0.0":
   version "15.1.1"
@@ -1286,44 +1307,44 @@
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
 
-"@redux-saga/core@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.1.1.tgz#72432130630cca08260086ffc564c2aa5488a0a2"
-  integrity sha512-WKXfj2cYkP0eh74dE1ueMjVDoGJIkppXiMFgx0buVRkXENeZmRxIjM4lh9LEWWFqay7I/Qkw7+cMossa7xXoAQ==
+"@redux-saga/core@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.1.3.tgz#3085097b57a4ea8db5528d58673f20ce0950f6a4"
+  integrity sha512-8tInBftak8TPzE6X13ABmEtRJGjtK17w7VUs7qV17S8hCO5S3+aUTWZ/DBsBJPdE8Z5jOPwYALyvofgq1Ws+kg==
   dependencies:
-    "@babel/runtime" "^7.6.0"
-    "@redux-saga/deferred" "^1.1.0"
-    "@redux-saga/delay-p" "^1.1.0"
-    "@redux-saga/is" "^1.1.0"
-    "@redux-saga/symbols" "^1.1.0"
+    "@babel/runtime" "^7.6.3"
+    "@redux-saga/deferred" "^1.1.2"
+    "@redux-saga/delay-p" "^1.1.2"
+    "@redux-saga/is" "^1.1.2"
+    "@redux-saga/symbols" "^1.1.2"
     "@redux-saga/types" "^1.1.0"
     redux "^4.0.4"
     typescript-tuple "^2.2.1"
 
-"@redux-saga/deferred@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@redux-saga/deferred/-/deferred-1.1.0.tgz#aff018f64a936c288c18bd64ddf9ccfa143db6b4"
-  integrity sha512-wOCJCby3hx14bvrEeFLJ1JJTjJdXDJyC+B3JQ6eiqgzNghylbf969lIYmS2Arf2QuALfUtRBNPXBIMDKG9km4g==
+"@redux-saga/deferred@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/deferred/-/deferred-1.1.2.tgz#59937a0eba71fff289f1310233bc518117a71888"
+  integrity sha512-908rDLHFN2UUzt2jb4uOzj6afpjgJe3MjICaUNO3bvkV/kN/cNeI9PMr8BsFXB/MR8WTAZQq/PlTq8Kww3TBSQ==
 
-"@redux-saga/delay-p@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@redux-saga/delay-p/-/delay-p-1.1.0.tgz#4024f979d0f78763d2e90233be8c922781ae4400"
-  integrity sha512-BcRwXs20kKjgiYEwZARkpVoRIe/hHftW3iwPhdeW4/jPyR9gLv/vG8VsJMF5NDEch+/w/mJtdgSubq+wtOS47g==
+"@redux-saga/delay-p@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/delay-p/-/delay-p-1.1.2.tgz#8f515f4b009b05b02a37a7c3d0ca9ddc157bb355"
+  integrity sha512-ojc+1IoC6OP65Ts5+ZHbEYdrohmIw1j9P7HS9MOJezqMYtCDgpkoqB5enAAZrNtnbSL6gVCWPHaoaTY5KeO0/g==
   dependencies:
-    "@redux-saga/symbols" "^1.1.0"
+    "@redux-saga/symbols" "^1.1.2"
 
-"@redux-saga/is@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@redux-saga/is/-/is-1.1.0.tgz#d74358364ebde160bf1b8bd94903ff7684b12d41"
-  integrity sha512-0uFXWGSvDCfNBdROHwEVixNhFbI3S+UGBQfcPXQiYL+CjIjyR3DTg2Z+NFH9xzP+H4Oh/yGtTHDhC0GxYp7HQQ==
+"@redux-saga/is@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/is/-/is-1.1.2.tgz#ae6c8421f58fcba80faf7cadb7d65b303b97e58e"
+  integrity sha512-OLbunKVsCVNTKEf2cH4TYyNbbPgvmZ52iaxBD4I1fTif4+MTXMa4/Z07L83zW/hTCXwpSZvXogqMqLfex2Tg6w==
   dependencies:
-    "@redux-saga/symbols" "^1.1.0"
+    "@redux-saga/symbols" "^1.1.2"
     "@redux-saga/types" "^1.1.0"
 
-"@redux-saga/symbols@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@redux-saga/symbols/-/symbols-1.1.0.tgz#676b277cb5deb48ce723b2b394cbae97f82e8319"
-  integrity sha512-Fzw1wV3j4hbac3MYmgNE18Z53URmQZeilTHZLF7Lm4SQ1jG4fcU47v2kElsEbQXUSaFqj+uJqdRzmDGNb6pRwQ==
+"@redux-saga/symbols@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@redux-saga/symbols/-/symbols-1.1.2.tgz#216a672a487fc256872b8034835afc22a2d0595d"
+  integrity sha512-EfdGnF423glv3uMwLsGAtE6bg+R9MdqlHEzExnfagXPrIiuxwr3bdiAwz3gi+PsrQ3yBlaBpfGLtDG8rf3LgQQ==
 
 "@redux-saga/types@^1.1.0":
   version "1.1.0"
@@ -1338,41 +1359,41 @@
     any-observable "^0.3.0"
 
 "@sentry/browser@^5.6.3":
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.7.1.tgz#1f8435e2a325d7a09f830065ebce40a2b3c708a4"
-  integrity sha512-K0x1XhsHS8PPdtlVOLrKZyYvi5Vexs9WApdd214bO6KaGF296gJvH1mG8XOY0+7aA5i2A7T3ttcaJNDYS49lzw==
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.9.0.tgz#09f6f544fce51d52f2e086ef776509b15ef04761"
+  integrity sha512-KTpmAau98QyJZtoV7LVYEFd1cdKQGk5yHlRyP3pCkhDcRbgicBNR3umdRDpsI5Ozgix3zNlyQprz0iQPmrPNRQ==
   dependencies:
-    "@sentry/core" "5.7.1"
+    "@sentry/core" "5.8.0"
     "@sentry/types" "5.7.1"
-    "@sentry/utils" "5.7.1"
+    "@sentry/utils" "5.8.0"
     tslib "^1.9.3"
 
-"@sentry/core@5.7.1":
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.7.1.tgz#3eb2b7662cac68245931ee939ec809bf7a639d0e"
-  integrity sha512-AOn3k3uVWh2VyajcHbV9Ta4ieDIeLckfo7UMLM+CTk2kt7C89SayDGayJMSsIrsZlL4qxBoLB9QY4W2FgAGJrg==
+"@sentry/core@5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.8.0.tgz#bbfd2f4711491951a8e3a0e8fa8b172fdf7bff6f"
+  integrity sha512-aAh2KLidIXJVGrxmHSVq2eVKbu7tZiYn5ylW6yzJXFetS5z4MA+JYaSBaG2inVYDEEqqMIkb17TyWxxziUDieg==
   dependencies:
-    "@sentry/hub" "5.7.1"
-    "@sentry/minimal" "5.7.1"
+    "@sentry/hub" "5.8.0"
+    "@sentry/minimal" "5.8.0"
     "@sentry/types" "5.7.1"
-    "@sentry/utils" "5.7.1"
+    "@sentry/utils" "5.8.0"
     tslib "^1.9.3"
 
-"@sentry/hub@5.7.1":
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.7.1.tgz#a52acd9fead7f3779d96e9965c6978aecc8b9cad"
-  integrity sha512-evGh323WR073WSBCg/RkhlUmCQyzU0xzBzCZPscvcoy5hd4SsLE6t9Zin+WACHB9JFsRQIDwNDn+D+pj3yKsig==
+"@sentry/hub@5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.8.0.tgz#56aaeb7324cb66d90db838011cb0127f5558007f"
+  integrity sha512-VdApn1ZCNwH1wwQwoO6pu53PM/qgHG+DQege0hbByluImpLBhAj9w50nXnF/8KzV4UoMIVbzCb6jXzMRmqqp9A==
   dependencies:
     "@sentry/types" "5.7.1"
-    "@sentry/utils" "5.7.1"
+    "@sentry/utils" "5.8.0"
     tslib "^1.9.3"
 
-"@sentry/minimal@5.7.1":
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.7.1.tgz#56afc537737586929e25349765e37a367958c1e1"
-  integrity sha512-nS/Dg+jWAZtcxQW8wKbkkw4dYvF6uyY/vDiz/jFCaux0LX0uhgXAC9gMOJmgJ/tYBLJ64l0ca5LzpZa7BMJQ0g==
+"@sentry/minimal@5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.8.0.tgz#b7ad5113504ab67f1ef2b0f465b7ba608e6b8dc5"
+  integrity sha512-MIlFOgd+JvAUrBBmq7vr9ovRH1HvckhnwzHdoUPpKRBN+rQgTyZy1o6+kA2fASCbrRqFCP+Zk7EHMACKg8DpIw==
   dependencies:
-    "@sentry/hub" "5.7.1"
+    "@sentry/hub" "5.8.0"
     "@sentry/types" "5.7.1"
     tslib "^1.9.3"
 
@@ -1381,10 +1402,10 @@
   resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.7.1.tgz#4c4c1d4d891b6b8c2c3c7b367d306a8b1350f090"
   integrity sha512-tbUnTYlSliXvnou5D4C8Zr+7/wJrHLbpYX1YkLXuIJRU0NSi81bHMroAuHWILcQKWhVjaV/HZzr7Y/hhWtbXVQ==
 
-"@sentry/utils@5.7.1":
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.7.1.tgz#cf37ad55f78e317665cd8680f202d307fa77f1d0"
-  integrity sha512-nhirUKj/qFLsR1i9kJ5BRvNyzdx/E2vorIsukuDrbo8e3iZ11JMgCOVrmC8Eq9YkHBqgwX4UnrPumjFyvGMZ2Q==
+"@sentry/utils@5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.8.0.tgz#34683088159b9935f973b6e6cad1a1cc26bbddac"
+  integrity sha512-KDxUvBSYi0/dHMdunbxAxD3389pcQioLtcO6CI6zt/nJXeVFolix66cRraeQvqupdLhvOk/el649W4fCPayTHw==
   dependencies:
     "@sentry/types" "5.7.1"
     tslib "^1.9.3"
@@ -1630,9 +1651,9 @@
   integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==
 
 "@types/lodash@^4.14.120":
-  version "4.14.144"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.144.tgz#12e57fc99064bce45e5ab3c8bc4783feb75eab8e"
-  integrity sha512-ogI4g9W5qIQQUhXAclq6zhqgqNUr7UlFaqDHbch7WLSLeeM/7d3CRaw7GLajxvyFvhJqw4Rpcz5bhoaYtIx6Tg==
+  version "4.14.147"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.147.tgz#8ca5cfa9c67753dcb73e507d1bbf1c4f8ba6f029"
+  integrity sha512-+0zY1Axql6ru5T85Rh6aR6Zr0xT7c0USLqsHv01b3ID//dOrV3OvpXJGjm69+4QpxoZ0oMNEfmW1ltwXe2WVzQ==
 
 "@types/minimatch@*":
   version "3.0.3"
@@ -1659,14 +1680,14 @@
   integrity sha512-mTdN5Z71smk1+TeqgDF1RhkB+CDCS/CvCm4Iy7gGpheB4tsJVk2hnAhTi6w9v2H0jhixfAMgu1bUkqDA1yuq2Q==
 
 "@types/node@*":
-  version "12.12.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.3.tgz#ebfe83507ac506bc3486314a8aa395be66af8d23"
-  integrity sha512-opgSsy+cEF9N8MgaVPnWVtdJ3o4mV2aMHvDq7thkQUFt0EuOHJon4rQpJfhjmNHB+ikl0Cd6WhWIErOyQ+f7tw==
+  version "12.12.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.7.tgz#01e4ea724d9e3bd50d90c11fd5980ba317d8fa11"
+  integrity sha512-E6Zn0rffhgd130zbCbAr/JdXfXkoOUFAKNs/rF8qnafSJ8KYaA/j3oz7dcwal+lYjLA7xvdd5J4wdYpCTlP8+w==
 
 "@types/node@^10.12.18":
-  version "10.17.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.2.tgz#41b5afbcde1a5a805302a4da3cf399499f1bbf64"
-  integrity sha512-sAh60KDol+MpwOr1RTK0+HgBEYejKsxdpmrOS1Wts5bI03dLzq8F7T0sRXDKeaEK8iWDlGfdzxrzg6vx/c5pNA==
+  version "10.17.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.5.tgz#c1920150f7b90708a7d0f3add12a06bc9123c055"
+  integrity sha512-RElZIr/7JreF1eY6oD5RF3kpmdcreuQPjg5ri4oQ5g9sq7YWU8HkfB3eH8GwAwxf5OaCh0VPi7r4N/yoTGelrA==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1684,9 +1705,9 @@
   integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
 
 "@types/react-dom@*", "@types/react-dom@^16.8.0":
-  version "16.9.3"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.3.tgz#4006ff0e13958af91313869077c04cb20d9b9d04"
-  integrity sha512-FUuZKXPr9qlzUT9lhuzrZgLjH63TvNn28Ch3MvKG4B+F52zQtO8DtE0Opbncy3xaucNZM2WIPfuNTgkbKx5Brg==
+  version "16.9.4"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.4.tgz#0b58df09a60961dcb77f62d4f1832427513420df"
+  integrity sha512-fya9xteU/n90tda0s+FtN5Ym4tbgxpq/hb/Af24dvs6uYnYn+fspaxw5USlw0R8apDNwxsqumdRoCoKitckQqw==
   dependencies:
     "@types/react" "*"
 
@@ -1708,27 +1729,27 @@
     hoist-non-react-statics "^3.3.0"
     redux "^4.0.0"
 
-"@types/react-router-dom@^4.3.5":
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.3.5.tgz#72f229967690c890d00f96e6b85e9ee5780db31f"
-  integrity sha512-eFajSUASYbPHg2BDM1G8Btx+YqGgvROPIg6sBhl3O4kbDdYXdFdfrgQFf/pcBuQVObjfT9AL/dd15jilR5DIEA==
+"@types/react-router-dom@^5.1.2":
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.2.tgz#853f229f1f297513c0be84f7c914a08b778cfdf5"
+  integrity sha512-kRx8hoBflE4Dp7uus+j/0uMHR5uGTAvQtc4A3vOTWKS+epe0leCuxEx7HNT7XGUd1lH53/moWM51MV2YUyhzAg==
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
     "@types/react-router" "*"
 
 "@types/react-router@*":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.2.tgz#41e5e6aa333a7b9a2bfdac753c04e1ca4b3e0d21"
-  integrity sha512-euC3SiwDg3NcjFdNmFL8uVuAFTpZJm0WMFUw+4eXMUnxa7M9RGFEG0szt0z+/Zgk4G2k9JBFhaEnY64RBiFmuw==
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.3.tgz#7c7ca717399af64d8733d8cb338dd43641b96f2d"
+  integrity sha512-0gGhmerBqN8CzlnDmSgGNun3tuZFXerUclWkqEhozdLaJtfcJRUTGkKaEKk+/MpHd1KDS1+o2zb/3PkBUiv2qQ==
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
 
 "@types/react-select@^3.0.5":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/@types/react-select/-/react-select-3.0.6.tgz#63e06aea611bcb264f4b8af069f11f987cbecb5e"
-  integrity sha512-vgEbVtwxtdgmaOPXb8HRlO3VgEwlhx8MVW/nB5yI/q3442x31XETy9P1UAoVRhSoYIEa4TuJGJCkKk7Ss3y5Eg==
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/@types/react-select/-/react-select-3.0.8.tgz#b824a12d438dd493c30ffff49a805f797602a837"
+  integrity sha512-0763TXYZc8bTiHM+DUnWoy9Rg5mk6PxYWBrEe6Fkjgc0Kv0r1RqjZk9/BrK4wdM0RNjYjixlFPnUhOJb76sMGg==
   dependencies:
     "@types/react" "*"
     "@types/react-dom" "*"
@@ -1757,9 +1778,9 @@
     csstype "^2.2.0"
 
 "@types/redux-form@^8.1.9":
-  version "8.1.9"
-  resolved "https://registry.yarnpkg.com/@types/redux-form/-/redux-form-8.1.9.tgz#8e8800541ce191f7145b8ddf3d926ed5dfeb42d3"
-  integrity sha512-JdXoybK8gL4TDFzHASiUpK7YaoQ1HqBZzXkHEUUGlOR0t2i2y42EXEyWuRtMKm/8NdoO9kPANd+mFGgJ07HIFA==
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@types/redux-form/-/redux-form-8.2.0.tgz#e177fb1b837c11ec4c9eb66b4f5e833cdb4bef3f"
+  integrity sha512-tC3DGzd7hvunwjcb+8VOuzaRq+/m56aw5zujHE8AsZs0ZjqIpJDrq95T40Wms7cAazfR+02hpQS/NzsNJICoJA==
   dependencies:
     "@types/react" "*"
     redux "^3.6.0 || ^4.0.0"
@@ -1787,9 +1808,9 @@
   integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
 
 "@types/styled-components@^4.1.8":
-  version "4.1.20"
-  resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-4.1.20.tgz#8afd41039c0fd582152e57ff75c58a5353870de6"
-  integrity sha512-WztLENdKY+H9udccx5ZhAblgTp08NSfOFYdGaWM0MMm+1tEOioYVFwIIQ7Hx+9wWXiWKDXeoX6R3D/i1obnG3g==
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-4.4.0.tgz#15a3d59533fd3a5bd013db4a7c4422ec542c59d2"
+  integrity sha512-QFl+w3hQJNHE64Or3PXMFpC3HAQDiuQLi5o9m1XPEwYWfgCZtAribO5ksjxnO8U0LG8Parh0ESCgVxo4VfxlHg==
   dependencies:
     "@types/react" "*"
     "@types/react-native" "*"
@@ -1817,9 +1838,9 @@
     source-map "^0.6.1"
 
 "@types/webpack@^4.4.19":
-  version "4.39.7"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.39.7.tgz#50ee509a206f9ab2ff812788efb896250068c659"
-  integrity sha512-xXNSgKu6KNNEhATLEDRI/T7hT3n3DVOCE1YWFXIP+XSDedRDAGaGTq8fr51Ntb9L0Bpopx9zJuGwK0/sj5my7g==
+  version "4.39.8"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.39.8.tgz#8083a4eb850ea02961ef6161465434c9b478851f"
+  integrity sha512-lkJvwNJQUPW2SbVwAZW9s9whJp02nzLf2yTNwMULa4LloED9MYS1aNnGeoBCifpAI1pEBkTpLhuyRmBnLEOZAA==
   dependencies:
     "@types/anymatch" "*"
     "@types/node" "*"
@@ -1841,45 +1862,46 @@
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/eslint-plugin@^2.0.0", "@typescript-eslint/eslint-plugin@^2.2.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.6.0.tgz#e82ed43fc4527b21bfe35c20a2d6e4ed49fc7957"
-  integrity sha512-iCcXREU4RciLmLniwKLRPCOFVXrkF7z27XuHq5DrykpREv/mz6ztKAyLg2fdkM0hQC7659p5ZF5uStH7uzAJ/w==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.7.0.tgz#dff176bdb73dfd7e2e43062452189bd1b9db6021"
+  integrity sha512-H5G7yi0b0FgmqaEUpzyBlVh0d9lq4cWG2ap0RKa6BkF3rpBb6IrAoubt1NWh9R2kRs/f0k6XwRDiDz3X/FqXhQ==
   dependencies:
-    "@typescript-eslint/experimental-utils" "2.6.0"
+    "@typescript-eslint/experimental-utils" "2.7.0"
     eslint-utils "^1.4.2"
     functional-red-black-tree "^1.0.1"
     regexpp "^2.0.1"
     tsutils "^3.17.1"
 
-"@typescript-eslint/experimental-utils@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.6.0.tgz#ed70bef72822bff54031ff0615fc888b9e2b6e8a"
-  integrity sha512-34BAFpNOwHXeqT+AvdalLxOvcPYnCxA5JGmBAFL64RGMdP0u65rXjii7l/nwpgk5aLEE1LaqF+SsCU0/Cb64xA==
+"@typescript-eslint/experimental-utils@2.7.0":
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.7.0.tgz#58d790a3884df3041b5a5e08f9e5e6b7c41864b5"
+  integrity sha512-9/L/OJh2a5G2ltgBWJpHRfGnt61AgDeH6rsdg59BH0naQseSwR7abwHq3D5/op0KYD/zFT4LS5gGvWcMmegTEg==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.6.0"
+    "@typescript-eslint/typescript-estree" "2.7.0"
     eslint-scope "^5.0.0"
 
 "@typescript-eslint/parser@^2.0.0", "@typescript-eslint/parser@^2.2.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.6.0.tgz#5106295c6a7056287b4719e24aae8d6293d5af49"
-  integrity sha512-AvLejMmkcjRTJ2KD72v565W4slSrrzUIzkReu1JN34b8JnsEsxx7S9Xx/qXEuMQas0mkdUfETr0j3zOhq2DIqQ==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.7.0.tgz#b5e6a4944e2b68dba1e7fbfd5242e09ff552fd12"
+  integrity sha512-ctC0g0ZvYclxMh/xI+tyqP0EC2fAo6KicN9Wm2EIao+8OppLfxji7KAGJosQHSGBj3TcqUrA96AjgXuKa5ob2g==
   dependencies:
     "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "2.6.0"
-    "@typescript-eslint/typescript-estree" "2.6.0"
+    "@typescript-eslint/experimental-utils" "2.7.0"
+    "@typescript-eslint/typescript-estree" "2.7.0"
     eslint-visitor-keys "^1.1.0"
 
-"@typescript-eslint/typescript-estree@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.6.0.tgz#d3e9d8e001492e2b9124c4d4bd4e7f03c0fd7254"
-  integrity sha512-A3lSBVIdj2Gp0lFEL6in2eSPqJ33uAc3Ko+Y4brhjkxzjbzLnwBH22CwsW2sCo+iwogfIyvb56/AJri15H0u5Q==
+"@typescript-eslint/typescript-estree@2.7.0":
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.7.0.tgz#34fd98c77a07b40d04d5b4203eddd3abeab909f4"
+  integrity sha512-vVCE/DY72N4RiJ/2f10PTyYekX2OLaltuSIBqeHYI44GQ940VCYioInIb8jKMrK9u855OEJdFC+HmWAZTnC+Ag==
   dependencies:
     debug "^4.1.1"
     glob "^7.1.4"
     is-glob "^4.0.1"
     lodash.unescape "4.0.1"
     semver "^6.3.0"
+    tsutils "^3.17.1"
 
 "@uppy/companion-client@^1.4.1":
   version "1.4.1"
@@ -1889,28 +1911,28 @@
     namespace-emitter "^2.0.1"
 
 "@uppy/core@^1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@uppy/core/-/core-1.5.1.tgz#61a083ea18e35d53e37248db6a379d480abe39c1"
-  integrity sha512-8HyCSKxece1PyOCx2oiZ8M61+ci6WSvlVukztBaU2eV2wjVYM/Bqxdv3dQtcjLwV82+2LD+9pYp2mlvou4bP5A==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@uppy/core/-/core-1.6.0.tgz#de3fec249adbaac499ecf3af5e7a186cb320f2d6"
+  integrity sha512-uKiP0HiI6kO1MhBGluJICExB7Pc5zrxNdPBjuJ3h4ZMLmqXqWmlelJ1T2MGZxpfFrBwmBM1jGuatLN+1n6ziyQ==
   dependencies:
     "@uppy/store-default" "^1.2.0"
-    "@uppy/utils" "^2.0.0"
+    "@uppy/utils" "^2.1.0"
     cuid "^2.1.1"
     lodash.throttle "^4.1.1"
     mime-match "^1.0.2"
     namespace-emitter "^2.0.1"
     preact "8.2.9"
 
-"@uppy/dashboard@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@uppy/dashboard/-/dashboard-1.4.1.tgz#8b9c1841d4f2594fa998d1a95282dd3f907d009d"
-  integrity sha512-/JG5YTPOu2oz2qQNSPEnXFTY2S0YWxPiV7x5SCwqP3zMI2g/tlG5l8sYTN2+KCWS8JZZaqyEaSWIh8KKQULcTQ==
+"@uppy/dashboard@^1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@uppy/dashboard/-/dashboard-1.5.0.tgz#acf38b7cf8ebf0ba59ff81ad5b721fea922b5f2e"
+  integrity sha512-6oHwPXk+ubBINV+YlqmjyzHpBUqPKDldjIOIWHhLwJOwz28LzdnCgYNOdaFxdPtg3YwKUzi26hn47Wg6CgzdVA==
   dependencies:
-    "@uppy/informer" "^1.3.1"
-    "@uppy/provider-views" "^1.4.0"
-    "@uppy/status-bar" "^1.3.1"
-    "@uppy/thumbnail-generator" "^1.4.0"
-    "@uppy/utils" "^2.0.0"
+    "@uppy/informer" "^1.3.2"
+    "@uppy/provider-views" "^1.5.0"
+    "@uppy/status-bar" "^1.4.0"
+    "@uppy/thumbnail-generator" "^1.5.0"
+    "@uppy/utils" "^2.1.0"
     classnames "^2.2.6"
     cuid "^2.1.1"
     is-shallow-equal "^1.0.1"
@@ -1921,85 +1943,85 @@
     preact-css-transition-group "^1.3.0"
     resize-observer-polyfill "^1.5.0"
 
-"@uppy/drag-drop@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@uppy/drag-drop/-/drag-drop-1.3.1.tgz#d2af47a33d0f4eef7283dabcc174a782b3134a5f"
-  integrity sha512-0LOMG766h+E0QKuYy7IgMGXhODhBAIEA5IzBEGF9LWdaYvsAx1JM9Z+wMEn3egu2qFVTTSyhOojROoaV1yDHBg==
+"@uppy/drag-drop@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@uppy/drag-drop/-/drag-drop-1.4.0.tgz#bdeb50a5b1f95454e9296185955d002b370ad5a0"
+  integrity sha512-gmWqZhoDOxdeXZexd3gtsmijhrrP+STi8eq94BsTntQMNij7cdLR98cAZUfVWfZ6J0fdwgH2g9p2K9BpTDCTxQ==
   dependencies:
-    "@uppy/utils" "^2.0.0"
+    "@uppy/utils" "^2.1.0"
     preact "8.2.9"
 
 "@uppy/file-input@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@uppy/file-input/-/file-input-1.3.1.tgz#86e92fa1c7cd379a55b64a828df6369030366377"
-  integrity sha512-Z8Qvdbaaw0SzPwg0gSws2SYKdOS86QDHbRLnNJNEXRNrETlYjeqZvAOAtanQZhzkKkxXrpS1jr/VISjNS16f4A==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@uppy/file-input/-/file-input-1.4.0.tgz#9d7191d8bd1b7a9fdab3fd84622a5c74fbb61611"
+  integrity sha512-JbmDnhbIkuzZj/Im3jWTguDUarbbCQHeCXc2Zbhh9AutLQaMxITsdB3KoTRNd0dlkwfLY9b5zOdcqOfa0aJXEg==
   dependencies:
-    "@uppy/utils" "^2.0.0"
+    "@uppy/utils" "^2.1.0"
     preact "8.2.9"
 
 "@uppy/google-drive@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@uppy/google-drive/-/google-drive-1.3.2.tgz#473ab3cd44eb0df252e9b462c2b25cf31bbb4d7e"
-  integrity sha512-CezojbaXQomhdItkTPu9j7yguVjaX02kIfr3a6ojXBuFhMY2JVb7ef8EkfabAa28RwK+l8sqEkg/AQjVfqZI8w==
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@uppy/google-drive/-/google-drive-1.3.3.tgz#d0b2127a14bfd01d7b1153e810220d01a48ab131"
+  integrity sha512-7KlhTeOemuJhlTw012BeAfF0/r7yZ8LB7CwrDWMV59T3LjF9ScY7IkBpw2axUhqOPQ35G7YnGRnTHObJV35yeA==
   dependencies:
     "@uppy/companion-client" "^1.4.1"
-    "@uppy/provider-views" "^1.4.0"
-    "@uppy/utils" "^2.0.0"
+    "@uppy/provider-views" "^1.5.0"
+    "@uppy/utils" "^2.1.0"
     preact "8.2.9"
 
-"@uppy/informer@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@uppy/informer/-/informer-1.3.1.tgz#ce9ac6fea1e695e5a38a65f2760ec1a4d522fde4"
-  integrity sha512-SuD686BxdEo4eAHSxjK0haPE0x8Pi2qsKUtRITx4CM+t4NKrg21/MRjD/dD4r4ydyYO5HhC5wTZfkAMA8BRVzQ==
+"@uppy/informer@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@uppy/informer/-/informer-1.3.2.tgz#5a6326dfeff0f14be2ff436a1d30160308579ee7"
+  integrity sha512-4XOdPitL0ZfbVXWFcvUNGkvkkC+5kO0MlZrvNTv7JsnJ8obvzwcsBd/BWBb4zXOAKFFA7NvyWPy5ErCibr4eMg==
   dependencies:
-    "@uppy/utils" "^2.0.0"
+    "@uppy/utils" "^2.1.0"
     preact "8.2.9"
 
 "@uppy/onedrive@^0.1.1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@uppy/onedrive/-/onedrive-0.1.1.tgz#0874117b8e3c12bbdd86987cd24ba518b4a5721c"
-  integrity sha512-t9vwG+dmYJYa5JuPB05jQgV1V3mOgnVTSU5ScxloqI2O0FC9VFWh1P7M0A5AlwfO0BOrTU4oXRG9m6jWOdx2CA==
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@uppy/onedrive/-/onedrive-0.1.2.tgz#54eaccec279314868a226a73a9ccb6d0c0e3a9dd"
+  integrity sha512-tW6E7y3JAnvtcaTkozvXEbMdgECoFIMiGc9ELwdm9/0Yv0rI3h4GKB5c4Jo0YQTUPQwVOeePNmBs6o3hP+WOoA==
   dependencies:
     "@uppy/companion-client" "^1.4.1"
-    "@uppy/provider-views" "^1.4.0"
-    "@uppy/utils" "^2.0.0"
+    "@uppy/provider-views" "^1.5.0"
+    "@uppy/utils" "^2.1.0"
     preact "8.2.9"
 
-"@uppy/progress-bar@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@uppy/progress-bar/-/progress-bar-1.3.1.tgz#0b551fb4182abab9f587170d2ce5202928ab2c74"
-  integrity sha512-GlAfyXJWsY+9kpu1H2LCv/mDe6roNQAlznHPF1S6045NvxphQLIqebe9+ZK8nVhZKY6QnioXl57cay4N9cjvjQ==
+"@uppy/progress-bar@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@uppy/progress-bar/-/progress-bar-1.3.2.tgz#7cf2fcbff76906129bb95710244e725b1dcaa5ad"
+  integrity sha512-86Lf9Uzp/wIIV1/VrQoIAbT1rQtBkEauYCpWVRsA2z/NTMr6uzbmVXObGSOVaYO0rskj3eHMsSHe1zNtN4LnZQ==
   dependencies:
-    "@uppy/utils" "^2.0.0"
+    "@uppy/utils" "^2.1.0"
     preact "8.2.9"
 
-"@uppy/provider-views@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@uppy/provider-views/-/provider-views-1.4.0.tgz#ffe4b9bb8424b96b9a5f49d65097992c8b9c2886"
-  integrity sha512-y9laKMGu4GshqMmsxCBovqBtNKl4FOvwZvfuZZ4QC71xpuGLrEi/Y21JMHkh0aVTWxN4AmlMkj5t9fDKuhAxXw==
+"@uppy/provider-views@^1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@uppy/provider-views/-/provider-views-1.5.0.tgz#3ab5a46cf7053daf40e5dac015ea092c20e5f6f2"
+  integrity sha512-qjVjfi2XiBTZaflgo7Pv5AHyBTJP2hROgUOpO6oP8XgLbINp3gk6yvBw8ByxNEPVb15FnHFpsNuvIERuBi4AWg==
   dependencies:
-    "@uppy/utils" "^2.0.0"
+    "@uppy/utils" "^2.1.0"
     classnames "^2.2.6"
     preact "8.2.9"
 
 "@uppy/react@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@uppy/react/-/react-1.3.2.tgz#6c924ea19ed4cca7c4c46636b7e47085377b26fd"
-  integrity sha512-EzXDxyyMQZNoDwiUJwxRM9NNUppcFrqZ7aE2BZrGVBHKH0Rr9jSTDxkEts/kRQ+uUbsQhF3ppU6kYdR0H1bdbA==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@uppy/react/-/react-1.4.0.tgz#e5a79c8a0f8525842699d54391ca1f4d3b3f72f6"
+  integrity sha512-hT3I/DhwDO+YmxMZXA9Q8zFy29Z1v8elTzeqjxk+gGbBN4sk2//P9hbDS+xKaA/05Y5NuutMFVqFkxO8uOcCNg==
   dependencies:
-    "@uppy/dashboard" "^1.4.1"
-    "@uppy/drag-drop" "^1.3.1"
-    "@uppy/progress-bar" "^1.3.1"
-    "@uppy/status-bar" "^1.3.1"
-    "@uppy/utils" "^2.0.0"
+    "@uppy/dashboard" "^1.5.0"
+    "@uppy/drag-drop" "^1.4.0"
+    "@uppy/progress-bar" "^1.3.2"
+    "@uppy/status-bar" "^1.4.0"
+    "@uppy/utils" "^2.1.0"
     prop-types "^15.6.1"
 
-"@uppy/status-bar@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@uppy/status-bar/-/status-bar-1.3.1.tgz#36525803d5a55e6c3043604cf429b21d8afbae86"
-  integrity sha512-bEHyQOFRnqPXbAjvbPHtCdlMzrT91lR/r+zL4hRHU+pAJLIebLlhsXcxkKrJWtho6s0TcKXq/KGUPRVFIPVYww==
+"@uppy/status-bar@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@uppy/status-bar/-/status-bar-1.4.0.tgz#0f8e14be0b177bcb3d83971f55ddec97e82a0b04"
+  integrity sha512-NZqvAX21vGm7wZjGCq4vlY67CBGURMB0UUi9QPNJGnS79/3oTxbinRcm3vXzgxYwh38BuE8y4tKrDv/ENLxoUA==
   dependencies:
-    "@uppy/utils" "^2.0.0"
+    "@uppy/utils" "^2.1.0"
     classnames "^2.2.6"
     lodash.throttle "^4.1.1"
     preact "8.2.9"
@@ -2009,36 +2031,36 @@
   resolved "https://registry.yarnpkg.com/@uppy/store-default/-/store-default-1.2.0.tgz#4007b84e6eef24b3f07b0fe5457548386cea77d9"
   integrity sha512-mnkxdX4DJMP2nrBklh5MXdn31bAyBSlCcp4+BZanFwv4WiCEpg/ruYzNzaJ1nVyuINJEDj2nx/DWxo+1F6WuWw==
 
-"@uppy/thumbnail-generator@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@uppy/thumbnail-generator/-/thumbnail-generator-1.4.0.tgz#746e1b10a126b4b6992fe1bc5311f86c3c2321c0"
-  integrity sha512-Ftgr36xp6zS1Wh37ceURV/I9LiG7oI3F6YD0cviCI5dw8vYpjV8k9TvE6NBfZ3cnHk/+DAevaOR+pyjBIvQYHA==
+"@uppy/thumbnail-generator@^1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@uppy/thumbnail-generator/-/thumbnail-generator-1.5.0.tgz#5ba83287f6f0c81929f0a3243eb5c91c630c44ae"
+  integrity sha512-Fq8St34qh4ubed54xGPROs/C8tZfR1rwc0BajbupJKtcNJ7siVrPwoNra9MOKZ/2Gc9DCCpYGiBNyaMJZoRsNg==
   dependencies:
-    "@uppy/utils" "^2.0.0"
+    "@uppy/utils" "^2.1.0"
     exif-js "2.3.0"
 
 "@uppy/url@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@uppy/url/-/url-1.3.2.tgz#94a994585e7e744d146c20279da1aa06143bff6c"
-  integrity sha512-mvP+b4nFHHqcdQE6Wy+hDHIpZsUdffHWHLFOgvM/g7DIcyrqrlhBRCfXHPYI7kl8QWqg7IbWFrQ6OYeOI9AgAg==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@uppy/url/-/url-1.4.0.tgz#0a717abbcb6d17dd5be865af398d17de45989bc9"
+  integrity sha512-OTImClRq4ppVqJ1uOXs4HnHFfi5MvggK5pldXCzmylAgU0nSN2NOfzTnJb1SZ5n08DmuXkEckASOIaPDasKJcg==
   dependencies:
     "@uppy/companion-client" "^1.4.1"
-    "@uppy/utils" "^2.0.0"
+    "@uppy/utils" "^2.1.0"
     preact "8.2.9"
 
-"@uppy/utils@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@uppy/utils/-/utils-2.0.0.tgz#f603458cedb3d86017e33f00cce32e20f690b6f5"
-  integrity sha512-FWuSmdCK+dB5ybGlTp5xx1C6hf9Tsdl58Lrfg9KUF/4ogkzupj/2uEYmcn26S0GZ8FJPWNG/858EeF/bZNFAQw==
+"@uppy/utils@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@uppy/utils/-/utils-2.1.0.tgz#2f8c20288906f05310e52c6b681715ec25f2bd68"
+  integrity sha512-poNKSxx6g2h17uPi7P+EV0MvIDl15peh7m0RI26c73v47Kln8C1Th94erqMSPEbsmf37/3bz1TjABJUdMhLaDw==
   dependencies:
     lodash.throttle "^4.1.1"
 
 "@uppy/webcam@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@uppy/webcam/-/webcam-1.3.1.tgz#e9bb68eee6a3cdff11888705b7d35ab0a655e09b"
-  integrity sha512-9wo2cC2Vw1Rqc7IL1C8btT4BiB5DouLbIKJM/oSgmQ8SatwytMDPtAA0qgD0i/cC6rmGZh1J6W7IdnstJFoUSA==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@uppy/webcam/-/webcam-1.4.0.tgz#84b6301fe6add941abd5d6f2dcc4402a80d9e8d8"
+  integrity sha512-J60qASJFzEnI+thY7vM/8b7LAvCVWDU9F0P3cvAoF1FOIwnGn4dwxezXJnjjoOmUatZJoTcppW05yKOV0R/QwA==
   dependencies:
-    "@uppy/utils" "^2.0.0"
+    "@uppy/utils" "^2.1.0"
     preact "8.2.9"
 
 "@webassemblyjs/ast@1.8.5":
@@ -2198,9 +2220,9 @@
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
 abab@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.2.tgz#a2fba1b122c69a85caa02d10f9270c7219709a9d"
-  integrity sha512-2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
+  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
 abbrev@1:
   version "1.1.1"
@@ -2339,6 +2361,11 @@ ansi-regex@^4.0.0, ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -2561,16 +2588,16 @@ atob@^2.1.1:
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^9.6.1:
-  version "9.7.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.0.tgz#905ec19e50f04545fe9ff131182cc9ab25246901"
-  integrity sha512-j2IRvaCfrUxIiZun9ba4mhJ2omhw4OY88/yVzLO+lHhGBumAAK72PgM6gkbSN8iregPOn1ZlxGkmZh2CQ7X4AQ==
+  version "9.7.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.1.tgz#9ffc44c55f5ca89253d9bb7186cefb01ef57747f"
+  integrity sha512-w3b5y1PXWlhYulevrTJ0lizkQ5CyqfeU6BIRDbuhsMupstHQOeb1Ur80tcB1zxSu7AwyY/qCQ7Vvqklh31ZBFw==
   dependencies:
     browserslist "^4.7.2"
-    caniuse-lite "^1.0.30001004"
+    caniuse-lite "^1.0.30001006"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.19"
+    postcss "^7.0.21"
     postcss-value-parser "^4.0.2"
 
 aws-sign2@~0.7.0:
@@ -3049,9 +3076,9 @@ buffer-xor@^1.0.3:
   integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
 buffer@^4.3.0:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -3198,10 +3225,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001004:
-  version "1.0.30001006"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001006.tgz#5b6e8288792cfa275f007b2819a00ccad7112655"
-  integrity sha512-MXnUVX27aGs/QINz+QG1sWSLDr3P1A3Hq5EUWoIt0T7K24DuvMxZEnh3Y5aHlJW6Bz2aApJdSewdYLd8zQnUuw==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001004, caniuse-lite@^1.0.30001006:
+  version "1.0.30001010"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001010.tgz#397a14034d384260453cc81994f494626d34b938"
+  integrity sha512-RA5GH9YjFNea4ZQszdWgh2SC+dpLiRAg4VDQS2b5JRI45OxmbGrYocYHTa9x0bKMQUE7uvHkNPNffUr+pCxSGw==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -3586,7 +3613,7 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@1.6.0, convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0:
+convert-source-map@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
   integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
@@ -3598,6 +3625,13 @@ convert-source-map@^0.3.3:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
   integrity sha1-8dgClQr33SYxof6+BZZVDIarMZA=
 
+convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -3626,9 +3660,9 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js-compat@^3.1.1:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.3.5.tgz#7abf70778b73dc74aa99d4075aefcd99b76f2c3a"
-  integrity sha512-44ZORuapx0MUht0MUk0p9lcQPh7n/LDXehimTmjCs0CYblpKZcqVd5w0OQDUDq5OQjEbazWObHDQJWvvHYPNTg==
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.1.tgz#e12c5a3ef9fcb50fd9d9a32805bfe674f9139246"
+  integrity sha512-YdeJI26gLc0CQJ9asLE5obEgBz2I0+CIgnoTbS2T0d5IPQw/OCgCIFR527RmpduxjrB3gSEHoGOCTq9sigOyfw==
   dependencies:
     browserslist "^4.7.2"
     semver "^6.3.0"
@@ -3823,12 +3857,12 @@ css-select@^1.1.0:
     nth-check "~1.0.1"
 
 css-select@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz#ab4386cec9e1f668855564b17c3733b43b2a5ede"
-  integrity sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef"
+  integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==
   dependencies:
     boolbase "^1.0.0"
-    css-what "^2.1.2"
+    css-what "^3.2.1"
     domutils "^1.7.0"
     nth-check "^1.0.2"
 
@@ -3854,11 +3888,16 @@ css-unit-converter@^1.1.1:
   resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
   integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=
 
-css-what@2.1, css-what@^2.1.2:
+css-what@2.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
   integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
 
+css-what@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz#f4a8f12421064621b456755e34a03a2c22df5da1"
+  integrity sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==
+
 css@^2.0.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
@@ -4078,9 +4117,9 @@ dedent@^0.7.0:
   integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
 
 deep-equal@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.0.tgz#3103cdf8ab6d32cf4a8df7865458f2b8d33f3745"
-  integrity sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
+  integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
   dependencies:
     is-arguments "^1.0.4"
     is-date-object "^1.0.1"
@@ -4185,9 +4224,9 @@ depd@~1.1.2:
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 des.js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
+  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -4322,9 +4361,9 @@ dom-helpers@^3.4.0:
     "@babel/runtime" "^7.1.2"
 
 dom-serializer@0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.1.tgz#13650c850daffea35d8b626a4cfc4d3a17643fdb"
-  integrity sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
+  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
   dependencies:
     domelementtype "^2.0.1"
     entities "^2.0.0"
@@ -4430,9 +4469,9 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.295:
-  version "1.3.296"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.296.tgz#a1d4322d742317945285d3ba88966561b67f3ac8"
-  integrity sha512-s5hv+TSJSVRsxH190De66YHb50pBGTweT9XGWYu/LMR20KX6TsjFzObo36CjVAzM+PUeeKSBRtm/mISlCzeojQ==
+  version "1.3.306"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.306.tgz#e8265301d053d5f74e36cb876486830261fbe946"
+  integrity sha512-frDqXvrIROoYvikSKTIKbHbzO6M3/qC6kCIt/1FOa9kALe++c4VAJnwjSFvf1tYLEUsP2n9XZ4XSCyqc3l7A/A==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -4536,9 +4575,9 @@ es-abstract@^1.12.0, es-abstract@^1.15.0, es-abstract@^1.5.1, es-abstract@^1.7.0
     string.prototype.trimright "^2.1.0"
 
 es-to-primitive@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
-  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
   dependencies:
     is-callable "^1.1.4"
     is-date-object "^1.0.1"
@@ -4874,9 +4913,9 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     safe-buffer "^5.1.1"
 
 exec-sh@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
-  integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
+  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
 
 execa@^1.0.0:
   version "1.0.0"
@@ -4978,9 +5017,9 @@ express@^4.16.2:
     vary "~1.1.2"
 
 ext@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/ext/-/ext-1.1.2.tgz#d1d216c83641bb4cb7684622b063cff44a19ce35"
-  integrity sha512-/KLjJdTNyDepCihrk4HQt57nAE1IRCEo5jUt+WgWGCr1oARhibDvmI2DMcSNWood1T9AUWwq+jaV1wvRqaXfnA==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.2.0.tgz#8dd8d2dd21bcced3045be09621fa0cbf73908ba4"
+  integrity sha512-0ccUQK/9e3NreLFg6K6np8aPyRgwycx+oFGtfx1dSp7Wj00Ozw9r05FgBRlzjf2XBM7LAzwgLyDscRrtSU91hA==
   dependencies:
     type "^2.0.0"
 
@@ -5080,7 +5119,7 @@ fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
   integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
-fast-levenshtein@~2.0.4:
+fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -5263,9 +5302,9 @@ flatted@^2.0.0:
   integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
 
 flatten@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-  integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
+  integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
 
 flow-bin@^0.91.0:
   version "0.91.0"
@@ -5554,9 +5593,9 @@ glob-to-regexp@^0.3.0:
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
 glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1:
-  version "7.1.5"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0"
-  integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -5679,9 +5718,9 @@ handle-thing@^2.0.0:
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
 handlebars@^4.1.2:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.1.tgz#8a01c382c180272260d07f2d1aa3ae745715c7ba"
-  integrity sha512-C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA==
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.2.tgz#5a4eb92ab5962ca3415ac188c86dc7f784f76a0f"
+  integrity sha512-29Zxv/cynYB7mkT1rVWQnV7mGX6v7H/miQ6dbEpYTKq5eJBN7PsRB+ViYJlcT6JINTSu4dVB9kOqEun78h6Exg==
   dependencies:
     neo-async "^2.6.0"
     optimist "^0.6.1"
@@ -6081,9 +6120,9 @@ import-fresh@^2.0.0:
     resolve-from "^3.0.0"
 
 import-fresh@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz#6d33fa1dcef6df930fae003446f33415af905118"
-  integrity sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
+  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
@@ -7360,9 +7399,9 @@ lines-and-columns@^1.1.6:
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
 lint-staged@^9.2.5:
-  version "9.4.2"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-9.4.2.tgz#14cb577a9512f520691f8b5aefce6a8f7ead6c04"
-  integrity sha512-OFyGokJSWTn2M6vngnlLXjaHhi8n83VIZZ5/1Z26SULRUWgR3ITWpAEQC9Pnm3MC/EpCxlwts/mQWDHNji2+zA==
+  version "9.4.3"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-9.4.3.tgz#f55ad5f94f6e105294bfd6499b23142961f7b982"
+  integrity sha512-PejnI+rwOAmKAIO+5UuAZU9gxdej/ovSEOAY34yMfC3OS4Ac82vCBPzAWLReR9zCPOMqeVwQRaZ3bUBpAsaL2Q==
   dependencies:
     chalk "^2.4.2"
     commander "^2.20.0"
@@ -7595,9 +7634,9 @@ log-update@^2.3.0:
     wrap-ansi "^3.0.1"
 
 loglevel@^1.4.1:
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.4.tgz#f408f4f006db8354d0577dcf6d33485b3cb90d56"
-  integrity sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312"
+  integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
@@ -7836,12 +7875,7 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.40.0:
-  version "1.40.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
-  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
-
-"mime-db@>= 1.40.0 < 2":
+mime-db@1.42.0, "mime-db@>= 1.40.0 < 2":
   version "1.42.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
   integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==
@@ -7854,11 +7888,11 @@ mime-match@^1.0.2:
     wildcard "^1.1.0"
 
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
-  version "2.1.24"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
-  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+  version "2.1.25"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437"
+  integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==
   dependencies:
-    mime-db "1.40.0"
+    mime-db "1.42.0"
 
 mime@1.6.0:
   version "1.6.0"
@@ -8232,9 +8266,9 @@ node-pre-gyp@^0.12.0:
     tar "^4"
 
 node-releases@^1.1.29, node-releases@^1.1.38:
-  version "1.1.39"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.39.tgz#c1011f30343aff5b633153b10ff691d278d08e8d"
-  integrity sha512-8MRC/ErwNCHOlAFycy9OPca46fQYUjbJRDcZTHVWIGXIjYLM73k70vv3WkYutVnM4cCo4hE0MqBVVZjP6vjISA==
+  version "1.1.40"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.40.tgz#a94facfa8e2d612302601ca1361741d529c4515a"
+  integrity sha512-r4LPcC5b/bS8BdtWH1fbeK88ib/wg9aqmg6/s3ngNLn2Ewkn/8J6Iw3P9RTlfIAdSdvYvQl2thCY5Y+qTAQ2iQ==
   dependencies:
     semver "^6.3.0"
 
@@ -8383,9 +8417,9 @@ number-is-nan@^1.0.0:
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 nwsapi@^2.0.7, nwsapi@^2.1.3:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f"
-  integrity sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
 oauth-sign@~0.9.0:
   version "0.9.0"
@@ -8412,9 +8446,9 @@ object-hash@^1.3.1:
   integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
 
 object-inspect@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
-  integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
+  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
 
 object-is@^1.0.1:
   version "1.0.1"
@@ -8567,16 +8601,16 @@ optimize-css-assets-webpack-plugin@5.0.3:
     last-call-webpack-plugin "^3.0.0"
 
 optionator@^0.8.1, optionator@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
   dependencies:
     deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
+    fast-levenshtein "~2.0.6"
     levn "~0.3.0"
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
-    wordwrap "~1.0.0"
+    word-wrap "~1.2.3"
 
 ora@^3.4.0:
   version "3.4.0"
@@ -8873,9 +8907,9 @@ path-to-regexp@0.1.7:
   integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
 path-to-regexp@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
-  integrity sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
+  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
   dependencies:
     isarray "0.0.1"
 
@@ -8924,9 +8958,9 @@ performance-now@^2.1.0:
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 picomatch@^2.0.5:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6"
-  integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.1.1.tgz#ecdfbea7704adb5fe6fb47f9866c4c0e15e905c5"
+  integrity sha512-OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA==
 
 pify@^2.0.0:
   version "2.3.0"
@@ -9240,9 +9274,9 @@ postcss-image-set-function@^3.0.1:
     postcss-values-parser "^2.0.0"
 
 postcss-initial@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.1.tgz#99d319669a13d6c06ef8e70d852f68cb1b399b61"
-  integrity sha512-I2Sz83ZSHybMNh02xQDK609lZ1/QOyYeuizCjzEhlMgeV/HcDJapQiH4yTqLjZss0X6/6VvKFXUeObaHpJoINw==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz#f018563694b3c16ae8eaabe3c585ac6319637b2d"
+  integrity sha512-ugA2wKonC0xeNHgirR4D3VWHs2JcU08WAi1KFLVcnb7IN89phID6Qtg2RIctWbnvp1TM2BOmDtX8GGLCKdR8YA==
   dependencies:
     lodash.template "^4.5.0"
     postcss "^7.0.2"
@@ -9686,7 +9720,7 @@ postcss@7.0.14:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.19, postcss@^7.0.2, postcss@^7.0.5, postcss@^7.0.6:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.21"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17"
   integrity sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==
@@ -9723,9 +9757,9 @@ prettier-linter-helpers@^1.0.0:
     fast-diff "^1.1.2"
 
 prettier@^1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
-  integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
 pretty-bytes@^5.1.0:
   version "5.3.0"
@@ -9801,9 +9835,9 @@ promise@8.0.3:
     asap "~2.0.6"
 
 prompts@^2.0.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.2.1.tgz#f901dd2a2dfee080359c0e20059b24188d75ad35"
-  integrity sha512-VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.0.tgz#a444e968fa4cc7e86689a74050685ac8006c4cc4"
+  integrity sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg==
   dependencies:
     kleur "^3.0.3"
     sisteransi "^1.0.3"
@@ -10135,9 +10169,9 @@ react-netlify-identity@^0.1.9:
     tsdx "^0.6.0"
 
 react-popper@^1.3.3:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.4.tgz#f0cd3b0d30378e1f663b0d79bcc8614221652ced"
-  integrity sha512-9AcQB29V+WrBKk6X7p0eojd1f25/oJajVdMZkywIoAV6Ag7hzE1Mhyeup2Q1QnvFRtGQFQvtqfhlEoDAPfKAVA==
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.6.tgz#32122f83af8fda01bdd4f86625ddacaf64fdd06d"
+  integrity sha512-kLTfa9z8n+0jJvRVal9+vIuirg41rObg4Bbrvv/ZfsGPQDN9reyVVSxqnHF1ZNgXgV7x11PeUfd5ItF8DZnqhg==
   dependencies:
     "@babel/runtime" "^7.1.2"
     create-react-context "^0.3.0"
@@ -10167,7 +10201,7 @@ react-rnd@^10.1.1:
     react-draggable "4.0.3"
     tslib "1.10.0"
 
-react-router-dom@^5.0.1:
+react-router-dom@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz#06701b834352f44d37fbb6311f870f84c76b9c18"
   integrity sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew==
@@ -10180,7 +10214,7 @@ react-router-dom@^5.0.1:
     tiny-invariant "^1.0.2"
     tiny-warning "^1.0.0"
 
-react-router@5.1.2, react-router@^5.0.1:
+react-router@5.1.2, react-router@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz#6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418"
   integrity sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A==
@@ -10468,11 +10502,11 @@ redux-form@^8.2.6:
     immutable "3.8.2"
 
 redux-saga@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.1.1.tgz#7e02879beb02c92030b5fbe746fd70e8bda97dfb"
-  integrity sha512-guSnGJ/uEF8yL8Mn4aNa7HxRGCpVUALCkec9iTTD0fOhQqkF6bRQkBLeS+7/cAH3nFnr299bi/DOurTi1apcCA==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.1.3.tgz#9f3e6aebd3c994bbc0f6901a625f9a42b51d1112"
+  integrity sha512-RkSn/z0mwaSa5/xH/hQLo8gNf4tlvT18qXDNvedihLcfzh+jMchDgaariQoehCpgRltEm4zHKJyINEz6aqswTw==
   dependencies:
-    "@redux-saga/core" "^1.1.1"
+    "@redux-saga/core" "^1.1.3"
 
 "redux@^3.6.0 || ^4.0.0", redux@^4.0.0, redux@^4.0.1, redux@^4.0.4:
   version "4.0.4"
@@ -10598,19 +10632,19 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request-promise-core@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346"
-  integrity sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==
+request-promise-core@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
   dependencies:
-    lodash "^4.17.11"
+    lodash "^4.17.15"
 
 request-promise-native@^1.0.5:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59"
-  integrity sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
+  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
   dependencies:
-    request-promise-core "1.1.2"
+    request-promise-core "1.1.3"
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
@@ -10914,9 +10948,9 @@ rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0,
     estree-walker "^0.6.1"
 
 rollup@^1.12.0:
-  version "1.26.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.26.0.tgz#cf40fd5e1edc4d7f3d4235a0a43f1c2be1cf294b"
-  integrity sha512-5HljNYn9icFvXX+Oe97qY5TWvnWhKqgGT0HGeWWqFPx7w7+Anzg7dfHMtUif7YYy6QxAgynDSwK6uxbgcrVUxw==
+  version "1.27.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.0.tgz#7afe0da89c967cec5ccea7e919da6c89a1a68666"
+  integrity sha512-yaMna4MJ8LLEHhHl1ilgHakylf0LKeQctDxhngZLQ+W57GnXa5vtH7XKaK8zlAhNEhlWiH5YFVFt+QCDPUmNkw==
   dependencies:
     "@types/estree" "*"
     "@types/node" "*"
@@ -11254,9 +11288,9 @@ simple-swizzle@^0.2.2:
     is-arrayish "^0.3.1"
 
 sisteransi@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.3.tgz#98168d62b79e3a5e758e27ae63c4a053d748f4eb"
-  integrity sha512-SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3"
+  integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==
 
 slash@^1.0.0:
   version "1.0.0"
@@ -11610,13 +11644,13 @@ string-width@^3.0.0, string-width@^3.1.0:
     strip-ansi "^5.1.0"
 
 string-width@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff"
-  integrity sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^5.2.0"
+    strip-ansi "^6.0.0"
 
 string.prototype.trimleft@^2.1.0:
   version "2.1.0"
@@ -11678,6 +11712,13 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -11886,9 +11927,9 @@ terser@^3.14.1:
     source-map-support "~0.5.10"
 
 terser@^4.1.2:
-  version "4.3.9"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.9.tgz#e4be37f80553d02645668727777687dad26bbca8"
-  integrity sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA==
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.0.tgz#22c46b4817cf4c9565434bfe6ad47336af259ac3"
+  integrity sha512-oDG16n2WKm27JO8h4y/w3iqBGAOSCtq7k8dRmrn4Wf9NouL0b2WpMHGChFGZq4nFAQy1FsNJrVQHfurXOSTmOA==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -12083,11 +12124,16 @@ ts-loader@^6.0.4:
     micromatch "^4.0.0"
     semver "^6.0.0"
 
-ts-pnp@1.1.4, ts-pnp@^1.1.2:
+ts-pnp@1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.4.tgz#ae27126960ebaefb874c6d7fa4729729ab200d90"
   integrity sha512-1J/vefLC+BWSo+qe8OnJQfWTYRS6ingxjwqmHMqaMxXMj7kFtKLgAaYW3JeX3mktjgUL+etlU8/B4VUAUI9QGw==
 
+ts-pnp@^1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.5.tgz#840e0739c89fce5f3abd9037bb091dbff16d9dec"
+  integrity sha512-ti7OGMOUOzo66wLF3liskw6YQIaSsBgc4GOAlWRnIEj8htCxJUxskanMUoJOD6MDCRAXo36goXJZch+nOS0VMA==
+
 tsdx@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/tsdx/-/tsdx-0.6.1.tgz#fac0cc72a71f420cbfc9b38706f056f963bf72a1"
@@ -12230,9 +12276,9 @@ typescript-tuple@^2.2.1:
     typescript-compare "^0.0.2"
 
 typescript@^3.4.5, typescript@^3.6.3:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.4.tgz#b18752bb3792bc1a0281335f7f6ebf1bbfc5b91d"
-  integrity sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb"
+  integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==
 
 uglify-js@3.4.x:
   version "3.4.10"
@@ -12243,9 +12289,9 @@ uglify-js@3.4.x:
     source-map "~0.6.1"
 
 uglify-js@^3.1.4:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.5.tgz#b0ee796d2ae7e25672e04f65629b997cd4b30bd6"
-  integrity sha512-7L3W+Npia1OCr5Blp4/Vw83tK1mu5gnoIURtT1fUVfQ3Kf8WStWV6NJz0fdoBJZls0KlweruRTLVe6XLafmy5g==
+  version "3.6.9"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.9.tgz#85d353edb6ddfb62a9d798f36e91792249320611"
+  integrity sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==
   dependencies:
     commander "~2.20.3"
     source-map "~0.6.1"
@@ -12462,9 +12508,9 @@ verror@1.10.0:
     extsprintf "^1.2.0"
 
 vm-browserify@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
-  integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
 w3c-hr-time@^1.0.1:
   version "1.0.1"
@@ -12747,16 +12793,16 @@ wildcard@^1.1.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-1.1.2.tgz#a7020453084d8cd2efe70ba9d3696263de1710a5"
   integrity sha1-pwIEUwhNjNLv5wup02liY94XEKU=
 
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
   integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
-wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
-
 workbox-background-sync@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-4.3.1.tgz#26821b9bf16e9e37fd1d640289edddc08afd1950"