From d2ff19916b5bdca114fc345cf8fd513fec5a6993 Mon Sep 17 00:00:00 2001
From: Daniel Del Core <daniel.delcore.92@gmail.com>
Date: Sun, 24 Jan 2021 20:47:38 +1100
Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=92=A9=20Initial=20macro=20migration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/0_Palette.tsx                      |  18 +--
 package.json                                |   4 +-
 packages/components/avatar/Avatar.tsx       |  27 ++--
 packages/components/avatar/package.json     |   7 +-
 packages/components/badge/Badge.tsx         |  59 +++----
 packages/components/badge/package.json      |   8 +-
 packages/components/button/Button.tsx       | 132 ++++++++--------
 packages/components/button/package.json     |   7 +-
 packages/components/checkbox/Checkbox.tsx   |  24 ++-
 packages/components/checkbox/package.json   |   7 +-
 packages/components/code/Code.tsx           |  59 +++----
 packages/components/code/package.json       |   7 +-
 packages/components/image/Image.tsx         |  12 +-
 packages/components/image/package.json      |   4 +-
 packages/components/input/Input.tsx         | 117 +++++++-------
 packages/components/input/package.json      |   7 +-
 packages/components/keyboard/Keyboard.tsx   |  19 ++-
 packages/components/keyboard/package.json   |   7 +-
 packages/components/label/Label.tsx         |  23 ++-
 packages/components/label/package.json      |   7 +-
 packages/components/lozenge/Lozenge.tsx     |  63 ++++----
 packages/components/lozenge/package.json    |   8 +-
 packages/components/message/Message.tsx     |  57 ++++---
 packages/components/message/package.json    |   7 +-
 packages/components/modal/Modal.tsx         |  33 ++--
 packages/components/modal/ModalBody.tsx     |  13 +-
 packages/components/modal/ModalFooter.tsx   |  17 +-
 packages/components/modal/ModalHeader.tsx   |  16 +-
 packages/components/modal/package.json      |   5 +-
 packages/components/overlay/Overlay.tsx     |  38 ++---
 packages/components/overlay/package.json    |   7 +-
 packages/components/panel/Panel.tsx         |  21 +--
 packages/components/panel/package.json      |   8 +-
 packages/components/radio/Radio.tsx         | 145 +++++++++--------
 packages/components/radio/package.json      |   7 +-
 packages/components/range/Range.tsx         |  35 +++--
 packages/components/range/Slider.tsx        |  72 ++++-----
 packages/components/range/Track.tsx         |  54 +++----
 packages/components/range/package.json      |   7 +-
 packages/components/select/Select.tsx       | 133 ++++++++--------
 packages/components/select/package.json     |   6 +-
 packages/components/skeleton/Skeleton.tsx   |  72 ++++-----
 packages/components/skeleton/package.json   |   6 +-
 packages/components/spinner/Spinner.tsx     |  87 +++++------
 packages/components/spinner/package.json    |   7 +-
 packages/components/tabs/Tab.tsx            |  27 ++--
 packages/components/tabs/TabList.tsx        |  12 +-
 packages/components/tabs/TabPanel.tsx       |   2 +-
 packages/components/tabs/package.json       |   7 +-
 packages/components/textarea/TextArea.tsx   | 101 ++++++------
 packages/components/textarea/package.json   |   8 +-
 packages/components/toggle/Toggle.tsx       | 164 ++++++++++----------
 packages/components/toggle/package.json     |   7 +-
 packages/elements/blockquote/Blockquote.tsx |  26 ++--
 packages/elements/blockquote/package.json   |   7 +-
 packages/elements/heading/Heading.tsx       |  99 ++++++------
 packages/elements/heading/package.json      |   7 +-
 packages/elements/list/List.tsx             |  16 +-
 packages/elements/list/package.json         |   8 +-
 packages/elements/text/Text.tsx             |   8 +-
 packages/elements/text/package.json         |   7 +-
 packages/layout/grid/Column.tsx             |  21 +--
 packages/layout/grid/Grid.tsx               |  17 +-
 packages/layout/grid/Row.tsx                |  17 +-
 packages/layout/grid/package.json           |   6 +-
 packages/layout/inline/Inline.tsx           |  35 ++---
 packages/layout/inline/package.json         |   7 +-
 packages/layout/stack/Stack.tsx             |  17 +-
 packages/layout/stack/package.json          |   7 +-
 packages/theming/theme/Globals.tsx          |  48 +++---
 packages/theming/theme/ThemeProvider.tsx    |   6 +-
 packages/theming/theme/package.json         |   7 +-
 yarn.lock                                   | 131 ++++++++++------
 73 files changed, 1115 insertions(+), 1189 deletions(-)

diff --git a/examples/0_Palette.tsx b/examples/0_Palette.tsx
index 5b847de..645054e 100644
--- a/examples/0_Palette.tsx
+++ b/examples/0_Palette.tsx
@@ -479,7 +479,7 @@ const BasicExample = () => {
                                     name="input-success"
                                     onChange={() => console.log('onChange')}
                                     value=""
-                                    state="success"
+                                    appearance="success"
                                 />
                                 <Label htmlFor="input-warning">Warning</Label>
                                 <Input
@@ -487,7 +487,7 @@ const BasicExample = () => {
                                     name="input-warning"
                                     onChange={() => console.log('onChange')}
                                     value=""
-                                    state="warning"
+                                    appearance="warning"
                                 />
                                 <Label htmlFor="input-error">Error</Label>
                                 <Input
@@ -495,7 +495,7 @@ const BasicExample = () => {
                                     name="input-error"
                                     onChange={() => console.log('onChange')}
                                     value=""
-                                    state="error"
+                                    appearance="error"
                                 />
                                 <Label htmlFor="input-disabled">Disabled</Label>
                                 <Input
@@ -551,7 +551,7 @@ const BasicExample = () => {
                                     name="TextArea-success"
                                     onChange={() => console.log('onChange')}
                                     value=""
-                                    state="success"
+                                    appearance="success"
                                 />
                                 <Label htmlFor="TextArea-warning">
                                     Warning
@@ -561,7 +561,7 @@ const BasicExample = () => {
                                     name="TextArea-warning"
                                     onChange={() => console.log('onChange')}
                                     value=""
-                                    state="warning"
+                                    appearance="warning"
                                 />
                                 <Label htmlFor="TextArea-error">Error</Label>
                                 <TextArea
@@ -569,7 +569,7 @@ const BasicExample = () => {
                                     name="TextArea-error"
                                     onChange={() => console.log('onChange')}
                                     value=""
-                                    state="error"
+                                    appearance="error"
                                 />
                                 <Label htmlFor="TextArea-disabled">
                                     Disabled
@@ -625,7 +625,7 @@ const BasicExample = () => {
                                     id="select-success"
                                     name="select-success"
                                     onChange={() => console.log('onChange')}
-                                    state="success"
+                                    appearance="success"
                                 >
                                     <option value="hello">Hello</option>
                                     <option value="world">world</option>
@@ -635,7 +635,7 @@ const BasicExample = () => {
                                     id="select-warning"
                                     name="select-warning"
                                     onChange={() => console.log('onChange')}
-                                    state="warning"
+                                    appearance="warning"
                                 >
                                     <option value="hello">Hello</option>
                                     <option value="world">world</option>
@@ -645,7 +645,7 @@ const BasicExample = () => {
                                     id="select-error"
                                     name="select-error"
                                     onChange={() => console.log('onChange')}
-                                    state="error"
+                                    appearance="error"
                                 >
                                     <option value="hello">Hello</option>
                                     <option value="world">world</option>
diff --git a/package.json b/package.json
index 02eed93..82e6cbe 100644
--- a/package.json
+++ b/package.json
@@ -42,9 +42,7 @@
         "@storybook/source-loader": "^5.3.0",
         "@storybook/storybook-deployer": "^2.8.1",
         "@testing-library/react": "^10.0.0",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2",
-        "@trousers/theme": "^3.0.0",
+        "@trousers/macro": "4.0.0-alpha5",
         "@types/jest": "^25.2.0",
         "@types/jsdom": "^12.2.3",
         "@types/react": "^16.8.1",
diff --git a/packages/components/avatar/Avatar.tsx b/packages/components/avatar/Avatar.tsx
index 51d54a0..0d6177a 100644
--- a/packages/components/avatar/Avatar.tsx
+++ b/packages/components/avatar/Avatar.tsx
@@ -1,24 +1,23 @@
-/** @jsx jsx */
-import { FC } from 'react';
-import { jsx, css } from '@trousers/core';
+import React, { FC } from 'react';
+import { css } from '@trousers/macro';
 
 import Image, { ImageProps } from '@precursor/image';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface AvatarProps extends ImageProps {}
 
+const styles = css('Avatar', {
+    display: 'inline-block',
+    position: 'relative',
+    outline: '0px',
+    height: '64px',
+    width: '64px',
+    overflow: 'hidden',
+    borderRadius: '50%',
+});
+
 const Avatar: FC<AvatarProps> = ({ src, alt }) => (
-    <span
-        css={css`
-            display: inline-block;
-            position: relative;
-            outline: 0px;
-            height: 64px;
-            width: 64px;
-            overflow: hidden;
-            border-radius: 50%;
-        `}
-    >
+    <span css={styles}>
         <Image src={src} alt={alt} />
     </span>
 );
diff --git a/packages/components/avatar/package.json b/packages/components/avatar/package.json
index 13d5802..7e105e3 100644
--- a/packages/components/avatar/package.json
+++ b/packages/components/avatar/package.json
@@ -7,12 +7,11 @@
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/image": "^0.1.3",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
+        "@precursor/image": "^0.1.3"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/badge/Badge.tsx b/packages/components/badge/Badge.tsx
index c33a110..42864a6 100644
--- a/packages/components/badge/Badge.tsx
+++ b/packages/components/badge/Badge.tsx
@@ -1,38 +1,45 @@
-/** @jsx jsx */
-import { FC, ReactNode } from 'react';
-import { jsx } from '@trousers/core';
-import collector from '@trousers/collector';
+import React, { FC, ReactNode } from 'react';
+import { css } from '@trousers/macro';
 
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 export interface BadgeProps {
     status?: 'error' | 'success' | 'warning';
     children: ReactNode;
 }
 
-const styles = (status: BadgeProps['status']) => collector<Theme>('Badge')
-    .element`
-    display: inline-block;
-    min-width: 30px;
-    border-radius: 1rem;
-    padding: 2px 6px;
-    text-align: center;
-    font-size: ${({ fontSize }) => fontSize.small};
-    background-color: ${({ color }) => color.info.light};
-    color: ${({ color }) => color.info.base};
-`.modifier('error', status === 'error')`
-    background-color: ${({ color }) => color.error.light};
-    color: ${({ color }) => color.error.base};
-`.modifier('warning', status === 'warning')`
-    background-color: ${({ color }: Theme) => color.warning.light};
-    color: ${({ color }: Theme) => color.warning.base};
-`.modifier('success', status === 'success')`
-    background-color: ${({ color }: Theme) => color.success.light};
-    color: ${({ color }: Theme) => color.success.base};
-`;
+const styles = css('Badge', {
+    display: 'inline-block',
+    minWidth: '30px',
+    borderRadius: '1rem',
+    padding: '2px 6px',
+    textAlign: 'center',
+    fontSize: 'var(--fontSize-small)',
+    backgroundColor: 'var(--color-info-light)',
+    color: 'var(--color-info-base)',
+})
+    .modifier('error', {
+        backgroundColor: 'var(--color-error-light)',
+        color: 'var(--color-error-base)',
+    })
+    .modifier('warning', {
+        backgroundColor: 'var(--color-warning-light)',
+        color: 'var(--color-warning-base)',
+    })
+    .modifier('success', {
+        backgroundColor: 'var(--color-success-light)',
+        color: 'var(--color-success-base)',
+    });
 
 const Badge: FC<BadgeProps> = ({ status, children }) => (
-    <span css={styles(status)}>{children}</span>
+    <span
+        css={styles}
+        $error={status === 'error'}
+        $warning={status === 'warning'}
+        $success={status === 'success'}
+    >
+        {children}
+    </span>
 );
 
 export default Badge;
diff --git a/packages/components/badge/package.json b/packages/components/badge/package.json
index ef200a6..2ac88fc 100644
--- a/packages/components/badge/package.json
+++ b/packages/components/badge/package.json
@@ -6,12 +6,10 @@
     "module": "dist/index.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
-    },
+    "dependencies": {},
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/button/Button.tsx b/packages/components/button/Button.tsx
index c0084e5..f2f9286 100644
--- a/packages/components/button/Button.tsx
+++ b/packages/components/button/Button.tsx
@@ -1,9 +1,7 @@
-/** @jsx jsx */
-import { FC, ReactNode, Fragment } from 'react';
-import { jsx } from '@trousers/core';
-import collector from '@trousers/collector';
+import React, { FC, ReactNode, Fragment } from 'react';
+import { css } from '@trousers/macro';
 
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 import Spinner from '@precursor/spinner';
 
 export interface ButtonProps {
@@ -15,79 +13,75 @@ export interface ButtonProps {
     onClick?: React.MouseEventHandler;
 }
 
-const styles = (props: ButtonProps) => collector<Theme>('Button').element`
-        display: inline-block;
-        position: relative;
-        min-height: 30px;
-        color: ${({ color }) => color.typography.base};
-        text-align: center;
-        font-weight: ${({ fontWeight }) => fontWeight.base};
-        line-height: ${({ lineHeight }) => lineHeight.base};
-        letter-spacing: .1rem;
-        text-decoration: none;
-        white-space: nowrap;
-        background-color: ${({ color }) => color.neutral.lighter};
-        border-radius: ${({ radius }) => radius.l};
-        padding: ${({ spacePreset }) => `${spacePreset.insetSquish}`};
-        cursor: pointer;
-        user-select: none;
-        border: none;
-        outline: none;
-        transition: background-color 200ms;
-
-        > * {
-            pointer-events: none;
-        }
-
-        &:focus {
-            box-shadow: ${({ color }) => color.neutral.base} 0px 0px 2px 1px;
-            outline: 0;
-        }
-
-        &:hover {
-            background-color: ${({ color }) => color.neutral.light};
-        }
-
-        &:active {
-            background-color: ${({ color }) => color.neutral.base};
-        }
-    `.modifier('primary', props.primary)`
-        color: ${({ color }) => color.typography.baseInverse};
-        background-color: ${({ color }) => color.primary.base};
-
-        &:focus {
-            box-shadow: ${({ color }) => color.primary.base} 0px 0px 2px 1px;
-            outline: 0;
-        }
-
-        &:hover {
-            background-color: ${({ color }) => color.primary.dark};
-        }
-
-        &:active {
-            background-color: ${({ color }) => color.primary.darker};
-        }
-    `.modifier('disabled', props.disabled || props.loading)`
-        color: #CFD8E3;
-        background-color: ${({ color }: Theme) => color.neutral.lighter};
-        cursor: not-allowed;
-
-        &:hover {
-            background-color: ${({ color }: Theme) => color.neutral.lighter};
-        }
-    `;
+const styles = css('Button', {
+    display: 'inline-block',
+    position: 'relative',
+    minHeight: '30px',
+    color: 'var(--color-typography-base)',
+    textAlign: 'center',
+    fontWeight: 'var(--fontWeight-base)',
+    lineHeight: 'var(--lineHeight-base)',
+    letterSpacing: '.1rem',
+    textDecoration: 'none',
+    whiteSpace: 'nowrap',
+    backgroundColor: 'var(--color-neutral-lighter)',
+    borderRadius: 'var(--radius.l)',
+    padding: `var(--spacePreset-insetSquish)`,
+    cursor: 'pointer',
+    userSelect: 'none',
+    border: 'none',
+    outline: 'none',
+    transition: 'background-color 200ms',
+    '> *': {
+        pointerEvents: 'none',
+    },
+    '&:focus': {
+        boxShadow: 'var(--color-neutral-base) 0px 0px 2px 1px',
+        outline: 0,
+    },
+    '&:hover': {
+        backgroundColor: 'var(--color-neutral-light)',
+    },
+    '&:active': {
+        backgroundColor: 'var(--color-neutral-base)',
+    },
+})
+    .modifier('primary', {
+        color: 'var(--color-typography-baseInverse)',
+        backgroundColor: 'var(--color-primary-base)',
+        '&:focus': {
+            boxShadow: 'var(--color-primary-base) 0px 0px 2px 1px',
+            outline: 0,
+        },
+        '&:hover': {
+            backgroundColor: 'var(--color-primary-dark)',
+        },
+        '&:active': {
+            backgroundColor: 'var(--color-primary-darker)',
+        },
+    })
+    .modifier('disabled', {
+        color: '#CFD8E3',
+        backgroundColor: 'var(--color-neutral-lighter)',
+        cursor: 'not-allowed',
+        '&:hover': {
+            backgroundColor: 'var(--color-neutral-lighter)',
+        },
+    });
 
 const Button: FC<ButtonProps> = props => (
     <button
-        css={styles(props)}
+        css={styles}
         type={props.type}
         onClick={props.onClick}
         disabled={props.disabled || props.loading}
+        $primary={props.primary}
+        $disabled={props.disabled || props.loading}
     >
         {props.loading ? (
             <Fragment>
                 <div
-                    css={{
+                    css={css({
                         position: 'absolute',
                         display: 'flex',
                         pointerEvents: 'none',
@@ -97,7 +91,7 @@ const Button: FC<ButtonProps> = props => (
                         left: 0,
                         bottom: 0,
                         right: 0,
-                    }}
+                    })}
                 >
                     <Spinner />
                 </div>
diff --git a/packages/components/button/package.json b/packages/components/button/package.json
index 51288e5..d5edb21 100644
--- a/packages/components/button/package.json
+++ b/packages/components/button/package.json
@@ -8,12 +8,11 @@
     "license": "MIT",
     "dependencies": {
         "@precursor/spinner": "^0.1.1",
-        "@precursor/theme": "^0.1.7",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.7"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/checkbox/Checkbox.tsx b/packages/components/checkbox/Checkbox.tsx
index 7f3a3e2..a341c3f 100644
--- a/packages/components/checkbox/Checkbox.tsx
+++ b/packages/components/checkbox/Checkbox.tsx
@@ -1,24 +1,22 @@
-/** @jsx jsx */
-import { FC } from 'react';
-import { jsx } from '@trousers/core';
-import collector from '@trousers/collector';
+import React, { FC } from 'react';
+import { css } from '@trousers/macro';
 
 import Label from '@precursor/label';
 import Input, { InputProps } from '@precursor/input';
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 export interface CheckboxProps extends InputProps {
     label: string;
 }
 
-const styles = collector<Theme>('Checkbox').element`
-    height: auto;
-    width: auto;
-    appearance: checkbox;
-    display: inline;
-    cursor: pointer;
-    margin-right: ${({ spacePreset }) => spacePreset.inline};
-`;
+const styles = css('Checkbox', {
+    height: 'auto',
+    width: 'auto',
+    appearance: 'checkbox',
+    display: 'inline',
+    cursor: 'pointer',
+    marginRight: 'var(--spacePreset-inline)',
+});
 
 const Checkbox: FC<CheckboxProps> = props => {
     return (
diff --git a/packages/components/checkbox/package.json b/packages/components/checkbox/package.json
index 485f840..6971539 100644
--- a/packages/components/checkbox/package.json
+++ b/packages/components/checkbox/package.json
@@ -9,12 +9,11 @@
     "dependencies": {
         "@precursor/input": "^0.1.7",
         "@precursor/label": "^0.1.7",
-        "@precursor/theme": "^0.1.7",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.7"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/code/Code.tsx b/packages/components/code/Code.tsx
index 21167b2..d463d56 100644
--- a/packages/components/code/Code.tsx
+++ b/packages/components/code/Code.tsx
@@ -1,48 +1,39 @@
 import React, { FC, ReactNode } from 'react';
-import { useStyles } from '@trousers/core';
-import collector from '@trousers/collector';
+import { css } from '@trousers/macro';
 
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 export interface CodeProps {
     children: ReactNode;
     inline?: boolean;
 }
 
-const preStyles = collector<Theme>('Pre').element`
-    margin: 0;
-
-    & > code {
-        display: block;
-        padding: 1rem 1.5rem;
-        white-space: pre;
-        max-width: 100%;
-        overflow-y: auto;
-        color: ${({ color }) => color.typography.base};
-        font-family: ${({ font }) => font.code};
-    }
-`;
-
-const codeStyles = collector<Theme>('Code').element`
-    padding: .2rem .5rem;
-    font-size: 90%;
-    border-radius: ${({ radius }) => radius.s};
-    background-color: ${({ color }) => color.background.light};
-    color: ${({ color }) => color.typography.base};
-    font-family: ${({ font }) => font.code};
-`;
+const preStyles = css('Pre', {
+    margin: 0,
+    '& > code': {
+        display: 'block',
+        padding: '1rem 1.5rem',
+        whiteSpace: 'pre',
+        maxWidth: '100%',
+        overflowY: 'auto',
+        color: 'var(--color-typography-base)',
+        fontFamily: 'var(--font-code)',
+    },
+});
+
+const codeStyles = css('Code', {
+    padding: '.2rem .5rem',
+    fontSize: '90%',
+    borderRadius: 'var(--radius-s)',
+    backgroundColor: 'var(--color-background-light)',
+    color: 'var(--color-typography-base)',
+    fontFamily: 'var(--font-code)',
+});
 
 const Code: FC<CodeProps> = props => {
-    const preClassNames = useStyles(preStyles);
-    const codeClassNames = useStyles(codeStyles);
-
-    const codeBlock = <code className={codeClassNames}>{props.children}</code>;
+    const codeBlock = <code css={codeStyles}>{props.children}</code>;
 
-    return props.inline ? (
-        codeBlock
-    ) : (
-        <pre className={preClassNames}>{codeBlock}</pre>
-    );
+    return props.inline ? codeBlock : <pre css={preStyles}>{codeBlock}</pre>;
 };
 
 export default Code;
diff --git a/packages/components/code/package.json b/packages/components/code/package.json
index 310578a..5cbc869 100644
--- a/packages/components/code/package.json
+++ b/packages/components/code/package.json
@@ -7,12 +7,11 @@
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.7"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/image/Image.tsx b/packages/components/image/Image.tsx
index adc9200..a80fefa 100644
--- a/packages/components/image/Image.tsx
+++ b/packages/components/image/Image.tsx
@@ -1,6 +1,4 @@
-/** @jsx jsx */
-import { FC } from 'react';
-import { css, jsx } from '@trousers/core';
+import React, { FC } from 'react';
 
 export interface ImageProps {
     src: string;
@@ -8,13 +6,7 @@ export interface ImageProps {
 }
 
 const Image: FC<ImageProps> = props => (
-    <img
-        css={css`
-            width: 100%;
-        `}
-        alt={props.alt}
-        src={props.src}
-    />
+    <img style={{ width: '100%' }} alt={props.alt} src={props.src} />
 );
 
 export default Image;
diff --git a/packages/components/image/package.json b/packages/components/image/package.json
index 610627a..7833f50 100644
--- a/packages/components/image/package.json
+++ b/packages/components/image/package.json
@@ -6,9 +6,7 @@
     "module": "dist/index.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {
-        "@trousers/core": "^3.0.2"
-    },
+    "dependencies": {},
     "devDependencies": {
         "react": "^16.8.1"
     },
diff --git a/packages/components/input/Input.tsx b/packages/components/input/Input.tsx
index 89525a4..8df92ec 100644
--- a/packages/components/input/Input.tsx
+++ b/packages/components/input/Input.tsx
@@ -1,8 +1,7 @@
 import React, { FC, ChangeEventHandler } from 'react';
-import { useStyles } from '@trousers/core';
-import collector from '@trousers/collector';
+import { css } from '@trousers/macro';
 
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 import { InputTypes } from '@precursor/types';
 
 export interface InputProps {
@@ -15,69 +14,65 @@ export interface InputProps {
     defaultValue?: string;
     value?: string;
     checked?: boolean;
-    state?: 'success' | 'error' | 'warning';
+    appearance?: 'success' | 'error' | 'warning';
     size?: 's' | 'm' | 'l';
     onChange?: ChangeEventHandler<HTMLInputElement>;
 }
 
-const styles = ({ size, state, disabled }: InputProps) => collector<Theme>(
-    'Input',
-).element`
-    --input-height: 44px;
-    --input-border-color: #E2E8F0;
-    height: var(--input-height);
-    padding: 0 10px;
-    background-color: ${({ color }) => color.background.base};
-    border-radius: ${({ radius }) => radius.m};
-    border-color: var(--input-border-color);
-    border-style: solid;
-    border-width: 2px;
-    box-shadow: none;
-    appearance: none;
-    width: 100%;
-    margin: 0;
-    font-family: ${({ font }) => font.base};
-    color: ${({ color }) => color.typography.base};
+const styles = css('Input', {
+    '--input-height': '44px',
+    '--input-border-color': '#E2E8F0',
+    height: 'var(--input-height)',
+    padding: '0 10px',
+    backgroundColor: 'var(--color-background-base)',
+    borderRadius: 'var(--radius-m)',
+    borderColor: 'var(--input-border-color)',
+    borderStyle: 'solid',
+    borderWidth: '2px',
+    boxShadow: 'none',
+    appearance: 'none',
+    width: '100%',
+    margin: '0',
+    fontFamily: 'var(--font-base)',
+    color: 'var(--color-typography-base)',
 
-    &::placeholder {
-        color: ${({ color }) => color.typography.placeholder};
-    }
+    '&::placeholder': {
+        color: 'var(--color-typography-placeholder)',
+    },
+    '&:focus': {
+        boxShadow: 'var(--input-border-color) 0px 0px 2px 1px',
+        outline: 0,
+    },
+})
+    .modifier('success', { '--input-border-color': '#31C48D' })
+    .modifier('warning', { '--input-border-color': '#FDBA8C' })
+    .modifier('error', { '--input-border-color': '#F98080' })
+    .modifier('disabled', {
+        cursor: 'not-allowed',
+        backgroundColor: 'var(--color-background-light)',
+    })
+    .modifier('small', { '--input-height': '36px' })
+    .modifier('large', { '--input-height': '52px' });
 
-    &:focus {
-        box-shadow: var(--input-border-color) 0px 0px 2px 1px;
-        outline: 0;
-    }
-`.modifier('success', state === 'success')`
-    --input-border-color: #31C48D;
-`.modifier('warning', state === 'warning')`
-    --input-border-color: #FDBA8C;
-`.modifier('error', state === 'error')`
-    --input-border-color: #F98080;
-`.modifier('disabled', disabled)`
-    cursor: not-allowed;
-    background-color: ${({ color }: Theme) => color.background.light};
-`.modifier('small', size === 's')`
-    --input-height: 36px;
-`.modifier('large', size === 'l')`
-    --input-height: 52px;
-`;
-
-const Input: FC<InputProps> = ({ type = 'text', ...props }) => {
-    const classNames = useStyles(styles(props));
-
-    return (
-        <input
-            className={`${classNames} ${props.className || ''}`}
-            disabled={props.disabled}
-            id={props.id}
-            name={props.name}
-            onChange={props.onChange}
-            placeholder={props.placeholder}
-            type={type}
-            value={props.value || props.defaultValue}
-            checked={props.checked}
-        />
-    );
-};
+const Input: FC<InputProps> = ({ type = 'text', ...props }) => (
+    <input
+        css={styles}
+        className={props.className}
+        disabled={props.disabled}
+        id={props.id}
+        name={props.name}
+        onChange={props.onChange}
+        placeholder={props.placeholder}
+        type={type}
+        value={props.value || props.defaultValue}
+        checked={props.checked}
+        $success={props.appearance === 'success'}
+        $warning={props.appearance === 'warning'}
+        $error={props.appearance === 'error'}
+        $disabled={props.disabled}
+        $large={props.size === 'l'}
+        $small={props.size === 's'}
+    />
+);
 
 export default Input;
diff --git a/packages/components/input/package.json b/packages/components/input/package.json
index 1c368af..9a059e9 100644
--- a/packages/components/input/package.json
+++ b/packages/components/input/package.json
@@ -7,12 +7,11 @@
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.7"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/keyboard/Keyboard.tsx b/packages/components/keyboard/Keyboard.tsx
index e8c739b..ead31ca 100644
--- a/packages/components/keyboard/Keyboard.tsx
+++ b/packages/components/keyboard/Keyboard.tsx
@@ -1,7 +1,6 @@
-/** @jsx jsx */
-import { FC, ReactNode } from 'react';
-import { jsx, css } from '@trousers/core';
-import { Theme } from '@precursor/theme';
+import React, { FC, ReactNode } from 'react';
+import { css } from '@trousers/macro';
+// import { Theme } from '@precursor/theme';
 
 export interface KeyboardProps {
     children?: ReactNode;
@@ -11,12 +10,12 @@ export interface KeyboardProps {
     ctrl?: boolean;
 }
 
-const styles = css<Theme>`
-    padding: 0 10px;
-    background-color: ${({ color }) => color.background.light};
-    border-radius: ${({ radius }) => radius.s};
-    border: ${({ border }) => `${border.size[0]} solid ${border.color.base}`};
-`;
+const styles = css({
+    padding: '0 10px',
+    backgroundColor: 'var(--color-background-light)',
+    borderRadius: 'var(--radius-s)',
+    border: `var(--border-size-0) solid var(--border-color-base)`,
+});
 
 const Keyboard: FC<KeyboardProps> = ({
     children,
diff --git a/packages/components/keyboard/package.json b/packages/components/keyboard/package.json
index 2763fe1..631ef91 100644
--- a/packages/components/keyboard/package.json
+++ b/packages/components/keyboard/package.json
@@ -7,12 +7,11 @@
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.5",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.5"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/label/Label.tsx b/packages/components/label/Label.tsx
index 2091377..4850b53 100644
--- a/packages/components/label/Label.tsx
+++ b/packages/components/label/Label.tsx
@@ -1,7 +1,6 @@
-/** @jsx jsx */
-import { FC, ReactNode } from 'react';
-import { jsx, css } from '@trousers/core';
-import { Theme } from '@precursor/theme';
+import React, { FC, ReactNode } from 'react';
+import { css } from '@trousers/macro';
+// import { Theme } from '@precursor/theme';
 
 export interface LabelProps {
     children: ReactNode;
@@ -11,14 +10,14 @@ export interface LabelProps {
 
 const Label: FC<LabelProps> = ({ htmlFor, children }) => (
     <label
-        css={css<Theme>`
-            display: inline-flex;
-            align-items: center;
-            margin-bottom: 0;
-            font-weight: ${({ fontWeight }) => fontWeight.label};
-            font-size: ${({ fontSize }) => fontSize.label};
-            cursor: pointer;
-        `}
+        css={css({
+            display: 'inline-flex',
+            alignItems: 'center',
+            marginBottom: '0',
+            fontWeight: 'var(--fontWeight-label)',
+            fontSize: 'var(--fontSize-label)',
+            cursor: 'pointer',
+        })}
         htmlFor={htmlFor}
     >
         {children}
diff --git a/packages/components/label/package.json b/packages/components/label/package.json
index 75d6251..335be1f 100644
--- a/packages/components/label/package.json
+++ b/packages/components/label/package.json
@@ -6,11 +6,10 @@
     "module": "dist/index.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {
-        "@trousers/core": "^3.0.2"
-    },
+    "dependencies": {},
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/lozenge/Lozenge.tsx b/packages/components/lozenge/Lozenge.tsx
index 509cae0..86c1d6f 100644
--- a/packages/components/lozenge/Lozenge.tsx
+++ b/packages/components/lozenge/Lozenge.tsx
@@ -1,40 +1,47 @@
-/** @jsx jsx */
-import { FC, ReactNode } from 'react';
-import { jsx } from '@trousers/core';
-import collector from '@trousers/collector';
+import React, { FC, ReactNode } from 'react';
+import { css } from '@trousers/macro';
 
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 export interface LozengeProps {
     status?: 'error' | 'success' | 'warning';
     children: ReactNode;
 }
 
-const styles = (status: LozengeProps['status']) => collector<Theme>('Lozenge')
-    .element`
-    display: inline-block;
-    min-width: 30px;
-    border-radius: ${({ radius }) => radius.m};
-    padding: 2px 8px;
-    text-align: center;
-    font-size: ${({ fontSize }) => fontSize.small};
-    background-color: ${({ color }) => color.info.light};
-    color: ${({ color }) => color.info.base};
-    font-weight: bold;
-    text-transform: uppercase;
-`.modifier('error', status === 'error')`
-    background-color: ${({ color }) => color.error.light};
-    color: ${({ color }) => color.error.base};
-`.modifier('warning', status === 'warning')`
-    background-color: ${({ color }: Theme) => color.warning.light};
-    color: ${({ color }: Theme) => color.warning.base};
-`.modifier('success', status === 'success')`
-    background-color: ${({ color }: Theme) => color.success.light};
-    color: ${({ color }: Theme) => color.success.base};
-`;
+const styles = css('Lozenge', {
+    display: 'inline-block',
+    minWidth: '30px',
+    borderRadius: 'var(--radius-m)',
+    padding: '2px 8px',
+    textAlign: 'center',
+    fontSize: 'var(--fontSize-small)',
+    backgroundColor: 'var(--color-info-light)',
+    color: 'var(--color-info-base)',
+    fontWeight: 'bold',
+    textTransform: 'uppercase',
+})
+    .modifier('error', {
+        backgroundColor: 'var(--color-error-light)',
+        color: 'var(--color-error-base)',
+    })
+    .modifier('warning', {
+        backgroundColor: 'var(--color-warning-light)',
+        color: 'var(--color-warning-base)',
+    })
+    .modifier('success', {
+        backgroundColor: 'var(--color-success-light)',
+        color: 'var(--color-success-base)',
+    });
 
 const Lozenge: FC<LozengeProps> = ({ status, children }) => (
-    <span css={styles(status)}>{children}</span>
+    <span
+        css={styles}
+        $error={status === 'error'}
+        $warning={status === 'warning'}
+        $success={status === 'success'}
+    >
+        {children}
+    </span>
 );
 
 export default Lozenge;
diff --git a/packages/components/lozenge/package.json b/packages/components/lozenge/package.json
index 59764af..eca7267 100644
--- a/packages/components/lozenge/package.json
+++ b/packages/components/lozenge/package.json
@@ -6,12 +6,10 @@
     "module": "dist/index.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
-    },
+    "dependencies": {},
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/message/Message.tsx b/packages/components/message/Message.tsx
index 11dee0c..eb922d1 100644
--- a/packages/components/message/Message.tsx
+++ b/packages/components/message/Message.tsx
@@ -1,35 +1,42 @@
-/** @jsx jsx */
-import { FC, ReactNode } from 'react';
-import { jsx } from '@trousers/core';
-import collector from '@trousers/collector';
+import React, { FC, ReactNode } from 'react';
+import { css } from '@trousers/macro';
 
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 export interface MessageProps {
     status?: 'error' | 'success' | 'warning';
     children: ReactNode;
 }
 
-const styles = (status: MessageProps['status']) =>
-    collector<Theme>('message').element`
-    display: block;
-    padding: ${({ spacePreset }) => spacePreset.inset};
-    border-radius: ${({ radius }) => radius.m};
-    background-color: ${({ color }) => color.info.light};
-    color: ${({ color }) => color.info.base};
-`.modifier(status === 'error')`
-    background-color: ${({ color }) => color.error.light}
-    color: ${({ color }) => color.error.base}
-`.modifier(status === 'warning')`
-    background-color: ${({ color }: Theme) => color.warning.light}
-    color: ${({ color }: Theme) => color.warning.base}
-`.modifier(status === 'success')`
-    background-color: ${({ color }: Theme) => color.success.light}
-    color: ${({ color }: Theme) => color.success.base}
-`;
+const styles = css('message', {
+    display: 'block',
+    padding: 'var(--spacePreset-inset)',
+    borderRadius: 'var(--radius-m)',
+    backgroundColor: 'var(--color-info-light)',
+    color: 'var(--color-info-base)',
+})
+    .modifier('error', {
+        backgroundColor: 'var(--color-error-light)',
+        color: 'var(--color-error-base)',
+    })
+    .modifier('warning', {
+        backgroundColor: 'var(--color-warning-light)',
+        color: 'var(--color-warning-base)',
+    })
+    .modifier('success', {
+        backgroundColor: 'var(--color-success-light)',
+        color: 'var(--color-success-base)',
+    });
 
-const Message: FC<MessageProps> = props => {
-    return <div css={styles(props.status)}>{props.children}</div>;
-};
+const Message: FC<MessageProps> = props => (
+    <div
+        css={styles}
+        $error={props.status === 'error'}
+        $warning={props.status === 'warning'}
+        $success={props.status === 'success'}
+    >
+        {props.children}
+    </div>
+);
 
 export default Message;
diff --git a/packages/components/message/package.json b/packages/components/message/package.json
index d541ce3..8cad292 100644
--- a/packages/components/message/package.json
+++ b/packages/components/message/package.json
@@ -8,12 +8,11 @@
     "license": "MIT",
     "dependencies": {
         "@precursor/text": "^0.1.5",
-        "@precursor/theme": "^0.1.7",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.7"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/modal/Modal.tsx b/packages/components/modal/Modal.tsx
index 44ec68c..0f0e9ba 100644
--- a/packages/components/modal/Modal.tsx
+++ b/packages/components/modal/Modal.tsx
@@ -7,11 +7,10 @@ import React, {
     MouseEvent,
 } from 'react';
 import { createPortal } from 'react-dom';
-import { useStyles } from '@trousers/core';
-import collector from '@trousers/collector';
 import FocusLock from 'react-focus-lock';
+import { css } from '@trousers/macro';
 
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 import Overlay from '@precursor/overlay';
 
 export interface ModalProps {
@@ -20,24 +19,22 @@ export interface ModalProps {
     children: ReactNode;
 }
 
-const modalStyles = collector<Theme>('Modal').element`
-    max-width: 520px;
-    min-height: 320px;
-    width: 100%;
-    border-radius: 5px;
-    margin: 0.5rem;
-    background-color: #fff;
-    display: block;
-    transform: translate3d(0px, 0%, 0px);
-    position: relative;
-    display: flex;
-    flex-direction: column;
-`;
+const styles = css('Modal', {
+    maxWidth: '520px',
+    minHeight: '320px',
+    width: '100%',
+    borderRadius: '5px',
+    margin: '0.5rem',
+    backgroundColor: '#fff',
+    transform: 'translate3d(0px, 0%, 0px)',
+    position: 'relative',
+    display: 'flex',
+    flexDirection: 'column',
+});
 
 // TODO: ensure IDs are unique
 
 const Modal: FC<ModalProps> = ({ onDismiss, children, isOpen }) => {
-    const classNames = useStyles(modalStyles);
     const overlayRef = useRef<HTMLDivElement | null>(null);
     const handleKeyDown = useCallback(
         (event: KeyboardEvent) => {
@@ -73,7 +70,7 @@ const Modal: FC<ModalProps> = ({ onDismiss, children, isOpen }) => {
                           id="modal"
                           aria-describedby="modal-body"
                           aria-labelledby="modal-header"
-                          className={classNames}
+                          css={styles}
                       >
                           {children}
                       </section>
diff --git a/packages/components/modal/ModalBody.tsx b/packages/components/modal/ModalBody.tsx
index 72a3f24..a23d056 100644
--- a/packages/components/modal/ModalBody.tsx
+++ b/packages/components/modal/ModalBody.tsx
@@ -1,6 +1,5 @@
-/** @jsx jsx */
-import { FC, ReactNode } from 'react';
-import { css, jsx } from '@trousers/core';
+import React, { FC, ReactNode } from 'react';
+import { css } from '@trousers/macro';
 
 export interface ModalBodyProps {
     children: ReactNode;
@@ -9,10 +8,10 @@ export interface ModalBodyProps {
 const ModalBody: FC<ModalBodyProps> = ({ children }) => (
     <div
         id="modal-body"
-        css={css`
-            padding: 0 1rem;
-            flex: 1 1 0%;
-        `}
+        css={css('ModalBody', {
+            padding: '0 1rem',
+            flex: '1 1 0%',
+        })}
     >
         {children}
     </div>
diff --git a/packages/components/modal/ModalFooter.tsx b/packages/components/modal/ModalFooter.tsx
index 1417213..2075a9c 100644
--- a/packages/components/modal/ModalFooter.tsx
+++ b/packages/components/modal/ModalFooter.tsx
@@ -1,7 +1,7 @@
-/** @jsx jsx */
-import { FC, ReactNode } from 'react';
-import { css, jsx } from '@trousers/core';
-import { Theme } from '@precursor/theme';
+import React, { FC, ReactNode } from 'react';
+import { css } from '@trousers/macro';
+
+// import { Theme } from '@precursor/theme';
 import Inline from '@precursor/inline';
 
 export interface ModalFooterProps {
@@ -10,11 +10,10 @@ export interface ModalFooterProps {
 
 const ModalFooter: FC<ModalFooterProps> = ({ children }) => (
     <footer
-        css={css<Theme>`
-            padding: 1rem;
-            border-top: ${({ border }) =>
-                `${border.size[0]} solid ${border.color.base}`};
-        `}
+        css={css('ModalFooter', {
+            padding: '1rem',
+            borderTop: `var(--border-size-0) solid var(--border-color-base)`,
+        })}
     >
         <Inline justify="flex-end">{children}</Inline>
     </footer>
diff --git a/packages/components/modal/ModalHeader.tsx b/packages/components/modal/ModalHeader.tsx
index a532050..4e3f7f6 100644
--- a/packages/components/modal/ModalHeader.tsx
+++ b/packages/components/modal/ModalHeader.tsx
@@ -1,6 +1,6 @@
-/** @jsx jsx */
-import { FC, ReactNode } from 'react';
-import { css, jsx } from '@trousers/core';
+import React, { FC, ReactNode } from 'react';
+import { css } from '@trousers/macro';
+
 import Heading from '@precursor/heading';
 
 export interface ModalHeaderProps {
@@ -10,11 +10,11 @@ export interface ModalHeaderProps {
 const ModalHeader: FC<ModalHeaderProps> = ({ children }) => (
     <header
         id="modal-header"
-        css={css`
-            padding-top: 1rem;
-            padding-left: 1rem;
-            padding-right: 1rem;
-        `}
+        css={css('ModalHeader', {
+            paddingTop: '1rem',
+            paddingLeft: '1rem',
+            paddingRight: '1rem',
+        })}
     >
         <Heading>{children}</Heading>
     </header>
diff --git a/packages/components/modal/package.json b/packages/components/modal/package.json
index b68e063..19b3d43 100644
--- a/packages/components/modal/package.json
+++ b/packages/components/modal/package.json
@@ -10,13 +10,12 @@
         "@precursor/heading": "^0.1.7",
         "@precursor/overlay": "^0.1.4",
         "@precursor/theme": "^0.1.7",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2",
         "react-focus-lock": "^2.4.1"
     },
     "devDependencies": {
         "react": "^16.8.1",
-        "react-dom": "^16.8.4"
+        "react-dom": "^16.8.4",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0",
diff --git a/packages/components/overlay/Overlay.tsx b/packages/components/overlay/Overlay.tsx
index 112df08..6ee3767 100644
--- a/packages/components/overlay/Overlay.tsx
+++ b/packages/components/overlay/Overlay.tsx
@@ -1,11 +1,10 @@
-/** @jsx jsx */
-import {
+import React, {
     ReactNode,
     forwardRef,
     KeyboardEventHandler,
     MouseEventHandler,
 } from 'react';
-import { jsx, css } from '@trousers/core';
+import { css } from '@trousers/macro';
 
 export interface OverlayProps {
     onKeyDown?: KeyboardEventHandler;
@@ -13,27 +12,24 @@ export interface OverlayProps {
     children: ReactNode;
 }
 
+const styles = css('Overlay', {
+    display: 'flex',
+    alignContent: 'center',
+    alignItems: 'center',
+    flexDirection: 'column',
+    justifyContent: 'center',
+    height: '100vh',
+    width: '100vw',
+    position: 'fixed',
+    top: '0',
+    left: '0',
+    backgroundColor: 'rgba(0, 0, 0, 0.6)',
+});
+
 const Overlay = forwardRef<HTMLDivElement, OverlayProps>(
     ({ children, onKeyDown, onClick }, ref) => (
         // eslint-disable-next-line jsx-a11y/no-static-element-interactions
-        <div
-            ref={ref}
-            css={css`
-                display: flex;
-                align-content: center;
-                align-items: center;
-                flex-direction: column;
-                justify-content: center;
-                height: 100vh;
-                width: 100vw;
-                position: fixed;
-                top: 0;
-                left: 0;
-                background-color: rgba(0, 0, 0, 0.6);
-            `}
-            onKeyDown={onKeyDown}
-            onClick={onClick}
-        >
+        <div ref={ref} css={styles} onKeyDown={onKeyDown} onClick={onClick}>
             {children}
         </div>
     ),
diff --git a/packages/components/overlay/package.json b/packages/components/overlay/package.json
index 18f3716..7135846 100644
--- a/packages/components/overlay/package.json
+++ b/packages/components/overlay/package.json
@@ -6,11 +6,10 @@
     "module": "dist/index.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {
-        "@trousers/core": "^3.0.2"
-    },
+    "dependencies": {},
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/panel/Panel.tsx b/packages/components/panel/Panel.tsx
index 0558234..702b34c 100644
--- a/packages/components/panel/Panel.tsx
+++ b/packages/components/panel/Panel.tsx
@@ -1,23 +1,18 @@
 import React, { FC, ReactNode } from 'react';
-import { useStyles } from '@trousers/core';
-import collector from '@trousers/collector';
+import { css } from '@trousers/macro';
 
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 export interface PanelProps {
     children: ReactNode;
 }
 
-const styles = collector<Theme>('Panel').element`
-    border-radius: ${({ radius }) => radius.m};
-    border: ${({ border }) => `${border.size[0]} solid ${border.color.base}`};
-    padding: ${({ space }) => space.m};
-`;
+const styles = css('Panel', {
+    borderRadius: 'var(--radius-m)',
+    border: 'var(--border-size-0) solid var(--border-color-base)',
+    padding: 'var(--space-m)',
+});
 
-const Panel: FC<PanelProps> = props => {
-    const classNames = useStyles(styles);
-
-    return <div className={classNames}>{props.children}</div>;
-};
+const Panel: FC<PanelProps> = props => <div css={styles}>{props.children}</div>;
 
 export default Panel;
diff --git a/packages/components/panel/package.json b/packages/components/panel/package.json
index 2d0d56b..d98431e 100644
--- a/packages/components/panel/package.json
+++ b/packages/components/panel/package.json
@@ -6,12 +6,10 @@
     "module": "dist/index.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
-    },
+    "dependencies": {},
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/radio/Radio.tsx b/packages/components/radio/Radio.tsx
index 1b9a35a..37c4039 100644
--- a/packages/components/radio/Radio.tsx
+++ b/packages/components/radio/Radio.tsx
@@ -1,87 +1,82 @@
-/** @jsx jsx */
-import { FC } from 'react';
-import { jsx, css } from '@trousers/core';
-import styleCollector from '@trousers/collector';
+import React, { FC } from 'react';
+import { css } from '@trousers/macro';
 
 import Input, { InputProps } from '@precursor/input';
 import Label from '@precursor/label';
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 export interface RadioProps extends Omit<InputProps, 'placeholder'> {
     label: string;
     size?: 's' | 'm' | 'l';
 }
 
-const toggleStyles = (
-    size: RadioProps['size'],
-    disabled: RadioProps['disabled'],
-) =>
-    styleCollector<Theme>('ToggleIndicator').element`
-    --toggle-size: 24px;
-    --toggle-thumb-size: 10px;
+const styles = css('ToggleIndicator', {
+    '--toggle-size': '24px',
+    '--toggle-thumb-size': '10px',
 
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    cursor: pointer;
-    width: var(--toggle-size);
-    height: var(--toggle-size);
-    border-radius: calc(var(--toggle-size) / 2);
-    background-color: ${({ color }) => color.neutral.light};
-    padding: ${({ space }) => space.xxs};
-    transition: background-color 100ms;
-    margin-right: ${({ spacePreset }) => spacePreset.inline};
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
+    cursor: 'pointer',
+    width: 'var(--toggle-size)',
+    height: 'var(--toggle-size)',
+    borderRadius: 'calc(var(--toggle-size) / 2)',
+    backgroundColor: 'var(--color-neutral-light)',
+    padding: 'var(--space-xxs)',
+    transition: 'background-color 100ms',
+    marginRight: 'var(--spacePreset-inline)',
 
-    &:after {
-        content: '';
-        display: block;
-        width: var(--toggle-thumb-size);
-        height: var(--toggle-thumb-size);
-        background-color: #fff;
-        border-radius: 50%;
-        opacity: 0;
-    }
+    '&:after': {
+        content: '',
+        display: 'block',
+        width: 'var(--toggle-thumb-size)',
+        height: 'var(--toggle-thumb-size)',
+        backgroundColor: '#fff',
+        borderRadius: '50%',
+        opacity: 0,
+    },
 
-    input[type="radio"]:focus + & {
-        box-shadow: 0 0 0 ${({ border }) => border.size[1]} ${({ border }) =>
-        border.color.focus};
-    }
+    'input[type="radio"]:focus + &': {
+        boxShadow: '0 0 0 var(--border-size-1) var(--border-color-focus)',
+    },
 
-    input[type='radio']:checked + & {
-        background-color: ${({ color }) => color.primary.light};
-
-        &:after {
-          opacity: 1;
-        }
-    }
-`.modifier('large', size === 'l')`
-    --toggle-size: 34px;
-    --toggle-thumb-size: 14px;
-`.modifier('small', size === 's')`
-    --toggle-size: 20px;
-    --toggle-thumb-size: 8px;
-`.modifier('disabled', disabled)`
-    opacity: 0.6;
-    cursor: not-allowed;
-`;
+    'input[type="radio"]:checked + &': {
+        backgroundColor: 'var(--color-primary-light)',
+        '&:after': {
+            opacity: 1,
+        },
+    },
+})
+    .modifier('large', {
+        '--toggle-size': '34px',
+        '--toggle-thumb-size': '14px',
+    })
+    .modifier('small', {
+        '--toggle-size': '20px',
+        '--toggle-thumb-size': '8px',
+    })
+    .modifier('disabled', {
+        opacity: '0.6',
+        cursor: 'not-allowed',
+    });
 
 const Radio: FC<RadioProps> = ({ size = 'm', ...props }) => (
     <Label htmlFor={props.id}>
         <Input
-            css={css<Theme>`
-                clip: rect(0px, 0px, 0px, 0px);
-                height: 1px;
-                width: 1px;
-                white-space: nowrap;
-                position: absolute;
-                border-width: 0px;
-                border-style: initial;
-                border-color: initial;
-                border-image: initial;
-                margin: -1px;
-                padding: 0px;
-                overflow: hidden;
-            `}
+            css={css({
+                clip: 'rect(0px, 0px, 0px, 0px)',
+                height: '1px',
+                width: '1px',
+                whiteSpace: 'nowrap',
+                position: 'absolute',
+                borderWidth: '0px',
+                borderStyle: 'initial',
+                borderColor: 'initial',
+                borderImage: 'initial',
+                margin: '-1px',
+                padding: '0px',
+                overflow: 'hidden',
+            })}
             disabled={props.disabled}
             id={props.id}
             name={props.name}
@@ -90,14 +85,14 @@ const Radio: FC<RadioProps> = ({ size = 'm', ...props }) => (
             value={props.value}
             checked={props.checked}
         />
-        <div aria-hidden="true" css={toggleStyles(size, props.disabled)} />
-        <span
-            css={css`
-                user-select: none;
-            `}
-        >
-            {props.label}
-        </span>
+        <div
+            aria-hidden="true"
+            css={styles}
+            $large={size === 'l'}
+            $small={size === 's'}
+            $disabled={props.disabled}
+        />
+        <span css={css({ userSelect: 'none' })}>{props.label}</span>
     </Label>
 );
 
diff --git a/packages/components/radio/package.json b/packages/components/radio/package.json
index 797dca8..56c366d 100644
--- a/packages/components/radio/package.json
+++ b/packages/components/radio/package.json
@@ -9,12 +9,11 @@
     "dependencies": {
         "@precursor/input": "^0.1.5",
         "@precursor/label": "^0.1.4",
-        "@precursor/theme": "^0.1.6",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.6"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/range/Range.tsx b/packages/components/range/Range.tsx
index 1b7d011..f2f3680 100644
--- a/packages/components/range/Range.tsx
+++ b/packages/components/range/Range.tsx
@@ -1,8 +1,6 @@
 /* eslint-disable jsx-a11y/no-static-element-interactions */
-/** @jsx jsx */
-import { jsx } from '@trousers/core';
-import collector from '@trousers/collector';
-import { FC, useRef, useState } from 'react';
+import React, { FC, useRef, useState } from 'react';
+import { css } from '@trousers/macro';
 
 import Slider from './Slider';
 import Track from './Track';
@@ -36,18 +34,19 @@ function getStepFromValue(value: number, valuePerStep: number) {
     return Math.round(value / valuePerStep) * valuePerStep;
 }
 
-const styles = (size: RangeProps['size']) =>
-    collector('Thumb').element`
-        --range-track-height: 2px;
-        --range-thumb-height: 18px;
-        height: var(--range-thumb-height);
-        cursor: pointer;
-        position: relative;
-    `.modifier('small', size === 's')`
-        --range-thumb-height: 16px;
-    `.modifier('large', size === 'l')`
-        --range-thumb-height: 22px;
-    `;
+const styles = css('Thumb', {
+    '--range-track-height': '2px',
+    '--range-thumb-height': '18px',
+    height: 'var(--range-thumb-height)',
+    cursor: 'pointer',
+    position: 'relative',
+})
+    .modifier('small', {
+        '--range-thumb-height': '16px',
+    })
+    .modifier('large', {
+        '--range-thumb-height': '22px',
+    });
 
 const Range: FC<RangeProps> = ({
     max = 100,
@@ -173,7 +172,9 @@ const Range: FC<RangeProps> = ({
 
     return (
         <div
-            css={styles(size)}
+            css={styles}
+            $small={size === 's'}
+            $large={size === 'l'}
             onKeyDown={handleKeyDown}
             onMouseDown={handleTrackMouseDown}
             onTouchStart={handleTrackMouseDown}
diff --git a/packages/components/range/Slider.tsx b/packages/components/range/Slider.tsx
index 3267448..5d96991 100644
--- a/packages/components/range/Slider.tsx
+++ b/packages/components/range/Slider.tsx
@@ -1,9 +1,7 @@
-/** @jsx jsx */
-import { jsx } from '@trousers/core';
-import collector from '@trousers/collector';
-import { FC, useRef } from 'react';
+import { css } from '@trousers/macro';
+import React, { FC, useRef } from 'react';
 
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 export interface SliderProps {
     disabled?: boolean;
@@ -14,36 +12,31 @@ export interface SliderProps {
     onDrag: (event: MouseEvent | TouchEvent) => void;
 }
 
-const styles = (disabled: SliderProps['disabled']) =>
-    collector<Theme>('Thumb').element`
-    width: var(--range-thumb-height);
-    height: var(--range-thumb-height);
-    border-radius: 50%;
-    position: absolute;
-    top: calc(var(--range-track-height) / 2 * -1);
-    background-color: ${({ color }) => color.primary.base};
-    transition: background-color 200ms;
-
-    &:hover {
-        background-color: ${({ color }) => color.primary.dark};
-    }
-
-    &:active {
-        background-color: ${({ color }) => color.primary.darker};
-    }
-
-    &:focus {
-        box-shadow: ${({ color }) => color.primary.base} 0px 0px 2px 1px;
-        outline: 0;
-    }
-`.modifier('disabled', disabled)`
-    background-color: ${({ color }) => color.neutral.light};
-    cursor: not-allowed;
-
-    &:hover {
-        background-color: ${({ color }: Theme) => color.neutral.lighter};
-    }
-`;
+const styles = css('Thumb', {
+    width: 'var(--range-thumb-height)',
+    height: 'var(--range-thumb-height)',
+    borderRadius: '50%',
+    position: 'absolute',
+    top: 'calc(var(--range-track-height) / 2 * -1)',
+    backgroundColor: 'var(--color-primary-base)',
+    transition: 'background-color 200ms',
+    '&:hover': {
+        backgroundColor: 'var(--color-primary-dark)',
+    },
+    '&:active': {
+        backgroundColor: 'var(--color-primary-darker)',
+    },
+    '&:focus': {
+        boxShadow: 'var(--color-primary-base} 0px 0px 2px 1px',
+        outline: 0,
+    },
+}).modifier('disabled', {
+    backgroundColor: 'var(--color-neutral-light)',
+    cursor: 'not-allowed',
+    '&:hover': {
+        backgroundColor: 'var(--color-neutral-lighter)',
+    },
+});
 
 const Slider: FC<SliderProps> = ({
     disabled,
@@ -117,15 +110,16 @@ const Slider: FC<SliderProps> = ({
     return (
         <div
             ref={sliderRef}
+            css={styles}
+            $disabled={disabled}
+            style={{
+                left: `calc(${progress} - var(--range-thumb-height) / 2)`,
+            }}
             role={!disabled ? 'slider' : undefined}
             tabIndex={disabled ? -1 : 0}
             aria-valuemin={min}
             aria-valuemax={max}
             aria-valuenow={value}
-            css={styles(disabled)}
-            style={{
-                left: `calc(${progress} - var(--range-thumb-height) / 2)`,
-            }}
             draggable="false"
             onMouseDown={handleMouseDown}
             onTouchStart={handleTouchStart}
diff --git a/packages/components/range/Track.tsx b/packages/components/range/Track.tsx
index f60fdf6..73cb4ef 100644
--- a/packages/components/range/Track.tsx
+++ b/packages/components/range/Track.tsx
@@ -1,45 +1,37 @@
-/** @jsx jsx */
-import { jsx } from '@trousers/core';
-import collector from '@trousers/collector';
-import { forwardRef } from 'react';
+import React, { forwardRef } from 'react';
+import { css } from '@trousers/macro';
 
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 export interface TrackProps {
     disabled?: boolean;
     progress: string;
 }
 
-const styles = (disabled: TrackProps['disabled']) =>
-    collector<Theme>('Track').element`
-        background: lightgrey;
-        border-radius: var(--range-track-height);
-        display: block;
-        height: var(--range-track-height);
-        position: relative;
-        top: calc(50% - var(--range-track-height));
+const styles = css('Track', {
+    background: 'lightgrey',
+    borderRadius: 'var(--range-track-height)',
+    display: 'block',
+    height: 'var(--range-track-height)',
+    position: 'relative',
+    top: 'calc(50% - var(--range-track-height))',
+    '& > div': {
+        position: 'absolute',
+        height: 'var(--range-track-height)',
+        backgroundColor: 'var(--color-primary-base)',
+    },
+}).modifier('disabled', {
+    backgroundColor: 'var(--color-neutral-light)',
 
-        & > div {
-            position: absolute;
-            height: var(--range-track-height);
-            background-color: ${({ color }) => color.primary.base};
-        }
-    `.modifier('disabled', disabled)`
-        background-color: ${({ color }) => color.neutral.light};
-
-        & > div {
-            background-color: ${({ color }) => color.neutral.light};
-        }
-    `;
+    '& > div': {
+        backgroundColor: 'var(--color-neutral-light)',
+    },
+});
 
 const Track = forwardRef<HTMLDivElement, TrackProps>(
     ({ disabled, progress }, ref) => (
-        <div ref={ref} css={styles(disabled)}>
-            <div
-                style={{
-                    width: progress,
-                }}
-            />
+        <div ref={ref} css={styles} $disabled={disabled}>
+            <div style={{ width: progress }} />
         </div>
     ),
 );
diff --git a/packages/components/range/package.json b/packages/components/range/package.json
index 9ac998a..fb3f587 100644
--- a/packages/components/range/package.json
+++ b/packages/components/range/package.json
@@ -7,12 +7,11 @@
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.7"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/select/Select.tsx b/packages/components/select/Select.tsx
index e0ae072..76bc155 100644
--- a/packages/components/select/Select.tsx
+++ b/packages/components/select/Select.tsx
@@ -1,12 +1,9 @@
-/** @jsx jsx */
-import { ChangeEventHandler, ReactNode, FC } from 'react';
-import { jsx, css, useStyles } from '@trousers/core';
-import collector from '@trousers/collector';
-import { useTheme } from '@trousers/theme';
+import React, { ChangeEventHandler, ReactNode, FC } from 'react';
+import { css } from '@trousers/macro';
 // @ts-ignore
 import ChevronDown from 'react-feather/dist/icons/chevron-down';
 
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 export interface SelectProps {
     children: ReactNode | string;
@@ -16,65 +13,67 @@ export interface SelectProps {
     name?: string;
     onChange?: ChangeEventHandler<HTMLSelectElement>;
     value?: string;
-    state?: 'success' | 'error' | 'warning';
+    appearance?: 'success' | 'error' | 'warning';
     size?: 's' | 'm' | 'l';
     defaultValue?: string;
 }
 
-const styles = ({ size, state, disabled }: SelectProps) => collector<Theme>(
-    'Select',
-).element`
-    --select-height: 44px;
-    --select-border-color: #E2E8F0;
-    height: var(--select-height);
-    padding: 0 10px;
-    background-color: ${({ color }) => color.background.base};
-    border-radius: ${({ radius }) => radius.m};
-    border-color: var(--select-border-color);
-    border-style: solid;
-    border-width: 2px;
-    box-shadow: none;
-    appearance: none;
-    width: 100%;
-    margin: 0;
-    font-family: ${({ font }) => font.base};
-    color: ${({ color }) => color.typography.base};
-
-    &::placeholder {
-        color: ${({ color }) => color.typography.placeholder};
-    }
-
-    &:focus {
-        box-shadow: var(--select-border-color) 0px 0px 2px 1px;
-        outline: 0;
-    }
-`.modifier('success', state === 'success')`
-    --select-border-color: #31C48D;
-`.modifier('warning', state === 'warning')`
-    --select-border-color: #FDBA8C;
-`.modifier('error', state === 'error')`
-    --select-border-color: #F98080;
-`.modifier('disabled', disabled)`
-    cursor: not-allowed;
-    background-color: ${({ color }: Theme) => color.background.light};
-`.modifier('small', size === 's')`
-    --select-height: 36px;
-`.modifier('large', size === 'l')`
-    --select-height: 52px;
-`;
+const styles = css('Select', {
+    '--select-height': '44px',
+    '--select-border-color': '#E2E8F0',
+    height: 'var(--select-height)',
+    padding: '0 10px',
+    backgroundColor: 'var(--color-background-base)',
+    borderRadius: 'var(--radius-m)',
+    borderColor: 'var(--select-border-color)',
+    borderStyle: 'solid',
+    borderWidth: '2px',
+    boxShadow: 'none',
+    appearance: 'none',
+    width: '100%',
+    margin: 0,
+    fontFamily: 'var(--font-base)',
+    color: 'var(--color-typography-base)',
+    '&::placeholder': {
+        color: 'var(--color-typography-placeholder)',
+    },
+    '&:focus': {
+        'box-shadow': 'var(--select-border-color) 0px 0px 2px 1px',
+        outline: 0,
+    },
+})
+    .modifier('success', {
+        '--select-border-color': '#31C48D',
+    })
+    .modifier('warning', {
+        '--select-border-color': '#FDBA8C',
+    })
+    .modifier('error', {
+        '--select-border-color': '#F98080',
+    })
+    .modifier('disabled', {
+        cursor: 'not-allowed',
+        backgroundColor: 'var(--color-background-light)',
+    })
+    .modifier('small', {
+        '--select-height': '36px',
+    })
+    .modifier('large', {
+        '--select-height': '52px',
+    });
 
 const Select: FC<SelectProps> = props => {
-    const classNames = useStyles(styles(props));
-    const { theme } = useTheme();
-
     return (
-        <div
-            css={css`
-                position: relative;
-            `}
-        >
+        <div css={css({ position: 'relative' })}>
             <select
-                className={classNames}
+                // className={classNames}
+                css={styles}
+                $success={props.appearance === 'success'}
+                $warning={props.appearance === 'warning'}
+                $error={props.appearance === 'error'}
+                $disabled={props.disabled}
+                $small={props.size === 's'}
+                $large={props.size === 'l'}
                 id={props.id}
                 name={props.name}
                 onChange={props.onChange}
@@ -85,21 +84,21 @@ const Select: FC<SelectProps> = props => {
                 {props.children}
             </select>
             <span
-                css={css`
-                    align-items: center;
-                    display: flex;
-                    height: 100%;
-                    justify-content: center;
-                    padding-right: 10px;
-                    pointer-events: none;
-                    position: absolute;
+                css={css({
+                    alignItems: 'center',
+                    display: 'flex',
+                    height: '100%',
+                    justifyContent: 'center',
+                    paddingRight: '10px',
+                    pointerEvents: 'none',
+                    position: 'absolute',
                     right: 0;
                     top: 0;
-                `}
+                })}
             >
                 <ChevronDown
                     size="20"
-                    color={theme.color.typography.placeholder}
+                    color={theme.color.typography.placeholder} // TODO: Fix this
                 />
             </span>
         </div>
diff --git a/packages/components/select/package.json b/packages/components/select/package.json
index 9317ad2..c450686 100644
--- a/packages/components/select/package.json
+++ b/packages/components/select/package.json
@@ -7,13 +7,11 @@
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2",
-        "@trousers/theme": "^3.0.0",
         "react-feather": "^2.0.8"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/skeleton/Skeleton.tsx b/packages/components/skeleton/Skeleton.tsx
index cf07b73..d736c0a 100644
--- a/packages/components/skeleton/Skeleton.tsx
+++ b/packages/components/skeleton/Skeleton.tsx
@@ -1,45 +1,47 @@
-/** @jsx jsx */
-import { FC } from 'react';
-import { jsx } from '@trousers/core';
-import collector from '@trousers/collector';
-import { Theme } from '@precursor/theme';
+import React, { FC } from 'react';
+import { css } from '@trousers/macro';
+// import { Theme } from '@precursor/theme';
 
 export interface SkeletonProps {
     as?: 'image' | 'text' | 'avatar';
     height?: string;
 }
 
-const getStyles = (props: SkeletonProps) =>
-    collector<Theme>('skeleton').element`
-    background-color: ${({ color }) => color.background.light};
-    height: 1rem;
-    animation: precursor-pulse 1.5s ease-in-out 0.5s infinite;
-
-    @keyframes precursor-pulse {
-        0% {
-            opacity: 1;
-        }
-        50% {
-            opacity: 0.4;
-        }
-        100% {
-            opacity: 1;
-        }
-    }
-`.modifier(props.as === 'text')`
-    width: 100%;
-    border-radius: ${({ radius }) => radius.s}
-`.modifier(props.as === 'image')`
-    width: 100%;
-    padding-top: ${props.height || '56.25%'};
-`.modifier(props.as === 'avatar')`
-    width: 64px;
-    height: 64px;
-    border-radius: 100%;
-`;
-
 const Skeleton: FC<SkeletonProps> = ({ as = 'text', height }) => (
-    <div css={getStyles({ as, height })} />
+    <div
+        css={css('skeleton', {
+            backgroundColor: 'var(--color-background-light)',
+            height: '1rem',
+            animation: 'precursor-pulse 1.5s ease-in-out 0.5s infinite',
+            '@keyframes precursor-pulse': {
+                '0%': {
+                    opacity: 1,
+                },
+                '50%': {
+                    opacity: 0.4,
+                },
+                '100%': {
+                    opacity: 1,
+                },
+            },
+        })
+            .modifier('isText', {
+                width: '100%',
+                borderRadius: 'var(--radius-s)',
+            })
+            .modifier('isImage', {
+                width: '100%',
+                paddingTop: `${height || '56.25%'}`,
+            })
+            .modifier('isAvatar', {
+                width: '64px',
+                height: '64px',
+                borderRadius: '100%',
+            })}
+        $isText={as === 'text'}
+        $isImage={as === 'image'}
+        $isAvatar={as === 'avatar'}
+    />
 );
 
 export default Skeleton;
diff --git a/packages/components/skeleton/package.json b/packages/components/skeleton/package.json
index c329d3a..bc8ec29 100644
--- a/packages/components/skeleton/package.json
+++ b/packages/components/skeleton/package.json
@@ -7,11 +7,11 @@
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.7"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/spinner/Spinner.tsx b/packages/components/spinner/Spinner.tsx
index 321cd72..01dcac4 100644
--- a/packages/components/spinner/Spinner.tsx
+++ b/packages/components/spinner/Spinner.tsx
@@ -1,6 +1,5 @@
-/** @jsx jsx */
-import { FC } from 'react';
-import { css, jsx } from '@trousers/core';
+import React, { FC } from 'react';
+import { css } from '@trousers/macro';
 
 export interface SpinnerProps {
     color?: string;
@@ -9,49 +8,49 @@ export interface SpinnerProps {
 const Spinner: FC<SpinnerProps> = ({ color = 'black' }) => {
     return (
         <div
-            css={css`
-                color: ${color};
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                font-size: 1rem;
+            css={css({
+                color: color,
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                fontSize: '1rem',
 
-                &:after {
-                    animation: changeContent 0.8s linear infinite;
-                    display: block;
-                    content: '⠋';
-                }
+                '&:after': {
+                    animation: 'changeContent 0.8s linear infinite',
+                    display: 'block',
+                    content: '⠋',
+                },
 
-                @keyframes changeContent {
-                    10% {
-                        content: '⠙';
-                    }
-                    20% {
-                        content: '⠹';
-                    }
-                    30% {
-                        content: '⠸';
-                    }
-                    40% {
-                        content: '⠼';
-                    }
-                    50% {
-                        content: '⠴';
-                    }
-                    60% {
-                        content: '⠦';
-                    }
-                    70% {
-                        content: '⠧';
-                    }
-                    80% {
-                        content: '⠇';
-                    }
-                    90% {
-                        content: '⠏';
-                    }
-                }
-            `}
+                '@keyframes changeContent': {
+                    '10%': {
+                        content: '⠙',
+                    },
+                    '20%': {
+                        content: '⠹',
+                    },
+                    '30%': {
+                        content: '⠸',
+                    },
+                    '40%': {
+                        content: '⠼',
+                    },
+                    '50%': {
+                        content: '⠴',
+                    },
+                    '60%': {
+                        content: '⠦',
+                    },
+                    '70%': {
+                        content: '⠧',
+                    },
+                    '80%': {
+                        content: '⠇',
+                    },
+                    '90%': {
+                        content: '⠏',
+                    },
+                },
+            })}
         />
     );
 };
diff --git a/packages/components/spinner/package.json b/packages/components/spinner/package.json
index 2251a7a..415757b 100644
--- a/packages/components/spinner/package.json
+++ b/packages/components/spinner/package.json
@@ -6,11 +6,10 @@
     "module": "dist/index.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {
-        "@trousers/core": "^3.0.2"
-    },
+    "dependencies": {},
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/tabs/Tab.tsx b/packages/components/tabs/Tab.tsx
index cb7de06..578b6bd 100644
--- a/packages/components/tabs/Tab.tsx
+++ b/packages/components/tabs/Tab.tsx
@@ -1,9 +1,7 @@
-/** @jsx jsx */
-import { useContext, FC, ReactNode } from 'react';
-import { jsx } from '@trousers/core';
-import collector from '@trousers/collector';
-import { Theme } from '@precursor/theme';
+import React, { useContext, FC, ReactNode } from 'react';
+import { css } from '@trousers/macro';
 import Text from '@precursor/text';
+// import { Theme } from '@precursor/theme';
 
 import TabsContext from './TabsContext';
 
@@ -12,6 +10,15 @@ export interface TabProps {
     children: ReactNode;
 }
 
+const styles = css('Tab', {
+    cursor: 'pointer',
+    backgroundColor: 'transparent',
+    border: 'none',
+    padding: '1rem',
+}).modifier('selected', {
+    color: 'var(--color-focus)',
+});
+
 const Tab: FC<TabProps> = ({ id, children }) => {
     const { active, setActive } = useContext(TabsContext);
     const isSelected = active === id;
@@ -24,14 +31,8 @@ const Tab: FC<TabProps> = ({ id, children }) => {
             id={`tab-${id}`}
             tabIndex={isSelected ? 0 : -1}
             onClick={() => setActive && setActive(id)}
-            css={collector<Theme>('tab').element`
-                cursor: pointer;
-                background-color: transparent;
-                border: none;
-                padding: 1rem;
-            `.modifier(isSelected)`
-                color: ${({ color }) => color.focus};
-            `}
+            css={styles}
+            $selected={isSelected}
         >
             <Text as="span">{children}</Text>
         </button>
diff --git a/packages/components/tabs/TabList.tsx b/packages/components/tabs/TabList.tsx
index 5a7eb44..aa3c18a 100644
--- a/packages/components/tabs/TabList.tsx
+++ b/packages/components/tabs/TabList.tsx
@@ -1,6 +1,5 @@
-/** @jsx jsx */
-import { useContext, FC, KeyboardEventHandler, ReactNode } from 'react';
-import { jsx, css } from '@trousers/core';
+import React, { useContext, FC, KeyboardEventHandler, ReactNode } from 'react';
+import { css } from '@trousers/macro';
 import TabsContext from './TabsContext';
 
 export interface TabListProps {
@@ -40,10 +39,9 @@ const TabList: FC<TabListProps> = ({ label, children }) => {
             tabIndex={0}
             aria-label={label}
             onKeyDown={onKeyDown}
-            css={css`
-                border-bottom: ${({ border }) =>
-                    `${border.size[0]} solid ${border.color.base}`};
-            `}
+            css={css({
+                borderBottom: `var(--border--size[0]) solid var(--border--color.base)`,
+            })}
         >
             {children}
         </div>
diff --git a/packages/components/tabs/TabPanel.tsx b/packages/components/tabs/TabPanel.tsx
index 3d11c42..55c98ef 100644
--- a/packages/components/tabs/TabPanel.tsx
+++ b/packages/components/tabs/TabPanel.tsx
@@ -1,6 +1,6 @@
 /** @jsx jsx */
 import { useContext, FC, ReactNode } from 'react';
-import { jsx } from '@trousers/core';
+import { jsx } from '@trousers/macro';
 import TabsContext from './TabsContext';
 
 export interface TabPanelProps {
diff --git a/packages/components/tabs/package.json b/packages/components/tabs/package.json
index 791fe91..11b8350 100644
--- a/packages/components/tabs/package.json
+++ b/packages/components/tabs/package.json
@@ -8,12 +8,11 @@
     "license": "MIT",
     "dependencies": {
         "@precursor/stack": "^0.1.5",
-        "@precursor/theme": "^0.1.7",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.7"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/textarea/TextArea.tsx b/packages/components/textarea/TextArea.tsx
index 7f5a433..1a782e7 100644
--- a/packages/components/textarea/TextArea.tsx
+++ b/packages/components/textarea/TextArea.tsx
@@ -1,9 +1,7 @@
-/** @jsx jsx */
-import { FC, ChangeEventHandler } from 'react';
-import { jsx } from '@trousers/core';
-import collector from '@trousers/collector';
+import React, { FC, ChangeEventHandler } from 'react';
+import { css } from '@trousers/macro';
 
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 export interface TextAreaProps {
     className?: string;
@@ -14,66 +12,71 @@ export interface TextAreaProps {
     type?: string;
     value: string;
     defaultValue?: string;
-    state?: 'success' | 'error' | 'warning';
+    appearance?: 'success' | 'error' | 'warning';
     size?: 's' | 'm' | 'l';
     onChange?: ChangeEventHandler<HTMLTextAreaElement>;
 }
 
 // TODO: https://v5.fannypack.style/form/input/ great focus styles here
+const styles = css('TextArea', {
+    '--textarea-height': '90px',
+    '--textarea-border-color': '#E2E8F0',
+    height: 'var(--textarea-height)',
+    padding: '10px',
+    backgroundColor: 'var(--color-background-base)',
+    borderRadius: 'var(--radius-m)',
+    borderColor: 'var(--textarea-border-color)',
+    borderStyle: 'solid',
+    borderWidth: '2px',
+    boxShadow: 'none',
+    appearance: 'none',
+    width: '100%',
+    maxWidth: '100%',
+    minHeight: 'var(--textarea-height)',
+    margin: 0,
+    fontFamily: 'var(--font-base)',
+    color: 'var(--color-typography-base)',
 
-const styles = ({ size, state, disabled }: TextAreaProps) => collector<Theme>(
-    'TextArea',
-).element`
-    --textarea-height: 90px;
-    --textarea-border-color: #E2E8F0;
-    height: var(--textarea-height);
-    padding: 10px;
-    background-color: ${({ color }) => color.background.base};
-    border-radius: ${({ radius }) => radius.m};
-    border-color: var(--textarea-border-color);
-    border-style: solid;
-    border-width: 2px;
-    box-shadow: none;
-    appearance: none;
-    width: 100%;
-    max-width: 100%;
-    min-height: var(--textarea-height);
-    margin: 0;
-    font-family: ${({ font }) => font.base};
-    color: ${({ color }) => color.typography.base};
+    '&::placeholder': {
+        color: 'var(--color-typography-placeholder)',
+    },
 
-    &::placeholder {
-        color: ${({ color }) => color.typography.placeholder};
-    }
-
-    &:focus {
-        box-shadow: var(--textarea-border-color) 0px 0px 2px 1px;
-        outline: 0;
-    }
-`.modifier('success', state === 'success')`
-    --textarea-border-color: #31C48D;
-`.modifier('warning', state === 'warning')`
-    --textarea-border-color: #FDBA8C;
-`.modifier('error', state === 'error')`
-    --textarea-border-color: #F98080;
-`.modifier('disabled', disabled)`
-    cursor: not-allowed;
-    background-color: ${({ color }: Theme) => color.background.light};
-`.modifier('small', size === 's')`
-    --textarea-height: 60px;
-`.modifier('large', size === 'l')`
-    --textarea-height: 120px;
-`;
+    '&:focus': {
+        boxShadow: 'var(--textarea-border-color) 0px 0px 2px 1px',
+        outline: 0,
+    },
+})
+    .modifier('success', {
+        '--textarea-border-color': '#31C48D',
+    })
+    .modifier('warning', { '--textarea-border-color': '#FDBA8C' })
+    .modifier('error', { '--textarea-border-color': '#F98080' })
+    .modifier('disabled', {
+        cursor: 'not-allowed',
+        backgroundColor: 'var(--color-background-light)',
+    })
+    .modifier('small', {
+        '--textarea-height': '60px',
+    })
+    .modifier('large', {
+        '--textarea-height': '120px',
+    });
 
 const TextArea: FC<TextAreaProps> = props => (
     <textarea
-        css={styles(props)}
+        css={styles}
         disabled={props.disabled}
         id={props.id}
         name={props.name}
         onChange={props.onChange}
         placeholder={props.placeholder}
         value={props.value || props.defaultValue}
+        $success={props.appearance === 'success'}
+        $warning={props.appearance === 'warning'}
+        $error={props.appearance === 'error'}
+        $disabled={props.disabled}
+        $small={props.size === 's'}
+        $large={props.size === 'l'}
     />
 );
 
diff --git a/packages/components/textarea/package.json b/packages/components/textarea/package.json
index 71bb87b..68d13ac 100644
--- a/packages/components/textarea/package.json
+++ b/packages/components/textarea/package.json
@@ -6,12 +6,10 @@
     "module": "dist/index.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
-    },
+    "dependencies": {},
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/toggle/Toggle.tsx b/packages/components/toggle/Toggle.tsx
index 62512dd..c4537a3 100644
--- a/packages/components/toggle/Toggle.tsx
+++ b/packages/components/toggle/Toggle.tsx
@@ -1,97 +1,89 @@
-/** @jsx jsx */
-import { FC } from 'react';
-import { jsx, css } from '@trousers/core';
-import styleCollector from '@trousers/collector';
+import React, { FC } from 'react';
+import { css } from '@trousers/macro';
 
 import Input, { InputProps } from '@precursor/input';
 import Label from '@precursor/label';
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 export interface ToggleProps extends Omit<InputProps, 'placeholder'> {
     label?: string;
     size?: 's' | 'm' | 'l';
 }
 
-const toggleStyles = (
-    size: ToggleProps['size'],
-    disabled: ToggleProps['disabled'],
-) =>
-    styleCollector<Theme>('ToggleIndicator').element`
-    --toggle-size: 44px;
-    --toggle-thumb-size: 16px;
+const toggleStyles = css('ToggleIndicator', {
+    display: 'inline-block',
+    cursor: 'pointer',
+    width: 'var(--toggle-size)',
+    borderRadius: 'calc(var(--toggle-size) / 2)',
+    backgroundColor: '${({ color }) => color.neutral.light}',
+    padding: '${({ space }) => space.xxs}',
+    transition: 'background-color 100ms',
+    marginRight: '${({ spacePreset }) => spacePreset.inline}',
+    '&:after': {
+        content: '',
+        display: 'block',
+        width: 'var(--toggle-thumb-size)',
+        height: 'var(--toggle-thumb-size)',
+        backgroundColor: '#fff',
+        borderRadius: '50%',
+        transition: 'transform 100ms',
+        transform: 'translateX(0)',
+    },
+    'input[type="checkbox"]:focus + &': {
+        boxShadow:
+            '0 0 0 ${({ border }) => border.size[1]} ${({ border }) => border.color.focus}',
+    },
+    'input[type="checkbox"]:checked + &': {
+        backgroundColor: '${({ color }) => color.primary.light}',
 
-    display: inline-block;
-    cursor: pointer;
-    width: var(--toggle-size);
-    border-radius: calc(var(--toggle-size) / 2);
-    background-color: ${({ color }) => color.neutral.light};
-    padding: ${({ space }) => space.xxs};
-    transition: background-color 100ms;
-    margin-right: ${({ spacePreset }) => spacePreset.inline};
-
-    &:after {
-        content: '';
-        display: block;
-        width: var(--toggle-thumb-size);
-        height: var(--toggle-thumb-size);
-        background-color: #fff;
-        border-radius: 50%;
-        transition: transform 100ms;
-        transform: translateX(0);
-    }
-
-    input[type="checkbox"]:focus + & {
-        box-shadow: 0 0 0 ${({ border }) => border.size[1]} ${({ border }) =>
-        border.color.focus};
-    }
-
-    input[type='checkbox']:checked + & {
-        background-color: ${({ color }) => color.primary.light};
-
-        &:after {
-            transform: translateX(
-                calc(var(--toggle-size) - var(--toggle-thumb-size) - ${({
-                    space,
-                }) => space.xxs} * 2)
-            );
-        }
-    }
-`.modifier('large', size === 'l')`
-    --toggle-size: 70px;
-    --toggle-thumb-size: 26px;
-`.modifier('small', size === 's')`
-    --toggle-size: 30px;
-    --toggle-thumb-size: 12px;
-`.modifier('disabled', disabled)`
-    opacity: 0.6;
-    cursor: not-allowed;
-`;
+        '&:after': {
+            transform:
+                'translateX(calc(var(--toggle-size)-var(--toggle-thumb-size)-${({ space }) => space.xxs} * 2))',
+        },
+    },
+})
+    .modifier('large', {
+        '--toggle-size': '70px',
+        '--toggle-thumb-size': '26px',
+    })
+    .modifier('small', {
+        '--toggle-size': '30px',
+        '--toggle-thumb-size': '12px',
+    })
+    .modifier('disabled', {
+        opacity: 0.6,
+        cursor: 'not-allowed',
+    })
+    .theme({
+        toggleSize: '44px',
+        toggleThumbSize: '16px',
+    });
 
 const Toggle: FC<ToggleProps> = ({ size = 'm', ...props }) => (
     <div
-        css={css`
-            display: inline-flex;
-            align-items: center;
-            cursor: pointer;
-            user-select: none;
-        `}
+        css={css({
+            display: 'inline-flex',
+            alignItems: 'center',
+            cursor: 'pointer',
+            userSelect: 'none',
+        })}
     >
         <Label htmlFor={props.id}>
             <Input
-                css={css<Theme>`
-                    clip: rect(0px, 0px, 0px, 0px);
-                    height: 1px;
-                    width: 1px;
-                    white-space: nowrap;
-                    position: absolute;
-                    border-width: 0px;
-                    border-style: initial;
-                    border-color: initial;
-                    border-image: initial;
-                    margin: -1px;
-                    padding: 0px;
-                    overflow: hidden;
-                `}
+                css={css({
+                    clip: 'rect(0px, 0px, 0px, 0px)',
+                    height: '1px',
+                    width: '1px',
+                    whiteSpace: 'nowrap',
+                    position: 'absolute',
+                    borderWidth: 0,
+                    borderStyle: 'initial',
+                    borderColor: 'initial',
+                    borderImage: 'initial',
+                    margin: '-1px',
+                    padding: 0,
+                    overflow: 'hidden',
+                })}
                 disabled={props.disabled}
                 id={props.id}
                 name={props.name}
@@ -100,14 +92,14 @@ const Toggle: FC<ToggleProps> = ({ size = 'm', ...props }) => (
                 value={props.value}
                 checked={props.checked}
             />
-            <div aria-hidden="true" css={toggleStyles(size, props.disabled)} />
-            <span
-                css={css`
-                    user-select: none;
-                `}
-            >
-                {props.label}
-            </span>
+            <div
+                aria-hidden="true"
+                css={toggleStyles}
+                $large={size === 'l'}
+                $small={size === 's'}
+                $disabled={props.disabled}
+            />
+            <span css={css({ userSelect: 'none' })}>{props.label}</span>
         </Label>
     </div>
 );
diff --git a/packages/components/toggle/package.json b/packages/components/toggle/package.json
index 95fdf90..24d90db 100644
--- a/packages/components/toggle/package.json
+++ b/packages/components/toggle/package.json
@@ -9,12 +9,11 @@
     "dependencies": {
         "@precursor/input": "^0.1.7",
         "@precursor/label": "^0.1.7",
-        "@precursor/theme": "^0.1.7",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.7"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/elements/blockquote/Blockquote.tsx b/packages/elements/blockquote/Blockquote.tsx
index bb38ae1..265d46b 100644
--- a/packages/elements/blockquote/Blockquote.tsx
+++ b/packages/elements/blockquote/Blockquote.tsx
@@ -1,26 +1,22 @@
-/** @jsx jsx */
-import { FC } from 'react';
-import { css, jsx } from '@trousers/core';
+import React, { FC } from 'react';
+import { css } from '@trousers/macro';
 
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 export interface BlockquoteProps {
     children: string;
     cite?: string;
 }
 
+const styles = css('Blockquote', {
+    padding: '0.2rem 0.5rem',
+    margin: '0 0.2rem',
+    color: 'var(--color-typography-base)',
+    borderLeft: '0.25em solid #dfe2e5',
+});
+
 const Blockquote: FC<BlockquoteProps> = ({ cite, children }) => (
-    <blockquote
-        css={css<Theme>`
-            padding: 0.2rem 0.5rem;
-            margin: 0 0.2rem;
-            color: ${({ color }) => color.typography.base};
-            padding: 0 1em;
-            color: #6a737d;
-            border-left: 0.25em solid #dfe2e5;
-        `}
-        cite={cite}
-    >
+    <blockquote css={styles} cite={cite}>
         {children}
     </blockquote>
 );
diff --git a/packages/elements/blockquote/package.json b/packages/elements/blockquote/package.json
index 659a588..9020b9e 100644
--- a/packages/elements/blockquote/package.json
+++ b/packages/elements/blockquote/package.json
@@ -7,12 +7,11 @@
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.7"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/elements/heading/Heading.tsx b/packages/elements/heading/Heading.tsx
index e980b5d..7a396a8 100644
--- a/packages/elements/heading/Heading.tsx
+++ b/packages/elements/heading/Heading.tsx
@@ -1,10 +1,8 @@
-/** @jsx jsx */
 import React, { FC, ReactNode, Fragment } from 'react';
-import { useStyles, css, jsx } from '@trousers/core';
-import collector from '@trousers/collector';
+import { css } from '@trousers/macro';
 
 import copyToClipboard from '@precursor/copy-to-clipboard';
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 type Headings = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
 
@@ -15,34 +13,38 @@ export interface HeadingProps {
     weight?: Headings;
 }
 
-const styles = (weight: HeadingProps['weight']) => collector<Theme>('heading')
-    .element`
-    font-family: ${({ font }) => font.heading};
-    font-weight: ${({ fontWeight }) => fontWeight.heading};
-    font-size: ${({ fontSize }) => fontSize.h1};
-    line-height: ${({ lineHeight }) => lineHeight.h1};
-    color: ${({ color }) => color.typography.heading};
-    margin: 0;
+const styles = css('heading', {
+    fontFamily: 'var(--font-heading)',
+    fontWeight: 'var(--fontWeight-heading)',
+    fontSize: 'var(--fontSize-h1)',
+    lineHeight: 'var(--lineHeight-h1)',
+    color: 'var(--color-typography-heading)',
+    margin: 0,
 
-    &:hover > a {
-        opacity: 1;
-    }
-`.modifier('h2', weight === 'h2')`
-    font-size: ${({ fontSize }) => fontSize.h2};
-    line-height: ${({ lineHeight }) => lineHeight.h2};
-`.modifier('h3', weight === 'h3')`
-    font-size: ${({ fontSize }: Theme) => fontSize.h3};
-    line-height: ${({ lineHeight }: Theme) => lineHeight.h3};
-`.modifier('h4', weight === 'h4')`
-    font-size: ${({ fontSize }: Theme) => fontSize.h4};
-    line-height: ${({ lineHeight }: Theme) => lineHeight.h4};
-`.modifier('h5', weight === 'h5')`
-    font-size: ${({ fontSize }: Theme) => fontSize.h5};
-    line-height: ${({ lineHeight }: Theme) => lineHeight.h5};
-`.modifier('h6', weight === 'h6')`
-    font-size: ${({ fontSize }: Theme) => fontSize.h6};
-    line-height: ${({ lineHeight }: Theme) => lineHeight.h6};
-`;
+    '&:hover > a': {
+        opacity: 1,
+    },
+})
+    .modifier('h2', {
+        fontSize: 'var(--fontSize-h2)',
+        lineHeight: 'var(--lineHeight-h2)',
+    })
+    .modifier('h3', {
+        fontSize: 'var(--fontSize-h3)',
+        lineHeight: 'var(--lineHeight-h3)',
+    })
+    .modifier('h4', {
+        fontSize: 'var(--fontSize-h4)',
+        lineHeight: 'var(--lineHeight-h4)',
+    })
+    .modifier('h5', {
+        fontSize: 'var(--fontSize-h5)',
+        lineHeight: 'var(--lineHeight-h5)',
+    })
+    .modifier('h6', {
+        fontSize: 'var(--fontSize-h6)',
+        lineHeight: 'var(--lineHeight-h6)',
+    });
 
 const Heading: FC<HeadingProps> = ({
     children,
@@ -50,6 +52,7 @@ const Heading: FC<HeadingProps> = ({
     as: asElement,
     id,
 }) => {
+    // TODO: we cant render out to a classname here
     const className = useStyles(styles(weight));
 
     function onClick() {
@@ -69,25 +72,27 @@ const Heading: FC<HeadingProps> = ({
             {children}
             {id && (
                 <a
-                    css={css<Theme>`
-                        text-decoration: none;
-                        padding: 0 0.5rem;
-                        color: ${({ color }) => color.link};
-                        opacity: 0;
-                        border-radius: ${({ radius }) => radius.m};
-                        border: ${({ border }) =>
-                            `${border.size[0]} solid transparent`};
-
-                        :focus {
-                            opacity: 1;
-                            outline: none;
-                            border: ${({ border }) =>
-                                `${border.size[0]} solid ${border.color.focus}`};
-                        }
-                    `}
+                    css={css({
+                        textDecoration: 'none',
+                        padding: '0 0.5rem',
+                        color: 'var(--color-link)',
+                        opacity: '0',
+                        borderRadius: 'var(--radius-m)',
+                        border: `var(--border-size-0 solid transparent`,
+                        ':focus': {
+                            opacity: 1,
+                            outline: 'none',
+                            border: `var(--border-size-0 solid --var(--border-color-focus)`,
+                        },
+                    })}
                     href={`#${id}`}
                     onClick={onClick}
                     aria-label="anchor"
+                    $h2={weight === 'h2'}
+                    $h3={weight === 'h3'}
+                    $h4={weight === 'h4'}
+                    $h5={weight === 'h5'}
+                    $h6={weight === 'h6'}
                 >
                     #
                 </a>
diff --git a/packages/elements/heading/package.json b/packages/elements/heading/package.json
index a8bd285..318ca58 100644
--- a/packages/elements/heading/package.json
+++ b/packages/elements/heading/package.json
@@ -7,12 +7,11 @@
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.7"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/elements/list/List.tsx b/packages/elements/list/List.tsx
index b923719..78d103f 100644
--- a/packages/elements/list/List.tsx
+++ b/packages/elements/list/List.tsx
@@ -1,5 +1,4 @@
 import React, { FC, ReactNode } from 'react';
-import { css, useStyles } from '@trousers/core';
 
 export interface ListItemProps {
     children: ReactNode;
@@ -14,19 +13,16 @@ export interface ListProps {
     type?: 'ol' | 'ul';
 }
 
-const List: FC<ListProps> = ({ type = 'ul', children }) => {
-    const classNames = useStyles(css`
-        margin: 0 0 1rem 0;
-        padding: 0 1rem;
-    `);
-
-    return React.createElement(
+const List: FC<ListProps> = ({ type = 'ul', children }) =>
+    React.createElement(
         type,
         {
-            className: classNames,
+            style: {
+                margin: '0 0 1rem 0',
+                padding: '0 1rem',
+            },
         },
         children,
     );
-};
 
 export default List;
diff --git a/packages/elements/list/package.json b/packages/elements/list/package.json
index fd3e1c5..95d1113 100644
--- a/packages/elements/list/package.json
+++ b/packages/elements/list/package.json
@@ -6,12 +6,10 @@
     "module": "dist/index.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
-    },
+    "dependencies": {},
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/elements/text/Text.tsx b/packages/elements/text/Text.tsx
index 8150822..8bb4302 100644
--- a/packages/elements/text/Text.tsx
+++ b/packages/elements/text/Text.tsx
@@ -1,6 +1,4 @@
 import React, { FC, ReactNode } from 'react';
-import { css, useStyles } from '@trousers/core';
-import { Theme } from '@precursor/theme';
 
 export type Modifier =
     | 'i'
@@ -26,11 +24,9 @@ export interface TextProps {
 }
 
 const Text: FC<TextProps> = ({ as: modifier = 'p', children }) => {
-    const className = useStyles(css<Theme>`
-        margin: 0;
-    `);
+    const style = { margin: 0 };
 
-    return React.createElement(modifier, { className }, children);
+    return React.createElement(modifier, { style }, children);
 };
 
 export default Text;
diff --git a/packages/elements/text/package.json b/packages/elements/text/package.json
index 89a49f5..6911372 100644
--- a/packages/elements/text/package.json
+++ b/packages/elements/text/package.json
@@ -7,12 +7,11 @@
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7",
-        "@trousers/collector": "^3.0.2",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.7"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/layout/grid/Column.tsx b/packages/layout/grid/Column.tsx
index 531f94a..71ebb11 100644
--- a/packages/layout/grid/Column.tsx
+++ b/packages/layout/grid/Column.tsx
@@ -1,7 +1,4 @@
-/** @jsx jsx */
-import { FC, ReactNode, CSSProperties } from 'react';
-
-import { jsx } from '@trousers/core';
+import React, { FC, ReactNode, CSSProperties } from 'react';
 
 export interface ColumnProps {
     children: ReactNode;
@@ -13,19 +10,11 @@ export interface ColumnProps {
 const Column: FC<ColumnProps> = ({ span = 1, start, end, children }) => {
     const styles: CSSProperties = {};
 
-    if (start) {
-        styles.gridColumnStart = start;
-    }
-
-    if (end) {
-        styles.gridColumnEnd = end;
-    }
-
-    if (span) {
-        styles.gridColumnEnd = `span ${span}`;
-    }
+    if (start) styles.gridColumnStart = start;
+    if (end) styles.gridColumnEnd = end;
+    if (span) styles.gridColumnEnd = `span ${span}`;
 
-    return <div css={styles}>{children}</div>;
+    return <div style={styles}>{children}</div>;
 };
 
 export default Column;
diff --git a/packages/layout/grid/Grid.tsx b/packages/layout/grid/Grid.tsx
index 83fd5e6..46ef060 100644
--- a/packages/layout/grid/Grid.tsx
+++ b/packages/layout/grid/Grid.tsx
@@ -1,7 +1,6 @@
-/** @jsx jsx */
-import { FC, ReactNode } from 'react';
+import React, { FC, ReactNode } from 'react';
 
-import { css, jsx } from '@trousers/core';
+import { css } from '@trousers/macro';
 import { Theme } from '@precursor/theme';
 
 export interface GridProps {
@@ -28,12 +27,12 @@ const Grid: FC<GridProps> = ({
 
     return (
         <div
-            css={css<Theme>`
-                display: grid;
-                grid-template-columns: repeat(${columns}, 1fr);
-                gap: ${getGap};
-                width: 100%;
-            `}
+            css={css('Grid', {
+                display: 'grid',
+                gridTemplateColumns: `repeat(${columns}, 1fr)`,
+                gap: getGap,
+                width: '100%',
+            })}
         >
             {children}
         </div>
diff --git a/packages/layout/grid/Row.tsx b/packages/layout/grid/Row.tsx
index 4eb2ba1..7c397b4 100644
--- a/packages/layout/grid/Row.tsx
+++ b/packages/layout/grid/Row.tsx
@@ -1,7 +1,6 @@
-/** @jsx jsx */
-import { FC, ReactNode } from 'react';
+import React, { FC, ReactNode } from 'react';
 
-import { css, jsx } from '@trousers/core';
+import { css } from '@trousers/macro';
 
 export interface RowProps {
     children: ReactNode;
@@ -9,12 +8,12 @@ export interface RowProps {
 
 const Row: FC<RowProps> = ({ children }) => (
     <div
-        css={css`
-            display: grid;
-            grid-template-columns: repeat(12, 1fr);
-            gap: 0px;
-            grid-column-end: span 12;
-        `}
+        css={css({
+            display: 'grid',
+            gridTemplateColumns: 'repeat(12, 1fr)',
+            gap: '0px',
+            gridColumnEnd: 'span 12',
+        })}
     >
         {children}
     </div>
diff --git a/packages/layout/grid/package.json b/packages/layout/grid/package.json
index 36f3705..26089f2 100644
--- a/packages/layout/grid/package.json
+++ b/packages/layout/grid/package.json
@@ -7,11 +7,11 @@
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7",
-        "@trousers/core": "^3.0.2"
+        "@precursor/theme": "^0.1.7"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/layout/inline/Inline.tsx b/packages/layout/inline/Inline.tsx
index 25f300d..2e3ff36 100644
--- a/packages/layout/inline/Inline.tsx
+++ b/packages/layout/inline/Inline.tsx
@@ -1,7 +1,6 @@
-/** @jsx jsx */
-import { Children, FC, ReactNode } from 'react';
+import React, { Children, FC, ReactNode } from 'react';
 
-import { css, jsx } from '@trousers/core';
+import { css } from '@trousers/macro';
 import { Theme } from '@precursor/theme';
 
 export interface InlineProps {
@@ -16,21 +15,21 @@ const Inline: FC<InlineProps> = ({
     justify = 'flex-start',
 }) => (
     <span
-        css={css<Theme>`
-            --inline-gap: ${({ space }) => space[gap]};
-            display: flex;
-            flex-direction: row;
-            flex-wrap: wrap;
-            margin-top: calc(var(--inline-gap) * -1);
-            margin-left: calc(var(--inline-gap) * -1);
-            justify-content: ${justify};
-
-            > * {
-                margin-top: var(--inline-gap);
-                margin-left: var(--inline-gap);
-                margin-bottom: 0;
-            }
-        `}
+        css={css('Inline', {
+            display: 'flex',
+            flexDirection: 'row',
+            flexWrap: 'wrap',
+            marginTop: 'calc(var(--inline-gap) * -1)',
+            marginLeft: 'calc(var(--inline-gap) * -1)',
+            justifyContent: justify,
+            '> *': {
+                marginTop: 'var(--inline-gap)',
+                marginLeft: 'var(--inline-gap)',
+                marginBottom: 0,
+            },
+        }).theme({
+            inlineGap: `var(--space-${gap})`,
+        })}
     >
         {Children.map(children, child =>
             child !== null && child !== undefined ? <span>{child}</span> : null,
diff --git a/packages/layout/inline/package.json b/packages/layout/inline/package.json
index a2d12c4..338fdb8 100644
--- a/packages/layout/inline/package.json
+++ b/packages/layout/inline/package.json
@@ -6,11 +6,10 @@
     "module": "dist/index.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {
-        "@trousers/core": "^3.0.2"
-    },
+    "dependencies": {},
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/layout/stack/Stack.tsx b/packages/layout/stack/Stack.tsx
index cde7b57..04658d0 100644
--- a/packages/layout/stack/Stack.tsx
+++ b/packages/layout/stack/Stack.tsx
@@ -1,6 +1,5 @@
-/** @jsx jsx */
-import { FC, ReactNode } from 'react';
-import { css, jsx } from '@trousers/core';
+import React, { FC, ReactNode } from 'react';
+import { css } from '@trousers/macro';
 
 import { Theme } from '@precursor/theme';
 
@@ -11,12 +10,12 @@ export interface StackProps {
 
 const Stack: FC<StackProps> = ({ gap = 'm', children }) => (
     <div
-        css={css<Theme>`
-            display: grid;
-            grid-template-columns: repeat(1, 1fr);
-            gap: ${({ space }) => space[gap]};
-            width: 100%;
-        `}
+        css={css('Stack', {
+            display: 'grid',
+            gridTemplateColumns: 'repeat(1, 1fr)',
+            gap: `var(--space-${gap})`,
+            width: '100%',
+        })}
     >
         {children}
     </div>
diff --git a/packages/layout/stack/package.json b/packages/layout/stack/package.json
index cbf1ddd..f6e3d3d 100644
--- a/packages/layout/stack/package.json
+++ b/packages/layout/stack/package.json
@@ -6,11 +6,10 @@
     "module": "dist/index.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {
-        "@trousers/core": "^3.0.2"
-    },
+    "dependencies": {},
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/theming/theme/Globals.tsx b/packages/theming/theme/Globals.tsx
index d9ddea9..b55b7e1 100644
--- a/packages/theming/theme/Globals.tsx
+++ b/packages/theming/theme/Globals.tsx
@@ -1,35 +1,27 @@
-import { FC } from 'react';
-import { css, useGlobals } from '@trousers/core';
+import React, { FC } from 'react';
+import { css } from '@trousers/macro';
 
-import { Theme } from './theme';
+// import { Theme } from './theme';
 
-const reset = css`
-    * {
-        box-sizing: border-box;
-    }
-`;
-
-const typography = css<Theme>`
-    html,
-    body {
-        margin: 0px;
-        padding: 0px;
-    }
-
-    body {
-        font-family: ${({ font }) => font.base};
-        font-size: ${({ fontSize }) => fontSize.base};
-        line-height: ${({ lineHeight }) => lineHeight.base};
-        color: ${({ color }) => color.typography.base};
-        background-color: ${({ color }) => color.background.base};
-    }
-`;
+const reset = css({}).global({
+    '*': {
+        boxSizing: 'border-box',
+    },
+    'html, body': {
+        margin: '0px',
+        padding: '0px',
+    },
+    body: {
+        fontFamily: 'var(--font-base}',
+        fontSize: 'var(--fontSize-base}',
+        lineHeight: 'var(--lineHeight-base}',
+        color: 'var(--color-typography-base}',
+        backgroundColor: 'var(--color-background-base}',
+    },
+});
 
 const Globals: FC = () => {
-    useGlobals<Theme>(reset);
-    useGlobals<Theme>(typography);
-
-    return null;
+    return <span css={reset} />; // TODO: this isn't great
 };
 
 export default Globals;
diff --git a/packages/theming/theme/ThemeProvider.tsx b/packages/theming/theme/ThemeProvider.tsx
index fcf24f6..57a0aeb 100644
--- a/packages/theming/theme/ThemeProvider.tsx
+++ b/packages/theming/theme/ThemeProvider.tsx
@@ -1,5 +1,5 @@
 import React, { FC, ReactNode } from 'react';
-import { ThemeProvider as CoreThemeProvider } from '@trousers/theme';
+import { css } from '@trousers/macro';
 
 import defaultTheme, { Theme } from './theme';
 import Globals from './Globals';
@@ -10,10 +10,10 @@ export interface Props {
 }
 
 const ThemeProvider: FC<Props> = ({ theme = defaultTheme, children }) => (
-    <CoreThemeProvider theme={theme}>
+    <span css={css('Theme', {}).theme(theme)}>
         <Globals />
         {children}
-    </CoreThemeProvider>
+    </span>
 );
 
 export default ThemeProvider;
diff --git a/packages/theming/theme/package.json b/packages/theming/theme/package.json
index 85d674b..5e1ed18 100644
--- a/packages/theming/theme/package.json
+++ b/packages/theming/theme/package.json
@@ -7,12 +7,11 @@
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/tokens": "^0.1.1",
-        "@trousers/core": "^3.0.2",
-        "@trousers/theme": "^3.0.0"
+        "@precursor/tokens": "^0.1.1"
     },
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^16.8.1",
+        "@trousers/macro": "4.0.0-alpha5"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/yarn.lock b/yarn.lock
index e989b2c..0de19d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -917,6 +917,13 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
+  integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.10.1", "@babel/template@^7.3.3":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811"
@@ -2060,50 +2067,43 @@
   dependencies:
     "@trousers/utils" "3.0.2"
 
-"@trousers/core@^3.0.2":
-  version "3.0.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@trousers/core/-/core-3.0.2.tgz#cd8e8fa64cb000426dc3692ab94a926989b318d6"
-  integrity sha1-zY6PpkywAEJtw2kquUqSaYmzGNY=
-  dependencies:
-    "@trousers/hash" "3.0.0"
-    "@trousers/parser" "3.0.1"
-    "@trousers/registry" "3.0.2"
-    "@trousers/server" "3.0.2"
-    "@trousers/theme" "3.0.0"
-    "@trousers/utils" "3.0.2"
-
-"@trousers/hash@3.0.0":
-  version "3.0.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@trousers/hash/-/hash-3.0.0.tgz#f8be5eda1d65f70696098e1fb374368bc274c1ef"
-  integrity sha1-+L5e2h1l9waWCY4fs3Q2i8J0we8=
+"@trousers/core@4.0.0-alpha5":
+  version "4.0.0-alpha5"
+  resolved "https://registry.yarnpkg.com/@trousers/core/-/core-4.0.0-alpha5.tgz#e01f821c2c98f4f34d787c9e33b2376d82f8e2be"
+  integrity sha512-h56oUdhvXmoqBcwA6fA6ZrvniFnL3P4O+423qS+k+McfYi9AjslhxtKX/6XV4Wiinu7XBHBKV8E8V+JOWW+Mog==
+  dependencies:
+    "@trousers/hash" "4.0.0-alpha5"
+    csstype "^2.5.7"
+    tiny-css-prefixer "^1.1.4"
 
-"@trousers/parser@3.0.1":
-  version "3.0.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@trousers/parser/-/parser-3.0.1.tgz#c6a7d8172cde0f69b3e1a2350696713418afa4bf"
-  integrity sha1-xqfYFyzeD2mz4aI1BpZxNBivpL8=
+"@trousers/hash@4.0.0-alpha5":
+  version "4.0.0-alpha5"
+  resolved "https://registry.yarnpkg.com/@trousers/hash/-/hash-4.0.0-alpha5.tgz#7df745ece4eaab31b07b404232a2c71346e12cc3"
+  integrity sha512-V0BzOVVUxbH0JPOUIZg81ndrnMpffIax/VUmu07SFUWdeY8k/GMt65zTessnkTDiQiqm0MIgFrJEkDsCmq2gIA==
 
-"@trousers/registry@3.0.2":
-  version "3.0.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@trousers/registry/-/registry-3.0.2.tgz#7ccc68f004fdf0bdfa09f0d5ea679de5e9c71ee7"
-  integrity sha1-fMxo8AT98L36CfDV6med5enHHuc=
+"@trousers/macro@4.0.0-alpha5":
+  version "4.0.0-alpha5"
+  resolved "https://registry.yarnpkg.com/@trousers/macro/-/macro-4.0.0-alpha5.tgz#1b0bb9a0722df320ad9c8683d0d25d68859a9e60"
+  integrity sha512-omEH/u9irNMmbBG+Z9DGg7ozDrRJAGn3v3nScvxDiTHwMWGDqjwabxmwhvAWocbPi9VjxHGCuM3O46xG9RrO7w==
   dependencies:
-    "@trousers/parser" "3.0.1"
-    stylis "^3.5.4"
+    "@trousers/core" "4.0.0-alpha5"
+    "@trousers/hash" "4.0.0-alpha5"
+    "@trousers/react" "4.0.0-alpha5"
+    "@trousers/sheet" "4.0.0-alpha5"
+    babel-plugin-macros "^3.0.0"
 
-"@trousers/server@3.0.2":
-  version "3.0.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@trousers/server/-/server-3.0.2.tgz#0c515e32f5eeea86880663a5903e70e14f5534fd"
-  integrity sha1-DFFeMvXu6oaIBmOlkD5w4U9VNP0=
+"@trousers/react@4.0.0-alpha5":
+  version "4.0.0-alpha5"
+  resolved "https://registry.yarnpkg.com/@trousers/react/-/react-4.0.0-alpha5.tgz#3e1598e0a7ce7f31e3103c20c96a4a97a6954d1b"
+  integrity sha512-Oe3eCU0KXMlWemstINASYEBBZ+P9xwGs+htrbCsriW/cCc2RvptHJAttvpd/VR7qFmymPcZpBlHUp0HduBCUWg==
   dependencies:
-    "@trousers/registry" "3.0.2"
-    "@trousers/utils" "3.0.2"
+    "@trousers/core" "4.0.0-alpha5"
+    "@trousers/sheet" "4.0.0-alpha5"
 
-"@trousers/theme@3.0.0", "@trousers/theme@^3.0.0":
-  version "3.0.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@trousers/theme/-/theme-3.0.0.tgz#4232ab9211b068e3c549e2f5996b8ff5a1ba258d"
-  integrity sha1-QjKrkhGwaOPFSeL1mWuP9aG6JY0=
-  dependencies:
-    "@trousers/hash" "3.0.0"
+"@trousers/sheet@4.0.0-alpha5":
+  version "4.0.0-alpha5"
+  resolved "https://registry.yarnpkg.com/@trousers/sheet/-/sheet-4.0.0-alpha5.tgz#8f3931ac0c6ac04fa552135cebbf3b47a8e6caff"
+  integrity sha512-QDXu35nmadZc75sK7UFKomT68cTXF9PERuPqDw4snrM4vlFdRnUgxqD60YP0ty5PE9gNnsUuFtj6LnQZlN57PQ==
 
 "@trousers/utils@3.0.2":
   version "3.0.2"
@@ -3206,6 +3206,15 @@ babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.7.0:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
+babel-plugin-macros@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.0.1.tgz#0d412d68f5b3d1b64358f24ab099bd148724e2a9"
+  integrity sha512-CKt4+Oy9k2wiN+hT1uZzOw7d8zb1anbQpf7KLwaaXRCi/4pzKdFKHf7v5mvoPmjkmxshh7eKZQuRop06r5WP4w==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    cosmiconfig "^7.0.0"
+    resolve "^1.19.0"
+
 babel-plugin-minify-builtins@^0.5.0:
   version "0.5.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.5.0.tgz#31eb82ed1a0d0efdc31312f93b6e4741ce82c36b"
@@ -4342,6 +4351,17 @@ cosmiconfig@^6.0.0:
     path-type "^4.0.0"
     yaml "^1.7.2"
 
+cosmiconfig@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
+  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
+
 "crc32@>= 0.2.2":
   version "0.2.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/crc32/-/crc32-0.2.2.tgz#7ad220d6ffdcd119f9fc127a7772cacea390a4ba"
@@ -6663,6 +6683,14 @@ import-fresh@^3.0.0, import-fresh@^3.1.0:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
 import-from@^2.1.0:
   version "2.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
@@ -6878,6 +6906,13 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
+is-core-module@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -10354,6 +10389,14 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+  dependencies:
+    is-core-module "^2.1.0"
+    path-parse "^1.0.6"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -11252,11 +11295,6 @@ styled-components@^5.1.0:
     shallowequal "^1.1.0"
     supports-color "^5.5.0"
 
-stylis@^3.5.4:
-  version "3.5.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe"
-  integrity sha1-9mXyX14pnPPWRlSrlJpXx2i3P74=
-
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -11460,6 +11498,11 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
+tiny-css-prefixer@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/tiny-css-prefixer/-/tiny-css-prefixer-1.1.4.tgz#b96a0aa6b312227d996e9c303645e3ae2f194086"
+  integrity sha512-QLnDGLUmMkNlSuWogBaSu92uQnvWhcQwUc+MG8L4YgBkjSmBkAz29pTq+8Rh3YWR1TwPrjuZDKWzO7v4PXkipQ==
+
 tiny-emitter@^2.0.0:
   version "2.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
@@ -12292,7 +12335,7 @@ yallist@^4.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI=
 
-yaml@^1.7.2:
+yaml@^1.10.0, yaml@^1.7.2:
   version "1.10.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
   integrity sha1-O1k63ZRIdgd9TWg/7gEIG9n/8x4=

From cbe79cc6f3e6064870cddefc5706ecc3a96a033c Mon Sep 17 00:00:00 2001
From: Daniel Del Core <daniel.delcore.92@gmail.com>
Date: Sat, 6 Mar 2021 19:25:02 +1100
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=92=A9=20Trying=20to=20get=20the=20ma?=
 =?UTF-8?q?cro=20to=20work!!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .storybook/.babelrc                           |    8 +
 .storybook/addons.js                          |    0
 .storybook/config.js                          |    6 -
 .storybook/main.js                            |    4 +
 .storybook/preview.js                         |    3 +
 .storybook/webpack.config.js                  |   17 -
 babel.config.js                               |   11 +
 examples/0_Palette.tsx                        |   63 +-
 fixtures/Box.tsx                              |   25 +-
 fixtures/Container.tsx                        |    6 +-
 fixtures/index.ts                             |    4 +-
 package.json                                  |   51 +-
 .../common/copy-to-clipboard/package.json     |    4 +-
 .../{ => src}/copy-to-clipboard.ts            |    0
 .../copy-to-clipboard/{ => src}/index.ts      |    0
 .../common/copy-to-clipboard/tsconfig.json    |   10 -
 packages/common/types/index.ts                |    1 -
 packages/common/types/package.json            |    4 +-
 packages/common/types/src/index.ts            |    1 +
 .../common/types/{ => src}/input-types.ts     |    0
 packages/common/types/tsconfig.json           |   10 -
 packages/components/avatar/index.ts           |    1 -
 packages/components/avatar/package.json       |   10 +-
 .../avatar/{ => src}/Avatar.spec.tsx          |    0
 .../components/avatar/{ => src}/Avatar.tsx    |    3 +
 packages/components/avatar/src/index.ts       |    3 +
 packages/components/avatar/tsconfig.json      |   10 -
 packages/components/badge/index.ts            |    1 -
 packages/components/badge/package.json        |   11 +-
 packages/components/badge/{ => src}/Badge.tsx |    3 +
 packages/components/badge/src/index.ts        |    3 +
 packages/components/badge/tsconfig.json       |   10 -
 packages/components/button/index.ts           |    1 -
 packages/components/button/package.json       |   10 +-
 .../components/button/{ => src}/Button.tsx    |    7 +-
 packages/components/button/src/index.ts       |    3 +
 packages/components/button/tsconfig.json      |   10 -
 packages/components/checkbox/index.ts         |    1 -
 packages/components/checkbox/package.json     |   10 +-
 .../checkbox/{ => src}/Checkbox.tsx           |    2 +
 packages/components/checkbox/src/index.ts     |    3 +
 packages/components/checkbox/tsconfig.json    |   14 -
 packages/components/code/index.ts             |    1 -
 packages/components/code/package.json         |   10 +-
 packages/components/code/{ => src}/Code.tsx   |    3 +
 packages/components/code/src/index.ts         |    3 +
 packages/components/code/tsconfig.json        |   10 -
 packages/components/image/index.ts            |    1 -
 packages/components/image/package.json        |    6 +-
 packages/components/image/{ => src}/Image.tsx |    0
 packages/components/image/src/index.ts        |    3 +
 packages/components/image/tsconfig.json       |   10 -
 packages/components/input/index.ts            |    1 -
 packages/components/input/package.json        |   10 +-
 packages/components/input/{ => src}/Input.tsx |    3 +
 packages/components/input/src/index.ts        |    3 +
 packages/components/input/tsconfig.json       |   10 -
 packages/components/keyboard/index.ts         |    1 -
 packages/components/keyboard/package.json     |   10 +-
 .../keyboard/{ => src}/Keyboard.tsx           |    6 +-
 packages/components/keyboard/src/index.ts     |    3 +
 packages/components/keyboard/tsconfig.json    |   10 -
 packages/components/label/index.ts            |    1 -
 packages/components/label/package.json        |   11 +-
 packages/components/label/{ => src}/Label.tsx |    3 +
 packages/components/label/src/index.ts        |    3 +
 packages/components/label/tsconfig.json       |   10 -
 packages/components/lozenge/index.ts          |    1 -
 packages/components/lozenge/package.json      |   11 +-
 .../components/lozenge/{ => src}/Lozenge.tsx  |    3 +
 packages/components/lozenge/src/index.ts      |    3 +
 packages/components/lozenge/tsconfig.json     |   10 -
 packages/components/message/index.ts          |    1 -
 packages/components/message/package.json      |   10 +-
 .../components/message/{ => src}/Message.tsx  |    2 +
 packages/components/message/src/index.ts      |    3 +
 packages/components/message/tsconfig.json     |   17 -
 packages/components/modal/index.ts            |    4 -
 packages/components/modal/package.json        |   11 +-
 packages/components/modal/{ => src}/Modal.tsx |    2 +
 .../components/modal/{ => src}/ModalBody.tsx  |    2 +
 .../modal/{ => src}/ModalFooter.tsx           |    2 +
 .../modal/{ => src}/ModalHeader.tsx           |    2 +
 packages/components/modal/src/index.ts        |   12 +
 packages/components/modal/tsconfig.json       |   20 -
 packages/components/overlay/index.ts          |    1 -
 packages/components/overlay/package.json      |   11 +-
 .../components/overlay/{ => src}/Overlay.tsx  |    9 +-
 packages/components/overlay/src/index.ts      |    3 +
 packages/components/overlay/tsconfig.json     |   10 -
 packages/components/panel/index.ts            |    1 -
 packages/components/panel/package.json        |   11 +-
 packages/components/panel/{ => src}/Panel.tsx |    2 +
 packages/components/panel/src/index.ts        |    3 +
 packages/components/panel/tsconfig.json       |   10 -
 packages/components/radio/index.ts            |    1 -
 packages/components/radio/package.json        |   10 +-
 packages/components/radio/{ => src}/Radio.tsx |   11 +-
 packages/components/radio/src/index.ts        |    3 +
 packages/components/radio/tsconfig.json       |   14 -
 packages/components/range/index.ts            |    1 -
 packages/components/range/package.json        |   10 +-
 packages/components/range/{ => src}/Range.tsx |    2 +
 .../components/range/{ => src}/Slider.tsx     |    2 +
 packages/components/range/{ => src}/Track.tsx |    2 +
 packages/components/range/src/index.ts        |    3 +
 packages/components/range/tsconfig.json       |   10 -
 packages/components/select/index.ts           |    1 -
 packages/components/select/package.json       |    8 +-
 .../components/select/{ => src}/Select.tsx    |   10 +-
 packages/components/select/src/index.ts       |    3 +
 packages/components/select/tsconfig.json      |   10 -
 packages/components/skeleton/index.ts         |    1 -
 packages/components/skeleton/package.json     |   10 +-
 .../skeleton/{ => src}/Skeleton.tsx           |    3 +
 packages/components/skeleton/src/index.ts     |    3 +
 packages/components/skeleton/tsconfig.json    |   10 -
 packages/components/spinner/index.ts          |    1 -
 packages/components/spinner/package.json      |   11 +-
 .../components/spinner/{ => src}/Spinner.tsx  |    3 +
 packages/components/spinner/src/index.ts      |    3 +
 packages/components/spinner/tsconfig.json     |   10 -
 packages/components/tabs/index.ts             |    4 -
 packages/components/tabs/package.json         |   11 +-
 packages/components/tabs/{ => src}/Tab.tsx    |    2 +
 .../components/tabs/{ => src}/TabList.tsx     |    2 +
 .../components/tabs/{ => src}/TabPanel.tsx    |    4 +-
 packages/components/tabs/{ => src}/Tabs.tsx   |    0
 .../components/tabs/{ => src}/TabsContext.ts  |    0
 packages/components/tabs/src/index.ts         |   12 +
 packages/components/tabs/tsconfig.json        |   10 -
 packages/components/textarea/index.ts         |    1 -
 packages/components/textarea/package.json     |   11 +-
 .../textarea/{ => src}/TextArea.tsx           |    3 +
 packages/components/textarea/src/index.ts     |    3 +
 packages/components/textarea/tsconfig.json    |   10 -
 packages/components/toggle/index.ts           |    1 -
 packages/components/toggle/package.json       |   10 +-
 .../components/toggle/{ => src}/Toggle.tsx    |   12 +-
 packages/components/toggle/src/index.ts       |    3 +
 packages/components/toggle/tsconfig.json      |   14 -
 packages/elements/blockquote/index.ts         |    1 -
 packages/elements/blockquote/package.json     |   10 +-
 .../blockquote/{ => src}/Blockquote.tsx       |    2 +
 packages/elements/blockquote/src/index.ts     |    3 +
 packages/elements/blockquote/tsconfig.json    |   10 -
 packages/elements/emoji/index.ts              |    1 -
 packages/elements/emoji/package.json          |    6 +-
 packages/elements/emoji/{ => src}/Emoji.tsx   |    0
 packages/elements/emoji/src/index.ts          |    3 +
 packages/elements/emoji/tsconfig.json         |   10 -
 packages/elements/heading/Heading.tsx         |  104 -
 packages/elements/heading/index.ts            |    1 -
 packages/elements/heading/package.json        |   10 +-
 packages/elements/heading/src/Heading.tsx     |  108 +
 packages/elements/heading/src/index.ts        |    3 +
 packages/elements/heading/tsconfig.json       |   13 -
 packages/elements/list/index.ts               |    1 -
 packages/elements/list/package.json           |   11 +-
 packages/elements/list/{ => src}/List.tsx     |    0
 packages/elements/list/src/index.ts           |    3 +
 packages/elements/list/tsconfig.json          |   10 -
 packages/elements/text/index.ts               |    1 -
 packages/elements/text/package.json           |   10 +-
 packages/elements/text/{ => src}/Text.tsx     |    7 +-
 packages/elements/text/src/index.ts           |    3 +
 packages/elements/text/tsconfig.json          |   13 -
 packages/layout/grid/index.ts                 |    3 -
 packages/layout/grid/package.json             |   10 +-
 packages/layout/grid/{ => src}/Column.tsx     |    0
 packages/layout/grid/{ => src}/Grid.tsx       |   13 +-
 packages/layout/grid/{ => src}/Row.tsx        |    2 +
 packages/layout/grid/src/index.ts             |    9 +
 packages/layout/grid/tsconfig.json            |   10 -
 packages/layout/inline/index.ts               |    1 -
 packages/layout/inline/package.json           |   11 +-
 packages/layout/inline/{ => src}/Inline.tsx   |    2 +
 packages/layout/inline/src/index.ts           |    3 +
 packages/layout/inline/tsconfig.json          |   10 -
 packages/layout/stack/index.ts                |    1 -
 packages/layout/stack/package.json            |   11 +-
 packages/layout/stack/{ => src}/Stack.tsx     |    2 +
 packages/layout/stack/src/index.ts            |    3 +
 packages/layout/stack/tsconfig.json           |   10 -
 packages/theming/theme/ThemeProvider.tsx      |   19 -
 packages/theming/theme/index.ts               |    3 -
 packages/theming/theme/package.json           |   10 +-
 packages/theming/theme/{ => src}/Globals.tsx  |    2 +
 packages/theming/theme/src/ThemeProvider.tsx  |   21 +
 packages/theming/theme/src/index.ts           |    5 +
 packages/theming/theme/{ => src}/theme.ts     |    0
 packages/theming/theme/tsconfig.json          |   10 -
 packages/theming/tokens/package.json          |    4 +-
 packages/theming/tokens/{ => src}/index.ts    |    0
 packages/theming/tokens/{ => src}/tokens.ts   |    0
 packages/theming/tokens/tsconfig.json         |   10 -
 tsconfig.json                                 |   60 +-
 yarn.lock                                     | 4671 ++++++++++-------
 198 files changed, 3491 insertions(+), 2691 deletions(-)
 create mode 100644 .storybook/.babelrc
 delete mode 100644 .storybook/addons.js
 delete mode 100644 .storybook/config.js
 create mode 100644 .storybook/main.js
 create mode 100644 .storybook/preview.js
 delete mode 100644 .storybook/webpack.config.js
 create mode 100644 babel.config.js
 rename packages/common/copy-to-clipboard/{ => src}/copy-to-clipboard.ts (100%)
 rename packages/common/copy-to-clipboard/{ => src}/index.ts (100%)
 delete mode 100644 packages/common/copy-to-clipboard/tsconfig.json
 delete mode 100644 packages/common/types/index.ts
 create mode 100644 packages/common/types/src/index.ts
 rename packages/common/types/{ => src}/input-types.ts (100%)
 delete mode 100644 packages/common/types/tsconfig.json
 delete mode 100644 packages/components/avatar/index.ts
 rename packages/components/avatar/{ => src}/Avatar.spec.tsx (100%)
 rename packages/components/avatar/{ => src}/Avatar.tsx (94%)
 create mode 100644 packages/components/avatar/src/index.ts
 delete mode 100644 packages/components/avatar/tsconfig.json
 delete mode 100644 packages/components/badge/index.ts
 rename packages/components/badge/{ => src}/Badge.tsx (95%)
 create mode 100644 packages/components/badge/src/index.ts
 delete mode 100644 packages/components/badge/tsconfig.json
 delete mode 100644 packages/components/button/index.ts
 rename packages/components/button/{ => src}/Button.tsx (94%)
 create mode 100644 packages/components/button/src/index.ts
 delete mode 100644 packages/components/button/tsconfig.json
 delete mode 100644 packages/components/checkbox/index.ts
 rename packages/components/checkbox/{ => src}/Checkbox.tsx (95%)
 create mode 100644 packages/components/checkbox/src/index.ts
 delete mode 100644 packages/components/checkbox/tsconfig.json
 delete mode 100644 packages/components/code/index.ts
 rename packages/components/code/{ => src}/Code.tsx (95%)
 create mode 100644 packages/components/code/src/index.ts
 delete mode 100644 packages/components/code/tsconfig.json
 delete mode 100644 packages/components/image/index.ts
 rename packages/components/image/{ => src}/Image.tsx (100%)
 create mode 100644 packages/components/image/src/index.ts
 delete mode 100644 packages/components/image/tsconfig.json
 delete mode 100644 packages/components/input/index.ts
 rename packages/components/input/{ => src}/Input.tsx (97%)
 create mode 100644 packages/components/input/src/index.ts
 delete mode 100644 packages/components/input/tsconfig.json
 delete mode 100644 packages/components/keyboard/index.ts
 rename packages/components/keyboard/{ => src}/Keyboard.tsx (91%)
 create mode 100644 packages/components/keyboard/src/index.ts
 delete mode 100644 packages/components/keyboard/tsconfig.json
 delete mode 100644 packages/components/label/index.ts
 rename packages/components/label/{ => src}/Label.tsx (92%)
 create mode 100644 packages/components/label/src/index.ts
 delete mode 100644 packages/components/label/tsconfig.json
 delete mode 100644 packages/components/lozenge/index.ts
 rename packages/components/lozenge/{ => src}/Lozenge.tsx (95%)
 create mode 100644 packages/components/lozenge/src/index.ts
 delete mode 100644 packages/components/lozenge/tsconfig.json
 delete mode 100644 packages/components/message/index.ts
 rename packages/components/message/{ => src}/Message.tsx (96%)
 create mode 100644 packages/components/message/src/index.ts
 delete mode 100644 packages/components/message/tsconfig.json
 delete mode 100644 packages/components/modal/index.ts
 rename packages/components/modal/{ => src}/Modal.tsx (97%)
 rename packages/components/modal/{ => src}/ModalBody.tsx (91%)
 rename packages/components/modal/{ => src}/ModalFooter.tsx (93%)
 rename packages/components/modal/{ => src}/ModalHeader.tsx (93%)
 create mode 100644 packages/components/modal/src/index.ts
 delete mode 100644 packages/components/modal/tsconfig.json
 delete mode 100644 packages/components/overlay/index.ts
 rename packages/components/overlay/{ => src}/Overlay.tsx (82%)
 create mode 100644 packages/components/overlay/src/index.ts
 delete mode 100644 packages/components/overlay/tsconfig.json
 delete mode 100644 packages/components/panel/index.ts
 rename packages/components/panel/{ => src}/Panel.tsx (94%)
 create mode 100644 packages/components/panel/src/index.ts
 delete mode 100644 packages/components/panel/tsconfig.json
 delete mode 100644 packages/components/radio/index.ts
 rename packages/components/radio/{ => src}/Radio.tsx (92%)
 create mode 100644 packages/components/radio/src/index.ts
 delete mode 100644 packages/components/radio/tsconfig.json
 delete mode 100644 packages/components/range/index.ts
 rename packages/components/range/{ => src}/Range.tsx (99%)
 rename packages/components/range/{ => src}/Slider.tsx (98%)
 rename packages/components/range/{ => src}/Track.tsx (96%)
 create mode 100644 packages/components/range/src/index.ts
 delete mode 100644 packages/components/range/tsconfig.json
 delete mode 100644 packages/components/select/index.ts
 rename packages/components/select/{ => src}/Select.tsx (92%)
 create mode 100644 packages/components/select/src/index.ts
 delete mode 100644 packages/components/select/tsconfig.json
 delete mode 100644 packages/components/skeleton/index.ts
 rename packages/components/skeleton/{ => src}/Skeleton.tsx (96%)
 create mode 100644 packages/components/skeleton/src/index.ts
 delete mode 100644 packages/components/skeleton/tsconfig.json
 delete mode 100644 packages/components/spinner/index.ts
 rename packages/components/spinner/{ => src}/Spinner.tsx (96%)
 create mode 100644 packages/components/spinner/src/index.ts
 delete mode 100644 packages/components/spinner/tsconfig.json
 delete mode 100644 packages/components/tabs/index.ts
 rename packages/components/tabs/{ => src}/Tab.tsx (96%)
 rename packages/components/tabs/{ => src}/TabList.tsx (97%)
 rename packages/components/tabs/{ => src}/TabPanel.tsx (82%)
 rename packages/components/tabs/{ => src}/Tabs.tsx (100%)
 rename packages/components/tabs/{ => src}/TabsContext.ts (100%)
 create mode 100644 packages/components/tabs/src/index.ts
 delete mode 100644 packages/components/tabs/tsconfig.json
 delete mode 100644 packages/components/textarea/index.ts
 rename packages/components/textarea/{ => src}/TextArea.tsx (97%)
 create mode 100644 packages/components/textarea/src/index.ts
 delete mode 100644 packages/components/textarea/tsconfig.json
 delete mode 100644 packages/components/toggle/index.ts
 rename packages/components/toggle/{ => src}/Toggle.tsx (92%)
 create mode 100644 packages/components/toggle/src/index.ts
 delete mode 100644 packages/components/toggle/tsconfig.json
 delete mode 100644 packages/elements/blockquote/index.ts
 rename packages/elements/blockquote/{ => src}/Blockquote.tsx (94%)
 create mode 100644 packages/elements/blockquote/src/index.ts
 delete mode 100644 packages/elements/blockquote/tsconfig.json
 delete mode 100644 packages/elements/emoji/index.ts
 rename packages/elements/emoji/{ => src}/Emoji.tsx (100%)
 create mode 100644 packages/elements/emoji/src/index.ts
 delete mode 100644 packages/elements/emoji/tsconfig.json
 delete mode 100644 packages/elements/heading/Heading.tsx
 delete mode 100644 packages/elements/heading/index.ts
 create mode 100644 packages/elements/heading/src/Heading.tsx
 create mode 100644 packages/elements/heading/src/index.ts
 delete mode 100644 packages/elements/heading/tsconfig.json
 delete mode 100644 packages/elements/list/index.ts
 rename packages/elements/list/{ => src}/List.tsx (100%)
 create mode 100644 packages/elements/list/src/index.ts
 delete mode 100644 packages/elements/list/tsconfig.json
 delete mode 100644 packages/elements/text/index.ts
 rename packages/elements/text/{ => src}/Text.tsx (80%)
 create mode 100644 packages/elements/text/src/index.ts
 delete mode 100644 packages/elements/text/tsconfig.json
 delete mode 100644 packages/layout/grid/index.ts
 rename packages/layout/grid/{ => src}/Column.tsx (100%)
 rename packages/layout/grid/{ => src}/Grid.tsx (73%)
 rename packages/layout/grid/{ => src}/Row.tsx (92%)
 create mode 100644 packages/layout/grid/src/index.ts
 delete mode 100644 packages/layout/grid/tsconfig.json
 delete mode 100644 packages/layout/inline/index.ts
 rename packages/layout/inline/{ => src}/Inline.tsx (96%)
 create mode 100644 packages/layout/inline/src/index.ts
 delete mode 100644 packages/layout/inline/tsconfig.json
 delete mode 100644 packages/layout/stack/index.ts
 rename packages/layout/stack/{ => src}/Stack.tsx (93%)
 create mode 100644 packages/layout/stack/src/index.ts
 delete mode 100644 packages/layout/stack/tsconfig.json
 delete mode 100644 packages/theming/theme/ThemeProvider.tsx
 delete mode 100644 packages/theming/theme/index.ts
 rename packages/theming/theme/{ => src}/Globals.tsx (95%)
 create mode 100644 packages/theming/theme/src/ThemeProvider.tsx
 create mode 100644 packages/theming/theme/src/index.ts
 rename packages/theming/theme/{ => src}/theme.ts (100%)
 delete mode 100644 packages/theming/theme/tsconfig.json
 rename packages/theming/tokens/{ => src}/index.ts (100%)
 rename packages/theming/tokens/{ => src}/tokens.ts (100%)
 delete mode 100644 packages/theming/tokens/tsconfig.json

diff --git a/.storybook/.babelrc b/.storybook/.babelrc
new file mode 100644
index 0000000..1e9dcd2
--- /dev/null
+++ b/.storybook/.babelrc
@@ -0,0 +1,8 @@
+{
+    "presets": [
+        "@babel/preset-env",
+        "@babel/preset-react",
+        "@babel/preset-typescript"
+    ],
+    "plugins": ["babel-plugin-macros"]
+}
diff --git a/.storybook/addons.js b/.storybook/addons.js
deleted file mode 100644
index e69de29..0000000
diff --git a/.storybook/config.js b/.storybook/config.js
deleted file mode 100644
index b7a148a..0000000
--- a/.storybook/config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { configure } from '@storybook/react';
-
-configure(
-    require.context('../examples', true, /\.(js|jsx|ts|tsx|md|mdx)$/),
-    module,
-);
diff --git a/.storybook/main.js b/.storybook/main.js
new file mode 100644
index 0000000..ece7635
--- /dev/null
+++ b/.storybook/main.js
@@ -0,0 +1,4 @@
+module.exports = {
+    stories: ['../examples/**/*.@(js|jsx|ts|tsx|mdx)'],
+    addons: ['storybook-addon-performance'],
+};
diff --git a/.storybook/preview.js b/.storybook/preview.js
new file mode 100644
index 0000000..6a4dabd
--- /dev/null
+++ b/.storybook/preview.js
@@ -0,0 +1,3 @@
+export const parameters = {
+    actions: { argTypesRegex: '^on[A-Z].*' },
+};
diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
deleted file mode 100644
index b59c7cd..0000000
--- a/.storybook/webpack.config.js
+++ /dev/null
@@ -1,17 +0,0 @@
-module.exports = ({ config }) => {
-    config.module.rules.push({
-        test: /\.(ts|tsx)$/,
-        use: [
-            {
-                loader: require.resolve('ts-loader'),
-                options: {
-                    transpileOnly: true,
-                },
-            },
-        ],
-    });
-
-    config.resolve.extensions.push('.ts', '.tsx');
-
-    return config;
-};
diff --git a/babel.config.js b/babel.config.js
new file mode 100644
index 0000000..3d53069
--- /dev/null
+++ b/babel.config.js
@@ -0,0 +1,11 @@
+module.exports = api => {
+    api.cache(true);
+    return {
+        plugins: ['macros'],
+        presets: [
+            '@babel/preset-env',
+            '@babel/preset-react',
+            '@babel/preset-typescript',
+        ],
+    };
+};
diff --git a/examples/0_Palette.tsx b/examples/0_Palette.tsx
index 645054e..ebd8080 100644
--- a/examples/0_Palette.tsx
+++ b/examples/0_Palette.tsx
@@ -1,8 +1,6 @@
 /* eslint-disable jsx-a11y/accessible-emoji */
-/** @jsx jsx */
 import { storiesOf } from '@storybook/react';
-import { useState } from 'react';
-import { jsx } from '@trousers/core';
+import React, { useState } from 'react';
 import Avatar from '@precursor/avatar';
 import Blockquote from '@precursor/blockquote';
 import Text from '@precursor/text';
@@ -29,23 +27,29 @@ import Spinner from '@precursor/spinner';
 import Skeleton from '@precursor/skeleton';
 import Grid, { Column, Row } from '@precursor/grid';
 import Inline from '@precursor/inline';
-import Toggle from '@precursor/Toggle';
+import Toggle from '@precursor/toggle';
 import { Tabs, Tab, TabList, TabPanel } from '@precursor/tabs';
 import List, { ListItem } from '@precursor/list';
-import { theme as baseTheme, Theme, ThemeProvider } from '@precursor/theme';
-import deepObject from 'object-deep-key';
-import { Box, Container, ThemeEditor, themeSchema } from '../fixtures';
+// import { theme as baseTheme, Theme, ThemeProvider } from '@precursor/theme';
+// import deepObject from 'object-deep-key';
+import {
+    Box,
+    Container,
+    // ThemeEditor,
+    //themeSchema
+} from '../fixtures';
 
 const BasicExample = () => {
-    const [theme, setTheme] = useState<Theme>(baseTheme);
+    // const [theme, setTheme] = useState<Theme>(baseTheme);
     const [isModalOpen, setIsModalOpen] = useState(false);
 
     const closeModal = () => setIsModalOpen(false);
     const openModal = () => setIsModalOpen(true);
 
     return (
-        <ThemeProvider theme={theme}>
-            <aside
+        <React.Fragment>
+            {/* <ThemeProvider theme={theme}> */}
+            {/* <aside
                 style={{
                     width: '320px',
                     height: '100%',
@@ -70,7 +74,7 @@ const BasicExample = () => {
                         }}
                     />
                 </Stack>
-            </aside>
+            </aside> */}
             <div
                 style={{
                     display: 'block',
@@ -83,30 +87,12 @@ const BasicExample = () => {
                         <Heading id="typography">Typography</Heading>
                         <Panel>
                             <Stack>
-                                <Heading weight="h1">
-                                    Heading One ({theme.fontSize.h1}/
-                                    {theme.lineHeight.h1})
-                                </Heading>
-                                <Heading>
-                                    Heading Two ({theme.fontSize.h2}/
-                                    {theme.lineHeight.h2})
-                                </Heading>
-                                <Heading weight="h3">
-                                    Heading Three ({theme.fontSize.h3}/
-                                    {theme.lineHeight.h3})
-                                </Heading>
-                                <Heading weight="h4">
-                                    Heading Four ({theme.fontSize.h4}/
-                                    {theme.lineHeight.h4})
-                                </Heading>
-                                <Heading weight="h5">
-                                    Heading Five ({theme.fontSize.h5}/
-                                    {theme.lineHeight.h5})
-                                </Heading>
-                                <Heading weight="h6">
-                                    Heading Six ({theme.fontSize.h6}/
-                                    {theme.lineHeight.h6})
-                                </Heading>
+                                <Heading weight="h1">Heading One</Heading>
+                                <Heading>Heading Two</Heading>
+                                <Heading weight="h3">Heading Three</Heading>
+                                <Heading weight="h4">Heading Four</Heading>
+                                <Heading weight="h5">Heading Five</Heading>
+                                <Heading weight="h6">Heading Six</Heading>
                                 <Text>
                                     Lorem ipsum dolor sit amet, consectetur
                                     adipiscing elit. Mauris volutpat, odio vitae
@@ -176,7 +162,7 @@ const BasicExample = () => {
                             </Stack>
                         </Panel>
                         <Heading id="spacing">Spacing</Heading>
-                        <Panel>
+                        {/* <Panel>
                             <Stack>
                                 {Object.keys(theme.space).map(key => (
                                     <div key={key}>
@@ -192,7 +178,7 @@ const BasicExample = () => {
                                     </div>
                                 ))}
                             </Stack>
-                        </Panel>
+                        </Panel> */}
                         <Heading id="Stack">Stack</Heading>
                         <Panel>
                             <Stack>
@@ -985,7 +971,8 @@ const BasicExample = () => {
                     </Stack>
                 </Container>
             </div>
-        </ThemeProvider>
+            {/* </ThemeProvider> */}
+        </React.Fragment>
     );
 };
 
diff --git a/fixtures/Box.tsx b/fixtures/Box.tsx
index cb0ba3e..49259ac 100644
--- a/fixtures/Box.tsx
+++ b/fixtures/Box.tsx
@@ -1,8 +1,7 @@
-/** @jsx jsx */
-import { jsx, css } from '@trousers/core';
-import { ReactNode, FC } from 'react';
+// import { jsx, css } from '@trousers/core';
+import React, { ReactNode, FC } from 'react';
 
-import { Theme } from '@precursor/theme';
+// import { Theme } from '@precursor/theme';
 
 const Box: FC<{
     width?: string;
@@ -11,15 +10,15 @@ const Box: FC<{
     backgroundColor?: string;
 }> = ({ width = '100%', height = 0, children, backgroundColor }) => (
     <div
-        css={css<Theme>`
-            display: block;
-            color: white;
-            min-height: 20px;
-            width: ${width};
-            height: ${height};
-            background-color: ${({ color }) =>
-                backgroundColor || color.background.light};
-        `}
+    // css={css<Theme>`
+    //     display: block;
+    //     color: white;
+    //     min-height: 20px;
+    //     width: ${width};
+    //     height: ${height};
+    //     background-color: ${({ color }) =>
+    //         backgroundColor || color.background.light};
+    // `}
     >
         {children}
     </div>
diff --git a/fixtures/Container.tsx b/fixtures/Container.tsx
index 43c3be4..753f45c 100644
--- a/fixtures/Container.tsx
+++ b/fixtures/Container.tsx
@@ -1,10 +1,8 @@
-/** @jsx jsx */
-import { jsx } from '@trousers/core';
-import { ReactNode, FC } from 'react';
+import React, { ReactNode, FC } from 'react';
 
 const Container: FC<{ children?: ReactNode }> = ({ children }) => (
     <div
-        css={{
+        style={{
             maxWidth: '1000px',
             margin: '0 auto',
             display: 'block',
diff --git a/fixtures/index.ts b/fixtures/index.ts
index 8014513..120d833 100644
--- a/fixtures/index.ts
+++ b/fixtures/index.ts
@@ -1,4 +1,4 @@
-export { default as ThemeEditor } from './ThemeEditor';
-export { default as themeSchema } from './themeSchema';
+// export { default as ThemeEditor } from './ThemeEditor';
+// export { default as themeSchema } from './themeSchema';
 export { default as Box } from './Box';
 export { default as Container } from './Container';
diff --git a/package.json b/package.json
index 82e6cbe..e2e9357 100644
--- a/package.json
+++ b/package.json
@@ -14,35 +14,42 @@
     "scripts": {
         "prestart": "yarn build",
         "start": "run-p start:*",
-        "start:watch": "tsc --build --watch",
-        "start:stories": "start-storybook -p 9000 -s assets",
+        "start:watch": "preconstruct watch",
+        "start:stories": "start-storybook -p 9001 -s assets",
         "clean": "rm -rf node_modules/.cache && rimraf packages/**/**/{tsconfig.tsbuildinfo,lib,dist}",
         "validate": "yarn build && yarn lint && yarn monorepo:check",
-        "postinstall": "yarn monorepo:check",
+        "postinstall": "preconstruct dev && yarn monorepo:check",
         "monorepo:check": "manypkg check",
-        "monorepo:fix": "manypkg fix",
+        "monorepo:fix": "manypkg fix && preconstruct fix",
         "predeploy-storybook": "build-storybook -s assets",
         "deploy-storybook": "storybook-to-ghpages",
-        "build": "tsc --build",
+        "build": "yarn clean && preconstruct build",
         "test": "jest",
         "test:watch": "jest --watch",
         "test:coverage": "jest --coverage",
-        "lint": "eslint --config .eslintrc.js --ext tsx,ts ./packages/**/**/ ./examples ./fixtures",
+        "lint": "eslint --config .eslintrc.js --ext tsx,ts ./packages/**/**/src ./examples ./fixtures",
         "lint:fix": "yarn lint -- --fix",
         "docs:update": "markdown-toc -i ./README.md --maxdepth 3",
         "prerelease": "yarn lint && yarn monorepo:check && yarn test",
         "release": "yarn build && yarn changeset publish"
     },
     "dependencies": {
-        "@babel/core": "^7.7.5",
+        "@babel/core": "^7.12.7",
+        "@babel/parser": "^7.12.10",
+        "@babel/preset-env": "^7.12.7",
+        "@babel/preset-react": "^7.12.7",
+        "@babel/preset-typescript": "^7.12.7",
         "@changesets/cli": "^2.6.2",
         "@manypkg/cli": "^0.11.1",
-        "@storybook/addons": "^5.3.0",
-        "@storybook/react": "^5.3.0",
-        "@storybook/source-loader": "^5.3.0",
-        "@storybook/storybook-deployer": "^2.8.1",
+        "@preconstruct/cli": "^2.0.0",
+        "@storybook/addon-storysource": "6.1.18",
+        "@storybook/addons": "6.1.18",
+        "@storybook/react": "6.1.18",
+        "@storybook/source-loader": "6.1.18",
+        "@storybook/storybook-deployer": "^2.8.7",
         "@testing-library/react": "^10.0.0",
-        "@trousers/macro": "4.0.0-alpha5",
+        "@trousers/macro": "4.0.0-alpha7",
+        "@types/babel-plugin-macros": "^2.8.4",
         "@types/jest": "^25.2.0",
         "@types/jsdom": "^12.2.3",
         "@types/react": "^16.8.1",
@@ -50,6 +57,7 @@
         "@typescript-eslint/eslint-plugin": "^1.4.2",
         "@typescript-eslint/parser": "^1.4.2",
         "babel-loader": "^8.0.6",
+        "babel-plugin-macros": "^3.0.0",
         "eslint": "^7.5.0",
         "eslint-config-prettier": "^4.1.0",
         "eslint-plugin-import": "^2.22.0",
@@ -65,13 +73,22 @@
         "npm-run-all": "^4.1.5",
         "object-deep-key": "^1.1.3",
         "prettier": "^1.16.4",
-        "react": "^16.8.1",
-        "react-dom": "^16.8.4",
+        "react": "^17.0.1",
+        "react-dom": "^17.0.1",
         "react-stable-ref": "^0.4.0",
         "rimraf": "^2.6.3",
-        "storybook-addon-performance": "^0.10.0",
-        "ts-jest": "^25.3.1",
+        "storybook-addon-performance": "^0.14.0",
+        "ts-jest": "^26.4.4",
         "ts-loader": "^6.2.1",
-        "typescript": "^3.8.1"
+        "typescript": "^4.1.3"
+    },
+    "preconstruct": {
+        "packages": [
+            "packages/components/*",
+            "packages/elements/*",
+            "packages/layout/*",
+            "packages/theming/*",
+            "packages/common/*"
+        ]
     }
 }
diff --git a/packages/common/copy-to-clipboard/package.json b/packages/common/copy-to-clipboard/package.json
index b86387c..9278c22 100644
--- a/packages/common/copy-to-clipboard/package.json
+++ b/packages/common/copy-to-clipboard/package.json
@@ -2,8 +2,8 @@
     "name": "@precursor/copy-to-clipboard",
     "version": "0.1.2",
     "description": "Copy to clipboard utility",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-copy-to-clipboard.cjs.js",
+    "module": "dist/precursor-copy-to-clipboard.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {},
diff --git a/packages/common/copy-to-clipboard/copy-to-clipboard.ts b/packages/common/copy-to-clipboard/src/copy-to-clipboard.ts
similarity index 100%
rename from packages/common/copy-to-clipboard/copy-to-clipboard.ts
rename to packages/common/copy-to-clipboard/src/copy-to-clipboard.ts
diff --git a/packages/common/copy-to-clipboard/index.ts b/packages/common/copy-to-clipboard/src/index.ts
similarity index 100%
rename from packages/common/copy-to-clipboard/index.ts
rename to packages/common/copy-to-clipboard/src/index.ts
diff --git a/packages/common/copy-to-clipboard/tsconfig.json b/packages/common/copy-to-clipboard/tsconfig.json
deleted file mode 100644
index 9bea8f3..0000000
--- a/packages/common/copy-to-clipboard/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": []
-}
diff --git a/packages/common/types/index.ts b/packages/common/types/index.ts
deleted file mode 100644
index e905fc9..0000000
--- a/packages/common/types/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as InputTypes } from './input-types';
diff --git a/packages/common/types/package.json b/packages/common/types/package.json
index f7d2625..372c1a7 100644
--- a/packages/common/types/package.json
+++ b/packages/common/types/package.json
@@ -1,8 +1,8 @@
 {
     "name": "@precursor/types",
     "version": "0.1.2",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-types.cjs.js",
+    "module": "dist/precursor-types.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {},
diff --git a/packages/common/types/src/index.ts b/packages/common/types/src/index.ts
new file mode 100644
index 0000000..090e2f4
--- /dev/null
+++ b/packages/common/types/src/index.ts
@@ -0,0 +1 @@
+export type { default as InputTypes } from './input-types';
diff --git a/packages/common/types/input-types.ts b/packages/common/types/src/input-types.ts
similarity index 100%
rename from packages/common/types/input-types.ts
rename to packages/common/types/src/input-types.ts
diff --git a/packages/common/types/tsconfig.json b/packages/common/types/tsconfig.json
deleted file mode 100644
index 9bea8f3..0000000
--- a/packages/common/types/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": []
-}
diff --git a/packages/components/avatar/index.ts b/packages/components/avatar/index.ts
deleted file mode 100644
index 9accd4c..0000000
--- a/packages/components/avatar/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, AvatarProps } from './Avatar';
diff --git a/packages/components/avatar/package.json b/packages/components/avatar/package.json
index 7e105e3..87a0fbf 100644
--- a/packages/components/avatar/package.json
+++ b/packages/components/avatar/package.json
@@ -2,16 +2,16 @@
     "name": "@precursor/avatar",
     "version": "0.1.5",
     "description": "Avatar component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-avatar.cjs.js",
+    "module": "dist/precursor-avatar.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/image": "^0.1.3"
+        "@precursor/image": "^0.1.3",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/avatar/Avatar.spec.tsx b/packages/components/avatar/src/Avatar.spec.tsx
similarity index 100%
rename from packages/components/avatar/Avatar.spec.tsx
rename to packages/components/avatar/src/Avatar.spec.tsx
diff --git a/packages/components/avatar/Avatar.tsx b/packages/components/avatar/src/Avatar.tsx
similarity index 94%
rename from packages/components/avatar/Avatar.tsx
rename to packages/components/avatar/src/Avatar.tsx
index 0d6177a..6682d6d 100644
--- a/packages/components/avatar/Avatar.tsx
+++ b/packages/components/avatar/src/Avatar.tsx
@@ -1,4 +1,6 @@
 import React, { FC } from 'react';
+
+// @ts-ignore
 import { css } from '@trousers/macro';
 
 import Image, { ImageProps } from '@precursor/image';
@@ -17,6 +19,7 @@ const styles = css('Avatar', {
 });
 
 const Avatar: FC<AvatarProps> = ({ src, alt }) => (
+    // @ts-ignore
     <span css={styles}>
         <Image src={src} alt={alt} />
     </span>
diff --git a/packages/components/avatar/src/index.ts b/packages/components/avatar/src/index.ts
new file mode 100644
index 0000000..4704350
--- /dev/null
+++ b/packages/components/avatar/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Avatar';
+// eslint-disable-next-line prettier/prettier
+export type { AvatarProps } from './Avatar';
diff --git a/packages/components/avatar/tsconfig.json b/packages/components/avatar/tsconfig.json
deleted file mode 100644
index 073580b..0000000
--- a/packages/components/avatar/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../image" }]
-}
diff --git a/packages/components/badge/index.ts b/packages/components/badge/index.ts
deleted file mode 100644
index e130660..0000000
--- a/packages/components/badge/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, BadgeProps } from './Badge';
diff --git a/packages/components/badge/package.json b/packages/components/badge/package.json
index 2ac88fc..23711ff 100644
--- a/packages/components/badge/package.json
+++ b/packages/components/badge/package.json
@@ -2,14 +2,15 @@
     "name": "@precursor/badge",
     "version": "0.1.6",
     "description": "Badge component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-badge.cjs.js",
+    "module": "dist/precursor-badge.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {},
+    "dependencies": {
+        "@trousers/macro": "4.0.0-alpha7"
+    },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/badge/Badge.tsx b/packages/components/badge/src/Badge.tsx
similarity index 95%
rename from packages/components/badge/Badge.tsx
rename to packages/components/badge/src/Badge.tsx
index 42864a6..1e6e46b 100644
--- a/packages/components/badge/Badge.tsx
+++ b/packages/components/badge/src/Badge.tsx
@@ -1,4 +1,6 @@
 import React, { FC, ReactNode } from 'react';
+// @ts-ignore
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -33,6 +35,7 @@ const styles = css('Badge', {
 
 const Badge: FC<BadgeProps> = ({ status, children }) => (
     <span
+        // @ts-ignore
         css={styles}
         $error={status === 'error'}
         $warning={status === 'warning'}
diff --git a/packages/components/badge/src/index.ts b/packages/components/badge/src/index.ts
new file mode 100644
index 0000000..cff3e73
--- /dev/null
+++ b/packages/components/badge/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Badge';
+// eslint-disable-next-line prettier/prettier
+export type { BadgeProps } from './Badge';
diff --git a/packages/components/badge/tsconfig.json b/packages/components/badge/tsconfig.json
deleted file mode 100644
index 9bea8f3..0000000
--- a/packages/components/badge/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": []
-}
diff --git a/packages/components/button/index.ts b/packages/components/button/index.ts
deleted file mode 100644
index d600dd4..0000000
--- a/packages/components/button/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, ButtonProps } from './Button';
diff --git a/packages/components/button/package.json b/packages/components/button/package.json
index d5edb21..1acaef3 100644
--- a/packages/components/button/package.json
+++ b/packages/components/button/package.json
@@ -2,17 +2,17 @@
     "name": "@precursor/button",
     "version": "0.1.8",
     "description": "button component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-button.cjs.js",
+    "module": "dist/precursor-button.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/spinner": "^0.1.1",
-        "@precursor/theme": "^0.1.7"
+        "@precursor/theme": "^0.1.7",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/button/Button.tsx b/packages/components/button/src/Button.tsx
similarity index 94%
rename from packages/components/button/Button.tsx
rename to packages/components/button/src/Button.tsx
index f2f9286..e29a35e 100644
--- a/packages/components/button/Button.tsx
+++ b/packages/components/button/src/Button.tsx
@@ -1,4 +1,7 @@
 import React, { FC, ReactNode, Fragment } from 'react';
+// @ts-ignore
+// @ts-ignore
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -71,6 +74,7 @@ const styles = css('Button', {
 
 const Button: FC<ButtonProps> = props => (
     <button
+        // @ts-ignore
         css={styles}
         type={props.type}
         onClick={props.onClick}
@@ -81,6 +85,7 @@ const Button: FC<ButtonProps> = props => (
         {props.loading ? (
             <Fragment>
                 <div
+                    // @ts-ignore
                     css={css({
                         position: 'absolute',
                         display: 'flex',
@@ -95,7 +100,7 @@ const Button: FC<ButtonProps> = props => (
                 >
                     <Spinner />
                 </div>
-                <span css={{ opacity: 0 }}>{props.children}</span>
+                <span style={{ opacity: 0 }}>{props.children}</span>
             </Fragment>
         ) : (
             props.children
diff --git a/packages/components/button/src/index.ts b/packages/components/button/src/index.ts
new file mode 100644
index 0000000..d052ee4
--- /dev/null
+++ b/packages/components/button/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Button';
+// eslint-disable-next-line prettier/prettier
+export type { ButtonProps } from './Button';
diff --git a/packages/components/button/tsconfig.json b/packages/components/button/tsconfig.json
deleted file mode 100644
index 80ddcb8..0000000
--- a/packages/components/button/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../../theming/theme" }, { "path": "../spinner" }]
-}
diff --git a/packages/components/checkbox/index.ts b/packages/components/checkbox/index.ts
deleted file mode 100644
index bca1409..0000000
--- a/packages/components/checkbox/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, CheckboxProps } from './Checkbox';
diff --git a/packages/components/checkbox/package.json b/packages/components/checkbox/package.json
index 6971539..d1ffa20 100644
--- a/packages/components/checkbox/package.json
+++ b/packages/components/checkbox/package.json
@@ -2,18 +2,18 @@
     "name": "@precursor/checkbox",
     "version": "0.1.4",
     "description": "Checkbox component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-checkbox.cjs.js",
+    "module": "dist/precursor-checkbox.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/input": "^0.1.7",
         "@precursor/label": "^0.1.7",
-        "@precursor/theme": "^0.1.7"
+        "@precursor/theme": "^0.1.7",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/checkbox/Checkbox.tsx b/packages/components/checkbox/src/Checkbox.tsx
similarity index 95%
rename from packages/components/checkbox/Checkbox.tsx
rename to packages/components/checkbox/src/Checkbox.tsx
index a341c3f..d2b131c 100644
--- a/packages/components/checkbox/Checkbox.tsx
+++ b/packages/components/checkbox/src/Checkbox.tsx
@@ -1,4 +1,5 @@
 import React, { FC } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 import Label from '@precursor/label';
@@ -22,6 +23,7 @@ const Checkbox: FC<CheckboxProps> = props => {
     return (
         <Label htmlFor={props.id}>
             <Input
+                // @ts-ignore
                 css={styles}
                 disabled={props.disabled}
                 id={props.id}
diff --git a/packages/components/checkbox/src/index.ts b/packages/components/checkbox/src/index.ts
new file mode 100644
index 0000000..e02210c
--- /dev/null
+++ b/packages/components/checkbox/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Checkbox';
+// eslint-disable-next-line prettier/prettier
+export type { CheckboxProps } from './Checkbox';
diff --git a/packages/components/checkbox/tsconfig.json b/packages/components/checkbox/tsconfig.json
deleted file mode 100644
index 2da1429..0000000
--- a/packages/components/checkbox/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [
-        { "path": "../../theming/theme" },
-        { "path": "../input" },
-        { "path": "../label" }
-    ]
-}
diff --git a/packages/components/code/index.ts b/packages/components/code/index.ts
deleted file mode 100644
index 8153ec2..0000000
--- a/packages/components/code/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, CodeProps } from './Code';
diff --git a/packages/components/code/package.json b/packages/components/code/package.json
index 5cbc869..c1731dc 100644
--- a/packages/components/code/package.json
+++ b/packages/components/code/package.json
@@ -2,16 +2,16 @@
     "name": "@precursor/code",
     "version": "0.1.6",
     "description": "code component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-code.cjs.js",
+    "module": "dist/precursor-code.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7"
+        "@precursor/theme": "^0.1.7",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/code/Code.tsx b/packages/components/code/src/Code.tsx
similarity index 95%
rename from packages/components/code/Code.tsx
rename to packages/components/code/src/Code.tsx
index d463d56..7e2c43e 100644
--- a/packages/components/code/Code.tsx
+++ b/packages/components/code/src/Code.tsx
@@ -1,4 +1,5 @@
 import React, { FC, ReactNode } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -31,8 +32,10 @@ const codeStyles = css('Code', {
 });
 
 const Code: FC<CodeProps> = props => {
+    // @ts-ignore
     const codeBlock = <code css={codeStyles}>{props.children}</code>;
 
+    // @ts-ignore
     return props.inline ? codeBlock : <pre css={preStyles}>{codeBlock}</pre>;
 };
 
diff --git a/packages/components/code/src/index.ts b/packages/components/code/src/index.ts
new file mode 100644
index 0000000..88efa74
--- /dev/null
+++ b/packages/components/code/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Code';
+// eslint-disable-next-line prettier/prettier
+export type { CodeProps } from './Code';
diff --git a/packages/components/code/tsconfig.json b/packages/components/code/tsconfig.json
deleted file mode 100644
index 88fa918..0000000
--- a/packages/components/code/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../../theming/theme" }]
-}
diff --git a/packages/components/image/index.ts b/packages/components/image/index.ts
deleted file mode 100644
index 344483e..0000000
--- a/packages/components/image/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, ImageProps } from './Image';
diff --git a/packages/components/image/package.json b/packages/components/image/package.json
index 7833f50..f197b6f 100644
--- a/packages/components/image/package.json
+++ b/packages/components/image/package.json
@@ -2,13 +2,13 @@
     "name": "@precursor/image",
     "version": "0.1.3",
     "description": "image component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-image.cjs.js",
+    "module": "dist/precursor-image.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {},
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/image/Image.tsx b/packages/components/image/src/Image.tsx
similarity index 100%
rename from packages/components/image/Image.tsx
rename to packages/components/image/src/Image.tsx
diff --git a/packages/components/image/src/index.ts b/packages/components/image/src/index.ts
new file mode 100644
index 0000000..6ef72a6
--- /dev/null
+++ b/packages/components/image/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Image';
+// eslint-disable-next-line prettier/prettier
+export type { ImageProps } from './Image';
diff --git a/packages/components/image/tsconfig.json b/packages/components/image/tsconfig.json
deleted file mode 100644
index 9bea8f3..0000000
--- a/packages/components/image/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": []
-}
diff --git a/packages/components/input/index.ts b/packages/components/input/index.ts
deleted file mode 100644
index 53df8d0..0000000
--- a/packages/components/input/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, InputProps } from './Input';
diff --git a/packages/components/input/package.json b/packages/components/input/package.json
index 9a059e9..ae1e3fd 100644
--- a/packages/components/input/package.json
+++ b/packages/components/input/package.json
@@ -2,16 +2,16 @@
     "name": "@precursor/input",
     "version": "0.1.7",
     "description": "input component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-input.cjs.js",
+    "module": "dist/precursor-input.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7"
+        "@precursor/theme": "^0.1.7",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/input/Input.tsx b/packages/components/input/src/Input.tsx
similarity index 97%
rename from packages/components/input/Input.tsx
rename to packages/components/input/src/Input.tsx
index 8df92ec..9af9133 100644
--- a/packages/components/input/Input.tsx
+++ b/packages/components/input/src/Input.tsx
@@ -1,4 +1,5 @@
 import React, { FC, ChangeEventHandler } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -55,7 +56,9 @@ const styles = css('Input', {
     .modifier('large', { '--input-height': '52px' });
 
 const Input: FC<InputProps> = ({ type = 'text', ...props }) => (
+    // @ts-ignore
     <input
+        // @ts-ignore
         css={styles}
         className={props.className}
         disabled={props.disabled}
diff --git a/packages/components/input/src/index.ts b/packages/components/input/src/index.ts
new file mode 100644
index 0000000..2803717
--- /dev/null
+++ b/packages/components/input/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Input';
+// eslint-disable-next-line prettier/prettier
+export type {  InputProps } from './Input';
diff --git a/packages/components/input/tsconfig.json b/packages/components/input/tsconfig.json
deleted file mode 100644
index 1ac2033..0000000
--- a/packages/components/input/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../../common/types" }]
-}
diff --git a/packages/components/keyboard/index.ts b/packages/components/keyboard/index.ts
deleted file mode 100644
index 400c620..0000000
--- a/packages/components/keyboard/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, KeyboardProps } from './Keyboard';
diff --git a/packages/components/keyboard/package.json b/packages/components/keyboard/package.json
index 631ef91..af32e41 100644
--- a/packages/components/keyboard/package.json
+++ b/packages/components/keyboard/package.json
@@ -2,16 +2,16 @@
     "name": "@precursor/keyboard",
     "version": "0.1.3",
     "description": "keyboard combo component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-keyboard.cjs.js",
+    "module": "dist/precursor-keyboard.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.5"
+        "@precursor/theme": "^0.1.5",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/keyboard/Keyboard.tsx b/packages/components/keyboard/src/Keyboard.tsx
similarity index 91%
rename from packages/components/keyboard/Keyboard.tsx
rename to packages/components/keyboard/src/Keyboard.tsx
index ead31ca..8666f20 100644
--- a/packages/components/keyboard/Keyboard.tsx
+++ b/packages/components/keyboard/src/Keyboard.tsx
@@ -1,4 +1,5 @@
 import React, { FC, ReactNode } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 // import { Theme } from '@precursor/theme';
 
@@ -24,7 +25,10 @@ const Keyboard: FC<KeyboardProps> = ({
     option,
     ctrl,
 }) => (
-    <kbd css={styles}>
+    <kbd
+        // @ts-ignore
+        css={styles}
+    >
         {command && '⌘'}
         {shift && '⇧'}
         {option && '⌥'}
diff --git a/packages/components/keyboard/src/index.ts b/packages/components/keyboard/src/index.ts
new file mode 100644
index 0000000..ac1208a
--- /dev/null
+++ b/packages/components/keyboard/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Keyboard';
+// eslint-disable-next-line prettier/prettier
+export type { KeyboardProps } from './Keyboard';
diff --git a/packages/components/keyboard/tsconfig.json b/packages/components/keyboard/tsconfig.json
deleted file mode 100644
index 88fa918..0000000
--- a/packages/components/keyboard/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../../theming/theme" }]
-}
diff --git a/packages/components/label/index.ts b/packages/components/label/index.ts
deleted file mode 100644
index 10d1f88..0000000
--- a/packages/components/label/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, LabelProps } from './Label';
diff --git a/packages/components/label/package.json b/packages/components/label/package.json
index 335be1f..b09e571 100644
--- a/packages/components/label/package.json
+++ b/packages/components/label/package.json
@@ -2,14 +2,15 @@
     "name": "@precursor/label",
     "version": "0.1.7",
     "description": "label component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-label.cjs.js",
+    "module": "dist/precursor-label.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {},
+    "dependencies": {
+        "@trousers/macro": "4.0.0-alpha7"
+    },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/label/Label.tsx b/packages/components/label/src/Label.tsx
similarity index 92%
rename from packages/components/label/Label.tsx
rename to packages/components/label/src/Label.tsx
index 4850b53..6f8e419 100644
--- a/packages/components/label/Label.tsx
+++ b/packages/components/label/src/Label.tsx
@@ -1,4 +1,5 @@
 import React, { FC, ReactNode } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 // import { Theme } from '@precursor/theme';
 
@@ -9,7 +10,9 @@ export interface LabelProps {
 }
 
 const Label: FC<LabelProps> = ({ htmlFor, children }) => (
+    // @ts-ignore
     <label
+        // @ts-ignore
         css={css({
             display: 'inline-flex',
             alignItems: 'center',
diff --git a/packages/components/label/src/index.ts b/packages/components/label/src/index.ts
new file mode 100644
index 0000000..212f417
--- /dev/null
+++ b/packages/components/label/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Label';
+// eslint-disable-next-line prettier/prettier
+export type { LabelProps } from './Label';
diff --git a/packages/components/label/tsconfig.json b/packages/components/label/tsconfig.json
deleted file mode 100644
index 88fa918..0000000
--- a/packages/components/label/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../../theming/theme" }]
-}
diff --git a/packages/components/lozenge/index.ts b/packages/components/lozenge/index.ts
deleted file mode 100644
index bde69a0..0000000
--- a/packages/components/lozenge/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, LozengeProps } from './Lozenge';
diff --git a/packages/components/lozenge/package.json b/packages/components/lozenge/package.json
index eca7267..f6294e5 100644
--- a/packages/components/lozenge/package.json
+++ b/packages/components/lozenge/package.json
@@ -2,14 +2,15 @@
     "name": "@precursor/lozenge",
     "version": "0.1.1",
     "description": "lozenge component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-lozenge.cjs.js",
+    "module": "dist/precursor-lozenge.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {},
+    "dependencies": {
+        "@trousers/macro": "4.0.0-alpha7"
+    },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/lozenge/Lozenge.tsx b/packages/components/lozenge/src/Lozenge.tsx
similarity index 95%
rename from packages/components/lozenge/Lozenge.tsx
rename to packages/components/lozenge/src/Lozenge.tsx
index 86c1d6f..7e3b0cf 100644
--- a/packages/components/lozenge/Lozenge.tsx
+++ b/packages/components/lozenge/src/Lozenge.tsx
@@ -1,4 +1,5 @@
 import React, { FC, ReactNode } from 'react';
+// @ts-ignore
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -34,7 +35,9 @@ const styles = css('Lozenge', {
     });
 
 const Lozenge: FC<LozengeProps> = ({ status, children }) => (
+    // @ts-ignore
     <span
+        // @ts-ignore
         css={styles}
         $error={status === 'error'}
         $warning={status === 'warning'}
diff --git a/packages/components/lozenge/src/index.ts b/packages/components/lozenge/src/index.ts
new file mode 100644
index 0000000..153fe95
--- /dev/null
+++ b/packages/components/lozenge/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Lozenge';
+// eslint-disable-next-line prettier/prettier
+export type { LozengeProps } from './Lozenge';
diff --git a/packages/components/lozenge/tsconfig.json b/packages/components/lozenge/tsconfig.json
deleted file mode 100644
index 9bea8f3..0000000
--- a/packages/components/lozenge/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": []
-}
diff --git a/packages/components/message/index.ts b/packages/components/message/index.ts
deleted file mode 100644
index fb99ab3..0000000
--- a/packages/components/message/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, MessageProps } from './Message';
diff --git a/packages/components/message/package.json b/packages/components/message/package.json
index 8cad292..354aa58 100644
--- a/packages/components/message/package.json
+++ b/packages/components/message/package.json
@@ -2,17 +2,17 @@
     "name": "@precursor/message",
     "version": "0.1.1",
     "description": "message component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-message.cjs.js",
+    "module": "dist/precursor-message.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/text": "^0.1.5",
-        "@precursor/theme": "^0.1.7"
+        "@precursor/theme": "^0.1.7",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/message/Message.tsx b/packages/components/message/src/Message.tsx
similarity index 96%
rename from packages/components/message/Message.tsx
rename to packages/components/message/src/Message.tsx
index eb922d1..001fb80 100644
--- a/packages/components/message/Message.tsx
+++ b/packages/components/message/src/Message.tsx
@@ -1,4 +1,5 @@
 import React, { FC, ReactNode } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -30,6 +31,7 @@ const styles = css('message', {
 
 const Message: FC<MessageProps> = props => (
     <div
+        // @ts-ignore
         css={styles}
         $error={props.status === 'error'}
         $warning={props.status === 'warning'}
diff --git a/packages/components/message/src/index.ts b/packages/components/message/src/index.ts
new file mode 100644
index 0000000..2cb336e
--- /dev/null
+++ b/packages/components/message/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Message';
+// eslint-disable-next-line prettier/prettier
+export type { MessageProps } from './Message';
diff --git a/packages/components/message/tsconfig.json b/packages/components/message/tsconfig.json
deleted file mode 100644
index 2311819..0000000
--- a/packages/components/message/tsconfig.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [
-        {
-            "path": "../../theming/theme"
-        },
-        {
-            "path": "../../elements/text"
-        }
-    ]
-}
diff --git a/packages/components/modal/index.ts b/packages/components/modal/index.ts
deleted file mode 100644
index 7c95ddf..0000000
--- a/packages/components/modal/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as Modal, ModalProps } from './Modal';
-export { default as ModalBody, ModalBodyProps } from './ModalBody';
-export { default as ModalHeader, ModalHeaderProps } from './ModalHeader';
-export { default as ModalFooter, ModalFooterProps } from './ModalFooter';
diff --git a/packages/components/modal/package.json b/packages/components/modal/package.json
index 19b3d43..3832ed8 100644
--- a/packages/components/modal/package.json
+++ b/packages/components/modal/package.json
@@ -2,20 +2,21 @@
     "name": "@precursor/modal",
     "version": "0.1.6",
     "description": "modal component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-modal.cjs.js",
+    "module": "dist/precursor-modal.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/heading": "^0.1.7",
+        "@precursor/inline": "^0.1.1",
         "@precursor/overlay": "^0.1.4",
         "@precursor/theme": "^0.1.7",
+        "@trousers/macro": "4.0.0-alpha7",
         "react-focus-lock": "^2.4.1"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "react-dom": "^16.8.4",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1",
+        "react-dom": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0",
diff --git a/packages/components/modal/Modal.tsx b/packages/components/modal/src/Modal.tsx
similarity index 97%
rename from packages/components/modal/Modal.tsx
rename to packages/components/modal/src/Modal.tsx
index 0f0e9ba..a6fdfd5 100644
--- a/packages/components/modal/Modal.tsx
+++ b/packages/components/modal/src/Modal.tsx
@@ -8,6 +8,7 @@ import React, {
 } from 'react';
 import { createPortal } from 'react-dom';
 import FocusLock from 'react-focus-lock';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -70,6 +71,7 @@ const Modal: FC<ModalProps> = ({ onDismiss, children, isOpen }) => {
                           id="modal"
                           aria-describedby="modal-body"
                           aria-labelledby="modal-header"
+                          // @ts-ignore
                           css={styles}
                       >
                           {children}
diff --git a/packages/components/modal/ModalBody.tsx b/packages/components/modal/src/ModalBody.tsx
similarity index 91%
rename from packages/components/modal/ModalBody.tsx
rename to packages/components/modal/src/ModalBody.tsx
index a23d056..f64b3eb 100644
--- a/packages/components/modal/ModalBody.tsx
+++ b/packages/components/modal/src/ModalBody.tsx
@@ -1,4 +1,5 @@
 import React, { FC, ReactNode } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 export interface ModalBodyProps {
@@ -8,6 +9,7 @@ export interface ModalBodyProps {
 const ModalBody: FC<ModalBodyProps> = ({ children }) => (
     <div
         id="modal-body"
+        // @ts-ignore
         css={css('ModalBody', {
             padding: '0 1rem',
             flex: '1 1 0%',
diff --git a/packages/components/modal/ModalFooter.tsx b/packages/components/modal/src/ModalFooter.tsx
similarity index 93%
rename from packages/components/modal/ModalFooter.tsx
rename to packages/components/modal/src/ModalFooter.tsx
index 2075a9c..ca5dc61 100644
--- a/packages/components/modal/ModalFooter.tsx
+++ b/packages/components/modal/src/ModalFooter.tsx
@@ -1,4 +1,5 @@
 import React, { FC, ReactNode } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -10,6 +11,7 @@ export interface ModalFooterProps {
 
 const ModalFooter: FC<ModalFooterProps> = ({ children }) => (
     <footer
+        // @ts-ignore
         css={css('ModalFooter', {
             padding: '1rem',
             borderTop: `var(--border-size-0) solid var(--border-color-base)`,
diff --git a/packages/components/modal/ModalHeader.tsx b/packages/components/modal/src/ModalHeader.tsx
similarity index 93%
rename from packages/components/modal/ModalHeader.tsx
rename to packages/components/modal/src/ModalHeader.tsx
index 4e3f7f6..245f183 100644
--- a/packages/components/modal/ModalHeader.tsx
+++ b/packages/components/modal/src/ModalHeader.tsx
@@ -1,4 +1,5 @@
 import React, { FC, ReactNode } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 import Heading from '@precursor/heading';
@@ -10,6 +11,7 @@ export interface ModalHeaderProps {
 const ModalHeader: FC<ModalHeaderProps> = ({ children }) => (
     <header
         id="modal-header"
+        // @ts-ignore
         css={css('ModalHeader', {
             paddingTop: '1rem',
             paddingLeft: '1rem',
diff --git a/packages/components/modal/src/index.ts b/packages/components/modal/src/index.ts
new file mode 100644
index 0000000..2dcfe16
--- /dev/null
+++ b/packages/components/modal/src/index.ts
@@ -0,0 +1,12 @@
+export { default as Modal } from './Modal';
+// eslint-disable-next-line prettier/prettier
+export type { ModalProps } from './Modal';
+export { default as ModalBody } from './ModalBody';
+// eslint-disable-next-line prettier/prettier
+export type { ModalBodyProps } from './ModalBody';
+export { default as ModalHeader } from './ModalHeader';
+// eslint-disable-next-line prettier/prettier
+export type { ModalHeaderProps } from './ModalHeader';
+export { default as ModalFooter } from './ModalFooter';
+// eslint-disable-next-line prettier/prettier
+export type { ModalFooterProps } from './ModalFooter';
diff --git a/packages/components/modal/tsconfig.json b/packages/components/modal/tsconfig.json
deleted file mode 100644
index 30b19c5..0000000
--- a/packages/components/modal/tsconfig.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [
-        {
-            "path": "../../theming/theme"
-        },
-        {
-            "path": "../overlay"
-        },
-        {
-            "path": "../../elements/heading"
-        }
-    ]
-}
diff --git a/packages/components/overlay/index.ts b/packages/components/overlay/index.ts
deleted file mode 100644
index 5326a24..0000000
--- a/packages/components/overlay/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, OverlayProps } from './Overlay';
diff --git a/packages/components/overlay/package.json b/packages/components/overlay/package.json
index 7135846..937dea4 100644
--- a/packages/components/overlay/package.json
+++ b/packages/components/overlay/package.json
@@ -2,14 +2,15 @@
     "name": "@precursor/overlay",
     "version": "0.1.4",
     "description": "Overlay component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-overlay.cjs.js",
+    "module": "dist/precursor-overlay.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {},
+    "dependencies": {
+        "@trousers/macro": "4.0.0-alpha7"
+    },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/overlay/Overlay.tsx b/packages/components/overlay/src/Overlay.tsx
similarity index 82%
rename from packages/components/overlay/Overlay.tsx
rename to packages/components/overlay/src/Overlay.tsx
index 6ee3767..25343a6 100644
--- a/packages/components/overlay/Overlay.tsx
+++ b/packages/components/overlay/src/Overlay.tsx
@@ -4,6 +4,7 @@ import React, {
     KeyboardEventHandler,
     MouseEventHandler,
 } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 export interface OverlayProps {
@@ -29,7 +30,13 @@ const styles = css('Overlay', {
 const Overlay = forwardRef<HTMLDivElement, OverlayProps>(
     ({ children, onKeyDown, onClick }, ref) => (
         // eslint-disable-next-line jsx-a11y/no-static-element-interactions
-        <div ref={ref} css={styles} onKeyDown={onKeyDown} onClick={onClick}>
+        <div
+            ref={ref}
+            // @ts-ignore
+            css={styles}
+            onKeyDown={onKeyDown}
+            onClick={onClick}
+        >
             {children}
         </div>
     ),
diff --git a/packages/components/overlay/src/index.ts b/packages/components/overlay/src/index.ts
new file mode 100644
index 0000000..9f941c0
--- /dev/null
+++ b/packages/components/overlay/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Overlay';
+// eslint-disable-next-line prettier/prettier
+export type { OverlayProps } from './Overlay';
diff --git a/packages/components/overlay/tsconfig.json b/packages/components/overlay/tsconfig.json
deleted file mode 100644
index 9bea8f3..0000000
--- a/packages/components/overlay/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": []
-}
diff --git a/packages/components/panel/index.ts b/packages/components/panel/index.ts
deleted file mode 100644
index 2ab38cd..0000000
--- a/packages/components/panel/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, PanelProps } from './Panel';
diff --git a/packages/components/panel/package.json b/packages/components/panel/package.json
index d98431e..6720da6 100644
--- a/packages/components/panel/package.json
+++ b/packages/components/panel/package.json
@@ -2,14 +2,15 @@
     "name": "@precursor/panel",
     "version": "0.1.6",
     "description": "panel component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-panel.cjs.js",
+    "module": "dist/precursor-panel.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {},
+    "dependencies": {
+        "@trousers/macro": "4.0.0-alpha7"
+    },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/panel/Panel.tsx b/packages/components/panel/src/Panel.tsx
similarity index 94%
rename from packages/components/panel/Panel.tsx
rename to packages/components/panel/src/Panel.tsx
index 702b34c..1853ecc 100644
--- a/packages/components/panel/Panel.tsx
+++ b/packages/components/panel/src/Panel.tsx
@@ -1,4 +1,5 @@
 import React, { FC, ReactNode } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -13,6 +14,7 @@ const styles = css('Panel', {
     padding: 'var(--space-m)',
 });
 
+// @ts-ignore
 const Panel: FC<PanelProps> = props => <div css={styles}>{props.children}</div>;
 
 export default Panel;
diff --git a/packages/components/panel/src/index.ts b/packages/components/panel/src/index.ts
new file mode 100644
index 0000000..04a6f87
--- /dev/null
+++ b/packages/components/panel/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Panel';
+// eslint-disable-next-line prettier/prettier
+export type { PanelProps } from './Panel';
diff --git a/packages/components/panel/tsconfig.json b/packages/components/panel/tsconfig.json
deleted file mode 100644
index 88fa918..0000000
--- a/packages/components/panel/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../../theming/theme" }]
-}
diff --git a/packages/components/radio/index.ts b/packages/components/radio/index.ts
deleted file mode 100644
index 06e9701..0000000
--- a/packages/components/radio/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, RadioProps } from './Radio';
diff --git a/packages/components/radio/package.json b/packages/components/radio/package.json
index 56c366d..bc9b034 100644
--- a/packages/components/radio/package.json
+++ b/packages/components/radio/package.json
@@ -2,18 +2,18 @@
     "name": "@precursor/radio",
     "version": "0.1.3",
     "description": "radio component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-radio.cjs.js",
+    "module": "dist/precursor-radio.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/input": "^0.1.5",
         "@precursor/label": "^0.1.4",
-        "@precursor/theme": "^0.1.6"
+        "@precursor/theme": "^0.1.6",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/radio/Radio.tsx b/packages/components/radio/src/Radio.tsx
similarity index 92%
rename from packages/components/radio/Radio.tsx
rename to packages/components/radio/src/Radio.tsx
index 37c4039..85cf8ec 100644
--- a/packages/components/radio/Radio.tsx
+++ b/packages/components/radio/src/Radio.tsx
@@ -1,4 +1,5 @@
 import React, { FC } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 import Input, { InputProps } from '@precursor/input';
@@ -63,6 +64,7 @@ const styles = css('ToggleIndicator', {
 const Radio: FC<RadioProps> = ({ size = 'm', ...props }) => (
     <Label htmlFor={props.id}>
         <Input
+            // @ts-ignore
             css={css({
                 clip: 'rect(0px, 0px, 0px, 0px)',
                 height: '1px',
@@ -87,12 +89,19 @@ const Radio: FC<RadioProps> = ({ size = 'm', ...props }) => (
         />
         <div
             aria-hidden="true"
+            // @ts-ignore
             css={styles}
             $large={size === 'l'}
             $small={size === 's'}
             $disabled={props.disabled}
         />
-        <span css={css({ userSelect: 'none' })}>{props.label}</span>
+
+        <span
+            // @ts-ignore
+            css={css({ userSelect: 'none' })}
+        >
+            {props.label}
+        </span>
     </Label>
 );
 
diff --git a/packages/components/radio/src/index.ts b/packages/components/radio/src/index.ts
new file mode 100644
index 0000000..3be53f0
--- /dev/null
+++ b/packages/components/radio/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Radio';
+// eslint-disable-next-line prettier/prettier
+export type { RadioProps } from './Radio';
diff --git a/packages/components/radio/tsconfig.json b/packages/components/radio/tsconfig.json
deleted file mode 100644
index 2da1429..0000000
--- a/packages/components/radio/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [
-        { "path": "../../theming/theme" },
-        { "path": "../input" },
-        { "path": "../label" }
-    ]
-}
diff --git a/packages/components/range/index.ts b/packages/components/range/index.ts
deleted file mode 100644
index f4afb4d..0000000
--- a/packages/components/range/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, RangeProps } from './Range';
diff --git a/packages/components/range/package.json b/packages/components/range/package.json
index fb3f587..0a2fdc7 100644
--- a/packages/components/range/package.json
+++ b/packages/components/range/package.json
@@ -2,16 +2,16 @@
     "name": "@precursor/range",
     "version": "0.1.1",
     "description": "range component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-range.cjs.js",
+    "module": "dist/precursor-range.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7"
+        "@precursor/theme": "^0.1.7",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/range/Range.tsx b/packages/components/range/src/Range.tsx
similarity index 99%
rename from packages/components/range/Range.tsx
rename to packages/components/range/src/Range.tsx
index f2f3680..9ad5cec 100644
--- a/packages/components/range/Range.tsx
+++ b/packages/components/range/src/Range.tsx
@@ -1,5 +1,6 @@
 /* eslint-disable jsx-a11y/no-static-element-interactions */
 import React, { FC, useRef, useState } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 import Slider from './Slider';
@@ -172,6 +173,7 @@ const Range: FC<RangeProps> = ({
 
     return (
         <div
+            // @ts-ignore
             css={styles}
             $small={size === 's'}
             $large={size === 'l'}
diff --git a/packages/components/range/Slider.tsx b/packages/components/range/src/Slider.tsx
similarity index 98%
rename from packages/components/range/Slider.tsx
rename to packages/components/range/src/Slider.tsx
index 5d96991..298e3de 100644
--- a/packages/components/range/Slider.tsx
+++ b/packages/components/range/src/Slider.tsx
@@ -1,3 +1,4 @@
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 import React, { FC, useRef } from 'react';
 
@@ -110,6 +111,7 @@ const Slider: FC<SliderProps> = ({
     return (
         <div
             ref={sliderRef}
+            // @ts-ignore
             css={styles}
             $disabled={disabled}
             style={{
diff --git a/packages/components/range/Track.tsx b/packages/components/range/src/Track.tsx
similarity index 96%
rename from packages/components/range/Track.tsx
rename to packages/components/range/src/Track.tsx
index 73cb4ef..40e9dd6 100644
--- a/packages/components/range/Track.tsx
+++ b/packages/components/range/src/Track.tsx
@@ -1,4 +1,5 @@
 import React, { forwardRef } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -30,6 +31,7 @@ const styles = css('Track', {
 
 const Track = forwardRef<HTMLDivElement, TrackProps>(
     ({ disabled, progress }, ref) => (
+        // @ts-ignore
         <div ref={ref} css={styles} $disabled={disabled}>
             <div style={{ width: progress }} />
         </div>
diff --git a/packages/components/range/src/index.ts b/packages/components/range/src/index.ts
new file mode 100644
index 0000000..4871c01
--- /dev/null
+++ b/packages/components/range/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Range';
+// eslint-disable-next-line prettier/prettier
+export type {  RangeProps } from './Range';
diff --git a/packages/components/range/tsconfig.json b/packages/components/range/tsconfig.json
deleted file mode 100644
index 1ac2033..0000000
--- a/packages/components/range/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../../common/types" }]
-}
diff --git a/packages/components/select/index.ts b/packages/components/select/index.ts
deleted file mode 100644
index 2c58b9b..0000000
--- a/packages/components/select/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, SelectProps } from './Select';
diff --git a/packages/components/select/package.json b/packages/components/select/package.json
index c450686..68338aa 100644
--- a/packages/components/select/package.json
+++ b/packages/components/select/package.json
@@ -2,16 +2,16 @@
     "name": "@precursor/select",
     "version": "0.1.6",
     "description": "select component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-select.cjs.js",
+    "module": "dist/precursor-select.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
+        "@trousers/macro": "4.0.0-alpha7",
         "react-feather": "^2.0.8"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/select/Select.tsx b/packages/components/select/src/Select.tsx
similarity index 92%
rename from packages/components/select/Select.tsx
rename to packages/components/select/src/Select.tsx
index 76bc155..7c9a710 100644
--- a/packages/components/select/Select.tsx
+++ b/packages/components/select/src/Select.tsx
@@ -1,4 +1,5 @@
 import React, { ChangeEventHandler, ReactNode, FC } from 'react';
+// @ts-ignore
 import { css } from '@trousers/macro';
 // @ts-ignore
 import ChevronDown from 'react-feather/dist/icons/chevron-down';
@@ -64,9 +65,11 @@ const styles = css('Select', {
 
 const Select: FC<SelectProps> = props => {
     return (
+        // @ts-ignore
         <div css={css({ position: 'relative' })}>
             <select
                 // className={classNames}
+                // @ts-ignore
                 css={styles}
                 $success={props.appearance === 'success'}
                 $warning={props.appearance === 'warning'}
@@ -84,6 +87,7 @@ const Select: FC<SelectProps> = props => {
                 {props.children}
             </select>
             <span
+                // @ts-ignore
                 css={css({
                     alignItems: 'center',
                     display: 'flex',
@@ -92,13 +96,13 @@ const Select: FC<SelectProps> = props => {
                     paddingRight: '10px',
                     pointerEvents: 'none',
                     position: 'absolute',
-                    right: 0;
-                    top: 0;
+                    right: 0,
+                    top: 0,
                 })}
             >
                 <ChevronDown
                     size="20"
-                    color={theme.color.typography.placeholder} // TODO: Fix this
+                    // color={theme.color.typography.placeholder} // TODO: Fix this
                 />
             </span>
         </div>
diff --git a/packages/components/select/src/index.ts b/packages/components/select/src/index.ts
new file mode 100644
index 0000000..7aeb373
--- /dev/null
+++ b/packages/components/select/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Select';
+// eslint-disable-next-line prettier/prettier
+export type {  SelectProps } from './Select';
diff --git a/packages/components/select/tsconfig.json b/packages/components/select/tsconfig.json
deleted file mode 100644
index 88fa918..0000000
--- a/packages/components/select/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../../theming/theme" }]
-}
diff --git a/packages/components/skeleton/index.ts b/packages/components/skeleton/index.ts
deleted file mode 100644
index b2f86f3..0000000
--- a/packages/components/skeleton/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, SkeletonProps } from './Skeleton';
diff --git a/packages/components/skeleton/package.json b/packages/components/skeleton/package.json
index bc8ec29..9e10815 100644
--- a/packages/components/skeleton/package.json
+++ b/packages/components/skeleton/package.json
@@ -2,16 +2,16 @@
     "name": "@precursor/skeleton",
     "version": "0.1.3",
     "description": "skeleton component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-skeleton.cjs.js",
+    "module": "dist/precursor-skeleton.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7"
+        "@precursor/theme": "^0.1.7",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/skeleton/Skeleton.tsx b/packages/components/skeleton/src/Skeleton.tsx
similarity index 96%
rename from packages/components/skeleton/Skeleton.tsx
rename to packages/components/skeleton/src/Skeleton.tsx
index d736c0a..eda6d79 100644
--- a/packages/components/skeleton/Skeleton.tsx
+++ b/packages/components/skeleton/src/Skeleton.tsx
@@ -1,4 +1,5 @@
 import React, { FC } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 // import { Theme } from '@precursor/theme';
 
@@ -8,7 +9,9 @@ export interface SkeletonProps {
 }
 
 const Skeleton: FC<SkeletonProps> = ({ as = 'text', height }) => (
+    // @ts-ignore
     <div
+        // @ts-ignore
         css={css('skeleton', {
             backgroundColor: 'var(--color-background-light)',
             height: '1rem',
diff --git a/packages/components/skeleton/src/index.ts b/packages/components/skeleton/src/index.ts
new file mode 100644
index 0000000..253a52e
--- /dev/null
+++ b/packages/components/skeleton/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Skeleton';
+// eslint-disable-next-line prettier/prettier
+export type { SkeletonProps } from './Skeleton';
diff --git a/packages/components/skeleton/tsconfig.json b/packages/components/skeleton/tsconfig.json
deleted file mode 100644
index 88fa918..0000000
--- a/packages/components/skeleton/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../../theming/theme" }]
-}
diff --git a/packages/components/spinner/index.ts b/packages/components/spinner/index.ts
deleted file mode 100644
index 9e0b5ea..0000000
--- a/packages/components/spinner/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, SpinnerProps } from './Spinner';
diff --git a/packages/components/spinner/package.json b/packages/components/spinner/package.json
index 415757b..b04fa64 100644
--- a/packages/components/spinner/package.json
+++ b/packages/components/spinner/package.json
@@ -2,14 +2,15 @@
     "name": "@precursor/spinner",
     "version": "0.1.1",
     "description": "spinner component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-spinner.cjs.js",
+    "module": "dist/precursor-spinner.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {},
+    "dependencies": {
+        "@trousers/macro": "4.0.0-alpha7"
+    },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/spinner/Spinner.tsx b/packages/components/spinner/src/Spinner.tsx
similarity index 96%
rename from packages/components/spinner/Spinner.tsx
rename to packages/components/spinner/src/Spinner.tsx
index 01dcac4..e66f1f3 100644
--- a/packages/components/spinner/Spinner.tsx
+++ b/packages/components/spinner/src/Spinner.tsx
@@ -1,4 +1,5 @@
 import React, { FC } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 export interface SpinnerProps {
@@ -7,7 +8,9 @@ export interface SpinnerProps {
 
 const Spinner: FC<SpinnerProps> = ({ color = 'black' }) => {
     return (
+        // @ts-ignore
         <div
+            // @ts-ignore
             css={css({
                 color: color,
                 display: 'flex',
diff --git a/packages/components/spinner/src/index.ts b/packages/components/spinner/src/index.ts
new file mode 100644
index 0000000..d0f7a62
--- /dev/null
+++ b/packages/components/spinner/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Spinner';
+// eslint-disable-next-line prettier/prettier
+export type { SpinnerProps } from './Spinner';
diff --git a/packages/components/spinner/tsconfig.json b/packages/components/spinner/tsconfig.json
deleted file mode 100644
index 88fa918..0000000
--- a/packages/components/spinner/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../../theming/theme" }]
-}
diff --git a/packages/components/tabs/index.ts b/packages/components/tabs/index.ts
deleted file mode 100644
index 227aeb8..0000000
--- a/packages/components/tabs/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as Tabs, TabsProps } from './Tabs';
-export { default as Tab, TabProps } from './Tab';
-export { default as TabList, TabListProps } from './TabList';
-export { default as TabPanel, TabPanelProps } from './TabPanel';
diff --git a/packages/components/tabs/package.json b/packages/components/tabs/package.json
index 11b8350..c026527 100644
--- a/packages/components/tabs/package.json
+++ b/packages/components/tabs/package.json
@@ -2,17 +2,18 @@
     "name": "@precursor/tabs",
     "version": "0.1.7",
     "description": "tabs component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-tabs.cjs.js",
+    "module": "dist/precursor-tabs.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/stack": "^0.1.5",
-        "@precursor/theme": "^0.1.7"
+        "@precursor/text": "^0.1.5",
+        "@precursor/theme": "^0.1.7",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/tabs/Tab.tsx b/packages/components/tabs/src/Tab.tsx
similarity index 96%
rename from packages/components/tabs/Tab.tsx
rename to packages/components/tabs/src/Tab.tsx
index 578b6bd..19fd068 100644
--- a/packages/components/tabs/Tab.tsx
+++ b/packages/components/tabs/src/Tab.tsx
@@ -1,4 +1,5 @@
 import React, { useContext, FC, ReactNode } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 import Text from '@precursor/text';
 // import { Theme } from '@precursor/theme';
@@ -31,6 +32,7 @@ const Tab: FC<TabProps> = ({ id, children }) => {
             id={`tab-${id}`}
             tabIndex={isSelected ? 0 : -1}
             onClick={() => setActive && setActive(id)}
+            // @ts-ignore
             css={styles}
             $selected={isSelected}
         >
diff --git a/packages/components/tabs/TabList.tsx b/packages/components/tabs/src/TabList.tsx
similarity index 97%
rename from packages/components/tabs/TabList.tsx
rename to packages/components/tabs/src/TabList.tsx
index aa3c18a..f195ba4 100644
--- a/packages/components/tabs/TabList.tsx
+++ b/packages/components/tabs/src/TabList.tsx
@@ -1,4 +1,5 @@
 import React, { useContext, FC, KeyboardEventHandler, ReactNode } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 import TabsContext from './TabsContext';
 
@@ -39,6 +40,7 @@ const TabList: FC<TabListProps> = ({ label, children }) => {
             tabIndex={0}
             aria-label={label}
             onKeyDown={onKeyDown}
+            // @ts-ignore
             css={css({
                 borderBottom: `var(--border--size[0]) solid var(--border--color.base)`,
             })}
diff --git a/packages/components/tabs/TabPanel.tsx b/packages/components/tabs/src/TabPanel.tsx
similarity index 82%
rename from packages/components/tabs/TabPanel.tsx
rename to packages/components/tabs/src/TabPanel.tsx
index 55c98ef..d29ceb7 100644
--- a/packages/components/tabs/TabPanel.tsx
+++ b/packages/components/tabs/src/TabPanel.tsx
@@ -1,6 +1,4 @@
-/** @jsx jsx */
-import { useContext, FC, ReactNode } from 'react';
-import { jsx } from '@trousers/macro';
+import React, { useContext, FC, ReactNode } from 'react';
 import TabsContext from './TabsContext';
 
 export interface TabPanelProps {
diff --git a/packages/components/tabs/Tabs.tsx b/packages/components/tabs/src/Tabs.tsx
similarity index 100%
rename from packages/components/tabs/Tabs.tsx
rename to packages/components/tabs/src/Tabs.tsx
diff --git a/packages/components/tabs/TabsContext.ts b/packages/components/tabs/src/TabsContext.ts
similarity index 100%
rename from packages/components/tabs/TabsContext.ts
rename to packages/components/tabs/src/TabsContext.ts
diff --git a/packages/components/tabs/src/index.ts b/packages/components/tabs/src/index.ts
new file mode 100644
index 0000000..ca5efb2
--- /dev/null
+++ b/packages/components/tabs/src/index.ts
@@ -0,0 +1,12 @@
+export { default as Tabs } from './Tabs';
+// eslint-disable-next-line prettier/prettier
+export type { TabsProps } from './Tabs';
+export { default as Tab } from './Tab';
+// eslint-disable-next-line prettier/prettier
+export type { TabProps } from './Tab';
+export { default as TabList } from './TabList';
+// eslint-disable-next-line prettier/prettier
+export type { TabListProps } from './TabList';
+export { default as TabPanel } from './TabPanel';
+// eslint-disable-next-line prettier/prettier
+export type { TabPanelProps } from './TabPanel';
diff --git a/packages/components/tabs/tsconfig.json b/packages/components/tabs/tsconfig.json
deleted file mode 100644
index 88fa918..0000000
--- a/packages/components/tabs/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../../theming/theme" }]
-}
diff --git a/packages/components/textarea/index.ts b/packages/components/textarea/index.ts
deleted file mode 100644
index 002d364..0000000
--- a/packages/components/textarea/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, TextAreaProps } from './TextArea';
diff --git a/packages/components/textarea/package.json b/packages/components/textarea/package.json
index 68d13ac..ac97c3c 100644
--- a/packages/components/textarea/package.json
+++ b/packages/components/textarea/package.json
@@ -2,14 +2,15 @@
     "name": "@precursor/textarea",
     "version": "0.1.8",
     "description": "Textarea component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-textarea.cjs.js",
+    "module": "dist/precursor-textarea.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {},
+    "dependencies": {
+        "@trousers/macro": "4.0.0-alpha7"
+    },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/textarea/TextArea.tsx b/packages/components/textarea/src/TextArea.tsx
similarity index 97%
rename from packages/components/textarea/TextArea.tsx
rename to packages/components/textarea/src/TextArea.tsx
index 1a782e7..002f0d8 100644
--- a/packages/components/textarea/TextArea.tsx
+++ b/packages/components/textarea/src/TextArea.tsx
@@ -1,4 +1,5 @@
 import React, { FC, ChangeEventHandler } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -63,7 +64,9 @@ const styles = css('TextArea', {
     });
 
 const TextArea: FC<TextAreaProps> = props => (
+    // @ts-ignore
     <textarea
+        // @ts-ignore
         css={styles}
         disabled={props.disabled}
         id={props.id}
diff --git a/packages/components/textarea/src/index.ts b/packages/components/textarea/src/index.ts
new file mode 100644
index 0000000..53f3002
--- /dev/null
+++ b/packages/components/textarea/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './TextArea';
+// eslint-disable-next-line prettier/prettier
+export type { TextAreaProps } from './TextArea';
diff --git a/packages/components/textarea/tsconfig.json b/packages/components/textarea/tsconfig.json
deleted file mode 100644
index 88fa918..0000000
--- a/packages/components/textarea/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../../theming/theme" }]
-}
diff --git a/packages/components/toggle/index.ts b/packages/components/toggle/index.ts
deleted file mode 100644
index 53b1bb9..0000000
--- a/packages/components/toggle/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, ToggleProps } from './Toggle';
diff --git a/packages/components/toggle/package.json b/packages/components/toggle/package.json
index 24d90db..c7cd56a 100644
--- a/packages/components/toggle/package.json
+++ b/packages/components/toggle/package.json
@@ -2,18 +2,18 @@
     "name": "@precursor/toggle",
     "version": "0.1.4",
     "description": "toggle component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-toggle.cjs.js",
+    "module": "dist/precursor-toggle.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/input": "^0.1.7",
         "@precursor/label": "^0.1.7",
-        "@precursor/theme": "^0.1.7"
+        "@precursor/theme": "^0.1.7",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/components/toggle/Toggle.tsx b/packages/components/toggle/src/Toggle.tsx
similarity index 92%
rename from packages/components/toggle/Toggle.tsx
rename to packages/components/toggle/src/Toggle.tsx
index c4537a3..145a9e6 100644
--- a/packages/components/toggle/Toggle.tsx
+++ b/packages/components/toggle/src/Toggle.tsx
@@ -1,4 +1,5 @@
 import React, { FC } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 import Input, { InputProps } from '@precursor/input';
@@ -61,6 +62,7 @@ const toggleStyles = css('ToggleIndicator', {
 
 const Toggle: FC<ToggleProps> = ({ size = 'm', ...props }) => (
     <div
+        // @ts-ignore
         css={css({
             display: 'inline-flex',
             alignItems: 'center',
@@ -70,6 +72,7 @@ const Toggle: FC<ToggleProps> = ({ size = 'm', ...props }) => (
     >
         <Label htmlFor={props.id}>
             <Input
+                // @ts-ignore
                 css={css({
                     clip: 'rect(0px, 0px, 0px, 0px)',
                     height: '1px',
@@ -94,12 +97,19 @@ const Toggle: FC<ToggleProps> = ({ size = 'm', ...props }) => (
             />
             <div
                 aria-hidden="true"
+                // @ts-ignore
                 css={toggleStyles}
                 $large={size === 'l'}
                 $small={size === 's'}
                 $disabled={props.disabled}
             />
-            <span css={css({ userSelect: 'none' })}>{props.label}</span>
+
+            <span
+                // @ts-ignore
+                css={css({ userSelect: 'none' })}
+            >
+                {props.label}
+            </span>
         </Label>
     </div>
 );
diff --git a/packages/components/toggle/src/index.ts b/packages/components/toggle/src/index.ts
new file mode 100644
index 0000000..26ca5ba
--- /dev/null
+++ b/packages/components/toggle/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Toggle';
+// eslint-disable-next-line prettier/prettier
+export type { ToggleProps } from './Toggle';
diff --git a/packages/components/toggle/tsconfig.json b/packages/components/toggle/tsconfig.json
deleted file mode 100644
index 2da1429..0000000
--- a/packages/components/toggle/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [
-        { "path": "../../theming/theme" },
-        { "path": "../input" },
-        { "path": "../label" }
-    ]
-}
diff --git a/packages/elements/blockquote/index.ts b/packages/elements/blockquote/index.ts
deleted file mode 100644
index e014d23..0000000
--- a/packages/elements/blockquote/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, BlockquoteProps } from './Blockquote';
diff --git a/packages/elements/blockquote/package.json b/packages/elements/blockquote/package.json
index 9020b9e..a3a0793 100644
--- a/packages/elements/blockquote/package.json
+++ b/packages/elements/blockquote/package.json
@@ -2,16 +2,16 @@
     "name": "@precursor/blockquote",
     "version": "0.1.5",
     "description": "blockquote component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-blockquote.cjs.js",
+    "module": "dist/precursor-blockquote.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7"
+        "@precursor/theme": "^0.1.7",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/elements/blockquote/Blockquote.tsx b/packages/elements/blockquote/src/Blockquote.tsx
similarity index 94%
rename from packages/elements/blockquote/Blockquote.tsx
rename to packages/elements/blockquote/src/Blockquote.tsx
index 265d46b..907dea0 100644
--- a/packages/elements/blockquote/Blockquote.tsx
+++ b/packages/elements/blockquote/src/Blockquote.tsx
@@ -1,4 +1,5 @@
 import React, { FC } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -16,6 +17,7 @@ const styles = css('Blockquote', {
 });
 
 const Blockquote: FC<BlockquoteProps> = ({ cite, children }) => (
+    // @ts-ignore
     <blockquote css={styles} cite={cite}>
         {children}
     </blockquote>
diff --git a/packages/elements/blockquote/src/index.ts b/packages/elements/blockquote/src/index.ts
new file mode 100644
index 0000000..5015bfe
--- /dev/null
+++ b/packages/elements/blockquote/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Blockquote';
+// eslint-disable-next-line prettier/prettier
+export type { BlockquoteProps } from './Blockquote';
diff --git a/packages/elements/blockquote/tsconfig.json b/packages/elements/blockquote/tsconfig.json
deleted file mode 100644
index 88fa918..0000000
--- a/packages/elements/blockquote/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../../theming/theme" }]
-}
diff --git a/packages/elements/emoji/index.ts b/packages/elements/emoji/index.ts
deleted file mode 100644
index 63d9d13..0000000
--- a/packages/elements/emoji/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, EmojiProps } from './Emoji';
diff --git a/packages/elements/emoji/package.json b/packages/elements/emoji/package.json
index bb82abc..430fff7 100644
--- a/packages/elements/emoji/package.json
+++ b/packages/elements/emoji/package.json
@@ -2,13 +2,13 @@
     "name": "@precursor/emoji",
     "version": "0.1.3",
     "description": "Emoji component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-emoji.cjs.js",
+    "module": "dist/precursor-emoji.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {},
     "devDependencies": {
-        "react": "^16.8.1"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/elements/emoji/Emoji.tsx b/packages/elements/emoji/src/Emoji.tsx
similarity index 100%
rename from packages/elements/emoji/Emoji.tsx
rename to packages/elements/emoji/src/Emoji.tsx
diff --git a/packages/elements/emoji/src/index.ts b/packages/elements/emoji/src/index.ts
new file mode 100644
index 0000000..6e4c10e
--- /dev/null
+++ b/packages/elements/emoji/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Emoji';
+// eslint-disable-next-line prettier/prettier
+export type { EmojiProps } from './Emoji';
diff --git a/packages/elements/emoji/tsconfig.json b/packages/elements/emoji/tsconfig.json
deleted file mode 100644
index 9bea8f3..0000000
--- a/packages/elements/emoji/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": []
-}
diff --git a/packages/elements/heading/Heading.tsx b/packages/elements/heading/Heading.tsx
deleted file mode 100644
index 7a396a8..0000000
--- a/packages/elements/heading/Heading.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import React, { FC, ReactNode, Fragment } from 'react';
-import { css } from '@trousers/macro';
-
-import copyToClipboard from '@precursor/copy-to-clipboard';
-// import { Theme } from '@precursor/theme';
-
-type Headings = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
-
-export interface HeadingProps {
-    children: ReactNode;
-    id?: string;
-    as?: Headings;
-    weight?: Headings;
-}
-
-const styles = css('heading', {
-    fontFamily: 'var(--font-heading)',
-    fontWeight: 'var(--fontWeight-heading)',
-    fontSize: 'var(--fontSize-h1)',
-    lineHeight: 'var(--lineHeight-h1)',
-    color: 'var(--color-typography-heading)',
-    margin: 0,
-
-    '&:hover > a': {
-        opacity: 1,
-    },
-})
-    .modifier('h2', {
-        fontSize: 'var(--fontSize-h2)',
-        lineHeight: 'var(--lineHeight-h2)',
-    })
-    .modifier('h3', {
-        fontSize: 'var(--fontSize-h3)',
-        lineHeight: 'var(--lineHeight-h3)',
-    })
-    .modifier('h4', {
-        fontSize: 'var(--fontSize-h4)',
-        lineHeight: 'var(--lineHeight-h4)',
-    })
-    .modifier('h5', {
-        fontSize: 'var(--fontSize-h5)',
-        lineHeight: 'var(--lineHeight-h5)',
-    })
-    .modifier('h6', {
-        fontSize: 'var(--fontSize-h6)',
-        lineHeight: 'var(--lineHeight-h6)',
-    });
-
-const Heading: FC<HeadingProps> = ({
-    children,
-    weight = 'h2',
-    as: asElement,
-    id,
-}) => {
-    // TODO: we cant render out to a classname here
-    const className = useStyles(styles(weight));
-
-    function onClick() {
-        if (window && id) {
-            copyToClipboard(window.location.href);
-        }
-    }
-
-    return React.createElement(
-        asElement || weight,
-        {
-            className,
-            id,
-            onClick,
-        },
-        <Fragment>
-            {children}
-            {id && (
-                <a
-                    css={css({
-                        textDecoration: 'none',
-                        padding: '0 0.5rem',
-                        color: 'var(--color-link)',
-                        opacity: '0',
-                        borderRadius: 'var(--radius-m)',
-                        border: `var(--border-size-0 solid transparent`,
-                        ':focus': {
-                            opacity: 1,
-                            outline: 'none',
-                            border: `var(--border-size-0 solid --var(--border-color-focus)`,
-                        },
-                    })}
-                    href={`#${id}`}
-                    onClick={onClick}
-                    aria-label="anchor"
-                    $h2={weight === 'h2'}
-                    $h3={weight === 'h3'}
-                    $h4={weight === 'h4'}
-                    $h5={weight === 'h5'}
-                    $h6={weight === 'h6'}
-                >
-                    #
-                </a>
-            )}
-        </Fragment>,
-    );
-};
-
-export default Heading;
diff --git a/packages/elements/heading/index.ts b/packages/elements/heading/index.ts
deleted file mode 100644
index 63454e6..0000000
--- a/packages/elements/heading/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, HeadingProps } from './Heading';
diff --git a/packages/elements/heading/package.json b/packages/elements/heading/package.json
index 318ca58..d9c48f6 100644
--- a/packages/elements/heading/package.json
+++ b/packages/elements/heading/package.json
@@ -2,16 +2,16 @@
     "name": "@precursor/heading",
     "version": "0.1.7",
     "description": "Heading component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-heading.cjs.js",
+    "module": "dist/precursor-heading.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7"
+        "@precursor/theme": "^0.1.7",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/elements/heading/src/Heading.tsx b/packages/elements/heading/src/Heading.tsx
new file mode 100644
index 0000000..b78e050
--- /dev/null
+++ b/packages/elements/heading/src/Heading.tsx
@@ -0,0 +1,108 @@
+import React, { FC, ReactNode } from 'react';
+// // @ts-ignoreE
+// import { css } from '@trousers/macro';
+
+// import copyToClipboard from '@precursor/copy-to-clipboard';
+// import { Theme } from '@precursor/theme';
+
+type Headings = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
+
+export interface HeadingProps {
+    children: ReactNode;
+    id?: string;
+    as?: Headings;
+    weight?: Headings;
+}
+
+// const styles = css('heading', {
+//     fontFamily: 'var(--font-heading)',
+//     fontWeight: 'var(--fontWeight-heading)',
+//     fontSize: 'var(--fontSize-h1)',
+//     lineHeight: 'var(--lineHeight-h1)',
+//     color: 'var(--color-typography-heading)',
+//     margin: 0,
+
+//     '&:hover > a': {
+//         opacity: 1,
+//     },
+// })
+//     .modifier('h2', {
+//         fontSize: 'var(--fontSize-h2)',
+//         lineHeight: 'var(--lineHeight-h2)',
+//     })
+//     .modifier('h3', {
+//         fontSize: 'var(--fontSize-h3)',
+//         lineHeight: 'var(--lineHeight-h3)',
+//     })
+//     .modifier('h4', {
+//         fontSize: 'var(--fontSize-h4)',
+//         lineHeight: 'var(--lineHeight-h4)',
+//     })
+//     .modifier('h5', {
+//         fontSize: 'var(--fontSize-h5)',
+//         lineHeight: 'var(--lineHeight-h5)',
+//     })
+//     .modifier('h6', {
+//         fontSize: 'var(--fontSize-h6)',
+//         lineHeight: 'var(--lineHeight-h6)',
+//     });
+
+const Heading: FC<HeadingProps> = ({
+    children,
+    // weight = 'h2',
+    // as: asElement,
+    // id,
+}) => {
+    // // TODO: we cant render out to a classname here
+    // const className = useStyles(styles(weight));
+
+    // function onClick() {
+    //     if (window && id) {
+    //         copyToClipboard(window.location.href);
+    //     }
+    // }
+
+    // return React.createElement(
+    //     asElement || weight,
+    //     {
+    //         className,
+    //         id,
+    //         onClick,
+    //     },
+    //     <Fragment>
+    //         {children}
+    //         {id && (
+    //             <a
+    //                 // @ts-ignore
+    //                 css={css({
+    //                     textDecoration: 'none',
+    //                     padding: '0 0.5rem',
+    //                     color: 'var(--color-link)',
+    //                     opacity: '0',
+    //                     borderRadius: 'var(--radius-m)',
+    //                     border: `var(--border-size-0 solid transparent`,
+    //                     ':focus': {
+    //                         opacity: 1,
+    //                         outline: 'none',
+    //                         border: `var(--border-size-0 solid --var(--border-color-focus)`,
+    //                     },
+    //                 })}
+    //                 href={`#${id}`}
+    //                 onClick={onClick}
+    //                 aria-label="anchor"
+    //                 $h2={weight === 'h2'}
+    //                 $h3={weight === 'h3'}
+    //                 $h4={weight === 'h4'}
+    //                 $h5={weight === 'h5'}
+    //                 $h6={weight === 'h6'}
+    //             >
+    //                 #
+    //             </a>
+    //         )}
+    //     </Fragment>,
+    // );
+
+    return <p>{children}</p>;
+};
+
+export default Heading;
diff --git a/packages/elements/heading/src/index.ts b/packages/elements/heading/src/index.ts
new file mode 100644
index 0000000..277b9aa
--- /dev/null
+++ b/packages/elements/heading/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Heading';
+// eslint-disable-next-line prettier/prettier
+export type { HeadingProps } from './Heading';
diff --git a/packages/elements/heading/tsconfig.json b/packages/elements/heading/tsconfig.json
deleted file mode 100644
index dd9c207..0000000
--- a/packages/elements/heading/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [
-        { "path": "../../theming/theme" },
-        { "path": "../../common/copy-to-clipboard" }
-    ]
-}
diff --git a/packages/elements/list/index.ts b/packages/elements/list/index.ts
deleted file mode 100644
index 9c56e27..0000000
--- a/packages/elements/list/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, ListProps, ListItem, ListItemProps } from './List';
diff --git a/packages/elements/list/package.json b/packages/elements/list/package.json
index 95d1113..c089168 100644
--- a/packages/elements/list/package.json
+++ b/packages/elements/list/package.json
@@ -2,14 +2,15 @@
     "name": "@precursor/list",
     "version": "0.1.3",
     "description": "list component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-list.cjs.js",
+    "module": "dist/precursor-list.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {},
+    "dependencies": {
+        "@trousers/macro": "4.0.0-alpha7"
+    },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/elements/list/List.tsx b/packages/elements/list/src/List.tsx
similarity index 100%
rename from packages/elements/list/List.tsx
rename to packages/elements/list/src/List.tsx
diff --git a/packages/elements/list/src/index.ts b/packages/elements/list/src/index.ts
new file mode 100644
index 0000000..dc4b779
--- /dev/null
+++ b/packages/elements/list/src/index.ts
@@ -0,0 +1,3 @@
+export { default, ListItem } from './List';
+// eslint-disable-next-line prettier/prettier
+export type { ListProps, ListItemProps } from './List';
diff --git a/packages/elements/list/tsconfig.json b/packages/elements/list/tsconfig.json
deleted file mode 100644
index 9bea8f3..0000000
--- a/packages/elements/list/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": []
-}
diff --git a/packages/elements/text/index.ts b/packages/elements/text/index.ts
deleted file mode 100644
index d816459..0000000
--- a/packages/elements/text/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, TextProps } from './Text';
diff --git a/packages/elements/text/package.json b/packages/elements/text/package.json
index 6911372..b140673 100644
--- a/packages/elements/text/package.json
+++ b/packages/elements/text/package.json
@@ -2,16 +2,16 @@
     "name": "@precursor/text",
     "version": "0.1.5",
     "description": "text component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-text.cjs.js",
+    "module": "dist/precursor-text.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7"
+        "@precursor/theme": "^0.1.7",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/elements/text/Text.tsx b/packages/elements/text/src/Text.tsx
similarity index 80%
rename from packages/elements/text/Text.tsx
rename to packages/elements/text/src/Text.tsx
index 8bb4302..2923cf2 100644
--- a/packages/elements/text/Text.tsx
+++ b/packages/elements/text/src/Text.tsx
@@ -23,10 +23,7 @@ export interface TextProps {
     as?: Modifier;
 }
 
-const Text: FC<TextProps> = ({ as: modifier = 'p', children }) => {
-    const style = { margin: 0 };
-
-    return React.createElement(modifier, { style }, children);
-};
+const Text: FC<TextProps> = ({ as: modifier = 'p', children }) =>
+    React.createElement(modifier, { style: { margin: 0 } }, children);
 
 export default Text;
diff --git a/packages/elements/text/src/index.ts b/packages/elements/text/src/index.ts
new file mode 100644
index 0000000..e6289bb
--- /dev/null
+++ b/packages/elements/text/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Text';
+// eslint-disable-next-line prettier/prettier
+export type { TextProps } from './Text';
diff --git a/packages/elements/text/tsconfig.json b/packages/elements/text/tsconfig.json
deleted file mode 100644
index dd9c207..0000000
--- a/packages/elements/text/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [
-        { "path": "../../theming/theme" },
-        { "path": "../../common/copy-to-clipboard" }
-    ]
-}
diff --git a/packages/layout/grid/index.ts b/packages/layout/grid/index.ts
deleted file mode 100644
index e45fc41..0000000
--- a/packages/layout/grid/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default, GridProps } from './Grid';
-export { default as Row, RowProps } from './Row';
-export { default as Column, ColumnProps } from './Column';
diff --git a/packages/layout/grid/package.json b/packages/layout/grid/package.json
index 26089f2..70c3ef8 100644
--- a/packages/layout/grid/package.json
+++ b/packages/layout/grid/package.json
@@ -2,16 +2,16 @@
     "name": "@precursor/grid",
     "version": "0.1.4",
     "description": "grid component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-grid.cjs.js",
+    "module": "dist/precursor-grid.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/theme": "^0.1.7"
+        "@precursor/theme": "^0.1.7",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/layout/grid/Column.tsx b/packages/layout/grid/src/Column.tsx
similarity index 100%
rename from packages/layout/grid/Column.tsx
rename to packages/layout/grid/src/Column.tsx
diff --git a/packages/layout/grid/Grid.tsx b/packages/layout/grid/src/Grid.tsx
similarity index 73%
rename from packages/layout/grid/Grid.tsx
rename to packages/layout/grid/src/Grid.tsx
index 46ef060..e4f4e69 100644
--- a/packages/layout/grid/Grid.tsx
+++ b/packages/layout/grid/src/Grid.tsx
@@ -1,5 +1,6 @@
 import React, { FC, ReactNode } from 'react';
 
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 import { Theme } from '@precursor/theme';
 
@@ -18,19 +19,19 @@ const Grid: FC<GridProps> = ({
     columnGap,
     rowGap,
 }) => {
-    function getGap({ space }: Theme) {
-        const column = columnGap ? space[columnGap] : space[gap];
-        const row = rowGap ? space[rowGap] : space[gap];
+    // function getGap({ space }: Theme) {
+    //     const column = columnGap ? space[columnGap] : space[gap];
+    //     const row = rowGap ? space[rowGap] : space[gap];
 
-        return `${row} ${column}`;
-    }
+    //     return `${row} ${column}`;
+    // }
 
     return (
         <div
+            // @ts-ignore
             css={css('Grid', {
                 display: 'grid',
                 gridTemplateColumns: `repeat(${columns}, 1fr)`,
-                gap: getGap,
                 width: '100%',
             })}
         >
diff --git a/packages/layout/grid/Row.tsx b/packages/layout/grid/src/Row.tsx
similarity index 92%
rename from packages/layout/grid/Row.tsx
rename to packages/layout/grid/src/Row.tsx
index 7c397b4..fd2a320 100644
--- a/packages/layout/grid/Row.tsx
+++ b/packages/layout/grid/src/Row.tsx
@@ -1,5 +1,6 @@
 import React, { FC, ReactNode } from 'react';
 
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 export interface RowProps {
@@ -8,6 +9,7 @@ export interface RowProps {
 
 const Row: FC<RowProps> = ({ children }) => (
     <div
+        // @ts-ignore
         css={css({
             display: 'grid',
             gridTemplateColumns: 'repeat(12, 1fr)',
diff --git a/packages/layout/grid/src/index.ts b/packages/layout/grid/src/index.ts
new file mode 100644
index 0000000..6dce26f
--- /dev/null
+++ b/packages/layout/grid/src/index.ts
@@ -0,0 +1,9 @@
+export { default } from './Grid';
+// eslint-disable-next-line prettier/prettier
+export type { GridProps } from './Grid';
+export { default as Row } from './Row';
+// eslint-disable-next-line prettier/prettier
+export type { RowProps } from './Row';
+export { default as Column } from './Column';
+// eslint-disable-next-line prettier/prettier
+export type { ColumnProps } from './Column';
diff --git a/packages/layout/grid/tsconfig.json b/packages/layout/grid/tsconfig.json
deleted file mode 100644
index 88fa918..0000000
--- a/packages/layout/grid/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../../theming/theme" }]
-}
diff --git a/packages/layout/inline/index.ts b/packages/layout/inline/index.ts
deleted file mode 100644
index e2c667a..0000000
--- a/packages/layout/inline/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, InlineProps } from './Inline';
diff --git a/packages/layout/inline/package.json b/packages/layout/inline/package.json
index 338fdb8..8ece948 100644
--- a/packages/layout/inline/package.json
+++ b/packages/layout/inline/package.json
@@ -2,14 +2,15 @@
     "name": "@precursor/inline",
     "version": "0.1.1",
     "description": "inline component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-inline.cjs.js",
+    "module": "dist/precursor-inline.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {},
+    "dependencies": {
+        "@trousers/macro": "4.0.0-alpha7"
+    },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/layout/inline/Inline.tsx b/packages/layout/inline/src/Inline.tsx
similarity index 96%
rename from packages/layout/inline/Inline.tsx
rename to packages/layout/inline/src/Inline.tsx
index 2e3ff36..18e6bc0 100644
--- a/packages/layout/inline/Inline.tsx
+++ b/packages/layout/inline/src/Inline.tsx
@@ -1,5 +1,6 @@
 import React, { Children, FC, ReactNode } from 'react';
 
+// @ts-ignore
 import { css } from '@trousers/macro';
 import { Theme } from '@precursor/theme';
 
@@ -15,6 +16,7 @@ const Inline: FC<InlineProps> = ({
     justify = 'flex-start',
 }) => (
     <span
+        // @ts-ignore
         css={css('Inline', {
             display: 'flex',
             flexDirection: 'row',
diff --git a/packages/layout/inline/src/index.ts b/packages/layout/inline/src/index.ts
new file mode 100644
index 0000000..10fae4d
--- /dev/null
+++ b/packages/layout/inline/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Inline';
+// eslint-disable-next-line prettier/prettier
+export type { InlineProps } from './Inline';
diff --git a/packages/layout/inline/tsconfig.json b/packages/layout/inline/tsconfig.json
deleted file mode 100644
index 9bea8f3..0000000
--- a/packages/layout/inline/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": []
-}
diff --git a/packages/layout/stack/index.ts b/packages/layout/stack/index.ts
deleted file mode 100644
index b859868..0000000
--- a/packages/layout/stack/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default, StackProps } from './Stack';
diff --git a/packages/layout/stack/package.json b/packages/layout/stack/package.json
index f6e3d3d..d5ccbc9 100644
--- a/packages/layout/stack/package.json
+++ b/packages/layout/stack/package.json
@@ -2,14 +2,15 @@
     "name": "@precursor/stack",
     "version": "0.1.5",
     "description": "stack component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-stack.cjs.js",
+    "module": "dist/precursor-stack.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
-    "dependencies": {},
+    "dependencies": {
+        "@trousers/macro": "4.0.0-alpha7"
+    },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/layout/stack/Stack.tsx b/packages/layout/stack/src/Stack.tsx
similarity index 93%
rename from packages/layout/stack/Stack.tsx
rename to packages/layout/stack/src/Stack.tsx
index 04658d0..8b1c033 100644
--- a/packages/layout/stack/Stack.tsx
+++ b/packages/layout/stack/src/Stack.tsx
@@ -1,4 +1,5 @@
 import React, { FC, ReactNode } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 import { Theme } from '@precursor/theme';
@@ -10,6 +11,7 @@ export interface StackProps {
 
 const Stack: FC<StackProps> = ({ gap = 'm', children }) => (
     <div
+        // @ts-ignore
         css={css('Stack', {
             display: 'grid',
             gridTemplateColumns: 'repeat(1, 1fr)',
diff --git a/packages/layout/stack/src/index.ts b/packages/layout/stack/src/index.ts
new file mode 100644
index 0000000..f288616
--- /dev/null
+++ b/packages/layout/stack/src/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Stack';
+// eslint-disable-next-line prettier/prettier
+export type { StackProps } from './Stack';
diff --git a/packages/layout/stack/tsconfig.json b/packages/layout/stack/tsconfig.json
deleted file mode 100644
index 9bea8f3..0000000
--- a/packages/layout/stack/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": []
-}
diff --git a/packages/theming/theme/ThemeProvider.tsx b/packages/theming/theme/ThemeProvider.tsx
deleted file mode 100644
index 57a0aeb..0000000
--- a/packages/theming/theme/ThemeProvider.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React, { FC, ReactNode } from 'react';
-import { css } from '@trousers/macro';
-
-import defaultTheme, { Theme } from './theme';
-import Globals from './Globals';
-
-export interface Props {
-    theme?: Theme;
-    children: ReactNode;
-}
-
-const ThemeProvider: FC<Props> = ({ theme = defaultTheme, children }) => (
-    <span css={css('Theme', {}).theme(theme)}>
-        <Globals />
-        {children}
-    </span>
-);
-
-export default ThemeProvider;
diff --git a/packages/theming/theme/index.ts b/packages/theming/theme/index.ts
deleted file mode 100644
index 563eaad..0000000
--- a/packages/theming/theme/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as theme, Theme } from './theme';
-export { default as ThemeProvider } from './ThemeProvider';
-export { default as Globals } from './Globals';
diff --git a/packages/theming/theme/package.json b/packages/theming/theme/package.json
index 5e1ed18..eee3e6b 100644
--- a/packages/theming/theme/package.json
+++ b/packages/theming/theme/package.json
@@ -2,16 +2,16 @@
     "name": "@precursor/theme",
     "version": "0.1.7",
     "description": "Theme component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-theme.cjs.js",
+    "module": "dist/precursor-theme.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@precursor/tokens": "^0.1.1"
+        "@precursor/tokens": "^0.1.1",
+        "@trousers/macro": "4.0.0-alpha7"
     },
     "devDependencies": {
-        "react": "^16.8.1",
-        "@trousers/macro": "4.0.0-alpha5"
+        "react": "^17.0.1"
     },
     "peerDependencies": {
         "react": ">=16.8.0"
diff --git a/packages/theming/theme/Globals.tsx b/packages/theming/theme/src/Globals.tsx
similarity index 95%
rename from packages/theming/theme/Globals.tsx
rename to packages/theming/theme/src/Globals.tsx
index b55b7e1..f4fb9ae 100644
--- a/packages/theming/theme/Globals.tsx
+++ b/packages/theming/theme/src/Globals.tsx
@@ -1,4 +1,5 @@
 import React, { FC } from 'react';
+// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from './theme';
@@ -21,6 +22,7 @@ const reset = css({}).global({
 });
 
 const Globals: FC = () => {
+    // @ts-ignore
     return <span css={reset} />; // TODO: this isn't great
 };
 
diff --git a/packages/theming/theme/src/ThemeProvider.tsx b/packages/theming/theme/src/ThemeProvider.tsx
new file mode 100644
index 0000000..4c91a5c
--- /dev/null
+++ b/packages/theming/theme/src/ThemeProvider.tsx
@@ -0,0 +1,21 @@
+import React, { FC, ReactNode } from 'react';
+// // @ts-ignore
+// import { css } from '@trousers/macro';
+
+// import defaultTheme, { Theme } from './theme';
+// import Globals from './Globals';
+
+export interface Props {
+    theme?: Theme;
+    children: ReactNode;
+}
+
+const ThemeProvider: FC<Props> = ({ /*theme = defaultTheme,*/ children }) => (
+    // @ts-ignore
+    // <span css={css('Theme', {}).theme(theme)}>
+    // <Globals />
+    <span>{children}</span>
+    // </span>
+);
+
+export default ThemeProvider;
diff --git a/packages/theming/theme/src/index.ts b/packages/theming/theme/src/index.ts
new file mode 100644
index 0000000..a367436
--- /dev/null
+++ b/packages/theming/theme/src/index.ts
@@ -0,0 +1,5 @@
+export { default as theme } from './theme';
+// eslint-disable-next-line prettier/prettier
+export type { Theme } from './theme';
+export { default as ThemeProvider } from './ThemeProvider';
+export { default as Globals } from './Globals';
diff --git a/packages/theming/theme/theme.ts b/packages/theming/theme/src/theme.ts
similarity index 100%
rename from packages/theming/theme/theme.ts
rename to packages/theming/theme/src/theme.ts
diff --git a/packages/theming/theme/tsconfig.json b/packages/theming/theme/tsconfig.json
deleted file mode 100644
index 495bdcc..0000000
--- a/packages/theming/theme/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": [{ "path": "../tokens" }]
-}
diff --git a/packages/theming/tokens/package.json b/packages/theming/tokens/package.json
index 9cf21ae..0d5ac39 100644
--- a/packages/theming/tokens/package.json
+++ b/packages/theming/tokens/package.json
@@ -2,8 +2,8 @@
     "name": "@precursor/tokens",
     "version": "0.1.1",
     "description": "tokens component",
-    "main": "dist/index.js",
-    "module": "dist/index.js",
+    "main": "dist/precursor-tokens.cjs.js",
+    "module": "dist/precursor-tokens.esm.js",
     "types": "dist/index.d.ts",
     "license": "MIT",
     "dependencies": {},
diff --git a/packages/theming/tokens/index.ts b/packages/theming/tokens/src/index.ts
similarity index 100%
rename from packages/theming/tokens/index.ts
rename to packages/theming/tokens/src/index.ts
diff --git a/packages/theming/tokens/tokens.ts b/packages/theming/tokens/src/tokens.ts
similarity index 100%
rename from packages/theming/tokens/tokens.ts
rename to packages/theming/tokens/src/tokens.ts
diff --git a/packages/theming/tokens/tsconfig.json b/packages/theming/tokens/tsconfig.json
deleted file mode 100644
index 9bea8f3..0000000
--- a/packages/theming/tokens/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "include": ["*.tsx", "*.ts"],
-    "extends": "../../../tsconfig.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": ".",
-        "baseUrl": "."
-    },
-    "references": []
-}
diff --git a/tsconfig.json b/tsconfig.json
index d078fa7..08ebd9c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,25 +1,26 @@
 {
     "compilerOptions": {
         "baseUrl": ".",
-        "rootDir": ".",
-        "module": "es6",
         "target": "es5",
-        "outDir": "lib",
-        "moduleResolution": "node",
-        "lib": ["dom", "es2016", "es2017.object"],
+        "module": "commonjs",
+        "lib": ["dom", "es2017"],
         "jsx": "react",
+        "preserveSymlinks": true,
+        "moduleResolution": "node",
+        "importHelpers": true,
+        "declaration": true,
+        "pretty": true,
+        "sourceMap": true,
+        "inlineSources": true,
+        "resolveJsonModule": true,
+        "noEmit": true,
         "strict": true,
         "noUnusedLocals": true,
         "noUnusedParameters": true,
         "noImplicitReturns": true,
         "allowSyntheticDefaultImports": true,
         "esModuleInterop": true,
-        "composite": true,
-        "incremental": true,
-        "declaration": true,
-        "declarationMap": true,
-        "sourceMap": true,
-        "downlevelIteration": true,
+        "allowJs": true,
         "paths": {
             "@precursor/*": [
                 "packages/common/*/",
@@ -31,7 +32,6 @@
             "@emotion/core": ["typings/emotion.d.ts"]
         }
     },
-    "files": [],
     "exclude": [
         "node_modules",
         "dist",
@@ -41,41 +41,5 @@
         "**/*.spec*",
         "examples",
         "fixtures"
-    ],
-    "references": [
-        { "path": "packages/common/copy-to-clipboard" },
-        { "path": "packages/common/types" },
-        { "path": "packages/components/avatar" },
-        { "path": "packages/components/badge" },
-        { "path": "packages/components/button" },
-        { "path": "packages/components/checkbox" },
-        { "path": "packages/components/code" },
-        { "path": "packages/components/image" },
-        { "path": "packages/components/input" },
-        { "path": "packages/components/keyboard" },
-        { "path": "packages/components/label" },
-        { "path": "packages/components/lozenge" },
-        { "path": "packages/components/message" },
-        { "path": "packages/components/modal" },
-        { "path": "packages/components/overlay" },
-        { "path": "packages/components/panel" },
-        { "path": "packages/components/radio" },
-        { "path": "packages/components/range" },
-        { "path": "packages/components/select" },
-        { "path": "packages/components/skeleton" },
-        { "path": "packages/components/spinner" },
-        { "path": "packages/components/tabs" },
-        { "path": "packages/components/textarea" },
-        { "path": "packages/components/toggle" },
-        { "path": "packages/elements/blockquote" },
-        { "path": "packages/elements/emoji" },
-        { "path": "packages/elements/heading" },
-        { "path": "packages/elements/list" },
-        { "path": "packages/elements/text" },
-        { "path": "packages/layout/grid" },
-        { "path": "packages/layout/inline" },
-        { "path": "packages/layout/stack" },
-        { "path": "packages/theming/theme" },
-        { "path": "packages/theming/tokens" }
     ]
 }
diff --git a/yarn.lock b/yarn.lock
index 0de19d6..808e332 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,12 +2,12 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@7.5.5":
-  version "7.5.5"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
-  integrity sha1-vAeC9tafe31JUxIZaZuYj2aaj50=
+"@babel/code-frame@7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
+  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
   dependencies:
-    "@babel/highlight" "^7.0.0"
+    "@babel/highlight" "^7.8.3"
 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.1":
   version "7.10.1"
@@ -16,16 +16,19 @@
   dependencies:
     "@babel/highlight" "^7.10.1"
 
-"@babel/compat-data@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/compat-data/-/compat-data-7.10.1.tgz#b1085ffe72cd17bf2c0ee790fc09f9626011b2db"
-  integrity sha1-sQhf/nLNF78sDueQ/An5YmARsts=
+"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.5.5":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
+  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
   dependencies:
-    browserslist "^4.12.0"
-    invariant "^2.2.4"
-    semver "^5.5.0"
+    "@babel/highlight" "^7.12.13"
+
+"@babel/compat-data@^7.13.0", "@babel/compat-data@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.8.tgz#5b783b9808f15cef71547f1b691f34f8ff6003a6"
+  integrity sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==
 
-"@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@^7.7.5":
+"@babel/core@^7.1.0", "@babel/core@^7.7.5":
   version "7.10.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/core/-/core-7.10.2.tgz#bd6786046668a925ac2bd2fd95b579b92a23b36a"
   integrity sha1-vWeGBGZoqSWsK9L9lbV5uSojs2o=
@@ -47,6 +50,28 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
+"@babel/core@^7.12.3", "@babel/core@^7.12.7", "@babel/core@^7.7.7":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.8.tgz#c191d9c5871788a591d69ea1dc03e5843a3680fb"
+  integrity sha512-oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.13.0"
+    "@babel/helper-compilation-targets" "^7.13.8"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helpers" "^7.13.0"
+    "@babel/parser" "^7.13.4"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    lodash "^4.17.19"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.10.1", "@babel/generator@^7.10.2":
   version "7.10.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/generator/-/generator-7.10.2.tgz#0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9"
@@ -57,6 +82,15 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
+"@babel/generator@^7.13.0":
+  version "7.13.9"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
+  integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
+  dependencies:
+    "@babel/types" "^7.13.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.10.1":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz#f6d08acc6f70bbd59b436262553fb2e259a1a268"
@@ -64,55 +98,43 @@
   dependencies:
     "@babel/types" "^7.10.1"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz#0ec7d9be8174934532661f87783eb18d72290059"
-  integrity sha1-DsfZvoF0k0UyZh+HeD6xjXIpAFk=
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.10.1"
-    "@babel/types" "^7.10.1"
-
-"@babel/helper-builder-react-jsx-experimental@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.1.tgz#9a7d58ad184d3ac3bafb1a452cec2bad7e4a0bc8"
-  integrity sha1-mn1YrRhNOsO6+xpFLOwrrX5KC8g=
+"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
+  integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.12.13"
 
-"@babel/helper-builder-react-jsx@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.1.tgz#a327f0cf983af5554701b1215de54a019f09b532"
-  integrity sha1-oyfwz5g69VVHAbEhXeVKAZ8JtTI=
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
+  integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-explode-assignable-expression" "^7.12.13"
+    "@babel/types" "^7.12.13"
 
-"@babel/helper-compilation-targets@^7.10.2":
-  version "7.10.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz#a17d9723b6e2c750299d2a14d4637c76936d8285"
-  integrity sha1-oX2XI7bix1ApnSoU1GN8dpNtgoU=
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz#02bdb22783439afb11b2f009814bdd88384bd468"
+  integrity sha512-pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A==
   dependencies:
-    "@babel/compat-data" "^7.10.1"
-    browserslist "^4.12.0"
-    invariant "^2.2.4"
-    levenary "^1.1.1"
-    semver "^5.5.0"
+    "@babel/compat-data" "^7.13.8"
+    "@babel/helper-validator-option" "^7.12.17"
+    browserslist "^4.14.5"
+    semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.10.1":
-  version "7.10.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz#7474295770f217dbcf288bf7572eb213db46ee67"
-  integrity sha1-dHQpV3DyF9vPKIv3Vy6yE9tG7mc=
+"@babel/helper-create-class-features-plugin@^7.13.0":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz#0367bd0a7505156ce018ca464f7ac91ba58c1a04"
+  integrity sha512-qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w==
   dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-member-expression-to-functions" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-member-expression-to-functions" "^7.13.0"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.13.0"
+    "@babel/helper-split-export-declaration" "^7.12.13"
 
-"@babel/helper-create-regexp-features-plugin@^7.10.1", "@babel/helper-create-regexp-features-plugin@^7.8.3":
+"@babel/helper-create-regexp-features-plugin@^7.10.1":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz#1b8feeab1594cbcfbf3ab5a3bbcabac0468efdbd"
   integrity sha1-G4/uqxWUy8+/OrWju8q6wEaO/b0=
@@ -121,22 +143,34 @@
     "@babel/helper-regex" "^7.10.1"
     regexpu-core "^4.7.0"
 
-"@babel/helper-define-map@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz#5e69ee8308648470dd7900d159c044c10285221d"
-  integrity sha1-XmnugwhkhHDdeQDRWcBEwQKFIh0=
+"@babel/helper-create-regexp-features-plugin@^7.12.13":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7"
+  integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==
   dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/types" "^7.10.1"
-    lodash "^4.17.13"
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    regexpu-core "^4.7.1"
 
-"@babel/helper-explode-assignable-expression@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz#e9d76305ee1162ca467357ae25df94f179af2b7e"
-  integrity sha1-6ddjBe4RYspGc1euJd+U8XmvK34=
+"@babel/helper-define-polyfill-provider@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz#3c2f91b7971b9fc11fe779c945c014065dea340e"
+  integrity sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==
   dependencies:
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
+"@babel/helper-explode-assignable-expression@^7.12.13":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f"
+  integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==
+  dependencies:
+    "@babel/types" "^7.13.0"
 
 "@babel/helper-function-name@^7.10.1":
   version "7.10.1"
@@ -147,6 +181,15 @@
     "@babel/template" "^7.10.1"
     "@babel/types" "^7.10.1"
 
+"@babel/helper-function-name@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
+  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-get-function-arity@^7.10.1":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz#7303390a81ba7cb59613895a192b93850e373f7d"
@@ -154,12 +197,20 @@
   dependencies:
     "@babel/types" "^7.10.1"
 
-"@babel/helper-hoist-variables@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz#7e77c82e5dcae1ebf123174c385aaadbf787d077"
-  integrity sha1-fnfILl3K4evxIxdMOFqq2/eH0Hc=
+"@babel/helper-get-function-arity@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
+  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-hoist-variables@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz#5d5882e855b5c5eda91e0cadc26c6e7a2c8593d8"
+  integrity sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==
+  dependencies:
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
 
 "@babel/helper-member-expression-to-functions@^7.10.1":
   version "7.10.1"
@@ -168,6 +219,13 @@
   dependencies:
     "@babel/types" "^7.10.1"
 
+"@babel/helper-member-expression-to-functions@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz#6aa4bb678e0f8c22f58cdb79451d30494461b091"
+  integrity sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==
+  dependencies:
+    "@babel/types" "^7.13.0"
+
 "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.1":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz#dd331bd45bccc566ce77004e9d05fe17add13876"
@@ -175,6 +233,13 @@
   dependencies:
     "@babel/types" "^7.10.1"
 
+"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0"
+  integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-module-transforms@^7.10.1":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz#24e2f08ee6832c60b157bb0936c86bef7210c622"
@@ -188,6 +253,21 @@
     "@babel/types" "^7.10.1"
     lodash "^4.17.13"
 
+"@babel/helper-module-transforms@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz#42eb4bd8eea68bab46751212c357bfed8b40f6f1"
+  integrity sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.13.0"
+    "@babel/helper-simple-access" "^7.12.13"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+    lodash "^4.17.19"
+
 "@babel/helper-optimise-call-expression@^7.10.1":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz#b4a1f2561870ce1247ceddb02a3860fa96d72543"
@@ -195,11 +275,23 @@
   dependencies:
     "@babel/types" "^7.10.1"
 
+"@babel/helper-optimise-call-expression@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
+  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.1", "@babel/helper-plugin-utils@^7.8.0":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz#ec5a5cf0eec925b66c60580328b122c01230a127"
   integrity sha1-7Fpc8O7JJbZsYFgDKLEiwBIwoSc=
 
+"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
+  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
+
 "@babel/helper-regex@^7.10.1":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-regex/-/helper-regex-7.10.1.tgz#021cf1a7ba99822f993222a001cc3fec83255b96"
@@ -207,16 +299,14 @@
   dependencies:
     lodash "^4.17.13"
 
-"@babel/helper-remap-async-to-generator@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz#bad6aaa4ff39ce8d4b82ccaae0bfe0f7dbb5f432"
-  integrity sha1-utaqpP85zo1Lgsyq4L/g99u19DI=
+"@babel/helper-remap-async-to-generator@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209"
+  integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-wrap-function" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-wrap-function" "^7.13.0"
+    "@babel/types" "^7.13.0"
 
 "@babel/helper-replace-supers@^7.10.1":
   version "7.10.1"
@@ -228,6 +318,16 @@
     "@babel/traverse" "^7.10.1"
     "@babel/types" "^7.10.1"
 
+"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24"
+  integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.13.0"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
 "@babel/helper-simple-access@^7.10.1":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz#08fb7e22ace9eb8326f7e3920a1c2052f13d851e"
@@ -236,6 +336,20 @@
     "@babel/template" "^7.10.1"
     "@babel/types" "^7.10.1"
 
+"@babel/helper-simple-access@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4"
+  integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
+  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
+  dependencies:
+    "@babel/types" "^7.12.1"
+
 "@babel/helper-split-export-declaration@^7.10.1":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz#c6f4be1cbc15e3a868e4c64a17d5d31d754da35f"
@@ -243,20 +357,37 @@
   dependencies:
     "@babel/types" "^7.10.1"
 
+"@babel/helper-split-export-declaration@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
+  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-validator-identifier@^7.10.1":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz#5770b0c1a826c4f53f5ede5e153163e0318e94b5"
   integrity sha1-V3CwwagmxPU/Xt5eFTFj4DGOlLU=
 
-"@babel/helper-wrap-function@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz#956d1310d6696257a7afd47e4c42dfda5dfcedc9"
-  integrity sha1-lW0TENZpYlenr9R+TELf2l387ck=
+"@babel/helper-validator-identifier@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+
+"@babel/helper-validator-option@^7.12.17":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
+  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
+
+"@babel/helper-wrap-function@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4"
+  integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==
   dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
 
 "@babel/helpers@^7.10.1":
   version "7.10.1"
@@ -267,7 +398,16 @@
     "@babel/traverse" "^7.10.1"
     "@babel/types" "^7.10.1"
 
-"@babel/highlight@^7.0.0", "@babel/highlight@^7.10.1":
+"@babel/helpers@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.0.tgz#7647ae57377b4f0408bf4f8a7af01c42e41badc0"
+  integrity sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ==
+  dependencies:
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
+"@babel/highlight@^7.10.1":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/highlight/-/highlight-7.10.1.tgz#841d098ba613ba1a427a2b383d79e35552c38ae0"
   integrity sha1-hB0Ji6YTuhpCeis4PXnjVVLDiuA=
@@ -276,94 +416,152 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.12.13", "@babel/highlight@^7.8.3":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.8.tgz#10b2dac78526424dfc1f47650d0e415dfd9dc481"
+  integrity sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
 "@babel/parser@^7.1.0", "@babel/parser@^7.10.1", "@babel/parser@^7.10.2":
   version "7.10.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0"
   integrity sha1-hxgH8QRCuS/5fkeDubVPagyoEtA=
 
-"@babel/plugin-proposal-async-generator-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz#6911af5ba2e615c4ff3c497fe2f47b35bf6d7e55"
-  integrity sha1-aRGvW6LmFcT/PEl/4vR7Nb9tflU=
+"@babel/parser@^7.12.10", "@babel/parser@^7.12.13", "@babel/parser@^7.13.0", "@babel/parser@^7.13.4":
+  version "7.13.9"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.9.tgz#ca34cb95e1c2dd126863a84465ae8ef66114be99"
+  integrity sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==
+
+"@babel/plugin-proposal-async-generator-functions@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz#87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1"
+  integrity sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-remap-async-to-generator" "^7.10.1"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-remap-async-to-generator" "^7.13.0"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.10.1", "@babel/plugin-proposal-class-properties@^7.7.0":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz#046bc7f6550bb08d9bd1d4f060f5f5a4f1087e01"
-  integrity sha1-BGvH9lULsI2b0dTwYPX1pPEIfgE=
+"@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37"
+  integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz#e36979dc1dc3b73f6d6816fc4951da2363488ef0"
-  integrity sha1-42l53B3Dtz9taBb8SVHaI2NIjvA=
+"@babel/plugin-proposal-decorators@^7.12.1":
+  version "7.13.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.5.tgz#d28071457a5ba8ee1394b23e38d5dcf32ea20ef7"
+  integrity sha512-i0GDfVNuoapwiheevUOuSW67mInqJ8qw7uWfpjNVeHMn143kXblEy/bmL9AdZ/0yf/4BMQeWXezK0tQIvNPqag==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-decorators" "^7.12.13"
 
-"@babel/plugin-proposal-json-strings@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz#b1e691ee24c651b5a5e32213222b2379734aff09"
-  integrity sha1-seaR7iTGUbWl4yITIisjeXNK/wk=
+"@babel/plugin-proposal-dynamic-import@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d"
+  integrity sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz#02dca21673842ff2fe763ac253777f235e9bbf78"
-  integrity sha1-AtyiFnOEL/L+djrCU3d/I16bv3g=
+"@babel/plugin-proposal-export-default-from@^7.12.1":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.13.tgz#f110284108a9b2b96f01b15b3be9e54c2610a989"
+  integrity sha512-idIsBT+DGXdOHL82U+8bwX4goHm/z10g8sGGrQroh+HCRcm7mDv/luaGdWJQMTuCX2FsdXS7X0Nyyzp4znAPJA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/plugin-syntax-export-default-from" "^7.12.13"
 
-"@babel/plugin-proposal-numeric-separator@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz#a9a38bc34f78bdfd981e791c27c6fdcec478c123"
-  integrity sha1-qaOLw094vf2YHnkcJ8b9zsR4wSM=
+"@babel/plugin-proposal-export-namespace-from@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d"
+  integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-object-rest-spread@^7.10.1", "@babel/plugin-proposal-object-rest-spread@^7.6.2":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz#cba44908ac9f142650b4a65b8aa06bf3478d5fb6"
-  integrity sha1-y6RJCKyfFCZQtKZbiqBr80eNX7Y=
+"@babel/plugin-proposal-json-strings@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b"
+  integrity sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz#c9f86d99305f9fa531b568ff5ab8c964b8b223d2"
-  integrity sha1-yfhtmTBfn6UxtWj/WrjJZLiyI9I=
+"@babel/plugin-proposal-logical-assignment-operators@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a"
+  integrity sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-optional-chaining@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz#15f5d6d22708629451a91be28f8facc55b0e818c"
-  integrity sha1-FfXW0icIYpRRqRvij4+sxVsOgYw=
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3"
+  integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz#ed85e8058ab0fe309c3f448e5e1b73ca89cdb598"
-  integrity sha1-7YXoBYqw/jCcP0SOXhtzyonNtZg=
+"@babel/plugin-proposal-numeric-separator@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db"
+  integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
+"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz#5d210a4d727d6ce3b18f9de82cc99a3964eed60a"
+  integrity sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==
+  dependencies:
+    "@babel/compat-data" "^7.13.8"
+    "@babel/helper-compilation-targets" "^7.13.8"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.13.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.10.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+"@babel/plugin-proposal-optional-catch-binding@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107"
+  integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
+"@babel/plugin-proposal-optional-chaining@^7.12.1", "@babel/plugin-proposal-optional-chaining@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz#e39df93efe7e7e621841babc197982e140e90756"
+  integrity sha512-hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+"@babel/plugin-proposal-private-methods@^7.12.1", "@babel/plugin-proposal-private-methods@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"
+  integrity sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
+  integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz#dc04feb25e2dd70c12b05d680190e138fa2c0c6f"
   integrity sha1-3AT+sl4t1wwSsF1oAZDhOPosDG8=
@@ -371,7 +569,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.10.1"
     "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
+"@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha1-qYP7Gusuw/btBCohD2QOkOeG/g0=
@@ -385,26 +583,54 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.10.1", "@babel/plugin-syntax-class-properties@^7.8.3":
+"@babel/plugin-syntax-class-properties@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-syntax-class-properties@^7.8.3":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz#d5bc0645913df5b17ad7eda0fa2308330bde34c5"
   integrity sha1-1bwGRZE99bF61+2g+iMIMwveNMU=
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.8.0":
+"@babel/plugin-syntax-decorators@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz#fac829bf3c7ef4a1bc916257b403e58c6bdaf648"
+  integrity sha512-Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
-  integrity sha1-Yr+Ysto80h1iYVT8lu5bPLaOrLM=
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-flow@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.1.tgz#cd4bbca62fb402babacb174f64f8734310d742f0"
-  integrity sha1-zUu8pi+0Arq6yxdPZPhzQxDXQvA=
+"@babel/plugin-syntax-export-default-from@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.13.tgz#3c807d37efaf0a806f1deb556ccb3b2f562ae9c2"
+  integrity sha512-gVry0zqoums0hA+EniCYK3gABhjYSLX1dVuwYpPw9DrLNA4/GovXySHVg4FGRsZht09ON/5C2NVx3keq+qqVGQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-syntax-export-namespace-from@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-flow@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz#5df9962503c0a9c918381c929d51d4d6949e7e86"
+  integrity sha512-J/RYxnlSLXZLVR7wTRsozxKT8qbsx1mNKJzXEEjQ0Kjx1ZACcyHgbanNWNCFtc36IzuWhYWPpvJFFoexoOWFmA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.1"
@@ -413,19 +639,26 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
+"@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha1-AcohtmjNghjJ5kDLbdiMVBKyyWo=
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.1.tgz#0ae371134a42b91d5418feb3c8c8d43e1565d2da"
-  integrity sha1-CuNxE0pCuR1UGP6zyMjUPhVl0to=
+"@babel/plugin-syntax-jsx@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz#044fb81ebad6698fe62c478875575bcbb9b70f15"
+  integrity sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.1"
@@ -434,108 +667,128 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha1-Fn7XA2iIYIH3S1w2xlqIwDtm0ak=
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.10.1", "@babel/plugin-syntax-numeric-separator@^7.8.3":
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-numeric-separator@^7.8.3":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz#25761ee7410bc8cf97327ba741ee94e4a61b7d99"
   integrity sha1-JXYe50ELyM+XMnunQe6U5KYbfZk=
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha1-YOIl7cvZimQDMqLnLdPmbxr1WHE=
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha1-YRGiZbz7Ag6579D9/X0mQCue1sE=
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha1-T2nCq5UWfgGAzVM2YT+MV4j31Io=
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz#8b8733f8c57397b3eaa47ddba8841586dcaef362"
-  integrity sha1-i4cz+MVzl7PqpH3bqIQVhtyu82I=
+"@babel/plugin-syntax-top-level-await@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
+  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-arrow-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz#cb5ee3a36f0863c06ead0b409b4cc43a889b295b"
-  integrity sha1-y17jo28IY8BurQtAm0zEOoibKVs=
+"@babel/plugin-syntax-typescript@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474"
+  integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-async-to-generator@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz#e5153eb1a3e028f79194ed8a7a4bf55f862b2062"
-  integrity sha1-5RU+saPgKPeRlO2Kekv1X4YrIGI=
+"@babel/plugin-transform-arrow-functions@^7.12.1", "@babel/plugin-transform-arrow-functions@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
+  integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==
   dependencies:
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-remap-async-to-generator" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
-"@babel/plugin-transform-block-scoped-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz#146856e756d54b20fff14b819456b3e01820b85d"
-  integrity sha1-FGhW51bVSyD/8UuBlFaz4BgguF0=
+"@babel/plugin-transform-async-to-generator@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
+  integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-remap-async-to-generator" "^7.13.0"
 
-"@babel/plugin-transform-block-scoping@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz#47092d89ca345811451cd0dc5d91605982705d5e"
-  integrity sha1-Rwktico0WBFFHNDcXZFgWYJwXV4=
+"@babel/plugin-transform-block-scoped-functions@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
+  integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    lodash "^4.17.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-classes@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz#6e11dd6c4dfae70f540480a4702477ed766d733f"
-  integrity sha1-bhHdbE365w9UBICkcCR37XZtcz8=
+"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61"
+  integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-define-map" "^7.10.1"
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b"
+  integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-replace-supers" "^7.13.0"
+    "@babel/helper-split-export-declaration" "^7.12.13"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz#59aa399064429d64dce5cf76ef9b90b7245ebd07"
-  integrity sha1-Wao5kGRCnWTc5c9275uQtyRevQc=
+"@babel/plugin-transform-computed-properties@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
+  integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
-"@babel/plugin-transform-destructuring@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz#abd58e51337815ca3a22a336b85f62b998e71907"
-  integrity sha1-q9WOUTN4Fco6IqM2uF9iuZjnGQc=
+"@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz#c5dce270014d4e1ebb1d806116694c12b7028963"
+  integrity sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-dotall-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
+  integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-dotall-regex@^7.10.1", "@babel/plugin-transform-dotall-regex@^7.4.4":
+"@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz#920b9fec2d78bb57ebb64a644d5c2ba67cc104ee"
   integrity sha1-kguf7C14u1frtkpkTVwrpnzBBO4=
@@ -543,337 +796,325 @@
     "@babel/helper-create-regexp-features-plugin" "^7.10.1"
     "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-duplicate-keys@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz#c900a793beb096bc9d4d0a9d0cde19518ffc83b9"
-  integrity sha1-yQCnk76wlrydTQqdDN4ZUY/8g7k=
+"@babel/plugin-transform-duplicate-keys@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
+  integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-exponentiation-operator@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz#279c3116756a60dd6e6f5e488ba7957db9c59eb3"
-  integrity sha1-J5wxFnVqYN1ub15Ii6eVfbnFnrM=
+"@babel/plugin-transform-exponentiation-operator@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
+  integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-flow-strip-types@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.10.1.tgz#59eafbff9ae85ec8932d4c16c068654be814ec5e"
-  integrity sha1-Wer7/5roXsiTLUwWwGhlS+gU7F4=
+"@babel/plugin-transform-flow-strip-types@^7.12.13":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.13.0.tgz#58177a48c209971e8234e99906cb6bd1122addd3"
+  integrity sha512-EXAGFMJgSX8gxWD7PZtW/P6M+z74jpx3wm/+9pn+c2dOawPpBkUX7BrfyPvo6ZpXbgRIEuwgwDb/MGlKvu2pOg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-flow" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-flow" "^7.12.13"
 
-"@babel/plugin-transform-for-of@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz#ff01119784eb0ee32258e8646157ba2501fcfda5"
-  integrity sha1-/wERl4TrDuMiWOhkYVe6JQH8/aU=
+"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062"
+  integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
-"@babel/plugin-transform-function-name@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz#4ed46fd6e1d8fde2a2ec7b03c66d853d2c92427d"
-  integrity sha1-TtRv1uHY/eKi7HsDxm2FPSySQn0=
+"@babel/plugin-transform-function-name@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
+  integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
   dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz#5794f8da82846b22e4e6631ea1658bce708eb46a"
-  integrity sha1-V5T42oKEayLk5mMeoWWLznCOtGo=
+"@babel/plugin-transform-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
+  integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-member-expression-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz#90347cba31bca6f394b3f7bd95d2bbfd9fce2f39"
-  integrity sha1-kDR8ujG8pvOUs/e9ldK7/Z/OLzk=
+"@babel/plugin-transform-member-expression-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
+  integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-modules-amd@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz#65950e8e05797ebd2fe532b96e19fc5482a1d52a"
-  integrity sha1-ZZUOjgV5fr0v5TK5bhn8VIKh1So=
+"@babel/plugin-transform-modules-amd@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz#19f511d60e3d8753cc5a6d4e775d3a5184866cc3"
+  integrity sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz#d5ff4b4413ed97ffded99961056e1fb980fb9301"
-  integrity sha1-1f9LRBPtl//e2ZlhBW4fuYD7kwE=
+"@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.7.5":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz#7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b"
+  integrity sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-simple-access" "^7.10.1"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-simple-access" "^7.12.13"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz#9962e4b0ac6aaf2e20431ada3d8ec72082cbffb6"
-  integrity sha1-mWLksKxqry4gQxraPY7HIILL/7Y=
+"@babel/plugin-transform-modules-systemjs@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
+  integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.10.1"
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-hoist-variables" "^7.13.0"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-identifier" "^7.12.11"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz#ea080911ffc6eb21840a5197a39ede4ee67b1595"
-  integrity sha1-6ggJEf/G6yGEClGXo57eTuZ7FZU=
+"@babel/plugin-transform-modules-umd@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz#8a3d96a97d199705b9fd021580082af81c06e70b"
+  integrity sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
-  integrity sha1-oqcr/6ICrA4tBQav0JOcXsvEjGw=
+"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
+  integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
 
-"@babel/plugin-transform-new-target@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz#6ee41a5e648da7632e22b6fb54012e87f612f324"
-  integrity sha1-buQaXmSNp2MuIrb7VAEuh/YS8yQ=
+"@babel/plugin-transform-new-target@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
+  integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-object-super@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz#2e3016b0adbf262983bf0d5121d676a5ed9c4fde"
-  integrity sha1-LjAWsK2/JimDvw1RIdZ2pe2cT94=
+"@babel/plugin-transform-object-super@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
+  integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.12.13"
 
-"@babel/plugin-transform-parameters@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz#b25938a3c5fae0354144a720b07b32766f683ddd"
-  integrity sha1-slk4o8X64DVBRKcgsHsydm9oPd0=
+"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007"
+  integrity sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
-"@babel/plugin-transform-property-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz#cffc7315219230ed81dc53e4625bf86815b6050d"
-  integrity sha1-z/xzFSGSMO2B3FPkYlv4aBW2BQ0=
+"@babel/plugin-transform-property-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
+  integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-react-constant-elements@^7.0.0", "@babel/plugin-transform-react-constant-elements@^7.2.0", "@babel/plugin-transform-react-constant-elements@^7.6.3":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.10.1.tgz#c7f117a54657cba3f9d32012e050fc89982df9e1"
-  integrity sha1-x/EXpUZXy6P50yAS4FD8iZgt+eE=
+"@babel/plugin-transform-react-display-name@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz#c28effd771b276f4647411c9733dbb2d2da954bd"
+  integrity sha512-MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-react-display-name@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.1.tgz#e6a33f6d48dfb213dda5e007d0c7ff82b6a3d8ef"
-  integrity sha1-5qM/bUjfshPdpeAH0Mf/graj2O8=
+"@babel/plugin-transform-react-jsx-development@^7.12.12":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz#f510c0fa7cd7234153539f9a362ced41a5ca1447"
+  integrity sha512-BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-transform-react-jsx" "^7.12.17"
 
-"@babel/plugin-transform-react-jsx-development@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.10.1.tgz#1ac6300d8b28ef381ee48e6fec430cc38047b7f3"
-  integrity sha1-GsYwDYso7zge5I5v7EMMw4BHt/M=
+"@babel/plugin-transform-react-jsx@^7.12.13", "@babel/plugin-transform-react-jsx@^7.12.17":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.17.tgz#dd2c1299f5e26de584939892de3cfc1807a38f24"
+  integrity sha512-mwaVNcXV+l6qJOuRhpdTEj8sT/Z0owAVWf9QujTZ0d2ye9X/K+MTOTSizcgKOj18PGnTc/7g1I4+cIUjsKhBcw==
   dependencies:
-    "@babel/helper-builder-react-jsx-experimental" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-jsx" "^7.10.1"
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/plugin-syntax-jsx" "^7.12.13"
+    "@babel/types" "^7.12.17"
 
-"@babel/plugin-transform-react-jsx-self@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.1.tgz#22143e14388d72eb88649606bb9e46f421bc3821"
-  integrity sha1-IhQ+FDiNcuuIZJYGu55G9CG8OCE=
+"@babel/plugin-transform-react-pure-annotations@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42"
+  integrity sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-jsx" "^7.10.1"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx-source@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.1.tgz#30db3d4ee3cdebbb26a82a9703673714777a4273"
-  integrity sha1-MNs9TuPN67smqCqXA2c3FHd6QnM=
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-jsx" "^7.10.1"
-
-"@babel/plugin-transform-react-jsx@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.1.tgz#91f544248ba131486decb5d9806da6a6e19a2896"
-  integrity sha1-kfVEJIuhMUht7LXZgG2mpuGaKJY=
-  dependencies:
-    "@babel/helper-builder-react-jsx" "^7.10.1"
-    "@babel/helper-builder-react-jsx-experimental" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-jsx" "^7.10.1"
-
-"@babel/plugin-transform-react-pure-annotations@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.1.tgz#f5e7c755d3e7614d4c926e144f501648a5277b70"
-  integrity sha1-9efHVdPnYU1Mkm4UT1AWSKUne3A=
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-regenerator@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz#10e175cbe7bdb63cc9b39f9b3f823c5c7c5c5490"
-  integrity sha1-EOF1y+e9tjzJs5+bP4I8XHxcVJA=
+"@babel/plugin-transform-regenerator@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5"
+  integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz#0fc1027312b4d1c3276a57890c8ae3bcc0b64a86"
-  integrity sha1-D8ECcxK00cMnaleJDIrjvMC2SoY=
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-shorthand-properties@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz#e8b54f238a1ccbae482c4dce946180ae7b3143f3"
-  integrity sha1-6LVPI4ocy65ILE3OlGGArnsxQ/M=
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-spread@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz#0c6d618a0c4461a274418460a28c9ccf5239a7c8"
-  integrity sha1-DG1higxEYaJ0QYRgooycz1I5p8g=
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-sticky-regex@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz#90fc89b7526228bed9842cff3588270a7a393b00"
-  integrity sha1-kPyJt1JiKL7ZhCz/NYgnCno5OwA=
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-regex" "^7.10.1"
-
-"@babel/plugin-transform-template-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz#914c7b7f4752c570ea00553b4284dad8070e8628"
-  integrity sha1-kUx7f0dSxXDqAFU7QoTa2AcOhig=
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-typeof-symbol@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz#60c0239b69965d166b80a84de7315c1bc7e0bb0e"
-  integrity sha1-YMAjm2mWXRZrgKhN5zFcG8fguw4=
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-unicode-escapes@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz#add0f8483dab60570d9e03cecef6c023aa8c9940"
-  integrity sha1-rdD4SD2rYFcNngPOzvbAI6qMmUA=
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-
-"@babel/plugin-transform-unicode-regex@^7.10.1":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz#6b58f2aea7b68df37ac5025d9c88752443a6b43f"
-  integrity sha1-a1jyrqe2jfN6xQJdnIh1JEOmtD8=
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+"@babel/plugin-transform-reserved-words@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
+  integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-shorthand-properties@^7.12.1", "@babel/plugin-transform-shorthand-properties@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
+  integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
+  integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+
+"@babel/plugin-transform-sticky-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
+  integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
+  integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-typeof-symbol@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
+  integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-typescript@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz#4a498e1f3600342d2a9e61f60131018f55774853"
+  integrity sha512-elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-typescript" "^7.12.13"
+
+"@babel/plugin-transform-unicode-escapes@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74"
+  integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-unicode-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
+  integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/preset-env@^7.12.1", "@babel/preset-env@^7.12.7":
+  version "7.13.9"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.9.tgz#3ee5f233316b10d066d7f379c6d1e13a96853654"
+  integrity sha512-mcsHUlh2rIhViqMG823JpscLMesRt3QbMsv1+jhopXEb3W2wXvQ9QoiOlZI9ZbR3XqPtaFpZwEZKYqGJnGMZTQ==
+  dependencies:
+    "@babel/compat-data" "^7.13.8"
+    "@babel/helper-compilation-targets" "^7.13.8"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-option" "^7.12.17"
+    "@babel/plugin-proposal-async-generator-functions" "^7.13.8"
+    "@babel/plugin-proposal-class-properties" "^7.13.0"
+    "@babel/plugin-proposal-dynamic-import" "^7.13.8"
+    "@babel/plugin-proposal-export-namespace-from" "^7.12.13"
+    "@babel/plugin-proposal-json-strings" "^7.13.8"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8"
+    "@babel/plugin-proposal-numeric-separator" "^7.12.13"
+    "@babel/plugin-proposal-object-rest-spread" "^7.13.8"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.13.8"
+    "@babel/plugin-proposal-optional-chaining" "^7.13.8"
+    "@babel/plugin-proposal-private-methods" "^7.13.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.12.13"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.12.13"
+    "@babel/plugin-transform-arrow-functions" "^7.13.0"
+    "@babel/plugin-transform-async-to-generator" "^7.13.0"
+    "@babel/plugin-transform-block-scoped-functions" "^7.12.13"
+    "@babel/plugin-transform-block-scoping" "^7.12.13"
+    "@babel/plugin-transform-classes" "^7.13.0"
+    "@babel/plugin-transform-computed-properties" "^7.13.0"
+    "@babel/plugin-transform-destructuring" "^7.13.0"
+    "@babel/plugin-transform-dotall-regex" "^7.12.13"
+    "@babel/plugin-transform-duplicate-keys" "^7.12.13"
+    "@babel/plugin-transform-exponentiation-operator" "^7.12.13"
+    "@babel/plugin-transform-for-of" "^7.13.0"
+    "@babel/plugin-transform-function-name" "^7.12.13"
+    "@babel/plugin-transform-literals" "^7.12.13"
+    "@babel/plugin-transform-member-expression-literals" "^7.12.13"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.13.8"
+    "@babel/plugin-transform-modules-systemjs" "^7.13.8"
+    "@babel/plugin-transform-modules-umd" "^7.13.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13"
+    "@babel/plugin-transform-new-target" "^7.12.13"
+    "@babel/plugin-transform-object-super" "^7.12.13"
+    "@babel/plugin-transform-parameters" "^7.13.0"
+    "@babel/plugin-transform-property-literals" "^7.12.13"
+    "@babel/plugin-transform-regenerator" "^7.12.13"
+    "@babel/plugin-transform-reserved-words" "^7.12.13"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.13"
+    "@babel/plugin-transform-spread" "^7.13.0"
+    "@babel/plugin-transform-sticky-regex" "^7.12.13"
+    "@babel/plugin-transform-template-literals" "^7.13.0"
+    "@babel/plugin-transform-typeof-symbol" "^7.12.13"
+    "@babel/plugin-transform-unicode-escapes" "^7.12.13"
+    "@babel/plugin-transform-unicode-regex" "^7.12.13"
+    "@babel/preset-modules" "^0.1.4"
+    "@babel/types" "^7.13.0"
+    babel-plugin-polyfill-corejs2 "^0.1.4"
+    babel-plugin-polyfill-corejs3 "^0.1.3"
+    babel-plugin-polyfill-regenerator "^0.1.2"
+    core-js-compat "^3.9.0"
+    semver "^6.3.0"
 
-"@babel/preset-env@^7.4.5":
-  version "7.10.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/preset-env/-/preset-env-7.10.2.tgz#715930f2cf8573b0928005ee562bed52fb65fdfb"
-  integrity sha1-cVkw8s+Fc7CSgAXuVivtUvtl/fs=
+"@babel/preset-flow@^7.12.1":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.12.13.tgz#71ee7fe65a95b507ac12bcad65a4ced27d8dfc3e"
+  integrity sha512-gcEjiwcGHa3bo9idURBp5fmJPcyFPOszPQjztXrOjUE2wWVqc6fIVJPgWPIQksaQ5XZ2HWiRsf2s1fRGVjUtVw==
   dependencies:
-    "@babel/compat-data" "^7.10.1"
-    "@babel/helper-compilation-targets" "^7.10.2"
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-proposal-async-generator-functions" "^7.10.1"
-    "@babel/plugin-proposal-class-properties" "^7.10.1"
-    "@babel/plugin-proposal-dynamic-import" "^7.10.1"
-    "@babel/plugin-proposal-json-strings" "^7.10.1"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.1"
-    "@babel/plugin-proposal-numeric-separator" "^7.10.1"
-    "@babel/plugin-proposal-object-rest-spread" "^7.10.1"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.10.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.10.1"
-    "@babel/plugin-proposal-private-methods" "^7.10.1"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.10.1"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-class-properties" "^7.10.1"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.1"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.10.1"
-    "@babel/plugin-transform-arrow-functions" "^7.10.1"
-    "@babel/plugin-transform-async-to-generator" "^7.10.1"
-    "@babel/plugin-transform-block-scoped-functions" "^7.10.1"
-    "@babel/plugin-transform-block-scoping" "^7.10.1"
-    "@babel/plugin-transform-classes" "^7.10.1"
-    "@babel/plugin-transform-computed-properties" "^7.10.1"
-    "@babel/plugin-transform-destructuring" "^7.10.1"
-    "@babel/plugin-transform-dotall-regex" "^7.10.1"
-    "@babel/plugin-transform-duplicate-keys" "^7.10.1"
-    "@babel/plugin-transform-exponentiation-operator" "^7.10.1"
-    "@babel/plugin-transform-for-of" "^7.10.1"
-    "@babel/plugin-transform-function-name" "^7.10.1"
-    "@babel/plugin-transform-literals" "^7.10.1"
-    "@babel/plugin-transform-member-expression-literals" "^7.10.1"
-    "@babel/plugin-transform-modules-amd" "^7.10.1"
-    "@babel/plugin-transform-modules-commonjs" "^7.10.1"
-    "@babel/plugin-transform-modules-systemjs" "^7.10.1"
-    "@babel/plugin-transform-modules-umd" "^7.10.1"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.10.1"
-    "@babel/plugin-transform-object-super" "^7.10.1"
-    "@babel/plugin-transform-parameters" "^7.10.1"
-    "@babel/plugin-transform-property-literals" "^7.10.1"
-    "@babel/plugin-transform-regenerator" "^7.10.1"
-    "@babel/plugin-transform-reserved-words" "^7.10.1"
-    "@babel/plugin-transform-shorthand-properties" "^7.10.1"
-    "@babel/plugin-transform-spread" "^7.10.1"
-    "@babel/plugin-transform-sticky-regex" "^7.10.1"
-    "@babel/plugin-transform-template-literals" "^7.10.1"
-    "@babel/plugin-transform-typeof-symbol" "^7.10.1"
-    "@babel/plugin-transform-unicode-escapes" "^7.10.1"
-    "@babel/plugin-transform-unicode-regex" "^7.10.1"
-    "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.10.2"
-    browserslist "^4.12.0"
-    core-js-compat "^3.6.2"
-    invariant "^2.2.2"
-    levenary "^1.1.1"
-    semver "^5.5.0"
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/plugin-transform-flow-strip-types" "^7.12.13"
 
-"@babel/preset-flow@^7.0.0":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/preset-flow/-/preset-flow-7.10.1.tgz#29498ec23baf9aa6dae50c568ceba09d71692b82"
-  integrity sha1-KUmOwjuvmqba5QxWjOugnXFpK4I=
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-transform-flow-strip-types" "^7.10.1"
-
-"@babel/preset-modules@^0.1.3":
-  version "0.1.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
-  integrity sha1-EyQrU7XvjIg8PPfd3VWzbOgPvHI=
+"@babel/preset-modules@^0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
+  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -881,18 +1122,36 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@^7.0.0":
-  version "7.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/preset-react/-/preset-react-7.10.1.tgz#e2ab8ae9a363ec307b936589f07ed753192de041"
-  integrity sha1-4quK6aNj7DB7k2WJ8H7XUxkt4EE=
+"@babel/preset-react@^7.12.1", "@babel/preset-react@^7.12.7":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.13.tgz#5f911b2eb24277fa686820d5bd81cad9a0602a0a"
+  integrity sha512-TYM0V9z6Abb6dj1K7i5NrEhA13oS5ujUYQYDfqIBXYHOc2c2VkFgc+q9kyssIyUfy4/hEwqrgSlJ/Qgv8zJLsA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-transform-react-display-name" "^7.10.1"
-    "@babel/plugin-transform-react-jsx" "^7.10.1"
-    "@babel/plugin-transform-react-jsx-development" "^7.10.1"
-    "@babel/plugin-transform-react-jsx-self" "^7.10.1"
-    "@babel/plugin-transform-react-jsx-source" "^7.10.1"
-    "@babel/plugin-transform-react-pure-annotations" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/plugin-transform-react-display-name" "^7.12.13"
+    "@babel/plugin-transform-react-jsx" "^7.12.13"
+    "@babel/plugin-transform-react-jsx-development" "^7.12.12"
+    "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
+
+"@babel/preset-typescript@^7.12.1", "@babel/preset-typescript@^7.12.7":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.13.0.tgz#ab107e5f050609d806fbb039bec553b33462c60a"
+  integrity sha512-LXJwxrHy0N3f6gIJlYbLta1D9BDtHpQeqwzM0LIfjDlr6UE/D5Mc7W4iDiQzaE+ks0sTjT26ArcHWnJVt0QiHw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-option" "^7.12.17"
+    "@babel/plugin-transform-typescript" "^7.13.0"
+
+"@babel/register@^7.12.1":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.13.8.tgz#d9051dc6820cb4e86375cc0e2d55a4862b31184f"
+  integrity sha512-yCVtABcmvQjRsX2elcZFUV5Q5kDDpHdtXKKku22hNDma60lYuhKmtp1ykZ/okRCPLT2bR5S+cA1kvtBdAFlDTQ==
+  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.10.5"
@@ -910,7 +1169,7 @@
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
   version "7.10.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839"
   integrity sha1-0QPyHyYCSX04NIoy4AhjfVBtuDk=
@@ -924,6 +1183,13 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.7.7":
+  version "7.13.9"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.9.tgz#97dbe2116e2630c489f22e0656decd60aaa1fcee"
+  integrity sha512-aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.10.1", "@babel/template@^7.3.3":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811"
@@ -933,6 +1199,15 @@
     "@babel/parser" "^7.10.1"
     "@babel/types" "^7.10.1"
 
+"@babel/template@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
+  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/parser" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
 "@babel/traverse@^7.1.0", "@babel/traverse@^7.10.1", "@babel/traverse@^7.4.5":
   version "7.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/traverse/-/traverse-7.10.1.tgz#bbcef3031e4152a6c0b50147f4958df54ca0dd27"
@@ -948,6 +1223,21 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
+"@babel/traverse@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc"
+  integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.13.0"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/parser" "^7.13.0"
+    "@babel/types" "^7.13.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.19"
+
 "@babel/types@^7.0.0", "@babel/types@^7.10.1", "@babel/types@^7.10.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
   version "7.10.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@babel/types/-/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d"
@@ -957,6 +1247,15 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.17", "@babel/types@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80"
+  integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -1164,10 +1463,10 @@
     "@emotion/utils" "0.11.3"
     "@emotion/weak-memoize" "0.2.5"
 
-"@emotion/core@^10.0.20":
-  version "10.0.28"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@emotion/core/-/core-10.0.28.tgz#bb65af7262a234593a9e952c041d0f1c9b9bef3d"
-  integrity sha1-u2WvcmKiNFk6npUsBB0PHJub7z0=
+"@emotion/core@^10.1.1":
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3"
+  integrity sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==
   dependencies:
     "@babel/runtime" "^7.5.5"
     "@emotion/cache" "^10.0.27"
@@ -1190,10 +1489,10 @@
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
   integrity sha1-u7/2iXj+/b5ozLUzvIy+HRr7VBM=
 
-"@emotion/is-prop-valid@0.8.8", "@emotion/is-prop-valid@^0.8.8":
+"@emotion/is-prop-valid@0.8.8", "@emotion/is-prop-valid@^0.8.6", "@emotion/is-prop-valid@^0.8.8":
   version "0.8.8"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a"
-  integrity sha1-2yixxDaKJZtgqXMR1qlS1P0BrBo=
+  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a"
+  integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==
   dependencies:
     "@emotion/memoize" "0.7.4"
 
@@ -1228,10 +1527,10 @@
     "@emotion/serialize" "^0.11.15"
     "@emotion/utils" "0.11.3"
 
-"@emotion/styled@^10.0.17":
+"@emotion/styled@^10.0.23":
   version "10.0.27"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@emotion/styled/-/styled-10.0.27.tgz#12cb67e91f7ad7431e1875b1d83a94b814133eaf"
-  integrity sha1-Estn6R9610MeGHWx2DqUuBQTPq8=
+  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.27.tgz#12cb67e91f7ad7431e1875b1d83a94b814133eaf"
+  integrity sha512-iK/8Sh7+NLJzyp9a5+vIQIXTYxfT4yB/OJbjzQanB2RZpvmzBQOHZWhpAMZWYEKRNNbsD6WfBw5sVWkb6WzS/Q==
   dependencies:
     "@emotion/styled-base" "^10.0.27"
     babel-plugin-emotion "^10.0.27"
@@ -1256,6 +1555,11 @@
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
   integrity sha1-ju2YLi7m9/TkTCU+EpYpgHke/UY=
 
+"@icons/material@^0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
+  integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -1485,6 +1789,17 @@
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
 
+"@jest/types@^26.6.2":
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
+  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^15.0.0"
+    chalk "^4.0.0"
+
 "@manypkg/cli@^0.11.1":
   version "0.11.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@manypkg/cli/-/cli-0.11.1.tgz#1be7f661e0e1b7132809ff485f19694db4f29ce0"
@@ -1561,16 +1876,150 @@
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
 
-"@reach/router@^1.2.1":
-  version "1.3.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@reach/router/-/router-1.3.3.tgz#58162860dce6c9449d49be86b0561b5ef46d80db"
-  integrity sha1-WBYoYNzmyUSdSb6GsFYbXvRtgNs=
+"@npmcli/move-file@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
+  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
+  dependencies:
+    mkdirp "^1.0.4"
+    rimraf "^3.0.2"
+
+"@pmmmwh/react-refresh-webpack-plugin@^0.4.2":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz#1eec460596d200c0236bf195b078a5d1df89b766"
+  integrity sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ==
+  dependencies:
+    ansi-html "^0.0.7"
+    error-stack-parser "^2.0.6"
+    html-entities "^1.2.1"
+    native-url "^0.2.6"
+    schema-utils "^2.6.5"
+    source-map "^0.7.3"
+
+"@popperjs/core@^2.5.4":
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.0.tgz#32e63212293dd3efbb521cd35a5020ab66eaa546"
+  integrity sha512-wjtKehFAIARq2OxK8j3JrggNlEslJfNuSm2ArteIbKyRMts2g0a7KzTxfRVNUM+O0gnBJ2hNV8nWPOYBgI1sew==
+
+"@preconstruct/cli@^2.0.0":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@preconstruct/cli/-/cli-2.0.6.tgz#1abc9235176cf579f27caaaa5d498c73dddcbd93"
+  integrity sha512-qdulyG9OEGyAsWa9WG2su4u2n6sn/RkUVe/YcOLOjHXJBH+8MNijC0C0Xow/zCfdDUjzM2qMpzMB8zaTWQOoLA==
+  dependencies:
+    "@babel/code-frame" "^7.5.5"
+    "@babel/core" "^7.7.7"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/runtime" "^7.7.7"
+    "@preconstruct/hook" "^0.4.0"
+    "@rollup/plugin-alias" "^3.1.1"
+    "@rollup/plugin-commonjs" "^15.0.0"
+    "@rollup/plugin-json" "^4.1.0"
+    "@rollup/plugin-node-resolve" "^9.0.0"
+    "@rollup/plugin-replace" "^2.4.1"
+    builtin-modules "^3.1.0"
+    chalk "^4.1.0"
+    dataloader "^2.0.0"
+    detect-indent "^6.0.0"
+    enquirer "^2.3.6"
+    estree-walker "^2.0.1"
+    fast-deep-equal "^2.0.1"
+    fast-glob "^3.2.4"
+    fs-extra "^9.0.1"
+    is-ci "^2.0.0"
+    is-reference "^1.2.1"
+    jest-worker "^26.3.0"
+    magic-string "^0.25.7"
+    meow "^7.1.0"
+    ms "^2.1.2"
+    normalize-path "^3.0.0"
+    npm-packlist "^2.1.2"
+    p-limit "^3.0.2"
+    parse-glob "^3.0.4"
+    parse-json "^5.1.0"
+    quick-lru "^5.1.1"
+    resolve "^1.17.0"
+    resolve-from "^5.0.0"
+    rollup "^2.32.0"
+    semver "^7.3.4"
+    terser "^5.2.1"
+    v8-compile-cache "^2.1.1"
+
+"@preconstruct/hook@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@preconstruct/hook/-/hook-0.4.0.tgz#c15dfacfc6e60652a6837209c2fd87f0240b099e"
+  integrity sha512-a7mrlPTM3tAFJyz43qb4pPVpUx8j8TzZBFsNFqcKcE/sEakNXRlQAuCT4RGZRf9dQiiUnBahzSIWawU4rENl+Q==
+  dependencies:
+    "@babel/core" "^7.7.7"
+    "@babel/plugin-transform-modules-commonjs" "^7.7.5"
+    pirates "^4.0.1"
+    source-map-support "^0.5.16"
+
+"@reach/router@^1.3.3":
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/@reach/router/-/router-1.3.4.tgz#d2574b19370a70c80480ed91f3da840136d10f8c"
+  integrity sha512-+mtn9wjlB9NN2CNnnC/BRYtwdKBfSyyasPYraNAyvaV1occr/5NnB4CVzjEZipNHwYebQwcndGUmpFzxAUoqSA==
   dependencies:
     create-react-context "0.3.0"
     invariant "^2.2.3"
     prop-types "^15.6.1"
     react-lifecycles-compat "^3.0.4"
 
+"@rollup/plugin-alias@^3.1.1":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-3.1.2.tgz#c585b05be4a7782d269c69d13def56f44e417772"
+  integrity sha512-wzDnQ6v7CcoRzS0qVwFPrFdYA4Qlr+ookA217Y2Z3DPZE1R8jrFNM3jvGgOf6o6DMjbnQIn5lCIJgHPe1Bt3uw==
+  dependencies:
+    slash "^3.0.0"
+
+"@rollup/plugin-commonjs@^15.0.0":
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz#1e7d076c4f1b2abf7e65248570e555defc37c238"
+  integrity sha512-xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    commondir "^1.0.1"
+    estree-walker "^2.0.1"
+    glob "^7.1.6"
+    is-reference "^1.2.1"
+    magic-string "^0.25.7"
+    resolve "^1.17.0"
+
+"@rollup/plugin-json@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.1.0.tgz#54e09867ae6963c593844d8bd7a9c718294496f3"
+  integrity sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==
+  dependencies:
+    "@rollup/pluginutils" "^3.0.8"
+
+"@rollup/plugin-node-resolve@^9.0.0":
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-9.0.0.tgz#39bd0034ce9126b39c1699695f440b4b7d2b62e6"
+  integrity sha512-gPz+utFHLRrd41WMP13Jq5mqqzHL3OXrfj3/MkSyB6UBIcuNt9j60GCbarzMzdf1VHFpOxfQh/ez7wyadLMqkg==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    "@types/resolve" "1.17.1"
+    builtin-modules "^3.1.0"
+    deepmerge "^4.2.2"
+    is-module "^1.0.0"
+    resolve "^1.17.0"
+
+"@rollup/plugin-replace@^2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.1.tgz#c411b5ab72809fb1bfc8b487d8d02eef661460d3"
+  integrity sha512-XwC1oK5rrtRJ0tn1ioLHS6OV5JTluJF7QE1J/q1hN3bquwjnVxjtMyY9iCnoyH9DQbf92CxajB3o98wZbP3oAQ==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    magic-string "^0.25.7"
+
+"@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
+  integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
+  dependencies:
+    "@types/estree" "0.0.39"
+    estree-walker "^1.0.1"
+    picomatch "^2.2.2"
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
@@ -1578,174 +2027,318 @@
   dependencies:
     type-detect "4.0.8"
 
-"@storybook/addons@5.3.19", "@storybook/addons@^5.3.0", "@storybook/addons@^5.3.18":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/addons/-/addons-5.3.19.tgz#3a7010697afd6df9a41b8c8a7351d9a06ff490a4"
-  integrity sha1-OnAQaXr9bfmkG4yKc1HZoG/0kKQ=
+"@storybook/addon-storysource@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-storysource/-/addon-storysource-6.1.18.tgz#d66cb074b005a101bfcbf9b8b8163b271a83f849"
+  integrity sha512-Wkm5dvUYD6dQZq4kdav6VmEgP12uStn0QJfMycEqfztuZdeZWhFk6gLOsaK74v6/YB5whrDF+PlJTCLBrxseIw==
+  dependencies:
+    "@storybook/addons" "6.1.18"
+    "@storybook/api" "6.1.18"
+    "@storybook/client-logger" "6.1.18"
+    "@storybook/components" "6.1.18"
+    "@storybook/router" "6.1.18"
+    "@storybook/source-loader" "6.1.18"
+    "@storybook/theming" "6.1.18"
+    core-js "^3.0.1"
+    estraverse "^4.2.0"
+    loader-utils "^2.0.0"
+    prettier "~2.0.5"
+    prop-types "^15.7.2"
+    react-syntax-highlighter "^13.5.0"
+    regenerator-runtime "^0.13.7"
+
+"@storybook/addons@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.1.18.tgz#b953f355350376808914f015b689dbda4e20b864"
+  integrity sha512-sI/ifk3RLswItRUejt4tCi3IMS9oBUd2NK4Kns1PF+x4NIry/yuOeE/de3Dz5tPjJhg9jJuBDLhxEaqRFq3Uzg==
+  dependencies:
+    "@storybook/api" "6.1.18"
+    "@storybook/channels" "6.1.18"
+    "@storybook/client-logger" "6.1.18"
+    "@storybook/core-events" "6.1.18"
+    "@storybook/router" "6.1.18"
+    "@storybook/theming" "6.1.18"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    regenerator-runtime "^0.13.7"
+
+"@storybook/addons@^6.1.11":
+  version "6.1.21"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.1.21.tgz#94bb66fc51d1dfee80d0fe84f5b83c10045651b5"
+  integrity sha512-xo5TGu9EZVCqgh3D1veVnfuGzyKDWWsvOMo18phVqRxj21G3/+hScVyfIYwNTv7Ys5/Ahp9JxJUMXL3V3ny+tw==
+  dependencies:
+    "@storybook/api" "6.1.21"
+    "@storybook/channels" "6.1.21"
+    "@storybook/client-logger" "6.1.21"
+    "@storybook/core-events" "6.1.21"
+    "@storybook/router" "6.1.21"
+    "@storybook/theming" "6.1.21"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    regenerator-runtime "^0.13.7"
+
+"@storybook/api@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.1.18.tgz#289d9907ed36a0c2af933c871a36a72acd911c43"
+  integrity sha512-VfntmrMEijkbdNDncpr9bv2RXVn12hCui1YcK3S6bCXnMi/OFp6aO5+jrb/GZqqZzLeVK005N1HTE2Ivq1IBJg==
   dependencies:
-    "@storybook/api" "5.3.19"
-    "@storybook/channels" "5.3.19"
-    "@storybook/client-logger" "5.3.19"
-    "@storybook/core-events" "5.3.19"
+    "@reach/router" "^1.3.3"
+    "@storybook/channels" "6.1.18"
+    "@storybook/client-logger" "6.1.18"
+    "@storybook/core-events" "6.1.18"
+    "@storybook/csf" "0.0.1"
+    "@storybook/router" "6.1.18"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.1.18"
+    "@types/reach__router" "^1.3.7"
     core-js "^3.0.1"
+    fast-deep-equal "^3.1.1"
     global "^4.3.2"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    regenerator-runtime "^0.13.7"
+    store2 "^2.7.1"
+    telejson "^5.0.2"
+    ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/api@5.3.19", "@storybook/api@^5.3.18":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/api/-/api-5.3.19.tgz#77f15e9e2eee59fe1ddeaba1ef39bc34713a6297"
-  integrity sha1-d/Feni7uWf4d3quh7zm8NHE6Ypc=
+"@storybook/api@6.1.21", "@storybook/api@^6.1.11":
+  version "6.1.21"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.1.21.tgz#be753ca8d3602efe4a11783c81c689463bee0825"
+  integrity sha512-QjZk70VSXMw/wPPoWdMp5Bl9VmkfmGhIz8PALrFLLEZHjzptpfZE2qkGEEJHG0NAksFUv6NxGki2/632dzR7Ug==
   dependencies:
-    "@reach/router" "^1.2.1"
-    "@storybook/channels" "5.3.19"
-    "@storybook/client-logger" "5.3.19"
-    "@storybook/core-events" "5.3.19"
+    "@reach/router" "^1.3.3"
+    "@storybook/channels" "6.1.21"
+    "@storybook/client-logger" "6.1.21"
+    "@storybook/core-events" "6.1.21"
     "@storybook/csf" "0.0.1"
-    "@storybook/router" "5.3.19"
-    "@storybook/theming" "5.3.19"
-    "@types/reach__router" "^1.2.3"
+    "@storybook/router" "6.1.21"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.1.21"
+    "@types/reach__router" "^1.3.7"
     core-js "^3.0.1"
-    fast-deep-equal "^2.0.1"
+    fast-deep-equal "^3.1.1"
     global "^4.3.2"
     lodash "^4.17.15"
     memoizerific "^1.11.3"
-    prop-types "^15.6.2"
-    react "^16.8.3"
-    semver "^6.0.0"
-    shallow-equal "^1.1.0"
+    regenerator-runtime "^0.13.7"
     store2 "^2.7.1"
-    telejson "^3.2.0"
+    telejson "^5.0.2"
+    ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/channel-postmessage@5.3.19":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/channel-postmessage/-/channel-postmessage-5.3.19.tgz#ef9fe974c2a529d89ce342ff7acf5cc22805bae9"
-  integrity sha1-75/pdMKlKdic40L/es9cwigFuuk=
+"@storybook/channel-postmessage@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.1.18.tgz#9f4aa17612cc3c52a040c99c64d80838f835c410"
+  integrity sha512-49Tae2wwY+b2BL6b+Z+tqM/k8pX5ox/SE23ahtWtovrp/OHOYoXrMXTYuU8MA58xqjR4QhB4KjVB5e0V/iQxYQ==
   dependencies:
-    "@storybook/channels" "5.3.19"
-    "@storybook/client-logger" "5.3.19"
+    "@storybook/channels" "6.1.18"
+    "@storybook/client-logger" "6.1.18"
+    "@storybook/core-events" "6.1.18"
     core-js "^3.0.1"
     global "^4.3.2"
-    telejson "^3.2.0"
+    qs "^6.6.0"
+    telejson "^5.0.2"
 
-"@storybook/channels@5.3.19", "@storybook/channels@^5.3.18":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/channels/-/channels-5.3.19.tgz#65ad7cd19d70aa5eabbb2e5e39ceef5e510bcb7f"
-  integrity sha1-Za180Z1wql6ruy5eOc7vXlELy38=
+"@storybook/channels@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.1.18.tgz#834cafb45e91d39c99160dbaa2ac74720bbaef5a"
+  integrity sha512-XMuHD15B7SWpUJgaTP/6Axa66bykObN1YBcyZ2mOqBVQK4DVf51yI/zp/4ZndgE/MxG5uqVWuOEDOJvSAENREw==
   dependencies:
     core-js "^3.0.1"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
+"@storybook/channels@6.1.21", "@storybook/channels@^6.1.11":
+  version "6.1.21"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.1.21.tgz#adbfae5f4767234c5b17d9578be983584dddead4"
+  integrity sha512-7WoizMjyHqCyvcWncLexSg9FLPIErWAZL4NvluEthwsHSO2sDybn9mh1pzsFHdYMuTP6ml06Zt9ayWMtIveHDg==
+  dependencies:
+    core-js "^3.0.1"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
 
-"@storybook/client-api@5.3.19":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/client-api/-/client-api-5.3.19.tgz#7a5630bb8fffb92742b1773881e9004ee7fdf8e0"
-  integrity sha1-elYwu4//uSdCsXc4gekATuf9+OA=
+"@storybook/client-api@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.1.18.tgz#7569830375d6618e8b0f3b48c5789798e7474751"
+  integrity sha512-iwHLrirUFM4zQuzrKD+mN14F8/IdpMz4aYRBRDHf/FbG9F0dM27RF8S9a3y7thhAVPiNNT8HJ4YO0ZMTdZ5idg==
   dependencies:
-    "@storybook/addons" "5.3.19"
-    "@storybook/channel-postmessage" "5.3.19"
-    "@storybook/channels" "5.3.19"
-    "@storybook/client-logger" "5.3.19"
-    "@storybook/core-events" "5.3.19"
+    "@storybook/addons" "6.1.18"
+    "@storybook/channel-postmessage" "6.1.18"
+    "@storybook/channels" "6.1.18"
+    "@storybook/client-logger" "6.1.18"
+    "@storybook/core-events" "6.1.18"
     "@storybook/csf" "0.0.1"
-    "@types/webpack-env" "^1.15.0"
+    "@types/qs" "^6.9.0"
+    "@types/webpack-env" "^1.15.3"
     core-js "^3.0.1"
-    eventemitter3 "^4.0.0"
     global "^4.3.2"
-    is-plain-object "^3.0.0"
     lodash "^4.17.15"
     memoizerific "^1.11.3"
     qs "^6.6.0"
+    regenerator-runtime "^0.13.7"
     stable "^0.1.8"
-    ts-dedent "^1.1.0"
+    store2 "^2.7.1"
+    ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-logger@5.3.19":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/client-logger/-/client-logger-5.3.19.tgz#fbbd186e82102eaca1d6a5cca640271cae862921"
-  integrity sha1-+70YboIQLqyh1qXMpkAnHK6GKSE=
+"@storybook/client-logger@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.1.18.tgz#36c7e33090e70bc274e1a39ef5ebbfe31c886f6a"
+  integrity sha512-o+lXoi61SLgNbDGrfDJsUdkbc2eDzNL1DMkSenksis7kiblOsBzO+7S0UiguyQ/gku2wYyksGx71A/TzE5JsgQ==
+  dependencies:
+    core-js "^3.0.1"
+    global "^4.3.2"
+
+"@storybook/client-logger@6.1.21":
+  version "6.1.21"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.1.21.tgz#fe7d9e645ddb4eb9dc18fdacea24b4baf11bc6c9"
+  integrity sha512-QJV+gnVM2fQ4M7lSkRLCXkOw/RU+aEtUefo9TAnXxPHK3UGG+DyvLmha6fHGaz9GAcFxyWtgqCyVOhMe03Q35g==
   dependencies:
     core-js "^3.0.1"
+    global "^4.3.2"
 
-"@storybook/components@5.3.19", "@storybook/components@^5.3.18":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/components/-/components-5.3.19.tgz#aac1f9eea1247cc85bd93b10fca803876fb84a6b"
-  integrity sha1-qsH57qEkfMhb2TsQ/KgDh2+4Sms=
+"@storybook/components@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.1.18.tgz#23ab5a7d735bd8e09cad2e487f8636aa099998a9"
+  integrity sha512-YUF/JpkZ6ghcxm26V6zOXl4iS2OOhNhfCp1CxVBu+71k78nziOQdxBmT0aG0LXzZ+WSF8pMiXzvBTrei+YTxyg==
   dependencies:
-    "@storybook/client-logger" "5.3.19"
-    "@storybook/theming" "5.3.19"
+    "@popperjs/core" "^2.5.4"
+    "@storybook/client-logger" "6.1.18"
+    "@storybook/csf" "0.0.1"
+    "@storybook/theming" "6.1.18"
+    "@types/overlayscrollbars" "^1.9.0"
+    "@types/react-color" "^3.0.1"
     "@types/react-syntax-highlighter" "11.0.4"
-    "@types/react-textarea-autosize" "^4.3.3"
     core-js "^3.0.1"
+    fast-deep-equal "^3.1.1"
     global "^4.3.2"
     lodash "^4.17.15"
     markdown-to-jsx "^6.11.4"
     memoizerific "^1.11.3"
-    polished "^3.3.1"
-    popper.js "^1.14.7"
-    prop-types "^15.7.2"
-    react "^16.8.3"
-    react-dom "^16.8.3"
-    react-focus-lock "^2.1.0"
-    react-helmet-async "^1.0.2"
-    react-popper-tooltip "^2.8.3"
-    react-syntax-highlighter "^11.0.2"
-    react-textarea-autosize "^7.1.0"
-    simplebar-react "^1.0.0-alpha.6"
-    ts-dedent "^1.1.0"
+    overlayscrollbars "^1.10.2"
+    polished "^3.4.4"
+    react-color "^2.17.0"
+    react-popper-tooltip "^3.1.1"
+    react-syntax-highlighter "^13.5.0"
+    react-textarea-autosize "^8.1.1"
+    ts-dedent "^2.0.0"
+
+"@storybook/components@^6.1.0":
+  version "6.1.21"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.1.21.tgz#7b9bfd51e73c179654a114275e5073f494d2a005"
+  integrity sha512-2NjkyS1yeYXlRY7azt88woqd6eqJA00oloIxgMAFLVpRmvFxoHalY61wNrvxl2QSu9cNofp984AbGc8gPbizBA==
+  dependencies:
+    "@popperjs/core" "^2.5.4"
+    "@storybook/client-logger" "6.1.21"
+    "@storybook/csf" "0.0.1"
+    "@storybook/theming" "6.1.21"
+    "@types/overlayscrollbars" "^1.9.0"
+    "@types/react-color" "^3.0.1"
+    "@types/react-syntax-highlighter" "11.0.4"
+    core-js "^3.0.1"
+    fast-deep-equal "^3.1.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    markdown-to-jsx "^6.11.4"
+    memoizerific "^1.11.3"
+    overlayscrollbars "^1.10.2"
+    polished "^3.4.4"
+    react-color "^2.17.0"
+    react-popper-tooltip "^3.1.1"
+    react-syntax-highlighter "^13.5.0"
+    react-textarea-autosize "^8.1.1"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+
+"@storybook/core-events@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.1.18.tgz#6417eb25d36d7e26b990552dc1d3c4db1679e0d4"
+  integrity sha512-FdhDTsL8u9759jJ4nDthen5x8+mpmdMXIXat1HYL1RNgjXZFRUiwcWha8ELQFVTgpjJ9U5ZTF8C5B0B1W47Etw==
+  dependencies:
+    core-js "^3.0.1"
 
-"@storybook/core-events@5.3.19", "@storybook/core-events@^5.3.18":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/core-events/-/core-events-5.3.19.tgz#18020cd52e0d8ef0973a8e9622a10d5f99796f79"
-  integrity sha1-GAIM1S4NjvCXOo6WIqENX5l5b3k=
+"@storybook/core-events@6.1.21", "@storybook/core-events@^6.1.11":
+  version "6.1.21"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.1.21.tgz#11f537f78f8c73ba5e627b57b282a279793a3511"
+  integrity sha512-KWqnh1C7M1pT//WfQb3AD60yTR8jL48AfaeLGto2gO9VK7VVgj/EGsrXZP/GTL90ygyExbbBI5gkr7EBTu/HYw==
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core@5.3.19":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/core/-/core-5.3.19.tgz#1e61f35c5148343a0c580f5d5efb77f3b4243a30"
-  integrity sha1-HmHzXFFINDoMWA9dXvt387QkOjA=
-  dependencies:
-    "@babel/plugin-proposal-class-properties" "^7.7.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
-    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
-    "@babel/plugin-transform-react-constant-elements" "^7.2.0"
-    "@babel/preset-env" "^7.4.5"
-    "@storybook/addons" "5.3.19"
-    "@storybook/channel-postmessage" "5.3.19"
-    "@storybook/client-api" "5.3.19"
-    "@storybook/client-logger" "5.3.19"
-    "@storybook/core-events" "5.3.19"
+"@storybook/core@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.1.18.tgz#0186007c97a3e64f936eac784590d45eee6473d7"
+  integrity sha512-FJAJX39HvyL85riUBjRaiyKmbyppNmzZ4dU/hZpinmXHJDk9d857lmkjSz96N24vwRc5uinsodaPs+ccIUONNg==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/plugin-proposal-class-properties" "^7.12.1"
+    "@babel/plugin-proposal-decorators" "^7.12.1"
+    "@babel/plugin-proposal-export-default-from" "^7.12.1"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
+    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.1"
+    "@babel/plugin-proposal-private-methods" "^7.12.1"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-transform-arrow-functions" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.1"
+    "@babel/plugin-transform-classes" "^7.12.1"
+    "@babel/plugin-transform-destructuring" "^7.12.1"
+    "@babel/plugin-transform-for-of" "^7.12.1"
+    "@babel/plugin-transform-parameters" "^7.12.1"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
+    "@babel/plugin-transform-spread" "^7.12.1"
+    "@babel/plugin-transform-template-literals" "^7.12.1"
+    "@babel/preset-env" "^7.12.1"
+    "@babel/preset-react" "^7.12.1"
+    "@babel/preset-typescript" "^7.12.1"
+    "@babel/register" "^7.12.1"
+    "@storybook/addons" "6.1.18"
+    "@storybook/api" "6.1.18"
+    "@storybook/channel-postmessage" "6.1.18"
+    "@storybook/channels" "6.1.18"
+    "@storybook/client-api" "6.1.18"
+    "@storybook/client-logger" "6.1.18"
+    "@storybook/components" "6.1.18"
+    "@storybook/core-events" "6.1.18"
     "@storybook/csf" "0.0.1"
-    "@storybook/node-logger" "5.3.19"
-    "@storybook/router" "5.3.19"
-    "@storybook/theming" "5.3.19"
-    "@storybook/ui" "5.3.19"
+    "@storybook/node-logger" "6.1.18"
+    "@storybook/router" "6.1.18"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.1.18"
+    "@storybook/ui" "6.1.18"
+    "@types/glob-base" "^0.3.0"
+    "@types/micromatch" "^4.0.1"
+    "@types/node-fetch" "^2.5.4"
     airbnb-js-shims "^2.2.1"
     ansi-to-html "^0.6.11"
     autoprefixer "^9.7.2"
-    babel-plugin-add-react-displayname "^0.0.5"
+    babel-loader "^8.0.6"
     babel-plugin-emotion "^10.0.20"
-    babel-plugin-macros "^2.7.0"
+    babel-plugin-macros "^2.8.0"
     babel-preset-minify "^0.5.0 || 0.6.0-alpha.5"
+    better-opn "^2.0.0"
     boxen "^4.1.0"
     case-sensitive-paths-webpack-plugin "^2.2.0"
-    chalk "^3.0.0"
-    cli-table3 "0.5.1"
-    commander "^4.0.1"
+    chalk "^4.0.0"
+    cli-table3 "0.6.0"
+    commander "^5.0.0"
     core-js "^3.0.1"
-    corejs-upgrade-webpack-plugin "^2.2.0"
-    css-loader "^3.0.0"
+    cpy "^8.1.1"
+    css-loader "^3.5.3"
     detect-port "^1.3.0"
     dotenv-webpack "^1.7.0"
-    ejs "^2.7.4"
+    ejs "^3.1.2"
     express "^4.17.0"
-    file-loader "^4.2.0"
+    file-loader "^6.0.0"
     file-system-cache "^1.0.5"
-    find-cache-dir "^3.0.0"
     find-up "^4.1.0"
-    fs-extra "^8.0.1"
+    fork-ts-checker-webpack-plugin "^4.1.4"
+    fs-extra "^9.0.0"
+    glob "^7.1.6"
     glob-base "^0.3.0"
+    glob-promise "^3.4.0"
     global "^4.3.2"
-    html-webpack-plugin "^4.0.0-beta.2"
+    html-webpack-plugin "^4.2.1"
     inquirer "^7.0.0"
     interpret "^2.0.0"
     ip "^1.1.5"
@@ -1753,30 +2346,31 @@
     lazy-universal-dotenv "^3.0.1"
     micromatch "^4.0.2"
     node-fetch "^2.6.0"
-    open "^7.0.0"
-    pnp-webpack-plugin "1.5.0"
+    pkg-dir "^4.2.0"
+    pnp-webpack-plugin "1.6.4"
     postcss-flexbugs-fixes "^4.1.0"
     postcss-loader "^3.0.0"
     pretty-hrtime "^1.0.3"
     qs "^6.6.0"
-    raw-loader "^3.1.0"
-    react-dev-utils "^9.0.0"
-    regenerator-runtime "^0.13.3"
-    resolve "^1.11.0"
+    raw-loader "^4.0.1"
+    react-dev-utils "^10.0.0"
+    regenerator-runtime "^0.13.7"
     resolve-from "^5.0.0"
-    semver "^6.0.0"
     serve-favicon "^2.5.0"
-    shelljs "^0.8.3"
-    style-loader "^1.0.0"
-    terser-webpack-plugin "^2.1.2"
-    ts-dedent "^1.1.0"
+    shelljs "^0.8.4"
+    stable "^0.1.8"
+    style-loader "^1.2.1"
+    telejson "^5.0.2"
+    terser-webpack-plugin "^3.0.0"
+    ts-dedent "^2.0.0"
     unfetch "^4.1.0"
-    url-loader "^2.0.1"
+    url-loader "^4.0.0"
     util-deprecate "^1.0.2"
-    webpack "^4.33.0"
+    webpack "^4.44.2"
     webpack-dev-middleware "^3.7.0"
+    webpack-filter-warnings-plugin "^1.2.1"
     webpack-hot-middleware "^2.25.0"
-    webpack-virtual-modules "^0.2.0"
+    webpack-virtual-modules "^0.2.2"
 
 "@storybook/csf@0.0.1":
   version "0.0.1"
@@ -1785,80 +2379,97 @@
   dependencies:
     lodash "^4.17.15"
 
-"@storybook/node-logger@5.3.19":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/node-logger/-/node-logger-5.3.19.tgz#c414e4d3781aeb06298715220012f552a36dff29"
-  integrity sha1-xBTk03ga6wYphxUiABL1UqNt/yk=
+"@storybook/node-logger@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.1.18.tgz#cf45d30f3456b7eeb664233df05f654e5773cb18"
+  integrity sha512-gsiHQVratKBSoP11IqU2Td5W+KUc0qg+czqhzzp1JNMJ25/xBtCJ8MAIOX5JFhovzvB7H0j8y8VNF1YgmcmOQg==
   dependencies:
     "@types/npmlog" "^4.1.2"
-    chalk "^3.0.0"
+    chalk "^4.0.0"
     core-js "^3.0.1"
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
-    regenerator-runtime "^0.13.3"
-
-"@storybook/react@^5.3.0":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/react/-/react-5.3.19.tgz#ad7e7a5538399e2794cdb5a1b844a2b77c10bd09"
-  integrity sha1-rX56VTg5nieUzbWhuESit3wQvQk=
-  dependencies:
-    "@babel/plugin-transform-react-constant-elements" "^7.6.3"
-    "@babel/preset-flow" "^7.0.0"
-    "@babel/preset-react" "^7.0.0"
-    "@storybook/addons" "5.3.19"
-    "@storybook/core" "5.3.19"
-    "@storybook/node-logger" "5.3.19"
-    "@svgr/webpack" "^4.0.3"
-    "@types/webpack-env" "^1.15.0"
+
+"@storybook/react@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.1.18.tgz#895cdc252299a181442131f0b3b2506f273888c0"
+  integrity sha512-wAkUn3LPzoo10LgIZ28beJT9hrWAKR5rEl6g3Y4yTqmvfWdaXZOtHomEchq7Cru7C+1jQ60mDMtwu+D2FZP4bQ==
+  dependencies:
+    "@babel/preset-flow" "^7.12.1"
+    "@babel/preset-react" "^7.12.1"
+    "@pmmmwh/react-refresh-webpack-plugin" "^0.4.2"
+    "@storybook/addons" "6.1.18"
+    "@storybook/core" "6.1.18"
+    "@storybook/node-logger" "6.1.18"
+    "@storybook/semver" "^7.3.2"
+    "@types/webpack-env" "^1.15.3"
     babel-plugin-add-react-displayname "^0.0.5"
     babel-plugin-named-asset-import "^0.3.1"
-    babel-plugin-react-docgen "^4.0.0"
+    babel-plugin-react-docgen "^4.2.1"
     core-js "^3.0.1"
     global "^4.3.2"
     lodash "^4.17.15"
-    mini-css-extract-plugin "^0.7.0"
     prop-types "^15.7.2"
-    react-dev-utils "^9.0.0"
-    regenerator-runtime "^0.13.3"
-    semver "^6.0.0"
-    ts-dedent "^1.1.0"
-    webpack "^4.33.0"
+    react-dev-utils "^10.0.0"
+    react-docgen-typescript-plugin "^0.6.2"
+    react-refresh "^0.8.3"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    webpack "^4.44.2"
+
+"@storybook/router@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.1.18.tgz#e9ed563bd06f4a2a746709415f0c20d116b4cac5"
+  integrity sha512-eY8snYjAESgDdC4sZFJIZ6FTJU4hY1oRqk24nTxhUiEV7U7JAqcXPpz+kaoiAoXnB+H9vXh5MADs9pXS654pBw==
+  dependencies:
+    "@reach/router" "^1.3.3"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
 
-"@storybook/router@5.3.19":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/router/-/router-5.3.19.tgz#0f783b85658f99e4007f74347ad7ef17dbf7fc3a"
-  integrity sha1-D3g7hWWPmeQAf3Q0etfvF9v3/Do=
+"@storybook/router@6.1.21":
+  version "6.1.21"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.1.21.tgz#0a822fa9cc67589a082f7a10fff15c8413f17706"
+  integrity sha512-m75WvUhoCBWDVekICAdbkidji/w5hCjHo+M8L13UghpwXWEnyr4/QqvkOb/PcSC8aZzxeMqSCpRQ1o6LWULneg==
   dependencies:
-    "@reach/router" "^1.2.1"
-    "@storybook/csf" "0.0.1"
-    "@types/reach__router" "^1.2.3"
+    "@reach/router" "^1.3.3"
+    "@types/reach__router" "^1.3.7"
     core-js "^3.0.1"
     global "^4.3.2"
-    lodash "^4.17.15"
     memoizerific "^1.11.3"
     qs "^6.6.0"
-    util-deprecate "^1.0.2"
 
-"@storybook/source-loader@^5.3.0":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/source-loader/-/source-loader-5.3.19.tgz#ff0a00731c24c61721d8b9d84152f8542913a3b7"
-  integrity sha1-/woAcxwkxhch2LnYQVL4VCkTo7c=
+"@storybook/semver@^7.3.2":
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0"
+  integrity sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==
+  dependencies:
+    core-js "^3.6.5"
+    find-up "^4.1.0"
+
+"@storybook/source-loader@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.1.18.tgz#5221b9408f30454ae514f5d19fafdd81650647bf"
+  integrity sha512-Fca8gGqQ5rosXLZpBdqpwItbl7iQ4QZZ5MqJkt7FyEqVX7n4O8WjIiAqNbeCGJnc1keohoGIPWOMt1gXvwZQkA==
   dependencies:
-    "@storybook/addons" "5.3.19"
-    "@storybook/client-logger" "5.3.19"
+    "@storybook/addons" "6.1.18"
+    "@storybook/client-logger" "6.1.18"
     "@storybook/csf" "0.0.1"
     core-js "^3.0.1"
     estraverse "^4.2.0"
     global "^4.3.2"
-    loader-utils "^1.2.3"
-    prettier "^1.16.4"
-    prop-types "^15.7.2"
-    regenerator-runtime "^0.13.3"
+    loader-utils "^2.0.0"
+    lodash "^4.17.15"
+    prettier "~2.0.5"
+    regenerator-runtime "^0.13.7"
+    source-map "^0.7.3"
 
-"@storybook/storybook-deployer@^2.8.1":
-  version "2.8.6"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/storybook-deployer/-/storybook-deployer-2.8.6.tgz#00c2e84f27dfaa88cb0785361453f23b1ebb4ea3"
-  integrity sha1-AMLoTyffqojLB4U2FFPyOx67TqM=
+"@storybook/storybook-deployer@^2.8.7":
+  version "2.8.7"
+  resolved "https://registry.yarnpkg.com/@storybook/storybook-deployer/-/storybook-deployer-2.8.7.tgz#c1eed33d03bd9267f884c60eea8e03dc3261ec11"
+  integrity sha512-O0hKHV6hg93fPMvKGC5M/sd7KTL473+SzMKm+WZNVEyLEfXXcVU+Ts9/VL1IhmC1P2A8Bg9oBnkcPqAqjAN46w==
   dependencies:
     git-url-parse "^11.1.2"
     glob "^7.1.3"
@@ -1866,168 +2477,93 @@
     shelljs "^0.8.1"
     yargs "^15.0.0"
 
-"@storybook/theming@5.3.19", "@storybook/theming@^5.3.18":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/theming/-/theming-5.3.19.tgz#177d9819bd64f7a1a6ea2f1920ffa5baf9a5f467"
-  integrity sha1-F32YGb1k96Gm6i8ZIP+luvml9Gc=
+"@storybook/theming@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.1.18.tgz#a2aa08a52d589ce9662b9e789506ffa42d97da24"
+  integrity sha512-q97mKSLLnB2LmjzKiNpip7jvvrVPDi+bnYoUCWCt04zuXiaIVU8Bu4i0Y/w3Y3bHqfRbae3gZErFr89Z+f77vA==
   dependencies:
-    "@emotion/core" "^10.0.20"
-    "@emotion/styled" "^10.0.17"
-    "@storybook/client-logger" "5.3.19"
+    "@emotion/core" "^10.1.1"
+    "@emotion/is-prop-valid" "^0.8.6"
+    "@emotion/styled" "^10.0.23"
+    "@storybook/client-logger" "6.1.18"
     core-js "^3.0.1"
     deep-object-diff "^1.1.0"
     emotion-theming "^10.0.19"
     global "^4.3.2"
     memoizerific "^1.11.3"
-    polished "^3.3.1"
-    prop-types "^15.7.2"
+    polished "^3.4.4"
     resolve-from "^5.0.0"
-    ts-dedent "^1.1.0"
-
-"@storybook/ui@5.3.19":
-  version "5.3.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@storybook/ui/-/ui-5.3.19.tgz#ac03b67320044a3892ee784111d4436b61874332"
-  integrity sha1-rAO2cyAESjiS7nhBEdRDa2GHQzI=
-  dependencies:
-    "@emotion/core" "^10.0.20"
-    "@storybook/addons" "5.3.19"
-    "@storybook/api" "5.3.19"
-    "@storybook/channels" "5.3.19"
-    "@storybook/client-logger" "5.3.19"
-    "@storybook/components" "5.3.19"
-    "@storybook/core-events" "5.3.19"
-    "@storybook/router" "5.3.19"
-    "@storybook/theming" "5.3.19"
+    ts-dedent "^2.0.0"
+
+"@storybook/theming@6.1.21", "@storybook/theming@^6.1.11":
+  version "6.1.21"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.1.21.tgz#b8e612e5a39b77f7e63a5f9ea322ed62adb0d5b0"
+  integrity sha512-yq7+/mpdljRdSRJYw/In/9tnDGXIUDe//mhyMftFfrB2mq6zi1yAZpowCerWhiDE2ipGkrfzIYx/Sn7bcaXgqg==
+  dependencies:
+    "@emotion/core" "^10.1.1"
+    "@emotion/is-prop-valid" "^0.8.6"
+    "@emotion/styled" "^10.0.23"
+    "@storybook/client-logger" "6.1.21"
+    core-js "^3.0.1"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.19"
+    global "^4.3.2"
+    memoizerific "^1.11.3"
+    polished "^3.4.4"
+    resolve-from "^5.0.0"
+    ts-dedent "^2.0.0"
+
+"@storybook/ui@6.1.18":
+  version "6.1.18"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.1.18.tgz#e88ad5ba0e041127c8624f15b3071e796348b817"
+  integrity sha512-EKOja3ji0gHxnKWFBt+nK7xuBOzKTEKJ3+PiW0+QS0jZ18EkR7U7h0U052jNXdiI1c6Sck5n9+gI5EylzN18+Q==
+  dependencies:
+    "@emotion/core" "^10.1.1"
+    "@storybook/addons" "6.1.18"
+    "@storybook/api" "6.1.18"
+    "@storybook/channels" "6.1.18"
+    "@storybook/client-logger" "6.1.18"
+    "@storybook/components" "6.1.18"
+    "@storybook/core-events" "6.1.18"
+    "@storybook/router" "6.1.18"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.1.18"
+    "@types/markdown-to-jsx" "^6.11.0"
     copy-to-clipboard "^3.0.8"
     core-js "^3.0.1"
     core-js-pure "^3.0.1"
+    downshift "^6.0.6"
     emotion-theming "^10.0.19"
-    fast-deep-equal "^2.0.1"
-    fuse.js "^3.4.6"
+    fuse.js "^3.6.1"
     global "^4.3.2"
     lodash "^4.17.15"
     markdown-to-jsx "^6.11.4"
     memoizerific "^1.11.3"
-    polished "^3.3.1"
-    prop-types "^15.7.2"
+    polished "^3.4.4"
     qs "^6.6.0"
-    react "^16.8.3"
-    react-dom "^16.8.3"
     react-draggable "^4.0.3"
     react-helmet-async "^1.0.2"
     react-hotkeys "2.0.0"
     react-sizeme "^2.6.7"
-    regenerator-runtime "^0.13.2"
+    regenerator-runtime "^0.13.7"
     resolve-from "^5.0.0"
-    semver "^6.0.0"
     store2 "^2.7.1"
-    telejson "^3.2.0"
-    util-deprecate "^1.0.2"
-
-"@svgr/babel-plugin-add-jsx-attribute@^4.2.0":
-  version "4.2.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz#dadcb6218503532d6884b210e7f3c502caaa44b1"
-  integrity sha1-2ty2IYUDUy1ohLIQ5/PFAsqqRLE=
-
-"@svgr/babel-plugin-remove-jsx-attribute@^4.2.0":
-  version "4.2.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-4.2.0.tgz#297550b9a8c0c7337bea12bdfc8a80bb66f85abc"
-  integrity sha1-KXVQuajAxzN76hK9/IqAu2b4Wrw=
-
-"@svgr/babel-plugin-remove-jsx-empty-expression@^4.2.0":
-  version "4.2.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-4.2.0.tgz#c196302f3e68eab6a05e98af9ca8570bc13131c7"
-  integrity sha1-wZYwLz5o6ragXpivnKhXC8ExMcc=
-
-"@svgr/babel-plugin-replace-jsx-attribute-value@^4.2.0":
-  version "4.2.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-4.2.0.tgz#310ec0775de808a6a2e4fd4268c245fd734c1165"
-  integrity sha1-MQ7Ad13oCKai5P1CaMJF/XNMEWU=
-
-"@svgr/babel-plugin-svg-dynamic-title@^4.3.3":
-  version "4.3.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.3.tgz#2cdedd747e5b1b29ed4c241e46256aac8110dd93"
-  integrity sha1-LN7ddH5bGyntTCQeRiVqrIEQ3ZM=
-
-"@svgr/babel-plugin-svg-em-dimensions@^4.2.0":
-  version "4.2.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-4.2.0.tgz#9a94791c9a288108d20a9d2cc64cac820f141391"
-  integrity sha1-mpR5HJoogQjSCp0sxkysgg8UE5E=
-
-"@svgr/babel-plugin-transform-react-native-svg@^4.2.0":
-  version "4.2.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-4.2.0.tgz#151487322843359a1ca86b21a3815fd21a88b717"
-  integrity sha1-FRSHMihDNZocqGsho4Ff0hqItxc=
-
-"@svgr/babel-plugin-transform-svg-component@^4.2.0":
-  version "4.2.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-4.2.0.tgz#5f1e2f886b2c85c67e76da42f0f6be1b1767b697"
-  integrity sha1-Xx4viGsshcZ+dtpC8Pa+Gxdntpc=
-
-"@svgr/babel-preset@^4.3.3":
-  version "4.3.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@svgr/babel-preset/-/babel-preset-4.3.3.tgz#a75d8c2f202ac0e5774e6bfc165d028b39a1316c"
-  integrity sha1-p12MLyAqwOV3Tmv8Fl0CizmhMWw=
-  dependencies:
-    "@svgr/babel-plugin-add-jsx-attribute" "^4.2.0"
-    "@svgr/babel-plugin-remove-jsx-attribute" "^4.2.0"
-    "@svgr/babel-plugin-remove-jsx-empty-expression" "^4.2.0"
-    "@svgr/babel-plugin-replace-jsx-attribute-value" "^4.2.0"
-    "@svgr/babel-plugin-svg-dynamic-title" "^4.3.3"
-    "@svgr/babel-plugin-svg-em-dimensions" "^4.2.0"
-    "@svgr/babel-plugin-transform-react-native-svg" "^4.2.0"
-    "@svgr/babel-plugin-transform-svg-component" "^4.2.0"
-
-"@svgr/core@^4.3.3":
-  version "4.3.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@svgr/core/-/core-4.3.3.tgz#b37b89d5b757dc66e8c74156d00c368338d24293"
-  integrity sha1-s3uJ1bdX3Gbox0FW0Aw2gzjSQpM=
-  dependencies:
-    "@svgr/plugin-jsx" "^4.3.3"
-    camelcase "^5.3.1"
-    cosmiconfig "^5.2.1"
-
-"@svgr/hast-util-to-babel-ast@^4.3.2":
-  version "4.3.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-4.3.2.tgz#1d5a082f7b929ef8f1f578950238f630e14532b8"
-  integrity sha1-HVoIL3uSnvjx9XiVAjj2MOFFMrg=
-  dependencies:
-    "@babel/types" "^7.4.4"
 
-"@svgr/plugin-jsx@^4.3.3":
-  version "4.3.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@svgr/plugin-jsx/-/plugin-jsx-4.3.3.tgz#e2ba913dbdfbe85252a34db101abc7ebd50992fa"
-  integrity sha1-4rqRPb376FJSo02xAavH69UJkvo=
+"@testing-library/dom@^7.22.0":
+  version "7.29.6"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.29.6.tgz#eb37844fb431186db7960a7ff6749ea65a19617c"
+  integrity sha512-vzTsAXa439ptdvav/4lsKRcGpAQX7b6wBIqia7+iNzqGJ5zjswApxA6jDAsexrc6ue9krWcbh8o+LYkBXW+GCQ==
   dependencies:
-    "@babel/core" "^7.4.5"
-    "@svgr/babel-preset" "^4.3.3"
-    "@svgr/hast-util-to-babel-ast" "^4.3.2"
-    svg-parser "^2.0.0"
-
-"@svgr/plugin-svgo@^4.3.1":
-  version "4.3.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@svgr/plugin-svgo/-/plugin-svgo-4.3.1.tgz#daac0a3d872e3f55935c6588dd370336865e9e32"
-  integrity sha1-2qwKPYcuP1WTXGWI3TcDNoZenjI=
-  dependencies:
-    cosmiconfig "^5.2.1"
-    merge-deep "^3.0.2"
-    svgo "^1.2.2"
-
-"@svgr/webpack@^4.0.3":
-  version "4.3.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@svgr/webpack/-/webpack-4.3.3.tgz#13cc2423bf3dff2d494f16b17eb7eacb86895017"
-  integrity sha1-E8wkI789/y1JTxaxfrfqy4aJUBc=
-  dependencies:
-    "@babel/core" "^7.4.5"
-    "@babel/plugin-transform-react-constant-elements" "^7.0.0"
-    "@babel/preset-env" "^7.4.5"
-    "@babel/preset-react" "^7.0.0"
-    "@svgr/core" "^4.3.3"
-    "@svgr/plugin-jsx" "^4.3.3"
-    "@svgr/plugin-svgo" "^4.3.1"
-    loader-utils "^1.2.3"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/runtime" "^7.12.5"
+    "@types/aria-query" "^4.2.0"
+    aria-query "^4.2.2"
+    chalk "^4.1.0"
+    dom-accessibility-api "^0.5.4"
+    lz-string "^1.4.4"
+    pretty-format "^26.6.2"
 
-"@testing-library/dom@^7.2.1", "@testing-library/dom@^7.9.0":
+"@testing-library/dom@^7.9.0":
   version "7.16.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@testing-library/dom/-/dom-7.16.1.tgz#a6881d53612f2e8f7bcc0e0bd8825c6788cf57f2"
   integrity sha1-pogdU2EvLo97zA4L2IJcZ4jPV/I=
@@ -2037,18 +2573,17 @@
     dom-accessibility-api "^0.4.5"
     pretty-format "^25.5.0"
 
-"@testing-library/jest-dom@^5.3.0":
-  version "5.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@testing-library/jest-dom/-/jest-dom-5.10.1.tgz#6508a9f007bd74e5d3c0b3135b668027ab663989"
-  integrity sha1-ZQip8Ae9dOXTwLMTW2aAJ6tmOYk=
+"@testing-library/jest-dom@^5.11.2":
+  version "5.11.9"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.9.tgz#e6b3cd687021f89f261bd53cbe367041fbd3e975"
+  integrity sha512-Mn2gnA9d1wStlAIT2NU8J15LNob0YFBVjs2aEQ3j8rsfRQo+lAs7/ui1i2TGaJjapLmuNPLTsrm+nPjmZDwpcQ==
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@types/testing-library__jest-dom" "^5.9.1"
+    aria-query "^4.2.2"
     chalk "^3.0.0"
-    css "^2.2.4"
+    css "^3.0.0"
     css.escape "^1.5.1"
-    jest-diff "^25.1.0"
-    jest-matcher-utils "^25.1.0"
     lodash "^4.17.15"
     redent "^3.0.0"
 
@@ -2060,61 +2595,72 @@
     "@babel/runtime" "^7.10.2"
     "@testing-library/dom" "^7.9.0"
 
-"@trousers/collector@^3.0.2":
-  version "3.0.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@trousers/collector/-/collector-3.0.2.tgz#679d1000e07c6a86c63a91ae75c8e16e19de7bf6"
-  integrity sha1-Z50QAOB8aobGOpGudcjhbhnee/Y=
-  dependencies:
-    "@trousers/utils" "3.0.2"
-
-"@trousers/core@4.0.0-alpha5":
-  version "4.0.0-alpha5"
-  resolved "https://registry.yarnpkg.com/@trousers/core/-/core-4.0.0-alpha5.tgz#e01f821c2c98f4f34d787c9e33b2376d82f8e2be"
-  integrity sha512-h56oUdhvXmoqBcwA6fA6ZrvniFnL3P4O+423qS+k+McfYi9AjslhxtKX/6XV4Wiinu7XBHBKV8E8V+JOWW+Mog==
+"@trousers/core@4.0.0-alpha7":
+  version "4.0.0-alpha7"
+  resolved "https://registry.yarnpkg.com/@trousers/core/-/core-4.0.0-alpha7.tgz#996b32298010b1bd7392c487204165e4c5d09802"
+  integrity sha512-2l9VkJOJ3qlVBzRt+9jk52HPKF2X46zcEkzExEKaWBvygVV/nWJG4CsazqSCM+dmfTt/xbXSZlKXNaNX8Ofinw==
   dependencies:
-    "@trousers/hash" "4.0.0-alpha5"
+    "@trousers/hash" "4.0.0-alpha7"
     csstype "^2.5.7"
     tiny-css-prefixer "^1.1.4"
 
-"@trousers/hash@4.0.0-alpha5":
-  version "4.0.0-alpha5"
-  resolved "https://registry.yarnpkg.com/@trousers/hash/-/hash-4.0.0-alpha5.tgz#7df745ece4eaab31b07b404232a2c71346e12cc3"
-  integrity sha512-V0BzOVVUxbH0JPOUIZg81ndrnMpffIax/VUmu07SFUWdeY8k/GMt65zTessnkTDiQiqm0MIgFrJEkDsCmq2gIA==
+"@trousers/hash@4.0.0-alpha7":
+  version "4.0.0-alpha7"
+  resolved "https://registry.yarnpkg.com/@trousers/hash/-/hash-4.0.0-alpha7.tgz#b3037372c16e3dfcfadeea8a7e81b413e88126b6"
+  integrity sha512-UsIdHTT6XQxnRCzkxo1UJoHTBmS3CSNomLJUI7qGR3cfMtV8Ks5tJc46rTsMDBdCSnAEgOgyBx97QXAiy4fC8w==
 
-"@trousers/macro@4.0.0-alpha5":
-  version "4.0.0-alpha5"
-  resolved "https://registry.yarnpkg.com/@trousers/macro/-/macro-4.0.0-alpha5.tgz#1b0bb9a0722df320ad9c8683d0d25d68859a9e60"
-  integrity sha512-omEH/u9irNMmbBG+Z9DGg7ozDrRJAGn3v3nScvxDiTHwMWGDqjwabxmwhvAWocbPi9VjxHGCuM3O46xG9RrO7w==
+"@trousers/macro@4.0.0-alpha7":
+  version "4.0.0-alpha7"
+  resolved "https://registry.yarnpkg.com/@trousers/macro/-/macro-4.0.0-alpha7.tgz#f074c762a1a2bda4f28af308ee82db64bd7ffa4c"
+  integrity sha512-TTngcbCw9mnF+9fFUONR7he6Gp91/y8XSEHcvV70a+91K4XhDvD7ijk2Tv3ebBjLXZ2aXNWzi4KDmxCTm7bUhA==
   dependencies:
-    "@trousers/core" "4.0.0-alpha5"
-    "@trousers/hash" "4.0.0-alpha5"
-    "@trousers/react" "4.0.0-alpha5"
-    "@trousers/sheet" "4.0.0-alpha5"
+    "@trousers/core" "4.0.0-alpha7"
+    "@trousers/hash" "4.0.0-alpha7"
+    "@trousers/react" "4.0.0-alpha7"
+    "@trousers/sheet" "4.0.0-alpha7"
     babel-plugin-macros "^3.0.0"
 
-"@trousers/react@4.0.0-alpha5":
-  version "4.0.0-alpha5"
-  resolved "https://registry.yarnpkg.com/@trousers/react/-/react-4.0.0-alpha5.tgz#3e1598e0a7ce7f31e3103c20c96a4a97a6954d1b"
-  integrity sha512-Oe3eCU0KXMlWemstINASYEBBZ+P9xwGs+htrbCsriW/cCc2RvptHJAttvpd/VR7qFmymPcZpBlHUp0HduBCUWg==
+"@trousers/react@4.0.0-alpha7":
+  version "4.0.0-alpha7"
+  resolved "https://registry.yarnpkg.com/@trousers/react/-/react-4.0.0-alpha7.tgz#f01a90af635425f27cdbd30dc431cb7cf8bb3322"
+  integrity sha512-8P4EF80nrrZ2lqIIjl+QC3r+oq8fbcq69/+rR9zqTeRGPcuU8NE7gM2uT0JreVaBKNZfJRPIZLIcdt+qrmBZhw==
   dependencies:
-    "@trousers/core" "4.0.0-alpha5"
-    "@trousers/sheet" "4.0.0-alpha5"
-
-"@trousers/sheet@4.0.0-alpha5":
-  version "4.0.0-alpha5"
-  resolved "https://registry.yarnpkg.com/@trousers/sheet/-/sheet-4.0.0-alpha5.tgz#8f3931ac0c6ac04fa552135cebbf3b47a8e6caff"
-  integrity sha512-QDXu35nmadZc75sK7UFKomT68cTXF9PERuPqDw4snrM4vlFdRnUgxqD60YP0ty5PE9gNnsUuFtj6LnQZlN57PQ==
+    "@trousers/core" "4.0.0-alpha7"
+    "@trousers/sheet" "4.0.0-alpha7"
 
-"@trousers/utils@3.0.2":
-  version "3.0.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@trousers/utils/-/utils-3.0.2.tgz#8146dd3d1f1459bfc3dbd68f118eab45574123b4"
-  integrity sha1-gUbdPR8UWb/D29aPEY6rRVdBI7Q=
+"@trousers/sheet@4.0.0-alpha7":
+  version "4.0.0-alpha7"
+  resolved "https://registry.yarnpkg.com/@trousers/sheet/-/sheet-4.0.0-alpha7.tgz#fcd1c85e29f02525be453d177d7242d17f019f8e"
+  integrity sha512-xMGsHgRD5CeW9+Kc5g0h81MWE1bz6mzj2nCi0/Mo/gBsBZbUUvgoAaSzUWrGRWEyNOPcTTePT6G5GGg/DvJXjg==
 
 "@types/anymatch@*":
   version "1.3.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
   integrity sha1-M2utwb7sudrMOL6izzKt9ieoQho=
 
+"@types/aria-query@^4.2.0":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.1.tgz#78b5433344e2f92e8b306c06a5622c50c245bf6b"
+  integrity sha512-S6oPal772qJZHoRZLFc/XoZW2gFvwXusYUmXPXkgxJLuEk2vOt7jc4Yo6z/vtI0EBkbPBVrJJ0B+prLIKiWqHg==
+
+"@types/babel-plugin-macros@^2.8.4":
+  version "2.8.4"
+  resolved "https://registry.yarnpkg.com/@types/babel-plugin-macros/-/babel-plugin-macros-2.8.4.tgz#5e0a11093e1902faf23e803f1cf880364e943505"
+  integrity sha512-Fi2GPlNuqaw6oIa3kQSyJx7NiUw9X1XU9af28L4nu+klsDLJyBYoIRIshQW/BQ7/N4R0vPcfyZEZLrVYRoVsfg==
+  dependencies:
+    "@types/babel__core" "*"
+
+"@types/babel__core@*":
+  version "7.1.12"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
+  integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
 "@types/babel__core@^7.1.7":
   version "7.1.8"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/babel__core/-/babel__core-7.1.8.tgz#057f725aca3641f49fc11c7a87a9de5ec588a5d7"
@@ -2148,6 +2694,11 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/braces@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/braces/-/braces-3.0.0.tgz#7da1c0d44ff1c7eb660a36ec078ea61ba7eb42cb"
+  integrity sha512-TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw==
+
 "@types/color-name@^1.1.1":
   version "1.1.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -2158,6 +2709,29 @@
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
   integrity sha1-HuMNeVRMqE1o1LPNsK9PIFZj3S0=
 
+"@types/estree@*":
+  version "0.0.46"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe"
+  integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==
+
+"@types/estree@0.0.39":
+  version "0.0.39"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
+
+"@types/glob-base@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@types/glob-base/-/glob-base-0.3.0.tgz#a581d688347e10e50dd7c17d6f2880a10354319d"
+  integrity sha1-pYHWiDR+EOUN18F9byiAoQNUMZ0=
+
+"@types/glob@*":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
+  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
 "@types/glob@^7.1.1":
   version "7.1.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/glob/-/glob-7.1.2.tgz#06ca26521353a545d94a0adc74f38a59d232c987"
@@ -2173,10 +2747,12 @@
   dependencies:
     "@types/node" "*"
 
-"@types/history@*":
-  version "4.7.6"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/history/-/history-4.7.6.tgz#ed8fc802c45b8e8f54419c2d054e55c9ea344356"
-  integrity sha1-7Y/IAsRbjo9UQZwtBU5Vyeo0Q1Y=
+"@types/hast@^2.0.0":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.1.tgz#b16872f2a6144c7025f296fb9636a667ebb79cd9"
+  integrity sha512-viwwrB+6xGzw+G1eWpF9geV3fnsDgXqHG+cqgiHrvQfDUW5hzhCyV7Sy3UJxhfRFBsgky2SSW33qi/YrIkjX5Q==
+  dependencies:
+    "@types/unist" "*"
 
 "@types/html-minifier-terser@^5.0.0":
   version "5.1.0"
@@ -2208,6 +2784,13 @@
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
+"@types/istanbul-reports@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
+  integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
+  dependencies:
+    "@types/istanbul-lib-report" "*"
+
 "@types/jest@*":
   version "26.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/jest/-/jest-26.0.0.tgz#a6d7573dffa9c68cbbdf38f2e0de26f159e11134"
@@ -2238,16 +2821,48 @@
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd"
   integrity sha1-3M5EMOZLRDuolF8CkPtWStW6xt0=
 
+"@types/json-schema@^7.0.6":
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
+  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
+
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
+"@types/markdown-to-jsx@^6.11.0":
+  version "6.11.3"
+  resolved "https://registry.yarnpkg.com/@types/markdown-to-jsx/-/markdown-to-jsx-6.11.3.tgz#cdd1619308fecbc8be7e6a26f3751260249b020e"
+  integrity sha512-30nFYpceM/ZEvhGiqWjm5quLUxNeld0HCzJEXMZZDpq53FPkS85mTwkWtCXzCqq8s5JYLgM5W392a02xn8Bdaw==
+  dependencies:
+    "@types/react" "*"
+
+"@types/micromatch@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/micromatch/-/micromatch-4.0.1.tgz#9381449dd659fc3823fd2a4190ceacc985083bc7"
+  integrity sha512-my6fLBvpY70KattTNzYOK6KU1oR1+UCz9ug/JbcF5UrEmeCt9P7DV2t7L8+t18mMPINqGQCE4O8PLOPbI84gxw==
+  dependencies:
+    "@types/braces" "*"
+
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha1-PcoOPzOyAPx9ETnAzZbBJoyt/Z0=
 
+"@types/minimist@^1.2.0":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
+  integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
+
+"@types/node-fetch@^2.5.4":
+  version "2.5.8"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.8.tgz#e199c835d234c7eb0846f6618012e558544ee2fb"
+  integrity sha512-fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw==
+  dependencies:
+    "@types/node" "*"
+    form-data "^3.0.0"
+
 "@types/node@*":
   version "14.0.13"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/node/-/node-14.0.13.tgz#ee1128e881b874c371374c1f72201893616417c9"
@@ -2268,6 +2883,11 @@
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/npmlog/-/npmlog-4.1.2.tgz#d070fe6a6b78755d1092a3dc492d34c3d8f871c4"
   integrity sha1-0HD+amt4dV0QkqPcSS00w9j4ccQ=
 
+"@types/overlayscrollbars@^1.9.0":
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/@types/overlayscrollbars/-/overlayscrollbars-1.12.0.tgz#98456caceca8ad73bd5bb572632a585074e70764"
+  integrity sha512-h/pScHNKi4mb+TrJGDon8Yb06ujFG0mSg12wIO0sWMUF3dQIe2ExRRdNRviaNt9IjxIiOfnRr7FsQAdHwK4sMg==
+
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@@ -2283,18 +2903,25 @@
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
   integrity sha1-KrDV2i5YFflLC51LldHl8kOrLKc=
 
-"@types/q@^1.5.1":
-  version "1.5.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
-  integrity sha1-FZJUFOCtLNdlv+9YhC9+JqesyyQ=
+"@types/qs@^6.9.0":
+  version "6.9.5"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.5.tgz#434711bdd49eb5ee69d90c1d67c354a9a8ecb18b"
+  integrity sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==
 
-"@types/reach__router@^1.2.3":
-  version "1.3.5"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/reach__router/-/reach__router-1.3.5.tgz#14e1e981cccd3a5e50dc9e969a72de0b9d472f6d"
-  integrity sha1-FOHpgczNOl5Q3J6WmnLeC51HL20=
+"@types/reach__router@^1.3.7":
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.7.tgz#de8ab374259ae7f7499fc1373b9697a5f3cd6428"
+  integrity sha512-cyBEb8Ef3SJNH5NYEIDGPoMMmYUxROatuxbICusVRQIqZUB85UCt6R2Ok60tKS/TABJsJYaHyNTW3kqbpxlMjg==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react-color@^3.0.1":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/react-color/-/react-color-3.0.4.tgz#c63daf012ad067ac0127bdd86725f079d02082bd"
+  integrity sha512-EswbYJDF1kkrx93/YU+BbBtb46CCtDMvTiGmcOa/c5PETnwTiSWoseJ1oSWeRl/4rUXkhME9bVURvvPg0W5YQw==
   dependencies:
-    "@types/history" "*"
     "@types/react" "*"
+    "@types/reactcss" "*"
 
 "@types/react-dom@^16.8.2":
   version "16.9.8"
@@ -2310,13 +2937,6 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-textarea-autosize@^4.3.3":
-  version "4.3.5"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/react-textarea-autosize/-/react-textarea-autosize-4.3.5.tgz#6c4d2753fa1864c98c0b2b517f67bb1f6e4c46de"
-  integrity sha1-bE0nU/oYZMmMCytRf2e7H25MRt4=
-  dependencies:
-    "@types/react" "*"
-
 "@types/react@*", "@types/react@^16.8.1":
   version "16.9.36"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/react/-/react-16.9.36.tgz#ade589ff51e2a903e34ee4669e05dbfa0c1ce849"
@@ -2325,6 +2945,20 @@
     "@types/prop-types" "*"
     csstype "^2.2.0"
 
+"@types/reactcss@*":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@types/reactcss/-/reactcss-1.2.3.tgz#af28ae11bbb277978b99d04d1eedfd068ca71834"
+  integrity sha512-d2gQQ0IL6hXLnoRfVYZukQNWHuVsE75DzFTLPUuyyEhJS8G2VvlE+qfQQ91SJjaMqlURRCNIsX7Jcsw6cEuJlA==
+  dependencies:
+    "@types/react" "*"
+
+"@types/resolve@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
+  integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
+  dependencies:
+    "@types/node" "*"
+
 "@types/semver@^6.0.0", "@types/semver@^6.0.1":
   version "6.2.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/semver/-/semver-6.2.1.tgz#a236185670a7860f1597cf73bea2e16d001461ba"
@@ -2364,10 +2998,15 @@
   dependencies:
     source-map "^0.6.1"
 
-"@types/webpack-env@^1.15.0":
-  version "1.15.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/@types/webpack-env/-/webpack-env-1.15.2.tgz#927997342bb9f4a5185a86e6579a0a18afc33b0a"
-  integrity sha1-knmXNCu59KUYWobmV5oKGK/DOwo=
+"@types/unist@*":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
+  integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
+
+"@types/webpack-env@^1.15.3":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.0.tgz#8c0a9435dfa7b3b1be76562f3070efb3f92637b4"
+  integrity sha512-Fx+NpfOO0CpeYX2g9bkvX8O5qh9wrU1sOF4g8sft4Mu7z+qfe387YlyY8w8daDyDsKY5vUxM0yxkAYnbkRbZEw==
 
 "@types/webpack-sources@*":
   version "1.4.0"
@@ -2696,6 +3335,11 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
   integrity sha1-75FuJxxkrBIXH9g4TqrmsjRYVNo=
 
+ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+
 ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.5.5:
   version "6.12.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
@@ -2716,6 +3360,16 @@ ajv@^6.10.0:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^6.12.5:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ansi-align@^2.0.0:
   version "2.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
@@ -2740,7 +3394,7 @@ ansi-colors@^4.1.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
   integrity sha1-y7muJWv3UK8eqzRPIpqif+lLo0g=
 
-ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+ansi-escapes@^3.0.0:
   version "3.2.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha1-h4C5j/nb9WOBUtHx/lwde0RCl2s=
@@ -2752,9 +3406,9 @@ ansi-escapes@^4.2.1:
   dependencies:
     type-fest "^0.11.0"
 
-ansi-html@0.0.7:
+ansi-html@0.0.7, ansi-html@^0.0.7:
   version "0.0.7"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
   integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
 
 ansi-red@^0.1.1:
@@ -2966,6 +3620,11 @@ arrify@^1.0.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
+arrify@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
+  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
+
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
@@ -3005,16 +3664,18 @@ ast-types-flow@^0.0.7:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
   integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
 
-ast-types@0.11.3:
-  version "0.11.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/ast-types/-/ast-types-0.11.3.tgz#c20757fe72ee71278ea0ff3d87e5c2ca30d9edf8"
-  integrity sha1-wgdX/nLucSeOoP89h+XCyjDZ7fg=
-
 ast-types@^0.13.2:
   version "0.13.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/ast-types/-/ast-types-0.13.3.tgz#50da3f28d17bdbc7969a3a2d83a0e4a72ae755a7"
   integrity sha1-UNo/KNF728eWmjotg6DkpyrnVac=
 
+ast-types@^0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd"
+  integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==
+  dependencies:
+    tslib "^2.0.1"
+
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
@@ -3030,11 +3691,21 @@ async-limiter@~1.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha1-3TeelPDbgxCwgpH51kwyCXZmF/0=
 
+async@0.9.x:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
+  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
+at-least-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -3197,7 +3868,7 @@ babel-plugin-jest-hoist@^25.5.0:
     "@babel/types" "^7.3.3"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.7.0:
+babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.8.0:
   version "2.8.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
   integrity sha1-D5WKfMZVax5lNERl2ZERoeXhATg=
@@ -3296,14 +3967,38 @@ babel-plugin-named-asset-import@^0.3.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.6.tgz#c9750a1b38d85112c9e166bf3ef7c5dbc605f4be"
   integrity sha1-yXUKGzjYURLJ4Wa/PvfF28YF9L4=
 
-babel-plugin-react-docgen@^4.0.0:
-  version "4.1.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/babel-plugin-react-docgen/-/babel-plugin-react-docgen-4.1.0.tgz#1dfa447dac9ca32d625a123df5733a9e47287c26"
-  integrity sha1-HfpEfaycoy1iWhI99XM6nkcofCY=
+babel-plugin-polyfill-corejs2@^0.1.4:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz#a2c5c245f56c0cac3dbddbf0726a46b24f0f81d1"
+  integrity sha512-DO95wD4g0A8KRaHKi0D51NdGXzvpqVLnLu5BTvDlpqUEpTmeEtypgC1xqesORaWmiUOQI14UHKlzNd9iZ2G3ZA==
+  dependencies:
+    "@babel/compat-data" "^7.13.0"
+    "@babel/helper-define-polyfill-provider" "^0.1.5"
+    semver "^6.1.1"
+
+babel-plugin-polyfill-corejs3@^0.1.3:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz#80449d9d6f2274912e05d9e182b54816904befd0"
+  integrity sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==
   dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.1.5"
+    core-js-compat "^3.8.1"
+
+babel-plugin-polyfill-regenerator@^0.1.2:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz#0fe06a026fe0faa628ccc8ba3302da0a6ce02f3f"
+  integrity sha512-OUrYG9iKPKz8NxswXbRAdSwF0GhRdIEMTloQATJi4bDuFqrXaXcCUT/VGNrr8pBcjMh1RxZ7Xt9cytVJTJfvMg==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.1.5"
+
+babel-plugin-react-docgen@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-react-docgen/-/babel-plugin-react-docgen-4.2.1.tgz#7cc8e2f94e8dc057a06e953162f0810e4e72257b"
+  integrity sha512-UQ0NmGHj/HAqi5Bew8WvNfCk8wSsmdgNd8ZdMjBCICtyCJCq9LiqgqvjCYe570/Wg7AQArSq1VQ60Dd/CHN7mQ==
+  dependencies:
+    ast-types "^0.14.2"
     lodash "^4.17.15"
     react-docgen "^5.0.0"
-    recast "^0.14.7"
 
 "babel-plugin-styled-components@>= 1":
   version "1.10.7"
@@ -3468,6 +4163,13 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+better-opn@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/better-opn/-/better-opn-2.1.1.tgz#94a55b4695dc79288f31d7d0e5f658320759f7c6"
+  integrity sha512-kIPXZS5qwyKiX/HcRvDYfmBQUa8XP17I0mYZZ0y4UhpYOSvtsLHDYqmomS+Mj20aDvD3knEiQ0ecQy2nhio3yA==
+  dependencies:
+    open "^7.0.3"
+
 better-path-resolve@1.0.0:
   version "1.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/better-path-resolve/-/better-path-resolve-1.0.0.tgz#13a35a1104cdd48a7b74bf8758f96a1ee613f99d"
@@ -3528,7 +4230,7 @@ body-parser@1.19.0:
     raw-body "2.4.0"
     type-is "~1.6.17"
 
-boolbase@^1.0.0, boolbase@~1.0.0:
+boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
@@ -3676,16 +4378,17 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.7.0:
-  version "4.7.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/browserslist/-/browserslist-4.7.0.tgz#9ee89225ffc07db03409f2fee524dc8227458a17"
-  integrity sha1-nuiSJf/AfbA0CfL+5STcgidFihc=
+browserslist@4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz#f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"
+  integrity sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==
   dependencies:
-    caniuse-lite "^1.0.30000989"
-    electron-to-chromium "^1.3.247"
-    node-releases "^1.1.29"
+    caniuse-lite "^1.0.30001035"
+    electron-to-chromium "^1.3.378"
+    node-releases "^1.1.52"
+    pkg-up "^3.1.0"
 
-browserslist@^4.12.0, browserslist@^4.8.5:
+browserslist@^4.12.0:
   version "4.12.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
   integrity sha1-BsbVcVoe3mxR/Dn/Z/1kf3QLZW0=
@@ -3695,6 +4398,17 @@ browserslist@^4.12.0, browserslist@^4.8.5:
     node-releases "^1.1.53"
     pkg-up "^2.0.0"
 
+browserslist@^4.14.5, browserslist@^4.16.3:
+  version "4.16.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
+  integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==
+  dependencies:
+    caniuse-lite "^1.0.30001181"
+    colorette "^1.2.1"
+    electron-to-chromium "^1.3.649"
+    escalade "^3.1.1"
+    node-releases "^1.1.70"
+
 bs-logger@0.x:
   version "0.2.6"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
@@ -3728,6 +4442,11 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
+builtin-modules@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
+  integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
+
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
@@ -3764,28 +4483,27 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^13.0.1:
-  version "13.0.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c"
-  integrity sha1-qAAMIWlwiQgvhSh6GuxuOCAkpxw=
+cacache@^15.0.5:
+  version "15.0.5"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0"
+  integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==
   dependencies:
-    chownr "^1.1.2"
-    figgy-pudding "^3.5.1"
+    "@npmcli/move-file" "^1.0.1"
+    chownr "^2.0.0"
     fs-minipass "^2.0.0"
     glob "^7.1.4"
-    graceful-fs "^4.2.2"
     infer-owner "^1.0.4"
-    lru-cache "^5.1.1"
-    minipass "^3.0.0"
+    lru-cache "^6.0.0"
+    minipass "^3.1.1"
     minipass-collect "^1.0.2"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.2"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    p-map "^3.0.0"
+    mkdirp "^1.0.3"
+    p-map "^4.0.0"
     promise-inflight "^1.0.1"
-    rimraf "^2.7.1"
-    ssri "^7.0.0"
+    rimraf "^3.0.2"
+    ssri "^8.0.0"
+    tar "^6.0.2"
     unique-filename "^1.1.1"
 
 cache-base@^1.0.1:
@@ -3803,6 +4521,14 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
 call-me-maybe@^1.0.1:
   version "1.0.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
@@ -3849,6 +4575,15 @@ camelcase-keys@^4.0.0:
     map-obj "^2.0.0"
     quick-lru "^1.0.0"
 
+camelcase-keys@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
+  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
+  dependencies:
+    camelcase "^5.3.1"
+    map-obj "^4.0.0"
+    quick-lru "^4.0.1"
+
 camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -3864,12 +4599,12 @@ camelize@^1.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
   integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=
 
-can-use-dom@^0.1.0:
-  version "0.1.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/can-use-dom/-/can-use-dom-0.1.0.tgz#22cc4a34a0abc43950f42c6411024a3f6366b45a"
-  integrity sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo=
+caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001181:
+  version "1.0.30001196"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001196.tgz#00518a2044b1abf3e0df31fadbe5ed90b63f4e64"
+  integrity sha512-CPvObjD3ovWrNBaXlAIGWmg2gQQuJ5YhuciUOjPRox6hIQttu8O+b51dx6VIpIY9ESd2d0Vac1RKpICdG4rGUg==
 
-caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001061:
+caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001061:
   version "1.0.30001084"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/caniuse-lite/-/caniuse-lite-1.0.30001084.tgz#00e471931eaefbeef54f46aa2203914d3c165669"
   integrity sha1-AORxkx6u++71T0aqIgORTTwWVmk=
@@ -3919,10 +4654,10 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0:
+chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha1-ThSHCmGNni7dl92DRf2dncMVZGo=
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
@@ -3947,7 +4682,7 @@ chardet@^0.7.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha1-kAlISfCTfy7twkJdDSip5fDLrZ4=
 
-chokidar@^2.0.4, chokidar@^2.1.8:
+chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha1-gEs6e2qZNYw8XGHnHYco8EHP+Rc=
@@ -3966,10 +4701,10 @@ chokidar@^2.0.4, chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.4.0:
-  version "3.4.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
-  integrity sha1-swYRQjzjdjV8dlubj5BLn7o8C+g=
+chokidar@^3.3.0, chokidar@^3.4.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
+  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"
@@ -3977,15 +4712,20 @@ chokidar@^3.4.0:
     is-binary-path "~2.1.0"
     is-glob "~4.0.1"
     normalize-path "~3.0.0"
-    readdirp "~3.4.0"
+    readdirp "~3.5.0"
   optionalDependencies:
-    fsevents "~2.1.2"
+    fsevents "~2.3.1"
 
-chownr@^1.1.1, chownr@^1.1.2:
+chownr@^1.1.1:
   version "1.1.4"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha1-b8nXtC0ypYNZYzdmbn0ICE2izGs=
 
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
 chrome-trace-event@^1.0.2:
   version "1.0.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
@@ -4043,13 +4783,6 @@ cli-boxes@^2.2.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
   integrity sha1-U47K6PnGylCOPDyVtFP+k8tMFo0=
 
-cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
-  dependencies:
-    restore-cursor "^2.0.0"
-
 cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
@@ -4057,13 +4790,13 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-table3@0.5.1:
-  version "0.5.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
-  integrity sha1-AlI3LZTfxA29jfBgBfSPMfZW8gI=
+cli-table3@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.0.tgz#b7b1bc65ca8e7b5cef9124e13dc2b21e2ce4faee"
+  integrity sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==
   dependencies:
     object-assign "^4.1.0"
-    string-width "^2.1.1"
+    string-width "^4.2.0"
   optionalDependencies:
     colors "^1.1.2"
 
@@ -4090,17 +4823,6 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
-clone-deep@^0.2.4:
-  version "0.2.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/clone-deep/-/clone-deep-0.2.4.tgz#4e73dd09e9fb971cc38670c5dced9c1896481cc6"
-  integrity sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=
-  dependencies:
-    for-own "^0.1.3"
-    is-plain-object "^2.0.1"
-    kind-of "^3.0.2"
-    lazy-cache "^1.0.3"
-    shallow-clone "^0.1.2"
-
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
@@ -4111,15 +4833,6 @@ co@^4.6.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
-coa@^2.0.2:
-  version "2.0.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
-  integrity sha1-Q/bCEVG07yv1cYfbDXPeIp4+fsM=
-  dependencies:
-    "@types/q" "^1.5.1"
-    chalk "^2.4.1"
-    q "^1.1.2"
-
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -4167,15 +4880,20 @@ color-name@~1.1.4:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=
 
+colorette@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
 colors@^1.1.2:
   version "1.4.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha1-xQSRR51MG9rtLJztMs98fcI2D3g=
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
@@ -4189,11 +4907,16 @@ commander@^2.19.0, commander@^2.20.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha1-/UhehMA+tIgcIHIrpIA16FMa6zM=
 
-commander@^4.0.1, commander@^4.1.1:
+commander@^4.1.1:
   version "4.1.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha1-n9YCvZNilOnp70aj9NaWQESxgGg=
 
+commander@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
+  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -4204,6 +4927,11 @@ component-emitter@^1.2.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=
 
+compute-scroll-into-view@^1.0.16:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz#6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab"
+  integrity sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -4299,12 +5027,12 @@ copy-to-clipboard@^3.0.8:
   dependencies:
     toggle-selection "^1.0.6"
 
-core-js-compat@^3.6.2:
-  version "3.6.5"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
-  integrity sha1-KlHZpOJd/W5pAlGqgfmePAVIHxw=
+core-js-compat@^3.8.1, core-js-compat@^3.9.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.1.tgz#4e572acfe90aff69d76d8c37759d21a5c59bb455"
+  integrity sha512-jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA==
   dependencies:
-    browserslist "^4.8.5"
+    browserslist "^4.16.3"
     semver "7.0.0"
 
 core-js-pure@^3.0.0, core-js-pure@^3.0.1:
@@ -4317,20 +5045,17 @@ core-js@^3.0.1, core-js@^3.0.4:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
   integrity sha1-c5XcJzrzf7LlDpvT2f6EEoUjHRo=
 
+core-js@^3.6.5:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz#cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae"
+  integrity sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg==
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-corejs-upgrade-webpack-plugin@^2.2.0:
-  version "2.2.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/corejs-upgrade-webpack-plugin/-/corejs-upgrade-webpack-plugin-2.2.0.tgz#503293bf1fdcb104918eb40d0294e4776ad6923a"
-  integrity sha1-UDKTvx/csQSRjrQNApTkd2rWkjo=
-  dependencies:
-    resolve-from "^5.0.0"
-    webpack "^4.38.0"
-
-cosmiconfig@^5.0.0, cosmiconfig@^5.2.1:
+cosmiconfig@^5.0.0:
   version "5.2.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
   integrity sha1-BA9yaAnFked6F8CjYmykW08Wixo=
@@ -4362,6 +5087,31 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
+cp-file@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-7.0.0.tgz#b9454cfd07fe3b974ab9ea0e5f29655791a9b8cd"
+  integrity sha512-0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    make-dir "^3.0.0"
+    nested-error-stacks "^2.0.0"
+    p-event "^4.1.0"
+
+cpy@^8.1.1:
+  version "8.1.2"
+  resolved "https://registry.yarnpkg.com/cpy/-/cpy-8.1.2.tgz#e339ea54797ad23f8e3919a5cffd37bfc3f25935"
+  integrity sha512-dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg==
+  dependencies:
+    arrify "^2.0.1"
+    cp-file "^7.0.0"
+    globby "^9.2.0"
+    has-glob "^1.0.0"
+    junk "^3.1.0"
+    nested-error-stacks "^2.1.0"
+    p-all "^2.1.0"
+    p-filter "^2.1.0"
+    p-map "^3.0.0"
+
 "crc32@>= 0.2.2":
   version "0.2.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/crc32/-/crc32-0.2.2.tgz#7ad220d6ffdcd119f9fc127a7772cacea390a4ba"
@@ -4398,7 +5148,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-create-react-context@0.3.0, create-react-context@^0.3.0:
+create-react-context@0.3.0:
   version "0.3.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/create-react-context/-/create-react-context-0.3.0.tgz#546dede9dc422def0d3fc2fe03afe0bc0f4f7d8c"
   integrity sha1-VG3t6dxCLe8NP8L+A6/gvA9PfYw=
@@ -4406,16 +5156,14 @@ create-react-context@0.3.0, create-react-context@^0.3.0:
     gud "^1.0.0"
     warning "^4.0.3"
 
-cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=
+cross-spawn@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"
+  integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==
   dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
 
 cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
@@ -4426,6 +5174,17 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://packages.atlassian.com/api/npm/npm-remote/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 cross-spawn@^7.0.0, cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -4457,10 +5216,10 @@ css-color-keywords@^1.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05"
   integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=
 
-css-loader@^3.0.0:
+css-loader@^3.5.3:
   version "3.6.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"
-  integrity sha1-Lkssfm4tJ/jI8o9hv/zS5ske9kU=
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"
+  integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==
   dependencies:
     camelcase "^5.3.1"
     cssesc "^3.0.0"
@@ -4476,11 +5235,6 @@ css-loader@^3.0.0:
     schema-utils "^2.7.0"
     semver "^6.3.0"
 
-css-select-base-adapter@^0.1.1:
-  version "0.1.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7"
-  integrity sha1-Oy/0lyzDYquIVhUHqVQIoUMhNdc=
-
 css-select@^1.1.0:
   version "1.2.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
@@ -4491,16 +5245,6 @@ css-select@^1.1.0:
     domutils "1.5.1"
     nth-check "~1.0.1"
 
-css-select@^2.0.0:
-  version "2.1.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef"
-  integrity sha1-ajRlM1ZjWTSoG6ymjQJVQyEF2+8=
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^3.2.1"
-    domutils "^1.7.0"
-    nth-check "^1.0.2"
-
 css-to-react-native@^3.0.0:
   version "3.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756"
@@ -4510,59 +5254,30 @@ css-to-react-native@^3.0.0:
     css-color-keywords "^1.0.0"
     postcss-value-parser "^4.0.2"
 
-css-tree@1.0.0-alpha.37:
-  version "1.0.0-alpha.37"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22"
-  integrity sha1-mL69YsTB2flg7DQM+fdSLjBwmiI=
-  dependencies:
-    mdn-data "2.0.4"
-    source-map "^0.6.1"
-
-css-tree@1.0.0-alpha.39:
-  version "1.0.0-alpha.39"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/css-tree/-/css-tree-1.0.0-alpha.39.tgz#2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb"
-  integrity sha1-K/8//huz93bPfu/ZHuXLp3oUnus=
-  dependencies:
-    mdn-data "2.0.6"
-    source-map "^0.6.1"
-
 css-what@2.1:
   version "2.1.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
   integrity sha1-ptdgRXM2X+dGhsPzEcVlE9iChfI=
 
-css-what@^3.2.1:
-  version "3.3.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/css-what/-/css-what-3.3.0.tgz#10fec696a9ece2e591ac772d759aacabac38cd39"
-  integrity sha1-EP7Glqns4uWRrHctdZqsq6w4zTk=
-
 css.escape@^1.5.1:
   version "1.5.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
   integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=
 
-css@^2.2.4:
-  version "2.2.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
-  integrity sha1-xkZ1XHOXHyu6amAeLPL9cbEpiSk=
+css@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d"
+  integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==
   dependencies:
-    inherits "^2.0.3"
+    inherits "^2.0.4"
     source-map "^0.6.1"
-    source-map-resolve "^0.5.2"
-    urix "^0.1.0"
+    source-map-resolve "^0.6.0"
 
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4=
 
-csso@^4.0.2:
-  version "4.0.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/csso/-/csso-4.0.3.tgz#0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"
-  integrity sha1-DZmF3IUsfMKyys+74QeQFNGo6QM=
-  dependencies:
-    css-tree "1.0.0-alpha.39"
-
 cssom@0.3.x, cssom@^0.3.4, cssom@~0.3.6:
   version "0.3.8"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
@@ -4650,6 +5365,11 @@ data-urls@^1.1.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
+dataloader@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.0.0.tgz#41eaf123db115987e21ca93c005cd7753c55fe6f"
+  integrity sha512-YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ==
+
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
   version "2.6.9"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -4657,7 +5377,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.0, debug@^3.2.5:
+debug@^3.0.0:
   version "3.2.6"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha1-6D0X3hbYp++3cX7b5fsQE17uYps=
@@ -4671,7 +5391,7 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-decamelize-keys@^1.0.0:
+decamelize-keys@^1.0.0, decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
   integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
@@ -4689,17 +5409,10 @@ decode-uri-component@^0.2.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-deep-equal@^1.1.1:
-  version "1.1.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
-  integrity sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o=
-  dependencies:
-    is-arguments "^1.0.4"
-    is-date-object "^1.0.1"
-    is-regex "^1.0.4"
-    object-is "^1.0.1"
-    object-keys "^1.1.1"
-    regexp.prototype.flags "^1.2.0"
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
 
 deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.3"
@@ -4889,6 +5602,11 @@ dom-accessibility-api@^0.4.5:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/dom-accessibility-api/-/dom-accessibility-api-0.4.5.tgz#d9c1cefa89f509d8cf132ab5d250004d755e76e3"
   integrity sha1-2cHO+on1CdjPEyq10lAATXVeduM=
 
+dom-accessibility-api@^0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz#b06d059cdd4a4ad9a79275f9d414a5c126241166"
+  integrity sha512-TvrjBckDy2c6v6RLxPv5QXOnU+SmF9nBII5621Ve5fu6Z/BDrENurBEvlC1f44lKEUVqOpK4w9E5Idc5/EgkLQ==
+
 dom-converter@^0.2:
   version "0.2.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
@@ -4946,7 +5664,7 @@ domutils@1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^1.5.1, domutils@^1.7.0:
+domutils@^1.5.1:
   version "1.7.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
   integrity sha1-Vuo0HoNOBuZ0ivehyyXaZ+qfjCo=
@@ -4991,6 +5709,16 @@ dotenv@^8.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
   integrity sha1-l+YZJZradQ7qPk6j4mvO6lQksWo=
 
+downshift@^6.0.6:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/downshift/-/downshift-6.1.0.tgz#f008063d9b63935910d9db12ead07979ab51ce66"
+  integrity sha512-MnEJERij+1pTVAsOPsH3q9MJGNIZuu2sT90uxOCEOZYH6sEzkVGtUcTBVDRQkE8y96zpB7uEbRn24aE9VpHnZg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    compute-scroll-into-view "^1.0.16"
+    prop-types "^15.7.2"
+    react-is "^17.0.1"
+
 duplexer@^0.1.1:
   version "0.1.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
@@ -5019,12 +5747,19 @@ ee-first@1.1.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs@^2.7.4:
-  version "2.7.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
-  integrity sha1-SGYSh1c9zFPjZsehrlLDoSDuybo=
+ejs@^3.1.2:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a"
+  integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==
+  dependencies:
+    jake "^10.6.1"
 
-electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.413:
+electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.649:
+  version "1.3.682"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.682.tgz#f4b5c8d4479df96b61e508a721d6c32c1262ef23"
+  integrity sha512-zok2y37qR00U14uM6qBz/3iIjWHom2eRfC2S1StA0RslP7x34jX+j4mxv80t8OEOHLJPVG54ZPeaFxEI7gPrwg==
+
+electron-to-chromium@^1.3.413:
   version "1.3.474"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/electron-to-chromium/-/electron-to-chromium-1.3.474.tgz#161af012e11f96795eade84bf03b8ddc039621b9"
   integrity sha1-FhrwEuEflnlerehL8DuN3AOWIbk=
@@ -5095,7 +5830,16 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
+endent@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/endent/-/endent-2.0.1.tgz#fb18383a3f37ae3213a5d9f6c4a880d1061eb4c5"
+  integrity sha512-mADztvcC+vCk4XEZaCz6xIPO2NHQuprv5CAEjuVAu6aZwqAj7nVNlMyl1goPFYqCCpS2OJV9jwpumJLkotZrNw==
+  dependencies:
+    dedent "^0.7.0"
+    fast-json-parse "^1.0.3"
+    objectorarray "^1.0.4"
+
+enhanced-resolve@^4.0.0:
   version "4.2.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz#5d43bda4a0fd447cb0ebbe71bef8deff8805ad0d"
   integrity sha1-XUO9pKD9RHyw675xvvje/4gFrQ0=
@@ -5104,6 +5848,15 @@ enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
+enhanced-resolve@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
+  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.0"
+
 enquirer@^2.3.0:
   version "2.3.5"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/enquirer/-/enquirer-2.3.5.tgz#3ab2b838df0a9d8ab9e7dff235b0e8712ef92381"
@@ -5111,10 +5864,10 @@ enquirer@^2.3.0:
   dependencies:
     ansi-colors "^3.2.1"
 
-enquirer@^2.3.5:
+enquirer@^2.3.5, enquirer@^2.3.6:
   version "2.3.6"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha1-Kn/l3WNKHkElqXXsmU/1RW3Dc00=
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
   dependencies:
     ansi-colors "^4.1.1"
 
@@ -5142,7 +5895,14 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.0, es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4, es-abstract@^1.17.5:
+error-stack-parser@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8"
+  integrity sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==
+  dependencies:
+    stackframe "^1.1.1"
+
+es-abstract@^1.17.0, es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.4, es-abstract@^1.17.5:
   version "1.17.6"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
   integrity sha1-kUIHFweFeyysx7iey2cDFsPi1So=
@@ -5196,12 +5956,22 @@ es6-shim@^0.35.5:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/es6-shim/-/es6-shim-0.35.5.tgz#46f59dc0a84a1c5029e8ff1166ca0a902077a9ab"
   integrity sha1-RvWdwKhKHFAp6P8RZsoKkCB3qas=
 
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -5397,7 +6167,7 @@ espree@^7.2.0:
     acorn-jsx "^5.2.0"
     eslint-visitor-keys "^1.3.0"
 
-esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
+esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=
@@ -5426,6 +6196,16 @@ estraverse@^5.1.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
   integrity sha1-N0MJ05/ZNa5QDnuS6Ka0xyDllkI=
 
+estree-walker@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
+  integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
+
+estree-walker@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -5436,23 +6216,11 @@ etag@~1.8.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-eventemitter3@^4.0.0:
-  version "4.0.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
-  integrity sha1-tUY6zmNaCD0Bi9x8kXtMXxCoU4Q=
-
 events@^3.0.0:
   version "3.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
   integrity sha1-hCea8bNMt1qoi/X/KR9tC9mzGlk=
 
-eventsource@^1.0.7:
-  version "1.0.7"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
-  integrity sha1-j7xyyT/NNAiAkLwKTmT0tc7m2NA=
-  dependencies:
-    original "^1.0.0"
-
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
@@ -5678,6 +6446,23 @@ fast-glob@^3.1.1:
     micromatch "^4.0.2"
     picomatch "^2.2.1"
 
+fast-glob@^3.2.4:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
+  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
+
+fast-json-parse@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fast-json-parse/-/fast-json-parse-1.0.3.tgz#43e5c61ee4efa9265633046b770fb682a7577c4d"
+  integrity sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==
+
 fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -5695,20 +6480,13 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-fault@^1.0.2:
+fault@^1.0.0:
   version "1.0.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/fault/-/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13"
-  integrity sha1-6vz8Cm0hT8lGAeFw3ymVSk+ELxM=
+  resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13"
+  integrity sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==
   dependencies:
     format "^0.2.0"
 
-faye-websocket@~0.11.1:
-  version "0.11.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
-  integrity sha1-XA6aiWjokSwoZjn96XeosgnyUI4=
-  dependencies:
-    websocket-driver ">=0.5.1"
-
 fb-watchman@^2.0.0:
   version "2.0.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
@@ -5721,13 +6499,6 @@ figgy-pudding@^3.5.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha1-tO7oFIq7Adzx0aw0Nn1Z4S+mHW4=
 
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 figures@^3.0.0:
   version "3.2.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
@@ -5742,13 +6513,13 @@ file-entry-cache@^5.0.1:
   dependencies:
     flat-cache "^2.0.1"
 
-file-loader@^4.2.0:
-  version "4.3.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/file-loader/-/file-loader-4.3.0.tgz#780f040f729b3d18019f20605f723e844b8a58af"
-  integrity sha1-eA8ED3KbPRgBnyBgX3I+hEuKWK8=
+file-loader@^6.0.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
+  integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
   dependencies:
-    loader-utils "^1.2.3"
-    schema-utils "^2.5.0"
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
 
 file-system-cache@^1.0.5:
   version "1.0.5"
@@ -5764,10 +6535,17 @@ file-uri-to-path@1.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha1-VTp7hEb/b2hDWcRF8eN6BdrMM90=
 
-filesize@3.6.1:
-  version "3.6.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
-  integrity sha1-CQuz7gG2+AGoqL6Z0xcQs0Irsxc=
+filelist@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b"
+  integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==
+  dependencies:
+    minimatch "^3.0.4"
+
+filesize@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.0.1.tgz#f850b509909c7c86f7e450ea19006c31c2ed3d2f"
+  integrity sha512-u4AYWPgbI5GBhs6id1KdImZWn5yfyFrrQ8OWZdN7ZMfA8Bf4HcO0BGo9bmUIEV8yrp8I1xVfJ/dn90GtFNNJcg==
 
 fill-range@^2.1.0:
   version "2.2.4"
@@ -5810,7 +6588,7 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^2.1.0:
+find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
   integrity sha1-jQ+UzRP+Q8bHwmGg2GEVypGMBfc=
@@ -5819,7 +6597,7 @@ find-cache-dir@^2.1.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
-find-cache-dir@^3.0.0, find-cache-dir@^3.3.1:
+find-cache-dir@^3.3.1:
   version "3.3.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
   integrity sha1-ibM/rUpGcNqpT4Vff74x1thP6IA=
@@ -5833,12 +6611,13 @@ find-root@^1.1.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
   integrity sha1-q8/Iunb3CMQql7PWhbfpRQv7nOQ=
 
-find-up@3.0.0, find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=
+find-up@4.1.0, find-up@^4.0.0, find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://packages.atlassian.com/api/npm/npm-remote/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk=
   dependencies:
-    locate-path "^3.0.0"
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
 
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
@@ -5847,13 +6626,12 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-find-up@^4.0.0, find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk=
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://packages.atlassian.com/api/npm/npm-remote/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=
   dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
+    locate-path "^3.0.0"
 
 find-workspaces-root@^0.2.0:
   version "0.2.0"
@@ -5895,52 +6673,57 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-focus-lock@^0.6.7:
-  version "0.6.8"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/focus-lock/-/focus-lock-0.6.8.tgz#61985fadfa92f02f2ee1d90bc738efaf7f3c9f46"
-  integrity sha1-YZhfrfqS8C8u4dkLxzjvr388n0Y=
-
 focus-lock@^0.7.0:
   version "0.7.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/focus-lock/-/focus-lock-0.7.0.tgz#b2bfb0ca7beacc8710a1ff74275fe0dc60a1d88a"
   integrity sha1-sr+wynvqzIcQof90J1/g3GCh2Io=
 
-for-in@^0.1.3:
-  version "0.1.8"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
-  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
-
-for-in@^1.0.1, for-in@^1.0.2:
+for-in@^1.0.2:
   version "1.0.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-for-own@^0.1.3:
-  version "0.1.5"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
-  dependencies:
-    for-in "^1.0.1"
+  resolved "https://packages.atlassian.com/api/npm/npm-remote/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-fork-ts-checker-webpack-plugin@1.5.0:
-  version "1.5.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz#ce1d77190b44d81a761b10b6284a373795e41f0c"
-  integrity sha1-zh13GQtE2Bp2GxC2KEo3N5XkHww=
+fork-ts-checker-webpack-plugin@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz#a1642c0d3e65f50c2cc1742e9c0a80f441f86b19"
+  integrity sha512-DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ==
   dependencies:
     babel-code-frame "^6.22.0"
     chalk "^2.4.1"
-    chokidar "^2.0.4"
+    chokidar "^3.3.0"
+    micromatch "^3.1.10"
+    minimatch "^3.0.4"
+    semver "^5.6.0"
+    tapable "^1.0.0"
+    worker-rpc "^0.1.0"
+
+fork-ts-checker-webpack-plugin@^4.1.4:
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz#5055c703febcf37fa06405d400c122b905167fc5"
+  integrity sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==
+  dependencies:
+    "@babel/code-frame" "^7.5.5"
+    chalk "^2.4.1"
     micromatch "^3.1.10"
     minimatch "^3.0.4"
     semver "^5.6.0"
     tapable "^1.0.0"
     worker-rpc "^0.1.0"
 
+form-data@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -6000,7 +6783,7 @@ fs-extra@^7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^8.0.1, fs-extra@^8.1.0:
+fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
   integrity sha1-SdQ8RaiM2Wd2aMt74bRu/bjS4cA=
@@ -6009,6 +6792,16 @@ fs-extra@^8.0.1, fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^9.0.0, fs-extra@^9.0.1:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
+  dependencies:
+    at-least-node "^1.0.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -6039,11 +6832,16 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
-fsevents@^2.1.2, fsevents@~2.1.2:
+fsevents@^2.1.2:
   version "2.1.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
   integrity sha1-+3OHA66NL5/pAMM4Nt3r7ouX8j4=
 
+fsevents@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -6068,10 +6866,10 @@ functions-have-names@^1.2.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/functions-have-names/-/functions-have-names-1.2.1.tgz#a981ac397fa0c9964551402cdc5533d7a4d52f91"
   integrity sha1-qYGsOX+gyZZFUUAs3FUz16TVL5E=
 
-fuse.js@^3.4.6:
+fuse.js@^3.6.1:
   version "3.6.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/fuse.js/-/fuse.js-3.6.1.tgz#7de85fdd6e1b3377c23ce010892656385fd9b10c"
-  integrity sha1-fehf3W4bM3fCPOAQiSZWOF/ZsQw=
+  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.6.1.tgz#7de85fdd6e1b3377c23ce010892656385fd9b10c"
+  integrity sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw==
 
 gauge@~2.7.3:
   version "2.7.4"
@@ -6092,11 +6890,25 @@ gensync@^1.0.0-beta.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
   integrity sha1-WPQ2H/mH5f9uHnohCCeqNx6qwmk=
 
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+
 get-caller-file@^2.0.1:
   version "2.0.5"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha1-T5RBKoLbMvNuOwuXQfipf+sDH34=
 
+get-intrinsic@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -6193,12 +7005,19 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
+glob-promise@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-3.4.0.tgz#b6b8f084504216f702dc2ce8c9bc9ac8866fdb20"
+  integrity sha512-q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw==
+  dependencies:
+    "@types/glob" "*"
+
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=
@@ -6299,7 +7118,7 @@ good-listener@^1.2.2:
   dependencies:
     delegate "^3.1.2"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha1-Ila94U02MpWMRl68ltxGfKB6Kfs=
@@ -6368,6 +7187,11 @@ har-validator@~5.1.3:
     ajv "^6.5.5"
     har-schema "^2.0.0"
 
+hard-rejection@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
+  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -6385,6 +7209,13 @@ has-flag@^4.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=
 
+has-glob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-glob/-/has-glob-1.0.0.tgz#9aaa9eedbffb1ba3990a7b0010fb678ee0081207"
+  integrity sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=
+  dependencies:
+    is-glob "^3.0.0"
+
 has-symbols@^1.0.0, has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
@@ -6455,11 +7286,12 @@ hast-util-parse-selector@^2.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/hast-util-parse-selector/-/hast-util-parse-selector-2.2.4.tgz#60c99d0b519e12ab4ed32e58f150ec3f61ed1974"
   integrity sha1-YMmdC1GeEqtO0y5Y8VDsP2HtGXQ=
 
-hastscript@^5.0.0:
-  version "5.1.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/hastscript/-/hastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a"
-  integrity sha1-veLC5W0Exi3SToxd8ojQUKNV+4o=
+hastscript@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640"
+  integrity sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==
   dependencies:
+    "@types/hast" "^2.0.0"
     comma-separated-tokens "^1.0.0"
     hast-util-parse-selector "^2.0.0"
     property-information "^5.0.0"
@@ -6470,10 +7302,10 @@ he@^1.2.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha1-hK5l+n6vsWX922FWauFLrwVmTw8=
 
-highlight.js@~9.13.0:
-  version "9.13.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/highlight.js/-/highlight.js-9.13.1.tgz#054586d53a6863311168488a0f58d6c505ce641e"
-  integrity sha1-BUWG1TpoYzERaEiKD1jWxQXOZB4=
+highlight.js@^10.1.1, highlight.js@~10.6.0:
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.6.0.tgz#0073aa71d566906965ba6e1b7be7b2682f5e18b6"
+  integrity sha512-8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -6508,6 +7340,11 @@ html-entities@^1.2.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
   integrity sha1-+5oaS1sUxdq6gtPjTGrk/nAaDkQ=
 
+html-entities@^1.2.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
+  integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
+
 html-escaper@^2.0.0:
   version "2.0.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
@@ -6531,17 +7368,17 @@ html-tags@^1.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/html-tags/-/html-tags-1.2.0.tgz#c78de65b5663aa597989dd2b7ab49200d7e4db98"
   integrity sha1-x43mW1Zjqll5id0rerSSANfk25g=
 
-html-webpack-plugin@^4.0.0-beta.2:
-  version "4.3.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz#53bf8f6d696c4637d5b656d3d9863d89ce8174fd"
-  integrity sha1-U7+PbWlsRjfVtlbT2YY9ic6BdP0=
+html-webpack-plugin@^4.2.1:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz#76fc83fa1a0f12dd5f7da0404a54e2699666bc12"
+  integrity sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==
   dependencies:
     "@types/html-minifier-terser" "^5.0.0"
     "@types/tapable" "^1.0.5"
     "@types/webpack" "^4.41.8"
     html-minifier-terser "^5.0.1"
     loader-utils "^1.2.3"
-    lodash "^4.17.15"
+    lodash "^4.17.20"
     pretty-error "^2.1.1"
     tapable "^1.1.3"
     util.promisify "1.0.0"
@@ -6587,11 +7424,6 @@ http-errors@~1.7.2:
     statuses ">= 1.5.0 < 2"
     toidentifier "1.0.0"
 
-http-parser-js@>=0.5.1:
-  version "0.5.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/http-parser-js/-/http-parser-js-0.5.2.tgz#da2e31d237b393aae72ace43882dd7e270a8ff77"
-  integrity sha1-2i4x0jezk6rnKs5DiC3X4nCo/3c=
-
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -6640,6 +7472,13 @@ iferr@^0.1.5:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
+ignore-walk@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
+  dependencies:
+    minimatch "^3.0.4"
+
 ignore@^3.3.5:
   version "3.3.10"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
@@ -6759,22 +7598,22 @@ ini@^1.3.5:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=
 
-inquirer@6.5.0:
-  version "6.5.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42"
-  integrity sha1-IwMxfvyaTqfsLi32+GVptzSsz0I=
+inquirer@7.0.4:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz#99af5bde47153abca23f5c7fc30db247f39da703"
+  integrity sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==
   dependencies:
-    ansi-escapes "^3.2.0"
+    ansi-escapes "^4.2.1"
     chalk "^2.4.2"
-    cli-cursor "^2.1.0"
+    cli-cursor "^3.1.0"
     cli-width "^2.0.0"
     external-editor "^3.0.3"
-    figures "^2.0.0"
-    lodash "^4.17.12"
-    mute-stream "0.0.7"
+    figures "^3.0.0"
+    lodash "^4.17.15"
+    mute-stream "0.0.8"
     run-async "^2.2.0"
-    rxjs "^6.4.0"
-    string-width "^2.1.0"
+    rxjs "^6.5.3"
+    string-width "^4.1.0"
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
@@ -6816,7 +7655,7 @@ interpret@^2.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
   integrity sha1-GnigtZZcQKVBbQB61vUK0nxBffk=
 
-invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4:
+invariant@^2.2.3, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=
@@ -6889,7 +7728,7 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-buffer@^1.0.2, is-buffer@^1.1.5:
+is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha1-76ouqdqg16suoTqXsritUf776L4=
@@ -6906,7 +7745,7 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.1.0:
+is-core-module@^2.1.0, is-core-module@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
   integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
@@ -6965,6 +7804,11 @@ is-docker@^2.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/is-docker/-/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"
   integrity sha1-LLDfDnXi0GT+GGTDfN6st7Lc8ls=
 
+is-dotfile@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -7004,10 +7848,10 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0=
 
-is-function@^1.0.1:
+is-function@^1.0.2:
   version "1.0.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08"
-  integrity sha1-Twl/MKv2762smDOxfKXcA/gUTgg=
+  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08"
+  integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==
 
 is-generator-fn@^2.0.0:
   version "2.1.0"
@@ -7021,7 +7865,7 @@ is-glob@^2.0.0:
   dependencies:
     is-extglob "^1.0.0"
 
-is-glob@^3.1.0:
+is-glob@^3.0.0, is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
   integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
@@ -7052,6 +7896,11 @@ is-map@^2.0.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1"
   integrity sha1-Ug2vxDB7uOvDO4E95c58lADWRKE=
 
+is-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
+
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -7076,32 +7925,40 @@ is-number@^7.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=
 
-is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
+is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=
   dependencies:
     isobject "^3.0.1"
 
-is-plain-object@^3.0.0:
-  version "3.0.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/is-plain-object/-/is-plain-object-3.0.0.tgz#47bfc5da1b5d50d64110806c199359482e75a928"
-  integrity sha1-R7/F2htdUNZBEIBsGZNZSC51qSg=
+is-reference@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
+  integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
   dependencies:
-    isobject "^4.0.0"
+    "@types/estree" "*"
 
-is-regex@^1.0.4, is-regex@^1.1.0:
+is-regex@^1.1.0:
   version "1.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff"
   integrity sha1-7OOOOJ5JDfDcIcrqK9WW+Yf3Z/8=
   dependencies:
     has-symbols "^1.0.1"
 
+is-regex@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
+  integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
+  dependencies:
+    call-bind "^1.0.2"
+    has-symbols "^1.0.1"
+
 is-root@2.1.0:
   version "2.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
@@ -7261,6 +8118,16 @@ iterate-value@^1.0.0:
     es-get-iterator "^1.0.2"
     iterate-iterator "^1.0.1"
 
+jake@^10.6.1:
+  version "10.8.2"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"
+  integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==
+  dependencies:
+    async "0.9.x"
+    chalk "^2.4.2"
+    filelist "^1.0.1"
+    minimatch "^3.0.4"
+
 jest-changed-files@^25.5.0:
   version "25.5.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/jest-changed-files/-/jest-changed-files-25.5.0.tgz#141cc23567ceb3f534526f8614ba39421383634c"
@@ -7315,7 +8182,7 @@ jest-config@^25.5.4:
     pretty-format "^25.5.0"
     realpath-native "^2.0.0"
 
-jest-diff@^25.1.0, jest-diff@^25.2.1, jest-diff@^25.5.0:
+jest-diff@^25.2.1, jest-diff@^25.5.0:
   version "25.5.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9"
   integrity sha1-HdJu1k+WZnwGjO8Ca2d9+gGvz6k=
@@ -7423,7 +8290,7 @@ jest-leak-detector@^25.5.0:
     jest-get-type "^25.2.6"
     pretty-format "^25.5.0"
 
-jest-matcher-utils@^25.1.0, jest-matcher-utils@^25.5.0:
+jest-matcher-utils@^25.5.0:
   version "25.5.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz#fbc98a12d730e5d2453d7f1ed4a4d948e34b7867"
   integrity sha1-+8mKEtcw5dJFPX8e1KTZSONLeGc=
@@ -7636,6 +8503,18 @@ jest-util@^25.5.0:
     is-ci "^2.0.0"
     make-dir "^3.0.0"
 
+jest-util@^26.1.0:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
+  integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
+  dependencies:
+    "@jest/types" "^26.6.2"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    is-ci "^2.0.0"
+    micromatch "^4.0.2"
+
 jest-validate@^25.5.0:
   version "25.5.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/jest-validate/-/jest-validate-25.5.0.tgz#fb4c93f332c2e4cf70151a628e58a35e459a413a"
@@ -7686,7 +8565,7 @@ jest-watcher@^25.5.0:
     jest-util "^25.5.0"
     string-length "^3.1.0"
 
-jest-worker@^25.4.0, jest-worker@^25.5.0:
+jest-worker@^25.5.0:
   version "25.5.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/jest-worker/-/jest-worker-25.5.0.tgz#2611d071b79cea0f43ee57a3d118593ac1547db1"
   integrity sha1-JhHQcbec6g9D7lej0RhZOsFUfbE=
@@ -7694,6 +8573,15 @@ jest-worker@^25.4.0, jest-worker@^25.5.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
+jest-worker@^26.2.1, jest-worker@^26.3.0:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
+
 jest@^25.3.0:
   version "25.5.4"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/jest/-/jest-25.5.4.tgz#f21107b6489cfe32b076ce2adcadee3587acb9db"
@@ -7805,6 +8693,11 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk=
 
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -7825,11 +8718,6 @@ json-stringify-safe@~5.0.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json3@^3.3.2:
-  version "3.3.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
-  integrity sha1-f8EON1/FrkLEcFpcwKpvYr4wW4E=
-
 json5@2.x, json5@^2.1.1, json5@^2.1.2:
   version "2.1.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
@@ -7858,6 +8746,15 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -7876,12 +8773,10 @@ jsx-ast-utils@^2.2.3, jsx-ast-utils@^2.4.1:
     array-includes "^3.1.1"
     object.assign "^4.1.0"
 
-kind-of@^2.0.1:
-  version "2.0.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"
-  integrity sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=
-  dependencies:
-    is-buffer "^1.0.2"
+junk@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
+  integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
@@ -7902,7 +8797,7 @@ kind-of@^5.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
   integrity sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=
 
-kind-of@^6.0.0, kind-of@^6.0.2:
+kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=
@@ -7931,16 +8826,6 @@ language-tags@^1.0.5:
   dependencies:
     language-subtag-registry "~0.3.2"
 
-lazy-cache@^0.2.3:
-  version "0.2.7"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
-  integrity sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=
-
-lazy-cache@^1.0.3:
-  version "1.0.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
-  integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
-
 lazy-cache@^2.0.2:
   version "2.0.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
@@ -7964,13 +8849,6 @@ leven@^3.1.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha1-d4kd6DQGTMy6gq54QrtrFKE+1/I=
 
-levenary@^1.1.1:
-  version "1.1.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
-  integrity sha1-hCqe6Y0gdap/ru2+MmeekgX0b3c=
-  dependencies:
-    leven "^3.1.0"
-
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -8087,6 +8965,11 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+lodash-es@^4.17.15:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
+  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -8097,11 +8980,6 @@ lodash.debounce@^4.0.8:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
-lodash.memoize@4.x, lodash.memoize@^4.1.2:
-  version "4.1.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -8127,17 +9005,17 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "^3.0.0"
 
-lodash.throttle@^4.1.1:
-  version "4.1.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
-  integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
-
 lodash.unescape@4.0.1:
   version "4.0.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
   integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
 
-lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15:
+lodash@4.x, lodash@^4.0.1, lodash@^4.17.20:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15:
   version "4.17.15"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=
@@ -8176,13 +9054,13 @@ lower-case@^2.0.1:
   dependencies:
     tslib "^1.10.0"
 
-lowlight@~1.11.0:
-  version "1.11.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/lowlight/-/lowlight-1.11.0.tgz#1304d83005126d4e8b1dc0f07981e9b689ec2efc"
-  integrity sha1-EwTYMAUSbU6LHcDweYHptonsLvw=
+lowlight@^1.14.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.19.0.tgz#b8544199cafcf10c5731b21c7458c358f79a2a97"
+  integrity sha512-NIskvQ1d1ovKyUytkMpT8+8Bhq3Ub54os1Xp4RAC9uNbXH1YVRf5NERq7JNzapEe5BzUc1Cj4F0I+eLBBFj6hA==
   dependencies:
-    fault "^1.0.2"
-    highlight.js "~9.13.0"
+    fault "^1.0.0"
+    highlight.js "~10.6.0"
 
 lru-cache@^4.0.1:
   version "4.1.5"
@@ -8199,7 +9077,26 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-make-dir@^2.0.0:
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+lz-string@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26"
+  integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=
+
+magic-string@^0.25.7:
+  version "0.25.7"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
+  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
+make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
   integrity sha1-XwMQ4YuL6JjMBwCSlaMK5B6R5vU=
@@ -8241,6 +9138,11 @@ map-obj@^2.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
   integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
 
+map-obj@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.1.0.tgz#b91221b542734b9f14256c0132c897c5d7256fd5"
+  integrity sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==
+
 map-or-similar@^1.5.0:
   version "1.5.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/map-or-similar/-/map-or-similar-1.5.0.tgz#6de2653174adfb5d9edc33c69d3e92a1b76faf08"
@@ -8284,6 +9186,11 @@ markdown-toc@^1.2.0:
     repeat-string "^1.6.1"
     strip-color "^0.1.0"
 
+material-colors@^1.2.1:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
+  integrity sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==
+
 math-random@^1.0.1:
   version "1.0.4"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
@@ -8298,16 +9205,6 @@ md5.js@^1.3.4:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
-mdn-data@2.0.4:
-  version "2.0.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
-  integrity sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs=
-
-mdn-data@2.0.6:
-  version "2.0.6"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/mdn-data/-/mdn-data-2.0.6.tgz#852dc60fcaa5daa2e8cf6c9189c440ed3e042978"
-  integrity sha1-hS3GD8ql2qLoz2yRicRA7T4EKXg=
-
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -8356,14 +9253,22 @@ meow@^5.0.0:
     trim-newlines "^2.0.0"
     yargs-parser "^10.0.0"
 
-merge-deep@^3.0.2:
-  version "3.0.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/merge-deep/-/merge-deep-3.0.2.tgz#f39fa100a4f1bd34ff29f7d2bf4508fbb8d83ad2"
-  integrity sha1-85+hAKTxvTT/KffSv0UI+7jYOtI=
+meow@^7.1.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-7.1.1.tgz#7c01595e3d337fcb0ec4e8eed1666ea95903d306"
+  integrity sha512-GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==
   dependencies:
-    arr-union "^3.1.0"
-    clone-deep "^0.2.4"
-    kind-of "^3.0.2"
+    "@types/minimist" "^1.2.0"
+    camelcase-keys "^6.2.2"
+    decamelize-keys "^1.1.0"
+    hard-rejection "^2.1.0"
+    minimist-options "4.1.0"
+    normalize-package-data "^2.5.0"
+    read-pkg-up "^7.0.1"
+    redent "^3.0.0"
+    trim-newlines "^3.0.0"
+    type-fest "^0.13.1"
+    yargs-parser "^18.1.3"
 
 merge-descriptors@1.0.1:
   version "1.0.1"
@@ -8390,14 +9295,6 @@ microevent.ts@~0.1.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0"
   integrity sha1-cLCbg/Q99RctAgWmMCW84Pc1f6A=
 
-micromatch@4.x, micromatch@^4.0.0, micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha1-T8sJmb+fvC/L3SEvbWKbmlbDklk=
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
-
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -8417,6 +9314,14 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.0, micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://packages.atlassian.com/api/npm/npm-remote/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha1-T8sJmb+fvC/L3SEvbWKbmlbDklk=
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -8430,6 +9335,11 @@ mime-db@1.44.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
   integrity sha1-+hHF6wrKEzS0Izy01S8QxaYnL5I=
 
+mime-db@1.46.0:
+  version "1.46.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee"
+  integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==
+
 mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24:
   version "2.1.27"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
@@ -8437,6 +9347,13 @@ mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24:
   dependencies:
     mime-db "1.44.0"
 
+mime-types@^2.1.27:
+  version "2.1.29"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2"
+  integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==
+  dependencies:
+    mime-db "1.46.0"
+
 mime@1.6.0:
   version "1.6.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -8447,11 +9364,6 @@ mime@^2.4.4:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
   integrity sha1-5bQHyQ20QvK+tbFiNz0Htpr/pNE=
 
-mimic-fn@^1.0.0:
-  version "1.2.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-  integrity sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=
-
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -8469,16 +9381,6 @@ min-indent@^1.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha1-pj9oFnOzBXH76LwlaGrnRu76mGk=
 
-mini-css-extract-plugin@^0.7.0:
-  version "0.7.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/mini-css-extract-plugin/-/mini-css-extract-plugin-0.7.0.tgz#5ba8290fbb4179a43dd27cca444ba150bee743a0"
-  integrity sha1-W6gpD7tBeaQ90nzKREuhUL7nQ6A=
-  dependencies:
-    loader-utils "^1.1.0"
-    normalize-url "1.9.1"
-    schema-utils "^1.0.0"
-    webpack-sources "^1.1.0"
-
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
@@ -8496,6 +9398,15 @@ minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimist-options@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
+  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
+  dependencies:
+    arrify "^1.0.1"
+    is-plain-obj "^1.1.0"
+    kind-of "^6.0.3"
+
 minimist-options@^3.0.1:
   version "3.0.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
@@ -8537,6 +9448,14 @@ minipass@^3.0.0, minipass@^3.1.1:
   dependencies:
     yallist "^4.0.0"
 
+minizlib@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+  dependencies:
+    minipass "^3.0.0"
+    yallist "^4.0.0"
+
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -8561,20 +9480,17 @@ mixin-deep@^1.1.3, mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mixin-object@^2.0.1:
-  version "2.0.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
-  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
-  dependencies:
-    for-in "^0.1.3"
-    is-extendable "^0.1.1"
-
 mixme@^0.3.1:
   version "0.3.5"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/mixme/-/mixme-0.3.5.tgz#304652cdaf24a3df0487205e61ac6162c6906ddd"
   integrity sha1-MEZSza8ko98EhyBeYaxhYsaQbd0=
 
-mkdirp@0.x, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
+mkdirp@1.x, mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mkdirp@^0.5.1, mkdirp@^0.5.3:
   version "0.5.5"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha1-2Rzv1i0UNsoPQWIOJRKI1CAJne8=
@@ -8608,10 +9524,10 @@ ms@^2.1.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=
 
-mute-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+ms@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 mute-stream@0.0.8:
   version "0.0.8"
@@ -8640,6 +9556,13 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+native-url@^0.2.6:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.6.tgz#ca1258f5ace169c716ff44eccbddb674e10399ae"
+  integrity sha512-k4bDC87WtgrdD362gZz6zoiXQrl40kYlBmpfmSjwRO1VU0V5ccwJTlxuE72F6m3V0vc1xOf6n3UCP9QyerRqmA==
+  dependencies:
+    querystring "^0.2.0"
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -8655,6 +9578,11 @@ neo-async@^2.5.0, neo-async@^2.6.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha1-rCetpmFn+ohJpq3dg39rGJrSCBw=
 
+nested-error-stacks@^2.0.0, nested-error-stacks@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz#0fbdcf3e13fe4994781280524f8b96b0cdff9c61"
+  integrity sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==
+
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -8730,7 +9658,12 @@ node-notifier@^6.0.0:
     shellwords "^0.1.1"
     which "^1.3.1"
 
-node-releases@^1.1.29, node-releases@^1.1.53:
+node-releases@^1.1.52, node-releases@^1.1.70:
+  version "1.1.71"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
+  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+
+node-releases@^1.1.53:
   version "1.1.58"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935"
   integrity sha1-juIO7zD6YOUnVfzAlC3vWnNP6TU=
@@ -8762,21 +9695,33 @@ normalize-range@^0.1.2:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
-normalize-url@1.9.1:
-  version "1.9.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
-  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
-  dependencies:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
-
 normalize-url@^3.3.0:
   version "3.3.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha1-suHE3E98bVd0PfczpPWXjRhlBVk=
 
+npm-bundled@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
+npm-packlist@^2.1.2:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.1.4.tgz#40e96b2b43787d0546a574542d01e066640d09da"
+  integrity sha512-Qzg2pvXC9U4I4fLnUrBmcIT4x0woLtUgxUi9eC+Zrcv1Xx5eamytGAfbDWQ67j7xOcQ2VW1I3su9smVTIdu7Hw==
+  dependencies:
+    glob "^7.1.6"
+    ignore-walk "^3.0.3"
+    npm-bundled "^1.1.1"
+    npm-normalize-package-bin "^1.0.1"
+
 npm-run-all@^4.1.5:
   version "4.1.5"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
@@ -8816,7 +9761,7 @@ npmlog@^4.1.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-nth-check@^1.0.2, nth-check@~1.0.1:
+nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
   integrity sha1-sr0pXDfj3VijvwcAN2Zjuk2c8Fw=
@@ -8843,7 +9788,7 @@ oauth-sign@~0.9.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=
 
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -8867,14 +9812,6 @@ object-inspect@^1.7.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
   integrity sha1-9Pa9GBrXfwBrXs5gvQtvOY/3Smc=
 
-object-is@^1.0.1:
-  version "1.1.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6"
-  integrity sha1-xdLof/nhGfeLegiEQVGeLuwVc7Y=
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
 object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -8916,7 +9853,7 @@ object.entries@^1.1.0, object.entries@^1.1.1:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
+object.getownpropertydescriptors@^2.0.3:
   version "2.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
   integrity sha1-Npvx+VktiridcS3O1cuBx8U1Jkk=
@@ -8941,6 +9878,11 @@ object.values@^1.1.0, object.values@^1.1.1:
     function-bind "^1.1.1"
     has "^1.0.3"
 
+objectorarray@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/objectorarray/-/objectorarray-1.0.4.tgz#d69b2f0ff7dc2701903d308bb85882f4ddb49483"
+  integrity sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w==
+
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -8955,13 +9897,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
-  dependencies:
-    mimic-fn "^1.0.0"
-
 onetime@^5.1.0:
   version "5.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
@@ -8969,17 +9904,10 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@^6.3.0:
-  version "6.4.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
-  integrity sha1-XBPpbQ3IlGhhZPGJZez+iJ7PyKk=
-  dependencies:
-    is-wsl "^1.1.0"
-
-open@^7.0.0:
-  version "7.0.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/open/-/open-7.0.4.tgz#c28a9d315e5c98340bf979fdcb2e58664aa10d83"
-  integrity sha1-woqdMV5cmDQL+Xn9yy5YZkqhDYM=
+open@^7.0.2, open@^7.0.3:
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
+  integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
   dependencies:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
@@ -9008,13 +9936,6 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
-original@^1.0.0:
-  version "1.0.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
-  integrity sha1-5EKmHP/hxf0gpl8yYcJmY7MD8l8=
-  dependencies:
-    url-parse "^1.4.3"
-
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
@@ -9030,11 +9951,30 @@ outdent@^0.5.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/outdent/-/outdent-0.5.0.tgz#9e10982fdc41492bb473ad13840d22f9655be2ff"
   integrity sha1-nhCYL9xBSSu0c60ThA0i+WVb4v8=
 
+overlayscrollbars@^1.10.2:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/overlayscrollbars/-/overlayscrollbars-1.13.1.tgz#0b840a88737f43a946b9d87875a2f9e421d0338a"
+  integrity sha512-gIQfzgGgu1wy80EB4/6DaJGHMEGmizq27xHIESrzXq0Y/J0Ay1P3DWk6tuVmEPIZH15zaBlxeEJOqdJKmowHCQ==
+
+p-all@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-all/-/p-all-2.1.0.tgz#91419be56b7dee8fe4c5db875d55e0da084244a0"
+  integrity sha512-HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA==
+  dependencies:
+    p-map "^2.0.0"
+
 p-each-series@^2.1.0:
   version "2.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48"
   integrity sha1-lhyN0/GV6pbHR+Y2smK4AKaxr0g=
 
+p-event@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/p-event/-/p-event-4.2.0.tgz#af4b049c8acd91ae81083ebd1e6f5cae2044c1b5"
+  integrity sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==
+  dependencies:
+    p-timeout "^3.1.0"
+
 p-filter@^2.1.0:
   version "2.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/p-filter/-/p-filter-2.1.0.tgz#1b1472562ae7a0f742f0f3d3d3718ea66ff9c09c"
@@ -9059,13 +9999,20 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.1, p-limit@^2.3.0:
+p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.1:
   version "2.3.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -9099,6 +10046,20 @@ p-map@^3.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
+p-timeout@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+  dependencies:
+    p-finally "^1.0.0"
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -9150,10 +10111,10 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-entities@^1.1.2:
-  version "1.2.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/parse-entities/-/parse-entities-1.2.2.tgz#c31bf0f653b6661354f8973559cb86dd1d5edf50"
-  integrity sha1-wxvw9lO2ZhNU+Jc1WcuG3R1e31A=
+parse-entities@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"
+  integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==
   dependencies:
     character-entities "^1.0.0"
     character-entities-legacy "^1.0.0"
@@ -9167,6 +10128,16 @@ parse-github-url@^1.0.2:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/parse-github-url/-/parse-github-url-1.0.2.tgz#242d3b65cbcdda14bb50439e3242acf6971db395"
   integrity sha1-JC07ZcvN2hS7UEOeMkKs9pcds5U=
 
+parse-glob@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
+  dependencies:
+    glob-base "^0.3.0"
+    is-dotfile "^1.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.0"
+
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -9192,6 +10163,16 @@ parse-json@^5.0.0:
     json-parse-better-errors "^1.0.1"
     lines-and-columns "^1.1.6"
 
+parse-json@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
 parse-path@^4.0.0:
   version "4.0.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/parse-path/-/parse-path-4.0.1.tgz#0ec769704949778cb3b8eda5e994c32073a1adff"
@@ -9323,7 +10304,7 @@ performance-now@^2.1.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2:
   version "2.2.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha1-IfMz6ba46v8CRo9RRupAbTRfTa0=
@@ -9348,7 +10329,7 @@ pify@^4.0.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE=
 
-pirates@^4.0.1:
+pirates@^4.0.0, pirates@^4.0.1:
   version "4.0.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
   integrity sha1-ZDqSyviUVm+RsrmG0sZpUKji+4c=
@@ -9376,7 +10357,14 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-up@2.0.0, pkg-up@^2.0.0:
+pkg-up@3.1.0, pkg-up@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
+  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
+  dependencies:
+    find-up "^3.0.0"
+
+pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
   integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
@@ -9388,24 +10376,19 @@ pn@^1.1.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
   integrity sha1-4vTO8OIZ9GPBeas3Rj5OHs3Muvs=
 
-pnp-webpack-plugin@1.5.0:
-  version "1.5.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/pnp-webpack-plugin/-/pnp-webpack-plugin-1.5.0.tgz#62a1cd3068f46d564bb33c56eb250e4d586676eb"
-  integrity sha1-YqHNMGj0bVZLszxW6yUOTVhmdus=
+pnp-webpack-plugin@1.6.4:
+  version "1.6.4"
+  resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149"
+  integrity sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==
   dependencies:
-    ts-pnp "^1.1.2"
+    ts-pnp "^1.1.6"
 
-polished@^3.3.1:
-  version "3.6.5"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/polished/-/polished-3.6.5.tgz#dbefdde64c675935ec55119fe2a2ab627ca82e9c"
-  integrity sha1-2+/d5kxnWTXsVRGf4qKrYnyoLpw=
+polished@^3.4.4:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/polished/-/polished-3.7.1.tgz#d1addc87ee16eb5b413c6165eda37600cccb9c11"
+  integrity sha512-/QgHrNGYwIA4mwxJ/7FSvalUJsm7KNfnXiScVSEG2Xa5qxDeBn4nmdjN2pW00mkM2Tts64ktc47U8F7Ed1BRAA==
   dependencies:
-    "@babel/runtime" "^7.9.2"
-
-popper.js@^1.14.4, popper.js@^1.14.7:
-  version "1.16.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
-  integrity sha1-KiI8s9x7YhPXQOQDcr5A3kPmWxs=
+    "@babel/runtime" "^7.12.5"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
@@ -9513,11 +10496,6 @@ prelude-ls@~1.1.2:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prepend-http@^1.0.0:
-  version "1.0.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
-
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
@@ -9530,6 +10508,11 @@ prettier@^1.16.4, prettier@^1.18.2:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha1-99f1/4qc2HKnvkyhQglZVqYHl8s=
 
+prettier@~2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
+  integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
+
 pretty-error@^2.1.1:
   version "2.1.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
@@ -9548,26 +10531,29 @@ pretty-format@^25.2.1, pretty-format@^25.5.0:
     ansi-styles "^4.0.0"
     react-is "^16.12.0"
 
+pretty-format@^26.6.2:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
+  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
+  dependencies:
+    "@jest/types" "^26.6.2"
+    ansi-regex "^5.0.0"
+    ansi-styles "^4.0.0"
+    react-is "^17.0.1"
+
 pretty-hrtime@^1.0.3:
   version "1.0.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
   integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
 
-prismjs@^1.8.4:
-  version "1.20.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/prismjs/-/prismjs-1.20.0.tgz#9b685fc480a3514ee7198eac6a3bf5024319ff03"
-  integrity sha1-m2hfxICjUU7nGY6sajv1AkMZ/wM=
-  optionalDependencies:
-    clipboard "^2.0.0"
-
-prismjs@~1.17.0:
-  version "1.17.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/prismjs/-/prismjs-1.17.1.tgz#e669fcbd4cdd873c35102881c33b14d0d68519be"
-  integrity sha1-5mn8vUzdhzw1ECiBwzsU0NaFGb4=
+prismjs@^1.21.0, prismjs@~1.23.0:
+  version "1.23.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33"
+  integrity sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA==
   optionalDependencies:
     clipboard "^2.0.0"
 
-private@^0.1.8, private@~0.1.5:
+private@^0.1.8:
   version "0.1.8"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha1-I4Hts2ifelPWUxkAYPz4ItLzaP8=
@@ -9620,7 +10606,7 @@ prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.4"
 
-prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha1-UsQedbjIfnK52TYOAga5ncv/psU=
@@ -9716,11 +10702,6 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha1-tYsBCsQMIsVldhbI0sLALHv0eew=
 
-q@^1.1.2:
-  version "1.5.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
-
 qs@6.7.0:
   version "6.7.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
@@ -9736,14 +10717,6 @@ qs@~6.5.2:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=
 
-query-string@^4.1.0:
-  version "4.3.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
-  dependencies:
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -9754,16 +10727,21 @@ querystring@0.2.0, querystring@^0.2.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-querystringify@^2.1.1:
-  version "2.1.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
-  integrity sha1-YOWl/WSn+L+k0qsu1v30yFutFU4=
-
 quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
   integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
 
+quick-lru@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
+  integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
+
+quick-lru@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
+
 ramda@^0.21.0:
   version "0.21.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/ramda/-/ramda-0.21.0.tgz#a001abedb3ff61077d4ff1d577d44de77e8d0a35"
@@ -9808,13 +10786,13 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-raw-loader@^3.1.0:
-  version "3.1.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/raw-loader/-/raw-loader-3.1.0.tgz#5e9d399a5a222cc0de18f42c3bc5e49677532b3f"
-  integrity sha1-Xp05mloiLMDeGPQsO8XklndTKz8=
+raw-loader@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6"
+  integrity sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==
   dependencies:
-    loader-utils "^1.1.0"
-    schema-utils "^2.0.1"
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
 
 react-clientside-effect@^1.2.2:
   version "1.2.2"
@@ -9823,37 +10801,65 @@ react-clientside-effect@^1.2.2:
   dependencies:
     "@babel/runtime" "^7.0.0"
 
-react-dev-utils@^9.0.0:
-  version "9.1.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/react-dev-utils/-/react-dev-utils-9.1.0.tgz#3ad2bb8848a32319d760d0a84c56c14bdaae5e81"
-  integrity sha1-OtK7iEijIxnXYNCoTFbBS9quXoE=
+react-color@^2.17.0:
+  version "2.19.3"
+  resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.19.3.tgz#ec6c6b4568312a3c6a18420ab0472e146aa5683d"
+  integrity sha512-LEeGE/ZzNLIsFWa1TMe8y5VYqr7bibneWmvJwm1pCn/eNmrabWDh659JSPn9BuaMpEfU83WTOJfnCcjDZwNQTA==
+  dependencies:
+    "@icons/material" "^0.2.4"
+    lodash "^4.17.15"
+    lodash-es "^4.17.15"
+    material-colors "^1.2.1"
+    prop-types "^15.5.10"
+    reactcss "^1.2.0"
+    tinycolor2 "^1.4.1"
+
+react-dev-utils@^10.0.0:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz#f6de325ae25fa4d546d09df4bb1befdc6dd19c19"
+  integrity sha512-XxTbgJnYZmxuPtY3y/UV0D8/65NKkmaia4rXzViknVnZeVlklSh8u6TnaEYPfAi/Gh1TP4mEOXHI6jQOPbeakQ==
   dependencies:
-    "@babel/code-frame" "7.5.5"
+    "@babel/code-frame" "7.8.3"
     address "1.1.2"
-    browserslist "4.7.0"
+    browserslist "4.10.0"
     chalk "2.4.2"
-    cross-spawn "6.0.5"
+    cross-spawn "7.0.1"
     detect-port-alt "1.1.6"
-    escape-string-regexp "1.0.5"
-    filesize "3.6.1"
-    find-up "3.0.0"
-    fork-ts-checker-webpack-plugin "1.5.0"
+    escape-string-regexp "2.0.0"
+    filesize "6.0.1"
+    find-up "4.1.0"
+    fork-ts-checker-webpack-plugin "3.1.1"
     global-modules "2.0.0"
     globby "8.0.2"
     gzip-size "5.1.1"
     immer "1.10.0"
-    inquirer "6.5.0"
+    inquirer "7.0.4"
     is-root "2.1.0"
     loader-utils "1.2.3"
-    open "^6.3.0"
-    pkg-up "2.0.0"
-    react-error-overlay "^6.0.3"
+    open "^7.0.2"
+    pkg-up "3.1.0"
+    react-error-overlay "^6.0.7"
     recursive-readdir "2.2.2"
     shell-quote "1.7.2"
-    sockjs-client "1.4.0"
-    strip-ansi "5.2.0"
+    strip-ansi "6.0.0"
     text-table "0.2.0"
 
+react-docgen-typescript-plugin@^0.6.2:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-0.6.3.tgz#664b22601df083597ecb1e60bd21beca60125fdf"
+  integrity sha512-av1S/fmWBNFGgNa4qtkidFjjOz23eEi6EdCtwSWo9WNhGzUMyMygbD/DosMWoeFlZpk9R3MXPkRE7PDH6j5GMQ==
+  dependencies:
+    debug "^4.1.1"
+    endent "^2.0.1"
+    micromatch "^4.0.2"
+    react-docgen-typescript "^1.20.5"
+    tslib "^2.0.0"
+
+react-docgen-typescript@^1.20.5:
+  version "1.21.0"
+  resolved "https://registry.yarnpkg.com/react-docgen-typescript/-/react-docgen-typescript-1.21.0.tgz#3385dde81b63eb1d54f86a935bd4f65f96c821f6"
+  integrity sha512-E4y/OcXwHukgiVafCGlxwoNHr4BDmM70Ww7oimL/QkMo5dmGALhceewe/xmVjdMxxI7E5syOGOc9/tbHL742rg==
+
 react-docgen@^5.0.0:
   version "5.3.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/react-docgen/-/react-docgen-5.3.0.tgz#9aabde5e69f1993c8ba839fd9a86696504654589"
@@ -9868,15 +10874,14 @@ react-docgen@^5.0.0:
     node-dir "^0.1.10"
     strip-indent "^3.0.0"
 
-react-dom@^16.8.3, react-dom@^16.8.4:
-  version "16.13.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f"
-  integrity sha1-wb03MxoEhsB47lTEdAcgmTsuDn8=
+react-dom@^17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6"
+  integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    scheduler "^0.19.1"
+    scheduler "^0.20.1"
 
 react-draggable@^4.0.3:
   version "4.4.3"
@@ -9886,10 +10891,10 @@ react-draggable@^4.0.3:
     classnames "^2.2.5"
     prop-types "^15.6.0"
 
-react-error-overlay@^6.0.3:
-  version "6.0.7"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/react-error-overlay/-/react-error-overlay-6.0.7.tgz#1dcfb459ab671d53f660a991513cb2f0a0553108"
-  integrity sha1-Hc+0WatnHVP2YKmRUTyy8KBVMQg=
+react-error-overlay@^6.0.7:
+  version "6.0.9"
+  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a"
+  integrity sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==
 
 react-fast-compare@^3.0.1:
   version "3.2.0"
@@ -9903,18 +10908,6 @@ react-feather@^2.0.8:
   dependencies:
     prop-types "^15.7.2"
 
-react-focus-lock@^2.1.0:
-  version "2.3.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/react-focus-lock/-/react-focus-lock-2.3.1.tgz#9d5d85899773609c7eefa4fc54fff6a0f5f2fc47"
-  integrity sha1-nV2FiZdzYJx+76T8VP/2oPXy/Ec=
-  dependencies:
-    "@babel/runtime" "^7.0.0"
-    focus-lock "^0.6.7"
-    prop-types "^15.6.2"
-    react-clientside-effect "^1.2.2"
-    use-callback-ref "^1.2.1"
-    use-sidecar "^1.0.1"
-
 react-focus-lock@^2.4.1:
   version "2.4.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/react-focus-lock/-/react-focus-lock-2.4.1.tgz#e842cc93da736b5c5d331799012544295cbcee4f"
@@ -9950,32 +10943,38 @@ react-is@^16.12.0, react-is@^16.7.0, react-is@^16.8.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha1-eJcppNw23imZ3BVt1sHZwYzqVqQ=
 
+react-is@^17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
+  integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
+
 react-lifecycles-compat@^3.0.4:
   version "3.0.4"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha1-TxonOv38jzSIqMUWv9p4+HI1I2I=
 
-react-popper-tooltip@^2.8.3:
-  version "2.11.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/react-popper-tooltip/-/react-popper-tooltip-2.11.1.tgz#3c4bdfd8bc10d1c2b9a162e859bab8958f5b2644"
-  integrity sha1-PEvf2LwQ0cK5oWLoWbq4lY9bJkQ=
+react-popper-tooltip@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-3.1.1.tgz#329569eb7b287008f04fcbddb6370452ad3f9eac"
+  integrity sha512-EnERAnnKRptQBJyaee5GJScWNUKQPDD2ywvzZyUjst/wj5U64C8/CnSYLNEmP2hG0IJ3ZhtDxE8oDN+KOyavXQ==
   dependencies:
-    "@babel/runtime" "^7.9.2"
-    react-popper "^1.3.7"
+    "@babel/runtime" "^7.12.5"
+    "@popperjs/core" "^2.5.4"
+    react-popper "^2.2.4"
 
-react-popper@^1.3.7:
-  version "1.3.7"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/react-popper/-/react-popper-1.3.7.tgz#f6a3471362ef1f0d10a4963673789de1baca2324"
-  integrity sha1-9qNHE2LvHw0QpJY2c3id4brKIyQ=
+react-popper@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.4.tgz#d2ad3d2474ac9f1abf93df3099d408e5aa6a2e22"
+  integrity sha512-NacOu4zWupdQjVXq02XpTD3yFPSfg5a7fex0wa3uGKVkFK7UN6LvVxgcb+xYr56UCuWiNPMH20tntdVdJRwYew==
   dependencies:
-    "@babel/runtime" "^7.1.2"
-    create-react-context "^0.3.0"
-    deep-equal "^1.1.1"
-    popper.js "^1.14.4"
-    prop-types "^15.6.1"
-    typed-styles "^0.0.7"
+    react-fast-compare "^3.0.1"
     warning "^4.0.2"
 
+react-refresh@^0.8.3:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f"
+  integrity sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==
+
 react-sizeme@^2.6.7:
   version "2.6.12"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/react-sizeme/-/react-sizeme-2.6.12.tgz#ed207be5476f4a85bf364e92042520499455453e"
@@ -9991,33 +10990,40 @@ react-stable-ref@^0.4.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/react-stable-ref/-/react-stable-ref-0.4.0.tgz#4eb3a9cc0aaf8a4ce73927272bf9ba4fe4c69c06"
   integrity sha1-TrOpzAqvikznOScnK/m6T+TGnAY=
 
-react-syntax-highlighter@^11.0.2:
-  version "11.0.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/react-syntax-highlighter/-/react-syntax-highlighter-11.0.2.tgz#4e3f376e752b20d2f54e4c55652fd663149e4029"
-  integrity sha1-Tj83bnUrINL1TkxVZS/WYxSeQCk=
+react-syntax-highlighter@^13.5.0:
+  version "13.5.3"
+  resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz#9712850f883a3e19eb858cf93fad7bb357eea9c6"
+  integrity sha512-crPaF+QGPeHNIblxxCdf2Lg936NAHKhNhuMzRL3F9ct6aYXL3NcZtCL0Rms9+qVo6Y1EQLdXGypBNSbPL/r+qg==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    highlight.js "~9.13.0"
-    lowlight "~1.11.0"
-    prismjs "^1.8.4"
-    refractor "^2.4.1"
+    highlight.js "^10.1.1"
+    lowlight "^1.14.0"
+    prismjs "^1.21.0"
+    refractor "^3.1.0"
 
-react-textarea-autosize@^7.1.0:
-  version "7.1.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/react-textarea-autosize/-/react-textarea-autosize-7.1.2.tgz#70fdb333ef86bcca72717e25e623e90c336e2cda"
-  integrity sha1-cP2zM++GvMpycX4l5iPpDDNuLNo=
+react-textarea-autosize@^8.1.1:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.2.tgz#4f9374d357b0a6f6469956726722549124a1b2db"
+  integrity sha512-JrMWVgQSaExQByP3ggI1eA8zF4mF0+ddVuX7acUeK2V7bmrpjVOY72vmLz2IXFJSAXoY3D80nEzrn0GWajWK3Q==
   dependencies:
-    "@babel/runtime" "^7.1.2"
-    prop-types "^15.6.0"
+    "@babel/runtime" "^7.10.2"
+    use-composed-ref "^1.0.0"
+    use-latest "^1.0.0"
 
-react@^16.8.1, react@^16.8.3:
-  version "16.13.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
-  integrity sha1-LoGIIvGpdDEiwGPWQQ2FweOv5I4=
+react@^17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
+  integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
-    prop-types "^15.6.2"
+
+reactcss@^1.2.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
+  integrity sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==
+  dependencies:
+    lodash "^4.0.1"
 
 read-pkg-up@^2.0.0:
   version "2.0.0"
@@ -10113,10 +11119,10 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@~3.4.0:
-  version "3.4.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
-  integrity sha1-n9zN+ekVWAVEkiGsZF6DA6tbmto=
+readdirp@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
   dependencies:
     picomatch "^2.2.1"
 
@@ -10125,16 +11131,6 @@ realpath-native@^2.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866"
   integrity sha1-c3esQptuH9WZ3DjQjtlC0Ne+uGY=
 
-recast@^0.14.7:
-  version "0.14.7"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/recast/-/recast-0.14.7.tgz#4f1497c2b5826d42a66e8e3c9d80c512983ff61d"
-  integrity sha1-TxSXwrWCbUKmbo48nYDFEpg/9h0=
-  dependencies:
-    ast-types "0.11.3"
-    esprima "~4.0.0"
-    private "~0.1.5"
-    source-map "~0.6.1"
-
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -10165,14 +11161,14 @@ redent@^3.0.0:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
-refractor@^2.4.1:
-  version "2.10.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/refractor/-/refractor-2.10.1.tgz#166c32f114ed16fd96190ad21d5193d3afc7d34e"
-  integrity sha1-Fmwy8RTtFv2WGQrSHVGT06/H004=
+refractor@^3.1.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.3.1.tgz#ebbc04b427ea81dc25ad333f7f67a0b5f4f0be3a"
+  integrity sha512-vaN6R56kLMuBszHSWlwTpcZ8KTMG6aUCok4GrxYDT20UIOXxOc5o6oDc8tNTzSlH3m2sI+Eu9Jo2kVdDcUTWYw==
   dependencies:
-    hastscript "^5.0.0"
-    parse-entities "^1.1.2"
-    prismjs "~1.17.0"
+    hastscript "^6.0.0"
+    parse-entities "^2.0.0"
+    prismjs "~1.23.0"
 
 regenerate-unicode-properties@^8.2.0:
   version "8.2.0"
@@ -10186,11 +11182,16 @@ regenerate@^1.4.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/regenerate/-/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f"
   integrity sha1-ytkq2Oa1kXc0hfvgWkhcr09Ffm8=
 
-regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4:
+regenerator-runtime@^0.13.4:
   version "0.13.5"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
   integrity sha1-2Hih0JS0MG0QuQlkhLM+vVXiZpc=
 
+regenerator-runtime@^0.13.7:
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
+  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
+
 regenerator-transform@^0.14.2:
   version "0.14.4"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
@@ -10207,7 +11208,7 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0:
+regexp.prototype.flags@^1.3.0:
   version "1.3.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
   integrity sha1-erqJs8E6ZFCdq888qNn7ub31y3U=
@@ -10237,6 +11238,18 @@ regexpu-core@^4.7.0:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.2.0"
 
+regexpu-core@^4.7.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
+  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^8.2.0"
+    regjsgen "^0.5.1"
+    regjsparser "^0.6.4"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.2.0"
+
 regjsgen@^0.5.1:
   version "0.5.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
@@ -10340,16 +11353,6 @@ require-main-filename@^2.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs=
 
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-resize-observer-polyfill@^1.5.1:
-  version "1.5.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
-  integrity sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ=
-
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -10382,13 +11385,21 @@ resolve@1.1.7:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.3.2:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.3.2:
   version "1.17.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha1-sllBtUloIxzC0bt2p5y38sC/hEQ=
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.14.2:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
 resolve@^1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
@@ -10397,14 +11408,6 @@ resolve@^1.19.0:
     is-core-module "^2.1.0"
     path-parse "^1.0.6"
 
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
-  dependencies:
-    onetime "^2.0.0"
-    signal-exit "^3.0.2"
-
 restore-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
@@ -10430,17 +11433,17 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1:
+rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha1-NXl/E6f9rcVmFCwp1PB8ytSD4+w=
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.0:
+rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha1-8aVAK6YiCtUswSgrrBrjqkn9Bho=
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
@@ -10452,6 +11455,13 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
+rollup@^2.32.0:
+  version "2.40.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.40.0.tgz#efc218eaede7ab590954df50f96195188999c304"
+  integrity sha512-WiOGAPbXoHu+TOz6hyYUxIksOwsY/21TRWoO593jgYt8mvYafYqQl+axaA8y1z2HFazNUUrsMSjahV2A6/2R9A==
+  optionalDependencies:
+    fsevents "~2.3.1"
+
 rsvp@^4.8.4:
   version "4.8.5"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
@@ -10474,7 +11484,7 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^6.4.0, rxjs@^6.5.3:
+rxjs@^6.5.3:
   version "6.5.5"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
   integrity sha1-xciE4wlMjP7jG/J+uH5UzPyH+ew=
@@ -10491,7 +11501,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha1-mR7GnSluAxN0fVm9/St0XDX4go0=
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY=
@@ -10523,11 +11533,6 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sax@~1.2.4:
-  version "1.2.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha1-KBYjTiN4vdxOU1T6tcqold9xANk=
-
 saxes@^3.1.9:
   version "3.1.11"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b"
@@ -10535,10 +11540,10 @@ saxes@^3.1.9:
   dependencies:
     xmlchars "^2.1.1"
 
-scheduler@^0.19.1:
-  version "0.19.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
-  integrity sha1-Tz4u0sGn1laB9MhU+oxaHMtA8ZY=
+scheduler@^0.20.1:
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c"
+  integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -10552,7 +11557,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.0.1, schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
+schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
   version "2.7.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
   integrity sha1-FxUfdtjq5n+793lgwzxnatn078c=
@@ -10561,6 +11566,15 @@ schema-utils@^2.0.1, schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.6
     ajv "^6.12.2"
     ajv-keywords "^3.4.1"
 
+schema-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
+  integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
+  dependencies:
+    "@types/json-schema" "^7.0.6"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
 select@^1.1.2:
   version "1.1.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
@@ -10584,16 +11598,23 @@ semver@5.5.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=
 
-semver@6.x, semver@^6.0.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=
-
 semver@7.0.0:
   version "7.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha1-XzyjV2HkfgWyBsba/yz4FPAxa44=
 
+semver@7.x, semver@^7.3.4:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://packages.atlassian.com/api/npm/npm-remote/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=
+
 semver@^7.2.1:
   version "7.3.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
@@ -10625,6 +11646,13 @@ serialize-javascript@^3.1.0:
   dependencies:
     randombytes "^2.1.0"
 
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+  dependencies:
+    randombytes "^2.1.0"
+
 serve-favicon@^2.5.0:
   version "2.5.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/serve-favicon/-/serve-favicon-2.5.0.tgz#935d240cdfe0f5805307fdfe967d88942a2cbcf0"
@@ -10686,21 +11714,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-shallow-clone@^0.1.2:
-  version "0.1.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060"
-  integrity sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=
-  dependencies:
-    is-extendable "^0.1.1"
-    kind-of "^2.0.1"
-    lazy-cache "^0.2.3"
-    mixin-object "^2.0.1"
-
-shallow-equal@^1.1.0:
-  version "1.2.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da"
-  integrity sha1-TBar+lYEOqINBQMk76aJQLDaedo=
-
 shallowequal@^1.1.0:
   version "1.1.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
@@ -10735,10 +11748,10 @@ shell-quote@1.7.2, shell-quote@^1.6.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
   integrity sha1-Z6fQLHbJ2iT5nSCAj8re0ODgS+I=
 
-shelljs@^0.8.1, shelljs@^0.8.3:
+shelljs@^0.8.1, shelljs@^0.8.4:
   version "0.8.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
-  integrity sha1-3naE/ut2f4cWsyYHiooAh1iQ48I=
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
+  integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -10762,26 +11775,6 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha1-oUEMLt2PB3sItOJTyOrPyvBXRhw=
 
-simplebar-react@^1.0.0-alpha.6:
-  version "1.2.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/simplebar-react/-/simplebar-react-1.2.3.tgz#bd81fa9827628470e9470d06caef6ece15e1c882"
-  integrity sha1-vYH6mCdihHDpRw0Gyu9uzhXhyII=
-  dependencies:
-    prop-types "^15.6.1"
-    simplebar "^4.2.3"
-
-simplebar@^4.2.3:
-  version "4.2.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/simplebar/-/simplebar-4.2.3.tgz#dac40aced299c17928329eab3d5e6e795fafc10c"
-  integrity sha1-2sQKztKZwXkoMp6rPV5ueV+vwQw=
-  dependencies:
-    can-use-dom "^0.1.0"
-    core-js "^3.0.1"
-    lodash.debounce "^4.0.8"
-    lodash.memoize "^4.1.2"
-    lodash.throttle "^4.1.1"
-    resize-observer-polyfill "^1.5.1"
-
 sisteransi@^1.0.4:
   version "1.0.5"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -10852,31 +11845,12 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-sockjs-client@1.4.0:
-  version "1.4.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"
-  integrity sha1-yfJWjhnI/YFztJl+o0IOC7MGx9U=
-  dependencies:
-    debug "^3.2.5"
-    eventsource "^1.0.7"
-    faye-websocket "~0.11.1"
-    inherits "^2.0.3"
-    json3 "^3.3.2"
-    url-parse "^1.4.3"
-
-sort-keys@^1.0.0:
-  version "1.1.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
-  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
-  dependencies:
-    is-plain-obj "^1.0.0"
-
 source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ=
 
-source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
+source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
   integrity sha1-GQhmvs51U+H48mei7oLGBrVQmho=
@@ -10887,10 +11861,18 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.6, source-map-support@~0.5.12:
+source-map-resolve@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
+  integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+
+source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
   version "0.5.19"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha1-qYti+G3K9PZzmWSMCFKRq56P7WE=
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -10910,10 +11892,15 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM=
 
-source-map@^0.7.3:
+source-map@^0.7.3, source-map@~0.7.2:
   version "0.7.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha1-UwL4FpAxc1ImVECS5kmB91F1A4M=
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
+sourcemap-codec@^1.4.4:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
 space-separated-tokens@^1.0.0:
   version "1.1.5"
@@ -10988,12 +11975,11 @@ ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-ssri@^7.0.0:
-  version "7.1.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/ssri/-/ssri-7.1.0.tgz#92c241bf6de82365b5c7fb4bd76e975522e1294d"
-  integrity sha1-ksJBv23oI2W1x/tL126XVSLhKU0=
+ssri@^8.0.0:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
+  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
   dependencies:
-    figgy-pudding "^3.5.1"
     minipass "^3.1.1"
 
 stable@^0.1.8:
@@ -11006,6 +11992,11 @@ stack-utils@^1.0.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
   integrity sha1-M+ujiXeIVYvr/C2wWdwVjsNs67g=
 
+stackframe@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303"
+  integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA==
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -11029,24 +12020,24 @@ store2@^2.7.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/store2/-/store2-2.11.2.tgz#a298e5e97b21b3ce7419b732540bc7c79cb007db"
   integrity sha1-opjl6Xshs850GbcyVAvHx5ywB9s=
 
-storybook-addon-performance@^0.10.0:
-  version "0.10.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/storybook-addon-performance/-/storybook-addon-performance-0.10.0.tgz#3647f57a5d0a7bce5e35c485ff85dcda2ffe8111"
-  integrity sha1-Nkf1el0Ke85eNcSF/4Xc2i/+gRE=
-  dependencies:
-    "@storybook/addons" "^5.3.18"
-    "@storybook/api" "^5.3.18"
-    "@storybook/channels" "^5.3.18"
-    "@storybook/components" "^5.3.18"
-    "@storybook/core-events" "^5.3.18"
-    "@storybook/theming" "^5.3.18"
-    "@testing-library/dom" "^7.2.1"
-    "@testing-library/jest-dom" "^5.3.0"
+storybook-addon-performance@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/storybook-addon-performance/-/storybook-addon-performance-0.14.0.tgz#d5cf3afc1bbc630f626b67d489ba55e9cd76a12b"
+  integrity sha512-Aa/d2B0N2lEc2bTM6arrNkPRELphwp5n90mzvcjT6ls69q486g3e11CLUE/g0roR6dk1hdOkENJLr+ELoMq41g==
+  dependencies:
+    "@storybook/addons" "^6.1.11"
+    "@storybook/api" "^6.1.11"
+    "@storybook/channels" "^6.1.11"
+    "@storybook/components" "^6.1.0"
+    "@storybook/core-events" "^6.1.11"
+    "@storybook/theming" "^6.1.11"
+    "@testing-library/dom" "^7.22.0"
+    "@testing-library/jest-dom" "^5.11.2"
     "@xstate/react" "1.0.0-rc.3"
     gzip-js "^0.3.2"
-    styled-components "^5.1.0"
+    styled-components "^5.1.1"
     tiny-invariant "^1.1.0"
-    xstate "^4.8.0"
+    xstate "^4.11.0"
 
 stream-browserify@^2.0.1:
   version "2.0.2"
@@ -11087,11 +12078,6 @@ stream-transform@^2.0.1:
   dependencies:
     mixme "^0.3.1"
 
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
-
 string-length@^2.0.0:
   version "2.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
@@ -11117,7 +12103,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=
@@ -11201,12 +12187,12 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@5.2.0, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=
+strip-ansi@6.0.0, strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://packages.atlassian.com/api/npm/npm-remote/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI=
   dependencies:
-    ansi-regex "^4.1.0"
+    ansi-regex "^5.0.0"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
@@ -11222,12 +12208,12 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI=
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://packages.atlassian.com/api/npm/npm-remote/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=
   dependencies:
-    ansi-regex "^5.0.0"
+    ansi-regex "^4.1.0"
 
 strip-bom@^3.0.0:
   version "3.0.0"
@@ -11271,18 +12257,18 @@ strip-json-comments@^3.1.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha1-MfEoGzgyYwQ0gxwxDAHMzajL4AY=
 
-style-loader@^1.0.0:
-  version "1.2.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/style-loader/-/style-loader-1.2.1.tgz#c5cbbfbf1170d076cfdd86e0109c5bba114baa1a"
-  integrity sha1-xcu/vxFw0HbP3YbgEJxbuhFLqho=
+style-loader@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz#828b4a3b3b7e7aa5847ce7bae9e874512114249e"
+  integrity sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==
   dependencies:
     loader-utils "^2.0.0"
-    schema-utils "^2.6.6"
+    schema-utils "^2.7.0"
 
-styled-components@^5.1.0:
-  version "5.1.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/styled-components/-/styled-components-5.1.1.tgz#96dfb02a8025794960863b9e8e365e3b6be5518d"
-  integrity sha1-lt+wKoAleUlghjuejjZeO2vlUY0=
+styled-components@^5.1.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.2.1.tgz#6ed7fad2dc233825f64c719ffbdedd84ad79101a"
+  integrity sha512-sBdgLWrCFTKtmZm/9x7jkIabjFNVzCUeKfoQsM6R3saImkUnjx0QYdLwJHBjY9ifEcmjDamJDVfknWm1yxZPxQ==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/traverse" "^7.4.5"
@@ -11329,30 +12315,6 @@ supports-hyperlinks@^2.0.0:
     has-flag "^4.0.0"
     supports-color "^7.0.0"
 
-svg-parser@^2.0.0:
-  version "2.0.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5"
-  integrity sha1-/cLinhOVFzYUC3bLEiyO5mMOtrU=
-
-svgo@^1.2.2:
-  version "1.3.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
-  integrity sha1-ttxRHAYzRsnkFbgeQ0ARRbltQWc=
-  dependencies:
-    chalk "^2.4.1"
-    coa "^2.0.2"
-    css-select "^2.0.0"
-    css-select-base-adapter "^0.1.1"
-    css-tree "1.0.0-alpha.37"
-    csso "^4.0.2"
-    js-yaml "^3.13.1"
-    mkdirp "~0.5.1"
-    object.values "^1.1.0"
-    sax "~1.2.4"
-    stable "^0.1.8"
-    unquote "~1.1.1"
-    util.promisify "~1.0.0"
-
 symbol-tree@^3.2.2:
   version "3.2.4"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -11381,18 +12343,30 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha1-ofzMBrWNth/XpF2i2kT186Pme6I=
 
-telejson@^3.2.0:
-  version "3.3.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/telejson/-/telejson-3.3.0.tgz#6d814f3c0d254d5c4770085aad063e266b56ad03"
-  integrity sha1-bYFPPA0lTVxHcAharQY+JmtWrQM=
+tar@^6.0.2:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83"
+  integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^3.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
+telejson@^5.0.2:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/telejson/-/telejson-5.1.0.tgz#cc04e4c2a355f9eb6af557e37acd6449feb1d146"
+  integrity sha512-Yy0N2OV0mosmr1SCZEm3Ezhu/oi5Dbao5RqauZu4+VI5I/XtVBHXajRk0txuqbFYtKdzzWGDZFGSif9ovVLjEA==
   dependencies:
     "@types/is-function" "^1.0.0"
     global "^4.4.0"
-    is-function "^1.0.1"
-    is-regex "^1.0.4"
+    is-function "^1.0.2"
+    is-regex "^1.1.1"
     is-symbol "^1.0.3"
     isobject "^4.0.0"
-    lodash "^4.17.15"
+    lodash "^4.17.20"
     memoizerific "^1.11.3"
 
 term-size@^1.2.0:
@@ -11430,22 +12404,22 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser-webpack-plugin@^2.1.2:
-  version "2.3.7"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/terser-webpack-plugin/-/terser-webpack-plugin-2.3.7.tgz#4910ff5d1a872168cc7fa6cd3749e2b0d60a8a0b"
-  integrity sha1-SRD/XRqHIWjMf6bNN0nisNYKigs=
+terser-webpack-plugin@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.1.0.tgz#91e6d39571460ed240c0cf69d295bcf30ebf98cb"
+  integrity sha512-cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA==
   dependencies:
-    cacache "^13.0.1"
+    cacache "^15.0.5"
     find-cache-dir "^3.3.1"
-    jest-worker "^25.4.0"
-    p-limit "^2.3.0"
+    jest-worker "^26.2.1"
+    p-limit "^3.0.2"
     schema-utils "^2.6.6"
-    serialize-javascript "^3.1.0"
+    serialize-javascript "^4.0.0"
     source-map "^0.6.1"
-    terser "^4.6.12"
+    terser "^4.8.0"
     webpack-sources "^1.4.3"
 
-terser@^4.1.2, terser@^4.6.12, terser@^4.6.3:
+terser@^4.1.2, terser@^4.6.3, terser@^4.8.0:
   version "4.8.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
   integrity sha1-YwVjQ9fHC7KfOvZlhlpG/gOg3xc=
@@ -11454,6 +12428,15 @@ terser@^4.1.2, terser@^4.6.12, terser@^4.6.3:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
+terser@^5.2.1:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2"
+  integrity sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.7.2"
+    source-map-support "~0.5.19"
+
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -11513,6 +12496,11 @@ tiny-invariant@^1.1.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875"
   integrity sha1-Y0xfjv3CdxS384bDXmdgmR0jCHU=
 
+tinycolor2@^1.4.1:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803"
+  integrity sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -11611,26 +12599,36 @@ trim-newlines@^2.0.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
   integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
 
-ts-dedent@^1.1.0:
-  version "1.1.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/ts-dedent/-/ts-dedent-1.1.1.tgz#68fad040d7dbd53a90f545b450702340e17d18f3"
-  integrity sha1-aPrQQNfb1TqQ9UW0UHAjQOF9GPM=
+trim-newlines@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
+  integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
 
-ts-jest@^25.3.1:
-  version "25.5.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/ts-jest/-/ts-jest-25.5.1.tgz#2913afd08f28385d54f2f4e828be4d261f4337c7"
-  integrity sha1-KROv0I8oOF1U8vToKL5NJh9DN8c=
+ts-dedent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.0.0.tgz#47c5eb23d9096f3237cc413bc82d387d36dbe690"
+  integrity sha512-DfxKjSFQfw9+uf7N9Cy8Ebx9fv5fquK4hZ6SD3Rzr+1jKP6AVA6H8+B5457ZpUs0JKsGpGqIevbpZ9DMQJDp1A==
+
+ts-essentials@^2.0.3:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745"
+  integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==
+
+ts-jest@^26.4.4:
+  version "26.5.3"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.3.tgz#a6ee00ba547be3b09877550df40a1465d0295554"
+  integrity sha512-nBiiFGNvtujdLryU7MiMQh1iPmnZ/QvOskBbD2kURiI1MwqvxlxNnaAB/z9TbslMqCsSbu5BXvSSQPc5tvHGeA==
   dependencies:
     bs-logger "0.x"
     buffer-from "1.x"
     fast-json-stable-stringify "2.x"
+    jest-util "^26.1.0"
     json5 "2.x"
-    lodash.memoize "4.x"
+    lodash "4.x"
     make-error "1.x"
-    micromatch "4.x"
-    mkdirp "0.x"
-    semver "6.x"
-    yargs-parser "18.x"
+    mkdirp "1.x"
+    semver "7.x"
+    yargs-parser "20.x"
 
 ts-loader@^6.2.1:
   version "6.2.2"
@@ -11643,10 +12641,10 @@ ts-loader@^6.2.1:
     micromatch "^4.0.0"
     semver "^6.0.0"
 
-ts-pnp@^1.1.2:
+ts-pnp@^1.1.6:
   version "1.2.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
-  integrity sha1-pQCtCEsHmPHDBxrzkeZZEshrypI=
+  resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
+  integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
 
 tsconfig-paths@^3.9.0:
   version "3.9.0"
@@ -11663,6 +12661,11 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
   integrity sha1-yIHhPMcBWJTtkUhi0nZDb6mkcEM=
 
+tslib@^2.0.0, tslib@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
+  integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
+
 tsutils@^3.7.0:
   version "3.17.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
@@ -11723,6 +12726,11 @@ type-fest@^0.11.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
   integrity sha1-l6vwhyMQ/tiKXEZrJWgVdhReM/E=
 
+type-fest@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
+  integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
+
 type-fest@^0.6.0:
   version "0.6.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
@@ -11741,11 +12749,6 @@ type-is@~1.6.17, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typed-styles@^0.0.7:
-  version "0.0.7"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9"
-  integrity sha1-kzkqAIeUxFlRGf9i3eaAnbxAo9k=
-
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -11758,10 +12761,10 @@ typedarray@^0.0.6:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@^3.8.1:
-  version "3.9.5"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
-  integrity sha1-WG8NujAM3ovlLdGsT34QCcGxPzY=
+typescript@^4.1.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"
+  integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==
 
 unfetch@^4.1.0:
   version "4.1.0"
@@ -11825,12 +12828,17 @@ universalify@^0.1.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=
 
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
-unquote@^1.1.0, unquote@~1.1.1:
+unquote@^1.1.0:
   version "1.1.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
   integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
@@ -11860,22 +12868,14 @@ urix@^0.1.0:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-loader@^2.0.1:
-  version "2.3.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/url-loader/-/url-loader-2.3.0.tgz#e0e2ef658f003efb8ca41b0f3ffbf76bab88658b"
-  integrity sha1-4OLvZY8APvuMpBsPP/v3a6uIZYs=
-  dependencies:
-    loader-utils "^1.2.3"
-    mime "^2.4.4"
-    schema-utils "^2.5.0"
-
-url-parse@^1.4.3:
-  version "1.4.7"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
-  integrity sha1-qKg1NejACjFuQDpdtKwbm4U64ng=
+url-loader@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2"
+  integrity sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==
   dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
+    loader-utils "^2.0.0"
+    mime-types "^2.1.27"
+    schema-utils "^3.0.0"
 
 url@^0.11.0:
   version "0.11.0"
@@ -11890,6 +12890,25 @@ use-callback-ref@^1.2.1:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/use-callback-ref/-/use-callback-ref-1.2.4.tgz#d86d1577bfd0b955b6e04aaf5971025f406bea3c"
   integrity sha1-2G0Vd7/QuVW24EqvWXECX0Br6jw=
 
+use-composed-ref@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.1.0.tgz#9220e4e94a97b7b02d7d27eaeab0b37034438bbc"
+  integrity sha512-my1lNHGWsSDAhhVAT4MKs6IjBUtG6ZG11uUqexPH9PptiIZDQOzaF4f5tEbJ2+7qvNbtXNBbU3SfmN+fXlWDhg==
+  dependencies:
+    ts-essentials "^2.0.3"
+
+use-isomorphic-layout-effect@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz#7bb6589170cd2987a152042f9084f9effb75c225"
+  integrity sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ==
+
+use-latest@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/use-latest/-/use-latest-1.2.0.tgz#a44f6572b8288e0972ec411bdd0840ada366f232"
+  integrity sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw==
+  dependencies:
+    use-isomorphic-layout-effect "^1.0.0"
+
 use-sidecar@^1.0.1:
   version "1.0.2"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/use-sidecar/-/use-sidecar-1.0.2.tgz#e72f582a75842f7de4ef8becd6235a4720ad8af6"
@@ -11923,16 +12942,6 @@ util.promisify@1.0.0:
     define-properties "^1.1.2"
     object.getownpropertydescriptors "^2.0.3"
 
-util.promisify@~1.0.0:
-  version "1.0.1"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
-  integrity sha1-a693dLgO6w91INi4HQeYKlmruu4=
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.2"
-    has-symbols "^1.0.1"
-    object.getownpropertydescriptors "^2.1.0"
-
 util@0.10.3:
   version "0.10.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
@@ -11967,6 +12976,11 @@ v8-compile-cache@^2.0.3:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
   integrity sha1-VLw83UMxe8qR413K8wWxpyN950U=
 
+v8-compile-cache@^2.1.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
+  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+
 v8-to-istanbul@^4.1.3:
   version "4.1.4"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz#b97936f21c0e2d9996d4985e5c5156e9d4e49cd6"
@@ -12040,23 +13054,23 @@ warning@^4.0.2, warning@^4.0.3:
   dependencies:
     loose-envify "^1.0.0"
 
-watchpack-chokidar2@^2.0.0:
-  version "2.0.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"
-  integrity sha1-mUihhmy71suCTeoTp+1pH2yN3/A=
+watchpack-chokidar2@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
+  integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==
   dependencies:
     chokidar "^2.1.8"
 
-watchpack@^1.6.1:
-  version "1.7.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/watchpack/-/watchpack-1.7.2.tgz#c02e4d4d49913c3e7e122c3325365af9d331e9aa"
-  integrity sha1-wC5NTUmRPD5+EiwzJTZa+dMx6ao=
+watchpack@^1.7.4:
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
+  integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
   dependencies:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
   optionalDependencies:
-    chokidar "^3.4.0"
-    watchpack-chokidar2 "^2.0.0"
+    chokidar "^3.4.1"
+    watchpack-chokidar2 "^2.0.1"
 
 wcwidth@^1.0.1:
   version "1.0.1"
@@ -12081,6 +13095,11 @@ webpack-dev-middleware@^3.7.0:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
+webpack-filter-warnings-plugin@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/webpack-filter-warnings-plugin/-/webpack-filter-warnings-plugin-1.2.1.tgz#dc61521cf4f9b4a336fbc89108a75ae1da951cdb"
+  integrity sha512-Ez6ytc9IseDMLPo0qCuNNYzgtUl8NovOqjIq4uAU8LTD4uoa1w1KpZyyzFtLTEMZpkkOkLfL9eN+KGYdk1Qtwg==
+
 webpack-hot-middleware@^2.25.0:
   version "2.25.0"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/webpack-hot-middleware/-/webpack-hot-middleware-2.25.0.tgz#4528a0a63ec37f8f8ef565cf9e534d57d09fe706"
@@ -12099,7 +13118,7 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
+webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
   version "1.4.3"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
   integrity sha1-7t2OwLko+/HL/plOItLYkPMwqTM=
@@ -12107,17 +13126,17 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-virtual-modules@^0.2.0:
+webpack-virtual-modules@^0.2.2:
   version "0.2.2"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/webpack-virtual-modules/-/webpack-virtual-modules-0.2.2.tgz#20863dc3cb6bb2104729fff951fbe14b18bd0299"
-  integrity sha1-IIY9w8trshBHKf/5UfvhSxi9Apk=
+  resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.2.2.tgz#20863dc3cb6bb2104729fff951fbe14b18bd0299"
+  integrity sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA==
   dependencies:
     debug "^3.0.0"
 
-webpack@^4.33.0, webpack@^4.38.0:
-  version "4.43.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/webpack/-/webpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6"
-  integrity sha1-xIVHsR1WMiTFYdrRFyyKoLimeOY=
+webpack@^4.44.2:
+  version "4.46.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
+  integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
@@ -12127,7 +13146,7 @@ webpack@^4.33.0, webpack@^4.38.0:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.1.0"
+    enhanced-resolve "^4.5.0"
     eslint-scope "^4.0.3"
     json-parse-better-errors "^1.0.2"
     loader-runner "^2.4.0"
@@ -12140,23 +13159,9 @@ webpack@^4.33.0, webpack@^4.38.0:
     schema-utils "^1.0.0"
     tapable "^1.1.3"
     terser-webpack-plugin "^1.4.3"
-    watchpack "^1.6.1"
+    watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
-websocket-driver@>=0.5.1:
-  version "0.7.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
-  integrity sha1-ia1Slbv2S0gKvLox5JU6ynBvV2A=
-  dependencies:
-    http-parser-js ">=0.5.1"
-    safe-buffer ">=5.1.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
-  version "0.1.4"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
-  integrity sha1-f4RzvIOd/YdgituV1+sHUhFXikI=
-
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
   version "1.0.5"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
@@ -12305,10 +13310,10 @@ xregexp@^4.3.0:
   dependencies:
     "@babel/runtime-corejs3" "^7.8.3"
 
-xstate@^4.8.0:
-  version "4.10.0"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/xstate/-/xstate-4.10.0.tgz#f87e4ef593fe40300b8eec50a5d9f0763aa4f622"
-  integrity sha1-+H5O9ZP+QDALjuxQpdnwdjqk9iI=
+xstate@^4.11.0:
+  version "4.16.2"
+  resolved "https://registry.yarnpkg.com/xstate/-/xstate-4.16.2.tgz#d6b973b1253b8c85f50f68601837287d59d4bf34"
+  integrity sha512-EY39NNZnwM4tRYNmQAi1c2qHuZ1lJmuDpEo1jxiRcfS+1jPtKRAjGRLNx3fYKcK0ohW6mL41Wze3mdCF0SqavA==
 
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"
@@ -12340,13 +13345,10 @@ yaml@^1.10.0, yaml@^1.7.2:
   resolved "https://packages.atlassian.com/api/npm/npm-remote/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
   integrity sha1-O1k63ZRIdgd9TWg/7gEIG9n/8x4=
 
-yargs-parser@18.x, yargs-parser@^18.1.1:
-  version "18.1.3"
-  resolved "https://packages.atlassian.com/api/npm/npm-remote/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha1-vmjEl1xrKr9GkjawyHA2L6sJp7A=
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
+yargs-parser@20.x:
+  version "20.2.6"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.6.tgz#69f920addf61aafc0b8b89002f5d66e28f2d8b20"
+  integrity sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA==
 
 yargs-parser@^10.0.0:
   version "10.1.0"
@@ -12355,6 +13357,14 @@ yargs-parser@^10.0.0:
   dependencies:
     camelcase "^4.1.0"
 
+yargs-parser@^18.1.1, yargs-parser@^18.1.3:
+  version "18.1.3"
+  resolved "https://packages.atlassian.com/api/npm/npm-remote/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha1-vmjEl1xrKr9GkjawyHA2L6sJp7A=
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs@^15.0.0, yargs@^15.1.0, yargs@^15.3.1:
   version "15.3.1"
   resolved "https://packages.atlassian.com/api/npm/npm-remote/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
@@ -12371,3 +13381,8 @@ yargs@^15.0.0, yargs@^15.1.0, yargs@^15.3.1:
     which-module "^2.0.0"
     y18n "^4.0.0"
     yargs-parser "^18.1.1"
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==

From c29abc895b4af816b4a0075543ef72e16d87281a Mon Sep 17 00:00:00 2001
From: Daniel Del Core <daniel.delcore.92@gmail.com>
Date: Sat, 6 Mar 2021 21:42:46 +1100
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=A8=20fix=20type=20entry=20points,?=
 =?UTF-8?q?=20bump=20alpha=20ver,=20remove=20ignores?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fixtures/Box.tsx                              | 21 ++++----
 package.json                                  |  2 +-
 .../common/copy-to-clipboard/package.json     |  2 +-
 packages/common/types/package.json            |  2 +-
 packages/components/avatar/package.json       |  4 +-
 packages/components/avatar/src/Avatar.tsx     |  2 -
 packages/components/badge/package.json        |  4 +-
 packages/components/badge/src/Badge.tsx       |  3 --
 packages/components/button/package.json       |  4 +-
 packages/components/button/src/Button.tsx     |  5 --
 packages/components/checkbox/package.json     |  4 +-
 packages/components/checkbox/src/Checkbox.tsx |  2 -
 packages/components/code/package.json         |  4 +-
 packages/components/code/src/Code.tsx         |  3 --
 packages/components/image/package.json        |  2 +-
 packages/components/input/package.json        |  4 +-
 packages/components/input/src/Input.tsx       |  3 --
 packages/components/keyboard/package.json     |  4 +-
 packages/components/keyboard/src/Keyboard.tsx |  6 +--
 packages/components/label/package.json        |  4 +-
 packages/components/label/src/Label.tsx       |  3 --
 packages/components/lozenge/package.json      |  4 +-
 packages/components/lozenge/src/Lozenge.tsx   |  3 --
 packages/components/message/package.json      |  4 +-
 packages/components/message/src/Message.tsx   |  2 -
 packages/components/modal/package.json        |  4 +-
 packages/components/modal/src/Modal.tsx       |  3 --
 packages/components/modal/src/ModalBody.tsx   |  2 -
 packages/components/modal/src/ModalFooter.tsx |  2 -
 packages/components/modal/src/ModalHeader.tsx |  2 -
 packages/components/overlay/package.json      |  4 +-
 packages/components/overlay/src/Overlay.tsx   |  9 +---
 packages/components/panel/package.json        |  4 +-
 packages/components/panel/src/Panel.tsx       |  2 -
 packages/components/radio/package.json        |  4 +-
 packages/components/radio/src/Radio.tsx       | 10 +---
 packages/components/range/package.json        |  4 +-
 packages/components/range/src/Range.tsx       |  2 -
 packages/components/range/src/Slider.tsx      |  2 -
 packages/components/range/src/Track.tsx       |  2 -
 packages/components/select/package.json       |  4 +-
 packages/components/select/src/Select.tsx     |  6 +--
 packages/components/skeleton/package.json     |  4 +-
 packages/components/skeleton/src/Skeleton.tsx |  4 +-
 packages/components/spinner/package.json      |  4 +-
 packages/components/spinner/src/Spinner.tsx   |  3 --
 packages/components/tabs/package.json         |  4 +-
 packages/components/tabs/src/Tab.tsx          |  3 +-
 packages/components/tabs/src/TabList.tsx      |  4 +-
 packages/components/textarea/package.json     |  4 +-
 packages/components/textarea/src/TextArea.tsx |  4 +-
 packages/components/toggle/package.json       |  4 +-
 packages/components/toggle/src/Toggle.tsx     | 12 +----
 packages/elements/blockquote/package.json     |  4 +-
 .../elements/blockquote/src/Blockquote.tsx    |  3 +-
 packages/elements/emoji/package.json          |  2 +-
 packages/elements/heading/package.json        |  4 +-
 packages/elements/heading/src/Heading.tsx     |  3 +-
 packages/elements/list/package.json           |  4 +-
 packages/elements/text/package.json           |  4 +-
 packages/layout/grid/package.json             |  4 +-
 packages/layout/grid/src/Grid.tsx             |  4 +-
 packages/layout/grid/src/Row.tsx              |  3 --
 packages/layout/inline/package.json           |  4 +-
 packages/layout/inline/src/Inline.tsx         |  2 -
 packages/layout/stack/package.json            |  4 +-
 packages/layout/stack/src/Stack.tsx           |  3 --
 packages/theming/theme/package.json           |  4 +-
 packages/theming/theme/src/Globals.tsx        |  6 +--
 packages/theming/theme/src/ThemeProvider.tsx  | 18 +++----
 packages/theming/tokens/package.json          |  2 +-
 yarn.lock                                     | 54 +++++++++----------
 72 files changed, 124 insertions(+), 225 deletions(-)

diff --git a/fixtures/Box.tsx b/fixtures/Box.tsx
index 49259ac..ef5e272 100644
--- a/fixtures/Box.tsx
+++ b/fixtures/Box.tsx
@@ -1,4 +1,4 @@
-// import { jsx, css } from '@trousers/core';
+import { css } from '@trousers/macro';
 import React, { ReactNode, FC } from 'react';
 
 // import { Theme } from '@precursor/theme';
@@ -10,15 +10,16 @@ const Box: FC<{
     backgroundColor?: string;
 }> = ({ width = '100%', height = 0, children, backgroundColor }) => (
     <div
-    // css={css<Theme>`
-    //     display: block;
-    //     color: white;
-    //     min-height: 20px;
-    //     width: ${width};
-    //     height: ${height};
-    //     background-color: ${({ color }) =>
-    //         backgroundColor || color.background.light};
-    // `}
+        // @ts-ignore
+        css={css('Box', {
+            display: 'block',
+            color: 'white',
+            minHeight: '20px',
+            width,
+            height,
+            //     background-color: ${({ color }) =>
+            //         backgroundColor || color.background.light};
+        })}
     >
         {children}
     </div>
diff --git a/package.json b/package.json
index e2e9357..3939203 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
         "@storybook/source-loader": "6.1.18",
         "@storybook/storybook-deployer": "^2.8.7",
         "@testing-library/react": "^10.0.0",
-        "@trousers/macro": "4.0.0-alpha7",
+        "@trousers/macro": "4.0.0-alpha9",
         "@types/babel-plugin-macros": "^2.8.4",
         "@types/jest": "^25.2.0",
         "@types/jsdom": "^12.2.3",
diff --git a/packages/common/copy-to-clipboard/package.json b/packages/common/copy-to-clipboard/package.json
index 9278c22..08cb591 100644
--- a/packages/common/copy-to-clipboard/package.json
+++ b/packages/common/copy-to-clipboard/package.json
@@ -4,7 +4,7 @@
     "description": "Copy to clipboard utility",
     "main": "dist/precursor-copy-to-clipboard.cjs.js",
     "module": "dist/precursor-copy-to-clipboard.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-copy-to-clipboard.cjs.d.ts",
     "license": "MIT",
     "dependencies": {},
     "devDependencies": {},
diff --git a/packages/common/types/package.json b/packages/common/types/package.json
index 372c1a7..ff54fa8 100644
--- a/packages/common/types/package.json
+++ b/packages/common/types/package.json
@@ -3,7 +3,7 @@
     "version": "0.1.2",
     "main": "dist/precursor-types.cjs.js",
     "module": "dist/precursor-types.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-types.cjs.d.ts",
     "license": "MIT",
     "dependencies": {},
     "devDependencies": {},
diff --git a/packages/components/avatar/package.json b/packages/components/avatar/package.json
index 87a0fbf..9218350 100644
--- a/packages/components/avatar/package.json
+++ b/packages/components/avatar/package.json
@@ -4,11 +4,11 @@
     "description": "Avatar component",
     "main": "dist/precursor-avatar.cjs.js",
     "module": "dist/precursor-avatar.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-avatar.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/image": "^0.1.3",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/avatar/src/Avatar.tsx b/packages/components/avatar/src/Avatar.tsx
index 6682d6d..c293d7b 100644
--- a/packages/components/avatar/src/Avatar.tsx
+++ b/packages/components/avatar/src/Avatar.tsx
@@ -1,6 +1,5 @@
 import React, { FC } from 'react';
 
-// @ts-ignore
 import { css } from '@trousers/macro';
 
 import Image, { ImageProps } from '@precursor/image';
@@ -19,7 +18,6 @@ const styles = css('Avatar', {
 });
 
 const Avatar: FC<AvatarProps> = ({ src, alt }) => (
-    // @ts-ignore
     <span css={styles}>
         <Image src={src} alt={alt} />
     </span>
diff --git a/packages/components/badge/package.json b/packages/components/badge/package.json
index 23711ff..51eac57 100644
--- a/packages/components/badge/package.json
+++ b/packages/components/badge/package.json
@@ -4,10 +4,10 @@
     "description": "Badge component",
     "main": "dist/precursor-badge.cjs.js",
     "module": "dist/precursor-badge.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-badge.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/badge/src/Badge.tsx b/packages/components/badge/src/Badge.tsx
index 1e6e46b..42864a6 100644
--- a/packages/components/badge/src/Badge.tsx
+++ b/packages/components/badge/src/Badge.tsx
@@ -1,6 +1,4 @@
 import React, { FC, ReactNode } from 'react';
-// @ts-ignore
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -35,7 +33,6 @@ const styles = css('Badge', {
 
 const Badge: FC<BadgeProps> = ({ status, children }) => (
     <span
-        // @ts-ignore
         css={styles}
         $error={status === 'error'}
         $warning={status === 'warning'}
diff --git a/packages/components/button/package.json b/packages/components/button/package.json
index 1acaef3..2aaf4e3 100644
--- a/packages/components/button/package.json
+++ b/packages/components/button/package.json
@@ -4,12 +4,12 @@
     "description": "button component",
     "main": "dist/precursor-button.cjs.js",
     "module": "dist/precursor-button.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-button.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/spinner": "^0.1.1",
         "@precursor/theme": "^0.1.7",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/button/src/Button.tsx b/packages/components/button/src/Button.tsx
index e29a35e..e4a31f9 100644
--- a/packages/components/button/src/Button.tsx
+++ b/packages/components/button/src/Button.tsx
@@ -1,7 +1,4 @@
 import React, { FC, ReactNode, Fragment } from 'react';
-// @ts-ignore
-// @ts-ignore
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -74,7 +71,6 @@ const styles = css('Button', {
 
 const Button: FC<ButtonProps> = props => (
     <button
-        // @ts-ignore
         css={styles}
         type={props.type}
         onClick={props.onClick}
@@ -85,7 +81,6 @@ const Button: FC<ButtonProps> = props => (
         {props.loading ? (
             <Fragment>
                 <div
-                    // @ts-ignore
                     css={css({
                         position: 'absolute',
                         display: 'flex',
diff --git a/packages/components/checkbox/package.json b/packages/components/checkbox/package.json
index d1ffa20..bdc42b4 100644
--- a/packages/components/checkbox/package.json
+++ b/packages/components/checkbox/package.json
@@ -4,13 +4,13 @@
     "description": "Checkbox component",
     "main": "dist/precursor-checkbox.cjs.js",
     "module": "dist/precursor-checkbox.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-checkbox.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/input": "^0.1.7",
         "@precursor/label": "^0.1.7",
         "@precursor/theme": "^0.1.7",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/checkbox/src/Checkbox.tsx b/packages/components/checkbox/src/Checkbox.tsx
index d2b131c..a341c3f 100644
--- a/packages/components/checkbox/src/Checkbox.tsx
+++ b/packages/components/checkbox/src/Checkbox.tsx
@@ -1,5 +1,4 @@
 import React, { FC } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 import Label from '@precursor/label';
@@ -23,7 +22,6 @@ const Checkbox: FC<CheckboxProps> = props => {
     return (
         <Label htmlFor={props.id}>
             <Input
-                // @ts-ignore
                 css={styles}
                 disabled={props.disabled}
                 id={props.id}
diff --git a/packages/components/code/package.json b/packages/components/code/package.json
index c1731dc..c4a973d 100644
--- a/packages/components/code/package.json
+++ b/packages/components/code/package.json
@@ -4,11 +4,11 @@
     "description": "code component",
     "main": "dist/precursor-code.cjs.js",
     "module": "dist/precursor-code.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-code.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/theme": "^0.1.7",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/code/src/Code.tsx b/packages/components/code/src/Code.tsx
index 7e2c43e..d463d56 100644
--- a/packages/components/code/src/Code.tsx
+++ b/packages/components/code/src/Code.tsx
@@ -1,5 +1,4 @@
 import React, { FC, ReactNode } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -32,10 +31,8 @@ const codeStyles = css('Code', {
 });
 
 const Code: FC<CodeProps> = props => {
-    // @ts-ignore
     const codeBlock = <code css={codeStyles}>{props.children}</code>;
 
-    // @ts-ignore
     return props.inline ? codeBlock : <pre css={preStyles}>{codeBlock}</pre>;
 };
 
diff --git a/packages/components/image/package.json b/packages/components/image/package.json
index f197b6f..95e9a98 100644
--- a/packages/components/image/package.json
+++ b/packages/components/image/package.json
@@ -4,7 +4,7 @@
     "description": "image component",
     "main": "dist/precursor-image.cjs.js",
     "module": "dist/precursor-image.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-image.cjs.d.ts",
     "license": "MIT",
     "dependencies": {},
     "devDependencies": {
diff --git a/packages/components/input/package.json b/packages/components/input/package.json
index ae1e3fd..94bc9d8 100644
--- a/packages/components/input/package.json
+++ b/packages/components/input/package.json
@@ -4,11 +4,11 @@
     "description": "input component",
     "main": "dist/precursor-input.cjs.js",
     "module": "dist/precursor-input.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-input.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/theme": "^0.1.7",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/input/src/Input.tsx b/packages/components/input/src/Input.tsx
index 9af9133..8df92ec 100644
--- a/packages/components/input/src/Input.tsx
+++ b/packages/components/input/src/Input.tsx
@@ -1,5 +1,4 @@
 import React, { FC, ChangeEventHandler } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -56,9 +55,7 @@ const styles = css('Input', {
     .modifier('large', { '--input-height': '52px' });
 
 const Input: FC<InputProps> = ({ type = 'text', ...props }) => (
-    // @ts-ignore
     <input
-        // @ts-ignore
         css={styles}
         className={props.className}
         disabled={props.disabled}
diff --git a/packages/components/keyboard/package.json b/packages/components/keyboard/package.json
index af32e41..e91a613 100644
--- a/packages/components/keyboard/package.json
+++ b/packages/components/keyboard/package.json
@@ -4,11 +4,11 @@
     "description": "keyboard combo component",
     "main": "dist/precursor-keyboard.cjs.js",
     "module": "dist/precursor-keyboard.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-keyboard.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/theme": "^0.1.5",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/keyboard/src/Keyboard.tsx b/packages/components/keyboard/src/Keyboard.tsx
index 8666f20..ead31ca 100644
--- a/packages/components/keyboard/src/Keyboard.tsx
+++ b/packages/components/keyboard/src/Keyboard.tsx
@@ -1,5 +1,4 @@
 import React, { FC, ReactNode } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 // import { Theme } from '@precursor/theme';
 
@@ -25,10 +24,7 @@ const Keyboard: FC<KeyboardProps> = ({
     option,
     ctrl,
 }) => (
-    <kbd
-        // @ts-ignore
-        css={styles}
-    >
+    <kbd css={styles}>
         {command && '⌘'}
         {shift && '⇧'}
         {option && '⌥'}
diff --git a/packages/components/label/package.json b/packages/components/label/package.json
index b09e571..44f56b8 100644
--- a/packages/components/label/package.json
+++ b/packages/components/label/package.json
@@ -4,10 +4,10 @@
     "description": "label component",
     "main": "dist/precursor-label.cjs.js",
     "module": "dist/precursor-label.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-label.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/label/src/Label.tsx b/packages/components/label/src/Label.tsx
index 6f8e419..4850b53 100644
--- a/packages/components/label/src/Label.tsx
+++ b/packages/components/label/src/Label.tsx
@@ -1,5 +1,4 @@
 import React, { FC, ReactNode } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 // import { Theme } from '@precursor/theme';
 
@@ -10,9 +9,7 @@ export interface LabelProps {
 }
 
 const Label: FC<LabelProps> = ({ htmlFor, children }) => (
-    // @ts-ignore
     <label
-        // @ts-ignore
         css={css({
             display: 'inline-flex',
             alignItems: 'center',
diff --git a/packages/components/lozenge/package.json b/packages/components/lozenge/package.json
index f6294e5..06a42b7 100644
--- a/packages/components/lozenge/package.json
+++ b/packages/components/lozenge/package.json
@@ -4,10 +4,10 @@
     "description": "lozenge component",
     "main": "dist/precursor-lozenge.cjs.js",
     "module": "dist/precursor-lozenge.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-lozenge.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/lozenge/src/Lozenge.tsx b/packages/components/lozenge/src/Lozenge.tsx
index 7e3b0cf..86c1d6f 100644
--- a/packages/components/lozenge/src/Lozenge.tsx
+++ b/packages/components/lozenge/src/Lozenge.tsx
@@ -1,5 +1,4 @@
 import React, { FC, ReactNode } from 'react';
-// @ts-ignore
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -35,9 +34,7 @@ const styles = css('Lozenge', {
     });
 
 const Lozenge: FC<LozengeProps> = ({ status, children }) => (
-    // @ts-ignore
     <span
-        // @ts-ignore
         css={styles}
         $error={status === 'error'}
         $warning={status === 'warning'}
diff --git a/packages/components/message/package.json b/packages/components/message/package.json
index 354aa58..354b39f 100644
--- a/packages/components/message/package.json
+++ b/packages/components/message/package.json
@@ -4,12 +4,12 @@
     "description": "message component",
     "main": "dist/precursor-message.cjs.js",
     "module": "dist/precursor-message.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-message.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/text": "^0.1.5",
         "@precursor/theme": "^0.1.7",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/message/src/Message.tsx b/packages/components/message/src/Message.tsx
index 001fb80..eb922d1 100644
--- a/packages/components/message/src/Message.tsx
+++ b/packages/components/message/src/Message.tsx
@@ -1,5 +1,4 @@
 import React, { FC, ReactNode } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -31,7 +30,6 @@ const styles = css('message', {
 
 const Message: FC<MessageProps> = props => (
     <div
-        // @ts-ignore
         css={styles}
         $error={props.status === 'error'}
         $warning={props.status === 'warning'}
diff --git a/packages/components/modal/package.json b/packages/components/modal/package.json
index 3832ed8..ffee7a3 100644
--- a/packages/components/modal/package.json
+++ b/packages/components/modal/package.json
@@ -4,14 +4,14 @@
     "description": "modal component",
     "main": "dist/precursor-modal.cjs.js",
     "module": "dist/precursor-modal.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-modal.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/heading": "^0.1.7",
         "@precursor/inline": "^0.1.1",
         "@precursor/overlay": "^0.1.4",
         "@precursor/theme": "^0.1.7",
-        "@trousers/macro": "4.0.0-alpha7",
+        "@trousers/macro": "4.0.0-alpha9",
         "react-focus-lock": "^2.4.1"
     },
     "devDependencies": {
diff --git a/packages/components/modal/src/Modal.tsx b/packages/components/modal/src/Modal.tsx
index a6fdfd5..cd60bcf 100644
--- a/packages/components/modal/src/Modal.tsx
+++ b/packages/components/modal/src/Modal.tsx
@@ -8,7 +8,6 @@ import React, {
 } from 'react';
 import { createPortal } from 'react-dom';
 import FocusLock from 'react-focus-lock';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -34,7 +33,6 @@ const styles = css('Modal', {
 });
 
 // TODO: ensure IDs are unique
-
 const Modal: FC<ModalProps> = ({ onDismiss, children, isOpen }) => {
     const overlayRef = useRef<HTMLDivElement | null>(null);
     const handleKeyDown = useCallback(
@@ -71,7 +69,6 @@ const Modal: FC<ModalProps> = ({ onDismiss, children, isOpen }) => {
                           id="modal"
                           aria-describedby="modal-body"
                           aria-labelledby="modal-header"
-                          // @ts-ignore
                           css={styles}
                       >
                           {children}
diff --git a/packages/components/modal/src/ModalBody.tsx b/packages/components/modal/src/ModalBody.tsx
index f64b3eb..a23d056 100644
--- a/packages/components/modal/src/ModalBody.tsx
+++ b/packages/components/modal/src/ModalBody.tsx
@@ -1,5 +1,4 @@
 import React, { FC, ReactNode } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 export interface ModalBodyProps {
@@ -9,7 +8,6 @@ export interface ModalBodyProps {
 const ModalBody: FC<ModalBodyProps> = ({ children }) => (
     <div
         id="modal-body"
-        // @ts-ignore
         css={css('ModalBody', {
             padding: '0 1rem',
             flex: '1 1 0%',
diff --git a/packages/components/modal/src/ModalFooter.tsx b/packages/components/modal/src/ModalFooter.tsx
index ca5dc61..2075a9c 100644
--- a/packages/components/modal/src/ModalFooter.tsx
+++ b/packages/components/modal/src/ModalFooter.tsx
@@ -1,5 +1,4 @@
 import React, { FC, ReactNode } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -11,7 +10,6 @@ export interface ModalFooterProps {
 
 const ModalFooter: FC<ModalFooterProps> = ({ children }) => (
     <footer
-        // @ts-ignore
         css={css('ModalFooter', {
             padding: '1rem',
             borderTop: `var(--border-size-0) solid var(--border-color-base)`,
diff --git a/packages/components/modal/src/ModalHeader.tsx b/packages/components/modal/src/ModalHeader.tsx
index 245f183..4e3f7f6 100644
--- a/packages/components/modal/src/ModalHeader.tsx
+++ b/packages/components/modal/src/ModalHeader.tsx
@@ -1,5 +1,4 @@
 import React, { FC, ReactNode } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 import Heading from '@precursor/heading';
@@ -11,7 +10,6 @@ export interface ModalHeaderProps {
 const ModalHeader: FC<ModalHeaderProps> = ({ children }) => (
     <header
         id="modal-header"
-        // @ts-ignore
         css={css('ModalHeader', {
             paddingTop: '1rem',
             paddingLeft: '1rem',
diff --git a/packages/components/overlay/package.json b/packages/components/overlay/package.json
index 937dea4..b4fd1e6 100644
--- a/packages/components/overlay/package.json
+++ b/packages/components/overlay/package.json
@@ -4,10 +4,10 @@
     "description": "Overlay component",
     "main": "dist/precursor-overlay.cjs.js",
     "module": "dist/precursor-overlay.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-overlay.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/overlay/src/Overlay.tsx b/packages/components/overlay/src/Overlay.tsx
index 25343a6..6ee3767 100644
--- a/packages/components/overlay/src/Overlay.tsx
+++ b/packages/components/overlay/src/Overlay.tsx
@@ -4,7 +4,6 @@ import React, {
     KeyboardEventHandler,
     MouseEventHandler,
 } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 export interface OverlayProps {
@@ -30,13 +29,7 @@ const styles = css('Overlay', {
 const Overlay = forwardRef<HTMLDivElement, OverlayProps>(
     ({ children, onKeyDown, onClick }, ref) => (
         // eslint-disable-next-line jsx-a11y/no-static-element-interactions
-        <div
-            ref={ref}
-            // @ts-ignore
-            css={styles}
-            onKeyDown={onKeyDown}
-            onClick={onClick}
-        >
+        <div ref={ref} css={styles} onKeyDown={onKeyDown} onClick={onClick}>
             {children}
         </div>
     ),
diff --git a/packages/components/panel/package.json b/packages/components/panel/package.json
index 6720da6..aac98ee 100644
--- a/packages/components/panel/package.json
+++ b/packages/components/panel/package.json
@@ -4,10 +4,10 @@
     "description": "panel component",
     "main": "dist/precursor-panel.cjs.js",
     "module": "dist/precursor-panel.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-panel.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/panel/src/Panel.tsx b/packages/components/panel/src/Panel.tsx
index 1853ecc..702b34c 100644
--- a/packages/components/panel/src/Panel.tsx
+++ b/packages/components/panel/src/Panel.tsx
@@ -1,5 +1,4 @@
 import React, { FC, ReactNode } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -14,7 +13,6 @@ const styles = css('Panel', {
     padding: 'var(--space-m)',
 });
 
-// @ts-ignore
 const Panel: FC<PanelProps> = props => <div css={styles}>{props.children}</div>;
 
 export default Panel;
diff --git a/packages/components/radio/package.json b/packages/components/radio/package.json
index bc9b034..f22daff 100644
--- a/packages/components/radio/package.json
+++ b/packages/components/radio/package.json
@@ -4,13 +4,13 @@
     "description": "radio component",
     "main": "dist/precursor-radio.cjs.js",
     "module": "dist/precursor-radio.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-radio.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/input": "^0.1.5",
         "@precursor/label": "^0.1.4",
         "@precursor/theme": "^0.1.6",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/radio/src/Radio.tsx b/packages/components/radio/src/Radio.tsx
index 85cf8ec..fa03601 100644
--- a/packages/components/radio/src/Radio.tsx
+++ b/packages/components/radio/src/Radio.tsx
@@ -1,5 +1,4 @@
 import React, { FC } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 import Input, { InputProps } from '@precursor/input';
@@ -64,7 +63,6 @@ const styles = css('ToggleIndicator', {
 const Radio: FC<RadioProps> = ({ size = 'm', ...props }) => (
     <Label htmlFor={props.id}>
         <Input
-            // @ts-ignore
             css={css({
                 clip: 'rect(0px, 0px, 0px, 0px)',
                 height: '1px',
@@ -89,19 +87,13 @@ const Radio: FC<RadioProps> = ({ size = 'm', ...props }) => (
         />
         <div
             aria-hidden="true"
-            // @ts-ignore
             css={styles}
             $large={size === 'l'}
             $small={size === 's'}
             $disabled={props.disabled}
         />
 
-        <span
-            // @ts-ignore
-            css={css({ userSelect: 'none' })}
-        >
-            {props.label}
-        </span>
+        <span css={css({ userSelect: 'none' })}>{props.label}</span>
     </Label>
 );
 
diff --git a/packages/components/range/package.json b/packages/components/range/package.json
index 0a2fdc7..139a29d 100644
--- a/packages/components/range/package.json
+++ b/packages/components/range/package.json
@@ -4,11 +4,11 @@
     "description": "range component",
     "main": "dist/precursor-range.cjs.js",
     "module": "dist/precursor-range.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-range.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/theme": "^0.1.7",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/range/src/Range.tsx b/packages/components/range/src/Range.tsx
index 9ad5cec..f2f3680 100644
--- a/packages/components/range/src/Range.tsx
+++ b/packages/components/range/src/Range.tsx
@@ -1,6 +1,5 @@
 /* eslint-disable jsx-a11y/no-static-element-interactions */
 import React, { FC, useRef, useState } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 import Slider from './Slider';
@@ -173,7 +172,6 @@ const Range: FC<RangeProps> = ({
 
     return (
         <div
-            // @ts-ignore
             css={styles}
             $small={size === 's'}
             $large={size === 'l'}
diff --git a/packages/components/range/src/Slider.tsx b/packages/components/range/src/Slider.tsx
index 298e3de..5d96991 100644
--- a/packages/components/range/src/Slider.tsx
+++ b/packages/components/range/src/Slider.tsx
@@ -1,4 +1,3 @@
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 import React, { FC, useRef } from 'react';
 
@@ -111,7 +110,6 @@ const Slider: FC<SliderProps> = ({
     return (
         <div
             ref={sliderRef}
-            // @ts-ignore
             css={styles}
             $disabled={disabled}
             style={{
diff --git a/packages/components/range/src/Track.tsx b/packages/components/range/src/Track.tsx
index 40e9dd6..73cb4ef 100644
--- a/packages/components/range/src/Track.tsx
+++ b/packages/components/range/src/Track.tsx
@@ -1,5 +1,4 @@
 import React, { forwardRef } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -31,7 +30,6 @@ const styles = css('Track', {
 
 const Track = forwardRef<HTMLDivElement, TrackProps>(
     ({ disabled, progress }, ref) => (
-        // @ts-ignore
         <div ref={ref} css={styles} $disabled={disabled}>
             <div style={{ width: progress }} />
         </div>
diff --git a/packages/components/select/package.json b/packages/components/select/package.json
index 68338aa..6b619ab 100644
--- a/packages/components/select/package.json
+++ b/packages/components/select/package.json
@@ -4,10 +4,10 @@
     "description": "select component",
     "main": "dist/precursor-select.cjs.js",
     "module": "dist/precursor-select.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-select.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@trousers/macro": "4.0.0-alpha7",
+        "@trousers/macro": "4.0.0-alpha9",
         "react-feather": "^2.0.8"
     },
     "devDependencies": {
diff --git a/packages/components/select/src/Select.tsx b/packages/components/select/src/Select.tsx
index 7c9a710..20daaf4 100644
--- a/packages/components/select/src/Select.tsx
+++ b/packages/components/select/src/Select.tsx
@@ -1,5 +1,4 @@
 import React, { ChangeEventHandler, ReactNode, FC } from 'react';
-// @ts-ignore
 import { css } from '@trousers/macro';
 // @ts-ignore
 import ChevronDown from 'react-feather/dist/icons/chevron-down';
@@ -65,11 +64,8 @@ const styles = css('Select', {
 
 const Select: FC<SelectProps> = props => {
     return (
-        // @ts-ignore
         <div css={css({ position: 'relative' })}>
             <select
-                // className={classNames}
-                // @ts-ignore
                 css={styles}
                 $success={props.appearance === 'success'}
                 $warning={props.appearance === 'warning'}
@@ -79,6 +75,7 @@ const Select: FC<SelectProps> = props => {
                 $large={props.size === 'l'}
                 id={props.id}
                 name={props.name}
+                className={props.className}
                 onChange={props.onChange}
                 onBlur={props.onChange}
                 value={props.value || props.defaultValue}
@@ -87,7 +84,6 @@ const Select: FC<SelectProps> = props => {
                 {props.children}
             </select>
             <span
-                // @ts-ignore
                 css={css({
                     alignItems: 'center',
                     display: 'flex',
diff --git a/packages/components/skeleton/package.json b/packages/components/skeleton/package.json
index 9e10815..c7cc171 100644
--- a/packages/components/skeleton/package.json
+++ b/packages/components/skeleton/package.json
@@ -4,11 +4,11 @@
     "description": "skeleton component",
     "main": "dist/precursor-skeleton.cjs.js",
     "module": "dist/precursor-skeleton.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-skeleton.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/theme": "^0.1.7",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/skeleton/src/Skeleton.tsx b/packages/components/skeleton/src/Skeleton.tsx
index eda6d79..87d92fc 100644
--- a/packages/components/skeleton/src/Skeleton.tsx
+++ b/packages/components/skeleton/src/Skeleton.tsx
@@ -1,5 +1,5 @@
 import React, { FC } from 'react';
-// @ts-ignoreE
+
 import { css } from '@trousers/macro';
 // import { Theme } from '@precursor/theme';
 
@@ -9,9 +9,7 @@ export interface SkeletonProps {
 }
 
 const Skeleton: FC<SkeletonProps> = ({ as = 'text', height }) => (
-    // @ts-ignore
     <div
-        // @ts-ignore
         css={css('skeleton', {
             backgroundColor: 'var(--color-background-light)',
             height: '1rem',
diff --git a/packages/components/spinner/package.json b/packages/components/spinner/package.json
index b04fa64..822db96 100644
--- a/packages/components/spinner/package.json
+++ b/packages/components/spinner/package.json
@@ -4,10 +4,10 @@
     "description": "spinner component",
     "main": "dist/precursor-spinner.cjs.js",
     "module": "dist/precursor-spinner.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-spinner.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/spinner/src/Spinner.tsx b/packages/components/spinner/src/Spinner.tsx
index e66f1f3..01dcac4 100644
--- a/packages/components/spinner/src/Spinner.tsx
+++ b/packages/components/spinner/src/Spinner.tsx
@@ -1,5 +1,4 @@
 import React, { FC } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 export interface SpinnerProps {
@@ -8,9 +7,7 @@ export interface SpinnerProps {
 
 const Spinner: FC<SpinnerProps> = ({ color = 'black' }) => {
     return (
-        // @ts-ignore
         <div
-            // @ts-ignore
             css={css({
                 color: color,
                 display: 'flex',
diff --git a/packages/components/tabs/package.json b/packages/components/tabs/package.json
index c026527..10d3c4f 100644
--- a/packages/components/tabs/package.json
+++ b/packages/components/tabs/package.json
@@ -4,13 +4,13 @@
     "description": "tabs component",
     "main": "dist/precursor-tabs.cjs.js",
     "module": "dist/precursor-tabs.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-tabs.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/stack": "^0.1.5",
         "@precursor/text": "^0.1.5",
         "@precursor/theme": "^0.1.7",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/tabs/src/Tab.tsx b/packages/components/tabs/src/Tab.tsx
index 19fd068..4b1bb81 100644
--- a/packages/components/tabs/src/Tab.tsx
+++ b/packages/components/tabs/src/Tab.tsx
@@ -1,5 +1,5 @@
 import React, { useContext, FC, ReactNode } from 'react';
-// @ts-ignoreE
+
 import { css } from '@trousers/macro';
 import Text from '@precursor/text';
 // import { Theme } from '@precursor/theme';
@@ -32,7 +32,6 @@ const Tab: FC<TabProps> = ({ id, children }) => {
             id={`tab-${id}`}
             tabIndex={isSelected ? 0 : -1}
             onClick={() => setActive && setActive(id)}
-            // @ts-ignore
             css={styles}
             $selected={isSelected}
         >
diff --git a/packages/components/tabs/src/TabList.tsx b/packages/components/tabs/src/TabList.tsx
index f195ba4..42df8e7 100644
--- a/packages/components/tabs/src/TabList.tsx
+++ b/packages/components/tabs/src/TabList.tsx
@@ -1,5 +1,4 @@
 import React, { useContext, FC, KeyboardEventHandler, ReactNode } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 import TabsContext from './TabsContext';
 
@@ -40,9 +39,8 @@ const TabList: FC<TabListProps> = ({ label, children }) => {
             tabIndex={0}
             aria-label={label}
             onKeyDown={onKeyDown}
-            // @ts-ignore
             css={css({
-                borderBottom: `var(--border--size[0]) solid var(--border--color.base)`,
+                borderBottom: `var(--border--size[0]) solid var(--border--color--base)`,
             })}
         >
             {children}
diff --git a/packages/components/textarea/package.json b/packages/components/textarea/package.json
index ac97c3c..1dc1571 100644
--- a/packages/components/textarea/package.json
+++ b/packages/components/textarea/package.json
@@ -4,10 +4,10 @@
     "description": "Textarea component",
     "main": "dist/precursor-textarea.cjs.js",
     "module": "dist/precursor-textarea.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-textarea.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/textarea/src/TextArea.tsx b/packages/components/textarea/src/TextArea.tsx
index 002f0d8..2ecaa96 100644
--- a/packages/components/textarea/src/TextArea.tsx
+++ b/packages/components/textarea/src/TextArea.tsx
@@ -1,5 +1,5 @@
 import React, { FC, ChangeEventHandler } from 'react';
-// @ts-ignoreE
+
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -64,9 +64,7 @@ const styles = css('TextArea', {
     });
 
 const TextArea: FC<TextAreaProps> = props => (
-    // @ts-ignore
     <textarea
-        // @ts-ignore
         css={styles}
         disabled={props.disabled}
         id={props.id}
diff --git a/packages/components/toggle/package.json b/packages/components/toggle/package.json
index c7cd56a..510959a 100644
--- a/packages/components/toggle/package.json
+++ b/packages/components/toggle/package.json
@@ -4,13 +4,13 @@
     "description": "toggle component",
     "main": "dist/precursor-toggle.cjs.js",
     "module": "dist/precursor-toggle.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-toggle.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/input": "^0.1.7",
         "@precursor/label": "^0.1.7",
         "@precursor/theme": "^0.1.7",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/components/toggle/src/Toggle.tsx b/packages/components/toggle/src/Toggle.tsx
index 145a9e6..a967e17 100644
--- a/packages/components/toggle/src/Toggle.tsx
+++ b/packages/components/toggle/src/Toggle.tsx
@@ -1,5 +1,5 @@
 import React, { FC } from 'react';
-// @ts-ignoreE
+
 import { css } from '@trousers/macro';
 
 import Input, { InputProps } from '@precursor/input';
@@ -62,7 +62,6 @@ const toggleStyles = css('ToggleIndicator', {
 
 const Toggle: FC<ToggleProps> = ({ size = 'm', ...props }) => (
     <div
-        // @ts-ignore
         css={css({
             display: 'inline-flex',
             alignItems: 'center',
@@ -72,7 +71,6 @@ const Toggle: FC<ToggleProps> = ({ size = 'm', ...props }) => (
     >
         <Label htmlFor={props.id}>
             <Input
-                // @ts-ignore
                 css={css({
                     clip: 'rect(0px, 0px, 0px, 0px)',
                     height: '1px',
@@ -97,19 +95,13 @@ const Toggle: FC<ToggleProps> = ({ size = 'm', ...props }) => (
             />
             <div
                 aria-hidden="true"
-                // @ts-ignore
                 css={toggleStyles}
                 $large={size === 'l'}
                 $small={size === 's'}
                 $disabled={props.disabled}
             />
 
-            <span
-                // @ts-ignore
-                css={css({ userSelect: 'none' })}
-            >
-                {props.label}
-            </span>
+            <span css={css({ userSelect: 'none' })}>{props.label}</span>
         </Label>
     </div>
 );
diff --git a/packages/elements/blockquote/package.json b/packages/elements/blockquote/package.json
index a3a0793..dd89f6a 100644
--- a/packages/elements/blockquote/package.json
+++ b/packages/elements/blockquote/package.json
@@ -4,11 +4,11 @@
     "description": "blockquote component",
     "main": "dist/precursor-blockquote.cjs.js",
     "module": "dist/precursor-blockquote.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-blockquote.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/theme": "^0.1.7",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/elements/blockquote/src/Blockquote.tsx b/packages/elements/blockquote/src/Blockquote.tsx
index 907dea0..8223930 100644
--- a/packages/elements/blockquote/src/Blockquote.tsx
+++ b/packages/elements/blockquote/src/Blockquote.tsx
@@ -1,5 +1,5 @@
 import React, { FC } from 'react';
-// @ts-ignoreE
+
 import { css } from '@trousers/macro';
 
 // import { Theme } from '@precursor/theme';
@@ -17,7 +17,6 @@ const styles = css('Blockquote', {
 });
 
 const Blockquote: FC<BlockquoteProps> = ({ cite, children }) => (
-    // @ts-ignore
     <blockquote css={styles} cite={cite}>
         {children}
     </blockquote>
diff --git a/packages/elements/emoji/package.json b/packages/elements/emoji/package.json
index 430fff7..8602d63 100644
--- a/packages/elements/emoji/package.json
+++ b/packages/elements/emoji/package.json
@@ -4,7 +4,7 @@
     "description": "Emoji component",
     "main": "dist/precursor-emoji.cjs.js",
     "module": "dist/precursor-emoji.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-emoji.cjs.d.ts",
     "license": "MIT",
     "dependencies": {},
     "devDependencies": {
diff --git a/packages/elements/heading/package.json b/packages/elements/heading/package.json
index d9c48f6..dc4edd5 100644
--- a/packages/elements/heading/package.json
+++ b/packages/elements/heading/package.json
@@ -4,11 +4,11 @@
     "description": "Heading component",
     "main": "dist/precursor-heading.cjs.js",
     "module": "dist/precursor-heading.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-heading.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/theme": "^0.1.7",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/elements/heading/src/Heading.tsx b/packages/elements/heading/src/Heading.tsx
index b78e050..0848568 100644
--- a/packages/elements/heading/src/Heading.tsx
+++ b/packages/elements/heading/src/Heading.tsx
@@ -1,5 +1,5 @@
 import React, { FC, ReactNode } from 'react';
-// // @ts-ignoreE
+//
 // import { css } from '@trousers/macro';
 
 // import copyToClipboard from '@precursor/copy-to-clipboard';
@@ -73,7 +73,6 @@ const Heading: FC<HeadingProps> = ({
     //         {children}
     //         {id && (
     //             <a
-    //                 // @ts-ignore
     //                 css={css({
     //                     textDecoration: 'none',
     //                     padding: '0 0.5rem',
diff --git a/packages/elements/list/package.json b/packages/elements/list/package.json
index c089168..fe0973d 100644
--- a/packages/elements/list/package.json
+++ b/packages/elements/list/package.json
@@ -4,10 +4,10 @@
     "description": "list component",
     "main": "dist/precursor-list.cjs.js",
     "module": "dist/precursor-list.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-list.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/elements/text/package.json b/packages/elements/text/package.json
index b140673..b28bc18 100644
--- a/packages/elements/text/package.json
+++ b/packages/elements/text/package.json
@@ -4,11 +4,11 @@
     "description": "text component",
     "main": "dist/precursor-text.cjs.js",
     "module": "dist/precursor-text.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-text.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/theme": "^0.1.7",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/layout/grid/package.json b/packages/layout/grid/package.json
index 70c3ef8..cbcad33 100644
--- a/packages/layout/grid/package.json
+++ b/packages/layout/grid/package.json
@@ -4,11 +4,11 @@
     "description": "grid component",
     "main": "dist/precursor-grid.cjs.js",
     "module": "dist/precursor-grid.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-grid.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/theme": "^0.1.7",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/layout/grid/src/Grid.tsx b/packages/layout/grid/src/Grid.tsx
index e4f4e69..2fd3d50 100644
--- a/packages/layout/grid/src/Grid.tsx
+++ b/packages/layout/grid/src/Grid.tsx
@@ -1,6 +1,4 @@
 import React, { FC, ReactNode } from 'react';
-
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 import { Theme } from '@precursor/theme';
 
@@ -28,11 +26,11 @@ const Grid: FC<GridProps> = ({
 
     return (
         <div
-            // @ts-ignore
             css={css('Grid', {
                 display: 'grid',
                 gridTemplateColumns: `repeat(${columns}, 1fr)`,
                 width: '100%',
+                // gap: getGap()
             })}
         >
             {children}
diff --git a/packages/layout/grid/src/Row.tsx b/packages/layout/grid/src/Row.tsx
index fd2a320..8442015 100644
--- a/packages/layout/grid/src/Row.tsx
+++ b/packages/layout/grid/src/Row.tsx
@@ -1,6 +1,4 @@
 import React, { FC, ReactNode } from 'react';
-
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 export interface RowProps {
@@ -9,7 +7,6 @@ export interface RowProps {
 
 const Row: FC<RowProps> = ({ children }) => (
     <div
-        // @ts-ignore
         css={css({
             display: 'grid',
             gridTemplateColumns: 'repeat(12, 1fr)',
diff --git a/packages/layout/inline/package.json b/packages/layout/inline/package.json
index 8ece948..756406f 100644
--- a/packages/layout/inline/package.json
+++ b/packages/layout/inline/package.json
@@ -4,10 +4,10 @@
     "description": "inline component",
     "main": "dist/precursor-inline.cjs.js",
     "module": "dist/precursor-inline.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-inline.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/layout/inline/src/Inline.tsx b/packages/layout/inline/src/Inline.tsx
index 18e6bc0..2e3ff36 100644
--- a/packages/layout/inline/src/Inline.tsx
+++ b/packages/layout/inline/src/Inline.tsx
@@ -1,6 +1,5 @@
 import React, { Children, FC, ReactNode } from 'react';
 
-// @ts-ignore
 import { css } from '@trousers/macro';
 import { Theme } from '@precursor/theme';
 
@@ -16,7 +15,6 @@ const Inline: FC<InlineProps> = ({
     justify = 'flex-start',
 }) => (
     <span
-        // @ts-ignore
         css={css('Inline', {
             display: 'flex',
             flexDirection: 'row',
diff --git a/packages/layout/stack/package.json b/packages/layout/stack/package.json
index d5ccbc9..8f37a12 100644
--- a/packages/layout/stack/package.json
+++ b/packages/layout/stack/package.json
@@ -4,10 +4,10 @@
     "description": "stack component",
     "main": "dist/precursor-stack.cjs.js",
     "module": "dist/precursor-stack.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-stack.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/layout/stack/src/Stack.tsx b/packages/layout/stack/src/Stack.tsx
index 8b1c033..7c896f3 100644
--- a/packages/layout/stack/src/Stack.tsx
+++ b/packages/layout/stack/src/Stack.tsx
@@ -1,7 +1,5 @@
 import React, { FC, ReactNode } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
-
 import { Theme } from '@precursor/theme';
 
 export interface StackProps {
@@ -11,7 +9,6 @@ export interface StackProps {
 
 const Stack: FC<StackProps> = ({ gap = 'm', children }) => (
     <div
-        // @ts-ignore
         css={css('Stack', {
             display: 'grid',
             gridTemplateColumns: 'repeat(1, 1fr)',
diff --git a/packages/theming/theme/package.json b/packages/theming/theme/package.json
index eee3e6b..eac0265 100644
--- a/packages/theming/theme/package.json
+++ b/packages/theming/theme/package.json
@@ -4,11 +4,11 @@
     "description": "Theme component",
     "main": "dist/precursor-theme.cjs.js",
     "module": "dist/precursor-theme.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-theme.cjs.d.ts",
     "license": "MIT",
     "dependencies": {
         "@precursor/tokens": "^0.1.1",
-        "@trousers/macro": "4.0.0-alpha7"
+        "@trousers/macro": "4.0.0-alpha9"
     },
     "devDependencies": {
         "react": "^17.0.1"
diff --git a/packages/theming/theme/src/Globals.tsx b/packages/theming/theme/src/Globals.tsx
index f4fb9ae..91dcefd 100644
--- a/packages/theming/theme/src/Globals.tsx
+++ b/packages/theming/theme/src/Globals.tsx
@@ -1,5 +1,4 @@
 import React, { FC } from 'react';
-// @ts-ignoreE
 import { css } from '@trousers/macro';
 
 // import { Theme } from './theme';
@@ -21,9 +20,6 @@ const reset = css({}).global({
     },
 });
 
-const Globals: FC = () => {
-    // @ts-ignore
-    return <span css={reset} />; // TODO: this isn't great
-};
+const Globals: FC = () => <span css={reset} />;
 
 export default Globals;
diff --git a/packages/theming/theme/src/ThemeProvider.tsx b/packages/theming/theme/src/ThemeProvider.tsx
index 4c91a5c..fd79dbd 100644
--- a/packages/theming/theme/src/ThemeProvider.tsx
+++ b/packages/theming/theme/src/ThemeProvider.tsx
@@ -1,21 +1,19 @@
 import React, { FC, ReactNode } from 'react';
-// // @ts-ignore
-// import { css } from '@trousers/macro';
+import { css } from '@trousers/macro';
 
-// import defaultTheme, { Theme } from './theme';
-// import Globals from './Globals';
+import defaultTheme, { Theme } from './theme';
+import Globals from './Globals';
 
 export interface Props {
     theme?: Theme;
     children: ReactNode;
 }
 
-const ThemeProvider: FC<Props> = ({ /*theme = defaultTheme,*/ children }) => (
-    // @ts-ignore
-    // <span css={css('Theme', {}).theme(theme)}>
-    // <Globals />
-    <span>{children}</span>
-    // </span>
+const ThemeProvider: FC<Props> = ({ theme = defaultTheme, children }) => (
+    <span css={css('Theme', {}) /*.theme(theme)*/}>
+        <Globals />
+        {children}
+    </span>
 );
 
 export default ThemeProvider;
diff --git a/packages/theming/tokens/package.json b/packages/theming/tokens/package.json
index 0d5ac39..ef62c85 100644
--- a/packages/theming/tokens/package.json
+++ b/packages/theming/tokens/package.json
@@ -4,7 +4,7 @@
     "description": "tokens component",
     "main": "dist/precursor-tokens.cjs.js",
     "module": "dist/precursor-tokens.esm.js",
-    "types": "dist/index.d.ts",
+    "types": "dist/precursor-tokens.cjs.d.ts",
     "license": "MIT",
     "dependencies": {},
     "devDependencies": {},
diff --git a/yarn.lock b/yarn.lock
index 808e332..00f1327 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2595,43 +2595,43 @@
     "@babel/runtime" "^7.10.2"
     "@testing-library/dom" "^7.9.0"
 
-"@trousers/core@4.0.0-alpha7":
-  version "4.0.0-alpha7"
-  resolved "https://registry.yarnpkg.com/@trousers/core/-/core-4.0.0-alpha7.tgz#996b32298010b1bd7392c487204165e4c5d09802"
-  integrity sha512-2l9VkJOJ3qlVBzRt+9jk52HPKF2X46zcEkzExEKaWBvygVV/nWJG4CsazqSCM+dmfTt/xbXSZlKXNaNX8Ofinw==
+"@trousers/core@4.0.0-alpha9":
+  version "4.0.0-alpha9"
+  resolved "https://registry.yarnpkg.com/@trousers/core/-/core-4.0.0-alpha9.tgz#e28915ba8110916246761efb04ed0999e0d750bc"
+  integrity sha512-w9U6afAijy3kcSJTAoB1HtMHrdcqRsXplTmwdYYAk6rOhyxQL36aJlAHeJ5aXvFRFdRXZCEJLtgf5JKL7KwtIg==
   dependencies:
-    "@trousers/hash" "4.0.0-alpha7"
+    "@trousers/hash" "4.0.0-alpha9"
     csstype "^2.5.7"
     tiny-css-prefixer "^1.1.4"
 
-"@trousers/hash@4.0.0-alpha7":
-  version "4.0.0-alpha7"
-  resolved "https://registry.yarnpkg.com/@trousers/hash/-/hash-4.0.0-alpha7.tgz#b3037372c16e3dfcfadeea8a7e81b413e88126b6"
-  integrity sha512-UsIdHTT6XQxnRCzkxo1UJoHTBmS3CSNomLJUI7qGR3cfMtV8Ks5tJc46rTsMDBdCSnAEgOgyBx97QXAiy4fC8w==
+"@trousers/hash@4.0.0-alpha9":
+  version "4.0.0-alpha9"
+  resolved "https://registry.yarnpkg.com/@trousers/hash/-/hash-4.0.0-alpha9.tgz#4248530bad07e6937bf691a3093328a9e3173ee8"
+  integrity sha512-NZ//gldu4f/lCARCXVlODOzBGuv8MJTf/kWlVIG+q4BWo13qL6sGrvx0keoMVt+Wsx3KcjgGjThr2ZPo8Du33A==
 
-"@trousers/macro@4.0.0-alpha7":
-  version "4.0.0-alpha7"
-  resolved "https://registry.yarnpkg.com/@trousers/macro/-/macro-4.0.0-alpha7.tgz#f074c762a1a2bda4f28af308ee82db64bd7ffa4c"
-  integrity sha512-TTngcbCw9mnF+9fFUONR7he6Gp91/y8XSEHcvV70a+91K4XhDvD7ijk2Tv3ebBjLXZ2aXNWzi4KDmxCTm7bUhA==
+"@trousers/macro@4.0.0-alpha9":
+  version "4.0.0-alpha9"
+  resolved "https://registry.yarnpkg.com/@trousers/macro/-/macro-4.0.0-alpha9.tgz#df67e945caef31cde22a3f1d2ca13d42f871d7c8"
+  integrity sha512-16qjaOW4Z1d44nVNWDU5nvQmDJ8KGe4hHCm3g/irIbwzu1X8eQaYkjRY5JPAAAM+dSavAZ9JgQ2LQVsBb1Lm6Q==
   dependencies:
-    "@trousers/core" "4.0.0-alpha7"
-    "@trousers/hash" "4.0.0-alpha7"
-    "@trousers/react" "4.0.0-alpha7"
-    "@trousers/sheet" "4.0.0-alpha7"
+    "@trousers/core" "4.0.0-alpha9"
+    "@trousers/hash" "4.0.0-alpha9"
+    "@trousers/react" "4.0.0-alpha9"
+    "@trousers/sheet" "4.0.0-alpha9"
     babel-plugin-macros "^3.0.0"
 
-"@trousers/react@4.0.0-alpha7":
-  version "4.0.0-alpha7"
-  resolved "https://registry.yarnpkg.com/@trousers/react/-/react-4.0.0-alpha7.tgz#f01a90af635425f27cdbd30dc431cb7cf8bb3322"
-  integrity sha512-8P4EF80nrrZ2lqIIjl+QC3r+oq8fbcq69/+rR9zqTeRGPcuU8NE7gM2uT0JreVaBKNZfJRPIZLIcdt+qrmBZhw==
+"@trousers/react@4.0.0-alpha9":
+  version "4.0.0-alpha9"
+  resolved "https://registry.yarnpkg.com/@trousers/react/-/react-4.0.0-alpha9.tgz#170be1417470ac963fd89437ccc8d279f4ae2050"
+  integrity sha512-I7O9iyb0doZTE3QO0AsWAZA8xozbzHkP+0rnjfKnXEMVAUxlrUKUNRSvqf2AOXxD/LAqPyw5z5szJSYVjDn5Ww==
   dependencies:
-    "@trousers/core" "4.0.0-alpha7"
-    "@trousers/sheet" "4.0.0-alpha7"
+    "@trousers/core" "4.0.0-alpha9"
+    "@trousers/sheet" "4.0.0-alpha9"
 
-"@trousers/sheet@4.0.0-alpha7":
-  version "4.0.0-alpha7"
-  resolved "https://registry.yarnpkg.com/@trousers/sheet/-/sheet-4.0.0-alpha7.tgz#fcd1c85e29f02525be453d177d7242d17f019f8e"
-  integrity sha512-xMGsHgRD5CeW9+Kc5g0h81MWE1bz6mzj2nCi0/Mo/gBsBZbUUvgoAaSzUWrGRWEyNOPcTTePT6G5GGg/DvJXjg==
+"@trousers/sheet@4.0.0-alpha9":
+  version "4.0.0-alpha9"
+  resolved "https://registry.yarnpkg.com/@trousers/sheet/-/sheet-4.0.0-alpha9.tgz#e5b0e6b9e71ef9d281e24eb615929db84f95af45"
+  integrity sha512-vexI0LsGLXQ9K5sxKotCs2DBtNoN1gBXGhka+6LdQTJ/A7iAI2hFfWNfLq+GsJ04pzKUKO8u1dDmk5s2KWaR2g==
 
 "@types/anymatch@*":
   version "1.3.1"