refactor

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: ~/outline
     docker:
-      - image: circleci/node:14
+      - image: circleci/node:12
       - image: circleci/redis:latest
       - image: circleci/postgres:9.6.5-alpine-ram
     environment:

.dockerignore

@@ -1,19 +0,0 @@
-__mocks__
-.git
-.vscode
-.github
-.circleci
-.DS_Store
-.env*
-.eslint*
-.flowconfig
-.log
-Makefile
-Procfile
-app.json
-build
-docker-compose.yml
-fakes3
-flow-typed
-node_modules
-setupJest.js

.env.sample

@@ -45,7 +45,6 @@ AWS_REGION=xx-xxxx-x
 AWS_S3_UPLOAD_BUCKET_URL=http://s3:4569
 AWS_S3_UPLOAD_BUCKET_NAME=bucket_name_here
 AWS_S3_UPLOAD_MAX_SIZE=26214400
-AWS_S3_FORCE_PATH_STYLE=true
 # uploaded s3 objects permission level, default is private
 # set to "public-read" to allow public access
 AWS_S3_ACL=private

.eslintrc

@@ -4,8 +4,7 @@
     "react-app",
     "plugin:import/errors",
     "plugin:import/warnings",
-    "plugin:flowtype/recommended",
-    "plugin:react-hooks/recommended"
+    "plugin:flowtype/recommended"
   ],
   "plugins": [
     "prettier",

.gitignore

@@ -1,5 +1,4 @@
 dist
-build
 node_modules/*
 server/scripts
 .env

Dockerfile

@@ -1,24 +1,17 @@
-FROM node:14-alpine
+FROM node:12-alpine
 
+ENV PATH /opt/outline/node_modules/.bin:/opt/node_modules/.bin:$PATH
+ENV NODE_PATH /opt/outline/node_modules:/opt/node_modules
 ENV APP_PATH /opt/outline
 RUN mkdir -p $APP_PATH
 
 WORKDIR $APP_PATH
+COPY . $APP_PATH
 
-COPY package.json ./
-COPY yarn.lock ./
+RUN yarn install --pure-lockfile
+RUN yarn build
+RUN cp -r /opt/outline/node_modules /opt/node_modules
 
-RUN yarn --pure-lockfile
-
-COPY . .
-
-RUN yarn build && \
-  yarn --production --ignore-scripts --prefer-offline && \
-  rm -rf server && \
-  rm -rf shared && \
-  rm -rf app
-
-ENV NODE_ENV production
 CMD yarn start
 
 EXPOSE 3000

Procfile

@@ -1 +1 @@
-web: node ./build/server/index.js
+web: node index.js

app.json

@@ -92,11 +92,6 @@
       "value": "26214400",
       "required": false
     },
-    "AWS_S3_FORCE_PATH_STYLE": {
-      "description": "Use path-style URL's for connecting to S3 instead of subdomain. This is useful for S3-compatible storage.",
-      "value": "true",
-      "required": false
-    },
     "AWS_REGION": {
       "value": "us-east-1",
       "description": "Region in which the above S3 bucket exists",

app/components/DelayedMount.js

@@ -14,7 +14,7 @@ export default function DelayedMount({ delay = 250, children }: Props) {
     return () => {
       clearTimeout(timeout);
     };
-  }, [delay]);
+  }, []);
 
   if (!isShowing) {
     return null;

app/components/DocumentHistory/DocumentHistory.js

@@ -1,23 +1,20 @@
 // @flow
 import ArrowKeyNavigation from "boundless-arrow-key-navigation";
-import { action, observable } from "mobx";
-import { inject, observer } from "mobx-react";
-import { CloseIcon } from "outline-icons";
+import { observable, action } from "mobx";
+import { observer, inject } from "mobx-react";
 import * as React from "react";
-import { type Match, Redirect, type RouterHistory } from "react-router-dom";
+import { type RouterHistory, type Match } from "react-router-dom";
 import { Waypoint } from "react-waypoint";
 import styled from "styled-components";
 
-import breakpoint from "styled-components-breakpoint";
 import { DEFAULT_PAGINATION_LIMIT } from "stores/BaseStore";
 import DocumentsStore from "stores/DocumentsStore";
 import RevisionsStore from "stores/RevisionsStore";
 
-import Button from "components/Button";
 import Flex from "components/Flex";
 import { ListPlaceholder } from "components/LoadingPlaceholder";
 import Revision from "./components/Revision";
-import { documentHistoryUrl, documentUrl } from "utils/routeHelpers";
+import { documentHistoryUrl } from "utils/routeHelpers";
 
 type Props = {
   match: Match,
@@ -32,7 +29,6 @@ class DocumentHistory extends React.Component<Props> {
   @observable isFetching: boolean = false;
   @observable offset: number = 0;
   @observable allowLoadMore: boolean = true;
-  @observable redirectTo: ?string;
 
   async componentDidMount() {
     await this.loadMoreResults();
@@ -90,34 +86,15 @@ class DocumentHistory extends React.Component<Props> {
     return this.props.revisions.getDocumentRevisions(document.id);
   }
 
-  onCloseHistory = () => {
-    const document = this.props.documents.getByUrl(
-      this.props.match.params.documentSlug
-    );
-
-    this.redirectTo = documentUrl(document);
-  };
-
   render() {
     const document = this.props.documents.getByUrl(
       this.props.match.params.documentSlug
     );
     const showLoading = (!this.isLoaded && this.isFetching) || !document;
 
-    if (this.redirectTo) return <Redirect to={this.redirectTo} push />;
-
     return (
       <Sidebar>
         <Wrapper column>
-          <Header>
-            <Title>History</Title>
-            <Button
-              icon={<CloseIcon />}
-              onClick={this.onCloseHistory}
-              borderOnHover
-              neutral
-            />
-          </Header>
           {showLoading ? (
             <Loading>
               <ListPlaceholder count={5} />
@@ -163,36 +140,10 @@ const Wrapper = styled(Flex)`
 `;
 
 const Sidebar = styled(Flex)`
-  display: none;
   background: ${(props) => props.theme.background};
   min-width: ${(props) => props.theme.sidebarWidth};
   border-left: 1px solid ${(props) => props.theme.divider};
   z-index: 1;
-
-  ${breakpoint("tablet")`
-    display: flex;
-  `};
-`;
-
-const Title = styled(Flex)`
-  font-size: 16px;
-  font-weight: 600;
-  text-align: center;
-  align-items: center;
-  justify-content: flex-start;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-  width: 0;
-  flex-grow: 1;
-`;
-
-const Header = styled(Flex)`
-  align-items: center;
-  position: relative;
-  padding: 12px;
-  border-bottom: 1px solid ${(props) => props.theme.divider};
-  color: ${(props) => props.theme.text};
 `;
 
 export default inject("documents", "revisions")(DocumentHistory);

app/components/HoverPreview.js

@@ -20,7 +20,12 @@ type Props = {
   onClose: () => void,
 };
 
-function HoverPreviewInternal({ node, documents, onClose, event }: Props) {
+function HoverPreview({ node, documents, onClose, event }: Props) {
+  // previews only work for internal doc links for now
+  if (!isInternalUrl(node.href)) {
+    return null;
+  }
+
   const slug = parseDocumentSlugFromUrl(node.href);
 
   const [isVisible, setVisible] = React.useState(false);
@@ -126,15 +131,6 @@ function HoverPreviewInternal({ node, documents, onClose, event }: Props) {
   );
 }
 
-function HoverPreview({ node, ...rest }: Props) {
-  // previews only work for internal doc links for now
-  if (!isInternalUrl(node.href)) {
-    return null;
-  }
-
-  return <HoverPreviewInternal {...rest} node={node} />;
-}
-
 const Animate = styled.div`
   animation: ${fadeAndSlideIn} 150ms ease;
 

app/components/Layout.js

@@ -44,22 +44,21 @@ class Layout extends React.Component<Props> {
   @observable redirectTo: ?string;
   @observable keyboardShortcutsOpen: boolean = false;
 
-  constructor(props) {
-    super();
-    this.updateBackground(props);
+  componentWillMount() {
+    this.updateBackground();
   }
 
   componentDidUpdate() {
-    this.updateBackground(this.props);
+    this.updateBackground();
 
     if (this.redirectTo) {
       this.redirectTo = undefined;
     }
   }
 
-  updateBackground(props) {
+  updateBackground() {
     // ensure the wider page color always matches the theme
-    window.document.body.style.background = props.theme.background;
+    window.document.body.style.background = this.props.theme.background;
   }
 
   @keydown("shift+/")

app/components/Mask.js

@@ -17,8 +17,7 @@ class Mask extends React.Component<Props> {
     return false;
   }
 
-  constructor() {
-    super();
+  componentWillMount() {
     this.width = randomInteger(75, 100);
   }
 

app/components/Modal.js

@@ -9,7 +9,6 @@ import breakpoint from "styled-components-breakpoint";
 import { fadeAndScaleIn } from "shared/styles/animations";
 import Flex from "components/Flex";
 import NudeButton from "components/NudeButton";
-import Scrollable from "components/Scrollable";
 
 ReactModal.setAppElement("#root");
 
@@ -28,8 +27,7 @@ const GlobalStyles = createGlobalStyle`
   }
 
   ${breakpoint("tablet")`
-    .ReactModalPortal + .ReactModalPortal,
-    .ReactModalPortal + [data-react-modal-body-trap] + .ReactModalPortal {
+    .ReactModalPortal + .ReactModalPortal {
       .ReactModal__Overlay {
         margin-left: 12px;
         box-shadow: 0 -2px 10px ${(props) => props.theme.shadow};
@@ -38,15 +36,13 @@ const GlobalStyles = createGlobalStyle`
       }
     }
 
-    .ReactModalPortal + .ReactModalPortal + .ReactModalPortal,
-    .ReactModalPortal + .ReactModalPortal + [data-react-modal-body-trap] + .ReactModalPortal {
+    .ReactModalPortal + .ReactModalPortal + .ReactModalPortal {
       .ReactModal__Overlay {
         margin-left: 24px;
       }
     }
 
-    .ReactModalPortal + .ReactModalPortal + .ReactModalPortal + .ReactModalPortal,
-    .ReactModalPortal + .ReactModalPortal + .ReactModalPortal + [data-react-modal-body-trap] + .ReactModalPortal {
+    .ReactModalPortal + .ReactModalPortal + .ReactModalPortal + .ReactModalPortal {
       .ReactModal__Overlay {
         margin-left: 36px;
       }
@@ -76,11 +72,10 @@ const Modal = ({
         isOpen={isOpen}
         {...rest}
       >
-        <Content>
-          <Centered onClick={(ev) => ev.stopPropagation()} column>
-            {title && <h1>{title}</h1>}
-            {children}
-          </Centered>
+        <Content onClick={(ev) => ev.stopPropagation()} column>
+          {title && <h1>{title}</h1>}
+
+          {children}
         </Content>
         <Back onClick={onRequestClose}>
           <BackIcon size={32} color="currentColor" />
@@ -94,20 +89,10 @@ const Modal = ({
   );
 };
 
-const Content = styled(Scrollable)`
-  width: 100%;
-  padding: 8vh 2rem 2rem;
-
-  ${breakpoint("tablet")`
-    padding-top: 13vh;
-  `};
-`;
-
-const Centered = styled(Flex)`
+const Content = styled(Flex)`
   width: 640px;
   max-width: 100%;
   position: relative;
-  margin: 0 auto;
 `;
 
 const StyledModal = styled(ReactModal)`
@@ -122,9 +107,16 @@ const StyledModal = styled(ReactModal)`
   display: flex;
   justify-content: center;
   align-items: flex-start;
+  overflow-x: hidden;
+  overflow-y: auto;
   background: ${(props) => props.theme.background};
   transition: ${(props) => props.theme.backgroundTransition};
+  padding: 8vh 2rem 2rem;
   outline: none;
+
+  ${breakpoint("tablet")`
+    padding-top: 13vh;
+  `};
 `;
 
 const Text = styled.span`
@@ -155,7 +147,7 @@ const Close = styled(NudeButton)`
 `;
 
 const Back = styled(NudeButton)`
-  position: absolute;
+  position: fixed;
   display: none;
   align-items: center;
   top: 2rem;

app/components/PathToDocument.js

@@ -42,23 +42,20 @@ class PathToDocument extends React.Component<Props> {
     return (
       <Component ref={ref} onClick={this.handleClick} href="" selectable>
         {collection && <CollectionIcon collection={collection} />}
-        &nbsp;
         {result.path
           .map((doc) => <Title key={doc.id}>{doc.title}</Title>)
           .reduce((prev, curr) => [prev, <StyledGoToIcon />, curr])}
         {document && (
-          <DocumentTitle>
+          <Flex>
             {" "}
             <StyledGoToIcon /> <Title>{document.title}</Title>
-          </DocumentTitle>
+          </Flex>
         )}
       </Component>
     );
   }
 }
 
-const DocumentTitle = styled(Flex)``;
-
 const Title = styled.span`
   white-space: nowrap;
   overflow: hidden;
@@ -66,7 +63,7 @@ const Title = styled.span`
 `;
 
 const StyledGoToIcon = styled(GoToIcon)`
-  fill: ${(props) => props.theme.divider};
+  opacity: 0.25;
 `;
 
 const ResultWrapper = styled.div`
@@ -82,20 +79,13 @@ const ResultWrapper = styled.div`
 const ResultWrapperLink = styled(ResultWrapper.withComponent("a"))`
   margin: 0 -8px;
   padding: 8px 4px;
-
-  ${DocumentTitle} {
-    display: none;
-  }
+  border-radius: 8px;
 
   &:hover,
   &:active,
   &:focus {
     background: ${(props) => props.theme.listItemHoverBackground};
     outline: none;
-
-    ${DocumentTitle} {
-      display: flex;
-    }
   }
 `;
 

app/components/Sidebar/Sidebar.js

@@ -1,60 +1,65 @@
 // @flow
-import { observer } from "mobx-react";
+import { observer, inject } from "mobx-react";
 import { CloseIcon, MenuIcon } from "outline-icons";
 import * as React from "react";
 import { withRouter } from "react-router-dom";
 import type { Location } from "react-router-dom";
 import styled from "styled-components";
 import breakpoint from "styled-components-breakpoint";
+import UiStore from "stores/UiStore";
 import Fade from "components/Fade";
 import Flex from "components/Flex";
-import usePrevious from "hooks/usePrevious";
-import useStores from "hooks/useStores";
 
 let firstRender = true;
 
 type Props = {
   children: React.Node,
   location: Location,
+  ui: UiStore,
 };
 
-function Sidebar({ location, children }: Props) {
-  const { ui } = useStores();
-  const previousLocation = usePrevious(location);
-
-  React.useEffect(() => {
-    if (location !== previousLocation) {
-      ui.hideMobileSidebar();
+@observer
+class Sidebar extends React.Component<Props> {
+  componentWillReceiveProps = (nextProps: Props) => {
+    if (this.props.location !== nextProps.location) {
+      this.props.ui.hideMobileSidebar();
     }
-  }, [ui, location]);
+  };
 
-  const content = (
-    <Container
-      editMode={ui.editMode}
-      mobileSidebarVisible={ui.mobileSidebarVisible}
-      column
-    >
-      <Toggle
-        onClick={ui.toggleMobileSidebar}
+  toggleSidebar = () => {
+    this.props.ui.toggleMobileSidebar();
+  };
+
+  render() {
+    const { children, ui } = this.props;
+    const content = (
+      <Container
+        editMode={ui.editMode}
         mobileSidebarVisible={ui.mobileSidebarVisible}
+        column
       >
-        {ui.mobileSidebarVisible ? (
-          <CloseIcon size={32} />
-        ) : (
-          <MenuIcon size={32} />
-        )}
-      </Toggle>
-      {children}
-    </Container>
-  );
+        <Toggle
+          onClick={this.toggleSidebar}
+          mobileSidebarVisible={ui.mobileSidebarVisible}
+        >
+          {ui.mobileSidebarVisible ? (
+            <CloseIcon size={32} />
+          ) : (
+            <MenuIcon size={32} />
+          )}
+        </Toggle>
+        {children}
+      </Container>
+    );
 
-  // Fade in the sidebar on first render after page load
-  if (firstRender) {
-    firstRender = false;
-    return <Fade>{content}</Fade>;
+    // Fade in the sidebar on first render after page load
+    if (firstRender) {
+      firstRender = false;
+      return <Fade>{content}</Fade>;
+    }
+
+    return content;
   }
-
-  return content;
 }
 
 const Container = styled(Flex)`
@@ -112,4 +117,4 @@ const Toggle = styled.a`
   `};
 `;
 
-export default withRouter(observer(Sidebar));
+export default withRouter(inject("ui")(Sidebar));

app/components/Sidebar/components/SidebarLink.js

@@ -1,4 +1,5 @@
 // @flow
+import { observable, action } from "mobx";
 import { observer } from "mobx-react";
 import { CollapsedIcon } from "outline-icons";
 import * as React from "react";
@@ -24,80 +25,79 @@ type Props = {
   depth?: number,
 };
 
-function SidebarLink({
-  icon,
-  children,
-  onClick,
-  to,
-  label,
-  active,
-  menu,
-  menuOpen,
-  hideDisclosure,
-  theme,
-  exact,
-  href,
-  depth,
-  ...rest
-}: Props) {
-  const [expanded, setExpanded] = React.useState(rest.expanded);
+@observer
+class SidebarLink extends React.Component<Props> {
+  @observable expanded: ?boolean = this.props.expanded;
 
-  const style = React.useMemo(() => {
-    return {
-      paddingLeft: `${(depth || 0) * 16 + 16}px`,
-    };
-  }, [depth]);
-
-  React.useEffect(() => {
-    if (rest.expanded !== undefined) {
-      setExpanded(rest.expanded);
-    }
-  }, [rest.expanded]);
-
-  const handleClick = React.useCallback(
-    (ev: SyntheticEvent<>) => {
-      ev.preventDefault();
-      ev.stopPropagation();
-      setExpanded(!expanded);
-    },
-    [expanded]
-  );
-
-  const handleExpand = React.useCallback(() => {
-    setExpanded(true);
-  }, []);
-
-  const showDisclosure = !!children && !hideDisclosure;
-  const activeStyle = {
-    color: theme.text,
-    background: theme.sidebarItemBackground,
-    fontWeight: 600,
-    ...style,
+  style = {
+    paddingLeft: `${(this.props.depth || 0) * 16 + 16}px`,
   };
 
-  return (
-    <Wrapper column>
-      <StyledNavLink
-        activeStyle={activeStyle}
-        style={active ? activeStyle : style}
-        onClick={onClick}
-        exact={exact !== false}
-        to={to}
-        as={to ? undefined : href ? "a" : "div"}
-        href={href}
-      >
-        {icon && <IconWrapper>{icon}</IconWrapper>}
-        <Label onClick={handleExpand}>
-          {showDisclosure && (
-            <Disclosure expanded={expanded} onClick={handleClick} />
-          )}
-          {label}
-        </Label>
-        {menu && <Action menuOpen={menuOpen}>{menu}</Action>}
-      </StyledNavLink>
-      {expanded && children}
-    </Wrapper>
-  );
+  componentWillReceiveProps(nextProps: Props) {
+    if (nextProps.expanded !== undefined) {
+      this.expanded = nextProps.expanded;
+    }
+  }
+
+  @action
+  handleClick = (ev: SyntheticEvent<>) => {
+    ev.preventDefault();
+    ev.stopPropagation();
+
+    this.expanded = !this.expanded;
+  };
+
+  @action
+  handleExpand = () => {
+    this.expanded = true;
+  };
+
+  render() {
+    const {
+      icon,
+      children,
+      onClick,
+      to,
+      label,
+      active,
+      menu,
+      menuOpen,
+      hideDisclosure,
+      exact,
+      href,
+    } = this.props;
+    const showDisclosure = !!children && !hideDisclosure;
+    const activeStyle = {
+      color: this.props.theme.text,
+      background: this.props.theme.sidebarItemBackground,
+      fontWeight: 600,
+      ...this.style,
+    };
+
+    return (
+      <Wrapper column>
+        <StyledNavLink
+          activeStyle={activeStyle}
+          style={active ? activeStyle : this.style}
+          onClick={onClick}
+          exact={exact !== false}
+          to={to}
+          as={to ? undefined : href ? "a" : "div"}
+          href={href}
+        >
+          {icon && <IconWrapper>{icon}</IconWrapper>}
+          <Label onClick={this.handleExpand}>
+            {showDisclosure && (
+              <Disclosure expanded={this.expanded} onClick={this.handleClick} />
+            )}
+            {label}
+          </Label>
+          {menu && <Action menuOpen={menuOpen}>{menu}</Action>}
+        </StyledNavLink>
+        {this.expanded && children}
+      </Wrapper>
+    );
+  }
 }
 
 // accounts for whitespace around icon
@@ -171,4 +171,4 @@ const Disclosure = styled(CollapsedIcon)`
   ${({ expanded }) => !expanded && "transform: rotate(-90deg);"};
 `;
 
-export default withRouter(withTheme(observer(SidebarLink)));
+export default withRouter(withTheme(SidebarLink));

app/hooks/usePrevious.js

@@ -1,10 +0,0 @@
-// @flow
-import * as React from "react";
-
-export default function usePrevious(value: any) {
-  const ref = React.useRef();
-  React.useEffect(() => {
-    ref.current = value;
-  });
-  return ref.current;
-}

app/hooks/useStores.js

@@ -1,8 +0,0 @@
-// @flow
-import { MobXProviderContext } from "mobx-react";
-import * as React from "react";
-import RootStore from "stores";
-
-export default function useStores(): typeof RootStore {
-  return React.useContext(MobXProviderContext);
-}

app/index.js

@@ -1,5 +1,4 @@
 // @flow
-import "mobx-react-lite/batchingForReactDom";
 import { Provider } from "mobx-react";
 import * as React from "react";
 import { render } from "react-dom";
@@ -13,24 +12,32 @@ import Toasts from "components/Toasts";
 import Routes from "./routes";
 import env from "env";
 
+let DevTools;
+if (process.env.NODE_ENV !== "production") {
+  DevTools = require("mobx-react-devtools").default; // eslint-disable-line global-require
+}
+
 const element = document.getElementById("root");
 
 if (element) {
   render(
-    <ErrorBoundary>
-      <Provider {...stores}>
-        <Theme>
-          <Router>
-            <>
-              <ScrollToTop>
-                <Routes />
-              </ScrollToTop>
-              <Toasts />
-            </>
-          </Router>
-        </Theme>
-      </Provider>
-    </ErrorBoundary>,
+    <>
+      <ErrorBoundary>
+        <Provider {...stores}>
+          <Theme>
+            <Router>
+              <>
+                <ScrollToTop>
+                  <Routes />
+                </ScrollToTop>
+                <Toasts />
+              </>
+            </Router>
+          </Theme>
+        </Provider>
+      </ErrorBoundary>
+      {DevTools && <DevTools position={{ bottom: 0, right: 0 }} />}
+    </>,
     element
   );
 }

app/menus/CollectionMenu.js

@@ -127,7 +127,6 @@ class CollectionMenu extends React.Component<Props> {
             collection={collection}
             onSubmit={this.handleMembersModalClose}
             handleEditCollectionOpen={this.handleEditCollectionOpen}
-            onEdit={this.handleEditCollectionOpen}
           />
         </Modal>
         <DropdownMenu onOpen={onOpen} onClose={onClose} position={position}>

app/scenes/Collection.js

@@ -62,10 +62,10 @@ class CollectionScene extends React.Component<Props> {
     }
   }
 
-  componentDidUpdate(prevProps) {
-    const { id } = this.props.match.params;
+  componentWillReceiveProps(nextProps) {
+    const { id } = nextProps.match.params;
 
-    if (id && id !== prevProps.match.params.id) {
+    if (id && id !== this.props.match.params.id) {
       this.loadContent(id);
     }
   }

app/scenes/CollectionMembers/CollectionMembers.js

@@ -132,7 +132,7 @@ class CollectionMembers extends React.Component<Props> {
               collection. You can make this collection visible to the entire
               team by{" "}
               <a role="button" onClick={this.props.onEdit}>
-                changing the visibility
+                changing its visibility
               </a>
               .
             </HelpText>

app/scenes/Document/components/Document.js

@@ -18,7 +18,6 @@ import Branding from "components/Branding";
 import ErrorBoundary from "components/ErrorBoundary";
 import Flex from "components/Flex";
 import LoadingIndicator from "components/LoadingIndicator";
-import LoadingPlaceholder from "components/LoadingPlaceholder";
 import Notice from "components/Notice";
 import PageTitle from "components/PageTitle";
 import Time from "components/Time";
@@ -68,7 +67,7 @@ type Props = {
 
 @observer
 class DocumentScene extends React.Component<Props> {
-  @observable editor = React.createRef();
+  @observable editor: ?any;
   @observable isUploading: boolean = false;
   @observable isSaving: boolean = false;
   @observable isPublishing: boolean = false;
@@ -134,7 +133,7 @@ class DocumentScene extends React.Component<Props> {
     ev.preventDefault();
     const { document, abilities } = this.props;
 
-    if (abilities.move) {
+    if (abilities.update) {
       this.props.history.push(documentMoveUrl(document));
     }
   }
@@ -381,7 +380,7 @@ class DocumentScene extends React.Component<Props> {
             )}
             <MaxWidth
               archived={document.isArchived}
-              tocVisible={ui.tocVisible && readOnly}
+              tocVisible={ui.tocVisible}
               column
               auto
             >
@@ -413,52 +412,50 @@ class DocumentScene extends React.Component<Props> {
                   )}
                 </Notice>
               )}
-              <React.Suspense fallback={<LoadingPlaceholder />}>
-                <Flex auto={!readOnly}>
-                  {ui.tocVisible && readOnly && (
-                    <Contents
-                      headings={
-                        this.editor.current
-                          ? this.editor.current.getHeadings()
-                          : []
-                      }
-                    />
-                  )}
-                  <Editor
-                    id={document.id}
-                    innerRef={this.editor}
-                    isShare={isShare}
-                    isDraft={document.isDraft}
-                    template={document.isTemplate}
-                    key={[injectTemplate, disableEmbeds].join("-")}
-                    title={revision ? revision.title : this.title}
-                    document={document}
-                    value={readOnly ? value : undefined}
-                    defaultValue={value}
-                    disableEmbeds={disableEmbeds}
-                    onImageUploadStart={this.onImageUploadStart}
-                    onImageUploadStop={this.onImageUploadStop}
-                    onSearchLink={this.props.onSearchLink}
-                    onCreateLink={this.props.onCreateLink}
-                    onChangeTitle={this.onChangeTitle}
-                    onChange={this.onChange}
-                    onSave={this.onSave}
-                    onPublish={this.onPublish}
-                    onCancel={this.goBack}
-                    readOnly={readOnly}
-                    readOnlyWriteCheckboxes={readOnly && abilities.update}
-                    ui={this.props.ui}
+              <Flex auto={!readOnly}>
+                {ui.tocVisible && readOnly && (
+                  <Contents
+                    headings={this.editor ? this.editor.getHeadings() : []}
                   />
-                </Flex>
-                {readOnly && !isShare && !revision && (
-                  <>
-                    <MarkAsViewed document={document} />
-                    <ReferencesWrapper isOnlyTitle={document.isOnlyTitle}>
-                      <References document={document} />
-                    </ReferencesWrapper>
-                  </>
                 )}
-              </React.Suspense>
+                <Editor
+                  id={document.id}
+                  ref={(ref) => {
+                    if (ref) {
+                      this.editor = ref;
+                    }
+                  }}
+                  isShare={isShare}
+                  isDraft={document.isDraft}
+                  template={document.isTemplate}
+                  key={[injectTemplate, disableEmbeds].join("-")}
+                  title={revision ? revision.title : this.title}
+                  document={document}
+                  value={readOnly ? value : undefined}
+                  defaultValue={value}
+                  disableEmbeds={disableEmbeds}
+                  onImageUploadStart={this.onImageUploadStart}
+                  onImageUploadStop={this.onImageUploadStop}
+                  onSearchLink={this.props.onSearchLink}
+                  onCreateLink={this.props.onCreateLink}
+                  onChangeTitle={this.onChangeTitle}
+                  onChange={this.onChange}
+                  onSave={this.onSave}
+                  onPublish={this.onPublish}
+                  onCancel={this.goBack}
+                  readOnly={readOnly}
+                  readOnlyWriteCheckboxes={readOnly && abilities.update}
+                  ui={this.props.ui}
+                />
+              </Flex>
+              {readOnly && !isShare && !revision && (
+                <>
+                  <MarkAsViewed document={document} />
+                  <ReferencesWrapper isOnlyTitle={document.isOnlyTitle}>
+                    <References document={document} />
+                  </ReferencesWrapper>
+                </>
+              )}
             </MaxWidth>
           </Container>
         </Background>

app/scenes/Document/components/DocumentMove.js

@@ -13,11 +13,13 @@ import DocumentsStore from "stores/DocumentsStore";
 import UiStore from "stores/UiStore";
 import Document from "models/Document";
 import Flex from "components/Flex";
-import { Outline } from "components/Input";
+import Input from "components/Input";
 import Labeled from "components/Labeled";
 import Modal from "components/Modal";
 import PathToDocument from "components/PathToDocument";
 
+const MAX_RESULTS = 8;
+
 type Props = {|
   document: Document,
   documents: DocumentsStore,
@@ -34,19 +36,14 @@ class DocumentMove extends React.Component<Props> {
 
   @computed
   get searchIndex() {
-    const { collections, documents } = this.props;
+    const { collections } = this.props;
     const paths = collections.pathsToDocuments;
     const index = new Search("id");
     index.addIndex("title");
 
     // Build index
     const indexeableDocuments = [];
-    paths.forEach((path) => {
-      const doc = documents.get(path.id);
-      if (!doc || !doc.isTemplate) {
-        indexeableDocuments.push(path);
-      }
-    });
+    paths.forEach((path) => indexeableDocuments.push(path));
     index.addDocuments(indexeableDocuments);
 
     return index;
@@ -55,7 +52,6 @@ class DocumentMove extends React.Component<Props> {
   @computed
   get results(): DocumentPath[] {
     const { document, collections } = this.props;
-    const onlyShowCollections = document.isTemplate;
 
     let results = [];
     if (collections.isLoaded) {
@@ -66,24 +62,18 @@ class DocumentMove extends React.Component<Props> {
       }
     }
 
-    if (onlyShowCollections) {
-      results = results.filter((result) => result.type === "collection");
-    } else {
-      // Exclude root from search results if document is already at the root
-      if (!document.parentDocumentId) {
-        results = results.filter(
-          (result) => result.id !== document.collectionId
-        );
-      }
-
-      // Exclude document if on the path to result, or the same result
-      results = results.filter(
-        (result) =>
-          !result.path.map((doc) => doc.id).includes(document.id) &&
-          last(result.path.map((doc) => doc.id)) !== document.parentDocumentId
-      );
+    // Exclude root from search results if document is already at the root
+    if (!document.parentDocumentId) {
+      results = results.filter((result) => result.id !== document.collectionId);
     }
 
+    // Exclude document if on the path to result, or the same result
+    results = results.filter(
+      (result) =>
+        !result.path.map((doc) => doc.id).includes(document.id) &&
+        last(result.path.map((doc) => doc.id)) !== document.parentDocumentId
+    );
+
     return results;
   }
 
@@ -139,41 +129,35 @@ class DocumentMove extends React.Component<Props> {
             </Section>
 
             <Section column>
-              <Labeled label="Choose a new location" />
-              <NewLocation>
-                <InputWrapper>
-                  <Input
-                    type="search"
-                    placeholder="Search collections & documents…"
-                    onKeyDown={this.handleKeyDown}
-                    onChange={this.handleFilter}
-                    required
-                    autoFocus
-                  />
-                </InputWrapper>
-
-                <Results>
-                  <Flex column>
-                    <StyledArrowKeyNavigation
-                      mode={ArrowKeyNavigation.mode.VERTICAL}
-                      defaultActiveChildIndex={0}
-                    >
-                      {this.results.map((result, index) => (
-                        <PathToDocument
-                          key={result.id}
-                          result={result}
-                          document={document}
-                          collection={collections.get(result.collectionId)}
-                          ref={(ref) =>
-                            index === 0 && this.setFirstDocumentRef(ref)
-                          }
-                          onSuccess={this.handleSuccess}
-                        />
-                      ))}
-                    </StyledArrowKeyNavigation>
-                  </Flex>
-                </Results>
-              </NewLocation>
+              <Labeled label="Choose a new location">
+                <Input
+                  type="search"
+                  placeholder="Search collections & documents…"
+                  onKeyDown={this.handleKeyDown}
+                  onChange={this.handleFilter}
+                  required
+                  autoFocus
+                />
+              </Labeled>
+              <Flex column>
+                <StyledArrowKeyNavigation
+                  mode={ArrowKeyNavigation.mode.VERTICAL}
+                  defaultActiveChildIndex={0}
+                >
+                  {this.results.slice(0, MAX_RESULTS).map((result, index) => (
+                    <PathToDocument
+                      key={result.id}
+                      result={result}
+                      document={document}
+                      collection={collections.get(result.collectionId)}
+                      ref={(ref) =>
+                        index === 0 && this.setFirstDocumentRef(ref)
+                      }
+                      onSuccess={this.handleSuccess}
+                    />
+                  ))}
+                </StyledArrowKeyNavigation>
+              </Flex>
             </Section>
           </Flex>
         )}
@@ -182,37 +166,6 @@ class DocumentMove extends React.Component<Props> {
   }
 }
 
-const InputWrapper = styled("div")`
-  padding: 8px;
-  width: 100%;
-`;
-
-const Input = styled("input")`
-  width: 100%;
-  outline: none;
-  background: none;
-  border-radius: 4px;
-  height: 30px;
-  border: 0;
-  color: ${(props) => props.theme.text};
-
-  &::placeholder {
-    color: ${(props) => props.theme.placeholder};
-  }
-`;
-
-const NewLocation = styled(Outline)`
-  flex-direction: column;
-`;
-
-const Results = styled(Flex)`
-  display: block;
-  width: 100%;
-  max-height: 40vh;
-  overflow-y: auto;
-  padding: 8px;
-`;
-
 const Section = styled(Flex)`
   margin-bottom: 24px;
 `;

app/scenes/Document/components/Editor.js

@@ -11,6 +11,7 @@ import DocumentMetaWithViews from "components/DocumentMetaWithViews";
 import Editor from "components/Editor";
 import Flex from "components/Flex";
 import HoverPreview from "components/HoverPreview";
+import LoadingPlaceholder from "components/LoadingPlaceholder";
 import { documentHistoryUrl } from "utils/routeHelpers";
 
 type Props = {
@@ -21,25 +22,33 @@ type Props = {
   isDraft: boolean,
   isShare: boolean,
   readOnly?: boolean,
-  innerRef: { current: any },
 };
 
 @observer
 class DocumentEditor extends React.Component<Props> {
   @observable activeLinkEvent: ?MouseEvent;
+  editor = React.createRef<any>();
 
   focusAtStart = () => {
-    if (this.props.innerRef.current) {
-      this.props.innerRef.current.focusAtStart();
+    if (this.editor.current) {
+      this.editor.current.focusAtStart();
     }
   };
 
   focusAtEnd = () => {
-    if (this.props.innerRef.current) {
-      this.props.innerRef.current.focusAtEnd();
+    if (this.editor.current) {
+      this.editor.current.focusAtEnd();
     }
   };
 
+  getHeadings = () => {
+    if (this.editor.current) {
+      return this.editor.current.getHeadings();
+    }
+
+    return [];
+  };
+
   handleTitleKeyDown = (event: SyntheticKeyboardEvent<>) => {
     if (event.key === "Enter" || event.key === "Tab") {
       event.preventDefault();
@@ -63,46 +72,49 @@ class DocumentEditor extends React.Component<Props> {
       isDraft,
       isShare,
       readOnly,
-      innerRef,
     } = this.props;
     const { emoji } = parseTitle(title);
     const startsWithEmojiAndSpace = !!(emoji && title.startsWith(`${emoji} `));
 
     return (
       <Flex auto column>
-        <Title
-          type="text"
-          onChange={onChangeTitle}
-          onKeyDown={this.handleTitleKeyDown}
-          placeholder={document.placeholder}
-          value={!title && readOnly ? document.titleWithDefault : title}
-          style={startsWithEmojiAndSpace ? { marginLeft: "-1.2em" } : undefined}
-          readOnly={readOnly}
-          autoFocus={!title}
-          maxLength={100}
-        />
-        <DocumentMetaWithViews
-          isDraft={isDraft}
-          document={document}
-          to={documentHistoryUrl(document)}
-        />
-        <Editor
-          ref={innerRef}
-          autoFocus={title && !this.props.defaultValue}
-          placeholder="…the rest is up to you"
-          onHoverLink={this.handleLinkActive}
-          scrollTo={window.location.hash}
-          grow
-          {...this.props}
-        />
-        {!readOnly && <ClickablePadding onClick={this.focusAtEnd} grow />}
-        {this.activeLinkEvent && !isShare && readOnly && (
-          <HoverPreview
-            node={this.activeLinkEvent.target}
-            event={this.activeLinkEvent}
-            onClose={this.handleLinkInactive}
+        <React.Suspense fallback={<LoadingPlaceholder />}>
+          <Title
+            type="text"
+            onChange={onChangeTitle}
+            onKeyDown={this.handleTitleKeyDown}
+            placeholder={document.placeholder}
+            value={!title && readOnly ? document.titleWithDefault : title}
+            style={
+              startsWithEmojiAndSpace ? { marginLeft: "-1.2em" } : undefined
+            }
+            readOnly={readOnly}
+            autoFocus={!title}
+            maxLength={100}
           />
-        )}
+          <DocumentMetaWithViews
+            isDraft={isDraft}
+            document={document}
+            to={documentHistoryUrl(document)}
+          />
+          <Editor
+            ref={this.editor}
+            autoFocus={title && !this.props.defaultValue}
+            placeholder="…the rest is up to you"
+            onHoverLink={this.handleLinkActive}
+            scrollTo={window.location.hash}
+            grow
+            {...this.props}
+          />
+          {!readOnly && <ClickablePadding onClick={this.focusAtEnd} grow />}
+          {this.activeLinkEvent && !isShare && readOnly && (
+            <HoverPreview
+              node={this.activeLinkEvent.target}
+              event={this.activeLinkEvent}
+              onClose={this.handleLinkInactive}
+            />
+          )}
+        </React.Suspense>
       </Flex>
     );
   }

app/scenes/DocumentDelete.js

@@ -9,7 +9,7 @@ import Document from "models/Document";
 import Button from "components/Button";
 import Flex from "components/Flex";
 import HelpText from "components/HelpText";
-import { collectionUrl, documentUrl } from "utils/routeHelpers";
+import { collectionUrl } from "utils/routeHelpers";
 
 type Props = {
   history: RouterHistory,
@@ -24,27 +24,15 @@ class DocumentDelete extends React.Component<Props> {
   @observable isDeleting: boolean;
 
   handleSubmit = async (ev: SyntheticEvent<>) => {
-    const { documents, document } = this.props;
     ev.preventDefault();
     this.isDeleting = true;
 
     try {
-      await document.delete();
-
-      // only redirect if we're currently viewing the document that's deleted
-      if (this.props.ui.activeDocumentId === document.id) {
-        // If the document has a parent and it's available in the store then
-        // redirect to it
-        if (document.parentDocumentId) {
-          const parent = documents.get(document.parentDocumentId);
-          if (parent) {
-            this.props.history.push(documentUrl(parent));
-            return;
-          }
-        }
-
-        // otherwise, redirect to the collection home
-        this.props.history.push(collectionUrl(document.collectionId));
+      await this.props.document.delete();
+      if (this.props.ui.activeDocumentId === this.props.document.id) {
+        this.props.history.push(
+          collectionUrl(this.props.document.collectionId)
+        );
       }
       this.props.onSubmit();
     } catch (err) {

app/stores/UiStore.js

@@ -109,34 +109,34 @@ class UiStore {
   };
 
   @action
-  enableEditMode = () => {
+  enableEditMode() {
     this.editMode = true;
-  };
+  }
 
   @action
-  disableEditMode = () => {
+  disableEditMode() {
     this.editMode = false;
-  };
+  }
 
   @action
-  enableProgressBar = () => {
+  enableProgressBar() {
     this.progressBarVisible = true;
-  };
+  }
 
   @action
-  disableProgressBar = () => {
+  disableProgressBar() {
     this.progressBarVisible = false;
-  };
+  }
 
   @action
-  toggleMobileSidebar = () => {
+  toggleMobileSidebar() {
     this.mobileSidebarVisible = !this.mobileSidebarVisible;
-  };
+  }
 
   @action
-  hideMobileSidebar = () => {
+  hideMobileSidebar() {
     this.mobileSidebarVisible = false;
-  };
+  }
 
   @action
   showToast = (

index.js

@@ -0,0 +1,74 @@
+// @flow
+require("./init");
+
+if (
+  !process.env.SECRET_KEY ||
+  process.env.SECRET_KEY === "generate_a_new_key"
+) {
+  console.error(
+    "The SECRET_KEY env variable must be set with the output of `openssl rand -hex 32`"
+  );
+  // $FlowFixMe
+  process.exit(1);
+}
+
+if (process.env.AWS_ACCESS_KEY_ID) {
+  [
+    "AWS_REGION",
+    "AWS_SECRET_ACCESS_KEY",
+    "AWS_S3_UPLOAD_BUCKET_URL",
+    "AWS_S3_UPLOAD_BUCKET_NAME",
+    "AWS_S3_UPLOAD_MAX_SIZE",
+  ].forEach(key => {
+    if (!process.env[key]) {
+      console.error(`The ${key} env variable must be set when using AWS`);
+      // $FlowFixMe
+      process.exit(1);
+    }
+  });
+}
+
+if (process.env.SLACK_KEY) {
+  if (!process.env.SLACK_SECRET) {
+    console.error(
+      `The SLACK_SECRET env variable must be set when using Slack Sign In`
+    );
+    // $FlowFixMe
+    process.exit(1);
+  }
+}
+
+if (!process.env.URL) {
+  console.error(
+    "The URL env variable must be set to the externally accessible URL, e.g (https://www.getoutline.com)"
+  );
+  // $FlowFixMe
+  process.exit(1);
+}
+
+if (!process.env.DATABASE_URL) {
+  console.error(
+    "The DATABASE_URL env variable must be set to the location of your postgres server, including authentication and port"
+  );
+  // $FlowFixMe
+  process.exit(1);
+}
+
+if (!process.env.REDIS_URL) {
+  console.error(
+    "The REDIS_URL env variable must be set to the location of your redis server, including authentication and port"
+  );
+  // $FlowFixMe
+  process.exit(1);
+}
+
+if (process.env.NODE_ENV === "production") {
+  console.log("\n\x1b[33m%s\x1b[0m", "Running Outline in production mode.");
+} else if (process.env.NODE_ENV === "development") {
+  console.log(
+    "\n\x1b[33m%s\x1b[0m",
+    'Running Outline in development mode with hot reloading. To run Outline in production mode set the NODE_ENV env variable to "production"'
+  );
+}
+
+require("./server");

init.js

@@ -0,0 +1,4 @@
+// @flow
+require("@babel/register");
+require("@babel/polyfill");
+require("dotenv").config({ silent: true });

package.json

@@ -1,22 +1,21 @@
 {
   "name": "outline",
   "private": true,
-  "license": "Business Source License 1.1",
   "main": "index.js",
   "scripts": {
-    "clean": "rimraf build",
-    "build:server": "babel -d ./build/server ./server && babel -d ./build/shared ./shared && cp package.json ./build && ln -sf \"$(pwd)/webpack.config.dev.js\" ./build",
-    "build:webpack": "webpack --config webpack.config.prod.js",
-    "build": "yarn clean && yarn build:webpack && yarn build:server",
-    "start": "node ./build/server/index.js",
-    "dev": "nodemon --exec \"yarn build:server && node build/server/index.js\" -e js --ignore build/",
+    "clean": "rimraf dist",
+    "build:webpack": "NODE_ENV=production webpack --config webpack.config.prod.js",
+    "build:analyze": "NODE_ENV=production webpack --config webpack.config.prod.js --json > stats.json",
+    "build": "npm run clean && npm run build:webpack",
+    "start": "NODE_ENV=production node index.js",
+    "dev": "NODE_ENV=development nodemon --watch server index.js",
     "lint": "eslint app server shared",
     "flow": "flow",
     "deploy": "git push heroku master",
-    "heroku-postbuild": "yarn build && yarn sequelize:migrate",
+    "heroku-postbuild": "npm run build && npm run sequelize:migrate",
     "sequelize:create-migration": "sequelize migration:create",
     "sequelize:migrate": "sequelize db:migrate",
-    "test": "yarn test:app && yarn test:server",
+    "test": "npm run test:app && npm run test:server",
     "test:app": "jest",
     "test:server": "jest --config=server/.jestconfig.json --runInBand --forceExit",
     "test:watch": "jest --config=server/.jestconfig.json --runInBand --forceExit --watchAll"
@@ -49,7 +48,7 @@
     ]
   },
   "engines": {
-    "node": ">= 12 <15"
+    "node": ">= 12 <14"
   },
   "repository": {
     "type": "git",
@@ -65,8 +64,9 @@
     "@babel/preset-env": "^7.11.0",
     "@babel/preset-flow": "^7.10.4",
     "@babel/preset-react": "^7.10.4",
+    "@babel/register": "^7.10.5",
     "@rehooks/window-scroll-position": "^1.0.1",
-    "@sentry/node": "^5.22.3",
+    "@sentry/node": "^5.12.2",
     "@tippy.js/react": "^2.2.2",
     "@tommoor/remove-markdown": "0.3.1",
     "autotrack": "^2.4.1",
@@ -115,13 +115,13 @@
     "koa-static": "^4.0.1",
     "lodash": "^4.17.19",
     "mobx": "4.6.0",
-    "mobx-react": "^6.2.5",
+    "mobx-react": "^5.4.2",
     "natural-sort": "^1.0.0",
     "nodemailer": "^4.4.0",
     "outline-icons": "^1.21.0-6",
     "oy-vey": "^0.10.0",
-    "pg": "^8.3.0",
-    "pg-hstore": "^2.3.3",
+    "pg": "^6.1.5",
+    "pg-hstore": "2.3.2",
     "polished": "3.6.5",
     "query-string": "^4.3.4",
     "randomstring": "1.1.5",
@@ -138,11 +138,11 @@
     "react-portal": "^4.0.0",
     "react-router-dom": "^5.1.2",
     "react-waypoint": "^9.0.2",
-    "rich-markdown-editor": "^10.6.5",
+    "rich-markdown-editor": "^10.6.1",
     "semver": "^7.3.2",
-    "sequelize": "^6.3.4",
-    "sequelize-cli": "^6.2.0",
-    "sequelize-encrypted": "^1.0.0",
+    "sequelize": "^5.21.1",
+    "sequelize-cli": "^5.5.0",
+    "sequelize-encrypted": "^0.1.0",
     "slate": "0.45.0",
     "slate-md-serializer": "5.5.4",
     "slug": "^1.0.0",
@@ -159,7 +159,6 @@
     "validator": "5.2.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.5",
     "@relative-ci/agent": "^1.3.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^26.2.2",
@@ -171,13 +170,13 @@
     "eslint-plugin-jsx-a11y": "^6.1.0",
     "eslint-plugin-prettier": "^3.1.0",
     "eslint-plugin-react": "^7.20.0",
-    "eslint-plugin-react-hooks": "^4.1.0",
     "fetch-test-server": "^1.1.0",
     "flow-bin": "^0.104.0",
     "html-webpack-plugin": "3.2.0",
     "jest-cli": "^26.0.0",
     "koa-webpack-dev-middleware": "^1.4.5",
     "koa-webpack-hot-middleware": "^1.0.3",
+    "mobx-react-devtools": "^6.0.3",
     "nodemon": "^1.19.4",
     "prettier": "^2.0.5",
     "rimraf": "^2.5.4",
@@ -191,5 +190,5 @@
     "dot-prop": "^5.2.0",
     "js-yaml": "^3.13.1"
   },
-  "version": "0.46.1"
+  "version": "0.46.0"
 }

server/api/documents.js

@@ -1001,7 +1001,7 @@ router.post("documents.delete", auth(), async (ctx) => {
   const document = await Document.findByPk(id, { userId: user.id });
   authorize(user, "delete", document);
 
-  await document.delete(user.id);
+  await document.delete();
 
   await Event.create({
     name: "documents.delete",

server/commands/documentMover.js

@@ -22,96 +22,79 @@ export default async function documentMover({
   const result = { collections: [], documents: [] };
   const collectionChanged = collectionId !== document.collectionId;
 
-  if (document.template) {
-    if (!collectionChanged) {
-      return result;
-    }
+  try {
+    transaction = await sequelize.transaction();
 
+    // remove from original collection
+    const collection = await document.getCollection({ transaction });
+    const documentJson = await collection.removeDocumentInStructure(document, {
+      save: false,
+    });
+
+    // if the collection is the same then it will get saved below, this
+    // line prevents a pointless intermediate save from occurring.
+    if (collectionChanged) await collection.save({ transaction });
+
+    // add to new collection (may be the same)
     document.collectionId = collectionId;
-    document.parentDocumentId = null;
+    document.parentDocumentId = parentDocumentId;
 
-    await document.save();
-    result.documents.push(document);
-  } else {
-    try {
-      transaction = await sequelize.transaction();
+    const newCollection: Collection = collectionChanged
+      ? await Collection.findByPk(collectionId, { transaction })
+      : collection;
+    await newCollection.addDocumentToStructure(document, index, {
+      documentJson,
+    });
+    result.collections.push(collection);
 
-      // remove from original collection
-      const collection = await Collection.findByPk(document.collectionId, {
-        transaction,
-      });
-      const documentJson = await collection.removeDocumentInStructure(
-        document,
-        {
-          save: false,
-        }
-      );
+    // if collection does not remain the same loop through children and change their
+    // collectionId too. This includes archived children, otherwise their collection
+    // would be wrong once restored.
+    if (collectionChanged) {
+      result.collections.push(newCollection);
 
-      // if the collection is the same then it will get saved below, this
-      // line prevents a pointless intermediate save from occurring.
-      if (collectionChanged) await collection.save({ transaction });
+      const loopChildren = async (documentId) => {
+        const childDocuments = await Document.findAll({
+          where: { parentDocumentId: documentId },
+        });
 
-      // add to new collection (may be the same)
-      document.collectionId = collectionId;
-      document.parentDocumentId = parentDocumentId;
+        await Promise.all(
+          childDocuments.map(async (child) => {
+            await loopChildren(child.id);
+            await child.update({ collectionId }, { transaction });
+            child.collection = newCollection;
+            result.documents.push(child);
+          })
+        );
+      };
 
-      const newCollection: Collection = collectionChanged
-        ? await Collection.findByPk(collectionId, { transaction })
-        : collection;
-      await newCollection.addDocumentToStructure(document, index, {
-        documentJson,
-      });
-      result.collections.push(collection);
-
-      // if collection does not remain the same loop through children and change their
-      // collectionId too. This includes archived children, otherwise their collection
-      // would be wrong once restored.
-      if (collectionChanged) {
-        result.collections.push(newCollection);
-
-        const loopChildren = async (documentId) => {
-          const childDocuments = await Document.findAll({
-            where: { parentDocumentId: documentId },
-          });
-
-          await Promise.all(
-            childDocuments.map(async (child) => {
-              await loopChildren(child.id);
-              await child.update({ collectionId }, { transaction });
-              child.collection = newCollection;
-              result.documents.push(child);
-            })
-          );
-        };
-
-        await loopChildren(document.id);
-      }
-
-      await document.save({ transaction });
-      result.documents.push(document);
-
-      await transaction.commit();
-    } catch (err) {
-      if (transaction) {
-        await transaction.rollback();
-      }
-      throw err;
+      await loopChildren(document.id);
     }
-  }
 
-  await Event.create({
-    name: "documents.move",
-    actorId: user.id,
-    documentId: document.id,
-    collectionId,
-    teamId: document.teamId,
-    data: {
-      title: document.title,
-      collectionIds: result.collections.map((c) => c.id),
-      documentIds: result.documents.map((d) => d.id),
-    },
-    ip,
-  });
+    await document.save({ transaction });
+    result.documents.push(document);
+
+    await transaction.commit();
+
+    await Event.create({
+      name: "documents.move",
+      actorId: user.id,
+      documentId: document.id,
+      collectionId,
+      teamId: document.teamId,
+      data: {
+        title: document.title,
+        collectionIds: result.collections.map((c) => c.id),
+        documentIds: result.documents.map((d) => d.id),
+      },
+      ip,
+    });
+  } catch (err) {
+    if (transaction) {
+      await transaction.rollback();
+    }
+    throw err;
+  }
 
   // we need to send all updated models back to the client
   return result;

server/config/database.json

@@ -9,11 +9,6 @@
   },
   "production": {
     "use_env_variable": "DATABASE_URL",
-    "dialect": "postgres",
-    "dialectOptions": {
-      "ssl": {
-        "rejectUnauthorized": false
-      }
-    }
+    "dialect": "postgres"
   }
 }

server/index.js

@@ -1,73 +1,189 @@
 // @flow
-require("dotenv").config({ silent: true });
+import http from "http";
+import IO from "socket.io";
+import socketRedisAdapter from "socket.io-redis";
+import SocketAuth from "socketio-auth";
+import app from "./app";
+import { Document, Collection, View } from "./models";
+import policy from "./policies";
+import { client, subscriber } from "./redis";
+import { getUserForJWT } from "./utils/jwt";
 
-if (
-  !process.env.SECRET_KEY ||
-  process.env.SECRET_KEY === "generate_a_new_key"
-) {
-  console.error(
-    "The SECRET_KEY env variable must be set with the output of `openssl rand -hex 32`"
-  );
-  // $FlowFixMe
-  process.exit(1);
-}
+const server = http.createServer(app.callback());
+let io;
 
-if (process.env.AWS_ACCESS_KEY_ID) {
-  [
-    "AWS_REGION",
-    "AWS_SECRET_ACCESS_KEY",
-    "AWS_S3_UPLOAD_BUCKET_URL",
-    "AWS_S3_UPLOAD_MAX_SIZE",
-  ].forEach((key) => {
-    if (!process.env[key]) {
-      console.error(`The ${key} env variable must be set when using AWS`);
-      // $FlowFixMe
-      process.exit(1);
+const { can } = policy;
+
+io = IO(server, {
+  path: "/realtime",
+  serveClient: false,
+  cookie: false,
+});
+
+io.adapter(
+  socketRedisAdapter({
+    pubClient: client,
+    subClient: subscriber,
+  })
+);
+
+SocketAuth(io, {
+  authenticate: async (socket, data, callback) => {
+    const { token } = data;
+
+    try {
+      const user = await getUserForJWT(token);
+      socket.client.user = user;
+
+      // store the mapping between socket id and user id in redis
+      // so that it is accessible across multiple server nodes
+      await client.hset(socket.id, "userId", user.id);
+
+      return callback(null, true);
+    } catch (err) {
+      return callback(err);
     }
-  });
-}
+  },
+  postAuthenticate: async (socket, data) => {
+    const { user } = socket.client;
 
-if (process.env.SLACK_KEY) {
-  if (!process.env.SLACK_SECRET) {
-    console.error(
-      `The SLACK_SECRET env variable must be set when using Slack Sign In`
+    // the rooms associated with the current team
+    // and user so we can send authenticated events
+    let rooms = [`team-${user.teamId}`, `user-${user.id}`];
+
+    // the rooms associated with collections this user
+    // has access to on connection. New collection subscriptions
+    // are managed from the client as needed through the 'join' event
+    const collectionIds = await user.collectionIds();
+    collectionIds.forEach((collectionId) =>
+      rooms.push(`collection-${collectionId}`)
     );
-    // $FlowFixMe
-    process.exit(1);
-  }
-}
 
-if (!process.env.URL) {
-  console.error(
-    "The URL env variable must be set to the externally accessible URL, e.g (https://www.getoutline.com)"
-  );
-  // $FlowFixMe
-  process.exit(1);
-}
+    // join all of the rooms at once
+    socket.join(rooms);
 
-if (!process.env.DATABASE_URL) {
-  console.error(
-    "The DATABASE_URL env variable must be set to the location of your postgres server, including authentication and port"
-  );
-  // $FlowFixMe
-  process.exit(1);
-}
+    // allow the client to request to join rooms
+    socket.on("join", async (event) => {
+      // user is joining a collection channel, because their permissions have
+      // changed, granting them access.
+      if (event.collectionId) {
+        const collection = await Collection.scope({
+          method: ["withMembership", user.id],
+        }).findByPk(event.collectionId);
 
-if (!process.env.REDIS_URL) {
-  console.error(
-    "The REDIS_URL env variable must be set to the location of your redis server, including authentication and port"
-  );
-  // $FlowFixMe
-  process.exit(1);
-}
+        if (can(user, "read", collection)) {
+          socket.join(`collection-${event.collectionId}`);
+        }
+      }
 
-if (process.env.NODE_ENV === "production") {
-  console.log("\n\x1b[33m%s\x1b[0m", "Running Outline in production mode.");
-} else if (process.env.NODE_ENV === "development") {
-  console.log(
-    "\n\x1b[33m%s\x1b[0m",
-    'Running Outline in development mode with hot reloading. To run Outline in production mode set the NODE_ENV env variable to "production"'
-  );
-}
+      // user is joining a document channel, because they have navigated to
+      // view a document.
+      if (event.documentId) {
+        const document = await Document.findByPk(event.documentId, {
+          userId: user.id,
+        });
 
-require("./main");
+        if (can(user, "read", document)) {
+          const room = `document-${event.documentId}`;
+
+          await View.touch(event.documentId, user.id, event.isEditing);
+          const editing = await View.findRecentlyEditingByDocument(
+            event.documentId
+          );
+
+          socket.join(room, () => {
+            // let everyone else in the room know that a new user joined
+            io.to(room).emit("user.join", {
+              userId: user.id,
+              documentId: event.documentId,
+              isEditing: event.isEditing,
+            });
+
+            // let this user know who else is already present in the room
+            io.in(room).clients(async (err, sockets) => {
+              if (err) throw err;
+
+              // because a single user can have multiple socket connections we
+              // need to make sure that only unique userIds are returned. A Map
+              // makes this easy.
+              let userIds = new Map();
+              for (const socketId of sockets) {
+                const userId = await client.hget(socketId, "userId");
+                userIds.set(userId, userId);
+              }
+              socket.emit("document.presence", {
+                documentId: event.documentId,
+                userIds: Array.from(userIds.keys()),
+                editingIds: editing.map((view) => view.userId),
+              });
+            });
+          });
+        }
+      }
+    });
+
+    // allow the client to request to leave rooms
+    socket.on("leave", (event) => {
+      if (event.collectionId) {
+        socket.leave(`collection-${event.collectionId}`);
+      }
+      if (event.documentId) {
+        const room = `document-${event.documentId}`;
+        socket.leave(room, () => {
+          io.to(room).emit("user.leave", {
+            userId: user.id,
+            documentId: event.documentId,
+          });
+        });
+      }
+    });
+
+    socket.on("disconnecting", () => {
+      const rooms = Object.keys(socket.rooms);
+
+      rooms.forEach((room) => {
+        if (room.startsWith("document-")) {
+          const documentId = room.replace("document-", "");
+          io.to(room).emit("user.leave", {
+            userId: user.id,
+            documentId,
+          });
+        }
+      });
+    });
+
+    socket.on("presence", async (event) => {
+      const room = `document-${event.documentId}`;
+
+      if (event.documentId && socket.rooms[room]) {
+        const view = await View.touch(
+          event.documentId,
+          user.id,
+          event.isEditing
+        );
+        view.user = user;
+
+        io.to(room).emit("user.presence", {
+          userId: user.id,
+          documentId: event.documentId,
+          isEditing: event.isEditing,
+        });
+      }
+    });
+  },
+});
+
+server.on("error", (err) => {
+  throw err;
+});
+
+server.on("listening", () => {
+  const address = server.address();
+  console.log(`\n> Listening on http://localhost:${address.port}\n`);
+});
+
+server.listen(process.env.PORT || "3000");
+
+export const socketio = io;
+
+export default server;

server/main.js

@@ -1,189 +0,0 @@
-// @flow
-import http from "http";
-import IO from "socket.io";
-import socketRedisAdapter from "socket.io-redis";
-import SocketAuth from "socketio-auth";
-import app from "./app";
-import { Document, Collection, View } from "./models";
-import policy from "./policies";
-import { client, subscriber } from "./redis";
-import { getUserForJWT } from "./utils/jwt";
-
-const server = http.createServer(app.callback());
-let io;
-
-const { can } = policy;
-
-io = IO(server, {
-  path: "/realtime",
-  serveClient: false,
-  cookie: false,
-});
-
-io.adapter(
-  socketRedisAdapter({
-    pubClient: client,
-    subClient: subscriber,
-  })
-);
-
-SocketAuth(io, {
-  authenticate: async (socket, data, callback) => {
-    const { token } = data;
-
-    try {
-      const user = await getUserForJWT(token);
-      socket.client.user = user;
-
-      // store the mapping between socket id and user id in redis
-      // so that it is accessible across multiple server nodes
-      await client.hset(socket.id, "userId", user.id);
-
-      return callback(null, true);
-    } catch (err) {
-      return callback(err);
-    }
-  },
-  postAuthenticate: async (socket, data) => {
-    const { user } = socket.client;
-
-    // the rooms associated with the current team
-    // and user so we can send authenticated events
-    let rooms = [`team-${user.teamId}`, `user-${user.id}`];
-
-    // the rooms associated with collections this user
-    // has access to on connection. New collection subscriptions
-    // are managed from the client as needed through the 'join' event
-    const collectionIds = await user.collectionIds();
-    collectionIds.forEach((collectionId) =>
-      rooms.push(`collection-${collectionId}`)
-    );
-
-    // join all of the rooms at once
-    socket.join(rooms);
-
-    // allow the client to request to join rooms
-    socket.on("join", async (event) => {
-      // user is joining a collection channel, because their permissions have
-      // changed, granting them access.
-      if (event.collectionId) {
-        const collection = await Collection.scope({
-          method: ["withMembership", user.id],
-        }).findByPk(event.collectionId);
-
-        if (can(user, "read", collection)) {
-          socket.join(`collection-${event.collectionId}`);
-        }
-      }
-
-      // user is joining a document channel, because they have navigated to
-      // view a document.
-      if (event.documentId) {
-        const document = await Document.findByPk(event.documentId, {
-          userId: user.id,
-        });
-
-        if (can(user, "read", document)) {
-          const room = `document-${event.documentId}`;
-
-          await View.touch(event.documentId, user.id, event.isEditing);
-          const editing = await View.findRecentlyEditingByDocument(
-            event.documentId
-          );
-
-          socket.join(room, () => {
-            // let everyone else in the room know that a new user joined
-            io.to(room).emit("user.join", {
-              userId: user.id,
-              documentId: event.documentId,
-              isEditing: event.isEditing,
-            });
-
-            // let this user know who else is already present in the room
-            io.in(room).clients(async (err, sockets) => {
-              if (err) throw err;
-
-              // because a single user can have multiple socket connections we
-              // need to make sure that only unique userIds are returned. A Map
-              // makes this easy.
-              let userIds = new Map();
-              for (const socketId of sockets) {
-                const userId = await client.hget(socketId, "userId");
-                userIds.set(userId, userId);
-              }
-              socket.emit("document.presence", {
-                documentId: event.documentId,
-                userIds: Array.from(userIds.keys()),
-                editingIds: editing.map((view) => view.userId),
-              });
-            });
-          });
-        }
-      }
-    });
-
-    // allow the client to request to leave rooms
-    socket.on("leave", (event) => {
-      if (event.collectionId) {
-        socket.leave(`collection-${event.collectionId}`);
-      }
-      if (event.documentId) {
-        const room = `document-${event.documentId}`;
-        socket.leave(room, () => {
-          io.to(room).emit("user.leave", {
-            userId: user.id,
-            documentId: event.documentId,
-          });
-        });
-      }
-    });
-
-    socket.on("disconnecting", () => {
-      const rooms = Object.keys(socket.rooms);
-
-      rooms.forEach((room) => {
-        if (room.startsWith("document-")) {
-          const documentId = room.replace("document-", "");
-          io.to(room).emit("user.leave", {
-            userId: user.id,
-            documentId,
-          });
-        }
-      });
-    });
-
-    socket.on("presence", async (event) => {
-      const room = `document-${event.documentId}`;
-
-      if (event.documentId && socket.rooms[room]) {
-        const view = await View.touch(
-          event.documentId,
-          user.id,
-          event.isEditing
-        );
-        view.user = user;
-
-        io.to(room).emit("user.presence", {
-          userId: user.id,
-          documentId: event.documentId,
-          isEditing: event.isEditing,
-        });
-      }
-    });
-  },
-});
-
-server.on("error", (err) => {
-  throw err;
-});
-
-server.on("listening", () => {
-  const address = server.address();
-  console.log(`\n> Listening on http://localhost:${address.port}\n`);
-});
-
-server.listen(process.env.PORT || "3000");
-
-export const socketio = io;
-
-export default server;

server/models/Authentication.js

@@ -9,7 +9,7 @@ const Authentication = sequelize.define("authentication", {
   },
   service: DataTypes.STRING,
   scopes: DataTypes.ARRAY(DataTypes.STRING),
-  token: encryptedFields().vault("token"),
+  token: encryptedFields.vault("token"),
 });
 
 Authentication.associate = (models) => {

server/models/Collection.js

@@ -250,13 +250,11 @@ Collection.prototype.addDocumentToStructure = async function (
     }
 
     // Sequelize doesn't seem to set the value with splice on JSONB field
-    // https://github.com/sequelize/sequelize/blob/e1446837196c07b8ff0c23359b958d68af40fd6d/src/model.js#L3937
-    this.changed("documentStructure", true);
+    this.documentStructure = this.documentStructure;
 
     if (options.save !== false) {
       await this.save({
         ...options,
-        fields: ["documentStructure"],
         transaction,
       });
       if (transaction) {

server/models/Document.js

@@ -570,7 +570,7 @@ Document.prototype.archive = async function (userId) {
 };
 
 // Restore an archived document back to being visible to the team
-Document.prototype.unarchive = async function (userId: string) {
+Document.prototype.unarchive = async function (userId) {
   const collection = await this.getCollection();
 
   // check to see if the documents parent hasn't been archived also
@@ -602,27 +602,23 @@ Document.prototype.unarchive = async function (userId: string) {
 };
 
 // Delete a document, archived or otherwise.
-Document.prototype.delete = function (userId: string) {
-  return sequelize.transaction(
-    async (transaction: Transaction): Promise<Document> => {
-      if (!this.archivedAt && !this.template) {
-        // delete any children and remove from the document structure
-        const collection = await this.getCollection();
-        if (collection) await collection.deleteDocument(this, { transaction });
-      }
-
-      await Revision.destroy({
-        where: { documentId: this.id },
-        transaction,
-      });
-
-      this.lastModifiedById = userId;
-      this.deletedAt = new Date();
-
-      await this.save({ transaction });
-      return this;
+Document.prototype.delete = function (options) {
+  return sequelize.transaction(async (transaction: Transaction): Promise<*> => {
+    if (!this.archivedAt) {
+      // delete any children and remove from the document structure
+      const collection = await this.getCollection();
+      if (collection) await collection.deleteDocument(this, { transaction });
     }
-  );
+
+    await Revision.destroy({
+      where: { documentId: this.id },
+      transaction,
+    });
+
+    await this.destroy({ transaction, ...options });
+
+    return this;
+  });
 };
 
 Document.prototype.getTimestamp = function () {

server/models/Document.test.js

@@ -1,11 +1,6 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 import { Document } from "../models";
-import {
-  buildDocument,
-  buildCollection,
-  buildTeam,
-  buildUser,
-} from "../test/factories";
+import { buildDocument, buildCollection, buildTeam } from "../test/factories";
 import { flushdb } from "../test/support";
 
 beforeEach(() => flushdb());
@@ -197,16 +192,3 @@ describe("#searchForTeam", () => {
     expect(results.length).toBe(0);
   });
 });
-
-describe("#delete", () => {
-  test("should soft delete and set last modified", async () => {
-    let document = await buildDocument();
-    let user = await buildUser();
-
-    await document.delete(user.id);
-
-    document = await Document.findByPk(document.id, { paranoid: false });
-    expect(document.lastModifiedById).toBe(user.id);
-    expect(document.deletedAt).toBeTruthy();
-  });
-});

server/models/User.js

@@ -27,7 +27,7 @@ const User = sequelize.define(
     service: { type: DataTypes.STRING, allowNull: true },
     serviceId: { type: DataTypes.STRING, allowNull: true, unique: true },
     slackData: DataTypes.JSONB,
-    jwtSecret: encryptedFields().vault("jwtSecret"),
+    jwtSecret: encryptedFields.vault("jwtSecret"),
     lastActiveAt: DataTypes.DATE,
     lastActiveIp: { type: DataTypes.STRING, allowNull: true },
     lastSignedInAt: DataTypes.DATE,

server/policies/document.js

@@ -71,21 +71,7 @@ allow(User, "createChildDocument", Document, (user, document) => {
   return user.teamId === document.teamId;
 });
 
-allow(User, "move", Document, (user, document) => {
-  if (document.archivedAt) return false;
-  if (document.deletedAt) return false;
-  if (!document.publishedAt) return false;
-
-  invariant(
-    document.collection,
-    "collection is missing, did you forget to include in the query scope?"
-  );
-  if (cannot(user, "update", document.collection)) return false;
-
-  return user.teamId === document.teamId;
-});
-
-allow(User, ["pin", "unpin"], Document, (user, document) => {
+allow(User, ["move", "pin", "unpin"], Document, (user, document) => {
   if (document.archivedAt) return false;
   if (document.deletedAt) return false;
   if (document.template) return false;
@@ -126,16 +112,16 @@ allow(User, "restore", Document, (user, document) => {
 });
 
 allow(User, "archive", Document, (user, document) => {
-  if (!document.publishedAt) return false;
-  if (document.archivedAt) return false;
-  if (document.deletedAt) return false;
-
   invariant(
     document.collection,
     "collection is missing, did you forget to include in the query scope?"
   );
   if (cannot(user, "update", document.collection)) return false;
 
+  if (!document.publishedAt) return false;
+  if (document.archivedAt) return false;
+  if (document.deletedAt) return false;
+
   return user.teamId === document.teamId;
 });
 

server/presenters/document.js

@@ -72,13 +72,11 @@ export default async function present(document: Document, options: ?Options) {
     data.updatedBy = presentUser(document.updatedBy);
 
     // TODO: This could be further optimized
-    data.collaborators = (
-      await User.findAll({
-        where: {
-          id: takeRight(document.collaboratorIds, 10) || [],
-        },
-      })
-    ).map(presentUser);
+    data.collaborators = await User.findAll({
+      where: {
+        id: takeRight(document.collaboratorIds, 10) || [],
+      },
+    }).map(presentUser);
   }
 
   return data;

server/routes.js

@@ -18,7 +18,7 @@ const readFile = util.promisify(fs.readFile);
 
 const readIndexFile = async (ctx) => {
   if (isProduction) {
-    return readFile(path.join(__dirname, "../app/index.html"));
+    return readFile(path.join(__dirname, "../dist/index.html"));
   }
 
   const middleware = ctx.devMiddleware;
@@ -39,7 +39,7 @@ const readIndexFile = async (ctx) => {
 
 // serve static assets
 koa.use(
-  serve(path.resolve(__dirname, "../../public"), {
+  serve(path.resolve(__dirname, "../public"), {
     maxage: 60 * 60 * 24 * 30 * 1000,
   })
 );
@@ -52,7 +52,10 @@ if (process.env.NODE_ENV === "production") {
       "Cache-Control": `max-age=${356 * 24 * 60 * 60}`,
     });
 
-    await sendfile(ctx, path.join(__dirname, "../app/", ctx.path.substring(8)));
+    await sendfile(
+      ctx,
+      path.join(__dirname, "../dist/", ctx.path.substring(8))
+    );
   });
 }
 

server/sequelize.js

@@ -3,23 +3,16 @@ import debug from "debug";
 import Sequelize from "sequelize";
 import EncryptedField from "sequelize-encrypted";
 
-const isProduction = process.env.NODE_ENV === "production";
-
-export const encryptedFields = () =>
-  EncryptedField(Sequelize, process.env.SECRET_KEY);
+export const encryptedFields = EncryptedField(
+  Sequelize,
+  process.env.SECRET_KEY
+);
 
 export const DataTypes = Sequelize;
 export const Op = Sequelize.Op;
 
 export const sequelize = new Sequelize(process.env.DATABASE_URL, {
+  // logging: console.log,
   logging: debug("sql"),
   typeValidation: true,
-  dialectOptions: {
-    ssl: isProduction
-      ? {
-          // Ref.: https://github.com/brianc/node-postgres/issues/2009
-          rejectUnauthorized: false,
-        }
-      : false,
-  },
 });

server/services/websockets.js

@@ -1,7 +1,7 @@
 // @flow
 import subHours from "date-fns/sub_hours";
+import { socketio } from "../";
 import type { Event } from "../events";
-import { socketio } from "../main";
 import {
   Document,
   Collection,

server/static/index.html

@@ -31,8 +31,8 @@
 <body>
   <div id="root"></div>
   <script>//inject-env//</script>
-  <script src="https://browser.sentry-cdn.com/5.22.3/bundle.min.js"
-    integrity="sha384-A1qzcXXJWl+bzYr+r8AdFzSaLbdcbYRFmG37MEDKr4EYjtraUyoZ6UiMw31jHcV9" crossorigin="anonymous">
+  <script src="https://browser.sentry-cdn.com/5.12.1/bundle.min.js"
+    integrity="sha384-y+an4eARFKvjzOivf/Z7JtMJhaN6b+lLQ5oFbBbUwZNNVir39cYtkjW1r6Xjbxg3" crossorigin="anonymous">
     </script>
   <script>
     if ('//inject-sentry-dsn//') {
@@ -44,7 +44,6 @@
           'NotFoundError',
           'OfflineError',
           'UpdateRequiredError',
-          'ChunkLoadError'
         ],
       });
     }

server/test/helper.js

@@ -28,4 +28,5 @@ function runMigrations() {
 runMigrations();
 
 // This is needed for the relative manual mock to be picked up
+// $FlowFixMe
 jest.mock("../events");

server/test/support.js

@@ -6,9 +6,7 @@ export function flushdb() {
   const sql = sequelize.getQueryInterface();
   const tables = Object.keys(sequelize.models).map((model) => {
     const n = sequelize.models[model].getTableName();
-    return sql.queryGenerator.quoteTable(
-      typeof n === "string" ? n : n.tableName
-    );
+    return sql.quoteTable(typeof n === "string" ? n : n.tableName);
   });
 
   const query = `TRUNCATE ${tables.join(", ")} CASCADE`;

server/utils/prefetchTags.js

@@ -16,7 +16,7 @@ const prefetchTags = [
 
 try {
   const manifest = fs.readFileSync(
-    path.join(__dirname, "../../app/manifest.json"),
+    path.join(__dirname, "../../dist/manifest.json"),
     "utf8"
   );
   const manifestData = JSON.parse(manifest);

server/utils/s3.js

@@ -4,18 +4,18 @@ import * as Sentry from "@sentry/node";
 import AWS from "aws-sdk";
 import addHours from "date-fns/add_hours";
 import format from "date-fns/format";
+import invariant from "invariant";
 import fetch from "isomorphic-fetch";
 
 const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY;
 const AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID;
 const AWS_REGION = process.env.AWS_REGION;
-const AWS_S3_UPLOAD_BUCKET_NAME = process.env.AWS_S3_UPLOAD_BUCKET_NAME || "";
-const AWS_S3_FORCE_PATH_STYLE = process.env.AWS_S3_FORCE_PATH_STYLE !== "false";
+const AWS_S3_UPLOAD_BUCKET_NAME = process.env.AWS_S3_UPLOAD_BUCKET_NAME;
 
 const s3 = new AWS.S3({
-  s3ForcePathStyle: AWS_S3_FORCE_PATH_STYLE,
-  accessKeyId: AWS_ACCESS_KEY_ID,
-  secretAccessKey: AWS_SECRET_ACCESS_KEY,
+  s3ForcePathStyle: true,
+  accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+  secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
   endpoint: new AWS.Endpoint(process.env.AWS_S3_UPLOAD_BUCKET_URL),
   signatureVersion: "v4",
 });
@@ -84,9 +84,9 @@ export const publicS3Endpoint = (isServerUpload?: boolean) => {
     "localhost:"
   ).replace(/\/$/, "");
 
-  return `${host}/${
-    isServerUpload && isDocker ? "s3/" : ""
-  }${AWS_S3_UPLOAD_BUCKET_NAME}`;
+  return `${host}/${isServerUpload && isDocker ? "s3/" : ""}${
+    process.env.AWS_S3_UPLOAD_BUCKET_NAME
+  }`;
 };
 
 export const uploadToS3FromUrl = async (
@@ -94,6 +94,8 @@ export const uploadToS3FromUrl = async (
   key: string,
   acl: string
 ) => {
+  invariant(AWS_S3_UPLOAD_BUCKET_NAME, "AWS_S3_UPLOAD_BUCKET_NAME not set");
+
   try {
     // $FlowIssue https://github.com/facebook/flow/issues/2171
     const res = await fetch(url);
@@ -101,7 +103,7 @@ export const uploadToS3FromUrl = async (
     await s3
       .putObject({
         ACL: acl,
-        Bucket: AWS_S3_UPLOAD_BUCKET_NAME,
+        Bucket: process.env.AWS_S3_UPLOAD_BUCKET_NAME,
         Key: key,
         ContentType: res.headers["content-type"],
         ContentLength: res.headers["content-length"],
@@ -124,17 +126,18 @@ export const uploadToS3FromUrl = async (
 export const deleteFromS3 = (key: string) => {
   return s3
     .deleteObject({
-      Bucket: AWS_S3_UPLOAD_BUCKET_NAME,
+      Bucket: process.env.AWS_S3_UPLOAD_BUCKET_NAME,
       Key: key,
     })
     .promise();
 };
 
 export const getSignedImageUrl = async (key: string) => {
+  invariant(AWS_S3_UPLOAD_BUCKET_NAME, "AWS_S3_UPLOAD_BUCKET_NAME not set");
   const isDocker = process.env.AWS_S3_UPLOAD_BUCKET_URL.match(/http:\/\/s3:/);
 
   const params = {
-    Bucket: AWS_S3_UPLOAD_BUCKET_NAME,
+    Bucket: process.env.AWS_S3_UPLOAD_BUCKET_NAME,
     Key: key,
     Expires: 60,
   };
@@ -146,7 +149,7 @@ export const getSignedImageUrl = async (key: string) => {
 
 export const getImageByKey = async (key: string) => {
   const params = {
-    Bucket: AWS_S3_UPLOAD_BUCKET_NAME,
+    Bucket: process.env.AWS_S3_UPLOAD_BUCKET_NAME,
     Key: key,
   };
 

webpack.config.js

@@ -9,7 +9,7 @@ require('dotenv').config({ silent: true });
 
 module.exports = {
   output: {
-    path: path.join(__dirname, 'build/app'),
+    path: path.join(__dirname, 'dist'),
     filename: '[name].[hash].js',
     publicPath: '/static/',
   },

webpack.config.prod.js

@@ -8,7 +8,7 @@ commonWebpackConfig = require('./webpack.config');
 
 productionWebpackConfig = Object.assign(commonWebpackConfig, {
   output: {
-    path: path.join(__dirname, 'build/app'),
+    path: path.join(__dirname, 'dist'),
     filename: '[name].[contenthash].js',
     publicPath: '/static/',
   },

yarn.lock

@@ -2,23 +2,7 @@
 # yarn lockfile v1
 
 
-"@babel/cli@^7.10.5":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.10.5.tgz#57df2987c8cf89d0fc7d4b157ec59d7619f1b77a"
-  integrity sha512-j9H9qSf3kLdM0Ao3aGPbGZ73mEA9XazuupcS6cDGWuiyAcANoguhP0r2Lx32H5JGw4sSSoHG3x/mxVnHgvOoyA==
-  dependencies:
-    commander "^4.0.1"
-    convert-source-map "^1.1.0"
-    fs-readdir-recursive "^1.1.0"
-    glob "^7.0.0"
-    lodash "^4.17.19"
-    make-dir "^2.1.0"
-    slash "^2.0.0"
-    source-map "^0.5.0"
-  optionalDependencies:
-    chokidar "^2.1.8"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
   integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
@@ -56,7 +40,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.11.0":
+"@babel/generator@^7.11.0", "@babel/generator@^7.8.6":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.0.tgz#4b90c78d8c12825024568cbe83ee6c9af193585c"
   integrity sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==
@@ -146,7 +130,7 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-function-name@^7.10.4":
+"@babel/helper-function-name@^7.10.4", "@babel/helper-function-name@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
   integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
@@ -155,7 +139,7 @@
     "@babel/template" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-get-function-arity@^7.10.4":
+"@babel/helper-get-function-arity@^7.10.4", "@babel/helper-get-function-arity@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
   integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
@@ -251,14 +235,14 @@
   dependencies:
     "@babel/types" "^7.11.0"
 
-"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
+"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.8.3":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
   integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
   dependencies:
     "@babel/types" "^7.11.0"
 
-"@babel/helper-validator-identifier@^7.10.4":
+"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.9.0":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
   integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
@@ -282,7 +266,7 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/highlight@^7.0.0", "@babel/highlight@^7.10.4":
+"@babel/highlight@^7.0.0", "@babel/highlight@^7.10.4", "@babel/highlight@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
   integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
@@ -291,7 +275,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.11.0", "@babel/parser@^7.11.1", "@babel/parser@^7.7.0":
+"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.11.0", "@babel/parser@^7.11.1", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6":
   version "7.11.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.3.tgz#9e1eae46738bcd08e23e867bab43e7b95299a8f9"
   integrity sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==
@@ -954,6 +938,17 @@
     "@babel/plugin-transform-react-jsx-source" "^7.10.4"
     "@babel/plugin-transform-react-pure-annotations" "^7.10.4"
 
+"@babel/register@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.10.5.tgz#354f3574895f1307f79efe37a51525e52fd38d89"
+  integrity sha512-eYHdLv43nyvmPn9bfNfrcC4+iYNwdQ8Pxk1MFJuU/U5LpSYl/PH4dFMazCYZDFVi8ueG3shvO+AQfLrxpYulQw==
+  dependencies:
+    find-cache-dir "^2.0.0"
+    lodash "^4.17.19"
+    make-dir "^2.1.0"
+    pirates "^4.0.0"
+    source-map-support "^0.5.16"
+
 "@babel/runtime-corejs3@^7.10.2":
   version "7.11.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz#02c3029743150188edeb66541195f54600278419"
@@ -969,7 +964,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.10.4", "@babel/template@^7.3.3":
+"@babel/template@^7.10.4", "@babel/template@^7.3.3", "@babel/template@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
   integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
@@ -993,7 +988,7 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.0.tgz#2ae6bf1ba9ae8c3c43824e5861269871b206e90d"
   integrity sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==
@@ -1024,10 +1019,10 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@emotion/is-prop-valid@^0.8.8":
-  version "0.8.8"
-  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a"
-  integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==
+"@emotion/is-prop-valid@^0.8.3":
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.7.tgz#803449993f436f9a6c67752251ea3fc492a1044c"
+  integrity sha512-OPkKzUeiid0vEKjZqnGcy2mzxjIlCffin+L2C02pdz/bVlt5zZZE2VzO0D3XOPnH0NEeF21QNKSXiZphjr4xiQ==
   dependencies:
     "@emotion/memoize" "0.7.4"
 
@@ -1372,72 +1367,83 @@
     execa "^4.0.0"
     java-properties "^1.0.0"
 
-"@sentry/core@5.22.3":
-  version "5.22.3"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.22.3.tgz#030f435f2b518f282ba8bd954dac90cd70888bd7"
-  integrity sha512-eGL5uUarw3o4i9QUb9JoFHnhriPpWCaqeaIBB06HUpdcvhrjoowcKZj1+WPec5lFg5XusE35vez7z/FPzmJUDw==
+"@sentry/apm@5.15.4":
+  version "5.15.4"
+  resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.15.4.tgz#59af766d2bb4c9d98eda5ddba7a32a79ecc807a2"
+  integrity sha512-gcW225Jls1ShyBXMWN6zZyuVJwBOIQ63sI+URI2NSFsdpBpdpZ8yennIm+oMlSfb25Nzt9SId7TRSjPhlSbTZQ==
   dependencies:
-    "@sentry/hub" "5.22.3"
-    "@sentry/minimal" "5.22.3"
-    "@sentry/types" "5.22.3"
-    "@sentry/utils" "5.22.3"
+    "@sentry/browser" "5.15.4"
+    "@sentry/hub" "5.15.4"
+    "@sentry/minimal" "5.15.4"
+    "@sentry/types" "5.15.4"
+    "@sentry/utils" "5.15.4"
     tslib "^1.9.3"
 
-"@sentry/hub@5.22.3":
-  version "5.22.3"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.22.3.tgz#08309a70d2ea8d5e313d05840c1711f34f2fffe5"
-  integrity sha512-INo47m6N5HFEs/7GMP9cqxOIt7rmRxdERunA3H2L37owjcr77MwHVeeJ9yawRS6FMtbWXplgWTyTIWIYOuqVbw==
+"@sentry/browser@5.15.4":
+  version "5.15.4"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.15.4.tgz#5a7e7bad088556665ed8e69bceb0e18784e4f6c7"
+  integrity sha512-l/auT1HtZM3KxjCGQHYO/K51ygnlcuOrM+7Ga8gUUbU9ZXDYw6jRi0+Af9aqXKmdDw1naNxr7OCSy6NBrLWVZw==
   dependencies:
-    "@sentry/types" "5.22.3"
-    "@sentry/utils" "5.22.3"
+    "@sentry/core" "5.15.4"
+    "@sentry/types" "5.15.4"
+    "@sentry/utils" "5.15.4"
     tslib "^1.9.3"
 
-"@sentry/minimal@5.22.3":
-  version "5.22.3"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.22.3.tgz#706e4029ae5494123d3875c658ba8911aa5cc440"
-  integrity sha512-HoINpYnVYCpNjn2XIPIlqH5o4BAITpTljXjtAftOx6Hzj+Opjg8tR8PWliyKDvkXPpc4kXK9D6TpEDw8MO0wZA==
+"@sentry/core@5.15.4":
+  version "5.15.4"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.15.4.tgz#08b617e093a636168be5aebad141d1f744217085"
+  integrity sha512-9KP4NM4SqfV5NixpvAymC7Nvp36Zj4dU2fowmxiq7OIbzTxGXDhwuN/t0Uh8xiqlkpkQqSECZ1OjSFXrBldetQ==
   dependencies:
-    "@sentry/hub" "5.22.3"
-    "@sentry/types" "5.22.3"
+    "@sentry/hub" "5.15.4"
+    "@sentry/minimal" "5.15.4"
+    "@sentry/types" "5.15.4"
+    "@sentry/utils" "5.15.4"
     tslib "^1.9.3"
 
-"@sentry/node@^5.22.3":
-  version "5.22.3"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.22.3.tgz#adea622eae6811e11edc8f34209c912caed91336"
-  integrity sha512-TCCKO7hJKiQi1nGmJcQfvbbqv98P08LULh7pb/NaO5pV20t1FtICfGx8UMpORRDehbcAiYq/f7rPOF6X/Xl5iw==
+"@sentry/hub@5.15.4":
+  version "5.15.4"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.15.4.tgz#cb64473725a60eec63b0be58ed1143eaaf894bee"
+  integrity sha512-1XJ1SVqadkbUT4zLS0TVIVl99si7oHizLmghR8LMFl5wOkGEgehHSoOydQkIAX2C7sJmaF5TZ47ORBHgkqclUg==
   dependencies:
-    "@sentry/core" "5.22.3"
-    "@sentry/hub" "5.22.3"
-    "@sentry/tracing" "5.22.3"
-    "@sentry/types" "5.22.3"
-    "@sentry/utils" "5.22.3"
-    cookie "^0.4.1"
-    https-proxy-agent "^5.0.0"
+    "@sentry/types" "5.15.4"
+    "@sentry/utils" "5.15.4"
+    tslib "^1.9.3"
+
+"@sentry/minimal@5.15.4":
+  version "5.15.4"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.15.4.tgz#113f01fefb86b7830994c3dfa7ad4889ba7b2003"
+  integrity sha512-GL4GZ3drS9ge+wmxkHBAMEwulaE7DMvAEfKQPDAjg2p3MfcCMhAYfuY4jJByAC9rg9OwBGGehz7UmhWMFjE0tw==
+  dependencies:
+    "@sentry/hub" "5.15.4"
+    "@sentry/types" "5.15.4"
+    tslib "^1.9.3"
+
+"@sentry/node@^5.12.2":
+  version "5.15.4"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.15.4.tgz#e7bc3962d321a12b633743200165ca5f1757cb68"
+  integrity sha512-OfdhNEvOJZ55ZkCUcVgctjaZkOw7rmLzO5VyDTSgevA4uLsPaTNXSAeK2GSQBXc5J0KdRpNz4sSIyuxOS4Z7Vg==
+  dependencies:
+    "@sentry/apm" "5.15.4"
+    "@sentry/core" "5.15.4"
+    "@sentry/hub" "5.15.4"
+    "@sentry/types" "5.15.4"
+    "@sentry/utils" "5.15.4"
+    cookie "^0.3.1"
+    https-proxy-agent "^4.0.0"
     lru_map "^0.3.3"
     tslib "^1.9.3"
 
-"@sentry/tracing@5.22.3":
-  version "5.22.3"
-  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-5.22.3.tgz#9b5a376e3164c007a22e8642ec094104468cac0c"
-  integrity sha512-Zp59kMCk5v56ZAyErqjv/QvGOWOQ5fRltzeVQVp8unIDTk6gEFXfhwPsYHOokJe1mfkmrgPDV6xAkYgtL3KCDQ==
-  dependencies:
-    "@sentry/hub" "5.22.3"
-    "@sentry/minimal" "5.22.3"
-    "@sentry/types" "5.22.3"
-    "@sentry/utils" "5.22.3"
-    tslib "^1.9.3"
+"@sentry/types@5.15.4":
+  version "5.15.4"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.15.4.tgz#37f30e35b06e8e12ad1101f1beec3e9b88ca1aab"
+  integrity sha512-quPHPpeAuwID48HLPmqBiyXE3xEiZLZ5D3CEbU3c3YuvvAg8qmfOOTI6z4Z3Eedi7flvYpnx3n7N3dXIEz30Eg==
 
-"@sentry/types@5.22.3":
-  version "5.22.3"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.22.3.tgz#d1d547b30ee8bd7771fa893af74c4f3d71f0fd18"
-  integrity sha512-cv+VWK0YFgCVDvD1/HrrBWOWYG3MLuCUJRBTkV/Opdy7nkdNjhCAJQrEyMM9zX0sac8FKWKOHT0sykNh8KgmYw==
-
-"@sentry/utils@5.22.3":
-  version "5.22.3"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.22.3.tgz#e3bda3e789239eb16d436f768daa12829f33d18f"
-  integrity sha512-AHNryXMBvIkIE+GQxTlmhBXD0Ksh+5w1SwM5qi6AttH+1qjWLvV6WB4+4pvVvEoS8t5F+WaVUZPQLmCCWp6zKw==
+"@sentry/utils@5.15.4":
+  version "5.15.4"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.15.4.tgz#02865ab3c9b745656cea0ab183767ec26c96f6e6"
+  integrity sha512-lO8SLBjrUDGADl0LOkd55R5oL510d/1SaI08/IBHZCxCUwI4TiYo5EPECq8mrj3XGfgCyq9osw33bymRlIDuSQ==
   dependencies:
-    "@sentry/types" "5.22.3"
+    "@sentry/types" "5.15.4"
     tslib "^1.9.3"
 
 "@sindresorhus/is@^0.7.0":
@@ -1797,6 +1803,11 @@ after@0.8.2:
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
   integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
+agent-base@5:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
+  integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
+
 agent-base@6:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.0.tgz#5d0101f19bbfaed39980b22ae866de153b93f09a"
@@ -2485,7 +2496,7 @@ blob@0.0.5:
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
   integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
-bluebird@^3.5.5, bluebird@^3.7.2:
+bluebird@^3.5.0, bluebird@^3.5.3, bluebird@^3.5.5, bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -2711,10 +2722,10 @@ buffer-indexof-polyfill@~1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.1.tgz#a9fb806ce8145d5428510ce72f278bb363a638bf"
   integrity sha1-qfuAbOgUXVQoUQznLyeLs2OmOL8=
 
-buffer-writer@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04"
-  integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==
+buffer-writer@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-1.0.1.tgz#22a936901e3029afcd7547eb4487ceb697a3bf08"
+  integrity sha1-Iqk2kB4wKa/NdUfrRIfOtpejvwg=
 
 buffer-xor@^1.0.3:
   version "1.0.3"
@@ -3179,6 +3190,14 @@ cloneable-readable@^1.0.0:
     process-nextick-args "^2.0.0"
     readable-stream "^2.3.5"
 
+cls-bluebird@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cls-bluebird/-/cls-bluebird-2.1.0.tgz#37ef1e080a8ffb55c2f4164f536f1919e7968aee"
+  integrity sha1-N+8eCAqP+1XC9BZPU28ZGeeWiu4=
+  dependencies:
+    is-bluebird "^1.0.2"
+    shimmer "^1.1.0"
+
 cluster-key-slot@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d"
@@ -3268,11 +3287,6 @@ commander@^2.11.0, commander@^2.19.0, commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
-  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
-
 commander@~2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -3397,7 +3411,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.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.4.0, convert-source-map@^1.6.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==
@@ -3412,16 +3426,11 @@ convert-units@^2.3.4:
     lodash.foreach "2.3.x"
     lodash.keys "2.3.x"
 
-cookie@0.3.1:
+cookie@0.3.1, cookie@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
   integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
-cookie@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
-  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
-
 cookies@~0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90"
@@ -4382,11 +4391,6 @@ eslint-plugin-prettier@^3.1.0:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-react-hooks@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.1.0.tgz#6323fbd5e650e84b2987ba76370523a60f4e7925"
-  integrity sha512-36zilUcDwDReiORXmcmTc6rRumu9JIM3WjSvV0nclHoUQ0CNrX866EwONvLR/UqaeqFutbAnVu8PEmctdo2SRQ==
-
 eslint-plugin-react@^7.20.0:
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.5.tgz#29480f3071f64a04b2c3d99d9b460ce0f76fb857"
@@ -4802,7 +4806,7 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-find-cache-dir@^2.1.0:
+find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
   integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
@@ -5004,11 +5008,6 @@ fs-minipass@^2.0.0:
   dependencies:
     minipass "^3.0.0"
 
-fs-readdir-recursive@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
-  integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==
-
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -5076,6 +5075,11 @@ gcp-metadata@^3.4.0:
     gaxios "^2.1.0"
     json-bigint "^0.3.0"
 
+generic-pool@2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff"
+  integrity sha1-eAw29p360FpaBF3Te+etyhGk9v8=
+
 gensync@^1.0.0-beta.1:
   version "1.0.0-beta.1"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
@@ -5671,6 +5675,14 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
+https-proxy-agent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b"
+  integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==
+  dependencies:
+    agent-base "5"
+    debug "4"
+
 https-proxy-agent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
@@ -5931,6 +5943,11 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
+is-bluebird@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-bluebird/-/is-bluebird-1.0.2.tgz#096439060f4aa411abee19143a84d6a55346d6e2"
+  integrity sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI=
+
 is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
@@ -6695,6 +6712,11 @@ js-search@^1.4.2:
   resolved "https://registry.yarnpkg.com/js-search/-/js-search-1.4.3.tgz#23a86d7e064ca53a473930edc48615b6b1c1954a"
   integrity sha512-Sny5pf00kX1sM1KzvUC9nGYWXOvBfy30rmvZWeRktpg+esQKedIXrXNee/I2CAnsouCyaTjitZpRflDACx4toA==
 
+js-string-escape@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+  integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -7491,7 +7513,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-"lodash@>=3.5 <5", lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5:
+"lodash@>=3.5 <5", lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5:
   version "4.17.19"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
   integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
@@ -7878,34 +7900,35 @@ mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.3:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-mobx-react-lite@>=2.0.6:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-2.0.7.tgz#1bfb3b4272668e288047cf0c7940b14e91cba284"
-  integrity sha512-YKAh2gThC6WooPnVZCoC+rV1bODAKFwkhxikzgH18wpBjkgTkkR9Sb0IesQAH5QrAEH/JQVmy47jcpQkf2Au3Q==
+mobx-react-devtools@^6.0.3:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/mobx-react-devtools/-/mobx-react-devtools-6.1.1.tgz#a462b944085cf11ff96fc937d12bf31dab4c8984"
+  integrity sha512-nc5IXLdEUFLn3wZal65KF3/JFEFd+mbH4KTz/IG5BOPyw7jo8z29w/8qm7+wiCyqVfUIgJ1gL4+HVKmcXIOgqA==
 
-mobx-react@^6.2.5:
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-6.2.5.tgz#9020a17b79cc6dc3d124ad89ab36eb9ea540a45b"
-  integrity sha512-LxtXXW0GkOAO6VOIg2m/6WL6ZuKlzOWwESIFdrWelI0ZMIvtKCMZVUuulcO5GAWSDsH0ApaMkGLoaPqKjzyziQ==
+mobx-react@^5.4.2:
+  version "5.4.4"
+  resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-5.4.4.tgz#b3de9c6eabcd0ed8a40036888cb0221ab9568b80"
+  integrity sha512-2mTzpyEjVB/RGk2i6KbcmP4HWcAUFox5ZRCrGvSyz49w20I4C4qql63grPpYrS9E9GKwgydBHQlA4y665LuRCQ==
   dependencies:
-    mobx-react-lite ">=2.0.6"
+    hoist-non-react-statics "^3.0.0"
+    react-lifecycles-compat "^3.0.2"
 
 mobx@4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/mobx/-/mobx-4.6.0.tgz#88a8ed21ff81b8861778c4b0d38e3dcdd1a7ddde"
   integrity sha512-qoX4BsUpA37yLzYAmNsApPiRlpMr8uwt+KYVTJNv9IhpD8NQVMno/K3EqZKAsiWo9IEvPOuQ0B6z7Z7ISjULpA==
 
-moment-timezone@^0.5.25, moment-timezone@^0.5.31:
-  version "0.5.31"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.31.tgz#9c40d8c5026f0c7ab46eda3d63e49c155148de05"
-  integrity sha512-+GgHNg8xRhMXfEbv81iDtrVeTcWt0kWmTEY1XQK14dICTXnWJnT0dxdlPspwqF3keKMVPXwayEsk1DI0AA/jdA==
+moment-timezone@^0.5.21, moment-timezone@^0.5.25:
+  version "0.5.28"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.28.tgz#f093d789d091ed7b055d82aa81a82467f72e4338"
+  integrity sha512-TDJkZvAyKIVWg5EtVqRzU97w0Rb0YVbfpqyjgu6GwXCAohVRqwZjf4fOzDE6p1Ch98Sro/8hQQi65WDXW5STPw==
   dependencies:
     moment ">= 2.9.0"
 
-"moment@>= 2.9.0", moment@^2.26.0:
-  version "2.27.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
-  integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
+"moment@>= 2.9.0", moment@^2.24.0:
+  version "2.24.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
+  integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -8189,6 +8212,11 @@ oauth-sign@~0.9.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
+object-assign@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
+  integrity sha1-ejs9DpgGPUP0wD8uiubNUahog6A=
+
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -8520,10 +8548,10 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-packet-reader@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74"
-  integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==
+packet-reader@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27"
+  integrity sha1-zWLmCvjX/qinBexP+ZCHHEaHHyc=
 
 pako@~1.0.2, pako@~1.0.5:
   version "1.0.11"
@@ -8718,15 +8746,15 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-pg-connection-string@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.3.0.tgz#c13fcb84c298d0bfa9ba12b40dd6c23d946f55d6"
-  integrity sha512-ukMTJXLI7/hZIwTW7hGMZJ0Lj0S2XQBCJ4Shv4y1zgQ/vqVea+FLhzywvPj0ujSuofu+yA4MYHGZPTsgjBgJ+w==
+pg-connection-string@0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7"
+  integrity sha1-2hhHsglA5C7hSSvq9l1J2RskXfc=
 
-pg-hstore@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/pg-hstore/-/pg-hstore-2.3.3.tgz#d1978c12a85359830b1388d3b0ff233b88928e96"
-  integrity sha512-qpeTpdkguFgfdoidtfeTho1Q1zPVPbtMHgs8eQ+Aan05iLmIs3Z3oo5DOZRclPGoQ4i68I1kCtQSJSa7i0ZVYg==
+pg-hstore@2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/pg-hstore/-/pg-hstore-2.3.2.tgz#f7ef053e7b9b892ae986af2f7cbe86432dfcf24f"
+  integrity sha1-9+8FPnubiSrphq8vfL6GQy388k8=
   dependencies:
     underscore "^1.7.0"
 
@@ -8735,42 +8763,40 @@ pg-int8@1.0.1:
   resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
   integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
 
-pg-pool@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.2.1.tgz#5f4afc0f58063659aeefa952d36af49fa28b30e0"
-  integrity sha512-BQDPWUeKenVrMMDN9opfns/kZo4lxmSWhIqo+cSAF7+lfi9ZclQbr9vfnlNaPr8wYF3UYjm5X0yPAhbcgqNOdA==
+pg-pool@1.*:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-1.8.0.tgz#f7ec73824c37a03f076f51bfdf70e340147c4f37"
+  integrity sha1-9+xzgkw3oD8Hb1G/33DjQBR8Tzc=
+  dependencies:
+    generic-pool "2.4.3"
+    object-assign "4.1.0"
 
-pg-protocol@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.2.5.tgz#28a1492cde11646ff2d2d06bdee42a3ba05f126c"
-  integrity sha512-1uYCckkuTfzz/FCefvavRywkowa6M5FohNMF5OjKrqo9PSR8gYc8poVmwwYQaBxhmQdBjhtP514eXy9/Us2xKg==
-
-pg-types@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3"
-  integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==
+pg-types@1.*:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.13.0.tgz#75f490b8a8abf75f1386ef5ec4455ecf6b345c63"
+  integrity sha512-lfKli0Gkl/+za/+b6lzENajczwZHc7D5kiUCZfgm914jipD2kIOIvEkAhZ8GrW3/TUoP9w8FHjwpPObBye5KQQ==
   dependencies:
     pg-int8 "1.0.1"
-    postgres-array "~2.0.0"
+    postgres-array "~1.0.0"
     postgres-bytea "~1.0.0"
-    postgres-date "~1.0.4"
+    postgres-date "~1.0.0"
     postgres-interval "^1.1.0"
 
-pg@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-8.3.0.tgz#941383300d38eef51ecb88a0188cec441ab64d81"
-  integrity sha512-jQPKWHWxbI09s/Z9aUvoTbvGgoj98AU7FDCcQ7kdejupn/TcNpx56v2gaOTzXkzOajmOEJEdi9eTh9cA2RVAjQ==
+pg@^6.1.5:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-6.4.2.tgz#c364011060eac7a507a2ae063eb857ece910e27f"
+  integrity sha1-w2QBEGDqx6UHoq4GPrhX7OkQ4n8=
   dependencies:
-    buffer-writer "2.0.0"
-    packet-reader "1.0.0"
-    pg-connection-string "^2.3.0"
-    pg-pool "^3.2.1"
-    pg-protocol "^1.2.5"
-    pg-types "^2.1.0"
-    pgpass "1.x"
+    buffer-writer "1.0.1"
+    js-string-escape "1.0.1"
+    packet-reader "0.3.1"
+    pg-connection-string "0.1.3"
+    pg-pool "1.*"
+    pg-types "1.*"
+    pgpass "1.*"
     semver "4.3.2"
 
-pgpass@1.x:
+pgpass@1.*:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306"
   integrity sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=
@@ -8797,7 +8823,7 @@ pify@^4.0.1:
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-pirates@^4.0.1:
+pirates@^4.0.0, pirates@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
   integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
@@ -8847,20 +8873,20 @@ postcss-value-parser@^4.0.2:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d"
   integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==
 
-postgres-array@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e"
-  integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==
+postgres-array@~1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.3.tgz#c561fc3b266b21451fc6555384f4986d78ec80f5"
+  integrity sha512-5wClXrAP0+78mcsNX3/ithQ5exKvCyK5lr5NEEEeGwwM6NJdQgzIJBVxLvRW+huFpX92F2QnZ5CcokH0VhK2qQ==
 
 postgres-bytea@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35"
   integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=
 
-postgres-date@~1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.6.tgz#4925e8085b30c2ba1a06ac91b9a3473954a2ce2d"
-  integrity sha512-o2a4gxeFcox+CgB3Ig/kNHBP23PiEXHCXx7pcIIsvzoNz4qv+lKTyiSkjOXIMNUl12MO/mOYl2K6wR9X5K6Plg==
+postgres-date@~1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.5.tgz#710b27de5f27d550f6e80b5d34f7ba189213c2ee"
+  integrity sha512-pdau6GRPERdAYUQwkBnGKxEfPyhVZXG/JiS44iZWiNdSOWE09N2lUgN6yshuq6fVSon4Pm0VMXd1srUUkLe9iA==
 
 postgres-interval@^1.1.0:
   version "1.2.0"
@@ -9086,7 +9112,7 @@ prosemirror-tables@^1.0.0:
     prosemirror-transform "^1.2.1"
     prosemirror-view "^1.13.3"
 
-prosemirror-transform@1.2.5, prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1:
+prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.5.tgz#7a3e2c61fcdbaf1d0844a2a3bc34fc3524e9809c"
   integrity sha512-eqeIaxWtUfOnpA1ERrXCuSIMzqIJtL9Qrs5uJMCjY5RMSaH5o4pc390SAjn/IDPeIlw6auh0hCCXs3wRvGnQug==
@@ -9346,7 +9372,7 @@ react-keydown@^1.7.3:
   dependencies:
     core-js "^3.1.2"
 
-react-lifecycles-compat@^3.0.0:
+react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
@@ -9828,10 +9854,10 @@ retry-as-promised@^3.2.0:
   dependencies:
     any-promise "^1.3.0"
 
-rich-markdown-editor@^10.6.5:
-  version "10.6.5"
-  resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-10.6.5.tgz#b74ae2e7d05eaa3c8ef34744e5cb0ed2dbdb0958"
-  integrity sha512-C/C+6L7BTXC4zSHgOYMljOQ3CvFt8zNCT829woKBHcDWSnXiUzpjgZZ4qEeNRlh/XJmqeFZYfqY+OzIMsVP2+Q==
+rich-markdown-editor@^10.6.1:
+  version "10.6.1"
+  resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-10.6.1.tgz#22099c12b8b1e193f9523c16cb83ef0824c08d58"
+  integrity sha512-HfjrNXanFwy6iy3dkNqOZF1siwm5tuou8B9y2gj0PcP73KJyQ/FoFPUSEZ/E3ttU45NJCARLvd8X5Qc2wdtLVA==
   dependencies:
     copy-to-clipboard "^3.0.8"
     lodash "^4.17.11"
@@ -9850,7 +9876,6 @@ rich-markdown-editor@^10.6.5:
     prosemirror-schema-list "^1.1.2"
     prosemirror-state "^1.3.3"
     prosemirror-tables "^1.0.0"
-    prosemirror-transform "1.2.5"
     prosemirror-utils "^0.9.6"
     prosemirror-view "^1.14.11"
     react-medium-image-zoom "^3.0.16"
@@ -9858,8 +9883,8 @@ rich-markdown-editor@^10.6.5:
     refractor "^2.10.1"
     slugify "^1.4.0"
     smooth-scroll-into-view-if-needed "^1.1.27"
-    styled-components "^5.1.0"
-    typescript "3.7.5"
+    styled-components "^5.0.0"
+    typescript "^3.7.5"
 
 rimraf@2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3:
   version "2.7.1"
@@ -10072,47 +10097,50 @@ semver@^7.2.1, semver@^7.3.2:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
 
-sequelize-cli@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-6.2.0.tgz#fd02bfeae23b8226872f9947f3f8212cc49a4771"
-  integrity sha512-6WQ2x91hg30dUn66mXHnzvHATZ4pyI1GHSNbS/TNN/vRR4BLRSLijadeMgC8zqmKDsL0VqzVVopJWfJakuP++Q==
+sequelize-cli@^5.5.0:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-5.5.1.tgz#0b9c2fc04d082cc8ae0a8fe270b96bb606152bab"
+  integrity sha512-ZM4kUZvY3y14y+Rq3cYxGH7YDJz11jWHcN2p2x7rhAIemouu4CEXr5ebw30lzTBtyXV4j2kTO+nUjZOqzG7k+Q==
   dependencies:
+    bluebird "^3.5.3"
     cli-color "^1.4.0"
     fs-extra "^7.0.1"
     js-beautify "^1.8.8"
     lodash "^4.17.5"
     resolve "^1.5.0"
-    umzug "^2.3.0"
+    umzug "^2.1.0"
     yargs "^13.1.0"
 
-sequelize-encrypted@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sequelize-encrypted/-/sequelize-encrypted-1.0.0.tgz#49c5f48edcebd3504cc18bcb4876600d53e311d7"
-  integrity sha1-ScX0jtzr01BMwYvLSHZgDVPjEdc=
+sequelize-encrypted@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/sequelize-encrypted/-/sequelize-encrypted-0.1.0.tgz#f9c7a94dc1b4413e1347a49f06cd07b7f3bf9916"
+  integrity sha1-+cepTcG0QT4TR6SfBs0Ht/O/mRY=
 
-sequelize-pool@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-6.1.0.tgz#caaa0c1e324d3c2c3a399fed2c7998970925d668"
-  integrity sha512-4YwEw3ZgK/tY/so+GfnSgXkdwIJJ1I32uZJztIEgZeAO6HMgj64OzySbWLgxj+tXhZCJnzRfkY9gINw8Ft8ZMg==
+sequelize-pool@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-2.3.0.tgz#64f1fe8744228172c474f530604b6133be64993d"
+  integrity sha512-Ibz08vnXvkZ8LJTiUOxRcj1Ckdn7qafNZ2t59jYHMX1VIebTAOYefWdRYFt6z6+hy52WGthAHAoLc9hvk3onqA==
 
-sequelize@^6.3.4:
-  version "6.3.4"
-  resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-6.3.4.tgz#dd6f4801ba5e4d7a6f845a5ad3e616f24453694f"
-  integrity sha512-W6Y96N5QHTgEz5Q37v2GYbKufSXaw0b3v4rCLTPbcCMfIG0MHI42Ozp7IwiyV9bdNkfFEdY7XP8R6lWrWg4hUw==
+sequelize@^5.21.1:
+  version "5.21.6"
+  resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.21.6.tgz#5bf9b687336ce9157a3b386ad653fa130a5fa38a"
+  integrity sha512-RsgEpP2PP7txeoTWxoLLoe3xX8R2WYQAO7LNba2Ok3/pV5EFfKZry4fJXH56DUHJB909msMCHg0CJKDsQVbjcQ==
   dependencies:
+    bluebird "^3.5.0"
+    cls-bluebird "^2.1.0"
     debug "^4.1.1"
     dottie "^2.0.0"
     inflection "1.12.0"
     lodash "^4.17.15"
-    moment "^2.26.0"
-    moment-timezone "^0.5.31"
+    moment "^2.24.0"
+    moment-timezone "^0.5.21"
     retry-as-promised "^3.2.0"
-    semver "^7.3.2"
-    sequelize-pool "^6.0.0"
+    semver "^6.3.0"
+    sequelize-pool "^2.3.0"
     toposort-class "^1.0.1"
-    uuid "^8.1.0"
+    uuid "^3.3.3"
     validator "^10.11.0"
-    wkx "^0.5.0"
+    wkx "^0.4.8"
 
 serialize-javascript@^4.0.0:
   version "4.0.0"
@@ -10207,6 +10235,11 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
+shimmer@^1.1.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
+  integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
+
 side-channel@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947"
@@ -10230,11 +10263,6 @@ sisteransi@^1.0.4:
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
   integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -10428,7 +10456,7 @@ source-map-support@^0.4.0:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@^0.5.6, source-map-support@~0.5.12:
+source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -10801,14 +10829,14 @@ styled-components-breakpoint@^2.1.1:
   resolved "https://registry.yarnpkg.com/styled-components-breakpoint/-/styled-components-breakpoint-2.1.1.tgz#37c1b92b0e96c1bbc5d293724d7a114daaa15fca"
   integrity sha512-PkS7p3MkPJx/v930Q3MPJU8llfFJTxk8o009jl0p+OUFmVb2AlHmVclX1MBHSXk8sZYGoVTTVIPDuZCELi7QIg==
 
-styled-components@^5.0.0, styled-components@^5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.1.1.tgz#96dfb02a8025794960863b9e8e365e3b6be5518d"
-  integrity sha512-1ps8ZAYu2Husx+Vz8D+MvXwEwvMwFv+hqqUwhNlDN5ybg6A+3xyW1ECrAgywhvXapNfXiz79jJyU0x22z0FFTg==
+styled-components@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.0.1.tgz#57782a6471031abefb2db5820a1876ae853bc619"
+  integrity sha512-E0xKTRIjTs4DyvC1MHu/EcCXIj6+ENCP8hP01koyoADF++WdBUOrSGwU1scJRw7/YaYOhDvvoad6VlMG+0j53A==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/traverse" "^7.4.5"
-    "@emotion/is-prop-valid" "^0.8.8"
+    "@emotion/is-prop-valid" "^0.8.3"
     "@emotion/stylis" "^0.8.4"
     "@emotion/unitless" "^0.7.4"
     babel-plugin-styled-components ">= 1"
@@ -11298,12 +11326,7 @@ typescript-compiler@^1.4.1-2:
   resolved "https://registry.yarnpkg.com/typescript-compiler/-/typescript-compiler-1.4.1-2.tgz#ba4f7db22d91534a1929d90009dce161eb72fd3f"
   integrity sha1-uk99si2RU0oZKdkACdzhYety/T8=
 
-typescript@3.7.5:
-  version "3.7.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
-  integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
-
-typescript@^3.4:
+typescript@^3.4, typescript@^3.7.5:
   version "3.9.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.2.tgz#64e9c8e9be6ea583c54607677dd4680a1cf35db9"
   integrity sha512-q2ktq4n/uLuNNShyayit+DTobV2ApPEo/6so68JaD5ojvc/6GClBipedB9zNWYxRSAlZXAe405Rlijzl6qDiSw==
@@ -11326,7 +11349,7 @@ uid2@0.0.3:
   resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82"
   integrity sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I=
 
-umzug@^2.3.0:
+umzug@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.3.0.tgz#0ef42b62df54e216b05dcaf627830a6a8b84a184"
   integrity sha512-Z274K+e8goZK8QJxmbRPhl89HPO1K+ORFtm6rySPhFKfKc5GHhqdzD0SGhSWHkzoXasqJuItdhorSvY7/Cgflw==
@@ -11595,12 +11618,12 @@ uuid@3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
-uuid@^3.3.2, uuid@^3.4.0:
+uuid@^3.3.2, uuid@^3.3.3, uuid@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^8.1.0, uuid@^8.2.0:
+uuid@^8.2.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
   integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
@@ -11886,10 +11909,10 @@ windows-release@^3.1.0:
   dependencies:
     execa "^1.0.0"
 
-wkx@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.5.0.tgz#c6c37019acf40e517cc6b94657a25a3d4aa33e8c"
-  integrity sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==
+wkx@^0.4.8:
+  version "0.4.8"
+  resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.4.8.tgz#a092cf088d112683fdc7182fd31493b2c5820003"
+  integrity sha512-ikPXMM9IR/gy/LwiOSqWlSL3X/J5uk9EO2hHNRXS41eTLXaUFEVw9fn/593jW/tE5tedNg8YjT5HkCa4FqQZyQ==
   dependencies:
     "@types/node" "*"