From e0cf24afe5051e72da553a6328ebc66008949a36 Mon Sep 17 00:00:00 2001
From: Peter Pistorius <peter.pistorius@gmail.com>
Date: Sun, 3 May 2020 00:03:29 +0200
Subject: [PATCH 01/25] Add a way to extract the user from the headers.

---
 packages/api/package.json              |  3 +-
 packages/api/src/getUserFromContext.ts | 45 ++++++++++++++++++++++++++
 packages/api/src/main.ts               |  2 +-
 yarn.lock                              | 26 +++++++++++++++
 4 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 packages/api/src/getUserFromContext.ts

diff --git a/packages/api/package.json b/packages/api/package.json
index bf7fd57c0996..a409e1ad462f 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -41,9 +41,10 @@
     ]
   },
   "scripts": {
-    "build": "yarn build:clean && yarn build:js",
+    "build": "yarn build:clean && yarn build:js && yarn build:types",
     "build:js": "yarn cross-env NODE_ENV=production babel src -d dist --extensions \".js,.ts\" --source-maps inline && yarn move-cli ./dist/importAll.macro.js ./importAll.macro.js",
     "build:clean": "yarn del-cli dist importAll.macro.js",
+    "build:types": "tsc --declaration --emitDeclarationOnly",
     "prepublishOnly": "yarn build",
     "build:watch": "nodemon --watch src --ext 'js,ts,tsx' --ignore dist --ignore importAll.macro.js --exec 'yarn build'",
     "test": "yarn jest",
diff --git a/packages/api/src/getUserFromContext.ts b/packages/api/src/getUserFromContext.ts
new file mode 100644
index 000000000000..9b08888f23f1
--- /dev/null
+++ b/packages/api/src/getUserFromContext.ts
@@ -0,0 +1,45 @@
+import type { APIGatewayProxyEvent, Context } from 'aws-lambda'
+import fetch from 'node-fetch'
+
+export type SupportedAuthTypes = 'auth0' | 'netlify'
+
+type NetlifyClientContext = Context & {
+  clientContext: {
+    user?: any
+  }
+}
+
+// TODO: Define what an Auth0 user looks like.
+const REDWOOD_AUTH_TYPE_HEADER = 'x-redwood-auth-type'
+
+export const getUserFromContext = async ({
+  event,
+  context,
+}: {
+  event: APIGatewayProxyEvent
+  context: NetlifyClientContext
+}) => {
+  const type = event?.headers[REDWOOD_AUTH_TYPE_HEADER] as SupportedAuthTypes
+  switch (type) {
+    case 'netlify':
+      return context.clientContext?.user
+    case 'auth0': {
+      // We need a strategy for fetching, caching and invalidating users from Auth0.
+      // It would be amazing if Netlify could do this automatically for us:
+      // As an example if we passed in an `X-Redwood-Auth-Type: Auth0` header,
+      // and it fetch this and placed it in `clientContext.user`,
+      // just like Netlify identity does it.
+      const response = await fetch(
+        `https://${process.env.AUTH0_DOMAIN}/userinfo`,
+        {
+          headers: {
+            Authorization: event.headers?.authorization,
+          },
+        }
+      )
+      return response.json()
+    }
+    default:
+      return undefined
+  }
+}
diff --git a/packages/api/src/main.ts b/packages/api/src/main.ts
index 4546aee675a3..8ab4981e911e 100644
--- a/packages/api/src/main.ts
+++ b/packages/api/src/main.ts
@@ -4,4 +4,4 @@ export * from './makeServices'
 export * from './makeMergedSchema/makeMergedSchema'
 export * from './functions/graphQLServer'
 export * from './globalContext'
-export * from './auth/authHeaders'
+export * from './getUserFromContext'
diff --git a/yarn.lock b/yarn.lock
index 3d25b94c60f8..5bdb35c710cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4413,6 +4413,7 @@ babel-plugin-tester@^9.0.0, babel-plugin-tester@^9.0.1:
     prettier "^2.0.1"
     strip-indent "^3.0.0"
 
+<<<<<<< HEAD
 babel-preset-current-node-syntax@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz#fb4a4c51fe38ca60fede1dc74ab35eb843cb41d6"
@@ -4433,6 +4434,21 @@ babel-preset-jest@^25.5.0:
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz#c1d7f191829487a907764c65307faa0e66590b49"
   integrity sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==
+=======
+babel-plugin-tester@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-tester/-/babel-plugin-tester-9.0.1.tgz#9e975a7fe278a49b3bd4b02bd3a77004819863ee"
+  integrity sha512-q5GXJowxsRefBDhgiZVyNPgIIHsfxtZNnMABxq+vtuoYP2JW8qaiIBBAG9/I0PgRGRpjUDXnn0IhGHGGn7UOcA==
+  dependencies:
+    lodash.mergewith "^4.6.2"
+    prettier "^2.0.1"
+    strip-indent "^3.0.0"
+
+babel-preset-jest@^25.2.1:
+  version "25.2.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.2.1.tgz#4ccd0e577f69aa11b71806edfe8b25a5c3ac93a2"
+  integrity sha512-zXHJBM5iR8oEO4cvdF83AQqqJf3tJrXy3x8nfu2Nlqvn4cneg4Ca8M7cQvC5S9BzDDy1O0tZ9iXru9J6E3ym+A==
+>>>>>>> 73720a6... Add a way to extract the user from the headers.
   dependencies:
     babel-plugin-jest-hoist "^25.5.0"
     babel-preset-current-node-syntax "^0.1.2"
@@ -8248,6 +8264,7 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
+<<<<<<< HEAD
 got@^9.6.0:
   version "9.6.0"
   resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
@@ -8265,6 +8282,8 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
+=======
+>>>>>>> 73720a6... Add a way to extract the user from the headers.
 gotrue-js@^0.9.25:
   version "0.9.25"
   resolved "https://registry.yarnpkg.com/gotrue-js/-/gotrue-js-0.9.25.tgz#eb9a3c76a2d08629afcda7872a60924d5d671c6a"
@@ -8272,10 +8291,17 @@ gotrue-js@^0.9.25:
   dependencies:
     micro-api-client "^3.2.1"
 
+<<<<<<< HEAD
 graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+=======
+graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
+  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+>>>>>>> 73720a6... Add a way to extract the user from the headers.
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"

From 15041af390a8007a454e934e12a971cc3447f438 Mon Sep 17 00:00:00 2001
From: Peter Pistorius <peter.pistorius@gmail.com>
Date: Sun, 3 May 2020 12:46:04 +0200
Subject: [PATCH 02/25] Add auth package.

---
 packages/auth/src/AuthProvider.tsx |  80 +++
 packages/auth/src/authClient.ts    |  42 ++
 packages/auth/src/useAuth.ts       |   3 +
 yarn.lock                          | 939 ++++++++++++++++++++++++-----
 4 files changed, 909 insertions(+), 155 deletions(-)

diff --git a/packages/auth/src/AuthProvider.tsx b/packages/auth/src/AuthProvider.tsx
index 58df76626307..6422d9b71880 100644
--- a/packages/auth/src/AuthProvider.tsx
+++ b/packages/auth/src/AuthProvider.tsx
@@ -1,21 +1,37 @@
+<<<<<<< HEAD
 import React from 'react'
+=======
+import type { ReactNode } from 'react'
+import React, { useState, useEffect } from 'react'
+>>>>>>> bb1ab34... Add auth package.
 
 import type {
   SupportedAuthTypes,
   SupportedAuthClients,
   Auth0User,
+<<<<<<< HEAD
   GoTrueUser,
   AuthClient,
   MagicUser,
+=======
+  NetlifyUser,
+>>>>>>> bb1ab34... Add auth package.
 } from './authClient'
 import { createAuthClient } from './authClient'
 
 export interface AuthContextInterface {
   loading: boolean
+<<<<<<< HEAD
   isAuthenticated: boolean
   currentUser: null | GoTrueUser | Auth0User | MagicUser
   logIn(): Promise<void>
   logOut(): Promise<void>
+=======
+  authenticated: boolean
+  user: null | object // TODO: Provide a generic interface to the users object.
+  login(): Promise<void>
+  logout(): Promise<void>
+>>>>>>> bb1ab34... Add auth package.
   getToken(): Promise<null | string>
   client: null | SupportedAuthClients
   type: null | SupportedAuthTypes
@@ -25,6 +41,7 @@ export const AuthContext = React.createContext<Partial<AuthContextInterface>>(
   {}
 )
 
+<<<<<<< HEAD
 type AuthProviderProps = {
   client: AuthClient
   type: SupportedAuthTypes
@@ -35,6 +52,8 @@ type AuthProviderState = {
   isAuthenticated: boolean
   currentUser: null | Auth0User | GoTrueUser
 }
+=======
+>>>>>>> bb1ab34... Add auth package.
 /**
  * @example
  * ```js
@@ -45,6 +64,7 @@ type AuthProviderState = {
  *  </AuthProvider>
  * ```
  */
+<<<<<<< HEAD
 export class AuthProvider extends React.Component<
   AuthProviderProps,
   AuthProviderState
@@ -100,4 +120,64 @@ export class AuthProvider extends React.Component<
       </AuthContext.Provider>
     )
   }
+=======
+export const AuthProvider = ({
+  children,
+  type,
+  client,
+}: {
+  children: ReactNode
+  type: SupportedAuthTypes
+  client: SupportedAuthClients
+}): JSX.Element => {
+  const [loading, setLoading] = useState(true)
+  const [authenticated, setAuthenticated] = useState(false)
+  const [user, setUser] = useState<null | NetlifyUser | Auth0User>(null)
+
+  // Map the methods from auth0 and netlify into a unified interface.
+  const rwClient = createAuthClient(client, type)
+
+  // Attempt to restore the authentication state when a user visits the app again.
+  useEffect(() => {
+    const restoreAuthState = async () => {
+      rwClient.restoreAuthState && (await rwClient.restoreAuthState())
+
+      const user = await rwClient.currentUser()
+      setUser(user)
+      setAuthenticated(user !== null)
+      setLoading(false)
+    }
+    restoreAuthState()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
+  const login = async (...args) => {
+    const user = await rwClient.login(...args)
+    setUser(user)
+    setAuthenticated(user !== null)
+  }
+
+  const logout = async () => {
+    await rwClient.logout()
+    setUser(null)
+    setAuthenticated(false)
+  }
+
+  return (
+    <AuthContext.Provider
+      value={{
+        loading,
+        authenticated,
+        user,
+        login,
+        logout,
+        getToken: rwClient.getToken,
+        client: rwClient.client,
+        type: rwClient.type,
+      }}
+    >
+      {children}
+    </AuthContext.Provider>
+  )
+>>>>>>> bb1ab34... Add auth package.
 }
diff --git a/packages/auth/src/authClient.ts b/packages/auth/src/authClient.ts
index 22a77fa249ba..49f4990f8c2e 100644
--- a/packages/auth/src/authClient.ts
+++ b/packages/auth/src/authClient.ts
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import type { default as GoTrue, User as GoTrueUser } from 'gotrue-js'
 import type { Auth0Client as Auth0 } from '@auth0/auth0-spa-js'
 import type NetlifyIdentityNS from 'netlify-identity-widget'
@@ -12,24 +13,43 @@ export type MagicUser = MagicUserMetadata
 
 export type SupportedAuthClients = Auth0 | GoTrue | NetlifyIdentity | MagicLinks
 export type SupportedAuthTypes = 'auth0' | 'gotrue' | 'netlify' | 'magic.link'
+=======
+import type { default as Netlify } from 'gotrue-js'
+import type { User as NetlifyUser } from 'gotrue-js'
+import type { Auth0Client as Auth0 } from '@auth0/auth0-spa-js'
+
+// TODO: Can also return an Auth0 user which doesn't have a definition.
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface Auth0User {}
+export type { NetlifyUser }
+>>>>>>> bb1ab34... Add auth package.
 
 export interface AuthClient {
   restoreAuthState?(): void | Promise<any>
   login(options?: any): Promise<any>
   logout(): void | Promise<void>
   getToken(): Promise<null | string>
+<<<<<<< HEAD
   currentUser(): Promise<null | Auth0User | GoTrueUser | MagicUser>
+=======
+  currentUser(): Promise<null | Auth0User | NetlifyUser>
+>>>>>>> bb1ab34... Add auth package.
   client: SupportedAuthClients
   type: SupportedAuthTypes
 }
 
 export type AuthClientAuth0 = AuthClient
 
+<<<<<<< HEAD
 export interface AuthClientGoTrue extends AuthClient {
+=======
+export interface AuthClientNetlify extends AuthClient {
+>>>>>>> bb1ab34... Add auth package.
   login(options: {
     email: string
     password: string
     remember?: boolean
+<<<<<<< HEAD
   }): Promise<GoTrueUser>
   client: GoTrue
 }
@@ -37,6 +57,14 @@ export interface AuthClientGoTrue extends AuthClient {
 export interface MagicLinksClient extends AuthClient {
   login(options: { email: string; showUI?: boolean })
 }
+=======
+  }): Promise<NetlifyUser>
+  client: Netlify
+}
+
+export type SupportedAuthClients = Auth0 | Netlify
+export type SupportedAuthTypes = 'auth0' | 'netlify'
+>>>>>>> bb1ab34... Add auth package.
 
 const mapAuthClientAuth0 = (client: Auth0): AuthClientAuth0 => {
   return {
@@ -64,9 +92,15 @@ const mapAuthClientAuth0 = (client: Auth0): AuthClientAuth0 => {
   }
 }
 
+<<<<<<< HEAD
 const mapAuthClientGoTrue = (client: GoTrue): AuthClientGoTrue => {
   return {
     type: 'gotrue',
+=======
+const mapAuthClientNetlify = (client: Netlify): AuthClientNetlify => {
+  return {
+    type: 'netlify',
+>>>>>>> bb1ab34... Add auth package.
     client,
     login: async ({ email, password, remember }) =>
       client.login(email, password, remember),
@@ -82,6 +116,7 @@ const mapAuthClientGoTrue = (client: GoTrue): AuthClientGoTrue => {
   }
 }
 
+<<<<<<< HEAD
 const mapAuthClientNetlify = (client: NetlifyIdentity): AuthClient => {
   return {
     type: 'netlify',
@@ -135,6 +170,8 @@ const mapAuthClientMagicLinks = (client: MagicLinks): MagicLinksClient => {
   }
 }
 
+=======
+>>>>>>> bb1ab34... Add auth package.
 export const createAuthClient = (
   client: SupportedAuthClients,
   type: SupportedAuthTypes
@@ -142,12 +179,17 @@ export const createAuthClient = (
   switch (type) {
     case 'auth0':
       return mapAuthClientAuth0(client as Auth0)
+<<<<<<< HEAD
     case 'gotrue':
       return mapAuthClientGoTrue(client as GoTrue)
     case 'netlify':
       return mapAuthClientNetlify(client as NetlifyIdentity)
     case 'magic.link':
       return mapAuthClientMagicLinks(client as MagicLinks)
+=======
+    case 'netlify':
+      return mapAuthClientNetlify(client as Netlify)
+>>>>>>> bb1ab34... Add auth package.
     default:
       throw new Error(
         `The ${type} auth client is not currently supported, please consider adding it.`
diff --git a/packages/auth/src/useAuth.ts b/packages/auth/src/useAuth.ts
index 3a17b54139f6..62543689711c 100644
--- a/packages/auth/src/useAuth.ts
+++ b/packages/auth/src/useAuth.ts
@@ -6,6 +6,7 @@ import type { AuthContextInterface } from './AuthProvider'
 export const useAuth = (): AuthContextInterface => {
   return React.useContext(AuthContext) as AuthContextInterface
 }
+<<<<<<< HEAD
 
 declare global {
   interface Window {
@@ -20,3 +21,5 @@ declare global {
 }
 
 window.__REDWOOD__USE_AUTH = useAuth
+=======
+>>>>>>> bb1ab34... Add auth package.
diff --git a/yarn.lock b/yarn.lock
index 5bdb35c710cd..a111de7c97ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -61,11 +61,19 @@
     tslib "^1.10.0"
 
 "@apollographql/apollo-tools@^0.4.3":
+<<<<<<< HEAD
   version "0.4.8"
   resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.4.8.tgz#d81da89ee880c2345eb86bddb92b35291f6135ed"
   integrity sha512-W2+HB8Y7ifowcf3YyPHgDI05izyRtOeZ4MqIr7LbTArtmJ0ZHULWpn84SGMW7NAvTV1tFExpHlveHhnXuJfuGA==
   dependencies:
     apollo-env "^0.6.5"
+=======
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.4.7.tgz#6ba9e0fa872128fbfc82a5ded1447fde932a0169"
+  integrity sha512-6QjZz6aLq6QXHgJ1AmSg4C4cBmhF5z3g7LPsk4g+zJoWKxiFuSIbrTe12ETtn6wgPq//e5p2agbXYydIjqs7gw==
+  dependencies:
+    apollo-env "^0.6.4"
+>>>>>>> bb1ab34... Add auth package.
 
 "@apollographql/graphql-playground-html@1.6.24":
   version "1.6.24"
@@ -73,9 +81,15 @@
   integrity sha512-8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ==
 
 "@auth0/auth0-spa-js@^1.7.0":
+<<<<<<< HEAD
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/@auth0/auth0-spa-js/-/auth0-spa-js-1.8.1.tgz#e1be74388c4fe6145259c6ca29da7635a537fbdc"
   integrity sha512-OoeTlFug2COCelF+hxGCWP3I/4S2H4niWp278urpmwC88h/7HFLZFvDrlMAV2tMyUiusMSa2w4lWcb2iXL/6+Q==
+=======
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@auth0/auth0-spa-js/-/auth0-spa-js-1.8.0.tgz#538a6df39551c303d060b9c6e5516d24a6b0e024"
+  integrity sha512-BkabMo/YAJt2XA+vcOmVFQ7syVrA4YWre1YYEQPet2izPDwgJ4IRLuE7mqOs+v74BQjs997tsuSY4/oHAu940Q==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     abortcontroller-polyfill "^1.4.0"
     browser-tabs-lock "^1.2.8"
@@ -389,7 +403,11 @@
     resolve "^1.13.1"
     v8flags "^3.1.1"
 
+<<<<<<< HEAD
 "@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.3.2", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.6":
+=======
+"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.3.2", "@babel/parser@^7.7.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.6":
+>>>>>>> bb1ab34... Add auth package.
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
   integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
@@ -1002,7 +1020,11 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
+<<<<<<< HEAD
 "@babel/template@^7.3.3", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
+=======
+"@babel/template@^7.3.3", "@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
+>>>>>>> bb1ab34... Add auth package.
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
   integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
@@ -1011,7 +1033,11 @@
     "@babel/parser" "^7.8.6"
     "@babel/types" "^7.8.6"
 
+<<<<<<< HEAD
 "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.6", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.9.6":
+=======
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.6", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3", "@babel/traverse@^7.9.6":
+>>>>>>> bb1ab34... Add auth package.
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
   integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
@@ -1334,10 +1360,17 @@
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
 
+<<<<<<< HEAD
 "@lerna/add@3.21.0":
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.21.0.tgz#27007bde71cc7b0a2969ab3c2f0ae41578b4577b"
   integrity sha512-vhUXXF6SpufBE1EkNEXwz1VLW03f177G9uMOFMQkp6OJ30/PWg4Ekifuz9/3YfgB2/GH8Tu4Lk3O51P2Hskg/A==
+=======
+"@lerna/add@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.20.0.tgz#bea7edf36fc93fb72ec34cb9ba854c48d4abf309"
+  integrity sha512-AnH1oRIEEg/VDa3SjYq4x1/UglEAvrZuV0WssHUMN81RTZgQk3we+Mv3qZNddrZ/fBcZu2IAdN/EQ3+ie2JxKQ==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@evocateur/pacote" "^9.6.3"
     "@lerna/bootstrap" "3.21.0"
@@ -2104,6 +2137,7 @@
     once "^1.4.0"
 
 "@octokit/request-error@^2.0.0":
+<<<<<<< HEAD
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.1.tgz#49bd71e811daffd5bdd06ef514ca47b5039682d1"
   integrity sha512-5lqBDJ9/TOehK82VvomQ6zFiZjPeSom8fLkFVLuYL3sKiIb5RB8iN/lenLkY7oBmyQcGP7FBMGiIZTO8jufaRQ==
@@ -2116,6 +2150,24 @@
   version "5.4.3"
   resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.3.tgz#85b78ea4ae6e1c4ac2b02528102d4cd776145935"
   integrity sha512-RtqMzF3mhqxmWoqVD84x2gdtbqn2inTBU/HPkWf5u0R5r7fBTaLPAcCBgukeI2gjTwD9ChL9Cu0MlTBs7B/tSw==
+  dependencies:
+    "@octokit/endpoint" "^6.0.1"
+    "@octokit/request-error" "^2.0.0"
+    "@octokit/types" "^2.11.1"
+=======
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.0.tgz#94ca7293373654400fbb2995f377f9473e00834b"
+  integrity sha512-rtYicB4Absc60rUv74Rjpzek84UbVHGHJRu4fNVlZ1mCcyUPPuzFfG9Rn6sjHrd95DEsmjSt1Axlc699ZlbDkw==
+  dependencies:
+    "@octokit/types" "^2.0.0"
+>>>>>>> bb1ab34... Add auth package.
+    deprecation "^2.0.0"
+    once "^1.4.0"
+
+"@octokit/request@^5.2.0":
+  version "5.4.2"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.2.tgz#74f8e5bbd39dc738a1b127629791f8ad1b3193ee"
+  integrity sha512-zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw==
   dependencies:
     "@octokit/endpoint" "^6.0.1"
     "@octokit/request-error" "^2.0.0"
@@ -2149,6 +2201,7 @@
     universal-user-agent "^4.0.0"
 
 "@octokit/types@^2.0.0", "@octokit/types@^2.0.1", "@octokit/types@^2.11.1":
+<<<<<<< HEAD
   version "2.16.2"
   resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.16.2.tgz#4c5f8da3c6fecf3da1811aef678fda03edac35d2"
   integrity sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==
@@ -2159,6 +2212,11 @@
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@octokit/types/-/types-4.0.1.tgz#dd32ff2407699f3a0c909cdd24de17b45b7d7051"
   integrity sha512-Ho6h7w2h9y8RRE8r656hIj1oiSbwbIHJGF5r9G5FOwS2VdDPq8QLGvsG4x6pKHpvyGK7j+43sAc2cJKMiFoIJw==
+=======
+  version "2.12.2"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.12.2.tgz#e9fbffa294adb54140946d436da9f73bc94b169c"
+  integrity sha512-1GHLI/Jll3j6F0GbYyZPFTcHZMGjAiRfkTEoRUyaVVk2IWbDdwEiClAJvXzfXCDayuGSNCqAUH8lpjZtqW9GDw==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@types/node" ">= 8"
 
@@ -2179,6 +2237,7 @@
   dependencies:
     debug "^4.1.1"
 
+<<<<<<< HEAD
 "@prisma/engine-core@2.0.0-beta.6":
   version "2.0.0-beta.6"
   resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-2.0.0-beta.6.tgz#e93b1c09dce22189a0db5141f1bfc4061a3c13f8"
@@ -2187,6 +2246,15 @@
     "@prisma/debug" "2.0.0-beta.6"
     "@prisma/generator-helper" "2.0.0-beta.6"
     "@prisma/get-platform" "2.0.0-beta.6"
+=======
+"@prisma/engine-core@2.0.0-beta.4":
+  version "2.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-2.0.0-beta.4.tgz#471e861a2fb16a0e5481808b1ff0d706b994685d"
+  integrity sha512-XJrhfhRaSN1kJQMjX1xmEHiooPtZXEcbXpgGTVPia8WLUo5buvnOIYL4qP5Cv0WSS4PSW68DChi+XlyGSlGNUg==
+  dependencies:
+    "@prisma/generator-helper" "2.0.0-beta.4"
+    "@prisma/get-platform" "2.0.0-beta.4"
+>>>>>>> bb1ab34... Add auth package.
     bent "^7.1.2"
     chalk "^3.0.0"
     cross-fetch "^3.0.4"
@@ -2197,6 +2265,7 @@
     terminal-link "^2.1.1"
     undici mcollina/undici
 
+<<<<<<< HEAD
 "@prisma/fetch-engine@2.0.0-beta.6":
   version "2.0.0-beta.6"
   resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-2.0.0-beta.6.tgz#d92523eb020c8f231d289e3d968261dea47e26b9"
@@ -2204,6 +2273,14 @@
   dependencies:
     "@prisma/debug" "2.0.0-beta.6"
     "@prisma/get-platform" "2.0.0-beta.6"
+=======
+"@prisma/fetch-engine@2.0.0-beta.4":
+  version "2.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-2.0.0-beta.4.tgz#e3fdc4b25e52fe72774d9ebda82adeebdf1ee33c"
+  integrity sha512-B9kPy0JhTKPoKol5uvs/832eyRZYoVf+hRbXrEbImULmz1nojk1Rv8fBLd/MVZ+cyvdgSlYeTPR2ZBTMTP1Kgg==
+  dependencies:
+    "@prisma/get-platform" "2.0.0-beta.4"
+>>>>>>> bb1ab34... Add auth package.
     chalk "^4.0.0"
     execa "^4.0.0"
     find-cache-dir "^3.3.1"
@@ -2220,10 +2297,17 @@
     rimraf "^3.0.2"
     tempy "^0.5.0"
 
+<<<<<<< HEAD
 "@prisma/generator-helper@2.0.0-beta.6":
   version "2.0.0-beta.6"
   resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-2.0.0-beta.6.tgz#daec76333406dcae0b6e69f3a7eb7ae48f002906"
   integrity sha512-i6fkmyKD3VSnAOD6a7Py1ANrBpg1TvLKu4xw9smONi+JnNUxXGFM89/hl/SaNx4YOqh4K8EQOVQYISFO+yqAew==
+=======
+"@prisma/generator-helper@2.0.0-beta.4":
+  version "2.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-2.0.0-beta.4.tgz#937ecfe49ac19cb2fe8d42282a0dba26d0431bb2"
+  integrity sha512-z4Q6vNntvkMnG15KOTWMlHrX1QBIF6Dy2gtBvgHNmrcRhhWqQLpRFs8+MffJL4TiA6/nPu0WaAOiwF3eA+7ovg==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@prisma/debug" "2.0.0-beta.6"
     "@types/cross-spawn" "^6.0.1"
@@ -2231,13 +2315,21 @@
     cross-spawn "^7.0.2"
     isbinaryfile "^4.0.6"
 
+<<<<<<< HEAD
 "@prisma/get-platform@2.0.0-beta.6":
   version "2.0.0-beta.6"
   resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-2.0.0-beta.6.tgz#7a3be5601bc69060416f6a623640e6fcbdf2d68b"
   integrity sha512-EohZpMtpIykc2S91EDfIYv+AiJ4Gifus1AMpfu6BSvV3EgVONJE9NcIFwjkHn24eLCYT742O1YgCe/W2ei+SIw==
+=======
+"@prisma/get-platform@2.0.0-beta.4":
+  version "2.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-2.0.0-beta.4.tgz#df019aca3c590c51382b1717bba404e389cd6697"
+  integrity sha512-usfvR2jxDghh0volcHl7st1ebJMn1vvJA8J0ZQWsspU/El+m6XR6hF3s9ORvlBh2nLIQPdhexFiOPAxp4c4FjQ==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@prisma/debug" "2.0.0-beta.6"
 
+<<<<<<< HEAD
 "@prisma/sdk@^2.0.0-beta.6":
   version "2.0.0-beta.6"
   resolved "https://registry.yarnpkg.com/@prisma/sdk/-/sdk-2.0.0-beta.6.tgz#965f637365467447583220c228ec8c92a8f2598a"
@@ -2249,6 +2341,18 @@
     "@prisma/fetch-engine" "2.0.0-beta.6"
     "@prisma/generator-helper" "2.0.0-beta.6"
     "@prisma/get-platform" "2.0.0-beta.6"
+=======
+"@prisma/sdk@^2.0.0-beta.3":
+  version "2.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@prisma/sdk/-/sdk-2.0.0-beta.4.tgz#41414edaa8f04bf18122063b93377838553354f8"
+  integrity sha512-zE1Rkjm923NopMFcWVuxCYRU8B7UUepIluD5oKc5626WxUeidFmvxnsp5YUSnqikivpu1hd22tM/jGKqOSO//A==
+  dependencies:
+    "@apexearth/copy" "^1.4.5"
+    "@prisma/engine-core" "2.0.0-beta.4"
+    "@prisma/fetch-engine" "2.0.0-beta.4"
+    "@prisma/generator-helper" "2.0.0-beta.4"
+    "@prisma/get-platform" "2.0.0-beta.4"
+>>>>>>> bb1ab34... Add auth package.
     archiver "^3.1.1"
     arg "^4.1.3"
     chalk "3.0.0"
@@ -2386,6 +2490,7 @@
   integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 
 "@sinonjs/commons@^1.7.0":
+<<<<<<< HEAD
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
   integrity sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==
@@ -2396,6 +2501,25 @@
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-1.5.0.tgz#b9dbe6ebfb86e67ffabf29d4e0d28a52670ac456"
   integrity sha512-+Qo+IO3YOXWgazlo+CKxOuWFLQQdaNCJ9cSfhFQd687/FuesaIxWdInaAdfpsLScq0c6M1ieZslXgiZELSzxbg==
+=======
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2"
+  integrity sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==
+  dependencies:
+    type-detect "4.0.8"
+
+"@szmarczak/http-timer@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
+  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+  dependencies:
+    defer-to-connect "^1.0.1"
+
+"@testing-library/dom@^7.2.2":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.2.2.tgz#30ab09cca132fe49b2ca61ccd9ed785c5f0a6fc5"
+  integrity sha512-g+gT//COYh2FgRrlgcgdkifkjqSk7wQIS7F8jbrf6yoEsh85PJUJ/QtO0bJ9QU7pQPYQgKcgqNJsOs0dlyFYag==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     tslib "^1.9.3"
 
@@ -2611,10 +2735,17 @@
     dom-accessibility-api "^0.4.4"
     pretty-format "^25.5.0"
 
+<<<<<<< HEAD
 "@testing-library/jest-dom@^5.8.0":
   version "5.8.0"
   resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.8.0.tgz#815e830129c4dda6c8e9a725046397acec523669"
   integrity sha512-9Y4FxYIxfwHpUyJVqI8EOfDP2LlEBqKwXE3F+V8ightji0M2rzQB+9kqZ5UJxNs+9oXJIgvYj7T3QaXLNHVDMw==
+=======
+"@testing-library/jest-dom@^5.3.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.5.0.tgz#4707023e8f572021e8a84f65721303ff60828d88"
+  integrity sha512-7sWHrpxG4Yd8TmryI7Rtbx8Ff4mbs3ASye3oshQIuHvsCR+QHgr7rTR/PfeXvOmwUwR36wSTTAvrLKsPmr6VEQ==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@types/testing-library__jest-dom" "^5.0.2"
@@ -2626,7 +2757,11 @@
     lodash "^4.17.15"
     redent "^3.0.0"
 
+<<<<<<< HEAD
 "@testing-library/react@^10.0.4":
+=======
+"@testing-library/react@^10.0.1":
+>>>>>>> bb1ab34... Add auth package.
   version "10.0.4"
   resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-10.0.4.tgz#8e0e299cd91acc626d81ed8489fdc13df864c31d"
   integrity sha512-2e1B5debfuiIGbvUuiSXybskuh7ZTVJDDvG/IxlzLOY9Co/mKFj9hIklAe2nGZYcOUxFaiqWrRZ9vCVGzJfRlQ==
@@ -2663,6 +2798,7 @@
   version "8.10.51"
   resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.51.tgz#7ad774507a3cf1d2e949ca305380c23b5af635a0"
   integrity sha512-XK7RerpXj4r+IO0r7qIeNqUSU6L4qhPMwNhISxozJJiUX/jdXj9WYzTShRVisEcUQHXgJ4TTBqTArM8f9Mjb8g==
+<<<<<<< HEAD
 
 "@types/babel-core@^6.25.6":
   version "6.25.6"
@@ -2711,6 +2847,10 @@
   integrity sha512-dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ==
 
 "@types/babel__core@*", "@types/babel__core@^7.1.7":
+=======
+
+"@types/babel__core@^7.1.7":
+>>>>>>> bb1ab34... Add auth package.
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
   integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==
@@ -2822,6 +2962,7 @@
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
+<<<<<<< HEAD
 "@types/express-jwt@0.0.42":
   version "0.0.42"
   resolved "https://registry.yarnpkg.com/@types/express-jwt/-/express-jwt-0.0.42.tgz#4f04e1fadf9d18725950dc041808a4a4adf7f5ae"
@@ -2834,6 +2975,12 @@
   version "4.17.7"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.7.tgz#dfe61f870eb549dc6d7e12050901847c7d7e915b"
   integrity sha512-EMgTj/DF9qpgLXyc+Btimg+XoH7A2liE8uKul8qSmMTHCeNYzydDKFdsJskDvw42UsesCnhO63dO0Grbj8J4Dw==
+=======
+"@types/express-serve-static-core@*":
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.5.tgz#a00ac7dadd746ae82477443e4d480a6a93ea083c"
+  integrity sha512-578YH5Lt88AKoADy0b2jQGwJtrBxezXtVe/MBqWXKZpqx91SnC0pVkVCcxcytz3lWW+cHBYDi3Ysh0WXc+rAYw==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -2903,6 +3050,7 @@
     "@types/koa" "*"
     graphql "^14.5.3"
 
+<<<<<<< HEAD
 "@types/hosted-git-info@^2.7.0":
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/@types/hosted-git-info/-/hosted-git-info-2.7.0.tgz#5199b4df62d53f51d60520d61513eaa4b2dd3d3d"
@@ -2912,6 +3060,12 @@
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz#551a4589b6ee2cc9c1dff08056128aec29b94880"
   integrity sha512-iYCgjm1dGPRuo12+BStjd1HiVQqhlRhWDOQigNxn023HcjnhsiFz9pc6CzJj4HwDCSQca9bxTL4PxJDbkdm3PA==
+=======
+"@types/html-minifier-terser@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.0.0.tgz#7532440c138605ced1b555935c3115ddd20e8bef"
+  integrity sha512-q95SP4FdkmF0CwO0F2q0H6ZgudsApaY/yCtAQNRn1gduef5fGpyEphzy0YCq/N0UFvDSnLg5V8jFK/YGXlDiCw==
+>>>>>>> bb1ab34... Add auth package.
 
 "@types/http-assert@*":
   version "1.5.1"
@@ -2939,6 +3093,7 @@
     "@types/istanbul-lib-report" "*"
 
 "@types/jest@*", "@types/jest@^25.1.4":
+<<<<<<< HEAD
   version "25.2.3"
   resolved "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.3.tgz#33d27e4c4716caae4eced355097a47ad363fdcaf"
   integrity sha512-JXc1nK/tXHiDhV55dvfzqtmP4S3sy3T3ouV2tkViZgxY/zeUkcpQcQPGRlgF4KmWzWW5oiWYSZwtCB+2RsE4Fw==
@@ -2950,6 +3105,14 @@
   version "3.12.4"
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.4.tgz#7d3b534ec35a0585128e2d332db1403ebe057e25"
   integrity sha512-fYMgzN+9e28R81weVN49inn/u798ruU91En1ZnGvSZzCRc5jXx9B2EDhlRaWmcO1RIxFHL8AajRXzxDuJu93+A==
+=======
+  version "25.2.1"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.1.tgz#9544cd438607955381c1bdbdb97767a249297db5"
+  integrity sha512-msra1bCaAeEdkSyA0CZ6gW1ukMIvZ5YoJkdXw/qhQdsuuDlFTcEUrUw8CLCPt2rVRUfXlClVvK2gvPs9IokZaA==
+  dependencies:
+    jest-diff "^25.2.1"
+    pretty-format "^25.2.1"
+>>>>>>> bb1ab34... Add auth package.
 
 "@types/json-schema@^7.0.3":
   version "7.0.4"
@@ -3003,9 +3166,15 @@
     "@types/lodash" "*"
 
 "@types/lodash@*":
+<<<<<<< HEAD
   version "4.14.152"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.152.tgz#7e7679250adce14e749304cdb570969f77ec997c"
   integrity sha512-Vwf9YF2x1GE3WNeUMjT5bTHa2DqgUo87ocdgTScupY2JclZ5Nn7W2RLM/N0+oreexUk8uaVugR81NnTY/jNNXg==
+=======
+  version "4.14.150"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.150.tgz#649fe44684c3f1fcb6164d943c5a61977e8cf0bd"
+  integrity sha512-kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w==
+>>>>>>> bb1ab34... Add auth package.
 
 "@types/long@^4.0.0":
   version "4.0.1"
@@ -3041,7 +3210,19 @@
   dependencies:
     "@types/express" "*"
 
+<<<<<<< HEAD
 "@types/node-fetch@2.5.7", "@types/node-fetch@^2.5.5":
+=======
+"@types/node-fetch@2.5.6":
+  version "2.5.6"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.6.tgz#df8377a66e64ddf75b65b072e37b3c5c5425a96f"
+  integrity sha512-2w0NTwMWF1d3NJMK0Uiq2UNN8htVCyOWOD0jIPjPgC5Ph/YP4dVhs9YxxcMcuLuwAslz0dVEcZQUaqkLs3IzOQ==
+  dependencies:
+    "@types/node" "*"
+    form-data "^3.0.0"
+
+"@types/node-fetch@^2.5.5":
+>>>>>>> bb1ab34... Add auth package.
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
   integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
@@ -3049,6 +3230,7 @@
     "@types/node" "*"
     form-data "^3.0.0"
 
+<<<<<<< HEAD
 "@types/node@*", "@types/node@>= 8", "@types/node@>=6":
   version "14.0.5"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.5.tgz#3d03acd3b3414cf67faf999aed11682ed121f22b"
@@ -3068,6 +3250,17 @@
   version "6.14.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.10.tgz#d9ce598127eb0cc02821476862d11389cb01f6a4"
   integrity sha512-pF4HjZGSog75kGq7B1InK/wt/N08BuPATo+7HRfv7gZUzccebwv/fmWVGs/j6LvSiLWpCuGGhql51M/wcQsNzA==
+=======
+"@types/node@*", "@types/node@>= 8", "@types/node@>=6", "@types/node@^13.9.5":
+  version "13.13.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.4.tgz#1581d6c16e3d4803eb079c87d4ac893ee7501c2c"
+  integrity sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==
+
+"@types/node@^10.1.0":
+  version "10.17.21"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.21.tgz#c00e9603399126925806bed2d9a1e37da506965e"
+  integrity sha512-PQKsydPxYxF1DsAFWmunaxd3sOi3iMt6Zmx/tgaagHYmwJ/9cRH91hQkeJZaUGWbvn0K5HlSVEXkn5U/llWPpQ==
+>>>>>>> bb1ab34... Add auth package.
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -3095,15 +3288,22 @@
   integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
 
 "@types/qs@*", "@types/qs@^6.9.1":
+<<<<<<< HEAD
   version "6.9.3"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.3.tgz#b755a0934564a200d3efdf88546ec93c369abd03"
   integrity sha512-7s9EQWupR1fTc2pSMtXRQ9w9gLOcrJn+h7HOXw4evxyvVqMi4f+q7d2tnFe3ng3SNHjtK+0EzGMGFUQX4/AQRA==
+=======
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.1.tgz#937fab3194766256ee09fcd40b781740758617e7"
+  integrity sha512-lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw==
+>>>>>>> bb1ab34... Add auth package.
 
 "@types/range-parser@*":
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
   integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
 
+<<<<<<< HEAD
 "@types/react-dom@*", "@types/react-dom@16.9.8":
   version "16.9.8"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423"
@@ -3115,6 +3315,19 @@
   version "16.9.35"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368"
   integrity sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ==
+=======
+"@types/react-dom@*", "@types/react-dom@16.9.7":
+  version "16.9.7"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.7.tgz#60844d48ce252d7b2dccf0c7bb937130e27c0cd2"
+  integrity sha512-GHTYhM8/OwUCf254WO5xqR/aqD3gC9kSTLpopWGpQLpnw23jk44RvMHsyUSEplvRJZdHxhJGMMLF0kCPYHPhQA==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react@*", "@types/react@16.9.34":
+  version "16.9.34"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz#f7d5e331c468f53affed17a8a4d488cd44ea9349"
+  integrity sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
@@ -3164,7 +3377,11 @@
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.5.tgz#9adbc12950582aa65ead76bffdf39fe0c27a3c02"
   integrity sha512-/gG2M/Imw7cQFp8PGvz/SwocNrmKFjFsm5Pb8HdbHkZ1K8pmuPzOX4VeVoiEecFCVf4CsN1r3/BRvx+6sNqwtQ==
 
+<<<<<<< HEAD
 "@types/testing-library__dom@*":
+=======
+"@types/testing-library__dom@*", "@types/testing-library__dom@^7.0.0":
+>>>>>>> bb1ab34... Add auth package.
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-7.0.2.tgz#2906f8a0dce58b0746c6ab606f786bd06fe6940e"
   integrity sha512-8yu1gSwUEAwzg2OlPNbGq+ixhmSviGurBu1+ivxRKq1eRcwdjkmlwtPvr9VhuxTq2fNHBWN2po6Iem3Xt5A6rg==
@@ -3172,9 +3389,15 @@
     pretty-format "^25.1.0"
 
 "@types/testing-library__jest-dom@^5.0.2":
+<<<<<<< HEAD
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.7.0.tgz#078790bf4dc89152a74428591a228ec5f9433251"
   integrity sha512-LoZ3uonlnAbJUz4bg6UoeFl+frfndXngmkCItSjJ8DD5WlRfVqPC5/LgJASsY/dy7AHH2YJ7PcsdASOydcVeFA==
+=======
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.0.3.tgz#8efef348eeedc62e7de21acbe455a779936417c4"
+  integrity sha512-NdbKc6yseg6uq4UJFwimPws0iwsGugVbPoOTP2EH+PJMJKiZsoSg5F2H3XYweOyytftCOuIMuXifBUrF9CSvaQ==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@types/jest" "*"
 
@@ -3204,9 +3427,15 @@
     source-map "^0.6.1"
 
 "@types/webpack@^4.41.11", "@types/webpack@^4.41.8":
+<<<<<<< HEAD
   version "4.41.13"
   resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.13.tgz#988d114c8913d039b8a0e0502a7fe4f1f84f3d5e"
   integrity sha512-RYmIHOWSxnTTa765N6jJBVE45pd2SYNblEYshVDduLw6RhocazNmRzE5/ytvBD8IkDMH6DI+bcrqxh8NILimBA==
+=======
+  version "4.41.12"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.12.tgz#0386ee2a2814368e2f2397abb036c0bf173ff6c3"
+  integrity sha512-BpCtM4NnBen6W+KEhrL9jKuZCXVtiH6+0b6cxdvNt2EwU949Al334PjQSl2BeAyvAX9mgoNNG21wvjP3xZJJ5w==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@types/anymatch" "*"
     "@types/node" "*"
@@ -3235,9 +3464,15 @@
   integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
 "@types/yargs@^15.0.0":
+<<<<<<< HEAD
   version "15.0.5"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79"
   integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==
+=======
+  version "15.0.4"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299"
+  integrity sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -3247,15 +3482,24 @@
   integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==
 
 "@typescript-eslint/eslint-plugin@^2.27.0":
+<<<<<<< HEAD
   version "2.34.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz#6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9"
   integrity sha512-4zY3Z88rEE99+CNvTbXSyovv2z9PNOVffTWD2W8QF5s2prBQtwN2zadqERcrHpcR7O/+KMI3fcTAmUUhK/iQcQ==
   dependencies:
     "@typescript-eslint/experimental-utils" "2.34.0"
+=======
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.30.0.tgz#312a37e80542a764d96e8ad88a105316cdcd7b05"
+  integrity sha512-PGejii0qIZ9Q40RB2jIHyUpRWs1GJuHP1pkoCiaeicfwO9z7Fx03NQzupuyzAmv+q9/gFNHu7lo1ByMXe8PNyg==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "2.30.0"
+>>>>>>> bb1ab34... Add auth package.
     functional-red-black-tree "^1.0.1"
     regexpp "^3.0.0"
     tsutils "^3.17.1"
 
+<<<<<<< HEAD
 "@typescript-eslint/experimental-utils@2.34.0":
   version "2.34.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"
@@ -3263,10 +3507,20 @@
   dependencies:
     "@types/json-schema" "^7.0.3"
     "@typescript-eslint/typescript-estree" "2.34.0"
+=======
+"@typescript-eslint/experimental-utils@2.30.0":
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.30.0.tgz#9845e868c01f3aed66472c561d4b6bac44809dd0"
+  integrity sha512-L3/tS9t+hAHksy8xuorhOzhdefN0ERPDWmR9CclsIGOUqGKy6tqc/P+SoXeJRye5gazkuPO0cK9MQRnolykzkA==
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/typescript-estree" "2.30.0"
+>>>>>>> bb1ab34... Add auth package.
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
 "@typescript-eslint/parser@^2.27.0":
+<<<<<<< HEAD
   version "2.34.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.34.0.tgz#50252630ca319685420e9a39ca05fe185a256bc8"
   integrity sha512-03ilO0ucSD0EPTw2X4PntSIRFtDPWjrVq7C3/Z3VQHRC7+13YB55rcJI3Jt+YgeHbjUdJPcPa7b23rXCBokuyA==
@@ -3280,6 +3534,21 @@
   version "2.34.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5"
   integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==
+=======
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.30.0.tgz#7681c305a6f4341ae2579f5e3a75846c29eee9ce"
+  integrity sha512-9kDOxzp0K85UnpmPJqUzdWaCNorYYgk1yZmf4IKzpeTlSAclnFsrLjfwD9mQExctLoLoGAUXq1co+fbr+3HeFw==
+  dependencies:
+    "@types/eslint-visitor-keys" "^1.0.0"
+    "@typescript-eslint/experimental-utils" "2.30.0"
+    "@typescript-eslint/typescript-estree" "2.30.0"
+    eslint-visitor-keys "^1.1.0"
+
+"@typescript-eslint/typescript-estree@2.30.0":
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.30.0.tgz#1b8e848b55144270255ffbfe4c63291f8f766615"
+  integrity sha512-nI5WOechrA0qAhnr+DzqwmqHsx7Ulr/+0H7bWCcClDhhWkSyZR5BmTvnBEyONwJCTWHfc5PAQExX24VD26IAVw==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     debug "^4.1.1"
     eslint-visitor-keys "^1.1.0"
@@ -3588,7 +3857,11 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
+<<<<<<< HEAD
 ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.11.0, ajv@^6.12.0, ajv@^6.5.5:
+=======
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5:
+>>>>>>> bb1ab34... Add auth package.
   version "6.12.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
   integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
@@ -3598,12 +3871,12 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.11.0, ajv@^6.12.0, ajv@^6.5.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ansi-align@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
-  integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=
+ansi-align@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
+  integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==
   dependencies:
-    string-width "^2.0.0"
+    string-width "^3.0.0"
 
 ansi-align@^3.0.0:
   version "3.0.0"
@@ -3720,6 +3993,7 @@ apollo-boost@0.4.7:
     ts-invariant "^0.4.0"
     tslib "^1.10.0"
 
+<<<<<<< HEAD
 apollo-cache-control@^0.10.1-alpha.0:
   version "0.10.1-alpha.0"
   resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.10.1-alpha.0.tgz#3547ebb1a6a49dd822800b86c3bf27c618abdf20"
@@ -3727,6 +4001,15 @@ apollo-cache-control@^0.10.1-alpha.0:
   dependencies:
     apollo-server-env "^2.4.4-alpha.0"
     graphql-extensions "^0.12.1-alpha.0"
+=======
+apollo-cache-control@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.9.1.tgz#2af4c53ef697a87808285a25f2b93ca0f183880c"
+  integrity sha512-9t2EcRevUrANuGhF5XUbKJEfnc6Jy2Rn7Y8nOIKlsEEC+AX7Ko4svWYTyyTxj0h0RXfiegY2nbz4sVry/pS3rA==
+  dependencies:
+    apollo-server-env "^2.4.3"
+    graphql-extensions "^0.11.1"
+>>>>>>> bb1ab34... Add auth package.
 
 apollo-cache-inmemory@^1.6.5:
   version "1.6.6"
@@ -3776,10 +4059,17 @@ apollo-engine-reporting-protobuf@^0.4.4:
   dependencies:
     "@apollo/protobufjs" "^1.0.3"
 
+<<<<<<< HEAD
 apollo-engine-reporting-protobuf@^0.5.1-alpha.0:
   version "0.5.1-alpha.1"
   resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1-alpha.1.tgz#d946a1943c52b2886dda911d54d9c9f3e33584e6"
   integrity sha512-c533X6iGOTKvwWwoeb+6SXEgJBCMnKGBzSUfVgLdTHJpy41VDvVteRzCWa+JwblM66LiZasxzkQXOpm5OC49MA==
+=======
+apollo-engine-reporting@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.7.1.tgz#469d9711507ef4c3b03f193a9b422ecf7ecff7e9"
+  integrity sha512-9ykddPxlC95R9CkkJaPaGriRbOGfzeKqqPXRAunyX1h4sG/8g+MJ/gGzmnNf63k6RvRUdRENCE83wPk2OeU+2A==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@apollo/protobufjs" "^1.0.3"
 
@@ -3791,6 +4081,7 @@ apollo-engine-reporting@^1.8.1-alpha.0:
     apollo-engine-reporting-protobuf "^0.5.1-alpha.0"
     apollo-graphql "^0.4.0"
     apollo-server-caching "^0.5.1"
+<<<<<<< HEAD
     apollo-server-env "^2.4.4-alpha.0"
     apollo-server-errors "^2.4.1"
     apollo-server-types "^0.4.1-alpha.0"
@@ -3803,16 +4094,38 @@ apollo-env@^0.6.5:
   integrity sha512-jeBUVsGymeTHYWp3me0R2CZRZrFeuSZeICZHCeRflHTfnQtlmbSXdy5E0pOyRM9CU4JfQkKDC98S1YglQj7Bzg==
   dependencies:
     "@types/node-fetch" "2.5.7"
+=======
+    apollo-server-env "^2.4.3"
+    apollo-server-errors "^2.4.1"
+    apollo-server-types "^0.3.1"
+    async-retry "^1.2.1"
+    graphql-extensions "^0.11.1"
+
+apollo-env@^0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.6.4.tgz#c5b9b2510428df5257846c0d96c9c907269d4b1f"
+  integrity sha512-8tGDMFv3sZLd76b/ZAo8GbdWU5Qt3VEUWSB+FLN41p/hVShZw0XIo2s/i8pVCTAhaWiEiD0Cr+d/zi0/h5UTxA==
+  dependencies:
+    "@types/node-fetch" "2.5.6"
+>>>>>>> bb1ab34... Add auth package.
     core-js "^3.0.1"
     node-fetch "^2.2.0"
     sha.js "^2.4.11"
 
 apollo-graphql@^0.4.0:
+<<<<<<< HEAD
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.4.4.tgz#25f456b28a4419bb6a42071f8a56e19e15bb80be"
   integrity sha512-i012iRKT5nfsOaNMx4MTwHw2jrlyaF1zikpejxsGHsKIf3OngGvGh3pyw20bEmwj413OrNQpRxvvIz5A7W/8xw==
   dependencies:
     apollo-env "^0.6.5"
+=======
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.4.3.tgz#cd25641d4151c931743cc1870a9d4be9f42b556f"
+  integrity sha512-eAl8w6TeuY0Q3x7TVqBjt4JObA34vUyctuDn2lOmkdIqlu1EKxNAnTlRtXkjQM89qUt0rK0teU8No0a2lMNGuw==
+  dependencies:
+    apollo-env "^0.6.4"
+>>>>>>> bb1ab34... Add auth package.
     lodash.sortby "^4.7.0"
 
 apollo-link-error@^1.0.3:
@@ -3860,13 +4173,20 @@ apollo-server-caching@^0.5.1:
     lru-cache "^5.0.0"
 
 apollo-server-core@^2.11.0:
+<<<<<<< HEAD
   version "2.13.1"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.13.1.tgz#eac223696ae9da5f4990273ea89c74b77af0e156"
   integrity sha512-4jKF0VbpoxprhcruaGoHG5ScrquSSkQ/LVFrOLp/ukUFuooLEMb1O18tAQdgVahkNgLkRKdNJYLLyoQoj+i3dA==
+=======
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.12.0.tgz#980f29788c17f029e7248d331bee1ad2e1f07e5b"
+  integrity sha512-BRVdOyZrRJ1ALlmis0vaOLIHHYu5K3UVKAQKIgHkRh/YY0Av4lpeEXr49ELK04LTeh0DG0pQ5YYYhaX1wFcDEw==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@apollographql/apollo-tools" "^0.4.3"
     "@apollographql/graphql-playground-html" "1.6.24"
     "@types/graphql-upload" "^8.0.0"
+<<<<<<< HEAD
     "@types/ws" "^7.0.0"
     apollo-cache-control "^0.10.1-alpha.0"
     apollo-datasource "^0.7.1-alpha.0"
@@ -3879,6 +4199,20 @@ apollo-server-core@^2.11.0:
     apollo-tracing "^0.10.1-alpha.0"
     fast-json-stable-stringify "^2.0.0"
     graphql-extensions "^0.12.1-alpha.0"
+=======
+    "@types/ws" "^6.0.0"
+    apollo-cache-control "^0.9.1"
+    apollo-datasource "^0.7.0"
+    apollo-engine-reporting "^1.7.1"
+    apollo-server-caching "^0.5.1"
+    apollo-server-env "^2.4.3"
+    apollo-server-errors "^2.4.1"
+    apollo-server-plugin-base "^0.7.1"
+    apollo-server-types "^0.3.1"
+    apollo-tracing "^0.9.1"
+    fast-json-stable-stringify "^2.0.0"
+    graphql-extensions "^0.11.1"
+>>>>>>> bb1ab34... Add auth package.
     graphql-tag "^2.9.2"
     graphql-tools "^4.0.0"
     graphql-upload "^8.0.2"
@@ -3895,6 +4229,7 @@ apollo-server-env@^2.4.3:
     node-fetch "^2.1.2"
     util.promisify "^1.0.0"
 
+<<<<<<< HEAD
 apollo-server-env@^2.4.4-alpha.0:
   version "2.4.4-alpha.0"
   resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.4-alpha.0.tgz#56e860b6af116cdbd05fc4bfe51d5851bde2413e"
@@ -3903,6 +4238,8 @@ apollo-server-env@^2.4.4-alpha.0:
     node-fetch "^2.1.2"
     util.promisify "^1.0.0"
 
+=======
+>>>>>>> bb1ab34... Add auth package.
 apollo-server-errors@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.4.1.tgz#16ad49de6c9134bfb2b7dede9842e73bb239dbe2"
@@ -3920,6 +4257,7 @@ apollo-server-lambda@2.11.0:
     apollo-server-types "^0.3.0"
     graphql-tools "^4.0.0"
 
+<<<<<<< HEAD
 apollo-server-plugin-base@^0.8.1-alpha.0:
   version "0.8.1-alpha.0"
   resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.8.1-alpha.0.tgz#79dc1e7996a9cfc627d89b7f24d29b6174c5cd2e"
@@ -3928,6 +4266,16 @@ apollo-server-plugin-base@^0.8.1-alpha.0:
     apollo-server-types "^0.4.1-alpha.0"
 
 apollo-server-types@^0.3.0:
+=======
+apollo-server-plugin-base@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.7.1.tgz#998d035723c5993171fd5aff3dbe7d2661db1a96"
+  integrity sha512-PRavvoWq7/Xufqc+qkDQg3Aqueq4QrPBFfoCFIjhkJ4n2d2YoqE3gTGccb8YoWusfa62ASMn6R47OdNuVtEbXw==
+  dependencies:
+    apollo-server-types "^0.3.1"
+
+apollo-server-types@^0.3.0, apollo-server-types@^0.3.1:
+>>>>>>> bb1ab34... Add auth package.
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.3.1.tgz#9456e243dad525a78b689246f124a66d7d8ac409"
   integrity sha512-6nX5VC3icOGf1RZIs7/SYQZff+Cl16LQu1FHUOIk9gAMN2XjlRCyJgCeMj5YHJzQ8Mhg4BO0weWuydEg+JxLzg==
@@ -3936,6 +4284,7 @@ apollo-server-types@^0.3.0:
     apollo-server-caching "^0.5.1"
     apollo-server-env "^2.4.3"
 
+<<<<<<< HEAD
 apollo-server-types@^0.4.1-alpha.0:
   version "0.4.1-alpha.0"
   resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.4.1-alpha.0.tgz#b74b8ebc85d4ffb62c083b1628199e57aa1e9b51"
@@ -3944,6 +4293,25 @@ apollo-server-types@^0.4.1-alpha.0:
     apollo-engine-reporting-protobuf "^0.5.1-alpha.0"
     apollo-server-caching "^0.5.1"
     apollo-server-env "^2.4.4-alpha.0"
+=======
+apollo-tracing@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.9.1.tgz#c481be727550c73fda53d20d798cbe4ad67c61bd"
+  integrity sha512-4wVNM6rc70XhwWxuDWrMBLaHA8NjB9pUS2sNpddQvP36ZtQfsa08XLSUxGAZT+bej+TzW26hKNtuO31RgqC9Hg==
+  dependencies:
+    apollo-server-env "^2.4.3"
+    graphql-extensions "^0.11.1"
+
+apollo-upload-client@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-13.0.0.tgz#146d1ddd85d711fcac8ca97a72d3ca6787f2b71b"
+  integrity sha512-lJ9/bk1BH1lD15WhWRha2J3+LrXrPIX5LP5EwiOUHv8PCORp4EUrcujrA3rI5hZeZygrTX8bshcuMdpqpSrvtA==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+    apollo-link "^1.2.12"
+    apollo-link-http-common "^0.2.14"
+    extract-files "^8.0.0"
+>>>>>>> bb1ab34... Add auth package.
 
 apollo-tracing@^0.10.1-alpha.0:
   version "0.10.1-alpha.0"
@@ -4404,6 +4772,7 @@ babel-plugin-module-resolver@^4.0.0:
     resolve "^1.13.1"
 
 babel-plugin-tester@^9.0.0, babel-plugin-tester@^9.0.1:
+<<<<<<< HEAD
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-tester/-/babel-plugin-tester-9.1.0.tgz#9c917ed8a898d65fe4c5e3035882be2a866212d2"
   integrity sha512-F+wlG1b+sN3Bwav8uMcd3Q9QAxtwMaZQ29u0r0UgP3u0T/Ws56dNoSo0Guy6GoCEXo4jc9/udh4HqdMIbSZGDA==
@@ -4436,6 +4805,8 @@ babel-preset-jest@^25.5.0:
   integrity sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==
 =======
 babel-plugin-tester@^9.0.1:
+=======
+>>>>>>> bb1ab34... Add auth package.
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-tester/-/babel-plugin-tester-9.0.1.tgz#9e975a7fe278a49b3bd4b02bd3a77004819863ee"
   integrity sha512-q5GXJowxsRefBDhgiZVyNPgIIHsfxtZNnMABxq+vtuoYP2JW8qaiIBBAG9/I0PgRGRpjUDXnn0IhGHGGn7UOcA==
@@ -4444,6 +4815,7 @@ babel-plugin-tester@^9.0.1:
     prettier "^2.0.1"
     strip-indent "^3.0.0"
 
+<<<<<<< HEAD
 babel-preset-jest@^25.2.1:
   version "25.2.1"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.2.1.tgz#4ccd0e577f69aa11b71806edfe8b25a5c3ac93a2"
@@ -4459,6 +4831,31 @@ back@1.0.x:
   integrity sha1-qT9ebOaXKZhNWQGiuxbjsBpNY2k=
   dependencies:
     xtend "^4.0.0"
+=======
+babel-preset-current-node-syntax@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz#fb4a4c51fe38ca60fede1dc74ab35eb843cb41d6"
+  integrity sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw==
+  dependencies:
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-bigint" "^7.8.3"
+    "@babel/plugin-syntax-class-properties" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@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-preset-jest@^25.5.0:
+  version "25.5.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz#c1d7f191829487a907764c65307faa0e66590b49"
+  integrity sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==
+  dependencies:
+    babel-plugin-jest-hoist "^25.5.0"
+    babel-preset-current-node-syntax "^0.1.2"
+>>>>>>> bb1ab34... Add auth package.
 
 backo2@^1.0.2:
   version "1.0.2"
@@ -4623,18 +5020,26 @@ boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
+<<<<<<< HEAD
 boxen@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
   integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==
+=======
+boxen@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
+  integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
-    ansi-align "^2.0.0"
-    camelcase "^4.0.0"
-    chalk "^2.0.1"
-    cli-boxes "^1.0.0"
-    string-width "^2.0.0"
-    term-size "^1.2.0"
-    widest-line "^2.0.0"
+    ansi-align "^3.0.0"
+    camelcase "^5.3.1"
+    chalk "^3.0.0"
+    cli-boxes "^2.2.0"
+    string-width "^4.1.0"
+    term-size "^2.1.0"
+    type-fest "^0.8.1"
+    widest-line "^3.1.0"
 
 boxen@^4.2.0:
   version "4.2.0"
@@ -5019,7 +5424,7 @@ camelcase@^2.0.0, camelcase@^2.0.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
   integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
-camelcase@^4.0.0, camelcase@^4.1.0:
+camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
@@ -5029,6 +5434,7 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
+<<<<<<< HEAD
 camelcase@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
@@ -5039,6 +5445,13 @@ caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001043:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001064.tgz#a0f49689119ba08943b09968e118faf3f645add0"
   integrity sha512-hdBcQMFvJIrOhkpAZiRXz04Cmetwc9NekeuNl0qZfHOugxOhJKxsjF1RmISMPFjIF4PPx1reliIzbfN42EiQ5A==
 
+=======
+caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001043:
+  version "1.0.30001048"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz#4bb4f1bc2eb304e5e1154da80b93dee3f1cf447e"
+  integrity sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==
+
+>>>>>>> bb1ab34... Add auth package.
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -5046,17 +5459,16 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
-capture-stack-trace@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
-  integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
+<<<<<<< HEAD
 chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
+=======
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
+>>>>>>> bb1ab34... Add auth package.
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -5152,7 +5564,11 @@ chokidar@^2.0.4, chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
+<<<<<<< HEAD
 chokidar@^3.2.2, chokidar@^3.3.1, chokidar@^3.4.0:
+=======
+chokidar@^3.2.2, chokidar@^3.3.1:
+>>>>>>> bb1ab34... Add auth package.
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
   integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
@@ -5184,11 +5600,6 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
-ci-info@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
-  integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
-
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
@@ -5224,10 +5635,10 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-cli-boxes@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
-  integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
+cli-boxes@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
+  integrity sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==
 
 cli-boxes@^2.2.0:
   version "2.2.0"
@@ -5732,7 +6143,11 @@ core-js@3.6.4:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
   integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
 
+<<<<<<< HEAD
 core-js@^3.0.1, core-js@^3.2.0, core-js@^3.2.1, core-js@^3.6.4:
+=======
+core-js@^3.0.1, core-js@^3.2.1, core-js@^3.6.4:
+>>>>>>> bb1ab34... Add auth package.
   version "3.6.5"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
   integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
@@ -5786,6 +6201,7 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
+<<<<<<< HEAD
 create-error-class@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
@@ -5794,6 +6210,9 @@ create-error-class@^3.0.0:
     capture-stack-trace "^1.0.0"
 
 create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
+=======
+create-hash@^1.1.0, create-hash@^1.1.2:
+>>>>>>> bb1ab34... Add auth package.
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
@@ -5851,6 +6270,7 @@ cross-spawn@7.0.1:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+<<<<<<< HEAD
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -5860,6 +6280,8 @@ cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+=======
+>>>>>>> bb1ab34... Add auth package.
 cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.2.tgz#d0d7dcfa74e89115c7619f4f721a94e1fdb716d6"
@@ -5886,11 +6308,6 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-random-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
-
 crypto-random-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
@@ -6023,9 +6440,15 @@ date-fns@^1.27.2:
   integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
 date-fns@^2.0.1:
+<<<<<<< HEAD
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.14.0.tgz#359a87a265bb34ef2e38f93ecf63ac453f9bc7ba"
   integrity sha512-1zD+68jhFgDIM0rF05rcwYO8cExdNqxjq4xP1QKM60Q45mnO6zaMWB4tOzrIr4M4GSLntsKeE4c9Bdl2jhL/yw==
+=======
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.12.0.tgz#01754c8a2f3368fc1119cf4625c3dad8c1845ee6"
+  integrity sha512-qJgn99xxKnFgB1qL4jpxU7Q2t0LOn1p8KMIveef3UZD7kqjT3tpFNNdXJelEHhE+rUgffriXriw/sOSU+cS1Hw==
+>>>>>>> bb1ab34... Add auth package.
 
 dateformat@^3.0.0:
   version "3.0.3"
@@ -6389,11 +6812,14 @@ diff-sequences@^25.2.6:
   version "25.2.6"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd"
   integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==
+<<<<<<< HEAD
 
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+=======
+>>>>>>> bb1ab34... Add auth package.
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
@@ -6668,10 +7094,22 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
+<<<<<<< HEAD
 electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.413:
   version "1.3.451"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.451.tgz#0c075af3e2f06d706670bde0279432802ca8c83f"
   integrity sha512-2fvco0F2bBIgqzO8GRP0Jt/91pdrf9KfZ5FsmkYkjERmIJG585cFeFZV4+CO6oTmU3HmCTgfcZuEa7kW8VUh3A==
+=======
+electron-to-chromium@^1.3.247:
+  version "1.3.423"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.423.tgz#1dcc9e54d642dd9b354c6609848abf8ba7b2570f"
+  integrity sha512-jXdnLcawJ/EMdN+j77TC3YyeAWiIjo1U63DFCKrjtLv4cu8ToyoF4HYXtFvkVVHhEtIl7lU1uDd307Xj1/YDjw==
+
+electron-to-chromium@^1.3.413:
+  version "1.3.427"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz#ea43d02908a8c71f47ebb46e09de5a3cf8236f04"
+  integrity sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==
+>>>>>>> bb1ab34... Add auth package.
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -6785,11 +7223,14 @@ env-paths@2.2.0, env-paths@^2.2.0:
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
   integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
 
+<<<<<<< HEAD
 env-variable@0.0.x:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808"
   integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==
 
+=======
+>>>>>>> bb1ab34... Add auth package.
 envinfo@^7.3.1, envinfo@^7.5.1:
   version "7.5.1"
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.5.1.tgz#93c26897225a00457c75e734d354ea9106a72236"
@@ -6977,7 +7418,11 @@ eslint-plugin-jsx-a11y@^6.2.3:
     has "^1.0.3"
     jsx-ast-utils "^2.2.1"
 
+<<<<<<< HEAD
 eslint-plugin-prettier@^3.1.3:
+=======
+eslint-plugin-prettier@^3.1.2:
+>>>>>>> bb1ab34... Add auth package.
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.3.tgz#ae116a0fc0e598fdae48743a4430903de5b4e6ca"
   integrity sha512-+HG5jmu/dN3ZV3T6eCD7a4BlAySdN7mLIbJYo0z1cFQuI+r2DiTJEFeF68ots93PsnrMxbzIZ2S/ieX+mkrBeQ==
@@ -7199,19 +7644,6 @@ exec-sh@^0.3.2:
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
   integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
 
-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@@ -7382,6 +7814,7 @@ extract-files@^8.0.0:
   resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-8.1.0.tgz#46a0690d0fe77411a2e3804852adeaa65cd59288"
   integrity sha512-PTGtfthZK79WUMk+avLmwx3NGdU8+iVFXC2NMGxKsn0MnihOG2lvumj+AZo8CTwTrwjXDgZ5tztbRlEdRjBonQ==
 
+<<<<<<< HEAD
 extract-github@0.0.x:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/extract-github/-/extract-github-0.0.5.tgz#f542536db8c19b983a3bec9db96d2ef2a5ff1a86"
@@ -7397,6 +7830,8 @@ extract-zip@^1.6.7:
     mkdirp "^0.5.4"
     yauzl "^2.10.0"
 
+=======
+>>>>>>> bb1ab34... Add auth package.
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -7471,9 +7906,15 @@ fast-write-atomic@0.2.1:
   integrity sha512-WvJe06IfNYlr+6cO3uQkdKdy3Cb1LlCJSF8zRs2eT8yuhdbSlR9nIt+TgQ92RUxiRrQm+/S7RARnMfCs5iuAjw==
 
 fastq@^1.6.0:
+<<<<<<< HEAD
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
   integrity sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==
+=======
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.7.0.tgz#fcd79a08c5bd7ec5b55cd3f5c4720db551929801"
+  integrity sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     reusify "^1.0.4"
 
@@ -7844,9 +8285,15 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.7:
+<<<<<<< HEAD
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
   integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
+=======
+  version "1.2.12"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz#db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"
+  integrity sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     bindings "^1.5.0"
     nan "^2.12.1"
@@ -7855,6 +8302,7 @@ fsevents@^2.1.2, fsevents@~2.1.2:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
   integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+<<<<<<< HEAD
 
 ftp@~0.3.10:
   version "0.3.10"
@@ -7863,6 +8311,8 @@ ftp@~0.3.10:
   dependencies:
     readable-stream "1.1.x"
     xregexp "2.0.0"
+=======
+>>>>>>> bb1ab34... Add auth package.
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -7965,11 +8415,6 @@ get-stream@^2.2.0:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
-
 get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -8109,12 +8554,12 @@ glob@^6.0.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-dirs@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
-  integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
+global-dirs@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201"
+  integrity sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==
   dependencies:
-    ini "^1.3.4"
+    ini "^1.3.5"
 
 global-dirs@^2.0.1:
   version "2.0.1"
@@ -8247,22 +8692,22 @@ globby@^9.2.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
-got@^6.7.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
-  integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
+got@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
+  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
   dependencies:
-    create-error-class "^3.0.0"
+    "@sindresorhus/is" "^0.14.0"
+    "@szmarczak/http-timer" "^1.1.2"
+    cacheable-request "^6.0.0"
+    decompress-response "^3.3.0"
     duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    is-redirect "^1.0.0"
-    is-retry-allowed "^1.0.0"
-    is-stream "^1.0.0"
-    lowercase-keys "^1.0.0"
-    safe-buffer "^5.0.1"
-    timed-out "^4.0.0"
-    unzip-response "^2.0.1"
-    url-parse-lax "^1.0.0"
+    get-stream "^4.1.0"
+    lowercase-keys "^1.0.1"
+    mimic-response "^1.0.1"
+    p-cancelable "^1.0.0"
+    to-readable-stream "^1.0.0"
+    url-parse-lax "^3.0.0"
 
 <<<<<<< HEAD
 got@^9.6.0:
@@ -8292,22 +8737,29 @@ gotrue-js@^0.9.25:
     micro-api-client "^3.2.1"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> bb1ab34... Add auth package.
 graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+<<<<<<< HEAD
 =======
 graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 >>>>>>> 73720a6... Add a way to extract the user from the headers.
+=======
+>>>>>>> bb1ab34... Add auth package.
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
   integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
 
+<<<<<<< HEAD
 graphql-extensions@^0.12.1-alpha.0:
   version "0.12.1-alpha.0"
   resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.12.1-alpha.0.tgz#ee6017440e55b6b84bcf2cef746c0df19886e48e"
@@ -8316,6 +8768,16 @@ graphql-extensions@^0.12.1-alpha.0:
     "@apollographql/apollo-tools" "^0.4.3"
     apollo-server-env "^2.4.4-alpha.0"
     apollo-server-types "^0.4.1-alpha.0"
+=======
+graphql-extensions@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.11.1.tgz#f543f544a047a7a4dd930123f662dfcc01527416"
+  integrity sha512-1bstq6YKaC579PTw9gchw2VlXqjPo3vn8NjRMaUqF2SxyYTjVSgXaCAbaeNa0B7xlLVigxi3DV1zh4A+ss+Lwg==
+  dependencies:
+    "@apollographql/apollo-tools" "^0.4.3"
+    apollo-server-env "^2.4.3"
+    apollo-server-types "^0.3.1"
+>>>>>>> bb1ab34... Add auth package.
 
 graphql-iso-date@^3.6.1:
   version "3.6.1"
@@ -8398,7 +8860,11 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
+<<<<<<< HEAD
 handlebars@^4.7.6:
+=======
+handlebars@^4.4.0:
+>>>>>>> bb1ab34... Add auth package.
   version "4.7.6"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
   integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
@@ -8571,7 +9037,11 @@ html-encoding-sniffer@^1.0.2:
   dependencies:
     whatwg-encoding "^1.0.1"
 
+<<<<<<< HEAD
 html-entities@^1.3.1:
+=======
+html-entities@^1.2.1:
+>>>>>>> bb1ab34... Add auth package.
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
   integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
@@ -8582,9 +9052,15 @@ html-escaper@^2.0.0:
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 html-minifier-terser@^5.0.1:
+<<<<<<< HEAD
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
   integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
+=======
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz#95d3df037f04835e9d1a09d1767c0e361a7de916"
+  integrity sha512-tiYE76O1zunboByeB/nFGwUEb263Z3nkNv6Lz2oLC1s6M36bLKfTrjQ+7ssVfaucVllE+N7hh/FbpbxvnIA+LQ==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     camel-case "^4.1.1"
     clean-css "^4.2.3"
@@ -9112,13 +9588,6 @@ is-callable@^1.1.4, is-callable@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
   integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
 
-is-ci@^1.0.10:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
-  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
-  dependencies:
-    ci-info "^1.5.0"
-
 is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -9231,13 +9700,13 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-installed-globally@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
-  integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=
+is-installed-globally@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
+  integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==
   dependencies:
-    global-dirs "^0.1.0"
-    is-path-inside "^1.0.0"
+    global-dirs "^2.0.1"
+    is-path-inside "^3.0.1"
 
 is-installed-globally@^0.3.1:
   version "0.3.2"
@@ -9257,10 +9726,10 @@ is-natural-number@^4.0.1:
   resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
   integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=
 
-is-npm@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
-  integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
+is-npm@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
+  integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
 
 is-npm@^4.0.0:
   version "4.0.0"
@@ -9308,13 +9777,6 @@ is-path-in-cwd@^2.0.0:
   dependencies:
     is-path-inside "^2.1.0"
 
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
-  dependencies:
-    path-is-inside "^1.0.1"
-
 is-path-inside@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
@@ -9350,11 +9812,14 @@ is-promise@^2.1.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
   integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
+<<<<<<< HEAD
 
 is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
   integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
+=======
+>>>>>>> bb1ab34... Add auth package.
 
 is-reference@^1.1.2:
   version "1.1.4"
@@ -9370,11 +9835,6 @@ is-regex@^1.0.4, is-regex@^1.0.5:
   dependencies:
     has "^1.0.3"
 
-is-retry-allowed@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
-  integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
-
 is-root@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
@@ -9387,7 +9847,7 @@ is-ssh@^1.3.0:
   dependencies:
     protocols "^1.1.0"
 
-is-stream@^1.0.0, is-stream@^1.1.0:
+is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
@@ -9447,11 +9907,14 @@ is-yarn-global@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
   integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
+<<<<<<< HEAD
 
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
   integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+=======
+>>>>>>> bb1ab34... Add auth package.
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
@@ -10072,6 +10535,7 @@ jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3:
     array-includes "^3.0.3"
     object.assign "^4.1.0"
 
+<<<<<<< HEAD
 jszip@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.3.0.tgz#29d72c21a54990fa885b11fc843db320640d5271"
@@ -10122,6 +10586,8 @@ jws@^3.2.2:
     jwa "^1.4.1"
     safe-buffer "^5.0.1"
 
+=======
+>>>>>>> bb1ab34... Add auth package.
 keyv@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
@@ -10163,6 +10629,7 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
+<<<<<<< HEAD
 kuler@0.0.x:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-0.0.0.tgz#b66bb46b934e550f59d818848e0abba4f7f5553c"
@@ -10174,8 +10641,14 @@ latest-version@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
   integrity sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=
+=======
+latest-version@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
+  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
-    package-json "^4.0.0"
+    package-json "^6.3.0"
 
 latest-version@^5.0.0:
   version "5.1.0"
@@ -10603,7 +11076,11 @@ logical-not@^1.0.0:
   resolved "https://registry.yarnpkg.com/logical-not/-/logical-not-1.0.0.tgz#3149848c0cce1fea1f76a0e45725c7bcdb33a627"
   integrity sha512-l3X5Sf25wwZkprKfrfJ2YjCcxkNnitMvuqoVPAFNz1xpAMG7B4CkdELK19hafcR8K9fcUs0K0LkzZ62U+xdHpA==
 
+<<<<<<< HEAD
 loglevel@^1.6.7, loglevel@^1.6.8:
+=======
+loglevel@^1.6.6, loglevel@^1.6.7:
+>>>>>>> bb1ab34... Add auth package.
   version "1.6.8"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
   integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
@@ -10651,6 +11128,7 @@ lowercase-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
+<<<<<<< HEAD
 
 lru-cache@^4.0.0, lru-cache@^4.0.1:
   version "4.1.5"
@@ -10659,6 +11137,8 @@ lru-cache@^4.0.0, lru-cache@^4.0.1:
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
+=======
+>>>>>>> bb1ab34... Add auth package.
 
 lru-cache@^5.0.0, lru-cache@^5.1.1:
   version "5.1.1"
@@ -11004,11 +11484,14 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
+<<<<<<< HEAD
 millisecond@0.1.x:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/millisecond/-/millisecond-0.1.2.tgz#6cc5ad386241cab8e78aff964f87028eec92dac5"
   integrity sha1-bMWtOGJByrjniv+WT4cCjuyS2sU=
 
+=======
+>>>>>>> bb1ab34... Add auth package.
 mime-db@1.44.0, "mime-db@>= 1.43.0 < 2":
   version "1.44.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
@@ -11166,7 +11649,11 @@ mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
+<<<<<<< HEAD
 mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@~0.5.1:
+=======
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
+>>>>>>> bb1ab34... Add auth package.
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -11459,6 +11946,7 @@ node-notifier@^6.0.0:
     which "^1.3.1"
 
 node-releases@^1.1.29, node-releases@^1.1.53:
+<<<<<<< HEAD
   version "1.1.56"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.56.tgz#bc054a417d316e3adac90eafb7e1932802f28705"
   integrity sha512-EVo605FhWLygH8a64TjgpjyHYOihkxECwX1bHHr8tETJKWEiWS2YJjPbvsX2jFjnjTNEgBCmk9mLjKG1Mf11cw==
@@ -11467,6 +11955,16 @@ nodemon@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.4.tgz#55b09319eb488d6394aa9818148c0c2d1c04c416"
   integrity sha512-Ltced+hIfTmaS28Zjv1BM552oQ3dbwPqI4+zI0SLgq+wpJhSyqgYude/aZa/3i31VCQWMfXJVxvu86abcam3uQ==
+=======
+  version "1.1.53"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
+  integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
+
+nodemon@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.3.tgz#e9c64df8740ceaef1cb00e1f3da57c0a93ef3714"
+  integrity sha512-lLQLPS90Lqwc99IHe0U94rDgvjo+G9I4uEIxRG3evSLROcqQ9hwc0AxlSHKS4T1JW/IMj/7N5mthiN58NL/5kw==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     chokidar "^3.2.2"
     debug "^3.2.6"
@@ -12050,6 +12548,7 @@ p-waterfall@^1.0.0:
   dependencies:
     p-reduce "^1.0.0"
 
+<<<<<<< HEAD
 pac-proxy-agent@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.1.tgz#115b1e58f92576cac2eba718593ca7b0e37de2ad"
@@ -12079,11 +12578,17 @@ package-json@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
   integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=
+=======
+package-json@^6.3.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
+  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
-    got "^6.7.1"
-    registry-auth-token "^3.0.1"
-    registry-url "^3.0.3"
-    semver "^5.1.0"
+    got "^9.6.0"
+    registry-auth-token "^4.0.0"
+    registry-url "^5.0.0"
+    semver "^6.2.0"
 
 package-json@^6.3.0:
   version "6.5.0"
@@ -12249,7 +12754,7 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -12407,7 +12912,11 @@ pn@^1.1.0:
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
   integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
 
+<<<<<<< HEAD
 portfinder@^1.0.26:
+=======
+portfinder@^1.0.25:
+>>>>>>> bb1ab34... Add auth package.
   version "1.0.26"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz#475658d56ca30bed72ac7f1378ed350bd1b64e70"
   integrity sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==
@@ -12469,9 +12978,15 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.3:
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
 postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6:
+<<<<<<< HEAD
   version "7.0.30"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz#cc9378beffe46a02cbc4506a0477d05fcea9a8e2"
   integrity sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==
+=======
+  version "7.0.28"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.28.tgz#d349ced7743475717ba91f6810efb58c51fb5dbb"
+  integrity sha512-YU6nVhyWIsVtlNlnAj1fHTsUKW5qxm3KEgzq2Jj6KTEFOTK8QWR12eIDvrlWhiSTK8WIBFTBhOJV4DY6dUuEbw==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -12489,7 +13004,7 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prepend-http@^1.0.0, prepend-http@^1.0.1:
+prepend-http@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
   integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
@@ -12506,12 +13021,16 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
+<<<<<<< HEAD
 prettier@^1.19.1:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
 prettier@^2.0.1, prettier@^2.0.2, prettier@^2.0.5:
+=======
+prettier@^2.0.1, prettier@^2.0.2:
+>>>>>>> bb1ab34... Add auth package.
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
   integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
@@ -12577,6 +13096,7 @@ promise-retry@^1.1.1:
     err-code "^1.0.0"
     retry "^0.10.0"
 
+<<<<<<< HEAD
 "promise@>=3.2 <8":
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -12585,6 +13105,9 @@ promise-retry@^1.1.1:
     asap "~2.0.3"
 
 prompts@^2.0.1, prompts@^2.3.0:
+=======
+prompts@^2.0.1:
+>>>>>>> bb1ab34... Add auth package.
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"
   integrity sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==
@@ -12637,6 +13160,7 @@ proxy-addr@~2.0.5:
   dependencies:
     forwarded "~0.1.2"
     ipaddr.js "1.9.1"
+<<<<<<< HEAD
 
 proxy-agent@^3.1.1:
   version "3.1.1"
@@ -12656,17 +13180,22 @@ proxy-from-env@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+=======
+>>>>>>> bb1ab34... Add auth package.
 
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
+<<<<<<< HEAD
 pseudomap@^1.0.1, pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
+=======
+>>>>>>> bb1ab34... Add auth package.
 psl@^1.1.28:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
@@ -12824,6 +13353,7 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+<<<<<<< HEAD
 raw-body@^2.2.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.1.tgz#30ac82f98bb5ae8c152e67149dac8d55153b168c"
@@ -12835,6 +13365,9 @@ raw-body@^2.2.0:
     unpipe "1.0.0"
 
 rc@^1.0.1, rc@^1.1.6, rc@^1.2.8:
+=======
+rc@^1.2.8:
+>>>>>>> bb1ab34... Add auth package.
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -12891,14 +13424,21 @@ react-error-overlay@^6.0.1, react-error-overlay@^6.0.3:
   integrity sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA==
 
 react-hook-form@^5.1.3:
+<<<<<<< HEAD
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-5.7.2.tgz#a84e259e5d37dd30949af4f79c4dac31101b79ac"
   integrity sha512-bJvY348vayIvEUmSK7Fvea/NgqbT2racA2IbnJz/aPlQ3GBtaTeDITH6rtCa6y++obZzG6E3Q8VuoXPir7QYUg==
+=======
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-5.6.1.tgz#8b6017ec01731bde4f6a6bcd94955ff5e69e28cc"
+  integrity sha512-pqlAiWyZqngdEVUinxPSmhs9k2L/ETsTf8LU7wfwrE1bXJnslRsb4aKlYiL2z0bgGrCuksN8el5bxFbnR1/qEA==
+>>>>>>> bb1ab34... Add auth package.
 
 react-is@^16.12.0, react-is@^16.8.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
+<<<<<<< HEAD
 
 react-native-webview@^8.1.2:
   version "8.2.1"
@@ -12908,6 +13448,8 @@ react-native-webview@^8.1.2:
     escape-string-regexp "2.0.0"
     invariant "2.2.4"
     rnpm-plugin-windows "^0.5.1-0"
+=======
+>>>>>>> bb1ab34... Add auth package.
 
 react@^16.13.1:
   version "16.13.1"
@@ -13045,6 +13587,7 @@ read@1, read@~1.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+<<<<<<< HEAD
 readable-stream@1.1.x:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
@@ -13055,6 +13598,8 @@ readable-stream@1.1.x:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
+=======
+>>>>>>> bb1ab34... Add auth package.
 "readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
@@ -13189,14 +13734,14 @@ regexpu-core@^4.7.0:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.2.0"
 
-registry-auth-token@^3.0.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
-  integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==
+registry-auth-token@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.1.1.tgz#40a33be1e82539460f94328b0f7f0f84c16d9479"
+  integrity sha512-9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA==
   dependencies:
-    rc "^1.1.6"
-    safe-buffer "^5.0.1"
+    rc "^1.2.8"
 
+<<<<<<< HEAD
 registry-auth-token@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.1.1.tgz#40a33be1e82539460f94328b0f7f0f84c16d9479"
@@ -13208,8 +13753,14 @@ registry-url@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
   integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI=
+=======
+registry-url@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
+  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
-    rc "^1.0.1"
+    rc "^1.2.8"
 
 registry-url@^5.0.0:
   version "5.1.0"
@@ -13642,13 +14193,14 @@ selfsigned@^1.10.7:
   dependencies:
     node-forge "0.9.0"
 
-semver-diff@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
-  integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=
+semver-diff@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
+  integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==
   dependencies:
-    semver "^5.0.3"
+    semver "^6.3.0"
 
+<<<<<<< HEAD
 semver-diff@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
@@ -13657,6 +14209,9 @@ semver-diff@^3.1.1:
     semver "^6.3.0"
 
 "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
+=======
+"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
+>>>>>>> bb1ab34... Add auth package.
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -14252,7 +14807,11 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
+<<<<<<< HEAD
 source-map-support@^0.5.11, source-map-support@^0.5.16, source-map-support@^0.5.19, source-map-support@^0.5.6, source-map-support@^0.5.7, source-map-support@~0.5.12:
+=======
+source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12:
+>>>>>>> bb1ab34... Add auth package.
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -14328,7 +14887,11 @@ spdy-transport@^3.0.0:
     readable-stream "^3.0.6"
     wbuf "^1.7.3"
 
+<<<<<<< HEAD
 spdy@^4.0.2:
+=======
+spdy@^4.0.1:
+>>>>>>> bb1ab34... Add auth package.
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
   integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
@@ -14685,9 +15248,15 @@ subscriptions-transport-ws@^0.9.11:
     ws "^5.2.0"
 
 sucrase@^3.10.1:
+<<<<<<< HEAD
   version "3.15.0"
   resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.15.0.tgz#78596a78be7264a65b52ed8d873883413ef0220c"
   integrity sha512-05TJOUfMgckH7wKqfk/1p4G6q16nIeW/GHQwD44vkT0mQMqqzgfHCwkX3whNmwyOo7nVF0jDLwVu/qOBTtsscw==
+=======
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.13.0.tgz#68eb000dea32dd2ec84b91de97c76dcb83a1a2ff"
+  integrity sha512-koXmWc8Iq8q7quNJ9v/TuDIRBeGul1D+QL36PnfzFvYFoQbWcYpSmpJElpSM+eCa0nFthyQqgCGrEKAepnFMtQ==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     commander "^4.0.0"
     glob "7.1.6"
@@ -14867,12 +15436,10 @@ tempy@^0.5.0:
     type-fest "^0.12.0"
     unique-string "^2.0.0"
 
-term-size@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
-  integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=
-  dependencies:
-    execa "^0.7.0"
+term-size@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753"
+  integrity sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==
 
 term-size@^2.1.0:
   version "2.2.0"
@@ -14903,9 +15470,15 @@ terser-webpack-plugin@^1.4.3:
     worker-farm "^1.7.0"
 
 terser@^4.1.2, terser@^4.6.3:
+<<<<<<< HEAD
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.7.0.tgz#15852cf1a08e3256a80428e865a2fa893ffba006"
   integrity sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==
+=======
+  version "4.6.13"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.13.tgz#e879a7364a5e0db52ba4891ecde007422c56a916"
+  integrity sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -14991,11 +15564,6 @@ thunky@^1.0.2:
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
-timed-out@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
-
 timers-browserify@^2.0.4:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f"
@@ -15169,6 +15737,7 @@ ts-invariant@^0.4.0, ts-invariant@^0.4.4:
   dependencies:
     tslib "^1.9.3"
 
+<<<<<<< HEAD
 tslib@1.11.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
@@ -15178,6 +15747,12 @@ tslib@^1, tslib@^1.10.0, tslib@^1.11.1, tslib@^1.11.2, tslib@^1.8.1, tslib@^1.9.
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
   integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
+=======
+tslib@1.11.1, tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
+  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
+>>>>>>> bb1ab34... Add auth package.
 
 tsutils@^3.17.1:
   version "3.17.1"
@@ -15271,9 +15846,15 @@ typescript@3.8.3, typescript@^3.8.3:
   integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
 
 uglify-js@^3.1.4:
+<<<<<<< HEAD
   version "3.9.3"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.3.tgz#4a285d1658b8a2ebaef9e51366b3a0f7acd79ec2"
   integrity sha512-r5ImcL6QyzQGVimQoov3aL2ZScywrOgBXGndbWrdehKoSvGe/RmiE5Jpw/v+GvxODt6l2tpBXwA7n+qZVlHBMA==
+=======
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.2.tgz#012b74fb6a2e440d9ba1f79110a479d3b1f2d48d"
+  integrity sha512-zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     commander "~2.20.3"
 
@@ -15302,12 +15883,15 @@ undefsafe@^2.0.2:
   dependencies:
     debug "^2.2.0"
 
+<<<<<<< HEAD
 undici@mcollina/undici:
   version "0.5.0"
   resolved "https://codeload.github.com/mcollina/undici/tar.gz/6c3d7eed592cab9c4b63d56164ecd3cc9358945a"
   dependencies:
     http-parser-js "^0.5.2"
 
+=======
+>>>>>>> bb1ab34... Add auth package.
 unfetch@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.1.0.tgz#6ec2dd0de887e58a4dee83a050ded80ffc4137db"
@@ -15365,13 +15949,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
-  dependencies:
-    crypto-random-string "^1.0.0"
-
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@@ -15418,11 +15995,6 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-unzip-response@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
-  integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
-
 upath@^1.1.1, upath@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
@@ -15468,12 +16040,12 @@ url-loader@4.0.0:
     mime-types "^2.1.26"
     schema-utils "^2.6.5"
 
-url-parse-lax@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
-  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
   dependencies:
-    prepend-http "^1.0.1"
+    prepend-http "^2.0.0"
 
 url-parse-lax@^3.0.0:
   version "3.0.0"
@@ -15583,9 +16155,15 @@ v8-compile-cache@^2.0.3:
   integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
 
 v8-to-istanbul@^4.1.3:
+<<<<<<< HEAD
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz#b97936f21c0e2d9996d4985e5c5156e9d4e49cd6"
   integrity sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ==
+=======
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz#22fe35709a64955f49a08a7c7c959f6520ad6f20"
+  integrity sha512-sAjOC+Kki6aJVbUOXJbcR0MnbfjvBzwKZazEJymA2IX49uoOdEdk+4fBq5cXgYgiyKtAyrrJNtBZdOeDIF+Fng==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
@@ -15665,6 +16243,7 @@ walker@^1.0.7, walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
+<<<<<<< HEAD
 watchpack-chokidar2@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"
@@ -15677,6 +16256,14 @@ watchpack@^1.6.1:
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz#c02e4d4d49913c3e7e122c3325365af9d331e9aa"
   integrity sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==
   dependencies:
+=======
+watchpack@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2"
+  integrity sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==
+  dependencies:
+    chokidar "^2.1.8"
+>>>>>>> bb1ab34... Add auth package.
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
   optionalDependencies:
@@ -15708,9 +16295,15 @@ webidl-conversions@^5.0.0:
   integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
 
 webpack-bundle-analyzer@^3.6.1:
+<<<<<<< HEAD
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz#ce6b3f908daf069fd1f7266f692cbb3bded9ba16"
   integrity sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==
+=======
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.7.0.tgz#84da434e89442899b884d9ad38e466d0db02a56f"
+  integrity sha512-mETdjZ30a3Yf+NTB/wqTgACK7rAYQl5uxKK0WVTNmF0sM3Uv8s3R58YZMW7Rhu0Lk2Rmuhdj5dcH5Q76zCDVdA==
+>>>>>>> bb1ab34... Add auth package.
   dependencies:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
@@ -15927,12 +16520,12 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2 || 2"
 
-widest-line@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc"
-  integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==
+widest-line@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
+  integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==
   dependencies:
-    string-width "^2.1.1"
+    string-width "^4.0.0"
 
 widest-line@^3.1.0:
   version "3.1.0"
@@ -16099,14 +16692,20 @@ ws@^6.0.0, ws@^6.2.1:
     async-limiter "~1.0.0"
 
 ws@^7.0.0:
+<<<<<<< HEAD
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz#4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd"
   integrity sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==
+=======
+  version "7.2.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d"
+  integrity sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==
+>>>>>>> bb1ab34... Add auth package.
 
-xdg-basedir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-  integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
+xdg-basedir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
+  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
 xdg-basedir@^4.0.0:
   version "4.0.0"
@@ -16183,11 +16782,14 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
+<<<<<<< HEAD
 yallist@^2.0.0, yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
+=======
+>>>>>>> bb1ab34... Add auth package.
 yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
@@ -16199,9 +16801,17 @@ yallist@^4.0.0:
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
 yaml@^1.7.2:
+<<<<<<< HEAD
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
   integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
+=======
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.9.2.tgz#f0cfa865f003ab707663e4f04b3956957ea564ed"
+  integrity sha512-HPT7cGGI0DuRcsO51qC1j9O16Dh1mZ2bnXwsi0jrSpsLz0WxOLSLXfkABVl6bZO629py3CU+OMJtpNHDLB97kg==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+>>>>>>> bb1ab34... Add auth package.
 
 yargs-parser@^10.0.0:
   version "10.1.0"
@@ -16210,6 +16820,17 @@ yargs-parser@^10.0.0:
   dependencies:
     camelcase "^4.1.0"
 
+<<<<<<< HEAD
+=======
+yargs-parser@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+>>>>>>> bb1ab34... Add auth package.
 yargs-parser@^13.1.0, yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
@@ -16226,7 +16847,11 @@ yargs-parser@^15.0.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+<<<<<<< HEAD
 yargs-parser@^18.1.1, yargs-parser@^18.1.3:
+=======
+yargs-parser@^18.1.1:
+>>>>>>> bb1ab34... Add auth package.
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
   integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
@@ -16251,7 +16876,11 @@ yargs@13.2.4:
     y18n "^4.0.0"
     yargs-parser "^13.1.0"
 
+<<<<<<< HEAD
 yargs@^13.3.0, yargs@^13.3.2:
+=======
+yargs@^13.3.0:
+>>>>>>> bb1ab34... Add auth package.
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
   integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==

From c313d610047fe33a2ad8973ac2a120e6ded2155f Mon Sep 17 00:00:00 2001
From: Peter Pistorius <peter.pistorius@gmail.com>
Date: Sun, 3 May 2020 18:06:46 +0200
Subject: [PATCH 03/25] Make auth package compile with TypeScript.

---
 packages/auth/package.json | 6 ++++++
 yarn.lock                  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/auth/package.json b/packages/auth/package.json
index 6a3326ed0281..bbc17e6b5477 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -8,12 +8,18 @@
   "types": "dist/index.d.ts",
   "license": "MIT",
   "devDependencies": {
+    "react": "^16.13.1",
     "@auth0/auth0-spa-js": "^1.7.0",
+<<<<<<< HEAD
     "@types/react": "16.9.35",
     "gotrue-js": "^0.9.25",
     "magic-sdk": "^1.3.5",
     "netlify-identity-widget": "1.6.0",
     "react": "^16.13.1"
+=======
+    "@types/react": "^16.9.34",
+    "gotrue-js": "^0.9.25"
+>>>>>>> 4e101f7... Make auth package compile with TypeScript.
   },
   "scripts": {
     "build": "yarn build:js && yarn build:types",
diff --git a/yarn.lock b/yarn.lock
index a111de7c97ed..edff10608243 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3323,7 +3323,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@16.9.34":
+"@types/react@*", "@types/react@16.9.34", "@types/react@^16.9.34":
   version "16.9.34"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz#f7d5e331c468f53affed17a8a4d488cd44ea9349"
   integrity sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==

From edc33bf083cd18d360b40b78d545e9dd7a77eee1 Mon Sep 17 00:00:00 2001
From: Brett Jackson <brett.jackson@rinse.com>
Date: Sat, 16 May 2020 15:44:53 -0500
Subject: [PATCH 04/25] Add IP address to the Lambda event's requestContext

---
 packages/dev-server/src/main.ts | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/packages/dev-server/src/main.ts b/packages/dev-server/src/main.ts
index 317111c74ee3..1d885e8c41f5 100644
--- a/packages/dev-server/src/main.ts
+++ b/packages/dev-server/src/main.ts
@@ -21,9 +21,32 @@ export const getArgsForSide = (
   const paths = getPaths()
 
   return {
-    port,
-    host,
-    paths: paths[side],
+    httpMethod: request.method,
+    headers: request.headers,
+    path: request.path,
+    queryStringParameters: qs.parse(request.url.split(/\?(.+)/)[1]),
+    requestContext: {
+      identity: {
+        sourceIp: request.ip,
+      },
+    },
+    ...parseBody(request.body), // adds `body` and `isBase64Encoded`
+  } as APIGatewayProxyEvent
+}
+
+const expressResponseForLambdaResult = (
+  expressResFn: Response,
+  lambdaResult: APIGatewayProxyResult
+) => {
+  // The response object must be compatible with JSON.stringify according
+  // to the aws lambda docs, but the type definition specifies that it has
+  // to be a string. Let's double check this.
+  const { statusCode = 200, headers, body = '' } = lambdaResult
+  if (headers) {
+    Object.keys(headers).forEach((headerName) => {
+      const headerValue: any = headers[headerName]
+      expressResFn.setHeader(headerName, headerValue)
+    })
   }
 }
 

From eb56ea6f52c08d89d6d61c8933058e1467d9a0de Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Tue, 5 May 2020 14:04:49 -0400
Subject: [PATCH 05/25] enable typescript services and sdl

---
 packages/cli/src/commands/generate/sdl/sdl.js | 14 ++++----
 .../generate/sdl/templates/sdl.ts.template    | 28 +++++++++++++++
 .../src/commands/generate/service/service.js  |  9 +++--
 .../service/templates/service.ts.template     | 34 +++++++++++++++++++
 .../service/templates/test.ts.template        |  7 ++++
 5 files changed, 83 insertions(+), 9 deletions(-)
 create mode 100644 packages/cli/src/commands/generate/sdl/templates/sdl.ts.template
 create mode 100644 packages/cli/src/commands/generate/service/templates/service.ts.template
 create mode 100644 packages/cli/src/commands/generate/service/templates/test.ts.template

diff --git a/packages/cli/src/commands/generate/sdl/sdl.js b/packages/cli/src/commands/generate/sdl/sdl.js
index a47ab538dfea..37bac5612896 100644
--- a/packages/cli/src/commands/generate/sdl/sdl.js
+++ b/packages/cli/src/commands/generate/sdl/sdl.js
@@ -105,7 +105,7 @@ const sdlFromSchemaModel = async (name) => {
   }
 }
 
-export const files = async ({ name, crud }) => {
+export const files = async ({ name, crud, typescript }) => {
   const {
     query,
     createInput,
@@ -115,8 +115,9 @@ export const files = async ({ name, crud }) => {
     enums,
   } = await sdlFromSchemaModel(pascalcase(pluralize.singular(name)))
 
+  const extension = typescript ? 'ts' : 'js'
   const template = generateTemplate(
-    path.join('sdl', 'templates', 'sdl.js.template'),
+    path.join('sdl', 'templates', `sdl.${extension}.template`),
     {
       name,
       crud,
@@ -130,11 +131,11 @@ export const files = async ({ name, crud }) => {
 
   const outputPath = path.join(
     getPaths().api.graphql,
-    `${camelcase(pluralize(name))}.sdl.js`
+    `${camelcase(pluralize(name))}.sdl.${extension}`
   )
   return {
     [outputPath]: template,
-    ...(await serviceFiles({ name, crud, relations })),
+    ...(await serviceFiles({ name, crud, relations, typescript })),
   }
 }
 
@@ -144,15 +145,16 @@ export const builder = {
   services: { type: 'boolean', default: true },
   crud: { type: 'boolean', default: false },
   force: { type: 'boolean', default: false },
+  typescript: { type: 'boolean', default: false },
 }
 // TODO: Add --dry-run command
-export const handler = async ({ model, crud, force }) => {
+export const handler = async ({ model, crud, force, typescript }) => {
   const tasks = new Listr(
     [
       {
         title: 'Generating SDL files...',
         task: async () => {
-          const f = await files({ name: model, crud })
+          const f = await files({ name: model, crud, typescript })
           return writeFilesTask(f, { overwriteExisting: force })
         },
       },
diff --git a/packages/cli/src/commands/generate/sdl/templates/sdl.ts.template b/packages/cli/src/commands/generate/sdl/templates/sdl.ts.template
new file mode 100644
index 000000000000..a417a5206332
--- /dev/null
+++ b/packages/cli/src/commands/generate/sdl/templates/sdl.ts.template
@@ -0,0 +1,28 @@
+export const schema = gql`
+  type ${singularPascalName} {
+    ${query}
+  }
+<% if (enums.length > 0) {%>
+<% enums.forEach((enumDef, idx)=> {%>  enum ${enums[idx].name} {<% enums[idx].values.forEach((enumDefValue, idk)=> { %>
+    ${enums[idx].values[idk].name}<% }) %>
+  }
+<%}) %><% } %>
+  type Query {
+    ${pluralCamelName}: [${singularPascalName}!]!<% if (crud) { %>
+    ${singularCamelName}(id: ${idType}!): ${singularPascalName}!<% } %>
+  }
+
+  input Create${singularPascalName}Input {
+    ${createInput}
+  }
+
+  input Update${singularPascalName}Input {
+    ${updateInput}
+  }<% if (crud) { %>
+
+  type Mutation {
+    create${singularPascalName}(input: Create${singularPascalName}Input!): ${singularPascalName}!
+    update${singularPascalName}(id: ${idType}!, input: Update${singularPascalName}Input!): ${singularPascalName}!
+    delete${singularPascalName}(id: ${idType}!): ${singularPascalName}!
+  }<% } %>
+`
diff --git a/packages/cli/src/commands/generate/service/service.js b/packages/cli/src/commands/generate/service/service.js
index 945ace05df2b..e3d11a173ee0 100644
--- a/packages/cli/src/commands/generate/service/service.js
+++ b/packages/cli/src/commands/generate/service/service.js
@@ -8,21 +8,23 @@ import {
 
 export const files = async ({ name, relations, ...rest }) => {
   const componentName = camelcase(pluralize(name))
+  const extension = rest.typescript ? 'ts' : 'js'
   const serviceFile = templateForComponentFile({
     name,
     componentName: componentName,
+    extension: `.${extension}`,
     apiPathSection: 'services',
     generator: 'service',
-    templatePath: 'service.js.template',
+    templatePath: `service.${extension}.template`,
     templateVars: { relations: relations || [], ...rest },
   })
   const testFile = templateForComponentFile({
     name,
     componentName: componentName,
-    extension: '.test.js',
+    extension: `.test.${extension}`,
     apiPathSection: 'services',
     generator: 'service',
-    templatePath: 'test.js.template',
+    templatePath: `test.${extension}.template`,
     templateVars: { relations: relations || [], ...rest },
   })
 
@@ -42,6 +44,7 @@ export const files = async ({ name, relations, ...rest }) => {
 export const builder = {
   crud: { type: 'boolean', default: false, desc: 'Create CRUD functions' },
   force: { type: 'boolean', default: false },
+  typescript: { type: 'boolean', default: false },
 }
 
 export const { command, desc, handler } = createYargsForComponentGeneration({
diff --git a/packages/cli/src/commands/generate/service/templates/service.ts.template b/packages/cli/src/commands/generate/service/templates/service.ts.template
new file mode 100644
index 000000000000..0ad65cbd7a5e
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/templates/service.ts.template
@@ -0,0 +1,34 @@
+import { db } from 'src/lib/db'
+
+export const ${pluralCamelName} = () => {
+  return db.${singularCamelName}.findMany()
+}<% if (crud) { %>
+
+export const ${singularCamelName} = ({ id }) => {
+  return db.${singularCamelName}.findOne({
+    where: { id },
+  })
+}
+
+export const create${singularPascalName} = ({ input }) => {
+  return db.${singularCamelName}.create({
+    data: input,
+  })
+}
+
+export const update${singularPascalName} = ({ id, input }) => {
+  return db.${singularCamelName}.update({
+    data: input,
+    where: { id },
+  })
+}
+
+export const delete${singularPascalName} = ({ id }) => {
+  return db.${singularCamelName}.delete({
+    where: { id },
+  })
+}<% } %><% if (relations.length) { %>
+
+export const ${singularPascalName} = {<% relations.forEach(relation => { %>
+  ${relation}: (_obj, { root }) => db.${singularCamelName}.findOne({ where: { id: root.id } }).${relation}(),<% }) %>
+}<% } %>
diff --git a/packages/cli/src/commands/generate/service/templates/test.ts.template b/packages/cli/src/commands/generate/service/templates/test.ts.template
new file mode 100644
index 000000000000..50cc4cc7e42c
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/templates/test.ts.template
@@ -0,0 +1,7 @@
+import { ${pluralCamelName} } from './${pluralCamelName}'
+
+describe('${pluralCamelName}', () => {
+  it('returns true', () => {
+    expect(true).toBe(true)
+  })
+})

From 173dc6c8b539cd422cd326f3aed0eb3d16e41fdc Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Thu, 14 May 2020 12:39:24 -0400
Subject: [PATCH 06/25] update tests for sdl

---
 .../__tests__/fixtures/enumGeneratedSdl.ts    |  33 ++++
 .../sdl/__tests__/fixtures/multiWordSdl.ts    |  24 +++
 .../__tests__/fixtures/multiWordSdlCrud.ts    |  31 ++++
 .../sdl/__tests__/fixtures/singleWordSdl.ts   |  27 ++++
 .../__tests__/fixtures/singleWordSdlCrud.ts   |  42 +++++
 .../generate/sdl/__tests__/sdl.test.js        | 153 ++++++++++++------
 .../generate/sdl/templates/sdl.ts.template    |   2 +
 7 files changed, 262 insertions(+), 50 deletions(-)
 create mode 100644 packages/cli/src/commands/generate/sdl/__tests__/fixtures/enumGeneratedSdl.ts
 create mode 100644 packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdl.ts
 create mode 100644 packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdlCrud.ts
 create mode 100644 packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdl.ts
 create mode 100644 packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdlCrud.ts

diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/enumGeneratedSdl.ts b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/enumGeneratedSdl.ts
new file mode 100644
index 000000000000..22cf0aa7d6ee
--- /dev/null
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/enumGeneratedSdl.ts
@@ -0,0 +1,33 @@
+import gql from 'graphql-tag'
+
+export const schema = gql`
+  type Shoe {
+    id: Int!
+    color: Color!
+  }
+
+  enum Color {
+    RED
+    GREEN
+    BLUE
+  }
+
+  type Query {
+    shoes: [Shoe!]!
+    shoe(id: Int!): Shoe!
+  }
+
+  input CreateShoeInput {
+    color: Color!
+  }
+
+  input UpdateShoeInput {
+    color: Color
+  }
+
+  type Mutation {
+    createShoe(input: CreateShoeInput!): Shoe!
+    updateShoe(id: Int!, input: UpdateShoeInput!): Shoe!
+    deleteShoe(id: Int!): Shoe!
+  }
+`
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdl.ts b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdl.ts
new file mode 100644
index 000000000000..bd895becd864
--- /dev/null
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdl.ts
@@ -0,0 +1,24 @@
+import gql from 'graphql-tag'
+
+export const schema = gql`
+  type UserProfile {
+    id: Int!
+    username: String!
+    userId: Int!
+    user: User!
+  }
+
+  type Query {
+    userProfiles: [UserProfile!]!
+  }
+
+  input CreateUserProfileInput {
+    username: String!
+    userId: Int!
+  }
+
+  input UpdateUserProfileInput {
+    username: String
+    userId: Int
+  }
+`
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdlCrud.ts b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdlCrud.ts
new file mode 100644
index 000000000000..978dd3902eb1
--- /dev/null
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdlCrud.ts
@@ -0,0 +1,31 @@
+import gql from 'graphql-tag'
+
+export const schema = gql`
+  type UserProfile {
+    id: Int!
+    username: String!
+    userId: Int!
+    user: User!
+  }
+
+  type Query {
+    userProfiles: [UserProfile!]!
+    userProfile(id: Int!): UserProfile!
+  }
+
+  input CreateUserProfileInput {
+    username: String!
+    userId: Int!
+  }
+
+  input UpdateUserProfileInput {
+    username: String
+    userId: Int
+  }
+
+  type Mutation {
+    createUserProfile(input: CreateUserProfileInput!): UserProfile!
+    updateUserProfile(id: Int!, input: UpdateUserProfileInput!): UserProfile!
+    deleteUserProfile(id: Int!): UserProfile!
+  }
+`
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdl.ts b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdl.ts
new file mode 100644
index 000000000000..70df6d89f9fe
--- /dev/null
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdl.ts
@@ -0,0 +1,27 @@
+import gql from 'graphql-tag'
+
+export const schema = gql`
+  type User {
+    id: Int!
+    name: String
+    email: String!
+    isAdmin: Boolean!
+    profiles: UserProfile
+  }
+
+  type Query {
+    users: [User!]!
+  }
+
+  input CreateUserInput {
+    name: String
+    email: String!
+    isAdmin: Boolean!
+  }
+
+  input UpdateUserInput {
+    name: String
+    email: String
+    isAdmin: Boolean
+  }
+`
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdlCrud.ts b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdlCrud.ts
new file mode 100644
index 000000000000..03e2e78cb282
--- /dev/null
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdlCrud.ts
@@ -0,0 +1,42 @@
+import gql from 'graphql-tag'
+
+export const schema = gql`
+  type Post {
+    id: Int!
+    title: String!
+    slug: String!
+    author: String!
+    body: String!
+    image: String
+    postedAt: DateTime
+  }
+
+  type Query {
+    posts: [Post!]!
+    post(id: Int!): Post!
+  }
+
+  input CreatePostInput {
+    title: String!
+    slug: String!
+    author: String!
+    body: String!
+    image: String
+    postedAt: DateTime
+  }
+
+  input UpdatePostInput {
+    title: String
+    slug: String
+    author: String
+    body: String
+    image: String
+    postedAt: DateTime
+  }
+
+  type Mutation {
+    createPost(input: CreatePostInput!): Post!
+    updatePost(id: Int!, input: UpdatePostInput!): Post!
+    deletePost(id: Int!): Post!
+  }
+`
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js b/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
index 783518f4c501..9f754c6e1bb2 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
@@ -8,62 +8,115 @@ afterEach(() => {
   jest.clearAllMocks()
 })
 
-test('returns exactly 3 files', async () => {
-  const files = await sdl.files({ name: 'Post', crud: false })
+const extensionForBaseArgs = (baseArgs) =>
+  baseArgs && baseArgs.typescript ? 'ts' : 'js'
 
-  expect(Object.keys(files).length).toEqual(3)
-})
+const itReturnsExactlyThreeFiles = (baseArgs = {}) => {
+  test('returns exactly 3 files', async () => {
+    const files = await sdl.files({ ...baseArgs, name: 'Post', crud: false })
+
+    expect(Object.keys(files).length).toEqual(3)
+  })
+}
 
 // in this case we'll trust that a service and test are actually created
 // with the correct filename, but the contents of that file should be the
 // job of the service tests
-test('creates a service', async () => {
-  const files = await sdl.files({ name: 'User', crud: false })
-
-  expect(files).toHaveProperty([
-    '/path/to/project/api/src/services/users/users.js',
-  ])
-  expect(files).toHaveProperty([
-    '/path/to/project/api/src/services/users/users.test.js',
-  ])
-})
-
-test('creates a single word sdl file', async () => {
-  const files = await sdl.files({ name: 'User', crud: false })
-
-  expect(files['/path/to/project/api/src/graphql/users.sdl.js']).toEqual(
-    loadGeneratorFixture('sdl', 'singleWordSdl.js')
-  )
-})
-
-test('creates a multi word sdl file', async () => {
-  const files = await sdl.files({ name: 'UserProfile', crud: false })
-
-  expect(files['/path/to/project/api/src/graphql/userProfiles.sdl.js']).toEqual(
-    loadGeneratorFixture('sdl', 'multiWordSdl.js')
-  )
-})
-
-test('creates a single word sdl file with CRUD actions', async () => {
-  const files = await sdl.files({ name: 'Post', crud: true })
-
-  expect(files['/path/to/project/api/src/graphql/posts.sdl.js']).toEqual(
-    loadGeneratorFixture('sdl', 'singleWordSdlCrud.js')
-  )
-})
-
-test('creates a multi word sdl file with CRUD actions', async () => {
-  const files = await sdl.files({ name: 'UserProfile', crud: true })
-
-  expect(files['/path/to/project/api/src/graphql/userProfiles.sdl.js']).toEqual(
-    loadGeneratorFixture('sdl', 'multiWordSdlCrud.js')
-  )
+const itCreatesAService = (baseArgs = {}) => {
+  test('creates a service', async () => {
+    const files = await sdl.files({ ...baseArgs, name: 'User', crud: false })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(files).toHaveProperty([
+      `/path/to/project/api/src/services/users/users.${extension}`,
+    ])
+    expect(files).toHaveProperty([
+      `/path/to/project/api/src/services/users/users.test.${extension}`,
+    ])
+  })
+}
+
+const itCreatesASingleWordSDLFile = (baseArgs = {}) => {
+  test('creates a single word sdl file', async () => {
+    const files = await sdl.files({ ...baseArgs, name: 'User', crud: false })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[`/path/to/project/api/src/graphql/users.sdl.${extension}`]
+    ).toEqual(loadGeneratorFixture('sdl', `singleWordSdl.${extension}`))
+  })
+}
+
+const itCreatesAMultiWordSDLFile = (baseArgs = {}) => {
+  test('creates a multi word sdl file', async () => {
+    const files = await sdl.files({
+      ...baseArgs,
+      name: 'UserProfile',
+      crud: false,
+    })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[`/path/to/project/api/src/graphql/userProfiles.sdl.${extension}`]
+    ).toEqual(loadGeneratorFixture('sdl', `multiWordSdl.${extension}`))
+  })
+}
+
+const itCreatesASingleWordSDLFileWithCRUD = (baseArgs = {}) => {
+  test('creates a single word sdl file with CRUD actions', async () => {
+    const files = await sdl.files({ ...baseArgs, name: 'Post', crud: true })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[`/path/to/project/api/src/graphql/posts.sdl.${extension}`]
+    ).toEqual(loadGeneratorFixture('sdl', `singleWordSdlCrud.${extension}`))
+  })
+}
+
+const itCreateAMultiWordSDLFileWithCRUD = (baseArgs = {}) => {
+  test('creates a multi word sdl file with CRUD actions', async () => {
+    const files = await sdl.files({
+      ...baseArgs,
+      name: 'UserProfile',
+      crud: true,
+    })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[`/path/to/project/api/src/graphql/userProfiles.sdl.${extension}`]
+    ).toEqual(loadGeneratorFixture('sdl', `multiWordSdlCrud.${extension}`))
+  })
+}
+
+const itCreatesASDLFileWithEnumDefinitions = (baseArgs = {}) => {
+  test('creates a sdl file with enum definitions', async () => {
+    const files = await sdl.files({ ...baseArgs, name: 'Shoe', crud: true })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[`/path/to/project/api/src/graphql/shoes.sdl.${extension}`]
+    ).toEqual(loadGeneratorFixture('sdl', `enumGeneratedSdl.${extension}`))
+  })
+}
+
+describe('in javascript mode', () => {
+  itReturnsExactlyThreeFiles()
+  itCreatesAService()
+  itCreatesASingleWordSDLFile()
+  itCreatesAMultiWordSDLFile()
+  itCreatesASingleWordSDLFileWithCRUD()
+  itCreateAMultiWordSDLFileWithCRUD()
+  itCreatesASDLFileWithEnumDefinitions()
 })
 
-test('creates a sdl file with enum definitions', async () => {
-  const files = await sdl.files({ name: 'Shoe', crud: true })
+describe('in typescript mode', () => {
+  const baseArgs = { typescript: true }
 
-  expect(files['/path/to/project/api/src/graphql/shoes.sdl.js']).toEqual(
-    loadGeneratorFixture('sdl', 'enumGeneratedSdl.js')
-  )
+  itReturnsExactlyThreeFiles(baseArgs)
+  itCreatesAService(baseArgs)
+  itCreatesASingleWordSDLFile(baseArgs)
+  itCreatesAMultiWordSDLFile(baseArgs)
+  itCreatesASingleWordSDLFileWithCRUD(baseArgs)
+  itCreateAMultiWordSDLFileWithCRUD(baseArgs)
+  itCreatesASDLFileWithEnumDefinitions(baseArgs)
 })
diff --git a/packages/cli/src/commands/generate/sdl/templates/sdl.ts.template b/packages/cli/src/commands/generate/sdl/templates/sdl.ts.template
index a417a5206332..d06d47b031a2 100644
--- a/packages/cli/src/commands/generate/sdl/templates/sdl.ts.template
+++ b/packages/cli/src/commands/generate/sdl/templates/sdl.ts.template
@@ -1,3 +1,5 @@
+import gql from 'graphql-tag'
+
 export const schema = gql`
   type ${singularPascalName} {
     ${query}

From c6e8230a0491db2b0b9104c314b2f544dcb421cb Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Sat, 16 May 2020 07:27:03 -0400
Subject: [PATCH 07/25] add tests for service generation

---
 .../__tests__/fixtures/multiWord.test.ts      |   7 +
 .../service/__tests__/fixtures/multiWord.ts   |   5 +
 .../fixtures/multiWordService.test.ts         |   7 +
 .../__tests__/fixtures/multiWordService.ts    |   5 +
 .../fixtures/multiWordServiceCrud.test.ts     |   7 +
 .../fixtures/multiWordServiceCrud.ts          |  45 +++
 .../__tests__/fixtures/multiWord_crud.test.ts |   7 +
 .../__tests__/fixtures/multiWord_crud.ts      |  44 +++
 .../__tests__/fixtures/singleWord.test.ts     |   7 +
 .../service/__tests__/fixtures/singleWord.ts  |   5 +
 .../fixtures/singleWordService.test.ts        |   7 +
 .../__tests__/fixtures/singleWordService.ts   |   5 +
 .../fixtures/singleWordServiceCrud.test.ts    |   7 +
 .../fixtures/singleWordServiceCrud.ts         |  44 +++
 .../fixtures/singleWord_belongsTo.ts          |   9 +
 .../fixtures/singleWord_crud.test.ts          |   7 +
 .../__tests__/fixtures/singleWord_crud.ts     |  44 +++
 .../__tests__/fixtures/singleWord_hasMany.ts  |   9 +
 .../__tests__/fixtures/singleWord_multiple.ts |  10 +
 .../service/__tests__/service.test.js         | 351 +++++++++++-------
 .../service/templates/service.ts.template     |  24 +-
 21 files changed, 524 insertions(+), 132 deletions(-)
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.test.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.test.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.test.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.test.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.ts
 create mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.ts

diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.ts
new file mode 100644
index 000000000000..0c1f26ab30ed
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.ts
@@ -0,0 +1,7 @@
+import { userProfiles } from './userProfiles'
+
+describe('userProfiles', () => {
+  it('returns true', () => {
+    expect(true).toBe(true)
+  })
+})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.ts
new file mode 100644
index 000000000000..2f54fb24b2c6
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.ts
@@ -0,0 +1,5 @@
+import { db } from 'src/lib/db'
+
+export const userProfiles = () => {
+  return db.userProfile.findMany()
+}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.test.ts
new file mode 100644
index 000000000000..0c1f26ab30ed
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.test.ts
@@ -0,0 +1,7 @@
+import { userProfiles } from './userProfiles'
+
+describe('userProfiles', () => {
+  it('returns true', () => {
+    expect(true).toBe(true)
+  })
+})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.ts
new file mode 100644
index 000000000000..2f54fb24b2c6
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.ts
@@ -0,0 +1,5 @@
+import { db } from 'src/lib/db'
+
+export const userProfiles = () => {
+  return db.userProfile.findMany()
+}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.test.ts
new file mode 100644
index 000000000000..0c1f26ab30ed
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.test.ts
@@ -0,0 +1,7 @@
+import { userProfiles } from './userProfiles'
+
+describe('userProfiles', () => {
+  it('returns true', () => {
+    expect(true).toBe(true)
+  })
+})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.ts
new file mode 100644
index 000000000000..57a2c078ae3d
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.ts
@@ -0,0 +1,45 @@
+import { db } from 'src/lib/db'
+import {
+  UserProfileWhereUniqueInput,
+  UserProfileCreateInput,
+  UserProfileUpdateInput,
+} from '@prisma/client'
+
+
+export const userProfiles = () => {
+  return db.userProfile.findMany()
+}
+
+export const userProfile = ({ id }: UserProfileWhereUniqueInput) => {
+  return db.userProfile.findOne({
+    where: { id },
+  })
+}
+
+interface CreateUserProfileArgs {
+  input: UserProfileCreateInput
+}
+
+export const createUserProfile = ({ input }: CreateUserProfileArgs) => {
+  return db.userProfile.create({
+    data: input,
+  })
+}
+
+interface UpdateUserProfileArgs {
+  where: UserProfileWhereUniqueInput
+  input: UserProfileUpdateInput
+}
+
+export const updateUserProfile = ({ id, input }: UpdateUserProfileArgs) => {
+  return db.userProfile.update({
+    data: input,
+    where: { id },
+  })
+}
+
+export const deleteUserProfile = ({ id }: UserProfileWhereUniqueInput) => {
+  return db.userProfile.delete({
+    where: { id },
+  })
+}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.ts
new file mode 100644
index 000000000000..0c1f26ab30ed
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.ts
@@ -0,0 +1,7 @@
+import { userProfiles } from './userProfiles'
+
+describe('userProfiles', () => {
+  it('returns true', () => {
+    expect(true).toBe(true)
+  })
+})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.ts
new file mode 100644
index 000000000000..d76defc6958a
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.ts
@@ -0,0 +1,44 @@
+import { db } from 'src/lib/db'
+import {
+  UserProfileWhereUniqueInput,
+  UserProfileCreateInput,
+  UserProfileUpdateInput,
+} from '@prisma/client'
+
+export const userProfiles = () => {
+  return db.userProfile.findMany()
+}
+
+export const userProfile = ({ id }: UserProfileWhereUniqueInput) => {
+  return db.userProfile.findOne({
+    where: { id },
+  })
+}
+
+interface CreateUserProfileArgs {
+  input: UserProfileCreateInput
+}
+
+export const createUserProfile = ({ input }: CreateUserProfileArgs) => {
+  return db.userProfile.create({
+    data: input,
+  })
+}
+
+interface UpdateUserProfileArgs {
+  where: UserProfileWhereUniqueInput
+  input: UserProfileUpdateInput
+}
+
+export const updateUserProfile = ({ id, input }: UpdateUserProfileArgs) => {
+  return db.userProfile.update({
+    data: input,
+    where: { id },
+  })
+}
+
+export const deleteUserProfile = ({ id }: UserProfileWhereUniqueInput) => {
+  return db.userProfile.delete({
+    where: { id },
+  })
+}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.ts
new file mode 100644
index 000000000000..5a73412f0b9d
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.ts
@@ -0,0 +1,7 @@
+import { users } from './users'
+
+describe('users', () => {
+  it('returns true', () => {
+    expect(true).toBe(true)
+  })
+})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.ts
new file mode 100644
index 000000000000..b5bfed92100b
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.ts
@@ -0,0 +1,5 @@
+import { db } from 'src/lib/db'
+
+export const users = () => {
+  return db.user.findMany()
+}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.test.ts
new file mode 100644
index 000000000000..5a73412f0b9d
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.test.ts
@@ -0,0 +1,7 @@
+import { users } from './users'
+
+describe('users', () => {
+  it('returns true', () => {
+    expect(true).toBe(true)
+  })
+})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.ts
new file mode 100644
index 000000000000..b5bfed92100b
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.ts
@@ -0,0 +1,5 @@
+import { db } from 'src/lib/db'
+
+export const users = () => {
+  return db.user.findMany()
+}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.test.ts
new file mode 100644
index 000000000000..b5ff8afbdfc3
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.test.ts
@@ -0,0 +1,7 @@
+import { posts } from './posts'
+
+describe('posts', () => {
+  it('returns true', () => {
+    expect(true).toBe(true)
+  })
+})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.ts
new file mode 100644
index 000000000000..a3af67dc165b
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.ts
@@ -0,0 +1,44 @@
+import { db } from 'src/lib/db'
+import {
+  PostWhereUniqueInput,
+  PostCreateInput,
+  PostUpdateInput,
+} from '@prisma/client'
+
+export const posts = () => {
+  return db.post.findMany()
+}
+
+export const post = ({ id }: PostWhereUniqueInput) => {
+  return db.post.findOne({
+    where: { id },
+  })
+}
+
+interface CreatePostArgs {
+  input: PostCreateInput
+}
+
+export const createPost = ({ input }) => {
+  return db.post.create({
+    data: input,
+  })
+}
+
+interface UpdatePostArgs {
+  where: PostWhereUniqueInput
+  input: PostUpdateInput
+}
+
+export const updatePost = ({ id, input }) => {
+  return db.post.update({
+    data: input,
+    where: { id },
+  })
+}
+
+export const deletePost = ({ id }: PostWhereUniqueInput) => {
+  return db.post.delete({
+    where: { id },
+  })
+}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.ts
new file mode 100644
index 000000000000..b1c72da817c6
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.ts
@@ -0,0 +1,9 @@
+import { db } from 'src/lib/db'
+
+export const users = () => {
+  return db.user.findMany()
+}
+
+export const User = {
+  identity: (_obj, { root }) => db.user.findOne({ where: { id: root.id } }).identity(),
+}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.ts
new file mode 100644
index 000000000000..b5ff8afbdfc3
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.ts
@@ -0,0 +1,7 @@
+import { posts } from './posts'
+
+describe('posts', () => {
+  it('returns true', () => {
+    expect(true).toBe(true)
+  })
+})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.ts
new file mode 100644
index 000000000000..5dd425efe5ea
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.ts
@@ -0,0 +1,44 @@
+import { db } from 'src/lib/db'
+import {
+  PostWhereUniqueInput,
+  PostCreateInput,
+  PostUpdateInput,
+} from '@prisma/client'
+
+export const posts = () => {
+  return db.post.findMany()
+}
+
+export const post = ({ id }: PostWhereUniqueInput) => {
+  return db.post.findOne({
+    where: { id },
+  })
+}
+
+interface CreatePostArgs {
+  input: PostCreateInput
+}
+
+export const createPost = ({ input }: CreatePostArgs) => {
+  return db.post.create({
+    data: input,
+  })
+}
+
+interface UpdatePostArgs {
+  where: PostWhereUniqueInput
+  input: PostUpdateInput
+}
+
+export const updatePost = ({ id, input }: UpdatePostArgs) => {
+  return db.post.update({
+    data: input,
+    where: { id },
+  })
+}
+
+export const deletePost = ({ id }: PostWhereUniqueInput) => {
+  return db.post.delete({
+    where: { id },
+  })
+}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.ts
new file mode 100644
index 000000000000..200d1809af15
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.ts
@@ -0,0 +1,9 @@
+import { db } from 'src/lib/db'
+
+export const users = () => {
+  return db.user.findMany()
+}
+
+export const User = {
+  userProfiles: (_obj, { root }) => db.user.findOne({ where: { id: root.id } }).userProfiles(),
+}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.ts
new file mode 100644
index 000000000000..1dfea708f072
--- /dev/null
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.ts
@@ -0,0 +1,10 @@
+import { db } from 'src/lib/db'
+
+export const users = () => {
+  return db.user.findMany()
+}
+
+export const User = {
+  userProfiles: (_obj, { root }) => db.user.findOne({ where: { id: root.id } }).userProfiles(),
+  identity: (_obj, { root }) => db.user.findOne({ where: { id: root.id } }).identity(),
+}
diff --git a/packages/cli/src/commands/generate/service/__tests__/service.test.js b/packages/cli/src/commands/generate/service/__tests__/service.test.js
index 3ae77b8b6a07..94a6f311f8db 100644
--- a/packages/cli/src/commands/generate/service/__tests__/service.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/service.test.js
@@ -3,144 +3,241 @@ import { loadGeneratorFixture } from 'src/lib/test'
 
 import * as service from '../service'
 
-test('returns exactly 2 files', async () => {
-  const files = await service.files({
-    name: 'User',
-    crud: false,
-    relations: [],
+const extensionForBaseArgs = (baseArgs) =>
+  baseArgs && baseArgs.typescript ? 'ts' : 'js'
+
+const itReturnsExactly2Files = (baseArgs) => {
+  test('returns exactly 2 files', async () => {
+    const files = await service.files({
+      ...baseArgs,
+      name: 'User',
+      crud: false,
+      relations: [],
+    })
+
+    expect(Object.keys(files).length).toEqual(2)
   })
-
-  expect(Object.keys(files).length).toEqual(2)
-})
-
-test('creates a single word service file', async () => {
-  const files = await service.files({
-    name: 'User',
-    crud: false,
-    relations: [],
+}
+const itCreatesASingleWordServiceFile = (baseArgs) => {
+  test('creates a single word service file', async () => {
+    const files = await service.files({
+      ...baseArgs,
+      name: 'User',
+      crud: false,
+      relations: [],
+    })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[`/path/to/project/api/src/services/users/users.${extension}`]
+    ).toEqual(loadGeneratorFixture('service', `singleWord.${extension}`))
   })
-
-  expect(files['/path/to/project/api/src/services/users/users.js']).toEqual(
-    loadGeneratorFixture('service', 'singleWord.js')
-  )
-})
-
-test('creates a single word service test file', async () => {
-  const files = await service.files({
-    name: 'User',
-    crud: false,
-    relations: null,
+}
+const itCreatesASingleWordServiceTestFile = (baseArgs) => {
+  test('creates a single word service test file', async () => {
+    const files = await service.files({
+      ...baseArgs,
+      name: 'User',
+      crud: false,
+      relations: null,
+    })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[`/path/to/project/api/src/services/users/users.test.${extension}`]
+    ).toEqual(loadGeneratorFixture('service', `singleWord.test.${extension}`))
   })
-
-  expect(
-    files['/path/to/project/api/src/services/users/users.test.js']
-  ).toEqual(loadGeneratorFixture('service', 'singleWord.test.js'))
-})
-
-test('creates a multi word service file', async () => {
-  const files = await service.files({
-    name: 'UserProfile',
-    crud: false,
-    relations: null,
+}
+
+const itCreatesAMultiWordServiceFile = (baseArgs) => {
+  test('creates a multi word service file', async () => {
+    const files = await service.files({
+      ...baseArgs,
+      name: 'UserProfile',
+      crud: false,
+      relations: null,
+    })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[
+        `/path/to/project/api/src/services/userProfiles/userProfiles.${extension}`
+      ]
+    ).toEqual(loadGeneratorFixture('service', `multiWord.${extension}`))
   })
-
-  expect(
-    files['/path/to/project/api/src/services/userProfiles/userProfiles.js']
-  ).toEqual(loadGeneratorFixture('service', 'multiWord.js'))
-})
-
-test('creates a multi word service test file', async () => {
-  const files = await service.files({
-    name: 'UserProfile',
-    crud: false,
-    relations: null,
+}
+
+const itCreatesAMultiWordServiceTestFile = (baseArgs) => {
+  test('creates a multi word service test file', async () => {
+    const files = await service.files({
+      ...baseArgs,
+      name: 'UserProfile',
+      crud: false,
+      relations: null,
+    })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[
+        `/path/to/project/api/src/services/userProfiles/userProfiles.test.${extension}`
+      ]
+    ).toEqual(loadGeneratorFixture('service', `multiWord.test.${extension}`))
   })
-
-  expect(
-    files['/path/to/project/api/src/services/userProfiles/userProfiles.test.js']
-  ).toEqual(loadGeneratorFixture('service', 'multiWord.test.js'))
-})
-
-test('creates a single word service file with CRUD actions', async () => {
-  const files = await service.files({
-    name: 'Post',
-    crud: true,
-    relations: null,
+}
+
+const itCreatesASingleWordServiceFileWithCRUDActions = (baseArgs) => {
+  test('creates a single word service file with CRUD actions', async () => {
+    const files = await service.files({
+      ...baseArgs,
+      name: 'Post',
+      crud: true,
+      relations: null,
+    })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[`/path/to/project/api/src/services/posts/posts.${extension}`]
+    ).toEqual(loadGeneratorFixture('service', `singleWord_crud.${extension}`))
   })
-
-  expect(files['/path/to/project/api/src/services/posts/posts.js']).toEqual(
-    loadGeneratorFixture('service', 'singleWord_crud.js')
-  )
-})
-
-test('creates a service test file with CRUD actions', async () => {
-  const files = await service.files({
-    name: 'Post',
-    crud: true,
-    relations: null,
+}
+
+const itCreatesASingleWordServiceTestFileWithCRUDActions = (baseArgs) => {
+  test('creates a service test file with CRUD actions', async () => {
+    const files = await service.files({
+      ...baseArgs,
+      name: 'Post',
+      crud: true,
+      relations: null,
+    })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[`/path/to/project/api/src/services/posts/posts.test.${extension}`]
+    ).toEqual(
+      loadGeneratorFixture('service', `singleWord_crud.test.${extension}`)
+    )
   })
-
-  expect(
-    files['/path/to/project/api/src/services/posts/posts.test.js']
-  ).toEqual(loadGeneratorFixture('service', 'singleWord_crud.test.js'))
-})
-
-test('creates a multi word service file with CRUD actions', async () => {
-  const files = await service.files({
-    name: 'UserProfile',
-    crud: true,
-    relations: null,
+}
+
+const itCreatesAMultiWordServiceFileWithCRUDActions = (baseArgs) => {
+  test('creates a multi word service file with CRUD actions', async () => {
+    const files = await service.files({
+      ...baseArgs,
+      name: 'UserProfile',
+      crud: true,
+      relations: null,
+    })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[
+        `/path/to/project/api/src/services/userProfiles/userProfiles.${extension}`
+      ]
+    ).toEqual(loadGeneratorFixture('service', `multiWord_crud.${extension}`))
   })
-
-  expect(
-    files['/path/to/project/api/src/services/userProfiles/userProfiles.js']
-  ).toEqual(loadGeneratorFixture('service', 'multiWord_crud.js'))
-})
-
-test('creates a multi word service test file with CRUD actions', async () => {
-  const files = await service.files({
-    name: 'UserProfile',
-    crud: true,
-    relations: null,
+}
+const itCreatesAMultiWordServiceTestFileWithCRUDActions = (baseArgs) => {
+  test('creates a multi word service test file with CRUD actions', async () => {
+    const files = await service.files({
+      ...baseArgs,
+      name: 'UserProfile',
+      crud: true,
+      relations: null,
+    })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[
+        `/path/to/project/api/src/services/userProfiles/userProfiles.test.${extension}`
+      ]
+    ).toEqual(
+      loadGeneratorFixture('service', `multiWord_crud.test.${extension}`)
+    )
   })
-
-  expect(
-    files['/path/to/project/api/src/services/userProfiles/userProfiles.test.js']
-  ).toEqual(loadGeneratorFixture('service', 'multiWord_crud.test.js'))
-})
-
-test('creates a single word service file with a hasMany relation', async () => {
-  const files = await service.files({
-    name: 'User',
-    crud: false,
-    relations: ['userProfiles'],
+}
+
+const itCreatesASingleWordServiceFileWithAHasManyRelation = (baseArgs) => {
+  test('creates a single word service file with a hasMany relation', async () => {
+    const files = await service.files({
+      ...baseArgs,
+      name: 'User',
+      crud: false,
+      relations: ['userProfiles'],
+    })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[`/path/to/project/api/src/services/users/users.${extension}`]
+    ).toEqual(
+      loadGeneratorFixture('service', `singleWord_hasMany.${extension}`)
+    )
   })
-
-  expect(files['/path/to/project/api/src/services/users/users.js']).toEqual(
-    loadGeneratorFixture('service', 'singleWord_hasMany.js')
-  )
-})
-
-test('creates a single word service file with a belongsTo relation', async () => {
-  const files = await service.files({
-    name: 'User',
-    crud: false,
-    relations: ['identity'],
+}
+
+const itCreatesASingleWordServiceFileWithABelongsToRelation = (baseArgs) => {
+  test('creates a single word service file with a belongsTo relation', async () => {
+    const files = await service.files({
+      ...baseArgs,
+      name: 'User',
+      crud: false,
+      relations: ['identity'],
+    })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[`/path/to/project/api/src/services/users/users.${extension}`]
+    ).toEqual(
+      loadGeneratorFixture('service', `singleWord_belongsTo.${extension}`)
+    )
   })
-
-  expect(files['/path/to/project/api/src/services/users/users.js']).toEqual(
-    loadGeneratorFixture('service', 'singleWord_belongsTo.js')
-  )
-})
-
-test('creates a single word service file with multiple relations', async () => {
-  const files = await service.files({
-    name: 'User',
-    crud: false,
-    relations: ['userProfiles', 'identity'],
+}
+
+const itCreatesASingleWordServiceFileWithMultipleRelations = (baseArgs) => {
+  test('creates a single word service file with multiple relations', async () => {
+    const files = await service.files({
+      ...baseArgs,
+      name: 'User',
+      crud: false,
+      relations: ['userProfiles', 'identity'],
+    })
+    const extension = extensionForBaseArgs(baseArgs)
+
+    expect(
+      files[`/path/to/project/api/src/services/users/users.${extension}`]
+    ).toEqual(
+      loadGeneratorFixture('service', `singleWord_multiple.${extension}`)
+    )
   })
+}
+
+describe('in javascript mode', () => {
+  itReturnsExactly2Files()
+  itCreatesASingleWordServiceFile()
+  itCreatesASingleWordServiceTestFile()
+  itCreatesAMultiWordServiceFile()
+  itCreatesAMultiWordServiceTestFile()
+  itCreatesASingleWordServiceFileWithCRUDActions()
+  itCreatesASingleWordServiceTestFileWithCRUDActions()
+  itCreatesAMultiWordServiceFileWithCRUDActions()
+  itCreatesAMultiWordServiceTestFileWithCRUDActions()
+  itCreatesASingleWordServiceFileWithAHasManyRelation()
+  itCreatesASingleWordServiceFileWithABelongsToRelation()
+  itCreatesASingleWordServiceFileWithMultipleRelations()
+})
 
-  expect(files['/path/to/project/api/src/services/users/users.js']).toEqual(
-    loadGeneratorFixture('service', 'singleWord_multiple.js')
-  )
+describe('in typescript mode', () => {
+  const baseArgs = { typescript: true }
+
+  itReturnsExactly2Files(baseArgs)
+  itCreatesASingleWordServiceFile(baseArgs)
+  itCreatesASingleWordServiceTestFile(baseArgs)
+  itCreatesAMultiWordServiceFile(baseArgs)
+  itCreatesAMultiWordServiceTestFile(baseArgs)
+  itCreatesASingleWordServiceFileWithCRUDActions(baseArgs)
+  itCreatesASingleWordServiceTestFileWithCRUDActions(baseArgs)
+  itCreatesAMultiWordServiceFileWithCRUDActions(baseArgs)
+  itCreatesAMultiWordServiceTestFileWithCRUDActions(baseArgs)
+  itCreatesASingleWordServiceFileWithAHasManyRelation(baseArgs)
+  itCreatesASingleWordServiceFileWithABelongsToRelation(baseArgs)
+  itCreatesASingleWordServiceFileWithMultipleRelations(baseArgs)
 })
diff --git a/packages/cli/src/commands/generate/service/templates/service.ts.template b/packages/cli/src/commands/generate/service/templates/service.ts.template
index 0ad65cbd7a5e..996dbf2723b4 100644
--- a/packages/cli/src/commands/generate/service/templates/service.ts.template
+++ b/packages/cli/src/commands/generate/service/templates/service.ts.template
@@ -1,29 +1,43 @@
 import { db } from 'src/lib/db'
-
+<%if (crud) { %>import {
+  ${singularPascalName}WhereUniqueInput,
+  ${singularPascalName}CreateInput,
+  ${singularPascalName}UpdateInput,
+} from '@prisma/client'
+<% } %>
 export const ${pluralCamelName} = () => {
   return db.${singularCamelName}.findMany()
 }<% if (crud) { %>
 
-export const ${singularCamelName} = ({ id }) => {
+export const ${singularCamelName} = ({ id }: ${singularPascalName}WhereUniqueInput) => {
   return db.${singularCamelName}.findOne({
     where: { id },
   })
 }
 
-export const create${singularPascalName} = ({ input }) => {
+interface Create${singularPascalName}Args {
+  input: ${singularPascalName}CreateInput
+}
+
+export const create${singularPascalName} = ({ input }: Create${singularPascalName}Args) => {
   return db.${singularCamelName}.create({
     data: input,
   })
 }
 
-export const update${singularPascalName} = ({ id, input }) => {
+interface Update${singularPascalName}Args {
+  where: ${singularPascalName}WhereUniqueInput
+  input: ${singularPascalName}UpdateInput
+}
+
+export const update${singularPascalName} = ({ id, input }: Update${singularPascalName}Args) => {
   return db.${singularCamelName}.update({
     data: input,
     where: { id },
   })
 }
 
-export const delete${singularPascalName} = ({ id }) => {
+export const delete${singularPascalName} = ({ id }: ${singularPascalName}WhereUniqueInput) => {
   return db.${singularCamelName}.delete({
     where: { id },
   })

From 25bdd19a3620bdd53a4420b5226f8040fff82ef5 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Sat, 16 May 2020 10:51:56 -0400
Subject: [PATCH 08/25] remote dupe test fixtures

---
 .../__tests__/fixtures/multiWordService.js    |  5 ---
 .../fixtures/multiWordService.test.js         |  7 ---
 .../fixtures/multiWordService.test.ts         |  7 ---
 .../__tests__/fixtures/multiWordService.ts    |  5 ---
 .../fixtures/multiWordServiceCrud.js          | 30 -------------
 .../fixtures/multiWordServiceCrud.test.js     |  7 ---
 .../fixtures/multiWordServiceCrud.test.ts     |  7 ---
 .../fixtures/multiWordServiceCrud.ts          | 45 -------------------
 .../__tests__/fixtures/singleWordService.js   |  5 ---
 .../fixtures/singleWordService.test.js        |  7 ---
 .../fixtures/singleWordService.test.ts        |  7 ---
 .../__tests__/fixtures/singleWordService.ts   |  5 ---
 .../fixtures/singleWordServiceCrud.js         | 30 -------------
 .../fixtures/singleWordServiceCrud.test.js    |  7 ---
 .../fixtures/singleWordServiceCrud.test.ts    |  7 ---
 .../fixtures/singleWordServiceCrud.ts         | 44 ------------------
 16 files changed, 225 deletions(-)
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.js
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.test.js
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.test.ts
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.ts
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.js
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.test.js
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.test.ts
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.ts
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.js
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.test.js
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.test.ts
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.ts
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.js
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.test.js
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.test.ts
 delete mode 100644 packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.ts

diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.js
deleted file mode 100644
index 2f54fb24b2c6..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { db } from 'src/lib/db'
-
-export const userProfiles = () => {
-  return db.userProfile.findMany()
-}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.test.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.test.js
deleted file mode 100644
index 0c1f26ab30ed..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.test.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { userProfiles } from './userProfiles'
-
-describe('userProfiles', () => {
-  it('returns true', () => {
-    expect(true).toBe(true)
-  })
-})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.test.ts
deleted file mode 100644
index 0c1f26ab30ed..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.test.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { userProfiles } from './userProfiles'
-
-describe('userProfiles', () => {
-  it('returns true', () => {
-    expect(true).toBe(true)
-  })
-})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.ts
deleted file mode 100644
index 2f54fb24b2c6..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordService.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { db } from 'src/lib/db'
-
-export const userProfiles = () => {
-  return db.userProfile.findMany()
-}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.js
deleted file mode 100644
index 8be74a61b2e7..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { db } from 'src/lib/db'
-
-export const userProfiles = () => {
-  return db.userProfile.findMany()
-}
-
-export const userProfile = ({ id }) => {
-  return db.userProfile.findOne({
-    where: { id },
-  })
-}
-
-export const createUserProfile = ({ input }) => {
-  return db.userProfile.create({
-    data: input,
-  })
-}
-
-export const updateUserProfile = ({ id, input }) => {
-  return db.userProfile.update({
-    data: input,
-    where: { id },
-  })
-}
-
-export const deleteUserProfile = ({ id }) => {
-  return db.userProfile.delete({
-    where: { id },
-  })
-}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.test.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.test.js
deleted file mode 100644
index 0c1f26ab30ed..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.test.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { userProfiles } from './userProfiles'
-
-describe('userProfiles', () => {
-  it('returns true', () => {
-    expect(true).toBe(true)
-  })
-})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.test.ts
deleted file mode 100644
index 0c1f26ab30ed..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.test.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { userProfiles } from './userProfiles'
-
-describe('userProfiles', () => {
-  it('returns true', () => {
-    expect(true).toBe(true)
-  })
-})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.ts
deleted file mode 100644
index 57a2c078ae3d..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWordServiceCrud.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { db } from 'src/lib/db'
-import {
-  UserProfileWhereUniqueInput,
-  UserProfileCreateInput,
-  UserProfileUpdateInput,
-} from '@prisma/client'
-
-
-export const userProfiles = () => {
-  return db.userProfile.findMany()
-}
-
-export const userProfile = ({ id }: UserProfileWhereUniqueInput) => {
-  return db.userProfile.findOne({
-    where: { id },
-  })
-}
-
-interface CreateUserProfileArgs {
-  input: UserProfileCreateInput
-}
-
-export const createUserProfile = ({ input }: CreateUserProfileArgs) => {
-  return db.userProfile.create({
-    data: input,
-  })
-}
-
-interface UpdateUserProfileArgs {
-  where: UserProfileWhereUniqueInput
-  input: UserProfileUpdateInput
-}
-
-export const updateUserProfile = ({ id, input }: UpdateUserProfileArgs) => {
-  return db.userProfile.update({
-    data: input,
-    where: { id },
-  })
-}
-
-export const deleteUserProfile = ({ id }: UserProfileWhereUniqueInput) => {
-  return db.userProfile.delete({
-    where: { id },
-  })
-}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.js
deleted file mode 100644
index b5bfed92100b..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { db } from 'src/lib/db'
-
-export const users = () => {
-  return db.user.findMany()
-}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.test.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.test.js
deleted file mode 100644
index 5a73412f0b9d..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.test.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { users } from './users'
-
-describe('users', () => {
-  it('returns true', () => {
-    expect(true).toBe(true)
-  })
-})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.test.ts
deleted file mode 100644
index 5a73412f0b9d..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.test.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { users } from './users'
-
-describe('users', () => {
-  it('returns true', () => {
-    expect(true).toBe(true)
-  })
-})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.ts
deleted file mode 100644
index b5bfed92100b..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordService.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { db } from 'src/lib/db'
-
-export const users = () => {
-  return db.user.findMany()
-}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.js
deleted file mode 100644
index be53d32bf06f..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { db } from 'src/lib/db'
-
-export const posts = () => {
-  return db.post.findMany()
-}
-
-export const post = ({ id }) => {
-  return db.post.findOne({
-    where: { id },
-  })
-}
-
-export const createPost = ({ input }) => {
-  return db.post.create({
-    data: input,
-  })
-}
-
-export const updatePost = ({ id, input }) => {
-  return db.post.update({
-    data: input,
-    where: { id },
-  })
-}
-
-export const deletePost = ({ id }) => {
-  return db.post.delete({
-    where: { id },
-  })
-}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.test.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.test.js
deleted file mode 100644
index b5ff8afbdfc3..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.test.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { posts } from './posts'
-
-describe('posts', () => {
-  it('returns true', () => {
-    expect(true).toBe(true)
-  })
-})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.test.ts
deleted file mode 100644
index b5ff8afbdfc3..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.test.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { posts } from './posts'
-
-describe('posts', () => {
-  it('returns true', () => {
-    expect(true).toBe(true)
-  })
-})
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.ts
deleted file mode 100644
index a3af67dc165b..000000000000
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWordServiceCrud.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { db } from 'src/lib/db'
-import {
-  PostWhereUniqueInput,
-  PostCreateInput,
-  PostUpdateInput,
-} from '@prisma/client'
-
-export const posts = () => {
-  return db.post.findMany()
-}
-
-export const post = ({ id }: PostWhereUniqueInput) => {
-  return db.post.findOne({
-    where: { id },
-  })
-}
-
-interface CreatePostArgs {
-  input: PostCreateInput
-}
-
-export const createPost = ({ input }) => {
-  return db.post.create({
-    data: input,
-  })
-}
-
-interface UpdatePostArgs {
-  where: PostWhereUniqueInput
-  input: PostUpdateInput
-}
-
-export const updatePost = ({ id, input }) => {
-  return db.post.update({
-    data: input,
-    where: { id },
-  })
-}
-
-export const deletePost = ({ id }: PostWhereUniqueInput) => {
-  return db.post.delete({
-    where: { id },
-  })
-}

From b0172fd3357bfe6704876ebd13f7ea07176f8ffc Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Sun, 17 May 2020 07:59:18 -0400
Subject: [PATCH 09/25] add graphql types for generated relations in services

---
 packages/api/src/types.ts                           |  8 ++++++++
 .../service/__tests__/fixtures/multiWord_crud.ts    |  2 +-
 .../__tests__/fixtures/singleWord_belongsTo.ts      |  6 +++++-
 .../service/__tests__/fixtures/singleWord_crud.ts   |  2 +-
 .../__tests__/fixtures/singleWord_hasMany.ts        |  6 +++++-
 .../__tests__/fixtures/singleWord_multiple.ts       |  8 ++++++--
 .../generate/service/templates/service.ts.template  | 13 +++++++------
 7 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/packages/api/src/types.ts b/packages/api/src/types.ts
index 1fa70d8776e1..1370f9da75d4 100644
--- a/packages/api/src/types.ts
+++ b/packages/api/src/types.ts
@@ -1,3 +1,5 @@
+import { GraphQLResolveInfo } from 'graphql'
+
 export type Services = { [funcName: string]: any }
 export type ImportedServices = {
   [serviceName: string]: Services
@@ -6,3 +8,9 @@ export interface MakeServicesInterface {
   services: ImportedServices
 }
 export type MakeServices = (args: MakeServicesInterface) => Services
+
+export interface ResolverArgs<M> {
+  root: M
+  context: any
+  info: GraphQLResolveInfo
+}
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.ts
index d76defc6958a..a2bf9912d8f8 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.ts
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.ts
@@ -1,9 +1,9 @@
-import { db } from 'src/lib/db'
 import {
   UserProfileWhereUniqueInput,
   UserProfileCreateInput,
   UserProfileUpdateInput,
 } from '@prisma/client'
+import { db } from 'src/lib/db'
 
 export const userProfiles = () => {
   return db.userProfile.findMany()
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.ts
index b1c72da817c6..42948794e96c 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.ts
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.ts
@@ -1,3 +1,7 @@
+import {
+  UserWhereUniqueInput,
+} from '@prisma/client'
+import { ResolverArgs } from '@redwoodjs/api/dist/types'
 import { db } from 'src/lib/db'
 
 export const users = () => {
@@ -5,5 +9,5 @@ export const users = () => {
 }
 
 export const User = {
-  identity: (_obj, { root }) => db.user.findOne({ where: { id: root.id } }).identity(),
+  identity: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) => db.user.findOne({ where: { id: root.id } }).identity(),
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.ts
index 5dd425efe5ea..2b47200240d1 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.ts
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.ts
@@ -1,9 +1,9 @@
-import { db } from 'src/lib/db'
 import {
   PostWhereUniqueInput,
   PostCreateInput,
   PostUpdateInput,
 } from '@prisma/client'
+import { db } from 'src/lib/db'
 
 export const posts = () => {
   return db.post.findMany()
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.ts
index 200d1809af15..6c809906926e 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.ts
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.ts
@@ -1,3 +1,7 @@
+import {
+  UserWhereUniqueInput,
+} from '@prisma/client'
+import { ResolverArgs } from '@redwoodjs/api/dist/types'
 import { db } from 'src/lib/db'
 
 export const users = () => {
@@ -5,5 +9,5 @@ export const users = () => {
 }
 
 export const User = {
-  userProfiles: (_obj, { root }) => db.user.findOne({ where: { id: root.id } }).userProfiles(),
+  userProfiles: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) => db.user.findOne({ where: { id: root.id } }).userProfiles(),
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.ts
index 1dfea708f072..3daed180d7f4 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.ts
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.ts
@@ -1,3 +1,7 @@
+import {
+  UserWhereUniqueInput,
+} from '@prisma/client'
+import { ResolverArgs } from '@redwoodjs/api/dist/types'
 import { db } from 'src/lib/db'
 
 export const users = () => {
@@ -5,6 +9,6 @@ export const users = () => {
 }
 
 export const User = {
-  userProfiles: (_obj, { root }) => db.user.findOne({ where: { id: root.id } }).userProfiles(),
-  identity: (_obj, { root }) => db.user.findOne({ where: { id: root.id } }).identity(),
+  userProfiles: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) => db.user.findOne({ where: { id: root.id } }).userProfiles(),
+  identity: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) => db.user.findOne({ where: { id: root.id } }).identity(),
 }
diff --git a/packages/cli/src/commands/generate/service/templates/service.ts.template b/packages/cli/src/commands/generate/service/templates/service.ts.template
index 996dbf2723b4..45ef7b4e1292 100644
--- a/packages/cli/src/commands/generate/service/templates/service.ts.template
+++ b/packages/cli/src/commands/generate/service/templates/service.ts.template
@@ -1,10 +1,11 @@
-import { db } from 'src/lib/db'
-<%if (crud) { %>import {
-  ${singularPascalName}WhereUniqueInput,
+<%if (crud || relations.length > 0) { %>import {
+  ${singularPascalName}WhereUniqueInput,<% if (crud) { %>
   ${singularPascalName}CreateInput,
-  ${singularPascalName}UpdateInput,
+  ${singularPascalName}UpdateInput,<% } %>
 } from '@prisma/client'
-<% } %>
+<% } %><% if (relations.length) { %>import { ResolverArgs } from '@redwoodjs/api/dist/types'
+<% } %>import { db } from 'src/lib/db'
+
 export const ${pluralCamelName} = () => {
   return db.${singularCamelName}.findMany()
 }<% if (crud) { %>
@@ -44,5 +45,5 @@ export const delete${singularPascalName} = ({ id }: ${singularPascalName}WhereUn
 }<% } %><% if (relations.length) { %>
 
 export const ${singularPascalName} = {<% relations.forEach(relation => { %>
-  ${relation}: (_obj, { root }) => db.${singularCamelName}.findOne({ where: { id: root.id } }).${relation}(),<% }) %>
+  ${relation}: (_obj, { root }: ResolverArgs<${singularPascalName}WhereUniqueInput>) => db.${singularCamelName}.findOne({ where: { id: root.id } }).${relation}(),<% }) %>
 }<% } %>

From 284c0f45bc024f9e0d86d83106eae8587110e8fd Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Mon, 18 May 2020 08:45:50 -0400
Subject: [PATCH 10/25] use only ts template for services

---
 packages/cli/package.json                     |  6 ++++
 .../__tests__/fixtures/multiWord.test.js      |  2 ++
 .../__tests__/fixtures/multiWord.test.ts      |  2 ++
 .../__tests__/fixtures/multiWord_crud.test.js |  2 ++
 .../__tests__/fixtures/multiWord_crud.test.ts |  2 ++
 .../__tests__/fixtures/singleWord.test.js     |  2 ++
 .../__tests__/fixtures/singleWord.test.ts     |  2 ++
 .../fixtures/singleWord_belongsTo.js          |  3 +-
 .../fixtures/singleWord_belongsTo.ts          |  7 ++--
 .../fixtures/singleWord_crud.test.js          |  2 ++
 .../fixtures/singleWord_crud.test.ts          |  2 ++
 .../__tests__/fixtures/singleWord_hasMany.js  |  3 +-
 .../__tests__/fixtures/singleWord_hasMany.ts  |  7 ++--
 .../__tests__/fixtures/singleWord_multiple.js |  6 ++--
 .../__tests__/fixtures/singleWord_multiple.ts | 10 +++---
 .../service/__tests__/service.test.js         | 15 ++++++++
 .../src/commands/generate/service/service.js  | 20 ++++++++++-
 .../service/templates/service.js.template     | 34 -------------------
 .../service/templates/test.js.template        |  7 ----
 .../service/templates/test.ts.template        |  2 ++
 packages/cli/src/lib/index.js                 |  4 ++-
 21 files changed, 80 insertions(+), 60 deletions(-)
 delete mode 100644 packages/cli/src/commands/generate/service/templates/service.js.template
 delete mode 100644 packages/cli/src/commands/generate/service/templates/test.js.template

diff --git a/packages/cli/package.json b/packages/cli/package.json
index d837b789ff19..cbcc15b46e87 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -13,8 +13,14 @@
     "dist"
   ],
   "dependencies": {
+<<<<<<< HEAD
     "@prisma/sdk": "^2.0.0-beta.6",
     "@redwoodjs/internal": "^0.8.1",
+=======
+    "@prisma/sdk": "^2.0.0-beta.5",
+    "@redwoodjs/internal": "^0.7.1-canary.8",
+    "babel-plugin-generator-prettier": "^1.2.0",
+>>>>>>> a81200f... use only ts template for services
     "camelcase": "^5.3.1",
     "chalk": "^3.0.0",
     "concurrently": "^5.1.0",
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.js
index 0c1f26ab30ed..7002f191355f 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.js
@@ -1,4 +1,6 @@
+/*
 import { userProfiles } from './userProfiles'
+*/
 
 describe('userProfiles', () => {
   it('returns true', () => {
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.ts
index 0c1f26ab30ed..7002f191355f 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.ts
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.ts
@@ -1,4 +1,6 @@
+/*
 import { userProfiles } from './userProfiles'
+*/
 
 describe('userProfiles', () => {
   it('returns true', () => {
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.js
index 0c1f26ab30ed..7002f191355f 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.js
@@ -1,4 +1,6 @@
+/*
 import { userProfiles } from './userProfiles'
+*/
 
 describe('userProfiles', () => {
   it('returns true', () => {
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.ts
index 0c1f26ab30ed..7002f191355f 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.ts
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.ts
@@ -1,4 +1,6 @@
+/*
 import { userProfiles } from './userProfiles'
+*/
 
 describe('userProfiles', () => {
   it('returns true', () => {
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.js
index 5a73412f0b9d..bac7cb4ed5c6 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.js
@@ -1,4 +1,6 @@
+/*
 import { users } from './users'
+*/
 
 describe('users', () => {
   it('returns true', () => {
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.ts
index 5a73412f0b9d..bac7cb4ed5c6 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.ts
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.ts
@@ -1,4 +1,6 @@
+/*
 import { users } from './users'
+*/
 
 describe('users', () => {
   it('returns true', () => {
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.js
index b1c72da817c6..2dbdb567cce2 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.js
@@ -5,5 +5,6 @@ export const users = () => {
 }
 
 export const User = {
-  identity: (_obj, { root }) => db.user.findOne({ where: { id: root.id } }).identity(),
+  identity: (_obj, { root }) =>
+    db.user.findOne({ where: { id: root.id } }).identity(),
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.ts
index 42948794e96c..6dcc0c2b3f24 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.ts
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.ts
@@ -1,6 +1,4 @@
-import {
-  UserWhereUniqueInput,
-} from '@prisma/client'
+import { UserWhereUniqueInput } from '@prisma/client'
 import { ResolverArgs } from '@redwoodjs/api/dist/types'
 import { db } from 'src/lib/db'
 
@@ -9,5 +7,6 @@ export const users = () => {
 }
 
 export const User = {
-  identity: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) => db.user.findOne({ where: { id: root.id } }).identity(),
+  identity: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) =>
+    db.user.findOne({ where: { id: root.id } }).identity(),
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.js
index b5ff8afbdfc3..f23483ac34b4 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.js
@@ -1,4 +1,6 @@
+/*
 import { posts } from './posts'
+*/
 
 describe('posts', () => {
   it('returns true', () => {
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.ts
index b5ff8afbdfc3..f23483ac34b4 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.ts
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.ts
@@ -1,4 +1,6 @@
+/*
 import { posts } from './posts'
+*/
 
 describe('posts', () => {
   it('returns true', () => {
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.js
index 200d1809af15..9e66d05df5a7 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.js
@@ -5,5 +5,6 @@ export const users = () => {
 }
 
 export const User = {
-  userProfiles: (_obj, { root }) => db.user.findOne({ where: { id: root.id } }).userProfiles(),
+  userProfiles: (_obj, { root }) =>
+    db.user.findOne({ where: { id: root.id } }).userProfiles(),
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.ts
index 6c809906926e..ace7796aeda6 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.ts
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.ts
@@ -1,6 +1,4 @@
-import {
-  UserWhereUniqueInput,
-} from '@prisma/client'
+import { UserWhereUniqueInput } from '@prisma/client'
 import { ResolverArgs } from '@redwoodjs/api/dist/types'
 import { db } from 'src/lib/db'
 
@@ -9,5 +7,6 @@ export const users = () => {
 }
 
 export const User = {
-  userProfiles: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) => db.user.findOne({ where: { id: root.id } }).userProfiles(),
+  userProfiles: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) =>
+    db.user.findOne({ where: { id: root.id } }).userProfiles(),
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.js
index 1dfea708f072..69686c8a7a6b 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.js
@@ -5,6 +5,8 @@ export const users = () => {
 }
 
 export const User = {
-  userProfiles: (_obj, { root }) => db.user.findOne({ where: { id: root.id } }).userProfiles(),
-  identity: (_obj, { root }) => db.user.findOne({ where: { id: root.id } }).identity(),
+  userProfiles: (_obj, { root }) =>
+    db.user.findOne({ where: { id: root.id } }).userProfiles(),
+  identity: (_obj, { root }) =>
+    db.user.findOne({ where: { id: root.id } }).identity(),
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.ts b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.ts
index 3daed180d7f4..b1b76038928b 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.ts
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.ts
@@ -1,6 +1,4 @@
-import {
-  UserWhereUniqueInput,
-} from '@prisma/client'
+import { UserWhereUniqueInput } from '@prisma/client'
 import { ResolverArgs } from '@redwoodjs/api/dist/types'
 import { db } from 'src/lib/db'
 
@@ -9,6 +7,8 @@ export const users = () => {
 }
 
 export const User = {
-  userProfiles: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) => db.user.findOne({ where: { id: root.id } }).userProfiles(),
-  identity: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) => db.user.findOne({ where: { id: root.id } }).identity(),
+  userProfiles: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) =>
+    db.user.findOne({ where: { id: root.id } }).userProfiles(),
+  identity: (_obj, { root }: ResolverArgs<UserWhereUniqueInput>) =>
+    db.user.findOne({ where: { id: root.id } }).identity(),
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/service.test.js b/packages/cli/src/commands/generate/service/__tests__/service.test.js
index 94a6f311f8db..4e8bba4e4bd8 100644
--- a/packages/cli/src/commands/generate/service/__tests__/service.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/service.test.js
@@ -1,8 +1,23 @@
 global.__dirname = __dirname
+
 import { loadGeneratorFixture } from 'src/lib/test'
 
 import * as service from '../service'
 
+jest.mock('../../../../lib', () => {
+  const path = require('path')
+  const lib = jest.requireActual('../../../../lib')
+  return {
+    ...lib,
+    prettierOptions: () => {
+      return require(path.resolve(
+        global.__dirname +
+          '../../../../../lib/__tests__/fixtures/prettier.config.js'
+      ))
+    },
+  }
+})
+
 const extensionForBaseArgs = (baseArgs) =>
   baseArgs && baseArgs.typescript ? 'ts' : 'js'
 
diff --git a/packages/cli/src/commands/generate/service/service.js b/packages/cli/src/commands/generate/service/service.js
index e3d11a173ee0..59d9a277e2b6 100644
--- a/packages/cli/src/commands/generate/service/service.js
+++ b/packages/cli/src/commands/generate/service/service.js
@@ -1,6 +1,11 @@
+import { resolve } from 'path'
+
 import camelcase from 'camelcase'
 import pluralize from 'pluralize'
+import * as prettier from 'prettier'
+import * as babel from '@babel/core'
 
+import { prettierOptions } from '../../../lib'
 import {
   templateForComponentFile,
   createYargsForComponentGeneration,
@@ -8,7 +13,8 @@ import {
 
 export const files = async ({ name, relations, ...rest }) => {
   const componentName = camelcase(pluralize(name))
-  const extension = rest.typescript ? 'ts' : 'js'
+  const extension = 'ts'
+  const configOptions = prettierOptions()
   const serviceFile = templateForComponentFile({
     name,
     componentName: componentName,
@@ -34,6 +40,18 @@ export const files = async ({ name, relations, ...rest }) => {
   //    "path/to/fileB": "<<<template>>>",
   // }
   return [serviceFile, testFile].reduce((acc, [outputPath, content]) => {
+    const isTypescript = rest.typescript
+    if (!isTypescript) {
+      content = babel.transform(content, {
+        plugins: ['@babel/plugin-transform-typescript', 'generator-prettier'],
+        generatorOpts: configOptions,
+      }).code
+      outputPath = outputPath.replace('.ts', '.js')
+    }
+    content = prettier.format(content, {
+      ...configOptions,
+      parser: isTypescript ? 'babel-ts' : 'babel',
+    })
     return {
       [outputPath]: content,
       ...acc,
diff --git a/packages/cli/src/commands/generate/service/templates/service.js.template b/packages/cli/src/commands/generate/service/templates/service.js.template
deleted file mode 100644
index 0ad65cbd7a5e..000000000000
--- a/packages/cli/src/commands/generate/service/templates/service.js.template
+++ /dev/null
@@ -1,34 +0,0 @@
-import { db } from 'src/lib/db'
-
-export const ${pluralCamelName} = () => {
-  return db.${singularCamelName}.findMany()
-}<% if (crud) { %>
-
-export const ${singularCamelName} = ({ id }) => {
-  return db.${singularCamelName}.findOne({
-    where: { id },
-  })
-}
-
-export const create${singularPascalName} = ({ input }) => {
-  return db.${singularCamelName}.create({
-    data: input,
-  })
-}
-
-export const update${singularPascalName} = ({ id, input }) => {
-  return db.${singularCamelName}.update({
-    data: input,
-    where: { id },
-  })
-}
-
-export const delete${singularPascalName} = ({ id }) => {
-  return db.${singularCamelName}.delete({
-    where: { id },
-  })
-}<% } %><% if (relations.length) { %>
-
-export const ${singularPascalName} = {<% relations.forEach(relation => { %>
-  ${relation}: (_obj, { root }) => db.${singularCamelName}.findOne({ where: { id: root.id } }).${relation}(),<% }) %>
-}<% } %>
diff --git a/packages/cli/src/commands/generate/service/templates/test.js.template b/packages/cli/src/commands/generate/service/templates/test.js.template
deleted file mode 100644
index 50cc4cc7e42c..000000000000
--- a/packages/cli/src/commands/generate/service/templates/test.js.template
+++ /dev/null
@@ -1,7 +0,0 @@
-import { ${pluralCamelName} } from './${pluralCamelName}'
-
-describe('${pluralCamelName}', () => {
-  it('returns true', () => {
-    expect(true).toBe(true)
-  })
-})
diff --git a/packages/cli/src/commands/generate/service/templates/test.ts.template b/packages/cli/src/commands/generate/service/templates/test.ts.template
index 50cc4cc7e42c..b4a3a5f21039 100644
--- a/packages/cli/src/commands/generate/service/templates/test.ts.template
+++ b/packages/cli/src/commands/generate/service/templates/test.ts.template
@@ -1,4 +1,6 @@
+/*
 import { ${pluralCamelName} } from './${pluralCamelName}'
+*/
 
 describe('${pluralCamelName}', () => {
   it('returns true', () => {
diff --git a/packages/cli/src/lib/index.js b/packages/cli/src/lib/index.js
index ff808501e463..eda21afbf0ca 100644
--- a/packages/cli/src/lib/index.js
+++ b/packages/cli/src/lib/index.js
@@ -174,8 +174,9 @@ export const getPaths = () => {
   try {
     return getRedwoodPaths()
   } catch (e) {
+    console.log(e)
     console.error(c.error(e.message))
-    process.exit(0)
+    //process.exit(0)
   }
 }
 
@@ -184,6 +185,7 @@ export const getPaths = () => {
  */
 export const prettierOptions = () => {
   try {
+    console.log(path.join(getPaths().base, 'prettier.config.js'))
     return require(path.join(getPaths().base, 'prettier.config.js'))
   } catch (e) {
     return undefined

From 3270cb7f8c9ccdf224248c9a7c765c23c03afd02 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Mon, 18 May 2020 13:14:12 -0400
Subject: [PATCH 11/25] extract transform from service, get it working with SDL

---
 .../__tests__/fixtures/enumGeneratedSdl.js    |  2 ++
 .../sdl/__tests__/fixtures/multiWordSdl.js    |  2 ++
 .../__tests__/fixtures/multiWordSdlCrud.js    |  2 ++
 .../sdl/__tests__/fixtures/singleWordSdl.js   |  2 ++
 .../__tests__/fixtures/singleWordSdlCrud.js   |  2 ++
 packages/cli/src/commands/generate/sdl/sdl.js | 14 ++++++++----
 .../service/__tests__/service.test.js         | 14 ------------
 .../src/commands/generate/service/service.js  | 16 +++-----------
 packages/cli/src/lib/index.js                 | 18 +++++++++++++--
 packages/cli/src/lib/test.js                  | 22 +++++++++++++++++++
 yarn.lock                                     | 15 ++++++++++++-
 11 files changed, 75 insertions(+), 34 deletions(-)

diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/enumGeneratedSdl.js b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/enumGeneratedSdl.js
index c43ed4054d3b..22cf0aa7d6ee 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/enumGeneratedSdl.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/enumGeneratedSdl.js
@@ -1,3 +1,5 @@
+import gql from 'graphql-tag'
+
 export const schema = gql`
   type Shoe {
     id: Int!
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdl.js b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdl.js
index 7be7ce0aa6ae..bd895becd864 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdl.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdl.js
@@ -1,3 +1,5 @@
+import gql from 'graphql-tag'
+
 export const schema = gql`
   type UserProfile {
     id: Int!
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdlCrud.js b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdlCrud.js
index 4daa293cfb90..978dd3902eb1 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdlCrud.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdlCrud.js
@@ -1,3 +1,5 @@
+import gql from 'graphql-tag'
+
 export const schema = gql`
   type UserProfile {
     id: Int!
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdl.js b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdl.js
index 48842d8062ba..70df6d89f9fe 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdl.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdl.js
@@ -1,3 +1,5 @@
+import gql from 'graphql-tag'
+
 export const schema = gql`
   type User {
     id: Int!
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdlCrud.js b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdlCrud.js
index 22c00836643d..03e2e78cb282 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdlCrud.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdlCrud.js
@@ -1,3 +1,5 @@
+import gql from 'graphql-tag'
+
 export const schema = gql`
   type Post {
     id: Int!
diff --git a/packages/cli/src/commands/generate/sdl/sdl.js b/packages/cli/src/commands/generate/sdl/sdl.js
index 37bac5612896..d95afc727afb 100644
--- a/packages/cli/src/commands/generate/sdl/sdl.js
+++ b/packages/cli/src/commands/generate/sdl/sdl.js
@@ -7,6 +7,7 @@ import pluralize from 'pluralize'
 
 import {
   generateTemplate,
+  transformTSToJS,
   getSchema,
   getPaths,
   writeFilesTask,
@@ -115,9 +116,8 @@ export const files = async ({ name, crud, typescript }) => {
     enums,
   } = await sdlFromSchemaModel(pascalcase(pluralize.singular(name)))
 
-  const extension = typescript ? 'ts' : 'js'
-  const template = generateTemplate(
-    path.join('sdl', 'templates', `sdl.${extension}.template`),
+  let template = generateTemplate(
+    path.join('sdl', 'templates', `sdl.ts.template`),
     {
       name,
       crud,
@@ -129,10 +129,16 @@ export const files = async ({ name, crud, typescript }) => {
     }
   )
 
-  const outputPath = path.join(
+  const extension = typescript ? 'ts' : 'js'
+  let outputPath = path.join(
     getPaths().api.graphql,
     `${camelcase(pluralize(name))}.sdl.${extension}`
   )
+
+  if (!typescript) {
+    template = transformTSToJS(template)
+  }
+
   return {
     [outputPath]: template,
     ...(await serviceFiles({ name, crud, relations, typescript })),
diff --git a/packages/cli/src/commands/generate/service/__tests__/service.test.js b/packages/cli/src/commands/generate/service/__tests__/service.test.js
index 4e8bba4e4bd8..5dc3b2ffa425 100644
--- a/packages/cli/src/commands/generate/service/__tests__/service.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/service.test.js
@@ -4,20 +4,6 @@ import { loadGeneratorFixture } from 'src/lib/test'
 
 import * as service from '../service'
 
-jest.mock('../../../../lib', () => {
-  const path = require('path')
-  const lib = jest.requireActual('../../../../lib')
-  return {
-    ...lib,
-    prettierOptions: () => {
-      return require(path.resolve(
-        global.__dirname +
-          '../../../../../lib/__tests__/fixtures/prettier.config.js'
-      ))
-    },
-  }
-})
-
 const extensionForBaseArgs = (baseArgs) =>
   baseArgs && baseArgs.typescript ? 'ts' : 'js'
 
diff --git a/packages/cli/src/commands/generate/service/service.js b/packages/cli/src/commands/generate/service/service.js
index 59d9a277e2b6..3ad2ff6852ed 100644
--- a/packages/cli/src/commands/generate/service/service.js
+++ b/packages/cli/src/commands/generate/service/service.js
@@ -1,11 +1,8 @@
-import { resolve } from 'path'
-
 import camelcase from 'camelcase'
 import pluralize from 'pluralize'
-import * as prettier from 'prettier'
 import * as babel from '@babel/core'
 
-import { prettierOptions } from '../../../lib'
+import { transformTSToJS } from '../../../lib'
 import {
   templateForComponentFile,
   createYargsForComponentGeneration,
@@ -14,7 +11,6 @@ import {
 export const files = async ({ name, relations, ...rest }) => {
   const componentName = camelcase(pluralize(name))
   const extension = 'ts'
-  const configOptions = prettierOptions()
   const serviceFile = templateForComponentFile({
     name,
     componentName: componentName,
@@ -42,16 +38,10 @@ export const files = async ({ name, relations, ...rest }) => {
   return [serviceFile, testFile].reduce((acc, [outputPath, content]) => {
     const isTypescript = rest.typescript
     if (!isTypescript) {
-      content = babel.transform(content, {
-        plugins: ['@babel/plugin-transform-typescript', 'generator-prettier'],
-        generatorOpts: configOptions,
-      }).code
+      content = transformTSToJS(content)
       outputPath = outputPath.replace('.ts', '.js')
     }
-    content = prettier.format(content, {
-      ...configOptions,
-      parser: isTypescript ? 'babel-ts' : 'babel',
-    })
+
     return {
       [outputPath]: content,
       ...acc,
diff --git a/packages/cli/src/lib/index.js b/packages/cli/src/lib/index.js
index eda21afbf0ca..b94e4bc98188 100644
--- a/packages/cli/src/lib/index.js
+++ b/packages/cli/src/lib/index.js
@@ -13,6 +13,7 @@ import execa from 'execa'
 import Listr from 'listr'
 import VerboseRenderer from 'listr-verbose-renderer'
 import { format } from 'prettier'
+import * as babel from '@babel/core'
 
 import c from './colors'
 
@@ -133,7 +134,8 @@ export const generateTemplate = (templateFilename, { name, root, ...rest }) => {
   const parser = {
     '.css': 'css',
     '.js': 'babel',
-  }[path.extname(templateFilename)]
+    '.ts': 'babel-ts',
+  }[path.extname(templateFilename.replace('.template', ''))]
 
   if (typeof parser === 'undefined') {
     return renderedTemplate
@@ -185,13 +187,25 @@ export const getPaths = () => {
  */
 export const prettierOptions = () => {
   try {
-    console.log(path.join(getPaths().base, 'prettier.config.js'))
     return require(path.join(getPaths().base, 'prettier.config.js'))
   } catch (e) {
     return undefined
   }
 }
 
+// TODO(@jmreidy): Move this into `generateTemplate` when all templates have TS support
+/*
+ * Convert a generated TS template file into JS.
+ */
+export const transformTSToJS = (content) => {
+  const configOptions = prettierOptions()
+  content = babel.transform(content, {
+    plugins: ['@babel/plugin-transform-typescript', 'generator-prettier'],
+    generatorOpts: configOptions,
+  }).code
+  return content
+}
+
 /**
  * Creates a list of tasks that write files to the disk.
  *
diff --git a/packages/cli/src/lib/test.js b/packages/cli/src/lib/test.js
index 0861fb4afa1b..ae9cdff66afc 100644
--- a/packages/cli/src/lib/test.js
+++ b/packages/cli/src/lib/test.js
@@ -36,6 +36,28 @@ jest.mock('@redwoodjs/internal', () => {
   }
 })
 
+global.__prettierPath = path.resolve(
+  __dirname,
+  './__tests__/fixtures/prettier.config.js'
+)
+
+jest.mock('path', () => {
+  const path = jest.requireActual('path')
+  return {
+    ...path,
+    join: (...paths) => {
+      if (
+        paths &&
+        paths[0] === '/path/to/project' &&
+        paths[1] === 'prettier.config.js'
+      ) {
+        return global.__prettierPath
+      }
+      return path.join(...paths)
+    },
+  }
+})
+
 export const generatorsRootPath = path.join(
   __dirname,
   '..',
diff --git a/yarn.lock b/yarn.lock
index edff10608243..aee6bf0831c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4722,6 +4722,15 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
+babel-plugin-generator-prettier@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-generator-prettier/-/babel-plugin-generator-prettier-1.2.0.tgz#ec4a00c787f670bbf669228b5375bf9fcd3a5fac"
+  integrity sha512-FE/doiOxcLaw7f4ydNw/poNyxbNUiTmhc4LAx/KW3JKBYzMVsOuLk+oGbgdHJeIAl0B9QKIdCO/ZD4hpdsXV+Q==
+  dependencies:
+    has "^1.0.3"
+    prettier "^1.18.2"
+    source-map "^0.5.7"
+
 babel-plugin-graphql-tag@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-graphql-tag/-/babel-plugin-graphql-tag-2.5.0.tgz#2b2df0dc4b9638022d18868d03abe60117aaf38d"
@@ -13021,8 +13030,12 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 prettier@^1.19.1:
+=======
+prettier@^1.18.2:
+>>>>>>> 7e8f41a... extract transform from service, get it working with SDL
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
@@ -14824,7 +14837,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@^0.5.0, source-map@^0.5.6:
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=

From 09568a1bff873cadf1ea66bf87487b862636fa15 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Tue, 19 May 2020 07:58:44 -0400
Subject: [PATCH 12/25] add javascript flag to sdl and service

---
 packages/cli/src/commands/generate/helpers.js |  9 +++--
 .../generate/sdl/__tests__/sdl.test.js        | 18 +++++----
 packages/cli/src/commands/generate/sdl/sdl.js | 17 +++++---
 .../service/__tests__/service.test.js         | 28 ++++++-------
 .../src/commands/generate/service/service.js  | 39 +++++++++++++------
 5 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/packages/cli/src/commands/generate/helpers.js b/packages/cli/src/commands/generate/helpers.js
index 7ac71a1a0daf..388ade1fdbbf 100644
--- a/packages/cli/src/commands/generate/helpers.js
+++ b/packages/cli/src/commands/generate/helpers.js
@@ -62,19 +62,20 @@ export const pathName = (path, name) => {
 export const createYargsForComponentGeneration = ({
   componentName,
   filesFn,
+  builder = { force: { type: 'boolean', default: false } },
 }) => {
   return {
     command: `${componentName} <name>`,
     desc: `Generate a ${componentName} component.`,
-    builder: { force: { type: 'boolean', default: false } },
-    handler: async ({ force, ...rest }) => {
+    builder,
+    handler: async (options) => {
       const tasks = new Listr(
         [
           {
             title: `Generating ${componentName} files...`,
             task: async () => {
-              const f = await filesFn(rest)
-              return writeFilesTask(f, { overwriteExisting: force })
+              const f = await filesFn(options)
+              return writeFilesTask(f, { overwriteExisting: options.force })
             },
           },
         ],
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js b/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
index 9f754c6e1bb2..c40da06d604e 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
@@ -100,17 +100,19 @@ const itCreatesASDLFileWithEnumDefinitions = (baseArgs = {}) => {
 }
 
 describe('in javascript mode', () => {
-  itReturnsExactlyThreeFiles()
-  itCreatesAService()
-  itCreatesASingleWordSDLFile()
-  itCreatesAMultiWordSDLFile()
-  itCreatesASingleWordSDLFileWithCRUD()
-  itCreateAMultiWordSDLFileWithCRUD()
-  itCreatesASDLFileWithEnumDefinitions()
+  const baseArgs = { javascript: true }
+
+  itReturnsExactlyThreeFiles(baseArgs)
+  itCreatesAService(baseArgs)
+  itCreatesASingleWordSDLFile(baseArgs)
+  itCreatesAMultiWordSDLFile(baseArgs)
+  itCreatesASingleWordSDLFileWithCRUD(baseArgs)
+  itCreateAMultiWordSDLFileWithCRUD(baseArgs)
+  itCreatesASDLFileWithEnumDefinitions(baseArgs)
 })
 
 describe('in typescript mode', () => {
-  const baseArgs = { typescript: true }
+  const baseArgs = { javascript: true, typescript: true }
 
   itReturnsExactlyThreeFiles(baseArgs)
   itCreatesAService(baseArgs)
diff --git a/packages/cli/src/commands/generate/sdl/sdl.js b/packages/cli/src/commands/generate/sdl/sdl.js
index d95afc727afb..c3307100e536 100644
--- a/packages/cli/src/commands/generate/sdl/sdl.js
+++ b/packages/cli/src/commands/generate/sdl/sdl.js
@@ -106,7 +106,7 @@ const sdlFromSchemaModel = async (name) => {
   }
 }
 
-export const files = async ({ name, crud, typescript }) => {
+export const files = async ({ name, crud, typescript, javascript }) => {
   const {
     query,
     createInput,
@@ -135,13 +135,13 @@ export const files = async ({ name, crud, typescript }) => {
     `${camelcase(pluralize(name))}.sdl.${extension}`
   )
 
-  if (!typescript) {
+  if (javascript && !typescript) {
     template = transformTSToJS(template)
   }
 
   return {
     [outputPath]: template,
-    ...(await serviceFiles({ name, crud, relations, typescript })),
+    ...(await serviceFiles({ name, crud, relations, typescript, javascript })),
   }
 }
 
@@ -151,16 +151,23 @@ export const builder = {
   services: { type: 'boolean', default: true },
   crud: { type: 'boolean', default: false },
   force: { type: 'boolean', default: false },
+  javascript: { type: 'boolean', default: true },
   typescript: { type: 'boolean', default: false },
 }
 // TODO: Add --dry-run command
-export const handler = async ({ model, crud, force, typescript }) => {
+export const handler = async ({
+  model,
+  crud,
+  force,
+  typescript,
+  javascript,
+}) => {
   const tasks = new Listr(
     [
       {
         title: 'Generating SDL files...',
         task: async () => {
-          const f = await files({ name: model, crud, typescript })
+          const f = await files({ name: model, crud, typescript, javascript })
           return writeFilesTask(f, { overwriteExisting: force })
         },
       },
diff --git a/packages/cli/src/commands/generate/service/__tests__/service.test.js b/packages/cli/src/commands/generate/service/__tests__/service.test.js
index 5dc3b2ffa425..56f97e32f6e1 100644
--- a/packages/cli/src/commands/generate/service/__tests__/service.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/service.test.js
@@ -212,22 +212,24 @@ const itCreatesASingleWordServiceFileWithMultipleRelations = (baseArgs) => {
 }
 
 describe('in javascript mode', () => {
-  itReturnsExactly2Files()
-  itCreatesASingleWordServiceFile()
-  itCreatesASingleWordServiceTestFile()
-  itCreatesAMultiWordServiceFile()
-  itCreatesAMultiWordServiceTestFile()
-  itCreatesASingleWordServiceFileWithCRUDActions()
-  itCreatesASingleWordServiceTestFileWithCRUDActions()
-  itCreatesAMultiWordServiceFileWithCRUDActions()
-  itCreatesAMultiWordServiceTestFileWithCRUDActions()
-  itCreatesASingleWordServiceFileWithAHasManyRelation()
-  itCreatesASingleWordServiceFileWithABelongsToRelation()
-  itCreatesASingleWordServiceFileWithMultipleRelations()
+  const baseArgs = { javascript: true }
+
+  itReturnsExactly2Files(baseArgs)
+  itCreatesASingleWordServiceFile(baseArgs)
+  itCreatesASingleWordServiceTestFile(baseArgs)
+  itCreatesAMultiWordServiceFile(baseArgs)
+  itCreatesAMultiWordServiceTestFile(baseArgs)
+  itCreatesASingleWordServiceFileWithCRUDActions(baseArgs)
+  itCreatesASingleWordServiceTestFileWithCRUDActions(baseArgs)
+  itCreatesAMultiWordServiceFileWithCRUDActions(baseArgs)
+  itCreatesAMultiWordServiceTestFileWithCRUDActions(baseArgs)
+  itCreatesASingleWordServiceFileWithAHasManyRelation(baseArgs)
+  itCreatesASingleWordServiceFileWithABelongsToRelation(baseArgs)
+  itCreatesASingleWordServiceFileWithMultipleRelations(baseArgs)
 })
 
 describe('in typescript mode', () => {
-  const baseArgs = { typescript: true }
+  const baseArgs = { javscript: true, typescript: true }
 
   itReturnsExactly2Files(baseArgs)
   itCreatesASingleWordServiceFile(baseArgs)
diff --git a/packages/cli/src/commands/generate/service/service.js b/packages/cli/src/commands/generate/service/service.js
index 3ad2ff6852ed..83035871eca2 100644
--- a/packages/cli/src/commands/generate/service/service.js
+++ b/packages/cli/src/commands/generate/service/service.js
@@ -1,6 +1,5 @@
 import camelcase from 'camelcase'
 import pluralize from 'pluralize'
-import * as babel from '@babel/core'
 
 import { transformTSToJS } from '../../../lib'
 import {
@@ -8,7 +7,13 @@ import {
   createYargsForComponentGeneration,
 } from '../helpers'
 
-export const files = async ({ name, relations, ...rest }) => {
+export const files = async ({
+  name,
+  relations,
+  javascript,
+  typescript,
+  ...rest
+}) => {
   const componentName = camelcase(pluralize(name))
   const extension = 'ts'
   const serviceFile = templateForComponentFile({
@@ -36,8 +41,7 @@ export const files = async ({ name, relations, ...rest }) => {
   //    "path/to/fileB": "<<<template>>>",
   // }
   return [serviceFile, testFile].reduce((acc, [outputPath, content]) => {
-    const isTypescript = rest.typescript
-    if (!isTypescript) {
+    if (javascript && !typescript) {
       content = transformTSToJS(content)
       outputPath = outputPath.replace('.ts', '.js')
     }
@@ -49,13 +53,26 @@ export const files = async ({ name, relations, ...rest }) => {
   }, {})
 }
 
-export const builder = {
-  crud: { type: 'boolean', default: false, desc: 'Create CRUD functions' },
-  force: { type: 'boolean', default: false },
-  typescript: { type: 'boolean', default: false },
-}
-
-export const { command, desc, handler } = createYargsForComponentGeneration({
+export const {
+  command,
+  desc,
+  builder,
+  handler,
+} = createYargsForComponentGeneration({
   componentName: 'service',
   filesFn: files,
+  builder: {
+    crud: { type: 'boolean', default: false, desc: 'Create CRUD functions' },
+    force: { type: 'boolean', default: false },
+    typescript: {
+      type: 'boolean',
+      default: false,
+      desc: 'Generate TypeScript files',
+    },
+    javascript: {
+      type: 'boolean',
+      default: true,
+      desc: 'Generate JavaScript files',
+    },
+  },
 })

From 389dd2197418d2e11b2928e118fce1d78fb86e97 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Tue, 19 May 2020 09:06:43 -0400
Subject: [PATCH 13/25] ensure tests use default builder args

---
 .../generate/sdl/__tests__/sdl.test.js        |  9 ++---
 .../service/__tests__/service.test.js         | 23 ++----------
 .../src/commands/generate/service/service.js  | 37 +++++++++----------
 packages/cli/src/lib/test.js                  | 10 +++++
 4 files changed, 34 insertions(+), 45 deletions(-)

diff --git a/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js b/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
index c40da06d604e..eccde98b1945 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
@@ -1,6 +1,6 @@
 global.__dirname = __dirname
 
-import { loadGeneratorFixture } from 'src/lib/test'
+import { loadGeneratorFixture, getDefaultArgs } from 'src/lib/test'
 
 import * as sdl from '../sdl'
 
@@ -38,7 +38,7 @@ const itCreatesAService = (baseArgs = {}) => {
 
 const itCreatesASingleWordSDLFile = (baseArgs = {}) => {
   test('creates a single word sdl file', async () => {
-    const files = await sdl.files({ ...baseArgs, name: 'User', crud: false })
+    const files = await sdl.files({ ...baseArgs, name: 'User' })
     const extension = extensionForBaseArgs(baseArgs)
 
     expect(
@@ -52,7 +52,6 @@ const itCreatesAMultiWordSDLFile = (baseArgs = {}) => {
     const files = await sdl.files({
       ...baseArgs,
       name: 'UserProfile',
-      crud: false,
     })
     const extension = extensionForBaseArgs(baseArgs)
 
@@ -100,7 +99,7 @@ const itCreatesASDLFileWithEnumDefinitions = (baseArgs = {}) => {
 }
 
 describe('in javascript mode', () => {
-  const baseArgs = { javascript: true }
+  const baseArgs = getDefaultArgs(sdl.builder)
 
   itReturnsExactlyThreeFiles(baseArgs)
   itCreatesAService(baseArgs)
@@ -112,7 +111,7 @@ describe('in javascript mode', () => {
 })
 
 describe('in typescript mode', () => {
-  const baseArgs = { javascript: true, typescript: true }
+  const baseArgs = { ...getDefaultArgs(sdl.builder), typescript: true }
 
   itReturnsExactlyThreeFiles(baseArgs)
   itCreatesAService(baseArgs)
diff --git a/packages/cli/src/commands/generate/service/__tests__/service.test.js b/packages/cli/src/commands/generate/service/__tests__/service.test.js
index 56f97e32f6e1..b6de5589c312 100644
--- a/packages/cli/src/commands/generate/service/__tests__/service.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/service.test.js
@@ -1,6 +1,6 @@
 global.__dirname = __dirname
 
-import { loadGeneratorFixture } from 'src/lib/test'
+import { loadGeneratorFixture, getDefaultArgs } from 'src/lib/test'
 
 import * as service from '../service'
 
@@ -12,8 +12,6 @@ const itReturnsExactly2Files = (baseArgs) => {
     const files = await service.files({
       ...baseArgs,
       name: 'User',
-      crud: false,
-      relations: [],
     })
 
     expect(Object.keys(files).length).toEqual(2)
@@ -24,8 +22,6 @@ const itCreatesASingleWordServiceFile = (baseArgs) => {
     const files = await service.files({
       ...baseArgs,
       name: 'User',
-      crud: false,
-      relations: [],
     })
     const extension = extensionForBaseArgs(baseArgs)
 
@@ -39,8 +35,6 @@ const itCreatesASingleWordServiceTestFile = (baseArgs) => {
     const files = await service.files({
       ...baseArgs,
       name: 'User',
-      crud: false,
-      relations: null,
     })
     const extension = extensionForBaseArgs(baseArgs)
 
@@ -55,8 +49,6 @@ const itCreatesAMultiWordServiceFile = (baseArgs) => {
     const files = await service.files({
       ...baseArgs,
       name: 'UserProfile',
-      crud: false,
-      relations: null,
     })
     const extension = extensionForBaseArgs(baseArgs)
 
@@ -73,8 +65,6 @@ const itCreatesAMultiWordServiceTestFile = (baseArgs) => {
     const files = await service.files({
       ...baseArgs,
       name: 'UserProfile',
-      crud: false,
-      relations: null,
     })
     const extension = extensionForBaseArgs(baseArgs)
 
@@ -92,7 +82,6 @@ const itCreatesASingleWordServiceFileWithCRUDActions = (baseArgs) => {
       ...baseArgs,
       name: 'Post',
       crud: true,
-      relations: null,
     })
     const extension = extensionForBaseArgs(baseArgs)
 
@@ -108,7 +97,6 @@ const itCreatesASingleWordServiceTestFileWithCRUDActions = (baseArgs) => {
       ...baseArgs,
       name: 'Post',
       crud: true,
-      relations: null,
     })
     const extension = extensionForBaseArgs(baseArgs)
 
@@ -126,7 +114,6 @@ const itCreatesAMultiWordServiceFileWithCRUDActions = (baseArgs) => {
       ...baseArgs,
       name: 'UserProfile',
       crud: true,
-      relations: null,
     })
     const extension = extensionForBaseArgs(baseArgs)
 
@@ -143,7 +130,6 @@ const itCreatesAMultiWordServiceTestFileWithCRUDActions = (baseArgs) => {
       ...baseArgs,
       name: 'UserProfile',
       crud: true,
-      relations: null,
     })
     const extension = extensionForBaseArgs(baseArgs)
 
@@ -162,7 +148,6 @@ const itCreatesASingleWordServiceFileWithAHasManyRelation = (baseArgs) => {
     const files = await service.files({
       ...baseArgs,
       name: 'User',
-      crud: false,
       relations: ['userProfiles'],
     })
     const extension = extensionForBaseArgs(baseArgs)
@@ -180,7 +165,6 @@ const itCreatesASingleWordServiceFileWithABelongsToRelation = (baseArgs) => {
     const files = await service.files({
       ...baseArgs,
       name: 'User',
-      crud: false,
       relations: ['identity'],
     })
     const extension = extensionForBaseArgs(baseArgs)
@@ -198,7 +182,6 @@ const itCreatesASingleWordServiceFileWithMultipleRelations = (baseArgs) => {
     const files = await service.files({
       ...baseArgs,
       name: 'User',
-      crud: false,
       relations: ['userProfiles', 'identity'],
     })
     const extension = extensionForBaseArgs(baseArgs)
@@ -212,7 +195,7 @@ const itCreatesASingleWordServiceFileWithMultipleRelations = (baseArgs) => {
 }
 
 describe('in javascript mode', () => {
-  const baseArgs = { javascript: true }
+  const baseArgs = getDefaultArgs(service.builder)
 
   itReturnsExactly2Files(baseArgs)
   itCreatesASingleWordServiceFile(baseArgs)
@@ -229,7 +212,7 @@ describe('in javascript mode', () => {
 })
 
 describe('in typescript mode', () => {
-  const baseArgs = { javscript: true, typescript: true }
+  const baseArgs = { ...getDefaultArgs(service.builder), typescript: true }
 
   itReturnsExactly2Files(baseArgs)
   itCreatesASingleWordServiceFile(baseArgs)
diff --git a/packages/cli/src/commands/generate/service/service.js b/packages/cli/src/commands/generate/service/service.js
index 83035871eca2..fbad6b3d894c 100644
--- a/packages/cli/src/commands/generate/service/service.js
+++ b/packages/cli/src/commands/generate/service/service.js
@@ -53,26 +53,23 @@ export const files = async ({
   }, {})
 }
 
-export const {
-  command,
-  desc,
-  builder,
-  handler,
-} = createYargsForComponentGeneration({
+export const builder = {
+  crud: { type: 'boolean', default: false, desc: 'Create CRUD functions' },
+  force: { type: 'boolean', default: false },
+  typescript: {
+    type: 'boolean',
+    default: false,
+    desc: 'Generate TypeScript files',
+  },
+  javascript: {
+    type: 'boolean',
+    default: true,
+    desc: 'Generate JavaScript files',
+  },
+}
+
+export const { command, desc, handler } = createYargsForComponentGeneration({
   componentName: 'service',
   filesFn: files,
-  builder: {
-    crud: { type: 'boolean', default: false, desc: 'Create CRUD functions' },
-    force: { type: 'boolean', default: false },
-    typescript: {
-      type: 'boolean',
-      default: false,
-      desc: 'Generate TypeScript files',
-    },
-    javascript: {
-      type: 'boolean',
-      default: true,
-      desc: 'Generate JavaScript files',
-    },
-  },
+  builder,
 })
diff --git a/packages/cli/src/lib/test.js b/packages/cli/src/lib/test.js
index ae9cdff66afc..5bffc7b4f9fc 100644
--- a/packages/cli/src/lib/test.js
+++ b/packages/cli/src/lib/test.js
@@ -91,3 +91,13 @@ export const loadGeneratorFixture = (generator, name) => {
 export const loadFixture = (filepath) => {
   return fs.readFileSync(filepath).toString()
 }
+
+/*
+ * Extract default CLI args from an exported builder
+ */
+export const getDefaultArgs = (builder) => {
+  return Object.entries(builder).reduce((agg, [k, v]) => {
+    agg[k] = v.default
+    return agg
+  }, {})
+}

From e3d0690afa596545e8433aa39d1553306b85b4c5 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Tue, 19 May 2020 10:07:53 -0400
Subject: [PATCH 14/25] update scaffold code

---
 .../__tests__/fixtures/assets/scaffold.css    | 404 +++++++++-
 .../fixtures/components/foreignKeys/edit.js   |  36 +-
 .../fixtures/components/foreignKeys/new.js    |  15 +-
 .../__tests__/fixtures/components/show.js     |  32 +
 .../scaffold/__tests__/scaffold.test.js       | 751 ++++++++++++------
 .../commands/generate/scaffold/scaffold.js    |  36 +-
 .../generate/sdl/__tests__/sdl.test.js        |   3 +-
 .../service/__tests__/service.test.js         |   3 +-
 packages/cli/src/lib/index.js                 |  13 +-
 packages/cli/src/lib/test.js                  |  10 -
 10 files changed, 1042 insertions(+), 261 deletions(-)

diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/assets/scaffold.css b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/assets/scaffold.css
index 88320a9d5780..458d62414c7b 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/assets/scaffold.css
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/assets/scaffold.css
@@ -2,6 +2,7 @@
   normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css
 */
 
+<<<<<<< HEAD
 .rw-scaffold *,.rw-scaffold ::after,.rw-scaffold ::before{box-sizing:inherit;border-width:0;border-style:solid;border-color:#e2e8f0}
 .rw-scaffold main{display:block}
 .rw-scaffold h1,.rw-scaffold h2{margin:0}
@@ -12,11 +13,80 @@
 .rw-scaffold input::-ms-input-placeholder{color:#a0aec0}
 .rw-scaffold input::placeholder{color:#a0aec0}
 .rw-scaffold table{border-collapse:collapse}
+=======
+.rw-scaffold main {
+  display: block;
+}
+.rw-scaffold h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+.rw-scaffold a {
+  background-color: transparent;
+}
+.rw-scaffold input {
+  font-family: inherit;
+  font-size: 100%;
+  line-height: 1.15;
+  margin: 0;
+}
+.rw-scaffold input {
+  overflow: visible;
+}
+.rw-scaffold *,
+.rw-scaffold ::after,
+.rw-scaffold ::before {
+  box-sizing: inherit;
+}
+.rw-scaffold h1,
+.rw-scaffold h2 {
+  margin: 0;
+}
+.rw-scaffold ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+.rw-scaffold *,
+.rw-scaffold ::after,
+.rw-scaffold ::before {
+  border-width: 0;
+  border-style: solid;
+  border-color: #e2e8f0;
+}
+.rw-scaffold input:-ms-input-placeholder {
+  color: #a0aec0;
+}
+.rw-scaffold input::-ms-input-placeholder {
+  color: #a0aec0;
+}
+.rw-scaffold input::placeholder {
+  color: #a0aec0;
+}
+.rw-scaffold table {
+  border-collapse: collapse;
+}
+.rw-scaffold h1,
+.rw-scaffold .rw-scaffold h2 {
+  font-size: inherit;
+  font-weight: inherit;
+}
+.rw-scaffold a {
+  color: inherit;
+  text-decoration: inherit;
+}
+.rw-scaffold input {
+  padding: 0;
+  line-height: inherit;
+  color: inherit;
+}
+>>>>>>> f0d1418... update scaffold code
 
 /*
   Style
 */
 
+<<<<<<< HEAD
 .rw-scaffold{background-color:#fff;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"}
 .rw-header{display:flex;justify-content:space-between;padding: 1rem 2rem 1rem 2rem}
 .rw-main{margin-left:1rem;margin-right:1rem;padding-bottom:1rem}
@@ -74,4 +144,336 @@
 .rw-table-actions .rw-button-blue:hover{background-color:#3182ce;color:#fff}
 .rw-table-actions .rw-button-red{color:#e53e3e}
 .rw-table-actions .rw-button-red:hover{background-color:#e53e3e;color:#fff}
-.rw-text-center{text-align:center}
\ No newline at end of file
+.rw-text-center{text-align:center}
+=======
+.rw-scaffold .bg-white {
+  background-color: #fff;
+}
+.rw-scaffold .bg-gray-100 {
+  background-color: #f7fafc;
+}
+.rw-scaffold .bg-gray-300 {
+  background-color: #e2e8f0;
+}
+.rw-scaffold .bg-red-100 {
+  background-color: #fff5f5;
+}
+.rw-scaffold .bg-red-600 {
+  background-color: #e53e3e;
+}
+.rw-scaffold .bg-green-500 {
+  background-color: #48bb78;
+}
+.rw-scaffold .bg-blue-600 {
+  background-color: #3182ce;
+}
+.rw-scaffold .hover\:bg-gray-600:hover {
+  background-color: #718096;
+}
+.rw-scaffold .hover\:bg-red-600:hover {
+  background-color: #e53e3e;
+}
+.rw-scaffold .hover\:bg-red-700:hover {
+  background-color: #c53030;
+}
+.rw-scaffold .hover\:bg-green-600:hover {
+  background-color: #38a169;
+}
+.rw-scaffold .hover\:bg-blue-600:hover {
+  background-color: #3182ce;
+}
+.rw-scaffold .hover\:bg-blue-700:hover {
+  background-color: #2b6cb0;
+}
+.rw-scaffold .border-gray-300 {
+  border-color: #e2e8f0;
+}
+.rw-scaffold .border-red-300 {
+  border-color: #feb2b2;
+}
+.rw-scaffold .border-red-700 {
+  border-color: #c53030;
+}
+.rw-scaffold .focus\:border-gray-500:focus {
+  border-color: #a0aec0;
+}
+.rw-scaffold .rounded-sm {
+  border-radius: 0.125rem;
+}
+.rw-scaffold .rounded {
+  border-radius: 0.25rem;
+}
+.rw-scaffold .rounded-lg {
+  border-radius: 0.5rem;
+}
+.rw-scaffold .border {
+  border-width: 1px;
+}
+.rw-scaffold .border-t {
+  border-top-width: 1px;
+}
+.rw-scaffold .block {
+  display: block;
+}
+.rw-scaffold .inline-block {
+  display: inline-block;
+}
+.rw-scaffold .flex {
+  display: flex;
+}
+.rw-scaffold .table {
+  display: table;
+}
+.rw-scaffold .justify-between {
+  justify-content: space-between;
+}
+.rw-scaffold .font-sans {
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+    'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji',
+    'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+}
+.rw-scaffold .font-semibold {
+  font-weight: 600;
+}
+.rw-scaffold .leading-none {
+  line-height: 1;
+}
+.rw-scaffold .leading-loose {
+  line-height: 2;
+}
+.rw-scaffold .list-inside {
+  list-style-position: inside;
+}
+.rw-scaffold .list-disc {
+  list-style-type: disc;
+}
+.rw-scaffold .mx-2 {
+  margin-left: 0.5rem;
+  margin-right: 0.5rem;
+}
+.rw-scaffold .my-4 {
+  margin-top: 1rem;
+  margin-bottom: 1rem;
+}
+.rw-scaffold .mx-4 {
+  margin-left: 1rem;
+  margin-right: 1rem;
+}
+.rw-scaffold .mt-0 {
+  margin-top: 0;
+}
+.rw-scaffold .mt-1 {
+  margin-top: 0.25rem;
+}
+.rw-scaffold .ml-1 {
+  margin-left: 0.25rem;
+}
+.rw-scaffold .mt-2 {
+  margin-top: 0.5rem;
+}
+.rw-scaffold .ml-2 {
+  margin-left: 0.5rem;
+}
+.rw-scaffold .mt-4 {
+  margin-top: 1rem;
+}
+.rw-scaffold .mb-4 {
+  margin-bottom: 1rem;
+}
+.rw-scaffold .mt-6 {
+  margin-top: 1.5rem;
+}
+.rw-scaffold .mt-8 {
+  margin-top: 2rem;
+}
+.rw-scaffold .-mt-4 {
+  margin-top: -1rem;
+}
+.rw-scaffold .focus\:outline-none:focus {
+  outline: 0;
+}
+.rw-scaffold .overflow-hidden {
+  overflow: hidden;
+}
+.rw-scaffold .overflow-x-scroll {
+  overflow-x: scroll;
+}
+.rw-scaffold .p-2 {
+  padding: 0.5rem;
+}
+.rw-scaffold .p-3 {
+  padding: 0.75rem;
+}
+.rw-scaffold .p-4 {
+  padding: 1rem;
+}
+.rw-scaffold .py-1 {
+  padding-top: 0.25rem;
+  padding-bottom: 0.25rem;
+}
+.rw-scaffold .py-2 {
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
+}
+.rw-scaffold .px-2 {
+  padding-left: 0.5rem;
+  padding-right: 0.5rem;
+}
+.rw-scaffold .py-3 {
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem;
+}
+.rw-scaffold .px-3 {
+  padding-left: 0.75rem;
+  padding-right: 0.75rem;
+}
+.rw-scaffold .py-4 {
+  padding-top: 1rem;
+  padding-bottom: 1rem;
+}
+.rw-scaffold .px-4 {
+  padding-left: 1rem;
+  padding-right: 1rem;
+}
+.rw-scaffold .px-8 {
+  padding-left: 2rem;
+  padding-right: 2rem;
+}
+.rw-scaffold .pr-4 {
+  padding-right: 1rem;
+}
+.rw-scaffold .pb-4 {
+  padding-bottom: 1rem;
+}
+.rw-scaffold .table-auto {
+  table-layout: auto;
+}
+.rw-scaffold .text-left {
+  text-align: left;
+}
+.rw-scaffold .text-center {
+  text-align: center;
+}
+.rw-scaffold .text-right {
+  text-align: right;
+}
+.rw-scaffold .text-white {
+  color: #fff;
+}
+.rw-scaffold .text-gray-600 {
+  color: #718096;
+}
+.rw-scaffold .text-gray-700 {
+  color: #4a5568;
+}
+.rw-scaffold .text-gray-900 {
+  color: #1a202c;
+}
+.rw-scaffold .text-red-600 {
+  color: #e53e3e;
+}
+.rw-scaffold .text-red-700 {
+  color: #c53030;
+}
+.rw-scaffold .text-red-900 {
+  color: #742a2a;
+}
+.rw-scaffold .text-blue-500 {
+  color: #4299e1;
+}
+.rw-scaffold .text-blue-600 {
+  color: #3182ce;
+}
+.rw-scaffold .hover\:text-white:hover {
+  color: #fff;
+}
+.rw-scaffold .hover\:text-gray-900:hover {
+  color: #1a202c;
+}
+.rw-scaffold .hover\:text-blue-700:hover {
+  color: #2b6cb0;
+}
+.rw-scaffold .text-xs {
+  font-size: 0.75rem;
+}
+.rw-scaffold .text-sm {
+  font-size: 0.875rem;
+}
+.rw-scaffold .text-xl {
+  font-size: 1.25rem;
+}
+.rw-scaffold .uppercase {
+  text-transform: uppercase;
+}
+.rw-scaffold .underline {
+  text-decoration: underline;
+}
+.rw-scaffold .hover\:underline:hover {
+  text-decoration: underline;
+}
+.rw-scaffold .tracking-wide {
+  letter-spacing: 0.025em;
+}
+.rw-scaffold .whitespace-no-wrap {
+  white-space: nowrap;
+}
+.rw-scaffold .truncate {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.rw-scaffold .w-full {
+  width: 100%;
+}
+.rw-scaffold .box-border {
+  box-sizing: border-box;
+}
+@media (min-width: 768px) {
+  .rw-scaffold .md\:w-1\/5 {
+    width: 20%;
+  }
+}
+
+/*
+  Here are variants (:odd, :even) that aren't enabled in Tailwind by default.
+  If you decide to include Tailwind yourself and still want scaffolds to look
+  the same then you can tell it to build these variants by adding the following
+  to tailwind.config.js:
+
+    module.exports = {
+      variants: {
+        backgroundColor: ['hover', 'focus', 'odd', 'even']
+      }
+    }
+
+  Tailwind variant customization docs: https://tailwindcss.com/docs/configuring-variants
+*/
+
+.rw-scaffold .odd\:bg-gray-100:nth-child(odd) {
+  background-color: #f7fafc;
+}
+.rw-scaffold .even\:bg-white:nth-child(even) {
+  background-color: #ffffff;
+}
+
+/*
+  Any custom styles that Tailwind doesn't provide. You can add these to your
+  own install of Tailwind by adding the following to tailwind.config.js:
+
+    module.exports = {
+      theme: {
+        extend: {
+          minWidth: {
+            '3xl': '48rem'
+          }
+        }
+      }
+    }
+
+  Tailwind theme extension docs: https://tailwindcss.com/docs/theme#extending-the-default-theme
+*/
+
+.rw-scaffold .min-w-3xl {
+  min-width: 48rem;
+}
+>>>>>>> f0d1418... update scaffold code
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/edit.js b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/edit.js
index 86bffe76c18d..ca0684f8cb97 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/edit.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/edit.js
@@ -12,7 +12,10 @@ export const QUERY = gql`
   }
 `
 const UPDATE_USER_PROFILE_MUTATION = gql`
-  mutation UpdateUserProfileMutation($id: Int!, $input: UpdateUserProfileInput!) {
+  mutation UpdateUserProfileMutation(
+    $id: Int!
+    $input: UpdateUserProfileInput!
+  ) {
     updateUserProfile(id: $id, input: $input) {
       id
     }
@@ -22,24 +25,43 @@ const UPDATE_USER_PROFILE_MUTATION = gql`
 export const Loading = () => <div>Loading...</div>
 
 export const Success = ({ userProfile }) => {
-  const [updateUserProfile, { loading, error }] = useMutation(UPDATE_USER_PROFILE_MUTATION, {
-    onCompleted: () => {
-      navigate(routes.userProfiles())
-    },
-  })
+  const [updateUserProfile, { loading, error }] = useMutation(
+    UPDATE_USER_PROFILE_MUTATION,
+    {
+      onCompleted: () => {
+        navigate(routes.userProfiles())
+      },
+    }
+  )
 
   const onSave = (input, id) => {
-    const castInput = Object.assign(input, { userId: parseInt(input.userId), })
+    const castInput = Object.assign(input, { userId: parseInt(input.userId) })
     updateUserProfile({ variables: { id, input: castInput } })
   }
 
   return (
+<<<<<<< HEAD
     <div className="rw-segment">
       <header className="rw-segment-header">
         <h2 className="rw-heading rw-heading-secondary">Edit UserProfile {userProfile.id}</h2>
       </header>
       <div className="rw-segment-main">
         <UserProfileForm userProfile={userProfile} onSave={onSave} error={error} loading={loading} />
+=======
+    <div className="bg-white border rounded-lg overflow-hidden">
+      <header className="bg-gray-300 text-gray-700 py-3 px-4">
+        <h2 className="text-sm font-semibold">
+          Edit UserProfile {userProfile.id}
+        </h2>
+      </header>
+      <div className="bg-gray-100 p-4">
+        <UserProfileForm
+          userProfile={userProfile}
+          onSave={onSave}
+          error={error}
+          loading={loading}
+        />
+>>>>>>> f0d1418... update scaffold code
       </div>
     </div>
   )
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/new.js b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/new.js
index 4d39015c9d57..69e28b5d4e5a 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/new.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/new.js
@@ -11,14 +11,17 @@ const CREATE_USER_PROFILE_MUTATION = gql`
 `
 
 const NewUserProfile = () => {
-  const [createUserProfile, { loading, error }] = useMutation(CREATE_USER_PROFILE_MUTATION, {
-    onCompleted: () => {
-      navigate(routes.userProfiles())
-    },
-  })
+  const [createUserProfile, { loading, error }] = useMutation(
+    CREATE_USER_PROFILE_MUTATION,
+    {
+      onCompleted: () => {
+        navigate(routes.userProfiles())
+      },
+    }
+  )
 
   const onSave = (input) => {
-    const castInput = Object.assign(input, { userId: parseInt(input.userId), })
+    const castInput = Object.assign(input, { userId: parseInt(input.userId) })
     createUserProfile({ variables: { input: castInput } })
   }
 
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/show.js b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/show.js
index 564633f3c311..cb2a9a7b5ac3 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/show.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/show.js
@@ -31,6 +31,7 @@ const Post = ({ post }) => {
         </header>
         <table className="rw-table">
           <tbody>
+<<<<<<< HEAD
             <tr>
               <th>id</th>
               <td>{post.id}</td>
@@ -52,6 +53,37 @@ const Post = ({ post }) => {
             </tr><tr>
               <th>postedAt</th>
               <td>{post.postedAt}</td>
+=======
+            <tr className="odd:bg-gray-100 even:bg-white border-t">
+              <td className="font-semibold p-3 text-right md:w-1/5">id</td>
+              <td className="p-3">{post.id}</td>
+            </tr>
+            <tr className="odd:bg-gray-100 even:bg-white border-t">
+              <td className="font-semibold p-3 text-right md:w-1/5">title</td>
+              <td className="p-3">{post.title}</td>
+            </tr>
+            <tr className="odd:bg-gray-100 even:bg-white border-t">
+              <td className="font-semibold p-3 text-right md:w-1/5">slug</td>
+              <td className="p-3">{post.slug}</td>
+            </tr>
+            <tr className="odd:bg-gray-100 even:bg-white border-t">
+              <td className="font-semibold p-3 text-right md:w-1/5">author</td>
+              <td className="p-3">{post.author}</td>
+            </tr>
+            <tr className="odd:bg-gray-100 even:bg-white border-t">
+              <td className="font-semibold p-3 text-right md:w-1/5">body</td>
+              <td className="p-3">{post.body}</td>
+            </tr>
+            <tr className="odd:bg-gray-100 even:bg-white border-t">
+              <td className="font-semibold p-3 text-right md:w-1/5">image</td>
+              <td className="p-3">{post.image}</td>
+            </tr>
+            <tr className="odd:bg-gray-100 even:bg-white border-t">
+              <td className="font-semibold p-3 text-right md:w-1/5">
+                postedAt
+              </td>
+              <td className="p-3">{post.postedAt}</td>
+>>>>>>> f0d1418... update scaffold code
             </tr>
           </tbody>
         </table>
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js
index a293db893bc9..76d766d30e71 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js
@@ -2,254 +2,547 @@ global.__dirname = __dirname
 import path from 'path'
 
 import { loadGeneratorFixture } from 'src/lib/test'
+import { getDefaultArgs } from 'src/lib'
 
 import * as scaffold from '../scaffold'
 
-let files
-
-beforeAll(async () => {
-  files = await scaffold.files({ model: 'Post' })
-})
-
-test('returns exactly 16 files', () => {
-  expect(Object.keys(files).length).toEqual(16)
-})
-
-// SDL
-
-test('creates an sdl', () => {
-  expect(files).toHaveProperty([
-    path.normalize('/path/to/project/api/src/graphql/posts.sdl.js'),
-  ])
-})
-
-// Service
-
-test('creates a service', () => {
-  expect(files).toHaveProperty([
-    path.normalize('/path/to/project/api/src/services/posts/posts.js'),
-  ])
-})
-
-test('creates a service test', () => {
-  expect(files).toHaveProperty([
-    path.normalize('/path/to/project/api/src/services/posts/posts.test.js'),
-  ])
-})
-
-// styles
-
-test('creates a stylesheet', () => {
-  expect(
-    files[path.normalize('/path/to/project/web/src/scaffold.css')]
-  ).toEqual(
-    loadGeneratorFixture('scaffold', path.join('assets', 'scaffold.css'))
-  )
-})
-
-// Layout
-
-test('creates a layout', async () => {
-  expect(
-    files[
-      path.normalize(
-        '/path/to/project/web/src/layouts/PostsLayout/PostsLayout.js'
-      )
-    ]
-  ).toEqual(loadGeneratorFixture('scaffold', path.join('layouts', 'layout.js')))
-})
-
-// Pages
-
-test('creates a edit page', async () => {
-  expect(
-    files[
-      path.normalize(
-        '/path/to/project/web/src/pages/EditPostPage/EditPostPage.js'
-      )
-    ]
-  ).toEqual(loadGeneratorFixture('scaffold', path.join('pages', 'editPage.js')))
-})
+describe('in javascript (defualt) mode', () => {
+  let files
+
+  beforeAll(async () => {
+    files = await scaffold.files({
+      ...getDefaultArgs(scaffold.builder),
+      model: 'Post',
+    })
+  })
+
+  test('returns exactly 16 files', () => {
+    expect(Object.keys(files).length).toEqual(16)
+  })
+
+  // SDL
+
+  test('creates an sdl', () => {
+    expect(files).toHaveProperty([
+      path.normalize('/path/to/project/api/src/graphql/posts.sdl.js'),
+    ])
+  })
+
+  // Service
+
+  test('creates a service', () => {
+    expect(files).toHaveProperty([
+      path.normalize('/path/to/project/api/src/services/posts/posts.js'),
+    ])
+  })
+
+  test('creates a service test', () => {
+    expect(files).toHaveProperty([
+      path.normalize('/path/to/project/api/src/services/posts/posts.test.js'),
+    ])
+  })
+
+  // styles
+
+  test('creates a stylesheet', () => {
+    expect(
+      files[path.normalize('/path/to/project/web/src/scaffold.css')]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('assets', 'scaffold.css'))
+    )
+  })
+
+  // Layout
+
+  test('creates a layout', async () => {
+    expect(
+      files[
+        path.normalize(
+          '/path/to/project/web/src/layouts/PostsLayout/PostsLayout.js'
+        )
+      ]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('layouts', 'layout.js'))
+    )
+  })
+
+  // Pages
+
+  test('creates a edit page', async () => {
+    expect(
+      files[
+        path.normalize(
+          '/path/to/project/web/src/pages/EditPostPage/EditPostPage.js'
+        )
+      ]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('pages', 'editPage.js'))
+    )
+  })
 
-test('creates a index page', async () => {
-  expect(
-    files['/path/to/project/web/src/pages/PostsPage/PostsPage.js']
-  ).toEqual(
-    loadGeneratorFixture('scaffold', path.join('pages', 'indexPage.js'))
-  )
-})
+  test('creates a index page', async () => {
+    expect(
+      files['/path/to/project/web/src/pages/PostsPage/PostsPage.js']
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('pages', 'indexPage.js'))
+    )
+  })
 
-test('creates a new page', async () => {
-  expect(
-    files['/path/to/project/web/src/pages/NewPostPage/NewPostPage.js']
-  ).toEqual(loadGeneratorFixture('scaffold', path.join('pages', 'newPage.js')))
-})
+  test('creates a new page', async () => {
+    expect(
+      files['/path/to/project/web/src/pages/NewPostPage/NewPostPage.js']
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('pages', 'newPage.js'))
+    )
+  })
+
+  test('creates a show page', async () => {
+    expect(
+      files[
+        path.normalize('/path/to/project/web/src/pages/PostPage/PostPage.js')
+      ]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('pages', 'showPage.js'))
+    )
+  })
+
+  // Cells
+
+  test('creates an edit cell', async () => {
+    expect(
+      files[
+        path.normalize(
+          '/path/to/project/web/src/components/EditPostCell/EditPostCell.js'
+        )
+      ]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('components', 'editCell.js'))
+    )
+  })
 
-test('creates a show page', async () => {
-  expect(
-    files[path.normalize('/path/to/project/web/src/pages/PostPage/PostPage.js')]
-  ).toEqual(loadGeneratorFixture('scaffold', path.join('pages', 'showPage.js')))
-})
+  test('creates an index cell', async () => {
+    expect(
+      files['/path/to/project/web/src/components/PostsCell/PostsCell.js']
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('components', 'indexCell.js'))
+    )
+  })
+
+  test('creates a show cell', async () => {
+    expect(
+      files[
+        path.normalize(
+          '/path/to/project/web/src/components/PostCell/PostCell.js'
+        )
+      ]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('components', 'showCell.js'))
+    )
+  })
+
+  // Components
+
+  test('creates a form component', async () => {
+    expect(
+      files[
+        path.normalize(
+          '/path/to/project/web/src/components/PostForm/PostForm.js'
+        )
+      ]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('components', 'form.js'))
+    )
+  })
 
-// Cells
+  test('creates an index component', async () => {
+    expect(files['/path/to/project/web/src/components/Posts/Posts.js']).toEqual(
+      loadGeneratorFixture('scaffold', path.join('components', 'index.js'))
+    )
+  })
+
+  test('creates a new component', async () => {
+    expect(
+      files[
+        path.normalize('/path/to/project/web/src/components/NewPost/NewPost.js')
+      ]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('components', 'new.js'))
+    )
+  })
 
-test('creates an edit cell', async () => {
-  expect(
-    files[
-      path.normalize(
-        '/path/to/project/web/src/components/EditPostCell/EditPostCell.js'
+  test('creates a show component', async () => {
+    expect(
+      files[path.normalize('/path/to/project/web/src/components/Post/Post.js')]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('components', 'show.js'))
+    )
+  })
+
+  // Routes
+
+  test('creates a single-word name routes', async () => {
+    expect(await scaffold.routes({ model: 'Post' })).toEqual([
+      '<Route path="/posts/new" page={NewPostPage} name="newPost" />',
+      '<Route path="/posts/{id:Int}/edit" page={EditPostPage} name="editPost" />',
+      '<Route path="/posts/{id:Int}" page={PostPage} name="post" />',
+      '<Route path="/posts" page={PostsPage} name="posts" />',
+    ])
+  })
+
+  test('creates a multi-word name routes', async () => {
+    expect(await scaffold.routes({ model: 'UserProfile' })).toEqual([
+      '<Route path="/user-profiles/new" page={NewUserProfilePage} name="newUserProfile" />',
+      '<Route path="/user-profiles/{id:Int}/edit" page={EditUserProfilePage} name="editUserProfile" />',
+      '<Route path="/user-profiles/{id:Int}" page={UserProfilePage} name="userProfile" />',
+      '<Route path="/user-profiles" page={UserProfilesPage} name="userProfiles" />',
+    ])
+  })
+
+  // GraphQL queries
+
+  test('the GraphQL in the index query does not contain object types', async () => {
+    const userProfileFiles = await scaffold.files({ model: 'UserProfile' })
+    const cell =
+      userProfileFiles[
+        path.normalize(
+          '/path/to/project/web/src/components/UserProfilesCell/UserProfilesCell.js'
+        )
+      ]
+    const query = cell.match(/(userProfiles.*?\})/s)[1]
+
+    expect(query).not.toMatch(/^\s+user$/m)
+  })
+
+  test('the GraphQL in the show query does not contain object types', async () => {
+    const userProfileFiles = await scaffold.files({ model: 'UserProfile' })
+    const cell =
+      userProfileFiles[
+        path.normalize(
+          '/path/to/project/web/src/components/UserProfileCell/UserProfileCell.js'
+        )
+      ]
+    const query = cell.match(/(userProfile.*?\})/s)[1]
+
+    expect(query).not.toMatch(/^\s+user$/m)
+  })
+
+  test('the GraphQL in the edit query does not contain object types', async () => {
+    const userProfileFiles = await scaffold.files({ model: 'UserProfile' })
+    const cell =
+      userProfileFiles[
+        path.normalize(
+          '/path/to/project/web/src/components/EditUserProfileCell/EditUserProfileCell.js'
+        )
+      ]
+    const query = cell.match(/(userProfile.*?\})/s)[1]
+
+    expect(query).not.toMatch(/^\s+user$/m)
+  })
+
+  // Foreign key casting
+
+  test('creates a new component with int foreign keys converted in onSave', async () => {
+    const foreignKeyFiles = await scaffold.files({ model: 'UserProfile' })
+
+    expect(
+      foreignKeyFiles[
+        path.normalize(
+          '/path/to/project/web/src/components/NewUserProfile/NewUserProfile.js'
+        )
+      ]
+    ).toEqual(
+      loadGeneratorFixture(
+        'scaffold',
+        path.join('components', 'foreignKeys', 'new.js')
       )
-    ]
-  ).toEqual(
-    loadGeneratorFixture('scaffold', path.join('components', 'editCell.js'))
-  )
-})
-
-test('creates an index cell', async () => {
-  expect(
-    files['/path/to/project/web/src/components/PostsCell/PostsCell.js']
-  ).toEqual(
-    loadGeneratorFixture('scaffold', path.join('components', 'indexCell.js'))
-  )
-})
-
-test('creates a show cell', async () => {
-  expect(
-    files[
-      path.normalize('/path/to/project/web/src/components/PostCell/PostCell.js')
-    ]
-  ).toEqual(
-    loadGeneratorFixture('scaffold', path.join('components', 'showCell.js'))
-  )
-})
-
-// Components
-
-test('creates a form component', async () => {
-  expect(
-    files[
-      path.normalize('/path/to/project/web/src/components/PostForm/PostForm.js')
-    ]
-  ).toEqual(
-    loadGeneratorFixture('scaffold', path.join('components', 'form.js'))
-  )
-})
-
-test('creates an index component', async () => {
-  expect(files['/path/to/project/web/src/components/Posts/Posts.js']).toEqual(
-    loadGeneratorFixture('scaffold', path.join('components', 'index.js'))
-  )
-})
-
-test('creates a new component', async () => {
-  expect(
-    files[
-      path.normalize('/path/to/project/web/src/components/NewPost/NewPost.js')
-    ]
-  ).toEqual(loadGeneratorFixture('scaffold', path.join('components', 'new.js')))
-})
-
-test('creates a show component', async () => {
-  expect(
-    files[path.normalize('/path/to/project/web/src/components/Post/Post.js')]
-  ).toEqual(
-    loadGeneratorFixture('scaffold', path.join('components', 'show.js'))
-  )
-})
-
-// Routes
-
-test('creates a single-word name routes', async () => {
-  expect(await scaffold.routes({ model: 'Post' })).toEqual([
-    '<Route path="/posts/new" page={NewPostPage} name="newPost" />',
-    '<Route path="/posts/{id:Int}/edit" page={EditPostPage} name="editPost" />',
-    '<Route path="/posts/{id:Int}" page={PostPage} name="post" />',
-    '<Route path="/posts" page={PostsPage} name="posts" />',
-  ])
-})
-
-test('creates a multi-word name routes', async () => {
-  expect(await scaffold.routes({ model: 'UserProfile' })).toEqual([
-    '<Route path="/user-profiles/new" page={NewUserProfilePage} name="newUserProfile" />',
-    '<Route path="/user-profiles/{id:Int}/edit" page={EditUserProfilePage} name="editUserProfile" />',
-    '<Route path="/user-profiles/{id:Int}" page={UserProfilePage} name="userProfile" />',
-    '<Route path="/user-profiles" page={UserProfilesPage} name="userProfiles" />',
-  ])
-})
-
-// GraphQL queries
-
-test('the GraphQL in the index query does not contain object types', async () => {
-  const userProfileFiles = await scaffold.files({ model: 'UserProfile' })
-  const cell =
-    userProfileFiles[
-      path.normalize(
-        '/path/to/project/web/src/components/UserProfilesCell/UserProfilesCell.js'
+    )
+  })
+
+  test('creates an edit component with int foreign keys converted in onSave', async () => {
+    const foreignKeyFiles = await scaffold.files({ model: 'UserProfile' })
+
+    expect(
+      foreignKeyFiles[
+        path.normalize(
+          '/path/to/project/web/src/components/EditUserProfileCell/EditUserProfileCell.js'
+        )
+      ]
+    ).toEqual(
+      loadGeneratorFixture(
+        'scaffold',
+        path.join('components', 'foreignKeys', 'edit.js')
       )
-    ]
-  const query = cell.match(/(userProfiles.*?\})/s)[1]
-
-  expect(query).not.toMatch(/^\s+user$/m)
+    )
+  })
 })
 
-test('the GraphQL in the show query does not contain object types', async () => {
-  const userProfileFiles = await scaffold.files({ model: 'UserProfile' })
-  const cell =
-    userProfileFiles[
-      path.normalize(
-        '/path/to/project/web/src/components/UserProfileCell/UserProfileCell.js'
-      )
-    ]
-  const query = cell.match(/(userProfile.*?\})/s)[1]
-
-  expect(query).not.toMatch(/^\s+user$/m)
-})
+describe('in typescript mode', () => {
+  let files
+
+  beforeAll(async () => {
+    files = await scaffold.files({
+      ...getDefaultArgs(scaffold.builder),
+      model: 'Post',
+      typescript: true,
+    })
+  })
+
+  test('returns exactly 16 files', () => {
+    expect(Object.keys(files).length).toEqual(16)
+  })
+
+  // SDL
+
+  test('creates an sdl', () => {
+    expect(files).toHaveProperty([
+      path.normalize('/path/to/project/api/src/graphql/posts.sdl.ts'),
+    ])
+  })
+
+  // Service
+
+  test('creates a service', () => {
+    expect(files).toHaveProperty([
+      path.normalize('/path/to/project/api/src/services/posts/posts.ts'),
+    ])
+  })
+
+  test('creates a service test', () => {
+    expect(files).toHaveProperty([
+      path.normalize('/path/to/project/api/src/services/posts/posts.test.ts'),
+    ])
+  })
+
+  // styles
+
+  test('creates a stylesheet', () => {
+    expect(
+      files[path.normalize('/path/to/project/web/src/scaffold.css')]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('assets', 'scaffold.css'))
+    )
+  })
+
+  // Layout
+
+  test('creates a layout', async () => {
+    expect(
+      files[
+        path.normalize(
+          '/path/to/project/web/src/layouts/PostsLayout/PostsLayout.js'
+        )
+      ]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('layouts', 'layout.js'))
+    )
+  })
+
+  // Pages
+
+  test('creates a edit page', async () => {
+    expect(
+      files[
+        path.normalize(
+          '/path/to/project/web/src/pages/EditPostPage/EditPostPage.js'
+        )
+      ]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('pages', 'editPage.js'))
+    )
+  })
 
-test('the GraphQL in the edit query does not contain object types', async () => {
-  const userProfileFiles = await scaffold.files({ model: 'UserProfile' })
-  const cell =
-    userProfileFiles[
-      path.normalize(
-        '/path/to/project/web/src/components/EditUserProfileCell/EditUserProfileCell.js'
-      )
-    ]
-  const query = cell.match(/(userProfile.*?\})/s)[1]
+  test('creates a index page', async () => {
+    expect(
+      files['/path/to/project/web/src/pages/PostsPage/PostsPage.js']
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('pages', 'indexPage.js'))
+    )
+  })
 
-  expect(query).not.toMatch(/^\s+user$/m)
-})
+  test('creates a new page', async () => {
+    expect(
+      files['/path/to/project/web/src/pages/NewPostPage/NewPostPage.js']
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('pages', 'newPage.js'))
+    )
+  })
+
+  test('creates a show page', async () => {
+    expect(
+      files[
+        path.normalize('/path/to/project/web/src/pages/PostPage/PostPage.js')
+      ]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('pages', 'showPage.js'))
+    )
+  })
+
+  // Cells
+
+  test('creates an edit cell', async () => {
+    expect(
+      files[
+        path.normalize(
+          '/path/to/project/web/src/components/EditPostCell/EditPostCell.js'
+        )
+      ]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('components', 'editCell.js'))
+    )
+  })
 
-// Foreign key casting
+  test('creates an index cell', async () => {
+    expect(
+      files['/path/to/project/web/src/components/PostsCell/PostsCell.js']
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('components', 'indexCell.js'))
+    )
+  })
+
+  test('creates a show cell', async () => {
+    expect(
+      files[
+        path.normalize(
+          '/path/to/project/web/src/components/PostCell/PostCell.js'
+        )
+      ]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('components', 'showCell.js'))
+    )
+  })
+
+  // Components
+
+  test('creates a form component', async () => {
+    expect(
+      files[
+        path.normalize(
+          '/path/to/project/web/src/components/PostForm/PostForm.js'
+        )
+      ]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('components', 'form.js'))
+    )
+  })
 
-test('creates a new component with int foreign keys converted in onSave', async () => {
-  const foreignKeyFiles = await scaffold.files({ model: 'UserProfile' })
+  test('creates an index component', async () => {
+    expect(files['/path/to/project/web/src/components/Posts/Posts.js']).toEqual(
+      loadGeneratorFixture('scaffold', path.join('components', 'index.js'))
+    )
+  })
+
+  test('creates a new component', async () => {
+    expect(
+      files[
+        path.normalize('/path/to/project/web/src/components/NewPost/NewPost.js')
+      ]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('components', 'new.js'))
+    )
+  })
 
-  expect(
-    foreignKeyFiles[
-      path.normalize(
-        '/path/to/project/web/src/components/NewUserProfile/NewUserProfile.js'
+  test('creates a show component', async () => {
+    expect(
+      files[path.normalize('/path/to/project/web/src/components/Post/Post.js')]
+    ).toEqual(
+      loadGeneratorFixture('scaffold', path.join('components', 'show.js'))
+    )
+  })
+
+  // Routes
+
+  test('creates a single-word name routes', async () => {
+    expect(await scaffold.routes({ model: 'Post' })).toEqual([
+      '<Route path="/posts/new" page={NewPostPage} name="newPost" />',
+      '<Route path="/posts/{id:Int}/edit" page={EditPostPage} name="editPost" />',
+      '<Route path="/posts/{id:Int}" page={PostPage} name="post" />',
+      '<Route path="/posts" page={PostsPage} name="posts" />',
+    ])
+  })
+
+  test('creates a multi-word name routes', async () => {
+    expect(await scaffold.routes({ model: 'UserProfile' })).toEqual([
+      '<Route path="/user-profiles/new" page={NewUserProfilePage} name="newUserProfile" />',
+      '<Route path="/user-profiles/{id:Int}/edit" page={EditUserProfilePage} name="editUserProfile" />',
+      '<Route path="/user-profiles/{id:Int}" page={UserProfilePage} name="userProfile" />',
+      '<Route path="/user-profiles" page={UserProfilesPage} name="userProfiles" />',
+    ])
+  })
+
+  // GraphQL queries
+
+  test('the GraphQL in the index query does not contain object types', async () => {
+    const userProfileFiles = await scaffold.files({ model: 'UserProfile' })
+    const cell =
+      userProfileFiles[
+        path.normalize(
+          '/path/to/project/web/src/components/UserProfilesCell/UserProfilesCell.js'
+        )
+      ]
+    const query = cell.match(/(userProfiles.*?\})/s)[1]
+
+    expect(query).not.toMatch(/^\s+user$/m)
+  })
+
+  test('the GraphQL in the show query does not contain object types', async () => {
+    const userProfileFiles = await scaffold.files({ model: 'UserProfile' })
+    const cell =
+      userProfileFiles[
+        path.normalize(
+          '/path/to/project/web/src/components/UserProfileCell/UserProfileCell.js'
+        )
+      ]
+    const query = cell.match(/(userProfile.*?\})/s)[1]
+
+    expect(query).not.toMatch(/^\s+user$/m)
+  })
+
+  test('the GraphQL in the edit query does not contain object types', async () => {
+    const userProfileFiles = await scaffold.files({ model: 'UserProfile' })
+    const cell =
+      userProfileFiles[
+        path.normalize(
+          '/path/to/project/web/src/components/EditUserProfileCell/EditUserProfileCell.js'
+        )
+      ]
+    const query = cell.match(/(userProfile.*?\})/s)[1]
+
+    expect(query).not.toMatch(/^\s+user$/m)
+  })
+
+  // Foreign key casting
+
+  test('creates a new component with int foreign keys converted in onSave', async () => {
+    const foreignKeyFiles = await scaffold.files({ model: 'UserProfile' })
+
+    expect(
+      foreignKeyFiles[
+        path.normalize(
+          '/path/to/project/web/src/components/NewUserProfile/NewUserProfile.js'
+        )
+      ]
+    ).toEqual(
+      loadGeneratorFixture(
+        'scaffold',
+        path.join('components', 'foreignKeys', 'new.js')
       )
-    ]
-  ).toEqual(
-    loadGeneratorFixture(
-      'scaffold',
-      path.join('components', 'foreignKeys', 'new.js')
     )
-  )
-})
-
-test('creates an edit component with int foreign keys converted in onSave', async () => {
-  const foreignKeyFiles = await scaffold.files({ model: 'UserProfile' })
-
-  expect(
-    foreignKeyFiles[
-      path.normalize(
-        '/path/to/project/web/src/components/EditUserProfileCell/EditUserProfileCell.js'
+  })
+
+  test('creates an edit component with int foreign keys converted in onSave', async () => {
+    const foreignKeyFiles = await scaffold.files({ model: 'UserProfile' })
+
+    expect(
+      foreignKeyFiles[
+        path.normalize(
+          '/path/to/project/web/src/components/EditUserProfileCell/EditUserProfileCell.js'
+        )
+      ]
+    ).toEqual(
+      loadGeneratorFixture(
+        'scaffold',
+        path.join('components', 'foreignKeys', 'edit.js')
       )
-    ]
-  ).toEqual(
-    loadGeneratorFixture(
-      'scaffold',
-      path.join('components', 'foreignKeys', 'edit.js')
     )
-  )
+  })
 })
diff --git a/packages/cli/src/commands/generate/scaffold/scaffold.js b/packages/cli/src/commands/generate/scaffold/scaffold.js
index 2cff717496f6..e57344f70ca4 100644
--- a/packages/cli/src/commands/generate/scaffold/scaffold.js
+++ b/packages/cli/src/commands/generate/scaffold/scaffold.js
@@ -15,6 +15,7 @@ import {
   writeFile,
   asyncForEach,
   getSchema,
+  getDefaultArgs,
   getPaths,
   writeFilesTask,
   addRoutesToRouterTask,
@@ -22,8 +23,11 @@ import {
 import c from 'src/lib/colors'
 
 import { relationsForModel, intForeignKeysForModel } from '../helpers'
-import { files as sdlFiles } from '../sdl/sdl'
-import { files as serviceFiles } from '../service/service'
+import { files as sdlFiles, builder as sdlBuilder } from '../sdl/sdl'
+import {
+  files as serviceFiles,
+  builder as serviceBuilder,
+} from '../service/service'
 
 const NON_EDITABLE_COLUMNS = ['id', 'createdAt', 'updatedAt']
 const ASSETS = fs.readdirSync(
@@ -46,15 +50,29 @@ const getIdType = (model) => {
   return model.fields.find((field) => field.isId)?.type
 }
 
-export const files = async ({ model: name, path: scaffoldPath = '' }) => {
+export const files = async ({
+  model: name,
+  path: scaffoldPath = '',
+  typescript,
+  javascript,
+}) => {
   const model = await getSchema(pascalcase(pluralize.singular(name)))
 
   return {
-    ...(await sdlFiles({ name, crud: true })),
+    ...(await sdlFiles({
+      ...getDefaultArgs(sdlBuilder),
+      name,
+      crud: true,
+      typescript,
+      javascript,
+    })),
     ...(await serviceFiles({
+      ...getDefaultArgs(serviceBuilder),
       name,
       crud: true,
       relations: relationsForModel(model),
+      typescript,
+      javascript,
     })),
     ...assetFiles(name),
     ...layoutFiles(name, scaffoldPath),
@@ -325,6 +343,16 @@ export const builder = (yargs) => {
     default: false,
     type: 'boolean',
   })
+  yargs.option('typescript', {
+    type: 'boolean',
+    default: false,
+    desc: 'Generate TypeScript files',
+  })
+  yargs.options('javascript', {
+    type: 'boolean',
+    default: true,
+    desc: 'Generate JavaScript files',
+  })
 }
 const tasks = ({ model, path, force }) => {
   return new Listr(
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js b/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
index eccde98b1945..622e15ee183e 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js
@@ -1,6 +1,7 @@
 global.__dirname = __dirname
 
-import { loadGeneratorFixture, getDefaultArgs } from 'src/lib/test'
+import { loadGeneratorFixture } from 'src/lib/test'
+import { getDefaultArgs } from 'src/lib'
 
 import * as sdl from '../sdl'
 
diff --git a/packages/cli/src/commands/generate/service/__tests__/service.test.js b/packages/cli/src/commands/generate/service/__tests__/service.test.js
index b6de5589c312..5dbe213840f3 100644
--- a/packages/cli/src/commands/generate/service/__tests__/service.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/service.test.js
@@ -1,6 +1,7 @@
 global.__dirname = __dirname
 
-import { loadGeneratorFixture, getDefaultArgs } from 'src/lib/test'
+import { loadGeneratorFixture } from 'src/lib/test'
+import { getDefaultArgs } from 'src/lib'
 
 import * as service from '../service'
 
diff --git a/packages/cli/src/lib/index.js b/packages/cli/src/lib/index.js
index b94e4bc98188..553e3ef3cf39 100644
--- a/packages/cli/src/lib/index.js
+++ b/packages/cli/src/lib/index.js
@@ -176,9 +176,8 @@ export const getPaths = () => {
   try {
     return getRedwoodPaths()
   } catch (e) {
-    console.log(e)
     console.error(c.error(e.message))
-    //process.exit(0)
+    process.exit(0)
   }
 }
 
@@ -336,3 +335,13 @@ export const runCommandTask = async (commands, { verbose }) => {
     return false
   }
 }
+
+/*
+ * Extract default CLI args from an exported builder
+ */
+export const getDefaultArgs = (builder) => {
+  return Object.entries(builder).reduce((agg, [k, v]) => {
+    agg[k] = v.default
+    return agg
+  }, {})
+}
diff --git a/packages/cli/src/lib/test.js b/packages/cli/src/lib/test.js
index 5bffc7b4f9fc..ae9cdff66afc 100644
--- a/packages/cli/src/lib/test.js
+++ b/packages/cli/src/lib/test.js
@@ -91,13 +91,3 @@ export const loadGeneratorFixture = (generator, name) => {
 export const loadFixture = (filepath) => {
   return fs.readFileSync(filepath).toString()
 }
-
-/*
- * Extract default CLI args from an exported builder
- */
-export const getDefaultArgs = (builder) => {
-  return Object.entries(builder).reduce((agg, [k, v]) => {
-    agg[k] = v.default
-    return agg
-  }, {})
-}

From 377a62b51b324efc308f1615e05dd17b95e0528b Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Tue, 19 May 2020 10:38:47 -0400
Subject: [PATCH 15/25] fix test regression

---
 .../generate/cell/__tests__/fixtures/singleWordCell.test.js   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/cli/src/commands/generate/cell/__tests__/fixtures/singleWordCell.test.js b/packages/cli/src/commands/generate/cell/__tests__/fixtures/singleWordCell.test.js
index ba6c85bfef84..5238145feb2d 100644
--- a/packages/cli/src/commands/generate/cell/__tests__/fixtures/singleWordCell.test.js
+++ b/packages/cli/src/commands/generate/cell/__tests__/fixtures/singleWordCell.test.js
@@ -24,9 +24,7 @@ describe('UserCell', () => {
   })
 
   it('Success renders successfully', () => {
-    render(
-      <Success userExample={{ user: { objectKey: 'objectValue' } }} />
-    )
+    render(<Success userExample={{ user: { objectKey: 'objectValue' } }} />)
     expect(
       screen.queryByText('{"user":{"objectKey":"objectValue"}}')
     ).toBeInTheDocument()

From 4db82a434425cab6f52d5d4697a623522fced1d6 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Tue, 26 May 2020 10:53:07 -0400
Subject: [PATCH 16/25] fix scaffold to use functional options

---
 .../scaffold/__tests__/scaffold.test.js       |  6 ++--
 .../commands/generate/scaffold/scaffold.js    | 31 +++++++++++--------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js
index 76d766d30e71..759dd6aed73b 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js
@@ -11,7 +11,7 @@ describe('in javascript (defualt) mode', () => {
 
   beforeAll(async () => {
     files = await scaffold.files({
-      ...getDefaultArgs(scaffold.builder),
+      ...getDefaultArgs(scaffold.defaults),
       model: 'Post',
     })
   })
@@ -22,7 +22,7 @@ describe('in javascript (defualt) mode', () => {
 
   // SDL
 
-  test('creates an sdl', () => {
+  test.only('creates an sdl', () => {
     expect(files).toHaveProperty([
       path.normalize('/path/to/project/api/src/graphql/posts.sdl.js'),
     ])
@@ -281,7 +281,7 @@ describe('in typescript mode', () => {
 
   beforeAll(async () => {
     files = await scaffold.files({
-      ...getDefaultArgs(scaffold.builder),
+      ...getDefaultArgs(scaffold.defaults),
       model: 'Post',
       typescript: true,
     })
diff --git a/packages/cli/src/commands/generate/scaffold/scaffold.js b/packages/cli/src/commands/generate/scaffold/scaffold.js
index e57344f70ca4..e7bf6372edc4 100644
--- a/packages/cli/src/commands/generate/scaffold/scaffold.js
+++ b/packages/cli/src/commands/generate/scaffold/scaffold.js
@@ -331,27 +331,32 @@ const addScaffoldImport = () => {
   return 'Added scaffold import to index.js'
 }
 
-export const command = 'scaffold <model>'
-export const desc =
-  'Generate Pages, SDL, and Services files based on a given DB schema Model. Also accepts <path/model>.'
-export const builder = (yargs) => {
-  yargs.positional('model', {
-    description:
-      "Model to scaffold. You can also use <path/model> to nest files by type at the given path directory (or directories). For example, 'rw g scaffold admin/post'.",
-  })
-  yargs.option('force', {
+export const defaults = {
+  force: {
     default: false,
     type: 'boolean',
-  })
-  yargs.option('typescript', {
+  },
+  typescript: {
     type: 'boolean',
     default: false,
     desc: 'Generate TypeScript files',
-  })
-  yargs.options('javascript', {
+  },
+  javascript: {
     type: 'boolean',
     default: true,
     desc: 'Generate JavaScript files',
+  },
+}
+export const command = 'scaffold <model>'
+export const desc =
+  'Generate Pages, SDL, and Services files based on a given DB schema Model. Also accepts <path/model>.'
+export const builder = (yargs) => {
+  yargs.positional('model', {
+    description:
+      "Model to scaffold. You can also use <path/model> to nest files by type at the given path directory (or directories). For example, 'rw g scaffold admin/post'.",
+  })
+  Object.entries(defaults).forEach((option, config) => {
+    yargs.option(option, config)
   })
 }
 const tasks = ({ model, path, force }) => {

From bbf8a014a2b3b30c9d7b9283195c94d15ef200d0 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Wed, 27 May 2020 04:19:49 -0400
Subject: [PATCH 17/25] remove accidentl `only` in test

---
 .../src/commands/generate/scaffold/__tests__/scaffold.test.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js
index 759dd6aed73b..f031c7089e3f 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js
@@ -22,7 +22,7 @@ describe('in javascript (defualt) mode', () => {
 
   // SDL
 
-  test.only('creates an sdl', () => {
+  test('creates an sdl', () => {
     expect(files).toHaveProperty([
       path.normalize('/path/to/project/api/src/graphql/posts.sdl.js'),
     ])

From 3351d6646d7d7409a96eda02a51aabee4554c411 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Wed, 27 May 2020 16:20:36 -0400
Subject: [PATCH 18/25] fix scaffold optional args

---
 packages/cli/src/commands/generate/scaffold/scaffold.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/commands/generate/scaffold/scaffold.js b/packages/cli/src/commands/generate/scaffold/scaffold.js
index e7bf6372edc4..960b83503f7d 100644
--- a/packages/cli/src/commands/generate/scaffold/scaffold.js
+++ b/packages/cli/src/commands/generate/scaffold/scaffold.js
@@ -355,7 +355,7 @@ export const builder = (yargs) => {
     description:
       "Model to scaffold. You can also use <path/model> to nest files by type at the given path directory (or directories). For example, 'rw g scaffold admin/post'.",
   })
-  Object.entries(defaults).forEach((option, config) => {
+  Object.entries(defaults).forEach(([option, config]) => {
     yargs.option(option, config)
   })
 }

From ace3453e491b059b780a17765cc80aaab39b98d9 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Fri, 29 May 2020 16:26:46 -0400
Subject: [PATCH 19/25] real world testing updates

---
 packages/cli/package.json                          |  3 +++
 .../cli/src/commands/destroy/scaffold/scaffold.js  |  9 +++++++--
 packages/cli/src/commands/destroy/sdl/sdl.js       |  6 +++---
 .../cli/src/commands/destroy/service/service.js    |  6 ++++--
 .../cli/src/commands/generate/scaffold/scaffold.js | 13 +++++++++----
 packages/cli/src/commands/generate/sdl/sdl.js      |  4 ++--
 .../cli/src/commands/generate/service/service.js   |  2 +-
 packages/cli/src/lib/index.js                      | 14 +++++++++-----
 yarn.lock                                          | 14 ++++----------
 9 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index cbcc15b46e87..6e43ed1918c5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -19,8 +19,11 @@
 =======
     "@prisma/sdk": "^2.0.0-beta.5",
     "@redwoodjs/internal": "^0.7.1-canary.8",
+<<<<<<< HEAD
     "babel-plugin-generator-prettier": "^1.2.0",
 >>>>>>> a81200f... use only ts template for services
+=======
+>>>>>>> 89ef31d... real world testing updates
     "camelcase": "^5.3.1",
     "chalk": "^3.0.0",
     "concurrently": "^5.1.0",
diff --git a/packages/cli/src/commands/destroy/scaffold/scaffold.js b/packages/cli/src/commands/destroy/scaffold/scaffold.js
index e99607e464c2..fb5e1f85b300 100644
--- a/packages/cli/src/commands/destroy/scaffold/scaffold.js
+++ b/packages/cli/src/commands/destroy/scaffold/scaffold.js
@@ -1,10 +1,15 @@
 import Listr from 'listr'
 
-import { deleteFilesTask, removeRoutesFromRouterTask } from 'src/lib'
+import {
+  getDefaultArgs,
+  deleteFilesTask,
+  removeRoutesFromRouterTask,
+} from 'src/lib'
 import c from 'src/lib/colors'
 
 import {
   files,
+  defaults,
   routes as scaffoldRoutes,
   splitPathAndModel,
 } from '../../generate/scaffold/scaffold'
@@ -18,7 +23,7 @@ export const tasks = ({ model, path }) =>
       {
         title: 'Destroying scaffold files...',
         task: async () => {
-          const f = await files({ model, path })
+          const f = await files({ ...getDefaultArgs(defaults), model, path })
           return deleteFilesTask(f)
         },
       },
diff --git a/packages/cli/src/commands/destroy/sdl/sdl.js b/packages/cli/src/commands/destroy/sdl/sdl.js
index 4e15556be70c..575bf7b26732 100644
--- a/packages/cli/src/commands/destroy/sdl/sdl.js
+++ b/packages/cli/src/commands/destroy/sdl/sdl.js
@@ -1,9 +1,9 @@
 import Listr from 'listr'
 
-import { deleteFilesTask } from 'src/lib'
+import { getDefaultArgs, deleteFilesTask } from 'src/lib'
 import c from 'src/lib/colors'
 
-import { files } from '../../generate/sdl/sdl'
+import { builder, files } from '../../generate/sdl/sdl'
 
 export const command = 'sdl <model>'
 export const desc = 'Destroy a GraphQL schema and service object.'
@@ -14,7 +14,7 @@ export const tasks = ({ model }) =>
       {
         title: 'Destroying GraphQL schema and service object files...',
         task: async () => {
-          const f = await files({ name: model, crud: false })
+          const f = await files({ ...getDefaultArgs(builder), name: model })
           return deleteFilesTask(f)
         },
       },
diff --git a/packages/cli/src/commands/destroy/service/service.js b/packages/cli/src/commands/destroy/service/service.js
index bf23acadcf32..32cee3c7d345 100644
--- a/packages/cli/src/commands/destroy/service/service.js
+++ b/packages/cli/src/commands/destroy/service/service.js
@@ -1,4 +1,6 @@
-import { files } from '../../generate/service/service'
+import { getDefaultArgs } from 'src/lib'
+
+import { builder, files } from '../../generate/service/service'
 import { createYargsForComponentDestroy } from '../helpers'
 
 // This function wraps files(), so we can pass templateVars. templateVars
@@ -16,6 +18,6 @@ export const filesWithTemplateVars = (templateVars) => {
 export const { command, desc, handler, tasks } = createYargsForComponentDestroy(
   {
     componentName: 'service',
-    filesFn: filesWithTemplateVars({ crud: false }),
+    filesFn: filesWithTemplateVars(getDefaultArgs(builder)),
   }
 )
diff --git a/packages/cli/src/commands/generate/scaffold/scaffold.js b/packages/cli/src/commands/generate/scaffold/scaffold.js
index 960b83503f7d..936132a2b210 100644
--- a/packages/cli/src/commands/generate/scaffold/scaffold.js
+++ b/packages/cli/src/commands/generate/scaffold/scaffold.js
@@ -359,13 +359,13 @@ export const builder = (yargs) => {
     yargs.option(option, config)
   })
 }
-const tasks = ({ model, path, force }) => {
+const tasks = ({ model, path, force, typescript, javascript }) => {
   return new Listr(
     [
       {
         title: 'Generating scaffold files...',
         task: async () => {
-          const f = await files({ model, path })
+          const f = await files({ model, path, typescript, javascript })
           return writeFilesTask(f, { overwriteExisting: force })
         },
       },
@@ -384,10 +384,15 @@ const tasks = ({ model, path, force }) => {
   )
 }
 
-export const handler = async ({ model: modelArg, force }) => {
+export const handler = async ({
+  model: modelArg,
+  force,
+  typescript,
+  javascript,
+}) => {
   const { model, path } = splitPathAndModel(modelArg)
 
-  const t = tasks({ model, path, force })
+  const t = tasks({ model, path, force, typescript, javascript })
   try {
     await t.run()
   } catch (e) {
diff --git a/packages/cli/src/commands/generate/sdl/sdl.js b/packages/cli/src/commands/generate/sdl/sdl.js
index c3307100e536..43553087ee57 100644
--- a/packages/cli/src/commands/generate/sdl/sdl.js
+++ b/packages/cli/src/commands/generate/sdl/sdl.js
@@ -129,14 +129,14 @@ export const files = async ({ name, crud, typescript, javascript }) => {
     }
   )
 
-  const extension = typescript ? 'ts' : 'js'
+  const extension = typescript === true ? 'ts' : 'js'
   let outputPath = path.join(
     getPaths().api.graphql,
     `${camelcase(pluralize(name))}.sdl.${extension}`
   )
 
   if (javascript && !typescript) {
-    template = transformTSToJS(template)
+    template = transformTSToJS(outputPath, template)
   }
 
   return {
diff --git a/packages/cli/src/commands/generate/service/service.js b/packages/cli/src/commands/generate/service/service.js
index fbad6b3d894c..d4bb671d1e3c 100644
--- a/packages/cli/src/commands/generate/service/service.js
+++ b/packages/cli/src/commands/generate/service/service.js
@@ -42,7 +42,7 @@ export const files = async ({
   // }
   return [serviceFile, testFile].reduce((acc, [outputPath, content]) => {
     if (javascript && !typescript) {
-      content = transformTSToJS(content)
+      content = transformTSToJS(outputPath, content)
       outputPath = outputPath.replace('.ts', '.js')
     }
 
diff --git a/packages/cli/src/lib/index.js b/packages/cli/src/lib/index.js
index 553e3ef3cf39..0574d12a5e0a 100644
--- a/packages/cli/src/lib/index.js
+++ b/packages/cli/src/lib/index.js
@@ -128,6 +128,10 @@ export const generateTemplate = (templateFilename, { name, root, ...rest }) => {
     ...rest,
   })
 
+  return prettify(templateFilename, renderedTemplate)
+}
+
+export const prettify = (templateFilename, renderedTemplate) => {
   // We format .js and .css templates, we need to tell prettier which parser
   // we're using.
   // https://prettier.io/docs/en/options.html#parser
@@ -196,13 +200,13 @@ export const prettierOptions = () => {
 /*
  * Convert a generated TS template file into JS.
  */
-export const transformTSToJS = (content) => {
-  const configOptions = prettierOptions()
+export const transformTSToJS = (filename, content) => {
   content = babel.transform(content, {
-    plugins: ['@babel/plugin-transform-typescript', 'generator-prettier'],
-    generatorOpts: configOptions,
+    filename,
+    configFile: false,
+    plugins: ['@babel/plugin-transform-typescript', 'graphql-tag'],
   }).code
-  return content
+  return prettify(filename, content)
 }
 
 /**
diff --git a/yarn.lock b/yarn.lock
index aee6bf0831c2..324c918ea92b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4722,15 +4722,6 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-generator-prettier@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-generator-prettier/-/babel-plugin-generator-prettier-1.2.0.tgz#ec4a00c787f670bbf669228b5375bf9fcd3a5fac"
-  integrity sha512-FE/doiOxcLaw7f4ydNw/poNyxbNUiTmhc4LAx/KW3JKBYzMVsOuLk+oGbgdHJeIAl0B9QKIdCO/ZD4hpdsXV+Q==
-  dependencies:
-    has "^1.0.3"
-    prettier "^1.18.2"
-    source-map "^0.5.7"
-
 babel-plugin-graphql-tag@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-graphql-tag/-/babel-plugin-graphql-tag-2.5.0.tgz#2b2df0dc4b9638022d18868d03abe60117aaf38d"
@@ -13030,6 +13021,7 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 prettier@^1.19.1:
@@ -13040,6 +13032,8 @@ prettier@^1.18.2:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
+=======
+>>>>>>> 89ef31d... real world testing updates
 prettier@^2.0.1, prettier@^2.0.2, prettier@^2.0.5:
 =======
 prettier@^2.0.1, prettier@^2.0.2:
@@ -14837,7 +14831,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
+source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=

From 74b05d99d6b02fffe1680d628db02d78f78673a4 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Sat, 30 May 2020 11:12:23 -0400
Subject: [PATCH 20/25] tests to green

---
 .../src/commands/destroy/scaffold/scaffold.js  |  9 ++-------
 packages/cli/src/commands/destroy/sdl/sdl.js   |  6 +++---
 .../sdl/__tests__/fixtures/enumGeneratedSdl.js |  1 -
 .../sdl/__tests__/fixtures/multiWordSdl.js     |  1 -
 .../sdl/__tests__/fixtures/multiWordSdlCrud.js |  1 -
 .../sdl/__tests__/fixtures/singleWordSdl.js    |  1 -
 .../__tests__/fixtures/singleWordSdlCrud.js    |  1 -
 .../service/__tests__/fixtures/multiWord.js    |  1 -
 .../__tests__/fixtures/multiWord.test.js       |  1 -
 .../__tests__/fixtures/multiWord_crud.js       | 17 +++++++++--------
 .../__tests__/fixtures/multiWord_crud.test.js  |  1 -
 .../service/__tests__/fixtures/singleWord.js   |  1 -
 .../__tests__/fixtures/singleWord.test.js      |  1 -
 .../__tests__/fixtures/singleWord_belongsTo.js | 10 +++++++---
 .../__tests__/fixtures/singleWord_crud.js      | 17 +++++++++--------
 .../__tests__/fixtures/singleWord_crud.test.js |  1 -
 .../__tests__/fixtures/singleWord_hasMany.js   | 10 +++++++---
 .../__tests__/fixtures/singleWord_multiple.js  | 18 ++++++++++++++----
 packages/cli/src/lib/index.js                  |  4 ++--
 19 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/packages/cli/src/commands/destroy/scaffold/scaffold.js b/packages/cli/src/commands/destroy/scaffold/scaffold.js
index fb5e1f85b300..e99607e464c2 100644
--- a/packages/cli/src/commands/destroy/scaffold/scaffold.js
+++ b/packages/cli/src/commands/destroy/scaffold/scaffold.js
@@ -1,15 +1,10 @@
 import Listr from 'listr'
 
-import {
-  getDefaultArgs,
-  deleteFilesTask,
-  removeRoutesFromRouterTask,
-} from 'src/lib'
+import { deleteFilesTask, removeRoutesFromRouterTask } from 'src/lib'
 import c from 'src/lib/colors'
 
 import {
   files,
-  defaults,
   routes as scaffoldRoutes,
   splitPathAndModel,
 } from '../../generate/scaffold/scaffold'
@@ -23,7 +18,7 @@ export const tasks = ({ model, path }) =>
       {
         title: 'Destroying scaffold files...',
         task: async () => {
-          const f = await files({ ...getDefaultArgs(defaults), model, path })
+          const f = await files({ model, path })
           return deleteFilesTask(f)
         },
       },
diff --git a/packages/cli/src/commands/destroy/sdl/sdl.js b/packages/cli/src/commands/destroy/sdl/sdl.js
index 575bf7b26732..5fba80c78362 100644
--- a/packages/cli/src/commands/destroy/sdl/sdl.js
+++ b/packages/cli/src/commands/destroy/sdl/sdl.js
@@ -1,9 +1,9 @@
 import Listr from 'listr'
 
-import { getDefaultArgs, deleteFilesTask } from 'src/lib'
+import { deleteFilesTask } from 'src/lib'
 import c from 'src/lib/colors'
 
-import { builder, files } from '../../generate/sdl/sdl'
+import { files } from '../../generate/sdl/sdl'
 
 export const command = 'sdl <model>'
 export const desc = 'Destroy a GraphQL schema and service object.'
@@ -14,7 +14,7 @@ export const tasks = ({ model }) =>
       {
         title: 'Destroying GraphQL schema and service object files...',
         task: async () => {
-          const f = await files({ ...getDefaultArgs(builder), name: model })
+          const f = await files({ name: model })
           return deleteFilesTask(f)
         },
       },
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/enumGeneratedSdl.js b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/enumGeneratedSdl.js
index 22cf0aa7d6ee..78bc7791feab 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/enumGeneratedSdl.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/enumGeneratedSdl.js
@@ -1,5 +1,4 @@
 import gql from 'graphql-tag'
-
 export const schema = gql`
   type Shoe {
     id: Int!
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdl.js b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdl.js
index bd895becd864..44a5ea1a156c 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdl.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdl.js
@@ -1,5 +1,4 @@
 import gql from 'graphql-tag'
-
 export const schema = gql`
   type UserProfile {
     id: Int!
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdlCrud.js b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdlCrud.js
index 978dd3902eb1..cf235c22a1b9 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdlCrud.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/multiWordSdlCrud.js
@@ -1,5 +1,4 @@
 import gql from 'graphql-tag'
-
 export const schema = gql`
   type UserProfile {
     id: Int!
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdl.js b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdl.js
index 70df6d89f9fe..dfb8f93f331a 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdl.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdl.js
@@ -1,5 +1,4 @@
 import gql from 'graphql-tag'
-
 export const schema = gql`
   type User {
     id: Int!
diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdlCrud.js b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdlCrud.js
index 03e2e78cb282..623ed9d92641 100644
--- a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdlCrud.js
+++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/singleWordSdlCrud.js
@@ -1,5 +1,4 @@
 import gql from 'graphql-tag'
-
 export const schema = gql`
   type Post {
     id: Int!
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.js
index 2f54fb24b2c6..5a456b92a707 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.js
@@ -1,5 +1,4 @@
 import { db } from 'src/lib/db'
-
 export const userProfiles = () => {
   return db.userProfile.findMany()
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.js
index 7002f191355f..ae85ba4ab5b7 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord.test.js
@@ -1,7 +1,6 @@
 /*
 import { userProfiles } from './userProfiles'
 */
-
 describe('userProfiles', () => {
   it('returns true', () => {
     expect(true).toBe(true)
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.js
index 8be74a61b2e7..7550866414f5 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.js
@@ -1,30 +1,31 @@
 import { db } from 'src/lib/db'
-
 export const userProfiles = () => {
   return db.userProfile.findMany()
 }
-
 export const userProfile = ({ id }) => {
   return db.userProfile.findOne({
-    where: { id },
+    where: {
+      id,
+    },
   })
 }
-
 export const createUserProfile = ({ input }) => {
   return db.userProfile.create({
     data: input,
   })
 }
-
 export const updateUserProfile = ({ id, input }) => {
   return db.userProfile.update({
     data: input,
-    where: { id },
+    where: {
+      id,
+    },
   })
 }
-
 export const deleteUserProfile = ({ id }) => {
   return db.userProfile.delete({
-    where: { id },
+    where: {
+      id,
+    },
   })
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.js
index 7002f191355f..ae85ba4ab5b7 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/multiWord_crud.test.js
@@ -1,7 +1,6 @@
 /*
 import { userProfiles } from './userProfiles'
 */
-
 describe('userProfiles', () => {
   it('returns true', () => {
     expect(true).toBe(true)
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.js
index b5bfed92100b..99fe7eeb6c5f 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.js
@@ -1,5 +1,4 @@
 import { db } from 'src/lib/db'
-
 export const users = () => {
   return db.user.findMany()
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.js
index bac7cb4ed5c6..f31a4e004ff4 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord.test.js
@@ -1,7 +1,6 @@
 /*
 import { users } from './users'
 */
-
 describe('users', () => {
   it('returns true', () => {
     expect(true).toBe(true)
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.js
index 2dbdb567cce2..7ee9591f01a5 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_belongsTo.js
@@ -1,10 +1,14 @@
 import { db } from 'src/lib/db'
-
 export const users = () => {
   return db.user.findMany()
 }
-
 export const User = {
   identity: (_obj, { root }) =>
-    db.user.findOne({ where: { id: root.id } }).identity(),
+    db.user
+      .findOne({
+        where: {
+          id: root.id,
+        },
+      })
+      .identity(),
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.js
index be53d32bf06f..586db6356700 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.js
@@ -1,30 +1,31 @@
 import { db } from 'src/lib/db'
-
 export const posts = () => {
   return db.post.findMany()
 }
-
 export const post = ({ id }) => {
   return db.post.findOne({
-    where: { id },
+    where: {
+      id,
+    },
   })
 }
-
 export const createPost = ({ input }) => {
   return db.post.create({
     data: input,
   })
 }
-
 export const updatePost = ({ id, input }) => {
   return db.post.update({
     data: input,
-    where: { id },
+    where: {
+      id,
+    },
   })
 }
-
 export const deletePost = ({ id }) => {
   return db.post.delete({
-    where: { id },
+    where: {
+      id,
+    },
   })
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.js
index f23483ac34b4..ecc2cd3a8f68 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_crud.test.js
@@ -1,7 +1,6 @@
 /*
 import { posts } from './posts'
 */
-
 describe('posts', () => {
   it('returns true', () => {
     expect(true).toBe(true)
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.js
index 9e66d05df5a7..0071f84f37f1 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_hasMany.js
@@ -1,10 +1,14 @@
 import { db } from 'src/lib/db'
-
 export const users = () => {
   return db.user.findMany()
 }
-
 export const User = {
   userProfiles: (_obj, { root }) =>
-    db.user.findOne({ where: { id: root.id } }).userProfiles(),
+    db.user
+      .findOne({
+        where: {
+          id: root.id,
+        },
+      })
+      .userProfiles(),
 }
diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.js b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.js
index 69686c8a7a6b..aaeb25f758ca 100644
--- a/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.js
+++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/singleWord_multiple.js
@@ -1,12 +1,22 @@
 import { db } from 'src/lib/db'
-
 export const users = () => {
   return db.user.findMany()
 }
-
 export const User = {
   userProfiles: (_obj, { root }) =>
-    db.user.findOne({ where: { id: root.id } }).userProfiles(),
+    db.user
+      .findOne({
+        where: {
+          id: root.id,
+        },
+      })
+      .userProfiles(),
   identity: (_obj, { root }) =>
-    db.user.findOne({ where: { id: root.id } }).identity(),
+    db.user
+      .findOne({
+        where: {
+          id: root.id,
+        },
+      })
+      .identity(),
 }
diff --git a/packages/cli/src/lib/index.js b/packages/cli/src/lib/index.js
index 0574d12a5e0a..93dc9f28b11f 100644
--- a/packages/cli/src/lib/index.js
+++ b/packages/cli/src/lib/index.js
@@ -204,9 +204,9 @@ export const transformTSToJS = (filename, content) => {
   content = babel.transform(content, {
     filename,
     configFile: false,
-    plugins: ['@babel/plugin-transform-typescript', 'graphql-tag'],
+    plugins: ['@babel/plugin-transform-typescript'],
   }).code
-  return prettify(filename, content)
+  return prettify(filename.replace(/\.t(sx?)$/, '.j$1'), content)
 }
 
 /**

From 387625d97bb9531476bba276306f14b5b76589d8 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Sat, 30 May 2020 13:48:51 -0400
Subject: [PATCH 21/25] destruction enabled!

---
 .../scaffold/__tests__/scaffold.test.js       | 278 ++++++++++++------
 .../destroy/sdl/__tests__/sdl.test.js         |  86 ++++--
 .../destroy/service/__tests__/service.test.js |  95 ++++--
 packages/cli/src/lib/index.js                 |  34 ++-
 4 files changed, 363 insertions(+), 130 deletions(-)

diff --git a/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js b/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js
index b14886bfd062..6d2604dc05eb 100644
--- a/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js
+++ b/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js
@@ -1,5 +1,21 @@
 global.__dirname = __dirname
+
+import fs from 'fs'
+
+import 'src/lib/test'
+import { getPaths, getDefaultArgs } from 'src/lib'
+
+import { defaults, files } from '../../../generate/scaffold/scaffold'
+import { tasks } from '../scaffold'
+
 jest.mock('fs')
+jest.mock('@babel/core', () => {
+  return {
+    transform: () => ({
+      code: '',
+    }),
+  }
+})
 jest.mock('src/lib', () => {
   const path = require('path')
   return {
@@ -10,115 +26,203 @@ jest.mock('src/lib', () => {
   }
 })
 
-import fs from 'fs'
+describe('rw destroy scaffold', () => {
+  describe('destroy scaffold post', () => {
+    beforeEach(async () => {
+      fs.__setMockFiles({
+        ...(await files({ ...getDefaultArgs(defaults), model: 'Post' })),
+        [getPaths().web.routes]: [
+          '<Routes>',
+          '  <Route path="/posts/new" page={NewPostPage} name="newPost" />',
+          '  <Route path="/posts/{id:Int}/edit" page={EditPostPage} name="editPost" />',
+          '  <Route path="/posts/{id:Int}" page={PostPage} name="post" />',
+          '  <Route path="/posts" page={PostsPage} name="posts" />',
+          '  <Route path="/" page={HomePage} name="home" />',
+          '  <Route notfound page={NotFoundPage} />',
+          '</Routes>',
+        ].join('\n'),
+      })
+    })
 
-import 'src/lib/test'
-import { getPaths } from 'src/lib'
+    afterEach(() => {
+      fs.__setMockFiles({})
+      jest.spyOn(fs, 'unlinkSync').mockClear()
+    })
 
-import { files } from '../../../generate/scaffold/scaffold'
-import { tasks } from '../scaffold'
+    test('destroys files', async () => {
+      const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
+      const t = tasks({ model: 'Post' })
+      t.setRenderer('silent')
 
-describe('destroy scaffold post', () => {
-  beforeEach(async () => {
-    fs.__setMockFiles({
-      ...(await files({ model: 'Post' })),
-      [getPaths().web.routes]: [
-        '<Routes>',
-        '  <Route path="/posts/new" page={NewPostPage} name="newPost" />',
-        '  <Route path="/posts/{id:Int}/edit" page={EditPostPage} name="editPost" />',
-        '  <Route path="/posts/{id:Int}" page={PostPage} name="post" />',
-        '  <Route path="/posts" page={PostsPage} name="posts" />',
-        '  <Route path="/" page={HomePage} name="home" />',
-        '  <Route notfound page={NotFoundPage} />',
-        '</Routes>',
-      ].join('\n'),
+      return t._tasks[0].run().then(async () => {
+        const generatedFiles = Object.keys(
+          await files({ ...getDefaultArgs(defaults), model: 'Post' })
+        )
+        expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
+        generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
+      })
     })
-  })
 
-  afterEach(() => {
-    fs.__setMockFiles({})
-    jest.spyOn(fs, 'unlinkSync').mockClear()
-  })
+    describe('for typescript files', () => {
+      beforeEach(async () => {
+        fs.__setMockFiles({}) // clear filesystem so files call works as expected
+        fs.__setMockFiles({
+          ...(await files({
+            ...getDefaultArgs(defaults),
+            typescript: true,
+            model: 'Post',
+          })),
+          [getPaths().web.routes]: [
+            '<Routes>',
+            '  <Route path="/posts/new" page={NewPostPage} name="newPost" />',
+            '  <Route path="/posts/{id:Int}/edit" page={EditPostPage} name="editPost" />',
+            '  <Route path="/posts/{id:Int}" page={PostPage} name="post" />',
+            '  <Route path="/posts" page={PostsPage} name="posts" />',
+            '  <Route path="/" page={HomePage} name="home" />',
+            '  <Route notfound page={NotFoundPage} />',
+            '</Routes>',
+          ].join('\n'),
+        })
+      })
 
-  test('destroys files', async () => {
-    const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
-    const t = tasks({ model: 'Post' })
-    t.setRenderer('silent')
+      test('destroys files', async () => {
+        const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
+        const t = tasks({ model: 'Post' })
+        t.setRenderer('silent')
 
-    return t._tasks[0].run().then(async () => {
-      const generatedFiles = Object.keys(await files({ model: 'Post' }))
-      expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
-      generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
+        return t._tasks[0].run().then(async () => {
+          const generatedFiles = Object.keys(
+            await files({
+              ...getDefaultArgs(defaults),
+              typescript: true,
+              model: 'Post',
+            })
+          )
+          expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
+          generatedFiles.forEach((f) =>
+            expect(unlinkSpy).toHaveBeenCalledWith(f)
+          )
+        })
+      })
     })
-  })
 
-  test('cleans up routes from Routes.js', async () => {
-    const t = tasks({ model: 'Post' })
-    t.setRenderer('silent')
+    test('cleans up routes from Routes.js', async () => {
+      const t = tasks({ model: 'Post' })
+      t.setRenderer('silent')
 
-    return t._tasks[1].run().then(() => {
-      const routes = fs.readFileSync(getPaths().web.routes)
-      expect(routes).toEqual(
-        [
+      return t._tasks[1].run().then(() => {
+        const routes = fs.readFileSync(getPaths().web.routes)
+        expect(routes).toEqual(
+          [
+            '<Routes>',
+            '  <Route path="/" page={HomePage} name="home" />',
+            '  <Route notfound page={NotFoundPage} />',
+            '</Routes>',
+          ].join('\n')
+        )
+      })
+    })
+  })
+
+  describe('destroy namespaced scaffold post', () => {
+    beforeEach(async () => {
+      fs.__setMockFiles({
+        ...(await files({
+          ...getDefaultArgs(defaults),
+          model: 'Post',
+          path: 'admin',
+        })),
+        [getPaths().web.routes]: [
           '<Routes>',
+          '  <Route path="/admin/posts/new" page={AdminNewPostPage} name="adminNewPost" />',
+          '  <Route path="/admin/posts/{id:Int}/edit" page={AdminEditPostPage} name="adminEditPost" />',
+          '  <Route path="/admin/posts/{id:Int}" page={AdminPostPage} name="adminPost" />',
           '  <Route path="/" page={HomePage} name="home" />',
           '  <Route notfound page={NotFoundPage} />',
           '</Routes>',
-        ].join('\n')
-      )
+        ].join('\n'),
+      })
     })
-  })
-})
 
-describe('destroy namespaced scaffold post', () => {
-  beforeEach(async () => {
-    fs.__setMockFiles({
-      ...(await files({ model: 'Post', path: 'admin' })),
-      [getPaths().web.routes]: [
-        '<Routes>',
-        '  <Route path="/admin/posts/new" page={AdminNewPostPage} name="adminNewPost" />',
-        '  <Route path="/admin/posts/{id:Int}/edit" page={AdminEditPostPage} name="adminEditPost" />',
-        '  <Route path="/admin/posts/{id:Int}" page={AdminPostPage} name="adminPost" />',
-        '  <Route path="/" page={HomePage} name="home" />',
-        '  <Route notfound page={NotFoundPage} />',
-        '</Routes>',
-      ].join('\n'),
+    afterEach(() => {
+      fs.__setMockFiles({})
+      jest.spyOn(fs, 'unlinkSync').mockClear()
     })
-  })
 
-  afterEach(() => {
-    fs.__setMockFiles({})
-    jest.spyOn(fs, 'unlinkSync').mockClear()
-  })
+    test('destroys files', async () => {
+      const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
+      const t = tasks({ model: 'Post', path: 'admin' })
+      t.setRenderer('silent')
 
-  test('destroys files', async () => {
-    const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
-    const t = tasks({ model: 'Post', path: 'admin' })
-    t.setRenderer('silent')
-
-    return t._tasks[0].run().then(async () => {
-      const generatedFiles = Object.keys(
-        await files({ model: 'Post', path: 'admin' })
-      )
-      expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
-      generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
+      return t._tasks[0].run().then(async () => {
+        const generatedFiles = Object.keys(
+          await files({
+            ...getDefaultArgs(defaults),
+            model: 'Post',
+            path: 'admin',
+          })
+        )
+        expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
+        generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
+      })
     })
-  })
 
-  test('cleans up routes from Routes.js', async () => {
-    const t = tasks({ model: 'Post', path: 'admin' })
-    t.setRenderer('silent')
+    describe('for typescript files', () => {
+      beforeEach(async () => {
+        fs.__setMockFiles({}) // clear filesystem so files call works as expected
+        fs.__setMockFiles({
+          ...(await files({
+            ...getDefaultArgs(defaults),
+            model: 'Post',
+            path: 'admin',
+          })),
+          [getPaths().web.routes]: [
+            '<Routes>',
+            '  <Route path="/admin/posts/new" page={AdminNewPostPage} name="adminNewPost" />',
+            '  <Route path="/admin/posts/{id:Int}/edit" page={AdminEditPostPage} name="adminEditPost" />',
+            '  <Route path="/admin/posts/{id:Int}" page={AdminPostPage} name="adminPost" />',
+            '  <Route path="/" page={HomePage} name="home" />',
+            '  <Route notfound page={NotFoundPage} />',
+            '</Routes>',
+          ].join('\n'),
+        })
+      })
+      test('destroys files', async () => {
+        const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
+        const t = tasks({ model: 'Post', path: 'admin' })
+        t.setRenderer('silent')
 
-    return t._tasks[1].run().then(() => {
-      const routes = fs.readFileSync(getPaths().web.routes)
-      expect(routes).toEqual(
-        [
-          '<Routes>',
-          '  <Route path="/" page={HomePage} name="home" />',
-          '  <Route notfound page={NotFoundPage} />',
-          '</Routes>',
-        ].join('\n')
-      )
+        return t._tasks[0].run().then(async () => {
+          const generatedFiles = Object.keys(
+            await files({
+              ...getDefaultArgs(defaults),
+              model: 'Post',
+              path: 'admin',
+            })
+          )
+          expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
+          generatedFiles.forEach((f) =>
+            expect(unlinkSpy).toHaveBeenCalledWith(f)
+          )
+        })
+      })
+    })
+
+    test('cleans up routes from Routes.js', async () => {
+      const t = tasks({ model: 'Post', path: 'admin' })
+      t.setRenderer('silent')
+
+      return t._tasks[1].run().then(() => {
+        const routes = fs.readFileSync(getPaths().web.routes)
+        expect(routes).toEqual(
+          [
+            '<Routes>',
+            '  <Route path="/" page={HomePage} name="home" />',
+            '  <Route notfound page={NotFoundPage} />',
+            '</Routes>',
+          ].join('\n')
+        )
+      })
     })
   })
 })
diff --git a/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js b/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js
index e45ffc87192e..381114a27d0f 100644
--- a/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js
+++ b/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js
@@ -1,5 +1,22 @@
 global.__dirname = __dirname
+
+import fs from 'fs'
+
+import 'src/lib/test'
+
+import { getDefaultArgs } from 'src/lib'
+
+import { builder, files } from '../../../generate/sdl/sdl'
+import { tasks } from '../sdl'
+
 jest.mock('fs')
+jest.mock('@babel/core', () => {
+  return {
+    transform: () => ({
+      code: '',
+    }),
+  }
+})
 jest.mock('src/lib', () => {
   const path = require('path')
   return {
@@ -10,30 +27,61 @@ jest.mock('src/lib', () => {
   }
 })
 
-import fs from 'fs'
+describe('rw destory sdl', () => {
+  afterEach(() => {
+    fs.__setMockFiles({})
+    jest.spyOn(fs, 'unlinkSync').mockClear()
+  })
 
-import 'src/lib/test'
+  describe('for javascipt files', () => {
+    beforeEach(async () => {
+      fs.__setMockFiles(
+        await files({ ...getDefaultArgs(builder), name: 'Post' })
+      )
+    })
 
-import { files } from '../../../generate/sdl/sdl'
-import { tasks } from '../sdl'
+    test('destroys sdl files', async () => {
+      const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
+      const t = tasks({ model: 'Post' })
+      t.setRenderer('silent')
 
-beforeEach(async () => {
-  fs.__setMockFiles(await files({ name: 'Post' }))
-})
+      return t._tasks[0].run().then(async () => {
+        const generatedFiles = Object.keys(
+          await files({ ...getDefaultArgs(builder), name: 'Post' })
+        )
+        expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
+        generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
+      })
+    })
+  })
 
-afterEach(() => {
-  fs.__setMockFiles({})
-  jest.spyOn(fs, 'unlinkSync').mockClear()
-})
+  describe('for typescript files', () => {
+    beforeEach(async () => {
+      fs.__setMockFiles(
+        await files({
+          ...getDefaultArgs(builder),
+          typescript: true,
+          name: 'Post',
+        })
+      )
+    })
 
-test('destroys sdl files', async () => {
-  const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
-  const t = tasks({ model: 'Post' })
-  t.setRenderer('silent')
+    test('destroys sdl files', async () => {
+      const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
+      const t = tasks({ model: 'Post' })
+      t.setRenderer('silent')
 
-  return t._tasks[0].run().then(async () => {
-    const generatedFiles = Object.keys(await files({ name: 'Post' }))
-    expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
-    generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
+      return t._tasks[0].run().then(async () => {
+        const generatedFiles = Object.keys(
+          await files({
+            ...getDefaultArgs(builder),
+            typescript: true,
+            name: 'Post',
+          })
+        )
+        expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
+        generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
+      })
+    })
   })
 })
diff --git a/packages/cli/src/commands/destroy/service/__tests__/service.test.js b/packages/cli/src/commands/destroy/service/__tests__/service.test.js
index 2503a33673e1..0278784adfee 100644
--- a/packages/cli/src/commands/destroy/service/__tests__/service.test.js
+++ b/packages/cli/src/commands/destroy/service/__tests__/service.test.js
@@ -1,5 +1,22 @@
 global.__dirname = __dirname
+
+import fs from 'fs'
+
+import 'src/lib/test'
+
+import { getDefaultArgs } from 'src/lib'
+
+import { builder, files } from '../../../generate/service/service'
+import { tasks } from '../service'
+
 jest.mock('fs')
+jest.mock('@babel/core', () => {
+  return {
+    transform: () => ({
+      code: '',
+    }),
+  }
+})
 jest.mock('src/lib', () => {
   return {
     ...require.requireActual('src/lib'),
@@ -7,30 +24,68 @@ jest.mock('src/lib', () => {
   }
 })
 
-import fs from 'fs'
+describe('rw destory service', () => {
+  afterEach(() => {
+    fs.__setMockFiles({})
+    jest.spyOn(fs, 'unlinkSync').mockClear()
+  })
 
-import 'src/lib/test'
+  describe('for javascript files', () => {
+    beforeEach(async () => {
+      fs.__setMockFiles(
+        await files({ ...getDefaultArgs(builder), name: 'User' })
+      )
+    })
+    test('destroys service files', async () => {
+      const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
+      const t = tasks({
+        componentName: 'service',
+        filesFn: files,
+        name: 'User',
+      })
+      t.setRenderer('silent')
 
-import { files } from '../../../generate/service/service'
-import { tasks } from '../service'
-
-beforeEach(async () => {
-  fs.__setMockFiles(await files({ name: 'User' }))
-})
+      return t.run().then(async () => {
+        const generatedFiles = Object.keys(
+          await files({ ...getDefaultArgs(builder), name: 'User' })
+        )
+        expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
+        generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
+      })
+    })
+  })
 
-afterEach(() => {
-  fs.__setMockFiles({})
-  jest.spyOn(fs, 'unlinkSync').mockClear()
-})
+  describe('for typescript files', () => {
+    beforeEach(async () => {
+      fs.__setMockFiles(
+        await files({
+          ...getDefaultArgs(builder),
+          typescript: true,
+          name: 'User',
+        })
+      )
+    })
 
-test('destroys service files', async () => {
-  const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
-  const t = tasks({ componentName: 'service', filesFn: files, name: 'User' })
-  t.setRenderer('silent')
+    test('destroys service files', async () => {
+      const unlinkSpy = jest.spyOn(fs, 'unlinkSync')
+      const t = tasks({
+        componentName: 'service',
+        filesFn: files,
+        name: 'User',
+      })
+      t.setRenderer('silent')
 
-  return t.run().then(async () => {
-    const generatedFiles = Object.keys(await files({ name: 'User' }))
-    expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
-    generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
+      return t.run().then(async () => {
+        const generatedFiles = Object.keys(
+          await files({
+            ...getDefaultArgs(builder),
+            typescript: true,
+            name: 'User',
+          })
+        )
+        expect(generatedFiles.length).toEqual(unlinkSpy.mock.calls.length)
+        generatedFiles.forEach((f) => expect(unlinkSpy).toHaveBeenCalledWith(f))
+      })
+    })
   })
 })
diff --git a/packages/cli/src/lib/index.js b/packages/cli/src/lib/index.js
index 93dc9f28b11f..816c7c26292f 100644
--- a/packages/cli/src/lib/index.js
+++ b/packages/cli/src/lib/index.js
@@ -153,7 +153,32 @@ export const prettify = (templateFilename, renderedTemplate) => {
 
 export const readFile = (target) => fs.readFileSync(target)
 
-export const deleteFile = (target) => fs.unlinkSync(target)
+export const deleteFile = (file) => {
+  const extension = path.extname(file)
+  if (['.js', '.ts'].includes(extension)) {
+    const baseFile = getBaseFile(file)
+    const files = [baseFile + '.js', baseFile + '.ts']
+    files.forEach((f) => {
+      if (fs.existsSync(f)) {
+        fs.unlinkSync(f)
+      }
+    })
+  } else {
+    fs.unlinkSync(file)
+  }
+}
+
+const getBaseFile = (file) => file.replace(/\.\w*$/, '')
+
+const existsAnyExtensionSync = (file) => {
+  const extension = path.extname(file)
+  if (['.js', '.ts'].includes(extension)) {
+    const baseFile = getBaseFile(file)
+    return fs.existsSync(`${baseFile}.js`) || fs.existsSync(`${baseFile}.ts`)
+  }
+
+  return fs.existsSync(file)
+}
 
 export const writeFile = (
   target,
@@ -206,7 +231,7 @@ export const transformTSToJS = (filename, content) => {
     configFile: false,
     plugins: ['@babel/plugin-transform-typescript'],
   }).code
-  return prettify(filename.replace(/\.t(sx?)$/, '.j$1'), content)
+  return prettify(filename.replace(/\.ts$/, '.js'), content)
 }
 
 /**
@@ -234,11 +259,12 @@ export const writeFilesTask = (files, options) => {
  */
 export const deleteFilesTask = (files) => {
   const { base } = getPaths()
+
   return new Listr([
     ...Object.keys(files).map((file) => {
       return {
-        title: `Destroying \`./${path.relative(base, file)}\`...`,
-        skip: () => !fs.existsSync(file) && `File doesn't exist`,
+        title: `Destroying \`./${path.relative(base, getBaseFile(file))}\`...`,
+        skip: () => !existsAnyExtensionSync(file) && `File doesn't exist`,
         task: () => deleteFile(file),
       }
     }),

From cf7aede0c72bbab8b2b119d4c1d3af1f46f25e48 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Sat, 30 May 2020 14:23:19 -0400
Subject: [PATCH 22/25] fixing merge issues

---
 packages/auth/package.json                    |    6 -
 packages/auth/src/AuthProvider.tsx            |   80 -
 packages/auth/src/authClient.ts               |   42 -
 packages/auth/src/useAuth.ts                  |    3 -
 packages/cli/package.json                     |    9 -
 .../__tests__/fixtures/assets/scaffold.css    |   74 -
 .../fixtures/components/foreignKeys/edit.js   |    9 -
 .../__tests__/fixtures/components/show.js     |   24 -
 yarn.lock                                     | 2958 ++++++-----------
 9 files changed, 1081 insertions(+), 2124 deletions(-)

diff --git a/packages/auth/package.json b/packages/auth/package.json
index bbc17e6b5477..6a3326ed0281 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -8,18 +8,12 @@
   "types": "dist/index.d.ts",
   "license": "MIT",
   "devDependencies": {
-    "react": "^16.13.1",
     "@auth0/auth0-spa-js": "^1.7.0",
-<<<<<<< HEAD
     "@types/react": "16.9.35",
     "gotrue-js": "^0.9.25",
     "magic-sdk": "^1.3.5",
     "netlify-identity-widget": "1.6.0",
     "react": "^16.13.1"
-=======
-    "@types/react": "^16.9.34",
-    "gotrue-js": "^0.9.25"
->>>>>>> 4e101f7... Make auth package compile with TypeScript.
   },
   "scripts": {
     "build": "yarn build:js && yarn build:types",
diff --git a/packages/auth/src/AuthProvider.tsx b/packages/auth/src/AuthProvider.tsx
index 6422d9b71880..58df76626307 100644
--- a/packages/auth/src/AuthProvider.tsx
+++ b/packages/auth/src/AuthProvider.tsx
@@ -1,37 +1,21 @@
-<<<<<<< HEAD
 import React from 'react'
-=======
-import type { ReactNode } from 'react'
-import React, { useState, useEffect } from 'react'
->>>>>>> bb1ab34... Add auth package.
 
 import type {
   SupportedAuthTypes,
   SupportedAuthClients,
   Auth0User,
-<<<<<<< HEAD
   GoTrueUser,
   AuthClient,
   MagicUser,
-=======
-  NetlifyUser,
->>>>>>> bb1ab34... Add auth package.
 } from './authClient'
 import { createAuthClient } from './authClient'
 
 export interface AuthContextInterface {
   loading: boolean
-<<<<<<< HEAD
   isAuthenticated: boolean
   currentUser: null | GoTrueUser | Auth0User | MagicUser
   logIn(): Promise<void>
   logOut(): Promise<void>
-=======
-  authenticated: boolean
-  user: null | object // TODO: Provide a generic interface to the users object.
-  login(): Promise<void>
-  logout(): Promise<void>
->>>>>>> bb1ab34... Add auth package.
   getToken(): Promise<null | string>
   client: null | SupportedAuthClients
   type: null | SupportedAuthTypes
@@ -41,7 +25,6 @@ export const AuthContext = React.createContext<Partial<AuthContextInterface>>(
   {}
 )
 
-<<<<<<< HEAD
 type AuthProviderProps = {
   client: AuthClient
   type: SupportedAuthTypes
@@ -52,8 +35,6 @@ type AuthProviderState = {
   isAuthenticated: boolean
   currentUser: null | Auth0User | GoTrueUser
 }
-=======
->>>>>>> bb1ab34... Add auth package.
 /**
  * @example
  * ```js
@@ -64,7 +45,6 @@ type AuthProviderState = {
  *  </AuthProvider>
  * ```
  */
-<<<<<<< HEAD
 export class AuthProvider extends React.Component<
   AuthProviderProps,
   AuthProviderState
@@ -120,64 +100,4 @@ export class AuthProvider extends React.Component<
       </AuthContext.Provider>
     )
   }
-=======
-export const AuthProvider = ({
-  children,
-  type,
-  client,
-}: {
-  children: ReactNode
-  type: SupportedAuthTypes
-  client: SupportedAuthClients
-}): JSX.Element => {
-  const [loading, setLoading] = useState(true)
-  const [authenticated, setAuthenticated] = useState(false)
-  const [user, setUser] = useState<null | NetlifyUser | Auth0User>(null)
-
-  // Map the methods from auth0 and netlify into a unified interface.
-  const rwClient = createAuthClient(client, type)
-
-  // Attempt to restore the authentication state when a user visits the app again.
-  useEffect(() => {
-    const restoreAuthState = async () => {
-      rwClient.restoreAuthState && (await rwClient.restoreAuthState())
-
-      const user = await rwClient.currentUser()
-      setUser(user)
-      setAuthenticated(user !== null)
-      setLoading(false)
-    }
-    restoreAuthState()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
-  const login = async (...args) => {
-    const user = await rwClient.login(...args)
-    setUser(user)
-    setAuthenticated(user !== null)
-  }
-
-  const logout = async () => {
-    await rwClient.logout()
-    setUser(null)
-    setAuthenticated(false)
-  }
-
-  return (
-    <AuthContext.Provider
-      value={{
-        loading,
-        authenticated,
-        user,
-        login,
-        logout,
-        getToken: rwClient.getToken,
-        client: rwClient.client,
-        type: rwClient.type,
-      }}
-    >
-      {children}
-    </AuthContext.Provider>
-  )
->>>>>>> bb1ab34... Add auth package.
 }
diff --git a/packages/auth/src/authClient.ts b/packages/auth/src/authClient.ts
index 49f4990f8c2e..22a77fa249ba 100644
--- a/packages/auth/src/authClient.ts
+++ b/packages/auth/src/authClient.ts
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import type { default as GoTrue, User as GoTrueUser } from 'gotrue-js'
 import type { Auth0Client as Auth0 } from '@auth0/auth0-spa-js'
 import type NetlifyIdentityNS from 'netlify-identity-widget'
@@ -13,43 +12,24 @@ export type MagicUser = MagicUserMetadata
 
 export type SupportedAuthClients = Auth0 | GoTrue | NetlifyIdentity | MagicLinks
 export type SupportedAuthTypes = 'auth0' | 'gotrue' | 'netlify' | 'magic.link'
-=======
-import type { default as Netlify } from 'gotrue-js'
-import type { User as NetlifyUser } from 'gotrue-js'
-import type { Auth0Client as Auth0 } from '@auth0/auth0-spa-js'
-
-// TODO: Can also return an Auth0 user which doesn't have a definition.
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface Auth0User {}
-export type { NetlifyUser }
->>>>>>> bb1ab34... Add auth package.
 
 export interface AuthClient {
   restoreAuthState?(): void | Promise<any>
   login(options?: any): Promise<any>
   logout(): void | Promise<void>
   getToken(): Promise<null | string>
-<<<<<<< HEAD
   currentUser(): Promise<null | Auth0User | GoTrueUser | MagicUser>
-=======
-  currentUser(): Promise<null | Auth0User | NetlifyUser>
->>>>>>> bb1ab34... Add auth package.
   client: SupportedAuthClients
   type: SupportedAuthTypes
 }
 
 export type AuthClientAuth0 = AuthClient
 
-<<<<<<< HEAD
 export interface AuthClientGoTrue extends AuthClient {
-=======
-export interface AuthClientNetlify extends AuthClient {
->>>>>>> bb1ab34... Add auth package.
   login(options: {
     email: string
     password: string
     remember?: boolean
-<<<<<<< HEAD
   }): Promise<GoTrueUser>
   client: GoTrue
 }
@@ -57,14 +37,6 @@ export interface AuthClientNetlify extends AuthClient {
 export interface MagicLinksClient extends AuthClient {
   login(options: { email: string; showUI?: boolean })
 }
-=======
-  }): Promise<NetlifyUser>
-  client: Netlify
-}
-
-export type SupportedAuthClients = Auth0 | Netlify
-export type SupportedAuthTypes = 'auth0' | 'netlify'
->>>>>>> bb1ab34... Add auth package.
 
 const mapAuthClientAuth0 = (client: Auth0): AuthClientAuth0 => {
   return {
@@ -92,15 +64,9 @@ const mapAuthClientAuth0 = (client: Auth0): AuthClientAuth0 => {
   }
 }
 
-<<<<<<< HEAD
 const mapAuthClientGoTrue = (client: GoTrue): AuthClientGoTrue => {
   return {
     type: 'gotrue',
-=======
-const mapAuthClientNetlify = (client: Netlify): AuthClientNetlify => {
-  return {
-    type: 'netlify',
->>>>>>> bb1ab34... Add auth package.
     client,
     login: async ({ email, password, remember }) =>
       client.login(email, password, remember),
@@ -116,7 +82,6 @@ const mapAuthClientNetlify = (client: Netlify): AuthClientNetlify => {
   }
 }
 
-<<<<<<< HEAD
 const mapAuthClientNetlify = (client: NetlifyIdentity): AuthClient => {
   return {
     type: 'netlify',
@@ -170,8 +135,6 @@ const mapAuthClientMagicLinks = (client: MagicLinks): MagicLinksClient => {
   }
 }
 
-=======
->>>>>>> bb1ab34... Add auth package.
 export const createAuthClient = (
   client: SupportedAuthClients,
   type: SupportedAuthTypes
@@ -179,17 +142,12 @@ export const createAuthClient = (
   switch (type) {
     case 'auth0':
       return mapAuthClientAuth0(client as Auth0)
-<<<<<<< HEAD
     case 'gotrue':
       return mapAuthClientGoTrue(client as GoTrue)
     case 'netlify':
       return mapAuthClientNetlify(client as NetlifyIdentity)
     case 'magic.link':
       return mapAuthClientMagicLinks(client as MagicLinks)
-=======
-    case 'netlify':
-      return mapAuthClientNetlify(client as Netlify)
->>>>>>> bb1ab34... Add auth package.
     default:
       throw new Error(
         `The ${type} auth client is not currently supported, please consider adding it.`
diff --git a/packages/auth/src/useAuth.ts b/packages/auth/src/useAuth.ts
index 62543689711c..3a17b54139f6 100644
--- a/packages/auth/src/useAuth.ts
+++ b/packages/auth/src/useAuth.ts
@@ -6,7 +6,6 @@ import type { AuthContextInterface } from './AuthProvider'
 export const useAuth = (): AuthContextInterface => {
   return React.useContext(AuthContext) as AuthContextInterface
 }
-<<<<<<< HEAD
 
 declare global {
   interface Window {
@@ -21,5 +20,3 @@ declare global {
 }
 
 window.__REDWOOD__USE_AUTH = useAuth
-=======
->>>>>>> bb1ab34... Add auth package.
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 6e43ed1918c5..d837b789ff19 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -13,17 +13,8 @@
     "dist"
   ],
   "dependencies": {
-<<<<<<< HEAD
     "@prisma/sdk": "^2.0.0-beta.6",
     "@redwoodjs/internal": "^0.8.1",
-=======
-    "@prisma/sdk": "^2.0.0-beta.5",
-    "@redwoodjs/internal": "^0.7.1-canary.8",
-<<<<<<< HEAD
-    "babel-plugin-generator-prettier": "^1.2.0",
->>>>>>> a81200f... use only ts template for services
-=======
->>>>>>> 89ef31d... real world testing updates
     "camelcase": "^5.3.1",
     "chalk": "^3.0.0",
     "concurrently": "^5.1.0",
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/assets/scaffold.css b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/assets/scaffold.css
index 458d62414c7b..aed2eec96c50 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/assets/scaffold.css
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/assets/scaffold.css
@@ -2,18 +2,6 @@
   normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css
 */
 
-<<<<<<< HEAD
-.rw-scaffold *,.rw-scaffold ::after,.rw-scaffold ::before{box-sizing:inherit;border-width:0;border-style:solid;border-color:#e2e8f0}
-.rw-scaffold main{display:block}
-.rw-scaffold h1,.rw-scaffold h2{margin:0}
-.rw-scaffold a{background-color:transparent}
-.rw-scaffold ul{margin:0;padding:0}
-.rw-scaffold input{font-family:inherit;font-size:100%;overflow:visible}
-.rw-scaffold input:-ms-input-placeholder{color:#a0aec0}
-.rw-scaffold input::-ms-input-placeholder{color:#a0aec0}
-.rw-scaffold input::placeholder{color:#a0aec0}
-.rw-scaffold table{border-collapse:collapse}
-=======
 .rw-scaffold main {
   display: block;
 }
@@ -80,72 +68,11 @@
   line-height: inherit;
   color: inherit;
 }
->>>>>>> f0d1418... update scaffold code
 
 /*
   Style
 */
 
-<<<<<<< HEAD
-.rw-scaffold{background-color:#fff;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"}
-.rw-header{display:flex;justify-content:space-between;padding: 1rem 2rem 1rem 2rem}
-.rw-main{margin-left:1rem;margin-right:1rem;padding-bottom:1rem}
-.rw-segment{background-color:#fff;border-width:1px;border-radius:.5rem;overflow:hidden}
-.rw-segment-header{background-color:#e2e8f0;color:#4a5568;padding:.75rem 1rem}
-.rw-segment-main{background-color:#f7fafc;padding: 1rem}
-.rw-link {color:#4299e1;text-decoration:underline}
-.rw-link:hover {color:#2b6cb0}
-.rw-heading {font-weight:600}
-.rw-heading.rw-heading-primary{font-size:1.25rem}
-.rw-heading.rw-heading-secondary{font-size:.875rem}
-.rw-heading .rw-link{color:#4a5568;text-decoration: none}
-.rw-heading .rw-link:hover{color:#1a202c;text-decoration:underline}
-.rw-form-wrapper{box-sizing:border-box;font-size:.875rem;margin-top:-1rem}
-.rw-form-error-wrapper{padding:1rem;background-color:#fff5f5;color:#c53030;border-width:1px;border-color:#feb2b2;border-radius:.25rem;margin:1rem 0}
-.rw-form-error-title{margin-top:0;margin-bottom:0;font-weight:600}
-.rw-form-error-list{margin-top:.5rem;list-style-type:disc;list-style-position:inside}
-.rw-button{color:#718096;cursor:pointer;display:flex;justify-content:center;font-size:.75rem;font-weight:600;padding:.25rem 1rem;text-transform:uppercase;text-decoration: none;letter-spacing:.025em;border-radius:.25rem;line-height: 2}
-.rw-button:hover{background-color:#718096;color:#fff}
-.rw-button.rw-button-small{font-size:.75rem;border-radius:.125rem;padding:.25rem .5rem;line-height:inherit}
-.rw-button.rw-button-green{background-color:#48bb78;color:#fff}
-.rw-button.rw-button-green:hover{background-color:#38a169;color:#fff}
-.rw-button.rw-button-blue{background-color:#3182ce;color:#fff}
-.rw-button.rw-button-blue:hover{background-color:#2b6cb0}
-.rw-button.rw-button-red{background-color:#e53e3e;color:#fff}
-.rw-button.rw-button-red:hover{background-color:#c53030}
-.rw-button-icon{font-size:1.25rem;line-height:1;margin-right:.25rem}
-.rw-button-group {display:flex;justify-content:center;margin:.75rem .5rem}
-.rw-button-group .rw-button { margin: 0 .25rem}
-.rw-form-wrapper .rw-button-group{margin-top:2rem;margin-bottom:0}
-.rw-label{display:block;margin-top:1.5rem;color:#4a5568;font-weight:600}
-.rw-label.rw-label-error{color:#c53030}
-.rw-input{display:block;margin-top:.5rem;width:100%;padding:.5rem;border-width:1px;border-color:#e2e8f0;color:#4a5568;border-radius:.25rem;outline:none}
-.rw-input:focus{border-color:#a0aec0}
-.rw-input-error{border-color:#c53030;color:#c53030}
-.rw-field-error{display:block;margin-top:.25rem;font-weight:600;text-transform:uppercase;font-size:.75rem;color:#c53030}
-.rw-table-wrapper-responsive{overflow-x: scroll}
-.rw-table-wrapper-responsive .rw-table{min-width:48rem}
-.rw-table{table-layout:auto;width:100%;font-size:.875rem}
-.rw-table th,
-.rw-table td{padding:.75rem}
-.rw-table thead tr{background-color:#e2e8f0;color:#4a5568}
-.rw-table th {font-weight:600;text-align:left}
-.rw-table thead th {text-align:left}
-.rw-table tbody th {text-align:right}
-@media (min-width:768px) {
-  .rw-table tbody th {width:20%}
-}
-.rw-table tbody tr{background-color:#f7fafc;border-top-width:1px}
-.rw-table tbody tr:nth-child(even){background-color:#fff}
-.rw-table-actions {display:flex;justify-content:flex-end;align-items: center;height:17px;padding-right:.25rem}
-.rw-table-actions .rw-button{background-color:transparent}
-.rw-table-actions .rw-button:hover{background-color:#718096;color:#fff}
-.rw-table-actions .rw-button-blue{color:#3182ce}
-.rw-table-actions .rw-button-blue:hover{background-color:#3182ce;color:#fff}
-.rw-table-actions .rw-button-red{color:#e53e3e}
-.rw-table-actions .rw-button-red:hover{background-color:#e53e3e;color:#fff}
-.rw-text-center{text-align:center}
-=======
 .rw-scaffold .bg-white {
   background-color: #fff;
 }
@@ -476,4 +403,3 @@
 .rw-scaffold .min-w-3xl {
   min-width: 48rem;
 }
->>>>>>> f0d1418... update scaffold code
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/edit.js b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/edit.js
index ca0684f8cb97..ac561d214f0d 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/edit.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/edit.js
@@ -40,14 +40,6 @@ export const Success = ({ userProfile }) => {
   }
 
   return (
-<<<<<<< HEAD
-    <div className="rw-segment">
-      <header className="rw-segment-header">
-        <h2 className="rw-heading rw-heading-secondary">Edit UserProfile {userProfile.id}</h2>
-      </header>
-      <div className="rw-segment-main">
-        <UserProfileForm userProfile={userProfile} onSave={onSave} error={error} loading={loading} />
-=======
     <div className="bg-white border rounded-lg overflow-hidden">
       <header className="bg-gray-300 text-gray-700 py-3 px-4">
         <h2 className="text-sm font-semibold">
@@ -61,7 +53,6 @@ export const Success = ({ userProfile }) => {
           error={error}
           loading={loading}
         />
->>>>>>> f0d1418... update scaffold code
       </div>
     </div>
   )
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/show.js b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/show.js
index cb2a9a7b5ac3..13555c1f2958 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/show.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/show.js
@@ -31,29 +31,6 @@ const Post = ({ post }) => {
         </header>
         <table className="rw-table">
           <tbody>
-<<<<<<< HEAD
-            <tr>
-              <th>id</th>
-              <td>{post.id}</td>
-            </tr><tr>
-              <th>title</th>
-              <td>{post.title}</td>
-            </tr><tr>
-              <th>slug</th>
-              <td>{post.slug}</td>
-            </tr><tr>
-              <th>author</th>
-              <td>{post.author}</td>
-            </tr><tr>
-              <th>body</th>
-              <td>{post.body}</td>
-            </tr><tr>
-              <th>image</th>
-              <td>{post.image}</td>
-            </tr><tr>
-              <th>postedAt</th>
-              <td>{post.postedAt}</td>
-=======
             <tr className="odd:bg-gray-100 even:bg-white border-t">
               <td className="font-semibold p-3 text-right md:w-1/5">id</td>
               <td className="p-3">{post.id}</td>
@@ -83,7 +60,6 @@ const Post = ({ post }) => {
                 postedAt
               </td>
               <td className="p-3">{post.postedAt}</td>
->>>>>>> f0d1418... update scaffold code
             </tr>
           </tbody>
         </table>
diff --git a/yarn.lock b/yarn.lock
index 324c918ea92b..407616f5ab2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -61,19 +61,11 @@
     tslib "^1.10.0"
 
 "@apollographql/apollo-tools@^0.4.3":
-<<<<<<< HEAD
   version "0.4.8"
   resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.4.8.tgz#d81da89ee880c2345eb86bddb92b35291f6135ed"
   integrity sha512-W2+HB8Y7ifowcf3YyPHgDI05izyRtOeZ4MqIr7LbTArtmJ0ZHULWpn84SGMW7NAvTV1tFExpHlveHhnXuJfuGA==
   dependencies:
     apollo-env "^0.6.5"
-=======
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.4.7.tgz#6ba9e0fa872128fbfc82a5ded1447fde932a0169"
-  integrity sha512-6QjZz6aLq6QXHgJ1AmSg4C4cBmhF5z3g7LPsk4g+zJoWKxiFuSIbrTe12ETtn6wgPq//e5p2agbXYydIjqs7gw==
-  dependencies:
-    apollo-env "^0.6.4"
->>>>>>> bb1ab34... Add auth package.
 
 "@apollographql/graphql-playground-html@1.6.24":
   version "1.6.24"
@@ -81,15 +73,9 @@
   integrity sha512-8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ==
 
 "@auth0/auth0-spa-js@^1.7.0":
-<<<<<<< HEAD
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/@auth0/auth0-spa-js/-/auth0-spa-js-1.8.1.tgz#e1be74388c4fe6145259c6ca29da7635a537fbdc"
-  integrity sha512-OoeTlFug2COCelF+hxGCWP3I/4S2H4niWp278urpmwC88h/7HFLZFvDrlMAV2tMyUiusMSa2w4lWcb2iXL/6+Q==
-=======
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@auth0/auth0-spa-js/-/auth0-spa-js-1.8.0.tgz#538a6df39551c303d060b9c6e5516d24a6b0e024"
-  integrity sha512-BkabMo/YAJt2XA+vcOmVFQ7syVrA4YWre1YYEQPet2izPDwgJ4IRLuE7mqOs+v74BQjs997tsuSY4/oHAu940Q==
->>>>>>> bb1ab34... Add auth package.
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@auth0/auth0-spa-js/-/auth0-spa-js-1.8.2.tgz#fdd5b66c58a69ff0838c75ce3d4794ab15fd9126"
+  integrity sha512-jm/zqfbZbJYz/AcJGQGugTGUm2MOD41+/OgOxvqfP/Emq0BLsrSfAUDaGgStlijUAsFElY24P9nVaAucDDrcZw==
   dependencies:
     abortcontroller-polyfill "^1.4.0"
     browser-tabs-lock "^1.2.8"
@@ -100,9 +86,9 @@
     unfetch "^4.1.0"
 
 "@babel/cli@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.8.4.tgz#505fb053721a98777b2b175323ea4f090b7d3c1c"
-  integrity sha512-XXLgAm6LBbaNxaGhMAznXXaxtCWfuv6PIDJ9Alsy9JYTOh+j2jJz+L/162kkfU1j/pTSxK1xGmlwI4pdIMkoag==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.10.1.tgz#b6e5cd43a17b8f639442ab027976408ebe6d79a0"
+  integrity sha512-cVB+dXeGhMOqViIaZs3A9OUAe4pKw4SBNdMw6yHJMYR7s4TB+Cei7ThquV/84O19PdIFWuwe03vxxES0BHUm5g==
   dependencies:
     commander "^4.0.1"
     convert-source-map "^1.1.0"
@@ -122,35 +108,35 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/code-frame@^7.0.0", "@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==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz#d5481c5095daa1c57e16e54c6f9198443afb49ff"
+  integrity sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==
   dependencies:
-    "@babel/highlight" "^7.8.3"
+    "@babel/highlight" "^7.10.1"
 
-"@babel/compat-data@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz#3f604c40e420131affe6f2c8052e9a275ae2049b"
-  integrity sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==
+"@babel/compat-data@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.1.tgz#b1085ffe72cd17bf2c0ee790fc09f9626011b2db"
+  integrity sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==
   dependencies:
-    browserslist "^4.11.1"
+    browserslist "^4.12.0"
     invariant "^2.2.4"
     semver "^5.5.0"
 
 "@babel/core@^7.1.0", "@babel/core@^7.2.2", "@babel/core@^7.7.5", "@babel/core@^7.9.0":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
-  integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.9.6"
-    "@babel/parser" "^7.9.6"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.1.tgz#2a0ad0ea693601820defebad2140206503d89af3"
+  integrity sha512-u8XiZ6sMXW/gPmoP5ijonSUln4unazG291X0XAQ5h0s8qnAFr6BRRZGUEK+jtRWdmB0NTJQt7Uga25q8GetIIg==
+  dependencies:
+    "@babel/code-frame" "^7.10.1"
+    "@babel/generator" "^7.10.1"
+    "@babel/helper-module-transforms" "^7.10.1"
+    "@babel/helpers" "^7.10.1"
+    "@babel/parser" "^7.10.1"
+    "@babel/template" "^7.10.1"
+    "@babel/traverse" "^7.10.1"
+    "@babel/types" "^7.10.1"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
@@ -160,241 +146,241 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
-  integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
+"@babel/generator@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.1.tgz#4d14458e539bcb04ffe34124143f5c489f2dbca9"
+  integrity sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==
   dependencies:
-    "@babel/types" "^7.9.6"
+    "@babel/types" "^7.10.1"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
-  integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
+"@babel/helper-annotate-as-pure@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz#f6d08acc6f70bbd59b436262553fb2e259a1a268"
+  integrity sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
-  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz#0ec7d9be8174934532661f87783eb18d72290059"
+  integrity sha512-cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-explode-assignable-expression" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-builder-react-jsx-experimental@^7.9.0":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.5.tgz#0b4b3e04e6123f03b404ca4dfd6528fe6bb92fe3"
-  integrity sha512-HAagjAC93tk748jcXpZ7oYRZH485RCq/+yEv9SIWezHRPv9moZArTnkUNciUNzvwHUABmiWKlcxJvMcu59UwTg==
+"@babel/helper-builder-react-jsx-experimental@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.1.tgz#9a7d58ad184d3ac3bafb1a452cec2bad7e4a0bc8"
+  integrity sha512-irQJ8kpQUV3JasXPSFQ+LCCtJSc5ceZrPFVj6TElR6XCHssi3jV8ch3odIrNtjJFRZZVbrOEfJMI79TPU/h1pQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/types" "^7.9.5"
+    "@babel/helper-annotate-as-pure" "^7.10.1"
+    "@babel/helper-module-imports" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-builder-react-jsx@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz#16bf391990b57732700a3278d4d9a81231ea8d32"
-  integrity sha512-weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw==
+"@babel/helper-builder-react-jsx@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.1.tgz#a327f0cf983af5554701b1215de54a019f09b532"
+  integrity sha512-KXzzpyWhXgzjXIlJU1ZjIXzUPdej1suE6vzqgImZ/cpAsR/CC8gUcX4EWRmDfWz/cs6HOCPMBIJ3nKoXt3BFuw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/types" "^7.9.0"
+    "@babel/helper-annotate-as-pure" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-compilation-targets@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz#1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"
-  integrity sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==
+"@babel/helper-compilation-targets@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.1.tgz#ad6f69b4c3bae955081ef914a84e5878ffcaca63"
+  integrity sha512-YuF8IrgSmX/+MV2plPkjEnzlC2wf+gaok8ehMNN0jodF3/sejZauExqpEVGbJua62oaWoNYIXwz4RmAsVcGyHw==
   dependencies:
-    "@babel/compat-data" "^7.9.6"
-    browserslist "^4.11.1"
+    "@babel/compat-data" "^7.10.1"
+    browserslist "^4.12.0"
     invariant "^2.2.4"
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/helper-create-class-features-plugin@^7.8.3", "@babel/helper-create-class-features-plugin@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz#965c8b0a9f051801fd9d3b372ca0ccf200a90897"
-  integrity sha512-6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow==
-  dependencies:
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.9.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-
-"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
-  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
+"@babel/helper-create-class-features-plugin@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.1.tgz#6d8a45aafe492378d0e6fc0b33e5dea132eae21c"
+  integrity sha512-bwhdehBJZt84HuPUcP1HaTLuc/EywVS8rc3FgsEPDcivg+DCW+SHuLHVkYOmcBA1ZfI+Z/oZjQc/+bPmIO7uAA==
+  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-create-regexp-features-plugin@^7.10.1", "@babel/helper-create-regexp-features-plugin@^7.8.3":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz#1b8feeab1594cbcfbf3ab5a3bbcabac0468efdbd"
+  integrity sha512-Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.10.1"
+    "@babel/helper-regex" "^7.10.1"
     regexpu-core "^4.7.0"
 
-"@babel/helper-define-map@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
-  integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
+"@babel/helper-define-map@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz#5e69ee8308648470dd7900d159c044c10285221d"
+  integrity sha512-+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.1"
+    "@babel/types" "^7.10.1"
     lodash "^4.17.13"
 
-"@babel/helper-explode-assignable-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
-  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
+"@babel/helper-explode-assignable-expression@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz#e9d76305ee1162ca467357ae25df94f179af2b7e"
+  integrity sha512-vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg==
   dependencies:
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/traverse" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
-  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
+"@babel/helper-function-name@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz#92bd63829bfc9215aca9d9defa85f56b539454f4"
+  integrity sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.9.5"
+    "@babel/helper-get-function-arity" "^7.10.1"
+    "@babel/template" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-get-function-arity@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
-  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
+"@babel/helper-get-function-arity@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz#7303390a81ba7cb59613895a192b93850e373f7d"
+  integrity sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-hoist-variables@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
-  integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==
+"@babel/helper-hoist-variables@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz#7e77c82e5dcae1ebf123174c385aaadbf787d077"
+  integrity sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-member-expression-to-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
-  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
+"@babel/helper-member-expression-to-functions@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz#432967fd7e12a4afef66c4687d4ca22bc0456f15"
+  integrity sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==
   dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-module-imports@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
-  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-module-transforms@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
-  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-simple-access" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.6"
-    "@babel/types" "^7.9.0"
-    lodash "^4.17.13"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-optimise-call-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
-  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
+"@babel/helper-module-imports@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz#dd331bd45bccc566ce77004e9d05fe17add13876"
+  integrity sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==
   dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
-  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
-  integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
+"@babel/helper-module-transforms@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz#24e2f08ee6832c60b157bb0936c86bef7210c622"
+  integrity sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==
   dependencies:
+    "@babel/helper-module-imports" "^7.10.1"
+    "@babel/helper-replace-supers" "^7.10.1"
+    "@babel/helper-simple-access" "^7.10.1"
+    "@babel/helper-split-export-declaration" "^7.10.1"
+    "@babel/template" "^7.10.1"
+    "@babel/types" "^7.10.1"
     lodash "^4.17.13"
 
-"@babel/helper-remap-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
-  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-wrap-function" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6", "@babel/helper-replace-supers@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz#03149d7e6a5586ab6764996cd31d6981a17e1444"
-  integrity sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
-
-"@babel/helper-simple-access@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
-  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
-  dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-split-export-declaration@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
-  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
+"@babel/helper-optimise-call-expression@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz#b4a1f2561870ce1247ceddb02a3860fa96d72543"
+  integrity sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==
   dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
-  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-wrap-function@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
-  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+"@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://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz#ec5a5cf0eec925b66c60580328b122c01230a127"
+  integrity sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==
 
-"@babel/helpers@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz#092c774743471d0bb6c7de3ad465ab3d3486d580"
-  integrity sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==
+"@babel/helper-regex@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.1.tgz#021cf1a7ba99822f993222a001cc3fec83255b96"
+  integrity sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    lodash "^4.17.13"
 
-"@babel/highlight@^7.0.0", "@babel/highlight@^7.8.3":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
-  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.9.0"
+"@babel/helper-remap-async-to-generator@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz#bad6aaa4ff39ce8d4b82ccaae0bfe0f7dbb5f432"
+  integrity sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==
+  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-replace-supers@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz#ec6859d20c5d8087f6a2dc4e014db7228975f13d"
+  integrity sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.10.1"
+    "@babel/helper-optimise-call-expression" "^7.10.1"
+    "@babel/traverse" "^7.10.1"
+    "@babel/types" "^7.10.1"
+
+"@babel/helper-simple-access@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz#08fb7e22ace9eb8326f7e3920a1c2052f13d851e"
+  integrity sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==
+  dependencies:
+    "@babel/template" "^7.10.1"
+    "@babel/types" "^7.10.1"
+
+"@babel/helper-split-export-declaration@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz#c6f4be1cbc15e3a868e4c64a17d5d31d754da35f"
+  integrity sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==
+  dependencies:
+    "@babel/types" "^7.10.1"
+
+"@babel/helper-validator-identifier@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz#5770b0c1a826c4f53f5ede5e153163e0318e94b5"
+  integrity sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==
+
+"@babel/helper-wrap-function@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz#956d1310d6696257a7afd47e4c42dfda5dfcedc9"
+  integrity sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.10.1"
+    "@babel/template" "^7.10.1"
+    "@babel/traverse" "^7.10.1"
+    "@babel/types" "^7.10.1"
+
+"@babel/helpers@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.1.tgz#a6827b7cb975c9d9cef5fd61d919f60d8844a973"
+  integrity sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==
+  dependencies:
+    "@babel/template" "^7.10.1"
+    "@babel/traverse" "^7.10.1"
+    "@babel/types" "^7.10.1"
+
+"@babel/highlight@^7.0.0", "@babel/highlight@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz#841d098ba613ba1a427a2b383d79e35552c38ae0"
+  integrity sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.1"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
 "@babel/node@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.8.7.tgz#4213ea99f0c86cc1cf460e61131e7acbb723e13a"
-  integrity sha512-o8cBT3cfRPLwoPh7VBYonSeZypIawGUeVfOIt1xSDgcDdirRGDPZ7/x+FLhhgQmKp3PKbz5Juh9/BNP4Jzrr9Q==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.10.1.tgz#34d3405c7c3d5139c48cbce2c80226f46e36ab25"
+  integrity sha512-HoLxelFIekiipykhN0d3cTSLZVxnl0aZiwv6oW4mxjeQEMOt1J/YGnBaIDyYWQ5tIHkUL1cqqn8LOvmWhFoCyw==
   dependencies:
-    "@babel/register" "^7.8.3"
+    "@babel/register" "^7.10.1"
     commander "^4.0.1"
     core-js "^3.2.1"
     lodash "^4.17.13"
@@ -403,96 +389,100 @@
     resolve "^1.13.1"
     v8flags "^3.1.1"
 
-<<<<<<< HEAD
-"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.3.2", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.6":
-=======
-"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.3.2", "@babel/parser@^7.7.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.6":
->>>>>>> bb1ab34... Add auth package.
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
-  integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
+"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.10.1", "@babel/parser@^7.3.2", "@babel/parser@^7.7.0":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.1.tgz#2e142c27ca58aa2c7b119d09269b702c8bbad28c"
+  integrity sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==
 
-"@babel/plugin-proposal-async-generator-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
-  integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
+"@babel/plugin-proposal-async-generator-functions@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz#6911af5ba2e615c4ff3c497fe2f47b35bf6d7e55"
+  integrity sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@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/plugin-proposal-class-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
-  integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
+"@babel/plugin-proposal-class-properties@^7.10.1", "@babel/plugin-proposal-class-properties@^7.8.3":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz#046bc7f6550bb08d9bd1d4f060f5f5a4f1087e01"
+  integrity sha512-sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-proposal-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
-  integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
+"@babel/plugin-proposal-dynamic-import@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz#e36979dc1dc3b73f6d6816fc4951da2363488ef0"
+  integrity sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
-  integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
+"@babel/plugin-proposal-json-strings@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz#b1e691ee24c651b5a5e32213222b2379734aff09"
+  integrity sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
-  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz#02dca21673842ff2fe763ac253777f235e9bbf78"
+  integrity sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
-  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
+"@babel/plugin-proposal-numeric-separator@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz#a9a38bc34f78bdfd981e791c27c6fdcec478c123"
+  integrity sha512-jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.1"
 
-"@babel/plugin-proposal-object-rest-spread@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz#7a093586fcb18b08266eb1a7177da671ac575b63"
-  integrity sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==
+"@babel/plugin-proposal-object-rest-spread@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz#cba44908ac9f142650b4a65b8aa06bf3478d5fb6"
+  integrity sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.9.5"
+    "@babel/plugin-transform-parameters" "^7.10.1"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
-  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
+"@babel/plugin-proposal-optional-catch-binding@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz#c9f86d99305f9fa531b568ff5ab8c964b8b223d2"
+  integrity sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
-  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
+"@babel/plugin-proposal-optional-chaining@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz#15f5d6d22708629451a91be28f8facc55b0e818c"
+  integrity sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
-  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
+"@babel/plugin-proposal-private-methods@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz#ed85e8058ab0fe309c3f448e5e1b73ca89cdb598"
+  integrity sha512-RZecFFJjDiQ2z6maFprLgrdnm0OzoC23Mx89xf1CcEsxmHuzuXOdniEuI+S3v7vjQG4F5sa6YtUp+19sZuSxHg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.10.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz#dc04feb25e2dd70c12b05d680190e138fa2c0c6f"
+  integrity sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@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":
   version "7.8.4"
@@ -508,12 +498,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz#6cb933a8872c8d359bfde69bbeaae5162fd1e8f7"
-  integrity sha512-UcAyQWg2bAN647Q+O811tG9MrJ38Z10jjhQdKNAL8fsyPzE3cCN/uT+f55cFVY4aGO4jqJAvmqsuY3GQDwAoXg==
+"@babel/plugin-syntax-class-properties@^7.10.1", "@babel/plugin-syntax-class-properties@^7.8.3":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz#d5bc0645913df5b17ad7eda0fa2308330bde34c5"
+  integrity sha512-Gf2Yx/iRs1JREDtVZ56OrjjgFHCaldpTnuy9BHla10qyVT3YkIIGEtoDWhyop0ksu1GvNjHIoYRBqm3zoR1jyQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.0":
   version "7.8.3"
@@ -529,19 +519,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz#521b06c83c40480f1e58b4fd33b92eceb1d6ea94"
-  integrity sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==
+"@babel/plugin-syntax-jsx@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.1.tgz#0ae371134a42b91d5418feb3c8c8d43e1565d2da"
+  integrity sha512-+OxyOArpVFXQeXKLO9o+r2I4dIoVoy6+Uu0vKELrlweDM3QJADZj+Z+5ERansZqIZBcLj42vHnDI8Rz9BnRIuQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz#3995d7d7ffff432f6ddc742b47e730c054599897"
-  integrity sha512-Zpg2Sgc++37kuFl6ppq2Q7Awc6E6AIW671x5PY8E/f7MCIyPPGK/EoeZXvvY3P42exZ3Q4/t3YOzP/HiN79jDg==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.1.tgz#fffee77b4934ce77f3b427649ecdddbec1958550"
+  integrity sha512-XyHIFa9kdrgJS91CUH+ccPVTnJShr8nLGc5bG2IhGXv5p1Rd+8BleGE5yzIg2Nc1QZAdHDa0Qp4m6066OL96Iw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@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":
   version "7.8.3"
@@ -550,12 +540,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
-  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
+"@babel/plugin-syntax-numeric-separator@^7.10.1", "@babel/plugin-syntax-numeric-separator@^7.8.3":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz#25761ee7410bc8cf97327ba741ee94e4a61b7d99"
+  integrity sha512-uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@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":
   version "7.8.3"
@@ -578,167 +568,167 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
-  integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
+"@babel/plugin-syntax-top-level-await@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz#8b8733f8c57397b3eaa47ddba8841586dcaef362"
+  integrity sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-syntax-typescript@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz#c1f659dda97711a569cef75275f7e15dcaa6cabc"
-  integrity sha512-GO1MQ/SGGGoiEXY0e0bSpHimJvxqB7lktLLIq2pv8xG7WZ8IMEle74jIe1FhprHBWjwjZtXHkycDLZXIWM5Wfg==
+"@babel/plugin-syntax-typescript@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.1.tgz#5e82bc27bb4202b93b949b029e699db536733810"
+  integrity sha512-X/d8glkrAtra7CaQGMiGs/OGa6XgUzqPcBXCIGFCpCqnfGlT0Wfbzo/B89xHhnInTaItPK8LALblVXcUOEh95Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-arrow-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
-  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
+"@babel/plugin-transform-arrow-functions@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz#cb5ee3a36f0863c06ead0b409b4cc43a889b295b"
+  integrity sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
-  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
+"@babel/plugin-transform-async-to-generator@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz#e5153eb1a3e028f79194ed8a7a4bf55f862b2062"
+  integrity sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/helper-module-imports" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-remap-async-to-generator" "^7.10.1"
 
-"@babel/plugin-transform-block-scoped-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
-  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
+"@babel/plugin-transform-block-scoped-functions@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz#146856e756d54b20fff14b819456b3e01820b85d"
+  integrity sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
-  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
+"@babel/plugin-transform-block-scoping@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz#47092d89ca345811451cd0dc5d91605982705d5e"
+  integrity sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
-  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-define-map" "^7.8.3"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
+"@babel/plugin-transform-classes@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz#6e11dd6c4dfae70f540480a4702477ed766d733f"
+  integrity sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==
+  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"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
-  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
+"@babel/plugin-transform-computed-properties@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz#59aa399064429d64dce5cf76ef9b90b7245ebd07"
+  integrity sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-destructuring@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
-  integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
+"@babel/plugin-transform-destructuring@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz#abd58e51337815ca3a22a336b85f62b998e71907"
+  integrity sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
-  integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
+"@babel/plugin-transform-dotall-regex@^7.10.1", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz#920b9fec2d78bb57ebb64a644d5c2ba67cc104ee"
+  integrity sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-duplicate-keys@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
-  integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
+"@babel/plugin-transform-duplicate-keys@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz#c900a793beb096bc9d4d0a9d0cde19518ffc83b9"
+  integrity sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-exponentiation-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
-  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
+"@babel/plugin-transform-exponentiation-operator@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz#279c3116756a60dd6e6f5e488ba7957db9c59eb3"
+  integrity sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-for-of@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
-  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
+"@babel/plugin-transform-for-of@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz#ff01119784eb0ee32258e8646157ba2501fcfda5"
+  integrity sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
-  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
+"@babel/plugin-transform-function-name@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz#4ed46fd6e1d8fde2a2ec7b03c66d853d2c92427d"
+  integrity sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
-  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
+"@babel/plugin-transform-literals@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz#5794f8da82846b22e4e6631ea1658bce708eb46a"
+  integrity sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-member-expression-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
-  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
+"@babel/plugin-transform-member-expression-literals@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz#90347cba31bca6f394b3f7bd95d2bbfd9fce2f39"
+  integrity sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-modules-amd@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz#8539ec42c153d12ea3836e0e3ac30d5aae7b258e"
-  integrity sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==
+"@babel/plugin-transform-modules-amd@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz#65950e8e05797ebd2fe532b96e19fc5482a1d52a"
+  integrity sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz#64b7474a4279ee588cacd1906695ca721687c277"
-  integrity sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==
+"@babel/plugin-transform-modules-commonjs@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz#d5ff4b4413ed97ffded99961056e1fb980fb9301"
+  integrity sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-simple-access" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-simple-access" "^7.10.1"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz#207f1461c78a231d5337a92140e52422510d81a4"
-  integrity sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==
+"@babel/plugin-transform-modules-systemjs@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz#9962e4b0ac6aaf2e20431ada3d8ec72082cbffb6"
+  integrity sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-hoist-variables" "^7.10.1"
+    "@babel/helper-module-transforms" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
-  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
+"@babel/plugin-transform-modules-umd@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz#ea080911ffc6eb21840a5197a39ede4ee67b1595"
+  integrity sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
   version "7.8.3"
@@ -747,217 +737,236 @@
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
 
-"@babel/plugin-transform-new-target@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
-  integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
+"@babel/plugin-transform-new-target@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz#6ee41a5e648da7632e22b6fb54012e87f612f324"
+  integrity sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-object-super@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
-  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
+"@babel/plugin-transform-object-super@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz#2e3016b0adbf262983bf0d5121d676a5ed9c4fde"
+  integrity sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-replace-supers" "^7.10.1"
 
-"@babel/plugin-transform-parameters@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
-  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
+"@babel/plugin-transform-parameters@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz#b25938a3c5fae0354144a720b07b32766f683ddd"
+  integrity sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-get-function-arity" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-property-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
-  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
+"@babel/plugin-transform-property-literals@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz#cffc7315219230ed81dc53e4625bf86815b6050d"
+  integrity sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-react-display-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz#70ded987c91609f78353dd76d2fb2a0bb991e8e5"
-  integrity sha512-3Jy/PCw8Fe6uBKtEgz3M82ljt+lTg+xJaM4og+eyu83qLT87ZUSckn0wy7r31jflURWLO83TW6Ylf7lyXj3m5A==
+"@babel/plugin-transform-react-display-name@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.1.tgz#e6a33f6d48dfb213dda5e007d0c7ff82b6a3d8ef"
+  integrity sha512-rBjKcVwjk26H3VX8pavMxGf33LNlbocMHdSeldIEswtQ/hrjyTG8fKKILW1cSkODyRovckN/uZlGb2+sAV9JUQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.1"
+
+"@babel/plugin-transform-react-jsx-development@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.10.1.tgz#1ac6300d8b28ef381ee48e6fec430cc38047b7f3"
+  integrity sha512-XwDy/FFoCfw9wGFtdn5Z+dHh6HXKHkC6DwKNWpN74VWinUagZfDcEJc3Y8Dn5B3WMVnAllX8Kviaw7MtC5Epwg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@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-jsx-development@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz#3c2a130727caf00c2a293f0aed24520825dbf754"
-  integrity sha512-tK8hWKrQncVvrhvtOiPpKrQjfNX3DtkNLSX4ObuGcpS9p0QrGetKmlySIGR07y48Zft8WVgPakqd/bk46JrMSw==
+"@babel/plugin-transform-react-jsx-self@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.1.tgz#22143e14388d72eb88649606bb9e46f421bc3821"
+  integrity sha512-4p+RBw9d1qV4S749J42ZooeQaBomFPrSxa9JONLHJ1TxCBo3TzJ79vtmG2S2erUT8PDDrPdw4ZbXGr2/1+dILA==
   dependencies:
-    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-syntax-jsx" "^7.10.1"
 
-"@babel/plugin-transform-react-jsx-self@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz#f4f26a325820205239bb915bad8e06fcadabb49b"
-  integrity sha512-K2ObbWPKT7KUTAoyjCsFilOkEgMvFG+y0FqOl6Lezd0/13kMkkjHskVsZvblRPj1PHA44PrToaZANrryppzTvQ==
+"@babel/plugin-transform-react-jsx-source@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.1.tgz#30db3d4ee3cdebbb26a82a9703673714777a4273"
+  integrity sha512-neAbaKkoiL+LXYbGDvh6PjPG+YeA67OsZlE78u50xbWh2L1/C81uHiNP5d1fw+uqUIoiNdCC8ZB+G4Zh3hShJA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-syntax-jsx" "^7.10.1"
 
-"@babel/plugin-transform-react-jsx-source@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz#89ef93025240dd5d17d3122294a093e5e0183de0"
-  integrity sha512-K6m3LlSnTSfRkM6FcRk8saNEeaeyG5k7AVkBU2bZK3+1zdkSED3qNdsWrUgQBeTVD2Tp3VMmerxVO2yM5iITmw==
+"@babel/plugin-transform-react-jsx@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.1.tgz#91f544248ba131486decb5d9806da6a6e19a2896"
+  integrity sha512-MBVworWiSRBap3Vs39eHt+6pJuLUAaK4oxGc8g+wY+vuSJvLiEQjW1LSTqKb8OUPtDvHCkdPhk7d6sjC19xyFw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@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-jsx@^7.9.4":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz#86f576c8540bd06d0e95e0b61ea76d55f6cbd03f"
-  integrity sha512-Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw==
+"@babel/plugin-transform-react-pure-annotations@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.1.tgz#f5e7c755d3e7614d4c926e144f501648a5277b70"
+  integrity sha512-mfhoiai083AkeewsBHUpaS/FM1dmUENHBMpS/tugSJ7VXqXO5dCN1Gkint2YvM1Cdv1uhmAKt1ZOuAjceKmlLA==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.9.0"
-    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-regenerator@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
-  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
+"@babel/plugin-transform-regenerator@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz#10e175cbe7bdb63cc9b39f9b3f823c5c7c5c5490"
+  integrity sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
-  integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
+"@babel/plugin-transform-reserved-words@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz#0fc1027312b4d1c3276a57890c8ae3bcc0b64a86"
+  integrity sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/plugin-transform-runtime@^7.9.0":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz#3ba804438ad0d880a17bca5eaa0cdf1edeedb2fd"
-  integrity sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.1.tgz#fd1887f749637fb2ed86dc278e79eb41df37f4b1"
+  integrity sha512-4w2tcglDVEwXJ5qxsY++DgWQdNJcCCsPxfT34wCUwIf2E7dI7pMpH8JczkMBbgBTNzBX62SZlNJ9H+De6Zebaw==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-imports" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
     resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
-  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
+"@babel/plugin-transform-shorthand-properties@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz#e8b54f238a1ccbae482c4dce946180ae7b3143f3"
+  integrity sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
-  integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
+"@babel/plugin-transform-spread@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz#0c6d618a0c4461a274418460a28c9ccf5239a7c8"
+  integrity sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-sticky-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
-  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
+"@babel/plugin-transform-sticky-regex@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz#90fc89b7526228bed9842cff3588270a7a393b00"
+  integrity sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-regex" "^7.10.1"
 
-"@babel/plugin-transform-template-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
-  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
+"@babel/plugin-transform-template-literals@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz#914c7b7f4752c570ea00553b4284dad8070e8628"
+  integrity sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-typeof-symbol@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
-  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
+"@babel/plugin-transform-typeof-symbol@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz#60c0239b69965d166b80a84de7315c1bc7e0bb0e"
+  integrity sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-typescript@^7.9.0":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz#2248971416a506fc78278fc0c0ea3179224af1e9"
-  integrity sha512-8OvsRdvpt3Iesf2qsAn+YdlwAJD7zJ+vhFZmDCa4b8dTp7MmHtKk5FF2mCsGxjZwuwsy/yIIay/nLmxST1ctVQ==
+"@babel/plugin-transform-typescript@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.1.tgz#2c54daea231f602468686d9faa76f182a94507a6"
+  integrity sha512-v+QWKlmCnsaimLeqq9vyCsVRMViZG1k2SZTlcZvB+TqyH570Zsij8nvVUZzOASCRiQFUxkLrn9Wg/kH0zgy5OQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.9.6"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-typescript" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-syntax-typescript" "^7.10.1"
 
-"@babel/plugin-transform-unicode-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
-  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
+"@babel/plugin-transform-unicode-escapes@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz#add0f8483dab60570d9e03cecef6c023aa8c9940"
+  integrity sha512-zZ0Poh/yy1d4jeDWpx/mNwbKJVwUYJX73q+gyh4bwtG0/iUlzdEu0sLMda8yuDFS6LBQlT/ST1SJAR6zYwXWgw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.1"
+
+"@babel/plugin-transform-unicode-regex@^7.10.1":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz#6b58f2aea7b68df37ac5025d9c88752443a6b43f"
+  integrity sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
 "@babel/preset-env@^7.9.0":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz#df063b276c6455ec6fcfc6e53aacc38da9b0aea6"
-  integrity sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==
-  dependencies:
-    "@babel/compat-data" "^7.9.6"
-    "@babel/helper-compilation-targets" "^7.9.6"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
-    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
-    "@babel/plugin-proposal-json-strings" "^7.8.3"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.9.6"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.1.tgz#099e1b76379739bdcbfab3d548dc7e7edb2ac808"
+  integrity sha512-bGWNfjfXRLnqbN2T4lB3pMfoic8dkRrmHpVZamSFHzGy5xklyHTobZ28TVUD2grhE5WDnu67tBj8oslIhkiOMQ==
+  dependencies:
+    "@babel/compat-data" "^7.10.1"
+    "@babel/helper-compilation-targets" "^7.10.1"
+    "@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.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.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.8.3"
-    "@babel/plugin-transform-async-to-generator" "^7.8.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.9.5"
-    "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.9.5"
-    "@babel/plugin-transform-dotall-regex" "^7.8.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
-    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.9.0"
-    "@babel/plugin-transform-function-name" "^7.8.3"
-    "@babel/plugin-transform-literals" "^7.8.3"
-    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.9.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.9.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.9.6"
-    "@babel/plugin-transform-modules-umd" "^7.9.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.8.3"
-    "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.9.5"
-    "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.7"
-    "@babel/plugin-transform-reserved-words" "^7.8.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
-    "@babel/plugin-transform-spread" "^7.8.3"
-    "@babel/plugin-transform-sticky-regex" "^7.8.3"
-    "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
-    "@babel/plugin-transform-unicode-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.9.6"
-    browserslist "^4.11.1"
+    "@babel/types" "^7.10.1"
+    browserslist "^4.12.0"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
     levenary "^1.1.1"
@@ -975,29 +984,30 @@
     esutils "^2.0.2"
 
 "@babel/preset-react@^7.9.4":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d"
-  integrity sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-react-display-name" "^7.8.3"
-    "@babel/plugin-transform-react-jsx" "^7.9.4"
-    "@babel/plugin-transform-react-jsx-development" "^7.9.0"
-    "@babel/plugin-transform-react-jsx-self" "^7.9.0"
-    "@babel/plugin-transform-react-jsx-source" "^7.9.0"
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.1.tgz#e2ab8ae9a363ec307b936589f07ed753192de041"
+  integrity sha512-Rw0SxQ7VKhObmFjD/cUcKhPTtzpeviEFX1E6PgP+cYOhQ98icNqtINNFANlsdbQHrmeWnqdxA4Tmnl1jy5tp3Q==
+  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/preset-typescript@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz#87705a72b1f0d59df21c179f7c3d2ef4b16ce192"
-  integrity sha512-S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.10.1.tgz#a8d8d9035f55b7d99a2461a0bdc506582914d07e"
+  integrity sha512-m6GV3y1ShiqxnyQj10600ZVOFrSSAa8HQ3qIUk2r+gcGtHTIRw0dJnFLt1WNXpKjtVw7yw1DAPU/6ma2ZvgJuA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-typescript" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/plugin-transform-typescript" "^7.10.1"
 
-"@babel/register@^7.8.3", "@babel/register@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.9.0.tgz#02464ede57548bddbb5e9f705d263b7c3f43d48b"
-  integrity sha512-Tv8Zyi2J2VRR8g7pC5gTeIN8Ihultbmk0ocyNz8H2nEZbmhp1N6q0A1UGsQbDvGP/sNinQKUHf3SqXwqjtFv4Q==
+"@babel/register@^7.10.1", "@babel/register@^7.9.0":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.10.1.tgz#b6567c5cb5049f44bbf8c35d6ff68ca3c43238ed"
+  integrity sha512-sl96+kB3IA2B9EzpwwBmYadOT14vw3KaXOknGDbJaZCOj52GDA4Tivudq9doCJcB+bEIKCEARZYwRgBBsCGXyg==
   dependencies:
     find-cache-dir "^2.0.0"
     lodash "^4.17.13"
@@ -1006,58 +1016,50 @@
     source-map-support "^0.5.16"
 
 "@babel/runtime-corejs3@^7.7.4", "@babel/runtime-corejs3@^7.8.3", "@babel/runtime-corejs3@^7.9.2":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz#67aded13fffbbc2cb93247388cf84d77a4be9a71"
-  integrity sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.1.tgz#ae8a85a04029d94ab8c3b5237a1031a9d631b515"
+  integrity sha512-/NLH0a34E/moPbqB1C/72I2gvMOmOly2JQARcRE1+PWCdHwMQ3la4sz7WnlK/EVHiBjQruH2WqE8YufL632Y8w==
   dependencies:
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.4.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2", "@babel/runtime@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
-  integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.1.tgz#b6eb75cac279588d3100baecd1b9894ea2840822"
+  integrity sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-<<<<<<< HEAD
-"@babel/template@^7.3.3", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
-=======
-"@babel/template@^7.3.3", "@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
->>>>>>> bb1ab34... Add auth package.
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
-  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
-
-<<<<<<< HEAD
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.6", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.9.6":
-=======
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.6", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3", "@babel/traverse@^7.9.6":
->>>>>>> bb1ab34... Add auth package.
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
-  integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.6"
-    "@babel/types" "^7.9.6"
+"@babel/template@^7.10.1", "@babel/template@^7.3.3":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811"
+  integrity sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==
+  dependencies:
+    "@babel/code-frame" "^7.10.1"
+    "@babel/parser" "^7.10.1"
+    "@babel/types" "^7.10.1"
+
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.6", "@babel/traverse@^7.10.1", "@babel/traverse@^7.7.0":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz#bbcef3031e4152a6c0b50147f4958df54ca0dd27"
+  integrity sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.1"
+    "@babel/generator" "^7.10.1"
+    "@babel/helper-function-name" "^7.10.1"
+    "@babel/helper-split-export-declaration" "^7.10.1"
+    "@babel/parser" "^7.10.1"
+    "@babel/types" "^7.10.1"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
-  integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
+"@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.10.1", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.1.tgz#6886724d31c8022160a7db895e6731ca33483921"
+  integrity sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.9.5"
+    "@babel/helper-validator-identifier" "^7.10.1"
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
@@ -1360,17 +1362,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
 
-<<<<<<< HEAD
 "@lerna/add@3.21.0":
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.21.0.tgz#27007bde71cc7b0a2969ab3c2f0ae41578b4577b"
   integrity sha512-vhUXXF6SpufBE1EkNEXwz1VLW03f177G9uMOFMQkp6OJ30/PWg4Ekifuz9/3YfgB2/GH8Tu4Lk3O51P2Hskg/A==
-=======
-"@lerna/add@3.20.0":
-  version "3.20.0"
-  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.20.0.tgz#bea7edf36fc93fb72ec34cb9ba854c48d4abf309"
-  integrity sha512-AnH1oRIEEg/VDa3SjYq4x1/UglEAvrZuV0WssHUMN81RTZgQk3we+Mv3qZNddrZ/fBcZu2IAdN/EQ3+ie2JxKQ==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@evocateur/pacote" "^9.6.3"
     "@lerna/bootstrap" "3.21.0"
@@ -1501,10 +1496,10 @@
     is-ci "^2.0.0"
     npmlog "^4.1.2"
 
-"@lerna/conventional-commits@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.18.5.tgz#08efd2e5b45acfaf3f151a53a3ec7ecade58a7bc"
-  integrity sha512-qcvXIEJ3qSgalxXnQ7Yxp5H9Ta5TVyai6vEor6AAEHc20WiO7UIdbLDCxBtiiHMdGdpH85dTYlsoYUwsCJu3HQ==
+"@lerna/conventional-commits@3.22.0":
+  version "3.22.0"
+  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.22.0.tgz#2798f4881ee2ef457bdae027ab7d0bf0af6f1e09"
+  integrity sha512-z4ZZk1e8Mhz7+IS8NxHr64wyklHctCJyWpJKEZZPJiLFJ8yKto/x38O80R10pIzC0rr8Sy/OsjSH4bl0TbbgqA==
   dependencies:
     "@lerna/validation-error" "3.13.0"
     conventional-changelog-angular "^5.0.3"
@@ -1527,10 +1522,10 @@
     fs-extra "^8.1.0"
     npmlog "^4.1.2"
 
-"@lerna/create@3.21.0":
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.21.0.tgz#e813832adf3488728b139e5a75c8b01b1372e62f"
-  integrity sha512-cRIopzKzE2vXJPmsiwCDMWo4Ct+KTmX3nvvkQLDoQNrrRK7w+3KQT3iiorbj1koD95RsVQA7mS2haWok9SIv0g==
+"@lerna/create@3.22.0":
+  version "3.22.0"
+  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.22.0.tgz#d6bbd037c3dc5b425fe5f6d1b817057c278f7619"
+  integrity sha512-MdiQQzCcB4E9fBF1TyMOaAEz9lUjIHp1Ju9H7f3lXze5JK6Fl5NYkouAvsLgY6YSIhXMY8AHW2zzXeBDY4yWkw==
   dependencies:
     "@evocateur/pacote" "^9.6.3"
     "@lerna/child-process" "3.16.5"
@@ -1618,13 +1613,13 @@
     ssri "^6.0.1"
     tar "^4.4.8"
 
-"@lerna/github-client@3.16.5":
-  version "3.16.5"
-  resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-3.16.5.tgz#2eb0235c3bf7a7e5d92d73e09b3761ab21f35c2e"
-  integrity sha512-rHQdn8Dv/CJrO3VouOP66zAcJzrHsm+wFuZ4uGAai2At2NkgKH+tpNhQy2H1PSC0Ezj9LxvdaHYrUzULqVK5Hw==
+"@lerna/github-client@3.22.0":
+  version "3.22.0"
+  resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-3.22.0.tgz#5d816aa4f76747ed736ae64ff962b8f15c354d95"
+  integrity sha512-O/GwPW+Gzr3Eb5bk+nTzTJ3uv+jh5jGho9BOqKlajXaOkMYGBELEAqV5+uARNGWZFvYAiF4PgqHb6aCUu7XdXg==
   dependencies:
     "@lerna/child-process" "3.16.5"
-    "@octokit/plugin-enterprise-rest" "^3.6.1"
+    "@octokit/plugin-enterprise-rest" "^6.0.1"
     "@octokit/rest" "^16.28.4"
     git-url-parse "^11.1.2"
     npmlog "^4.1.2"
@@ -1651,10 +1646,10 @@
     "@lerna/child-process" "3.16.5"
     semver "^6.2.0"
 
-"@lerna/import@3.21.0":
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.21.0.tgz#87b08f2a2bfeeff7357c6fd8490e638d3cd5b32d"
-  integrity sha512-aISkL4XD0Dqf5asDaOZWu65jgj8fWUhuQseZWuQe3UfHxav69fTS2YLIngUfencaOSZVOcVCom28YCzp61YDxw==
+"@lerna/import@3.22.0":
+  version "3.22.0"
+  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.22.0.tgz#1a5f0394f38e23c4f642a123e5e1517e70d068d2"
+  integrity sha512-uWOlexasM5XR6tXi4YehODtH9Y3OZrFht3mGUFFT3OIl2s+V85xIGFfqFGMTipMPAGb2oF1UBLL48kR43hRsOg==
   dependencies:
     "@lerna/child-process" "3.16.5"
     "@lerna/command" "3.21.0"
@@ -1873,10 +1868,10 @@
     inquirer "^6.2.0"
     npmlog "^4.1.2"
 
-"@lerna/publish@3.21.0":
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.21.0.tgz#0112393125f000484c3f50caba71a547f91bd7f4"
-  integrity sha512-JZ+ehZB9UCQ9nqH8Ld/Yqc/If++aK/7XIubkrB9sQ5hf2GeIbmI/BrJpMgLW/e9T5bKrUBZPUvoUN3daVipA5A==
+"@lerna/publish@3.22.0":
+  version "3.22.0"
+  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.22.0.tgz#7a3fb61026d3b7425f3b9a1849421f67d795c55d"
+  integrity sha512-8LBeTLBN8NIrCrLGykRu+PKrfrCC16sGCVY0/bzq9TDioR7g6+cY0ZAw653Qt/0Kr7rg3J7XxVNdzj3fvevlwA==
   dependencies:
     "@evocateur/libnpmaccess" "^3.1.2"
     "@evocateur/npm-registry-fetch" "^4.0.0"
@@ -1899,7 +1894,7 @@
     "@lerna/run-lifecycle" "3.16.2"
     "@lerna/run-topologically" "3.18.5"
     "@lerna/validation-error" "3.13.0"
-    "@lerna/version" "3.21.0"
+    "@lerna/version" "3.22.0"
     figgy-pudding "^3.5.1"
     fs-extra "^8.1.0"
     npm-package-arg "^6.1.0"
@@ -2012,17 +2007,17 @@
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/version@3.21.0":
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.21.0.tgz#5bcc3d2de9eb8f4db18efb0d88973f9a509eccc3"
-  integrity sha512-nIT3u43fCNj6uSMN1dRxFnF4GhmIiOEqSTkGSjrMU+8kHKwzOqS/6X6TOzklBmCyEZOpF/fLlGqH3BZHnwLDzQ==
+"@lerna/version@3.22.0":
+  version "3.22.0"
+  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.22.0.tgz#67e1340c1904e9b339becd66429f32dd8ad65a55"
+  integrity sha512-6uhL6RL7/FeW6u1INEgyKjd5dwO8+IsbLfkfC682QuoVLS7VG6OOB+JmTpCvnuyYWI6fqGh1bRk9ww8kPsj+EA==
   dependencies:
     "@lerna/check-working-tree" "3.16.5"
     "@lerna/child-process" "3.16.5"
     "@lerna/collect-updates" "3.20.0"
     "@lerna/command" "3.21.0"
-    "@lerna/conventional-commits" "3.18.5"
-    "@lerna/github-client" "3.16.5"
+    "@lerna/conventional-commits" "3.22.0"
+    "@lerna/github-client" "3.22.0"
     "@lerna/gitlab-client" "3.15.0"
     "@lerna/output" "3.13.0"
     "@lerna/prerelease-id-from-version" "3.16.0"
@@ -2094,18 +2089,18 @@
     "@octokit/types" "^4.0.1"
 
 "@octokit/endpoint@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.1.tgz#16d5c0e7a83e3a644d1ddbe8cded6c3d038d31d7"
-  integrity sha512-pOPHaSz57SFT/m3R5P8MUu4wLPszokn5pXcB/pzavLTQf2jbU+6iayTvzaY6/BiotuRS0qyEUkx3QglT4U958A==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.2.tgz#e876aafe68d7f9b6c6d80bf29458403f9afe7b2b"
+  integrity sha512-xs1mmCEZ2y4shXCpFjNq3UbmNR+bLzxtZim2L0zfEtj9R6O6kc4qLDvYw66hvO6lUsYzPTM5hMkltbuNAbRAcQ==
   dependencies:
-    "@octokit/types" "^2.11.1"
+    "@octokit/types" "^4.0.1"
     is-plain-object "^3.0.0"
     universal-user-agent "^5.0.0"
 
-"@octokit/plugin-enterprise-rest@^3.6.1":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-3.6.2.tgz#74de25bef21e0182b4fa03a8678cd00a4e67e561"
-  integrity sha512-3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA==
+"@octokit/plugin-enterprise-rest@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz#e07896739618dab8da7d4077c658003775f95437"
+  integrity sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==
 
 "@octokit/plugin-paginate-rest@^1.1.1":
   version "1.1.2"
@@ -2137,7 +2132,6 @@
     once "^1.4.0"
 
 "@octokit/request-error@^2.0.0":
-<<<<<<< HEAD
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.1.tgz#49bd71e811daffd5bdd06ef514ca47b5039682d1"
   integrity sha512-5lqBDJ9/TOehK82VvomQ6zFiZjPeSom8fLkFVLuYL3sKiIb5RB8iN/lenLkY7oBmyQcGP7FBMGiIZTO8jufaRQ==
@@ -2147,31 +2141,13 @@
     once "^1.4.0"
 
 "@octokit/request@^5.2.0":
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.3.tgz#85b78ea4ae6e1c4ac2b02528102d4cd776145935"
-  integrity sha512-RtqMzF3mhqxmWoqVD84x2gdtbqn2inTBU/HPkWf5u0R5r7fBTaLPAcCBgukeI2gjTwD9ChL9Cu0MlTBs7B/tSw==
-  dependencies:
-    "@octokit/endpoint" "^6.0.1"
-    "@octokit/request-error" "^2.0.0"
-    "@octokit/types" "^2.11.1"
-=======
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.0.tgz#94ca7293373654400fbb2995f377f9473e00834b"
-  integrity sha512-rtYicB4Absc60rUv74Rjpzek84UbVHGHJRu4fNVlZ1mCcyUPPuzFfG9Rn6sjHrd95DEsmjSt1Axlc699ZlbDkw==
-  dependencies:
-    "@octokit/types" "^2.0.0"
->>>>>>> bb1ab34... Add auth package.
-    deprecation "^2.0.0"
-    once "^1.4.0"
-
-"@octokit/request@^5.2.0":
-  version "5.4.2"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.2.tgz#74f8e5bbd39dc738a1b127629791f8ad1b3193ee"
-  integrity sha512-zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw==
+  version "5.4.4"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.4.tgz#dc57e85e86284fa016d0c1a2701a70a10cec4ff2"
+  integrity sha512-vqv1lz41c6VTxUvF9nM+a6U+vvP3vGk7drDpr0DVQg4zyqlOiKVrY17DLD6de5okj+YLHKcoqaUZTBtlNZ1BtQ==
   dependencies:
     "@octokit/endpoint" "^6.0.1"
     "@octokit/request-error" "^2.0.0"
-    "@octokit/types" "^2.11.1"
+    "@octokit/types" "^4.0.1"
     deprecation "^2.0.0"
     is-plain-object "^3.0.0"
     node-fetch "^2.3.0"
@@ -2200,8 +2176,7 @@
     once "^1.4.0"
     universal-user-agent "^4.0.0"
 
-"@octokit/types@^2.0.0", "@octokit/types@^2.0.1", "@octokit/types@^2.11.1":
-<<<<<<< HEAD
+"@octokit/types@^2.0.0", "@octokit/types@^2.0.1":
   version "2.16.2"
   resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.16.2.tgz#4c5f8da3c6fecf3da1811aef678fda03edac35d2"
   integrity sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==
@@ -2209,14 +2184,9 @@
     "@types/node" ">= 8"
 
 "@octokit/types@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-4.0.1.tgz#dd32ff2407699f3a0c909cdd24de17b45b7d7051"
-  integrity sha512-Ho6h7w2h9y8RRE8r656hIj1oiSbwbIHJGF5r9G5FOwS2VdDPq8QLGvsG4x6pKHpvyGK7j+43sAc2cJKMiFoIJw==
-=======
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.12.2.tgz#e9fbffa294adb54140946d436da9f73bc94b169c"
-  integrity sha512-1GHLI/Jll3j6F0GbYyZPFTcHZMGjAiRfkTEoRUyaVVk2IWbDdwEiClAJvXzfXCDayuGSNCqAUH8lpjZtqW9GDw==
->>>>>>> bb1ab34... Add auth package.
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-4.1.1.tgz#e2dc79d49b04c7f0e84fe61b0da28187d9bbaa2c"
+  integrity sha512-gOuIVmMCfHzSv3QBwLZjGDEDtYC73A5+tYcccEoq+Jd/h9rG/Mfc+h0+GEU+mpGhx86n7eBw6J/0BZ0zAmLkKg==
   dependencies:
     "@types/node" ">= 8"
 
@@ -2230,31 +2200,21 @@
   resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.0.0-beta.6.tgz#781eb8900ed265c6d7d35f1b5dd9b19f91440b40"
   integrity sha512-08AokCpMzL6SdxQVfShD7937t+sHntr6FJBpVKq5E/UFPVh0B2lUwU9YrA/MIAdRpGMg1wA+rdwRivtFIs5Law==
 
-"@prisma/debug@2.0.0-beta.6":
-  version "2.0.0-beta.6"
-  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-2.0.0-beta.6.tgz#20836cb26fb907116f156587425fa941d1fa7e74"
-  integrity sha512-5JyrrnvQkjCg550w9Iey3zIuCKcVqors1EDxGS6rOGo0CiOps5PbF5KdfJvyuCp72JHzof0fdUn+hzqN9D79Pg==
+"@prisma/debug@2.0.0-beta.7":
+  version "2.0.0-beta.7"
+  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-2.0.0-beta.7.tgz#1c946cac5f8eed6953b93f842c0a3cd8a5dfed33"
+  integrity sha512-7EP0DGZDQesZx4IK1OLg5vkCI2DuqMc3AZ9jmGPDgdvgHIVi0oJj+eXoHUl13VLNonx/ZexSrVLkODoR5qY7nw==
   dependencies:
     debug "^4.1.1"
 
-<<<<<<< HEAD
-"@prisma/engine-core@2.0.0-beta.6":
-  version "2.0.0-beta.6"
-  resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-2.0.0-beta.6.tgz#e93b1c09dce22189a0db5141f1bfc4061a3c13f8"
-  integrity sha512-PXmNf0Xd1T3khEmkxPxRrxZ7+7c+meHIIMJnU0Oq2GnoOkv+ery9lTTcwGF8/RcVtorH7drJ2Og9Viq2qUGEUg==
-  dependencies:
-    "@prisma/debug" "2.0.0-beta.6"
-    "@prisma/generator-helper" "2.0.0-beta.6"
-    "@prisma/get-platform" "2.0.0-beta.6"
-=======
-"@prisma/engine-core@2.0.0-beta.4":
-  version "2.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-2.0.0-beta.4.tgz#471e861a2fb16a0e5481808b1ff0d706b994685d"
-  integrity sha512-XJrhfhRaSN1kJQMjX1xmEHiooPtZXEcbXpgGTVPia8WLUo5buvnOIYL4qP5Cv0WSS4PSW68DChi+XlyGSlGNUg==
-  dependencies:
-    "@prisma/generator-helper" "2.0.0-beta.4"
-    "@prisma/get-platform" "2.0.0-beta.4"
->>>>>>> bb1ab34... Add auth package.
+"@prisma/engine-core@2.0.0-beta.7":
+  version "2.0.0-beta.7"
+  resolved "https://registry.yarnpkg.com/@prisma/engine-core/-/engine-core-2.0.0-beta.7.tgz#5ae1c8cf103c430bd47d0c531828bcafa157928c"
+  integrity sha512-EFmInft82li4hW39ie5LaBa1aGJFpZdZ+NO5+8wrQT4a8w7rzqUvCqzFX/hYAHQI4KPVhOVOEdZZk4IM86o/Ow==
+  dependencies:
+    "@prisma/debug" "2.0.0-beta.7"
+    "@prisma/generator-helper" "2.0.0-beta.7"
+    "@prisma/get-platform" "2.0.0-beta.7"
     bent "^7.1.2"
     chalk "^3.0.0"
     cross-fetch "^3.0.4"
@@ -2262,25 +2222,17 @@
     get-stream "^5.1.0"
     indent-string "^4.0.0"
     new-github-issue-url "^0.2.1"
+    p-retry "^4.2.0"
     terminal-link "^2.1.1"
     undici mcollina/undici
 
-<<<<<<< HEAD
-"@prisma/fetch-engine@2.0.0-beta.6":
-  version "2.0.0-beta.6"
-  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-2.0.0-beta.6.tgz#d92523eb020c8f231d289e3d968261dea47e26b9"
-  integrity sha512-YYtfahPHM5PzOchcb2ukFT1TvRf2n/Dp+XcyWK9+yCHYdRr93qCzpyfm+/NtLaEdNFVQGRI6HFSPQ/4dGjo+NA==
-  dependencies:
-    "@prisma/debug" "2.0.0-beta.6"
-    "@prisma/get-platform" "2.0.0-beta.6"
-=======
-"@prisma/fetch-engine@2.0.0-beta.4":
-  version "2.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-2.0.0-beta.4.tgz#e3fdc4b25e52fe72774d9ebda82adeebdf1ee33c"
-  integrity sha512-B9kPy0JhTKPoKol5uvs/832eyRZYoVf+hRbXrEbImULmz1nojk1Rv8fBLd/MVZ+cyvdgSlYeTPR2ZBTMTP1Kgg==
-  dependencies:
-    "@prisma/get-platform" "2.0.0-beta.4"
->>>>>>> bb1ab34... Add auth package.
+"@prisma/fetch-engine@2.0.0-beta.7":
+  version "2.0.0-beta.7"
+  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-2.0.0-beta.7.tgz#b1c55e61d98b100dbfb158ec753fb7b25efa6285"
+  integrity sha512-RuIozR2AoJHp7x0fAkKJ4D8WFWMpBKOC+8lEzlYevTdG3W7NTrtowAU2vHEg8lkD6gHcpP6f8R1FFlEHlmy/kA==
+  dependencies:
+    "@prisma/debug" "2.0.0-beta.7"
+    "@prisma/get-platform" "2.0.0-beta.7"
     chalk "^4.0.0"
     execa "^4.0.0"
     find-cache-dir "^3.3.1"
@@ -2297,62 +2249,34 @@
     rimraf "^3.0.2"
     tempy "^0.5.0"
 
-<<<<<<< HEAD
-"@prisma/generator-helper@2.0.0-beta.6":
-  version "2.0.0-beta.6"
-  resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-2.0.0-beta.6.tgz#daec76333406dcae0b6e69f3a7eb7ae48f002906"
-  integrity sha512-i6fkmyKD3VSnAOD6a7Py1ANrBpg1TvLKu4xw9smONi+JnNUxXGFM89/hl/SaNx4YOqh4K8EQOVQYISFO+yqAew==
-=======
-"@prisma/generator-helper@2.0.0-beta.4":
-  version "2.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-2.0.0-beta.4.tgz#937ecfe49ac19cb2fe8d42282a0dba26d0431bb2"
-  integrity sha512-z4Q6vNntvkMnG15KOTWMlHrX1QBIF6Dy2gtBvgHNmrcRhhWqQLpRFs8+MffJL4TiA6/nPu0WaAOiwF3eA+7ovg==
->>>>>>> bb1ab34... Add auth package.
-  dependencies:
-    "@prisma/debug" "2.0.0-beta.6"
+"@prisma/generator-helper@2.0.0-beta.7":
+  version "2.0.0-beta.7"
+  resolved "https://registry.yarnpkg.com/@prisma/generator-helper/-/generator-helper-2.0.0-beta.7.tgz#10ec6607f9cfca7c99a8d2892a3d73584749bdda"
+  integrity sha512-6KgM70FBqLf7v/z0H81qsMy7fJOAyHox89tRpy77fEWi2bcf1vMfwku5p5OdMqWzb2LR3krx4L5572EITDF+Ag==
+  dependencies:
+    "@prisma/debug" "2.0.0-beta.7"
     "@types/cross-spawn" "^6.0.1"
     chalk "^3.0.0"
     cross-spawn "^7.0.2"
-    isbinaryfile "^4.0.6"
 
-<<<<<<< HEAD
-"@prisma/get-platform@2.0.0-beta.6":
-  version "2.0.0-beta.6"
-  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-2.0.0-beta.6.tgz#7a3be5601bc69060416f6a623640e6fcbdf2d68b"
-  integrity sha512-EohZpMtpIykc2S91EDfIYv+AiJ4Gifus1AMpfu6BSvV3EgVONJE9NcIFwjkHn24eLCYT742O1YgCe/W2ei+SIw==
-=======
-"@prisma/get-platform@2.0.0-beta.4":
-  version "2.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-2.0.0-beta.4.tgz#df019aca3c590c51382b1717bba404e389cd6697"
-  integrity sha512-usfvR2jxDghh0volcHl7st1ebJMn1vvJA8J0ZQWsspU/El+m6XR6hF3s9ORvlBh2nLIQPdhexFiOPAxp4c4FjQ==
->>>>>>> bb1ab34... Add auth package.
-  dependencies:
-    "@prisma/debug" "2.0.0-beta.6"
-
-<<<<<<< HEAD
-"@prisma/sdk@^2.0.0-beta.6":
-  version "2.0.0-beta.6"
-  resolved "https://registry.yarnpkg.com/@prisma/sdk/-/sdk-2.0.0-beta.6.tgz#965f637365467447583220c228ec8c92a8f2598a"
-  integrity sha512-S/OXS34feAbBUH4lejjL73GP/m21VvMNzOoj6ZysdJYY9coBSHZFEO97KXCbOiWlZRZrqCJgICr/SZ0j9MVRxg==
+"@prisma/get-platform@2.0.0-beta.7":
+  version "2.0.0-beta.7"
+  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-2.0.0-beta.7.tgz#b307a69141ed845bd17fbc1b746456e6f338cc8b"
+  integrity sha512-c9IR/wEY/jsLm6+dHbd4xl/sr1TBuWEkuzOGe1hSiMq79tq5WVmH2WrD0DfZw+aypKkxrQiKA9zCKM5Z5bhfeQ==
   dependencies:
-    "@apexearth/copy" "^1.4.5"
-    "@prisma/debug" "2.0.0-beta.6"
-    "@prisma/engine-core" "2.0.0-beta.6"
-    "@prisma/fetch-engine" "2.0.0-beta.6"
-    "@prisma/generator-helper" "2.0.0-beta.6"
-    "@prisma/get-platform" "2.0.0-beta.6"
-=======
-"@prisma/sdk@^2.0.0-beta.3":
-  version "2.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@prisma/sdk/-/sdk-2.0.0-beta.4.tgz#41414edaa8f04bf18122063b93377838553354f8"
-  integrity sha512-zE1Rkjm923NopMFcWVuxCYRU8B7UUepIluD5oKc5626WxUeidFmvxnsp5YUSnqikivpu1hd22tM/jGKqOSO//A==
+    "@prisma/debug" "2.0.0-beta.7"
+
+"@prisma/sdk@^2.0.0-beta.6":
+  version "2.0.0-beta.7"
+  resolved "https://registry.yarnpkg.com/@prisma/sdk/-/sdk-2.0.0-beta.7.tgz#e2422fbddad719d5a7f56f58b93c02963db2ec92"
+  integrity sha512-0LVQMPkGU0PBRKIx/v16npkKNG71yOnD5K4tn97v/Gv4AkhJ/JCaqYkL+WMxY+XTtmkEI32e8fjGkfOYNEug0g==
   dependencies:
     "@apexearth/copy" "^1.4.5"
-    "@prisma/engine-core" "2.0.0-beta.4"
-    "@prisma/fetch-engine" "2.0.0-beta.4"
-    "@prisma/generator-helper" "2.0.0-beta.4"
-    "@prisma/get-platform" "2.0.0-beta.4"
->>>>>>> bb1ab34... Add auth package.
+    "@prisma/debug" "2.0.0-beta.7"
+    "@prisma/engine-core" "2.0.0-beta.7"
+    "@prisma/fetch-engine" "2.0.0-beta.7"
+    "@prisma/generator-helper" "2.0.0-beta.7"
+    "@prisma/get-platform" "2.0.0-beta.7"
     archiver "^3.1.1"
     arg "^4.1.3"
     chalk "3.0.0"
@@ -2490,7 +2414,6 @@
   integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 
 "@sinonjs/commons@^1.7.0":
-<<<<<<< HEAD
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
   integrity sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==
@@ -2501,25 +2424,6 @@
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-1.5.0.tgz#b9dbe6ebfb86e67ffabf29d4e0d28a52670ac456"
   integrity sha512-+Qo+IO3YOXWgazlo+CKxOuWFLQQdaNCJ9cSfhFQd687/FuesaIxWdInaAdfpsLScq0c6M1ieZslXgiZELSzxbg==
-=======
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2"
-  integrity sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==
-  dependencies:
-    type-detect "4.0.8"
-
-"@szmarczak/http-timer@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
-  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
-  dependencies:
-    defer-to-connect "^1.0.1"
-
-"@testing-library/dom@^7.2.2":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.2.2.tgz#30ab09cca132fe49b2ca61ccd9ed785c5f0a6fc5"
-  integrity sha512-g+gT//COYh2FgRrlgcgdkifkjqSk7wQIS7F8jbrf6yoEsh85PJUJ/QtO0bJ9QU7pQPYQgKcgqNJsOs0dlyFYag==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     tslib "^1.9.3"
 
@@ -2553,15 +2457,14 @@
     "@snyk/graphlib" "2.1.9-patch"
     tslib "^1.9.3"
 
-"@snyk/cocoapods-lockfile-parser@3.2.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.2.0.tgz#d59d82a89fb8ea4c8ab7f8068f94b8b14d0a9b39"
-  integrity sha512-DyFqZudOlGXHBOVneLnQnyQ97xZLq+PTF9PhWOmrEzH/tKcLyXhdW/WmDPVNJVyNvogyRZ4cXIj487xy/EeZEw==
+"@snyk/cocoapods-lockfile-parser@3.4.0":
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.4.0.tgz#e5a02e458b2db67de929936398565b22724ba2de"
+  integrity sha512-mAWgKIHFv0QEGpRvocVMxLAdJx7BmXtVOyQN/VtsGBoGFKqhO0jbtKUUVJC4b0jyKfVmEF2puo94i+1Uqz5q6A==
   dependencies:
-    "@snyk/dep-graph" "1.18.2"
+    "@snyk/dep-graph" "1.18.4"
     "@snyk/ruby-semver" "^2.0.4"
     "@types/js-yaml" "^3.12.1"
-    core-js "^3.2.0"
     js-yaml "^3.13.1"
     source-map-support "^0.5.7"
     tslib "^1.10.0"
@@ -2573,31 +2476,6 @@
   dependencies:
     "@snyk/lodash" "^4.17.15-patch"
 
-"@snyk/configstore@3.2.0-rc1", "@snyk/configstore@^3.2.0-rc1":
-  version "3.2.0-rc1"
-  resolved "https://registry.yarnpkg.com/@snyk/configstore/-/configstore-3.2.0-rc1.tgz#385c050d11926a26d0335a4b3be9e55f90f6e0ac"
-  integrity sha512-CV3QggFY8BY3u8PdSSlUGLibqbqCG1zJRmGM2DhnhcxQDRRPTGTP//l7vJphOVsUP1Oe23+UQsj7KRWpRUZiqg==
-  dependencies:
-    dot-prop "^5.2.0"
-    graceful-fs "^4.1.2"
-    make-dir "^1.0.0"
-    unique-string "^1.0.0"
-    write-file-atomic "^2.0.0"
-    xdg-basedir "^3.0.0"
-
-"@snyk/dep-graph@1.18.2":
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.18.2.tgz#59bc60850b2e4624a2d4dfb6f72a416c82586c1e"
-  integrity sha512-v7tIiCH4LmYOSc0xGHKSxSZ2PEDv8zDlYU7ZKSH+1Hk8Qvj3YYEFvtV1iFBHUEQFUen4kQA6lWxlwF8chsNw+w==
-  dependencies:
-    "@snyk/graphlib" "2.1.9-patch"
-    "@snyk/lodash" "4.17.15-patch"
-    object-hash "^1.3.1"
-    prettier "^1.19.1"
-    semver "^6.0.0"
-    source-map-support "^0.5.11"
-    tslib "^1.10.0"
-
 "@snyk/dep-graph@1.18.3":
   version "1.18.3"
   resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.18.3.tgz#7bf675f694ecbc329f67cca6456ae67f3f45f516"
@@ -2610,18 +2488,30 @@
     source-map-support "^0.5.19"
     tslib "^1.11.1"
 
-"@snyk/dep-graph@^1.18.2":
-  version "1.18.5"
-  resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.18.5.tgz#d44b43c61910da5ef81a575307e85f893f6d140a"
-  integrity sha512-8kExVTms09Zw3fnTNW743JhvB1f3otAXGuWl7D+rkZDggzbyYQGg2OBEtXtPfk4PEMPY4LAfB6xoTwWzvonPbw==
+"@snyk/dep-graph@1.18.4":
+  version "1.18.4"
+  resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.18.4.tgz#4dfb1681d56090ca1f04a3bcd6593cbb8bf1a576"
+  integrity sha512-SePWsDyD7qrLxFifIieEl4GqyOODfOnP0hmUweTG5YcMroAV5nARGAUcjxREGzbXMcUpPfZhAaqFjYgzUDH8dQ==
   dependencies:
     "@snyk/graphlib" "2.1.9-patch"
     "@snyk/lodash" "4.17.15-patch"
     object-hash "^2.0.3"
-    semver "^6.0.0"
+    semver "^7.3.2"
     source-map-support "^0.5.19"
     tslib "^1.11.1"
 
+"@snyk/dep-graph@^1.17.0", "@snyk/dep-graph@^1.18.2":
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.19.0.tgz#dfb2699520225e715083f6dd590bb91b55e99ba1"
+  integrity sha512-/0phOICMk4hkX2KtZgi+4KNd5G9oYDIlxQDQk+ui2xl4gonPvK6Q5MFzHP7Xet1YY/XoU33ox41i+IO48qZ+zQ==
+  dependencies:
+    "@snyk/graphlib" "2.1.9-patch"
+    lodash.isequal "^4.5.0"
+    object-hash "^2.0.3"
+    semver "^6.0.0"
+    source-map-support "^0.5.19"
+    tslib "^2.0.0"
+
 "@snyk/gemfile@1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@snyk/gemfile/-/gemfile-1.2.0.tgz#919857944973cce74c650e5428aaf11bcd5c0457"
@@ -2677,12 +2567,11 @@
   integrity sha512-e4+t34bGyjjRnwXwI14hqye9J/nRbG9iwaqTgXWHskm5qC+iK0UrjgYdWXiHJCf3Plbpr+1rpW+4LPzZnCGMhQ==
 
 "@snyk/rpm-parser@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@snyk/rpm-parser/-/rpm-parser-1.1.0.tgz#cf9aaee87bc85133d2d791c293e5e590d1206346"
-  integrity sha512-+DyCagvnpyBjwYTxaPMQGLW4rkpKAw1Jrh8YbZCg7Ix172InBxdve/0zud18Lu2H6xWtDDdMvRDdfl82wlTBvA==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@snyk/rpm-parser/-/rpm-parser-1.2.0.tgz#e3dde9bdf9debc26203cac22bf5a4d9f5451c5e7"
+  integrity sha512-9D2Vjg9LAONz9hHNPd/ORYF5Mv1Yw/uhJpJbwI3YRxKjlB3JY2UNLSVl1XWWr03hA1M+3rNAwVeOZNm3IJajgw==
   dependencies:
     event-loop-spinner "1.1.0"
-    typescript "3.8.3"
 
 "@snyk/ruby-semver@2.2.0", "@snyk/ruby-semver@^2.0.4":
   version "2.2.0"
@@ -2691,32 +2580,16 @@
   dependencies:
     "@snyk/lodash" "4.17.15-patch"
 
-"@snyk/snyk-cocoapods-plugin@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.2.0.tgz#abf01c15ace3a0d2db298c08317340fb9092c78e"
-  integrity sha512-Ux7hXKawbk30niGBToGkKqHyKzhT3E7sCl0FNkPkHaaGZwPwhFCDyNFxBd4uGgWiQ+kT+RjtH5ahna+bSP69Yg==
+"@snyk/snyk-cocoapods-plugin@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.3.0.tgz#e228f9eb42c94ef7309d98471768838f30e3274a"
+  integrity sha512-4V1xJMqsK6J3jHu9UufKySorzA8O1vNLRIK1JgJf5KcXQCP44SJI5dk9Xr9iFGXXtGo8iI9gmokQcHlGpkPSJg==
   dependencies:
     "@snyk/cli-interface" "1.5.0"
-    "@snyk/cocoapods-lockfile-parser" "3.2.0"
+    "@snyk/cocoapods-lockfile-parser" "3.4.0"
     "@snyk/dep-graph" "^1.18.2"
     source-map-support "^0.5.7"
-    tslib "^1.10.0"
-
-"@snyk/update-notifier@^2.5.1-rc2":
-  version "2.5.1-rc2"
-  resolved "https://registry.yarnpkg.com/@snyk/update-notifier/-/update-notifier-2.5.1-rc2.tgz#14bf816114b5698a255289d7170157f254202fad"
-  integrity sha512-dlled3mfpnAt3cQb5hxkFiqfPCj4Yk0xV8Yl5P8PeVv1pUmO7vI4Ka4Mjs4r6CYM5f9kZhviFPQQcWOIDlMRcw==
-  dependencies:
-    "@snyk/configstore" "3.2.0-rc1"
-    boxen "^1.3.0"
-    chalk "^2.3.2"
-    import-lazy "^2.1.0"
-    is-ci "^1.0.10"
-    is-installed-globally "^0.1.0"
-    is-npm "^1.0.0"
-    latest-version "^3.1.0"
-    semver-diff "^2.0.0"
-    xdg-basedir "^3.0.0"
+    tslib "^2.0.0"
 
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
@@ -2726,26 +2599,19 @@
     defer-to-connect "^1.0.1"
 
 "@testing-library/dom@^7.2.2":
-  version "7.5.7"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.5.7.tgz#c4bf683a65083d4a78644588cfa4ad684c113fc7"
-  integrity sha512-835MiwAxQE7xjSrhpeJbv41UQRmsPJQ0tGfzWiJMdZj2LBbdG5cT8Z44Viv11/XucCmJHr/v8q7VpZnuSimscg==
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.7.0.tgz#3567f4669f64b10c546c2fc42adec5a0cc84b956"
+  integrity sha512-Mlq+5hLGyitcoKrvKCnUNm8euM0+QEy2q1AaZzJTxEAaSaujBIut7+exodTSnhKoe+XLUZmlA45O9M4T+kHu9g==
   dependencies:
     "@babel/runtime" "^7.9.6"
     aria-query "^4.0.2"
     dom-accessibility-api "^0.4.4"
     pretty-format "^25.5.0"
 
-<<<<<<< HEAD
 "@testing-library/jest-dom@^5.8.0":
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.8.0.tgz#815e830129c4dda6c8e9a725046397acec523669"
-  integrity sha512-9Y4FxYIxfwHpUyJVqI8EOfDP2LlEBqKwXE3F+V8ightji0M2rzQB+9kqZ5UJxNs+9oXJIgvYj7T3QaXLNHVDMw==
-=======
-"@testing-library/jest-dom@^5.3.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.5.0.tgz#4707023e8f572021e8a84f65721303ff60828d88"
-  integrity sha512-7sWHrpxG4Yd8TmryI7Rtbx8Ff4mbs3ASye3oshQIuHvsCR+QHgr7rTR/PfeXvOmwUwR36wSTTAvrLKsPmr6VEQ==
->>>>>>> bb1ab34... Add auth package.
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.9.0.tgz#86464c66cbe75e632b8adb636f539bfd0efc2c9c"
+  integrity sha512-uZ68dyILuM2VL13lGz4ehFEAgxzvLKRu8wQxyAZfejWnyMhmipJ60w4eG81NQikJHBfaYXx+Or8EaPQTDwGfPA==
   dependencies:
     "@babel/runtime" "^7.9.2"
     "@types/testing-library__jest-dom" "^5.0.2"
@@ -2757,11 +2623,7 @@
     lodash "^4.17.15"
     redent "^3.0.0"
 
-<<<<<<< HEAD
 "@testing-library/react@^10.0.4":
-=======
-"@testing-library/react@^10.0.1":
->>>>>>> bb1ab34... Add auth package.
   version "10.0.4"
   resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-10.0.4.tgz#8e0e299cd91acc626d81ed8489fdc13df864c31d"
   integrity sha512-2e1B5debfuiIGbvUuiSXybskuh7ZTVJDDvG/IxlzLOY9Co/mKFj9hIklAe2nGZYcOUxFaiqWrRZ9vCVGzJfRlQ==
@@ -2782,13 +2644,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/agent-base@^4.2.0":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@types/agent-base/-/agent-base-4.2.1.tgz#e5b3b735d26af093843c1a5616ea923808e93a1c"
-  integrity sha512-GRmnDTq6ajyRyT8Ybg4IVVOyYqqFIAR4Zo9L+fdMAP+IJxd0nlTV99/IelJCBF629WOj6MpE9ohLHYCmkeJqRA==
-  dependencies:
-    "@types/node" "*"
-
 "@types/anymatch@*":
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
@@ -2798,7 +2653,6 @@
   version "8.10.51"
   resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.51.tgz#7ad774507a3cf1d2e949ca305380c23b5af635a0"
   integrity sha512-XK7RerpXj4r+IO0r7qIeNqUSU6L4qhPMwNhISxozJJiUX/jdXj9WYzTShRVisEcUQHXgJ4TTBqTArM8f9Mjb8g==
-<<<<<<< HEAD
 
 "@types/babel-core@^6.25.6":
   version "6.25.6"
@@ -2847,10 +2701,6 @@
   integrity sha512-dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ==
 
 "@types/babel__core@*", "@types/babel__core@^7.1.7":
-=======
-
-"@types/babel__core@^7.1.7":
->>>>>>> bb1ab34... Add auth package.
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
   integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==
@@ -2947,7 +2797,7 @@
   resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
   integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
 
-"@types/estree@*":
+"@types/estree@*", "@types/estree@0.0.44":
   version "0.0.44"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.44.tgz#980cc5a29a3ef3bea6ff1f7d021047d7ea575e21"
   integrity sha512-iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g==
@@ -2962,7 +2812,6 @@
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
-<<<<<<< HEAD
 "@types/express-jwt@0.0.42":
   version "0.0.42"
   resolved "https://registry.yarnpkg.com/@types/express-jwt/-/express-jwt-0.0.42.tgz#4f04e1fadf9d18725950dc041808a4a4adf7f5ae"
@@ -2975,12 +2824,6 @@
   version "4.17.7"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.7.tgz#dfe61f870eb549dc6d7e12050901847c7d7e915b"
   integrity sha512-EMgTj/DF9qpgLXyc+Btimg+XoH7A2liE8uKul8qSmMTHCeNYzydDKFdsJskDvw42UsesCnhO63dO0Grbj8J4Dw==
-=======
-"@types/express-serve-static-core@*":
-  version "4.17.5"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.5.tgz#a00ac7dadd746ae82477443e4d480a6a93ea083c"
-  integrity sha512-578YH5Lt88AKoADy0b2jQGwJtrBxezXtVe/MBqWXKZpqx91SnC0pVkVCcxcytz3lWW+cHBYDi3Ysh0WXc+rAYw==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -3050,7 +2893,6 @@
     "@types/koa" "*"
     graphql "^14.5.3"
 
-<<<<<<< HEAD
 "@types/hosted-git-info@^2.7.0":
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/@types/hosted-git-info/-/hosted-git-info-2.7.0.tgz#5199b4df62d53f51d60520d61513eaa4b2dd3d3d"
@@ -3060,12 +2902,6 @@
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz#551a4589b6ee2cc9c1dff08056128aec29b94880"
   integrity sha512-iYCgjm1dGPRuo12+BStjd1HiVQqhlRhWDOQigNxn023HcjnhsiFz9pc6CzJj4HwDCSQca9bxTL4PxJDbkdm3PA==
-=======
-"@types/html-minifier-terser@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.0.0.tgz#7532440c138605ced1b555935c3115ddd20e8bef"
-  integrity sha512-q95SP4FdkmF0CwO0F2q0H6ZgudsApaY/yCtAQNRn1gduef5fGpyEphzy0YCq/N0UFvDSnLg5V8jFK/YGXlDiCw==
->>>>>>> bb1ab34... Add auth package.
 
 "@types/http-assert@*":
   version "1.5.1"
@@ -3093,7 +2929,6 @@
     "@types/istanbul-lib-report" "*"
 
 "@types/jest@*", "@types/jest@^25.1.4":
-<<<<<<< HEAD
   version "25.2.3"
   resolved "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.3.tgz#33d27e4c4716caae4eced355097a47ad363fdcaf"
   integrity sha512-JXc1nK/tXHiDhV55dvfzqtmP4S3sy3T3ouV2tkViZgxY/zeUkcpQcQPGRlgF4KmWzWW5oiWYSZwtCB+2RsE4Fw==
@@ -3105,16 +2940,8 @@
   version "3.12.4"
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.4.tgz#7d3b534ec35a0585128e2d332db1403ebe057e25"
   integrity sha512-fYMgzN+9e28R81weVN49inn/u798ruU91En1ZnGvSZzCRc5jXx9B2EDhlRaWmcO1RIxFHL8AajRXzxDuJu93+A==
-=======
-  version "25.2.1"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.1.tgz#9544cd438607955381c1bdbdb97767a249297db5"
-  integrity sha512-msra1bCaAeEdkSyA0CZ6gW1ukMIvZ5YoJkdXw/qhQdsuuDlFTcEUrUw8CLCPt2rVRUfXlClVvK2gvPs9IokZaA==
-  dependencies:
-    jest-diff "^25.2.1"
-    pretty-format "^25.2.1"
->>>>>>> bb1ab34... Add auth package.
 
-"@types/json-schema@^7.0.3":
+"@types/json-schema@^7.0.3", "@types/json-schema@^7.0.4":
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
   integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
@@ -3166,15 +2993,9 @@
     "@types/lodash" "*"
 
 "@types/lodash@*":
-<<<<<<< HEAD
-  version "4.14.152"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.152.tgz#7e7679250adce14e749304cdb570969f77ec997c"
-  integrity sha512-Vwf9YF2x1GE3WNeUMjT5bTHa2DqgUo87ocdgTScupY2JclZ5Nn7W2RLM/N0+oreexUk8uaVugR81NnTY/jNNXg==
-=======
-  version "4.14.150"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.150.tgz#649fe44684c3f1fcb6164d943c5a61977e8cf0bd"
-  integrity sha512-kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w==
->>>>>>> bb1ab34... Add auth package.
+  version "4.14.154"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.154.tgz#069e3c703fdb264e67be9e03b20a640bc0198ecc"
+  integrity sha512-VoDZIJmg3P8vPEnTldLvgA+q7RkIbVkbYX4k0cAVFzGAOQwUehVgRHgIr2/wepwivDst/rVRqaiBSjCXRnoWwQ==
 
 "@types/long@^4.0.0":
   version "4.0.1"
@@ -3210,19 +3031,7 @@
   dependencies:
     "@types/express" "*"
 
-<<<<<<< HEAD
 "@types/node-fetch@2.5.7", "@types/node-fetch@^2.5.5":
-=======
-"@types/node-fetch@2.5.6":
-  version "2.5.6"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.6.tgz#df8377a66e64ddf75b65b072e37b3c5c5425a96f"
-  integrity sha512-2w0NTwMWF1d3NJMK0Uiq2UNN8htVCyOWOD0jIPjPgC5Ph/YP4dVhs9YxxcMcuLuwAslz0dVEcZQUaqkLs3IzOQ==
-  dependencies:
-    "@types/node" "*"
-    form-data "^3.0.0"
-
-"@types/node-fetch@^2.5.5":
->>>>>>> bb1ab34... Add auth package.
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
   integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
@@ -3230,11 +3039,10 @@
     "@types/node" "*"
     form-data "^3.0.0"
 
-<<<<<<< HEAD
 "@types/node@*", "@types/node@>= 8", "@types/node@>=6":
-  version "14.0.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.5.tgz#3d03acd3b3414cf67faf999aed11682ed121f22b"
-  integrity sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==
+  version "14.0.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.6.tgz#f9e178b2da31a4b0ec60b64649e244c31ce18daf"
+  integrity sha512-FbNmu4F67d3oZMWBV6Y4MaPER+0EpE9eIYf2yaHhCWovc1dlXCZkqGX4NLHfVVr6umt20TNBdRzrNJIzIKfdbw==
 
 "@types/node@^10.1.0":
   version "10.17.24"
@@ -3250,17 +3058,6 @@
   version "6.14.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.10.tgz#d9ce598127eb0cc02821476862d11389cb01f6a4"
   integrity sha512-pF4HjZGSog75kGq7B1InK/wt/N08BuPATo+7HRfv7gZUzccebwv/fmWVGs/j6LvSiLWpCuGGhql51M/wcQsNzA==
-=======
-"@types/node@*", "@types/node@>= 8", "@types/node@>=6", "@types/node@^13.9.5":
-  version "13.13.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.4.tgz#1581d6c16e3d4803eb079c87d4ac893ee7501c2c"
-  integrity sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==
-
-"@types/node@^10.1.0":
-  version "10.17.21"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.21.tgz#c00e9603399126925806bed2d9a1e37da506965e"
-  integrity sha512-PQKsydPxYxF1DsAFWmunaxd3sOi3iMt6Zmx/tgaagHYmwJ/9cRH91hQkeJZaUGWbvn0K5HlSVEXkn5U/llWPpQ==
->>>>>>> bb1ab34... Add auth package.
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -3288,22 +3085,15 @@
   integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
 
 "@types/qs@*", "@types/qs@^6.9.1":
-<<<<<<< HEAD
   version "6.9.3"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.3.tgz#b755a0934564a200d3efdf88546ec93c369abd03"
   integrity sha512-7s9EQWupR1fTc2pSMtXRQ9w9gLOcrJn+h7HOXw4evxyvVqMi4f+q7d2tnFe3ng3SNHjtK+0EzGMGFUQX4/AQRA==
-=======
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.1.tgz#937fab3194766256ee09fcd40b781740758617e7"
-  integrity sha512-lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw==
->>>>>>> bb1ab34... Add auth package.
 
 "@types/range-parser@*":
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
   integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
 
-<<<<<<< HEAD
 "@types/react-dom@*", "@types/react-dom@16.9.8":
   version "16.9.8"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423"
@@ -3315,19 +3105,6 @@
   version "16.9.35"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368"
   integrity sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ==
-=======
-"@types/react-dom@*", "@types/react-dom@16.9.7":
-  version "16.9.7"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.7.tgz#60844d48ce252d7b2dccf0c7bb937130e27c0cd2"
-  integrity sha512-GHTYhM8/OwUCf254WO5xqR/aqD3gC9kSTLpopWGpQLpnw23jk44RvMHsyUSEplvRJZdHxhJGMMLF0kCPYHPhQA==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react@*", "@types/react@16.9.34", "@types/react@^16.9.34":
-  version "16.9.34"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz#f7d5e331c468f53affed17a8a4d488cd44ea9349"
-  integrity sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
@@ -3377,11 +3154,7 @@
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.5.tgz#9adbc12950582aa65ead76bffdf39fe0c27a3c02"
   integrity sha512-/gG2M/Imw7cQFp8PGvz/SwocNrmKFjFsm5Pb8HdbHkZ1K8pmuPzOX4VeVoiEecFCVf4CsN1r3/BRvx+6sNqwtQ==
 
-<<<<<<< HEAD
 "@types/testing-library__dom@*":
-=======
-"@types/testing-library__dom@*", "@types/testing-library__dom@^7.0.0":
->>>>>>> bb1ab34... Add auth package.
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-7.0.2.tgz#2906f8a0dce58b0746c6ab606f786bd06fe6940e"
   integrity sha512-8yu1gSwUEAwzg2OlPNbGq+ixhmSviGurBu1+ivxRKq1eRcwdjkmlwtPvr9VhuxTq2fNHBWN2po6Iem3Xt5A6rg==
@@ -3389,15 +3162,9 @@
     pretty-format "^25.1.0"
 
 "@types/testing-library__jest-dom@^5.0.2":
-<<<<<<< HEAD
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.7.0.tgz#078790bf4dc89152a74428591a228ec5f9433251"
-  integrity sha512-LoZ3uonlnAbJUz4bg6UoeFl+frfndXngmkCItSjJ8DD5WlRfVqPC5/LgJASsY/dy7AHH2YJ7PcsdASOydcVeFA==
-=======
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.0.3.tgz#8efef348eeedc62e7de21acbe455a779936417c4"
-  integrity sha512-NdbKc6yseg6uq4UJFwimPws0iwsGugVbPoOTP2EH+PJMJKiZsoSg5F2H3XYweOyytftCOuIMuXifBUrF9CSvaQ==
->>>>>>> bb1ab34... Add auth package.
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.1.tgz#aba5ee062b7880f69c212ef769389f30752806e5"
+  integrity sha512-yYn5EKHO3MPEMSOrcAb1dLWY+68CG29LiXKsWmmpVHqoP5+ZRiAVLyUHvPNrO2dABDdUGZvavMsaGpWNjM6N2g==
   dependencies:
     "@types/jest" "*"
 
@@ -3427,15 +3194,9 @@
     source-map "^0.6.1"
 
 "@types/webpack@^4.41.11", "@types/webpack@^4.41.8":
-<<<<<<< HEAD
-  version "4.41.13"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.13.tgz#988d114c8913d039b8a0e0502a7fe4f1f84f3d5e"
-  integrity sha512-RYmIHOWSxnTTa765N6jJBVE45pd2SYNblEYshVDduLw6RhocazNmRzE5/ytvBD8IkDMH6DI+bcrqxh8NILimBA==
-=======
-  version "4.41.12"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.12.tgz#0386ee2a2814368e2f2397abb036c0bf173ff6c3"
-  integrity sha512-BpCtM4NnBen6W+KEhrL9jKuZCXVtiH6+0b6cxdvNt2EwU949Al334PjQSl2BeAyvAX9mgoNNG21wvjP3xZJJ5w==
->>>>>>> bb1ab34... Add auth package.
+  version "4.41.15"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.15.tgz#9395e759c26056637e716d197607f5ce16b29033"
+  integrity sha512-JP9plf6b9BkAFRV71JXaqsbritf7P14EnLYu6s6tepW5Ci0wD9EisyJpOOAdNy0fOWuPMnWAY+vUgI0pz0klOw==
   dependencies:
     "@types/anymatch" "*"
     "@types/node" "*"
@@ -3464,15 +3225,9 @@
   integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
 "@types/yargs@^15.0.0":
-<<<<<<< HEAD
   version "15.0.5"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79"
   integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==
-=======
-  version "15.0.4"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299"
-  integrity sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -3482,24 +3237,15 @@
   integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==
 
 "@typescript-eslint/eslint-plugin@^2.27.0":
-<<<<<<< HEAD
   version "2.34.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz#6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9"
   integrity sha512-4zY3Z88rEE99+CNvTbXSyovv2z9PNOVffTWD2W8QF5s2prBQtwN2zadqERcrHpcR7O/+KMI3fcTAmUUhK/iQcQ==
   dependencies:
     "@typescript-eslint/experimental-utils" "2.34.0"
-=======
-  version "2.30.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.30.0.tgz#312a37e80542a764d96e8ad88a105316cdcd7b05"
-  integrity sha512-PGejii0qIZ9Q40RB2jIHyUpRWs1GJuHP1pkoCiaeicfwO9z7Fx03NQzupuyzAmv+q9/gFNHu7lo1ByMXe8PNyg==
-  dependencies:
-    "@typescript-eslint/experimental-utils" "2.30.0"
->>>>>>> bb1ab34... Add auth package.
     functional-red-black-tree "^1.0.1"
     regexpp "^3.0.0"
     tsutils "^3.17.1"
 
-<<<<<<< HEAD
 "@typescript-eslint/experimental-utils@2.34.0":
   version "2.34.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"
@@ -3507,20 +3253,10 @@
   dependencies:
     "@types/json-schema" "^7.0.3"
     "@typescript-eslint/typescript-estree" "2.34.0"
-=======
-"@typescript-eslint/experimental-utils@2.30.0":
-  version "2.30.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.30.0.tgz#9845e868c01f3aed66472c561d4b6bac44809dd0"
-  integrity sha512-L3/tS9t+hAHksy8xuorhOzhdefN0ERPDWmR9CclsIGOUqGKy6tqc/P+SoXeJRye5gazkuPO0cK9MQRnolykzkA==
-  dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.30.0"
->>>>>>> bb1ab34... Add auth package.
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
 "@typescript-eslint/parser@^2.27.0":
-<<<<<<< HEAD
   version "2.34.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.34.0.tgz#50252630ca319685420e9a39ca05fe185a256bc8"
   integrity sha512-03ilO0ucSD0EPTw2X4PntSIRFtDPWjrVq7C3/Z3VQHRC7+13YB55rcJI3Jt+YgeHbjUdJPcPa7b23rXCBokuyA==
@@ -3534,21 +3270,6 @@
   version "2.34.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5"
   integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==
-=======
-  version "2.30.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.30.0.tgz#7681c305a6f4341ae2579f5e3a75846c29eee9ce"
-  integrity sha512-9kDOxzp0K85UnpmPJqUzdWaCNorYYgk1yZmf4IKzpeTlSAclnFsrLjfwD9mQExctLoLoGAUXq1co+fbr+3HeFw==
-  dependencies:
-    "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "2.30.0"
-    "@typescript-eslint/typescript-estree" "2.30.0"
-    eslint-visitor-keys "^1.1.0"
-
-"@typescript-eslint/typescript-estree@2.30.0":
-  version "2.30.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.30.0.tgz#1b8e848b55144270255ffbfe4c63291f8f766615"
-  integrity sha512-nI5WOechrA0qAhnr+DzqwmqHsx7Ulr/+0H7bWCcClDhhWkSyZR5BmTvnBEyONwJCTWHfc5PAQExX24VD26IAVw==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     debug "^4.1.1"
     eslint-visitor-keys "^1.1.0"
@@ -3857,11 +3578,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
-<<<<<<< HEAD
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.11.0, ajv@^6.12.0, ajv@^6.5.5:
-=======
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5:
->>>>>>> bb1ab34... Add auth package.
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.11.0, ajv@^6.12.2, ajv@^6.5.5:
   version "6.12.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
   integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
@@ -3878,13 +3595,6 @@ ansi-align@^3.0.0:
   dependencies:
     string-width "^3.0.0"
 
-ansi-align@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
-  integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==
-  dependencies:
-    string-width "^3.0.0"
-
 ansi-colors@^3.0.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
@@ -3993,23 +3703,13 @@ apollo-boost@0.4.7:
     ts-invariant "^0.4.0"
     tslib "^1.10.0"
 
-<<<<<<< HEAD
-apollo-cache-control@^0.10.1-alpha.0:
-  version "0.10.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.10.1-alpha.0.tgz#3547ebb1a6a49dd822800b86c3bf27c618abdf20"
-  integrity sha512-wg2OwsHC8NoBT4XRblqYznlfMoP7+mzp3frFn8jUwrrNAG1rIKUWgCCIwEKXJ34XDl+q8iMVYzwQ73jb6PC9Ng==
-  dependencies:
-    apollo-server-env "^2.4.4-alpha.0"
-    graphql-extensions "^0.12.1-alpha.0"
-=======
-apollo-cache-control@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.9.1.tgz#2af4c53ef697a87808285a25f2b93ca0f183880c"
-  integrity sha512-9t2EcRevUrANuGhF5XUbKJEfnc6Jy2Rn7Y8nOIKlsEEC+AX7Ko4svWYTyyTxj0h0RXfiegY2nbz4sVry/pS3rA==
+apollo-cache-control@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.11.0.tgz#7075492d04c5424e7c6769380b503e8f75b39d61"
+  integrity sha512-dmRnQ9AXGw2SHahVGLzB/p4UW/taFBAJxifxubp8hqY5p9qdlSu4MPRq8zvV2ULMYf50rBtZyC4C+dZLqmHuHQ==
   dependencies:
-    apollo-server-env "^2.4.3"
-    graphql-extensions "^0.11.1"
->>>>>>> bb1ab34... Add auth package.
+    apollo-server-env "^2.4.4"
+    apollo-server-plugin-base "^0.9.0"
 
 apollo-cache-inmemory@^1.6.5:
   version "1.6.6"
@@ -4044,13 +3744,13 @@ apollo-client@^2.6.7, apollo-client@^2.6.8:
     tslib "^1.10.0"
     zen-observable "^0.8.0"
 
-apollo-datasource@^0.7.1-alpha.0:
-  version "0.7.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.7.1-alpha.0.tgz#2e8f3b1b0846a8bc13bca614185a552eda03152b"
-  integrity sha512-i8/YALvDtbxsvSkmc/wMdGIXzj/fv7iFPNYPE9QUwylzOhuVV2jw0N69QCHWr7Ws69Sk4UpXGmUnWxc/qPiTOQ==
+apollo-datasource@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.7.1.tgz#0b06da999ace50b7f5fe509f2a03f7de97974334"
+  integrity sha512-h++/jQAY7GA+4TBM+7ezvctFmmGNLrAPf51KsagZj+NkT9qvxp585rdsuatynVbSl59toPK2EuVmc6ilmQHf+g==
   dependencies:
     apollo-server-caching "^0.5.1"
-    apollo-server-env "^2.4.4-alpha.0"
+    apollo-server-env "^2.4.4"
 
 apollo-engine-reporting-protobuf@^0.4.4:
   version "0.4.4"
@@ -4059,34 +3759,27 @@ apollo-engine-reporting-protobuf@^0.4.4:
   dependencies:
     "@apollo/protobufjs" "^1.0.3"
 
-<<<<<<< HEAD
-apollo-engine-reporting-protobuf@^0.5.1-alpha.0:
-  version "0.5.1-alpha.1"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1-alpha.1.tgz#d946a1943c52b2886dda911d54d9c9f3e33584e6"
-  integrity sha512-c533X6iGOTKvwWwoeb+6SXEgJBCMnKGBzSUfVgLdTHJpy41VDvVteRzCWa+JwblM66LiZasxzkQXOpm5OC49MA==
-=======
-apollo-engine-reporting@^1.7.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.7.1.tgz#469d9711507ef4c3b03f193a9b422ecf7ecff7e9"
-  integrity sha512-9ykddPxlC95R9CkkJaPaGriRbOGfzeKqqPXRAunyX1h4sG/8g+MJ/gGzmnNf63k6RvRUdRENCE83wPk2OeU+2A==
->>>>>>> bb1ab34... Add auth package.
+apollo-engine-reporting-protobuf@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1.tgz#b6e66e6e382f9bcdc2ac8ed168b047eb1470c1a8"
+  integrity sha512-TSfr9iAaInV8dhXkesdcmqsthRkVcJkzznmiM+1Ob/GScK7r6hBYCjVDt2613EHAg9SUzTOltIKlGD+N+GJRUw==
   dependencies:
     "@apollo/protobufjs" "^1.0.3"
 
-apollo-engine-reporting@^1.8.1-alpha.0:
-  version "1.8.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.8.1-alpha.0.tgz#1499ae467e4d713bad31479172daa9e9c2cf35d8"
-  integrity sha512-zprDnHUhhyc5EktCgBOdjEqlxo/OGsg4rvp/y74BOAYwJ/RGs2wsxqSxcpSz8twOai/AeR3y4t7gMrtd1m2TfQ==
+apollo-engine-reporting@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-2.0.0.tgz#af007b4a8a481fa97baef0eac51a7824f1ec3310"
+  integrity sha512-FvNwORsh3nxEfvQqd2xbd468a0q/R3kYar/Bk6YQdBX5qwqUhqmOcOSxLFk8Zb77HpwHij5CPpPWJb53TU1zcA==
   dependencies:
-    apollo-engine-reporting-protobuf "^0.5.1-alpha.0"
+    apollo-engine-reporting-protobuf "^0.5.1"
     apollo-graphql "^0.4.0"
     apollo-server-caching "^0.5.1"
-<<<<<<< HEAD
-    apollo-server-env "^2.4.4-alpha.0"
+    apollo-server-env "^2.4.4"
     apollo-server-errors "^2.4.1"
-    apollo-server-types "^0.4.1-alpha.0"
+    apollo-server-plugin-base "^0.9.0"
+    apollo-server-types "^0.5.0"
     async-retry "^1.2.1"
-    graphql-extensions "^0.12.1-alpha.0"
+    uuid "^8.0.0"
 
 apollo-env@^0.6.5:
   version "0.6.5"
@@ -4094,38 +3787,16 @@ apollo-env@^0.6.5:
   integrity sha512-jeBUVsGymeTHYWp3me0R2CZRZrFeuSZeICZHCeRflHTfnQtlmbSXdy5E0pOyRM9CU4JfQkKDC98S1YglQj7Bzg==
   dependencies:
     "@types/node-fetch" "2.5.7"
-=======
-    apollo-server-env "^2.4.3"
-    apollo-server-errors "^2.4.1"
-    apollo-server-types "^0.3.1"
-    async-retry "^1.2.1"
-    graphql-extensions "^0.11.1"
-
-apollo-env@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.6.4.tgz#c5b9b2510428df5257846c0d96c9c907269d4b1f"
-  integrity sha512-8tGDMFv3sZLd76b/ZAo8GbdWU5Qt3VEUWSB+FLN41p/hVShZw0XIo2s/i8pVCTAhaWiEiD0Cr+d/zi0/h5UTxA==
-  dependencies:
-    "@types/node-fetch" "2.5.6"
->>>>>>> bb1ab34... Add auth package.
     core-js "^3.0.1"
     node-fetch "^2.2.0"
     sha.js "^2.4.11"
 
 apollo-graphql@^0.4.0:
-<<<<<<< HEAD
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.4.4.tgz#25f456b28a4419bb6a42071f8a56e19e15bb80be"
   integrity sha512-i012iRKT5nfsOaNMx4MTwHw2jrlyaF1zikpejxsGHsKIf3OngGvGh3pyw20bEmwj413OrNQpRxvvIz5A7W/8xw==
   dependencies:
     apollo-env "^0.6.5"
-=======
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.4.3.tgz#cd25641d4151c931743cc1870a9d4be9f42b556f"
-  integrity sha512-eAl8w6TeuY0Q3x7TVqBjt4JObA34vUyctuDn2lOmkdIqlu1EKxNAnTlRtXkjQM89qUt0rK0teU8No0a2lMNGuw==
-  dependencies:
-    apollo-env "^0.6.4"
->>>>>>> bb1ab34... Add auth package.
     lodash.sortby "^4.7.0"
 
 apollo-link-error@^1.0.3:
@@ -4173,46 +3844,25 @@ apollo-server-caching@^0.5.1:
     lru-cache "^5.0.0"
 
 apollo-server-core@^2.11.0:
-<<<<<<< HEAD
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.13.1.tgz#eac223696ae9da5f4990273ea89c74b77af0e156"
-  integrity sha512-4jKF0VbpoxprhcruaGoHG5ScrquSSkQ/LVFrOLp/ukUFuooLEMb1O18tAQdgVahkNgLkRKdNJYLLyoQoj+i3dA==
-=======
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.12.0.tgz#980f29788c17f029e7248d331bee1ad2e1f07e5b"
-  integrity sha512-BRVdOyZrRJ1ALlmis0vaOLIHHYu5K3UVKAQKIgHkRh/YY0Av4lpeEXr49ELK04LTeh0DG0pQ5YYYhaX1wFcDEw==
->>>>>>> bb1ab34... Add auth package.
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.14.1.tgz#d930c62bfbe36e40fa5fce707aa3bfbfe3d1393b"
+  integrity sha512-Uk/jJwLtm+5YvExghNoq9V2ZHJRXPfaVOt4cIyo+mcjWG6YymHhMg5h9pR/auz9HMI8NP7ykmfo/bsTR1qutWQ==
   dependencies:
     "@apollographql/apollo-tools" "^0.4.3"
     "@apollographql/graphql-playground-html" "1.6.24"
     "@types/graphql-upload" "^8.0.0"
-<<<<<<< HEAD
     "@types/ws" "^7.0.0"
-    apollo-cache-control "^0.10.1-alpha.0"
-    apollo-datasource "^0.7.1-alpha.0"
-    apollo-engine-reporting "^1.8.1-alpha.0"
-    apollo-server-caching "^0.5.1"
-    apollo-server-env "^2.4.4-alpha.0"
-    apollo-server-errors "^2.4.1"
-    apollo-server-plugin-base "^0.8.1-alpha.0"
-    apollo-server-types "^0.4.1-alpha.0"
-    apollo-tracing "^0.10.1-alpha.0"
-    fast-json-stable-stringify "^2.0.0"
-    graphql-extensions "^0.12.1-alpha.0"
-=======
-    "@types/ws" "^6.0.0"
-    apollo-cache-control "^0.9.1"
-    apollo-datasource "^0.7.0"
-    apollo-engine-reporting "^1.7.1"
+    apollo-cache-control "^0.11.0"
+    apollo-datasource "^0.7.1"
+    apollo-engine-reporting "^2.0.0"
     apollo-server-caching "^0.5.1"
-    apollo-server-env "^2.4.3"
+    apollo-server-env "^2.4.4"
     apollo-server-errors "^2.4.1"
-    apollo-server-plugin-base "^0.7.1"
-    apollo-server-types "^0.3.1"
-    apollo-tracing "^0.9.1"
+    apollo-server-plugin-base "^0.9.0"
+    apollo-server-types "^0.5.0"
+    apollo-tracing "^0.11.0"
     fast-json-stable-stringify "^2.0.0"
-    graphql-extensions "^0.11.1"
->>>>>>> bb1ab34... Add auth package.
+    graphql-extensions "^0.12.2"
     graphql-tag "^2.9.2"
     graphql-tools "^4.0.0"
     graphql-upload "^8.0.2"
@@ -4221,25 +3871,14 @@ apollo-server-core@^2.11.0:
     subscriptions-transport-ws "^0.9.11"
     ws "^6.0.0"
 
-apollo-server-env@^2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.3.tgz#9bceedaae07eafb96becdfd478f8d92617d825d2"
-  integrity sha512-23R5Xo9OMYX0iyTu2/qT0EUb+AULCBriA9w8HDfMoChB8M+lFClqUkYtaTTHDfp6eoARLW8kDBhPOBavsvKAjA==
-  dependencies:
-    node-fetch "^2.1.2"
-    util.promisify "^1.0.0"
-
-<<<<<<< HEAD
-apollo-server-env@^2.4.4-alpha.0:
-  version "2.4.4-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.4-alpha.0.tgz#56e860b6af116cdbd05fc4bfe51d5851bde2413e"
-  integrity sha512-KoxYIYCZWh3oXDrsh/V43DVgTIo02XGEaLlNuwPMzPxwRA7id1wxcNInqISvd8Os8uoJSGuxkMCCs21UMOpnFw==
+apollo-server-env@^2.4.3, apollo-server-env@^2.4.4:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.4.tgz#12d2d0896dcb184478cba066c7a683ab18689ca1"
+  integrity sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==
   dependencies:
     node-fetch "^2.1.2"
     util.promisify "^1.0.0"
 
-=======
->>>>>>> bb1ab34... Add auth package.
 apollo-server-errors@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.4.1.tgz#16ad49de6c9134bfb2b7dede9842e73bb239dbe2"
@@ -4257,25 +3896,14 @@ apollo-server-lambda@2.11.0:
     apollo-server-types "^0.3.0"
     graphql-tools "^4.0.0"
 
-<<<<<<< HEAD
-apollo-server-plugin-base@^0.8.1-alpha.0:
-  version "0.8.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.8.1-alpha.0.tgz#79dc1e7996a9cfc627d89b7f24d29b6174c5cd2e"
-  integrity sha512-7itTcglQoVQfHPfITwuCJQMrTMsFsqdIJ02F5FyiMq3FwscStCfKhRu0c+uwdeipMNx8CDuAnjssfPYGc7CQkQ==
+apollo-server-plugin-base@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.0.tgz#777f720a1ee827a66b8c159073ca30645f8bc625"
+  integrity sha512-LWcPrsy2+xqwlNseh/QaGa/MPNopS8c4qGgh0g0cAn0lZBRrJ9Yab7dq+iQ6vdUBwIhUWYN6s9dwUWCZw2SL8g==
   dependencies:
-    apollo-server-types "^0.4.1-alpha.0"
+    apollo-server-types "^0.5.0"
 
 apollo-server-types@^0.3.0:
-=======
-apollo-server-plugin-base@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.7.1.tgz#998d035723c5993171fd5aff3dbe7d2661db1a96"
-  integrity sha512-PRavvoWq7/Xufqc+qkDQg3Aqueq4QrPBFfoCFIjhkJ4n2d2YoqE3gTGccb8YoWusfa62ASMn6R47OdNuVtEbXw==
-  dependencies:
-    apollo-server-types "^0.3.1"
-
-apollo-server-types@^0.3.0, apollo-server-types@^0.3.1:
->>>>>>> bb1ab34... Add auth package.
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.3.1.tgz#9456e243dad525a78b689246f124a66d7d8ac409"
   integrity sha512-6nX5VC3icOGf1RZIs7/SYQZff+Cl16LQu1FHUOIk9gAMN2XjlRCyJgCeMj5YHJzQ8Mhg4BO0weWuydEg+JxLzg==
@@ -4284,42 +3912,22 @@ apollo-server-types@^0.3.0, apollo-server-types@^0.3.1:
     apollo-server-caching "^0.5.1"
     apollo-server-env "^2.4.3"
 
-<<<<<<< HEAD
-apollo-server-types@^0.4.1-alpha.0:
-  version "0.4.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.4.1-alpha.0.tgz#b74b8ebc85d4ffb62c083b1628199e57aa1e9b51"
-  integrity sha512-ta2hAE2x4gVq0m+r0yT2d0hn4SCTa5LiClM+ugfETs06KHWoTqQ0QN2NHX2jKWh97GGx856EBZ4LMQEbVtS2+w==
+apollo-server-types@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.5.0.tgz#51f39c5fa610ece8b07f1fbcf63c47d4ac150340"
+  integrity sha512-zhtsqqqfdeoJQAfc41Sy6WnnBVxKNgZ34BKXf/Q+kXmw7rbZ/B5SG3SJMvj1iFsbzZxILmWdUsE9aD20lEr0bg==
   dependencies:
-    apollo-engine-reporting-protobuf "^0.5.1-alpha.0"
+    apollo-engine-reporting-protobuf "^0.5.1"
     apollo-server-caching "^0.5.1"
-    apollo-server-env "^2.4.4-alpha.0"
-=======
-apollo-tracing@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.9.1.tgz#c481be727550c73fda53d20d798cbe4ad67c61bd"
-  integrity sha512-4wVNM6rc70XhwWxuDWrMBLaHA8NjB9pUS2sNpddQvP36ZtQfsa08XLSUxGAZT+bej+TzW26hKNtuO31RgqC9Hg==
-  dependencies:
-    apollo-server-env "^2.4.3"
-    graphql-extensions "^0.11.1"
-
-apollo-upload-client@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-13.0.0.tgz#146d1ddd85d711fcac8ca97a72d3ca6787f2b71b"
-  integrity sha512-lJ9/bk1BH1lD15WhWRha2J3+LrXrPIX5LP5EwiOUHv8PCORp4EUrcujrA3rI5hZeZygrTX8bshcuMdpqpSrvtA==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
-    apollo-link "^1.2.12"
-    apollo-link-http-common "^0.2.14"
-    extract-files "^8.0.0"
->>>>>>> bb1ab34... Add auth package.
+    apollo-server-env "^2.4.4"
 
-apollo-tracing@^0.10.1-alpha.0:
-  version "0.10.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.10.1-alpha.0.tgz#c59443a7c39d84eed1fa3ad3b9be12d115c02f8a"
-  integrity sha512-DEVHP4niQRxAEgp5FajotioXzpzNdBcqCfjBWAvF++yCHzYVasFQe0qwMw3uadi46xvPaX2hG5gTrSCiMgdqUA==
+apollo-tracing@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.11.0.tgz#8821eb60692f77c06660fb6bc147446f600aecfe"
+  integrity sha512-I9IFb/8lkBW8ZwOAi4LEojfT7dMfUSkpnV8LHQI8Rcj0HtzL9HObQ3woBmzyGHdGHLFuD/6/VHyFD67SesSrJg==
   dependencies:
-    apollo-server-env "^2.4.4-alpha.0"
-    graphql-extensions "^0.12.1-alpha.0"
+    apollo-server-env "^2.4.4"
+    apollo-server-plugin-base "^0.9.0"
 
 apollo-upload-client@^13.0.0:
   version "13.0.0"
@@ -4529,7 +4137,7 @@ asn1.js@^4.0.0:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
 
-asn1@~0.2.3:
+asn1@~0.2.0, asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
   integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
@@ -4772,17 +4380,15 @@ babel-plugin-module-resolver@^4.0.0:
     resolve "^1.13.1"
 
 babel-plugin-tester@^9.0.0, babel-plugin-tester@^9.0.1:
-<<<<<<< HEAD
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-tester/-/babel-plugin-tester-9.1.0.tgz#9c917ed8a898d65fe4c5e3035882be2a866212d2"
-  integrity sha512-F+wlG1b+sN3Bwav8uMcd3Q9QAxtwMaZQ29u0r0UgP3u0T/Ws56dNoSo0Guy6GoCEXo4jc9/udh4HqdMIbSZGDA==
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-tester/-/babel-plugin-tester-9.2.0.tgz#7169f99678419b9c6754bcc5e3a44eb4a11cdff3"
+  integrity sha512-HCbgmxOJXCcJ8hMk4ek6Ehfv0Ye7D7EpglNP8bh2gmRZnLPkKSJF+ufvypur/F38N3bEWWHYX4QfdnfLyql2DQ==
   dependencies:
     "@types/babel-plugin-tester" "^9.0.0"
     lodash.mergewith "^4.6.2"
     prettier "^2.0.1"
     strip-indent "^3.0.0"
 
-<<<<<<< HEAD
 babel-preset-current-node-syntax@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz#fb4a4c51fe38ca60fede1dc74ab35eb843cb41d6"
@@ -4803,24 +4409,6 @@ babel-preset-jest@^25.5.0:
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz#c1d7f191829487a907764c65307faa0e66590b49"
   integrity sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==
-=======
-babel-plugin-tester@^9.0.1:
-=======
->>>>>>> bb1ab34... Add auth package.
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-tester/-/babel-plugin-tester-9.0.1.tgz#9e975a7fe278a49b3bd4b02bd3a77004819863ee"
-  integrity sha512-q5GXJowxsRefBDhgiZVyNPgIIHsfxtZNnMABxq+vtuoYP2JW8qaiIBBAG9/I0PgRGRpjUDXnn0IhGHGGn7UOcA==
-  dependencies:
-    lodash.mergewith "^4.6.2"
-    prettier "^2.0.1"
-    strip-indent "^3.0.0"
-
-<<<<<<< HEAD
-babel-preset-jest@^25.2.1:
-  version "25.2.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.2.1.tgz#4ccd0e577f69aa11b71806edfe8b25a5c3ac93a2"
-  integrity sha512-zXHJBM5iR8oEO4cvdF83AQqqJf3tJrXy3x8nfu2Nlqvn4cneg4Ca8M7cQvC5S9BzDDy1O0tZ9iXru9J6E3ym+A==
->>>>>>> 73720a6... Add a way to extract the user from the headers.
   dependencies:
     babel-plugin-jest-hoist "^25.5.0"
     babel-preset-current-node-syntax "^0.1.2"
@@ -4831,31 +4419,6 @@ back@1.0.x:
   integrity sha1-qT9ebOaXKZhNWQGiuxbjsBpNY2k=
   dependencies:
     xtend "^4.0.0"
-=======
-babel-preset-current-node-syntax@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz#fb4a4c51fe38ca60fede1dc74ab35eb843cb41d6"
-  integrity sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw==
-  dependencies:
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-bigint" "^7.8.3"
-    "@babel/plugin-syntax-class-properties" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
-    "@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-preset-jest@^25.5.0:
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz#c1d7f191829487a907764c65307faa0e66590b49"
-  integrity sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==
-  dependencies:
-    babel-plugin-jest-hoist "^25.5.0"
-    babel-preset-current-node-syntax "^0.1.2"
->>>>>>> bb1ab34... Add auth package.
 
 backo2@^1.0.2:
   version "1.0.2"
@@ -4897,7 +4460,7 @@ batch@0.6.1:
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
   integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
-bcrypt-pbkdf@^1.0.0:
+bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
   integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
@@ -4910,9 +4473,9 @@ before-after-hook@^2.0.0:
   integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==
 
 bent@^7.1.2:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/bent/-/bent-7.3.1.tgz#a4d2c83874d3f216baf5c78e7ab13335279ddb45"
-  integrity sha512-4nv/p7GaItr5FJ/CPiP0t3LZ1gETMaV+zXJU0X9tHiOuAPYZ8NA8ohIyugBMBV7q64X2OiDvBaqoQSUM2LuLjA==
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/bent/-/bent-7.3.2.tgz#4e4b3f71e44e4eb3409b811f51a2cd5ae59818ef"
+  integrity sha512-iI9r7tiiaWX8tToVBskcfU7omPb3Z1GoLhPZ1gqJD/K8jtHlPNB9dsD2RqiLc4xYOawsCzP8psnSuILN3PK9dg==
   dependencies:
     bytesish "^0.4.1"
     caseless "~0.12.0"
@@ -5020,27 +4583,6 @@ boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-<<<<<<< HEAD
-boxen@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
-  integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==
-=======
-boxen@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
-  integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==
->>>>>>> bb1ab34... Add auth package.
-  dependencies:
-    ansi-align "^3.0.0"
-    camelcase "^5.3.1"
-    chalk "^3.0.0"
-    cli-boxes "^2.2.0"
-    string-width "^4.1.0"
-    term-size "^2.1.0"
-    type-fest "^0.8.1"
-    widest-line "^3.1.0"
-
 boxen@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
@@ -5162,6 +4704,13 @@ browserify-sign@^4.0.0:
     readable-stream "^3.6.0"
     safe-buffer "^5.2.0"
 
+browserify-zlib@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
+  integrity sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=
+  dependencies:
+    pako "~0.2.0"
+
 browserify-zlib@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
@@ -5178,7 +4727,7 @@ browserslist@4.7.0:
     electron-to-chromium "^1.3.247"
     node-releases "^1.1.29"
 
-browserslist@^4.11.1, browserslist@^4.8.5:
+browserslist@^4.12.0, browserslist@^4.8.5:
   version "4.12.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
   integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
@@ -5434,24 +4983,16 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-<<<<<<< HEAD
 camelcase@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
   integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==
 
 caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001043:
-  version "1.0.30001064"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001064.tgz#a0f49689119ba08943b09968e118faf3f645add0"
-  integrity sha512-hdBcQMFvJIrOhkpAZiRXz04Cmetwc9NekeuNl0qZfHOugxOhJKxsjF1RmISMPFjIF4PPx1reliIzbfN42EiQ5A==
-
-=======
-caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001043:
-  version "1.0.30001048"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz#4bb4f1bc2eb304e5e1154da80b93dee3f1cf447e"
-  integrity sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==
+  version "1.0.30001066"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001066.tgz#0a8a58a10108f2b9bf38e7b65c237b12fd9c5f04"
+  integrity sha512-Gfj/WAastBtfxLws0RCh2sDbTK/8rJuSeZMecrSkNGYxPcv7EzblmDGfWQCFEQcSqYE2BRgQiJh8HOD07N5hIw==
 
->>>>>>> bb1ab34... Add auth package.
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -5464,11 +5005,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-<<<<<<< HEAD
-chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
-=======
 chalk@2.4.2, chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
->>>>>>> bb1ab34... Add auth package.
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -5564,11 +5101,7 @@ chokidar@^2.0.4, chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-<<<<<<< HEAD
 chokidar@^3.2.2, chokidar@^3.3.1, chokidar@^3.4.0:
-=======
-chokidar@^3.2.2, chokidar@^3.3.1:
->>>>>>> bb1ab34... Add auth package.
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
   integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
@@ -5640,11 +5173,6 @@ cli-boxes@^2.2.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
   integrity sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==
 
-cli-boxes@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
-  integrity sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==
-
 cli-cursor@^2.0.0, cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
@@ -6143,11 +5671,7 @@ core-js@3.6.4:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
   integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
 
-<<<<<<< HEAD
-core-js@^3.0.1, core-js@^3.2.0, core-js@^3.2.1, core-js@^3.6.4:
-=======
 core-js@^3.0.1, core-js@^3.2.1, core-js@^3.6.4:
->>>>>>> bb1ab34... Add auth package.
   version "3.6.5"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
   integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
@@ -6201,18 +5725,7 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
-<<<<<<< HEAD
-create-error-class@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
-  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
-  dependencies:
-    capture-stack-trace "^1.0.0"
-
 create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
-=======
-create-hash@^1.1.0, create-hash@^1.1.2:
->>>>>>> bb1ab34... Add auth package.
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
@@ -6270,22 +5783,10 @@ cross-spawn@7.0.1:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-<<<<<<< HEAD
-cross-spawn@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-=======
->>>>>>> bb1ab34... Add auth package.
 cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.2.tgz#d0d7dcfa74e89115c7619f4f721a94e1fdb716d6"
-  integrity sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -6440,15 +5941,9 @@ date-fns@^1.27.2:
   integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
 date-fns@^2.0.1:
-<<<<<<< HEAD
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.14.0.tgz#359a87a265bb34ef2e38f93ecf63ac453f9bc7ba"
   integrity sha512-1zD+68jhFgDIM0rF05rcwYO8cExdNqxjq4xP1QKM60Q45mnO6zaMWB4tOzrIr4M4GSLntsKeE4c9Bdl2jhL/yw==
-=======
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.12.0.tgz#01754c8a2f3368fc1119cf4625c3dad8c1845ee6"
-  integrity sha512-qJgn99xxKnFgB1qL4jpxU7Q2t0LOn1p8KMIveef3UZD7kqjT3tpFNNdXJelEHhE+rUgffriXriw/sOSU+cS1Hw==
->>>>>>> bb1ab34... Add auth package.
 
 dateformat@^3.0.0:
   version "3.0.3"
@@ -6812,14 +6307,11 @@ diff-sequences@^25.2.6:
   version "25.2.6"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd"
   integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==
-<<<<<<< HEAD
 
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-=======
->>>>>>> bb1ab34... Add auth package.
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
@@ -6880,6 +6372,16 @@ dns-txt@^2.0.2:
   dependencies:
     buffer-indexof "^1.0.0"
 
+docker-modem@2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/docker-modem/-/docker-modem-2.1.3.tgz#15432225f63db02eb5de4bb9a621b7293e5f264d"
+  integrity sha512-cwaRptBmYZwu/FyhGcqBm2MzXA77W2/E6eVkpOZVDk6PkI9Bjj84xPrXiHMA+OWjzNy+DFjgKh8Q+1hMR7/OHg==
+  dependencies:
+    debug "^4.1.1"
+    readable-stream "^3.5.0"
+    split-ca "^1.0.1"
+    ssh2 "^0.8.7"
+
 dockerfile-ast@0.0.19:
   version "0.0.19"
   resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.0.19.tgz#b1e21138eba995d7bf5576dc30ba1130c15995c3"
@@ -7059,7 +6561,7 @@ duplexer@^0.1.1:
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
   integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
-duplexify@^3.4.2, duplexify@^3.6.0:
+duplexify@^3.4.2, duplexify@^3.5.0, duplexify@^3.6.0:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
   integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
@@ -7094,22 +6596,10 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-<<<<<<< HEAD
 electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.413:
-  version "1.3.451"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.451.tgz#0c075af3e2f06d706670bde0279432802ca8c83f"
-  integrity sha512-2fvco0F2bBIgqzO8GRP0Jt/91pdrf9KfZ5FsmkYkjERmIJG585cFeFZV4+CO6oTmU3HmCTgfcZuEa7kW8VUh3A==
-=======
-electron-to-chromium@^1.3.247:
-  version "1.3.423"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.423.tgz#1dcc9e54d642dd9b354c6609848abf8ba7b2570f"
-  integrity sha512-jXdnLcawJ/EMdN+j77TC3YyeAWiIjo1U63DFCKrjtLv4cu8ToyoF4HYXtFvkVVHhEtIl7lU1uDd307Xj1/YDjw==
-
-electron-to-chromium@^1.3.413:
-  version "1.3.427"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz#ea43d02908a8c71f47ebb46e09de5a3cf8236f04"
-  integrity sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==
->>>>>>> bb1ab34... Add auth package.
+  version "1.3.455"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.455.tgz#fd65a3f5db6ffa83eb7c84f16ea9b1b7396f537d"
+  integrity sha512-4lwnxp+ArqOX9hiLwLpwhfqvwzUHFuDgLz4NTiU3lhygUzWtocIJ/5Vix+mWVNE2HQ9aI1k2ncGe5H/0OktMvA==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -7223,14 +6713,11 @@ env-paths@2.2.0, env-paths@^2.2.0:
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
   integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
 
-<<<<<<< HEAD
 env-variable@0.0.x:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808"
   integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==
 
-=======
->>>>>>> bb1ab34... Add auth package.
 envinfo@^7.3.1, envinfo@^7.5.1:
   version "7.5.1"
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.5.1.tgz#93c26897225a00457c75e734d354ea9106a72236"
@@ -7418,11 +6905,7 @@ eslint-plugin-jsx-a11y@^6.2.3:
     has "^1.0.3"
     jsx-ast-utils "^2.2.1"
 
-<<<<<<< HEAD
 eslint-plugin-prettier@^3.1.3:
-=======
-eslint-plugin-prettier@^3.1.2:
->>>>>>> bb1ab34... Add auth package.
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.3.tgz#ae116a0fc0e598fdae48743a4430903de5b4e6ca"
   integrity sha512-+HG5jmu/dN3ZV3T6eCD7a4BlAySdN7mLIbJYo0z1cFQuI+r2DiTJEFeF68ots93PsnrMxbzIZ2S/ieX+mkrBeQ==
@@ -7614,7 +7097,7 @@ eventemitter3@^3.1.0:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
   integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
 
-eventemitter3@^4.0.0:
+eventemitter3@^4.0.0, eventemitter3@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
   integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
@@ -7814,7 +7297,6 @@ extract-files@^8.0.0:
   resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-8.1.0.tgz#46a0690d0fe77411a2e3804852adeaa65cd59288"
   integrity sha512-PTGtfthZK79WUMk+avLmwx3NGdU8+iVFXC2NMGxKsn0MnihOG2lvumj+AZo8CTwTrwjXDgZ5tztbRlEdRjBonQ==
 
-<<<<<<< HEAD
 extract-github@0.0.x:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/extract-github/-/extract-github-0.0.5.tgz#f542536db8c19b983a3bec9db96d2ef2a5ff1a86"
@@ -7830,8 +7312,6 @@ extract-zip@^1.6.7:
     mkdirp "^0.5.4"
     yauzl "^2.10.0"
 
-=======
->>>>>>> bb1ab34... Add auth package.
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -7906,15 +7386,9 @@ fast-write-atomic@0.2.1:
   integrity sha512-WvJe06IfNYlr+6cO3uQkdKdy3Cb1LlCJSF8zRs2eT8yuhdbSlR9nIt+TgQ92RUxiRrQm+/S7RARnMfCs5iuAjw==
 
 fastq@^1.6.0:
-<<<<<<< HEAD
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
   integrity sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==
-=======
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.7.0.tgz#fcd79a08c5bd7ec5b55cd3f5c4720db551929801"
-  integrity sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     reusify "^1.0.4"
 
@@ -8285,15 +7759,9 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.7:
-<<<<<<< HEAD
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
   integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
-=======
-  version "1.2.12"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz#db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"
-  integrity sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     bindings "^1.5.0"
     nan "^2.12.1"
@@ -8302,7 +7770,6 @@ fsevents@^2.1.2, fsevents@~2.1.2:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
   integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
-<<<<<<< HEAD
 
 ftp@~0.3.10:
   version "0.3.10"
@@ -8311,8 +7778,6 @@ ftp@~0.3.10:
   dependencies:
     readable-stream "1.1.x"
     xregexp "2.0.0"
-=======
->>>>>>> bb1ab34... Add auth package.
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -8488,7 +7953,7 @@ git-up@^4.0.0:
     is-ssh "^1.3.0"
     parse-url "^5.0.0"
 
-git-url-parse@11.1.2, git-url-parse@^11.1.2:
+git-url-parse@^11.1.2:
   version "11.1.2"
   resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.1.2.tgz#aff1a897c36cc93699270587bea3dbcbbb95de67"
   integrity sha512-gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ==
@@ -8561,13 +8026,6 @@ global-dirs@^2.0.1:
   dependencies:
     ini "^1.3.5"
 
-global-dirs@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201"
-  integrity sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==
-  dependencies:
-    ini "^1.3.5"
-
 global-modules@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
@@ -8709,26 +8167,6 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-<<<<<<< HEAD
-got@^9.6.0:
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
-  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
-  dependencies:
-    "@sindresorhus/is" "^0.14.0"
-    "@szmarczak/http-timer" "^1.1.2"
-    cacheable-request "^6.0.0"
-    decompress-response "^3.3.0"
-    duplexer3 "^0.1.4"
-    get-stream "^4.1.0"
-    lowercase-keys "^1.0.1"
-    mimic-response "^1.0.1"
-    p-cancelable "^1.0.0"
-    to-readable-stream "^1.0.0"
-    url-parse-lax "^3.0.0"
-
-=======
->>>>>>> 73720a6... Add a way to extract the user from the headers.
 gotrue-js@^0.9.25:
   version "0.9.25"
   resolved "https://registry.yarnpkg.com/gotrue-js/-/gotrue-js-0.9.25.tgz#eb9a3c76a2d08629afcda7872a60924d5d671c6a"
@@ -8736,48 +8174,24 @@ gotrue-js@^0.9.25:
   dependencies:
     micro-api-client "^3.2.1"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> bb1ab34... Add auth package.
 graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
-<<<<<<< HEAD
-=======
-graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
->>>>>>> 73720a6... Add a way to extract the user from the headers.
-=======
->>>>>>> bb1ab34... Add auth package.
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
   integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
 
-<<<<<<< HEAD
-graphql-extensions@^0.12.1-alpha.0:
-  version "0.12.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.12.1-alpha.0.tgz#ee6017440e55b6b84bcf2cef746c0df19886e48e"
-  integrity sha512-EmqWxJh0m6d5Hqxg0QVe5VRyihYefnYzA7+E9ejh7BiQ7NzEkX7P820LC4lt9gcQIqnZxNCqvMNyvBZxHnubVg==
-  dependencies:
-    "@apollographql/apollo-tools" "^0.4.3"
-    apollo-server-env "^2.4.4-alpha.0"
-    apollo-server-types "^0.4.1-alpha.0"
-=======
-graphql-extensions@^0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.11.1.tgz#f543f544a047a7a4dd930123f662dfcc01527416"
-  integrity sha512-1bstq6YKaC579PTw9gchw2VlXqjPo3vn8NjRMaUqF2SxyYTjVSgXaCAbaeNa0B7xlLVigxi3DV1zh4A+ss+Lwg==
+graphql-extensions@^0.12.2:
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.12.2.tgz#f22210e812939b7caa2127589f30e6a1c671540f"
+  integrity sha512-vFaZua5aLiCOOzxfY5qzHZ6S52BCqW7VVOwzvV52Wb5edRm3dn6u+1MR9yYyEqUHSf8LvdhEojYlOkKiaQ4ghA==
   dependencies:
     "@apollographql/apollo-tools" "^0.4.3"
-    apollo-server-env "^2.4.3"
-    apollo-server-types "^0.3.1"
->>>>>>> bb1ab34... Add auth package.
+    apollo-server-env "^2.4.4"
+    apollo-server-types "^0.5.0"
 
 graphql-iso-date@^3.6.1:
   version "3.6.1"
@@ -8847,6 +8261,18 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
+gunzip-maybe@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz#b913564ae3be0eda6f3de36464837a9cd94b98ac"
+  integrity sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==
+  dependencies:
+    browserify-zlib "^0.1.4"
+    is-deflate "^1.0.0"
+    is-gzip "^1.0.0"
+    peek-stream "^1.1.0"
+    pumpify "^1.3.3"
+    through2 "^2.0.3"
+
 gzip-size@5.1.1, gzip-size@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
@@ -8860,11 +8286,7 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-<<<<<<< HEAD
 handlebars@^4.7.6:
-=======
-handlebars@^4.4.0:
->>>>>>> bb1ab34... Add auth package.
   version "4.7.6"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
   integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
@@ -9020,6 +8442,13 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
   integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
+hosted-git-info@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.4.tgz#be4973eb1fd2737b11c9c7c19380739bb249f60d"
+  integrity sha512-4oT62d2jwSDBbLLFLZE+1vPuQ1h8p9wjrJ8Mqx5TjsyWmBMV5B13eJqn8pvluqubLf3cJPTfiYCIwNwDNmzScQ==
+  dependencies:
+    lru-cache "^5.1.1"
+
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -9037,11 +8466,7 @@ html-encoding-sniffer@^1.0.2:
   dependencies:
     whatwg-encoding "^1.0.1"
 
-<<<<<<< HEAD
 html-entities@^1.3.1:
-=======
-html-entities@^1.2.1:
->>>>>>> bb1ab34... Add auth package.
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
   integrity sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==
@@ -9052,15 +8477,9 @@ html-escaper@^2.0.0:
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 html-minifier-terser@^5.0.1:
-<<<<<<< HEAD
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
   integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
-=======
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz#95d3df037f04835e9d1a09d1767c0e361a7de916"
-  integrity sha512-tiYE76O1zunboByeB/nFGwUEb263Z3nkNv6Lz2oLC1s6M36bLKfTrjQ+7ssVfaucVllE+N7hh/FbpbxvnIA+LQ==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     camel-case "^4.1.1"
     clean-css "^4.2.3"
@@ -9299,9 +8718,9 @@ ignore@^4.0.3, ignore@^4.0.6:
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
 ignore@^5.1.1, ignore@^5.1.4:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.6.tgz#643194ad4bf2712f37852e386b6998eff0db2106"
-  integrity sha512-cgXgkypZBcCnOgSihyeqbo6gjIaIyDqPQB7Ra4vhE9m6kigdGoQDMHjviFhRZo3IMlRy6yElosoviMs5YxZXUA==
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
 immediate@~3.0.5:
   version "3.0.6"
@@ -9530,7 +8949,7 @@ ip@1.1.5, ip@^1.1.0, ip@^1.1.5:
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
   integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
-ipaddr.js@1.9.1, ipaddr.js@^1.9.0:
+ipaddr.js@1.9.1, ipaddr.js@^1.9.0, ipaddr.js@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
@@ -9614,6 +9033,11 @@ is-date-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
   integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
 
+is-deflate@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-deflate/-/is-deflate-1.0.0.tgz#c862901c3c161fb09dac7cdc7e784f80e98f2f14"
+  integrity sha1-yGKQHDwWH7CdrHzcfnhPgOmPLxQ=
+
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -9700,13 +9124,10 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-installed-globally@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
-  integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==
-  dependencies:
-    global-dirs "^2.0.1"
-    is-path-inside "^3.0.1"
+is-gzip@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-gzip/-/is-gzip-1.0.0.tgz#6ca8b07b99c77998025900e555ced8ed80879a83"
+  integrity sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=
 
 is-installed-globally@^0.3.1:
   version "0.3.2"
@@ -9731,11 +9152,6 @@ is-npm@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
   integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
 
-is-npm@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
-  integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -9812,21 +9228,13 @@ is-promise@^2.1.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
   integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
-<<<<<<< HEAD
-
-is-redirect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
-  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
-=======
->>>>>>> bb1ab34... Add auth package.
 
 is-reference@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.1.4.tgz#3f95849886ddb70256a3e6d062b1a68c13c51427"
-  integrity sha512-uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.0.tgz#d938b0cf85a0df09849417b274f02fb509293599"
+  integrity sha512-ZVxq+5TkOx6GQdnoMm2aRdCKADdcrOWXLGzGT+vIA8DMpqEJaRk5AL1bS80zJ2bjHunVmjdzfCt0e4BymIEqKQ==
   dependencies:
-    "@types/estree" "0.0.39"
+    "@types/estree" "0.0.44"
 
 is-regex@^1.0.4, is-regex@^1.0.5:
   version "1.0.5"
@@ -9907,25 +9315,17 @@ is-yarn-global@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
   integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
-<<<<<<< HEAD
 
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
   integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-=======
->>>>>>> bb1ab34... Add auth package.
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isbinaryfile@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b"
-  integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -10528,14 +9928,13 @@ jsprim@^1.2.2:
     verror "1.10.0"
 
 jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f"
-  integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.3.0.tgz#edd727794ea284d7fda575015ed1b0cde0289ab6"
+  integrity sha512-3HNoc7nZ1hpZIKB3hJ7BlFRkzCx2BynRtfSwbkqZdpRdvAPsGMnzclPwrvDBS7/lalHTj21NwIeaEpysHBOudg==
   dependencies:
-    array-includes "^3.0.3"
+    array-includes "^3.1.1"
     object.assign "^4.1.0"
 
-<<<<<<< HEAD
 jszip@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.3.0.tgz#29d72c21a54990fa885b11fc843db320640d5271"
@@ -10586,8 +9985,6 @@ jws@^3.2.2:
     jwa "^1.4.1"
     safe-buffer "^5.0.1"
 
-=======
->>>>>>> bb1ab34... Add auth package.
 keyv@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
@@ -10629,7 +10026,6 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-<<<<<<< HEAD
 kuler@0.0.x:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-0.0.0.tgz#b66bb46b934e550f59d818848e0abba4f7f5553c"
@@ -10637,19 +10033,6 @@ kuler@0.0.x:
   dependencies:
     colornames "0.0.2"
 
-latest-version@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
-  integrity sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=
-=======
-latest-version@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
-  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
->>>>>>> bb1ab34... Add auth package.
-  dependencies:
-    package-json "^6.3.0"
-
 latest-version@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
@@ -10679,26 +10062,26 @@ lcid@^2.0.0:
     invert-kv "^2.0.0"
 
 lerna@^3.20.2:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.21.0.tgz#c81a0f8df45c6b7c9d3fc9fdcd0f846aca2375c6"
-  integrity sha512-ux8yOwQEgIXOZVUfq+T8nVzPymL19vlIoPbysOP3YA4hcjKlqQIlsjI/1ugBe6b4MF7W4iV5vS3gH9cGqBBc1A==
+  version "3.22.0"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.22.0.tgz#da14d08f183ffe6eec566a4ef3f0e11afa621183"
+  integrity sha512-xWlHdAStcqK/IjKvjsSMHPZjPkBV1lS60PmsIeObU8rLljTepc4Sg/hncw4HWfQxPIewHAUTqhrxPIsqf9L2Eg==
   dependencies:
     "@lerna/add" "3.21.0"
     "@lerna/bootstrap" "3.21.0"
     "@lerna/changed" "3.21.0"
     "@lerna/clean" "3.21.0"
     "@lerna/cli" "3.18.5"
-    "@lerna/create" "3.21.0"
+    "@lerna/create" "3.22.0"
     "@lerna/diff" "3.21.0"
     "@lerna/exec" "3.21.0"
-    "@lerna/import" "3.21.0"
+    "@lerna/import" "3.22.0"
     "@lerna/info" "3.21.0"
     "@lerna/init" "3.21.0"
     "@lerna/link" "3.21.0"
     "@lerna/list" "3.21.0"
-    "@lerna/publish" "3.21.0"
+    "@lerna/publish" "3.22.0"
     "@lerna/run" "3.21.0"
-    "@lerna/version" "3.21.0"
+    "@lerna/version" "3.22.0"
     import-local "^2.0.0"
     npmlog "^4.1.2"
 
@@ -10970,6 +10353,11 @@ lodash.isboolean@^3.0.3:
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
   integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
 
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
 lodash.isinteger@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
@@ -11076,11 +10464,7 @@ logical-not@^1.0.0:
   resolved "https://registry.yarnpkg.com/logical-not/-/logical-not-1.0.0.tgz#3149848c0cce1fea1f76a0e45725c7bcdb33a627"
   integrity sha512-l3X5Sf25wwZkprKfrfJ2YjCcxkNnitMvuqoVPAFNz1xpAMG7B4CkdELK19hafcR8K9fcUs0K0LkzZ62U+xdHpA==
 
-<<<<<<< HEAD
 loglevel@^1.6.7, loglevel@^1.6.8:
-=======
-loglevel@^1.6.6, loglevel@^1.6.7:
->>>>>>> bb1ab34... Add auth package.
   version "1.6.8"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
   integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
@@ -11128,17 +10512,14 @@ lowercase-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
-<<<<<<< HEAD
 
-lru-cache@^4.0.0, lru-cache@^4.0.1:
+lru-cache@^4.0.0:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
-=======
->>>>>>> bb1ab34... Add auth package.
 
 lru-cache@^5.0.0, lru-cache@^5.1.1:
   version "5.1.1"
@@ -11169,10 +10550,11 @@ macos-release@^2.2.0:
   integrity sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==
 
 magic-sdk@^1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/magic-sdk/-/magic-sdk-1.3.5.tgz#edfe7a3562a8b1242746759643651a6c0929bfda"
-  integrity sha512-vF9hRkn2uHtCOXb7HU5CecZoVAP51OviCUyMX1XjhPrfdAB5ndH74b0Od70MW6GsMUdCoU1oYz6mp7U4D19xUg==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/magic-sdk/-/magic-sdk-1.4.0.tgz#f5a50353d1469b4c8d9311ff2cd8a6fe59bd00f8"
+  integrity sha512-PLa5YgtC6RhdM2U/Ljd4vh4mpY6N6PltIYfIoL7DvLOEnqSribpY1ijXrLANStXKhN2cppvgDfYCqyUriXOi6Q==
   dependencies:
+    eventemitter3 "^4.0.4"
     react-native-webview "^8.1.2"
     snyk "^1.319.1"
     whatwg-url "^8.0.0"
@@ -11484,14 +10866,11 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-<<<<<<< HEAD
 millisecond@0.1.x:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/millisecond/-/millisecond-0.1.2.tgz#6cc5ad386241cab8e78aff964f87028eec92dac5"
   integrity sha1-bMWtOGJByrjniv+WT4cCjuyS2sU=
 
-=======
->>>>>>> bb1ab34... Add auth package.
 mime-db@1.44.0, "mime-db@>= 1.43.0 < 2":
   version "1.44.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
@@ -11510,9 +10889,9 @@ mime@1.6.0:
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.4.4:
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.5.tgz#d8de2ecb92982dedbb6541c9b6841d7f218ea009"
-  integrity sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
+  integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
@@ -11530,9 +10909,9 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
 min-indent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.0.tgz#cfc45c37e9ec0d8f0a0ec3dd4ef7f7c3abe39256"
-  integrity sha1-z8RcN+nsDY8KDsPdTvf3w6vjklY=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
 mini-css-extract-plugin@^0.9.0:
   version "0.9.0"
@@ -11649,11 +11028,7 @@ mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-<<<<<<< HEAD
 mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@~0.5.1:
-=======
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
->>>>>>> bb1ab34... Add auth package.
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -11804,10 +11179,10 @@ ncp@~2.0.0:
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
   integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
 
-needle@^2.2.4, needle@^2.3.3, needle@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a"
-  integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==
+needle@^2.3.3, needle@^2.4.0, needle@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz#e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0"
+  integrity sha512-o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA==
   dependencies:
     debug "^3.2.6"
     iconv-lite "^0.4.4"
@@ -11879,9 +11254,9 @@ node-forge@0.9.0:
   integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==
 
 node-gyp@^5.0.2:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.0.tgz#8e31260a7af4a2e2f994b0673d4e0b3866156332"
-  integrity sha512-OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz#eb915f7b631c937d282e33aed44cb7a025f62a3e"
+  integrity sha512-WH0WKGi+a4i4DUt2mHnvocex/xPLp9pYt5R6M2JdFB7pJ7Z34hveZ4nDTGTiLXCkitA9T8HFZjhinBCiVHYcWw==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
@@ -11946,25 +11321,14 @@ node-notifier@^6.0.0:
     which "^1.3.1"
 
 node-releases@^1.1.29, node-releases@^1.1.53:
-<<<<<<< HEAD
-  version "1.1.56"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.56.tgz#bc054a417d316e3adac90eafb7e1932802f28705"
-  integrity sha512-EVo605FhWLygH8a64TjgpjyHYOihkxECwX1bHHr8tETJKWEiWS2YJjPbvsX2jFjnjTNEgBCmk9mLjKG1Mf11cw==
+  version "1.1.57"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.57.tgz#f6754ce225fad0611e61228df3e09232e017ea19"
+  integrity sha512-ZQmnWS7adi61A9JsllJ2gdj2PauElcjnOwTp2O011iGzoakTxUsDGSe+6vD7wXbKdqhSFymC0OSx35aAMhrSdw==
 
 nodemon@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.4.tgz#55b09319eb488d6394aa9818148c0c2d1c04c416"
   integrity sha512-Ltced+hIfTmaS28Zjv1BM552oQ3dbwPqI4+zI0SLgq+wpJhSyqgYude/aZa/3i31VCQWMfXJVxvu86abcam3uQ==
-=======
-  version "1.1.53"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
-  integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
-
-nodemon@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.3.tgz#e9c64df8740ceaef1cb00e1f3da57c0a93ef3714"
-  integrity sha512-lLQLPS90Lqwc99IHe0U94rDgvjo+G9I4uEIxRG3evSLROcqQ9hwc0AxlSHKS4T1JW/IMj/7N5mthiN58NL/5kw==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     chokidar "^3.2.2"
     debug "^3.2.6"
@@ -12164,11 +11528,6 @@ object-filter@^1.0.2:
   resolved "https://registry.yarnpkg.com/object-filter/-/object-filter-1.0.2.tgz#af0b797ffebeaf8a52c6637cedbe8816cfec1bc8"
   integrity sha1-rwt5f/6+r4pSxmN87b6IFs/sG8g=
 
-object-hash@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
-  integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
-
 object-hash@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz#d12db044e03cd2ca3d77c0570d87225b02e1e6ea"
@@ -12548,7 +11907,6 @@ p-waterfall@^1.0.0:
   dependencies:
     p-reduce "^1.0.0"
 
-<<<<<<< HEAD
 pac-proxy-agent@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.1.tgz#115b1e58f92576cac2eba718593ca7b0e37de2ad"
@@ -12574,31 +11932,20 @@ pac-resolver@^3.0.0:
     netmask "^1.0.6"
     thunkify "^2.1.2"
 
-package-json@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
-  integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=
-=======
 package-json@^6.3.0:
   version "6.5.0"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
   integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     got "^9.6.0"
     registry-auth-token "^4.0.0"
     registry-url "^5.0.0"
     semver "^6.2.0"
 
-package-json@^6.3.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
-  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
-  dependencies:
-    got "^9.6.0"
-    registry-auth-token "^4.0.0"
-    registry-url "^5.0.0"
-    semver "^6.2.0"
+pako@~0.2.0:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+  integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
 
 pako@~1.0.2, pako@~1.0.5:
   version "1.0.11"
@@ -12818,6 +12165,15 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+peek-stream@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/peek-stream/-/peek-stream-1.1.3.tgz#3b35d84b7ccbbd262fff31dc10da56856ead6d67"
+  integrity sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==
+  dependencies:
+    buffer-from "^1.0.0"
+    duplexify "^3.5.0"
+    through2 "^2.0.3"
+
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
@@ -12912,11 +12268,7 @@ pn@^1.1.0:
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
   integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
 
-<<<<<<< HEAD
 portfinder@^1.0.26:
-=======
-portfinder@^1.0.25:
->>>>>>> bb1ab34... Add auth package.
   version "1.0.26"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz#475658d56ca30bed72ac7f1378ed350bd1b64e70"
   integrity sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==
@@ -12978,15 +12330,9 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.3:
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
 postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6:
-<<<<<<< HEAD
-  version "7.0.30"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz#cc9378beffe46a02cbc4506a0477d05fcea9a8e2"
-  integrity sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==
-=======
-  version "7.0.28"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.28.tgz#d349ced7743475717ba91f6810efb58c51fb5dbb"
-  integrity sha512-YU6nVhyWIsVtlNlnAj1fHTsUKW5qxm3KEgzq2Jj6KTEFOTK8QWR12eIDvrlWhiSTK8WIBFTBhOJV4DY6dUuEbw==
->>>>>>> bb1ab34... Add auth package.
+  version "7.0.31"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.31.tgz#332af45cb73e26c0ee2614d7c7fb02dfcc2bd6dd"
+  integrity sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -13021,23 +12367,7 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-prettier@^1.19.1:
-=======
-prettier@^1.18.2:
->>>>>>> 7e8f41a... extract transform from service, get it working with SDL
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
-  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
-
-=======
->>>>>>> 89ef31d... real world testing updates
 prettier@^2.0.1, prettier@^2.0.2, prettier@^2.0.5:
-=======
-prettier@^2.0.1, prettier@^2.0.2:
->>>>>>> bb1ab34... Add auth package.
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
   integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
@@ -13103,7 +12433,6 @@ promise-retry@^1.1.1:
     err-code "^1.0.0"
     retry "^0.10.0"
 
-<<<<<<< HEAD
 "promise@>=3.2 <8":
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -13112,9 +12441,6 @@ promise-retry@^1.1.1:
     asap "~2.0.3"
 
 prompts@^2.0.1, prompts@^2.3.0:
-=======
-prompts@^2.0.1:
->>>>>>> bb1ab34... Add auth package.
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"
   integrity sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==
@@ -13167,7 +12493,6 @@ proxy-addr@~2.0.5:
   dependencies:
     forwarded "~0.1.2"
     ipaddr.js "1.9.1"
-<<<<<<< HEAD
 
 proxy-agent@^3.1.1:
   version "3.1.1"
@@ -13187,22 +12512,17 @@ proxy-from-env@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
-=======
->>>>>>> bb1ab34... Add auth package.
 
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
-<<<<<<< HEAD
 pseudomap@^1.0.1, pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
-=======
->>>>>>> bb1ab34... Add auth package.
 psl@^1.1.28:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
@@ -13360,7 +12680,6 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-<<<<<<< HEAD
 raw-body@^2.2.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.1.tgz#30ac82f98bb5ae8c152e67149dac8d55153b168c"
@@ -13371,10 +12690,7 @@ raw-body@^2.2.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-rc@^1.0.1, rc@^1.1.6, rc@^1.2.8:
-=======
 rc@^1.2.8:
->>>>>>> bb1ab34... Add auth package.
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -13431,21 +12747,14 @@ react-error-overlay@^6.0.1, react-error-overlay@^6.0.3:
   integrity sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA==
 
 react-hook-form@^5.1.3:
-<<<<<<< HEAD
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-5.7.2.tgz#a84e259e5d37dd30949af4f79c4dac31101b79ac"
   integrity sha512-bJvY348vayIvEUmSK7Fvea/NgqbT2racA2IbnJz/aPlQ3GBtaTeDITH6rtCa6y++obZzG6E3Q8VuoXPir7QYUg==
-=======
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-5.6.1.tgz#8b6017ec01731bde4f6a6bcd94955ff5e69e28cc"
-  integrity sha512-pqlAiWyZqngdEVUinxPSmhs9k2L/ETsTf8LU7wfwrE1bXJnslRsb4aKlYiL2z0bgGrCuksN8el5bxFbnR1/qEA==
->>>>>>> bb1ab34... Add auth package.
 
 react-is@^16.12.0, react-is@^16.8.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-<<<<<<< HEAD
 
 react-native-webview@^8.1.2:
   version "8.2.1"
@@ -13455,8 +12764,6 @@ react-native-webview@^8.1.2:
     escape-string-regexp "2.0.0"
     invariant "2.2.4"
     rnpm-plugin-windows "^0.5.1-0"
-=======
->>>>>>> bb1ab34... Add auth package.
 
 react@^16.13.1:
   version "16.13.1"
@@ -13594,7 +12901,6 @@ read@1, read@~1.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-<<<<<<< HEAD
 readable-stream@1.1.x:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
@@ -13605,9 +12911,7 @@ readable-stream@1.1.x:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-=======
->>>>>>> bb1ab34... Add auth package.
-"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
+"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -13748,27 +13052,6 @@ registry-auth-token@^4.0.0:
   dependencies:
     rc "^1.2.8"
 
-<<<<<<< HEAD
-registry-auth-token@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.1.1.tgz#40a33be1e82539460f94328b0f7f0f84c16d9479"
-  integrity sha512-9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA==
-  dependencies:
-    rc "^1.2.8"
-
-registry-url@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
-  integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI=
-=======
-registry-url@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
-  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
->>>>>>> bb1ab34... Add auth package.
-  dependencies:
-    rc "^1.2.8"
-
 registry-url@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
@@ -13777,9 +13060,9 @@ registry-url@^5.0.0:
     rc "^1.2.8"
 
 regjsgen@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
-  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
+  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
 
 regjsparser@^0.6.4:
   version "0.6.4"
@@ -14169,11 +13452,12 @@ schema-utils@^1.0.0:
     ajv-keywords "^3.1.0"
 
 schema-utils@^2.6.5, schema-utils@^2.6.6:
-  version "2.6.6"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz#299fe6bd4a3365dc23d99fd446caff8f1d6c330c"
-  integrity sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
+  integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
   dependencies:
-    ajv "^6.12.0"
+    "@types/json-schema" "^7.0.4"
+    ajv "^6.12.2"
     ajv-keywords "^3.4.1"
 
 secure-keys@^1.0.0:
@@ -14207,18 +13491,7 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-<<<<<<< HEAD
-semver-diff@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
-  integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==
-  dependencies:
-    semver "^6.3.0"
-
-"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
-=======
 "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
->>>>>>> bb1ab34... Add auth package.
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -14493,52 +13766,63 @@ snyk-config@^3.0.0:
     lodash.merge "^4.6.2"
     nconf "^0.10.0"
 
-snyk-docker-plugin@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-3.2.0.tgz#5fb1cf045e45b4a3cfcdc9878ab29c80334d9742"
-  integrity sha512-LKsvGcRVBYzyTNT/Z5kImm6uHMX3wAs7gvR4dO8zqBVzCsn3zfi//kmRHWh7zhgvIb6reuhUqY1hMXaz0q/mBw==
+snyk-docker-plugin@3.6.3:
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-3.6.3.tgz#91d52417a4de010071b739d8900e3f0f7a98ab98"
+  integrity sha512-+9pQc9+tetzMiUIV42WA3LAUkrZh6hhkhURv1X4kKyo2c1C8PSbCmpvycx/irilzfmH7dqBv0RXmb4vONPBXHA==
   dependencies:
     "@snyk/rpm-parser" "^1.1.0"
     debug "^4.1.1"
+    docker-modem "2.1.3"
     dockerfile-ast "0.0.19"
     event-loop-spinner "^1.1.0"
+    gunzip-maybe "^1.4.2"
     semver "^6.1.0"
     snyk-nodejs-lockfile-parser "1.22.0"
     tar-stream "^2.1.0"
     tslib "^1"
 
-snyk-go-parser@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/snyk-go-parser/-/snyk-go-parser-1.4.0.tgz#0fa7e4b9f2cf14c95dbc09206416ac4676436c70"
-  integrity sha512-zcLA8u/WreycCjFKBblYfxszg7Fmnemuu9Ug/CE/jqF0yBXsI5DCWMteUvFkoa8DRntfGTlgf98TRl2aTSc2MQ==
+snyk-go-parser@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/snyk-go-parser/-/snyk-go-parser-1.4.1.tgz#df16a5fbd7a517ee757268ef081abc33506c8857"
+  integrity sha512-StU3uHB85VMEkcgXta63M0Fgd+9cs5sMCjQXTBoYTdE4dxarPn7U67yCuwkRRdZdny1ZXtzfY8LKns9i0+dy9w==
   dependencies:
     toml "^3.0.0"
     tslib "^1.10.0"
 
-snyk-go-plugin@1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.14.0.tgz#a96c3c09ea1728807158c52dd2d9a6d650617a82"
-  integrity sha512-9L+76De8F6yXWb+O3DA8QUi7+eDF2mOzCOveEPUJGkqWIDmurIiFcVxHJoj0EStjcxb3dX367KKlDlfFx+HiyA==
+snyk-go-plugin@1.14.2:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.14.2.tgz#03adb93ac28e21f9da03b444d0e06ee4b71c55ad"
+  integrity sha512-r/uaM3gk/RF7m/VGYswxlnA6I+kMgK3eVPsPyf7400BhqF8noh8K7v10CEg67mHA4JM0l7dZASqejr/5kKw9ZQ==
   dependencies:
     "@snyk/graphlib" "2.1.9-patch"
     debug "^4.1.1"
-    snyk-go-parser "1.4.0"
+    snyk-go-parser "1.4.1"
     tmp "0.1.0"
     tslib "^1.10.0"
 
-snyk-gradle-plugin@3.2.7:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.2.7.tgz#3a4f37afeac00407d7051891a0e3ee4d69f6866f"
-  integrity sha512-fBgQpRwfuHGuPvYGEjgNBtuwnkNAV9sv17lG+eWdQO3ntkAKnt1RyzQydAdffK2e8339XM6Mg/1EPYuIGIY3TA==
+snyk-gradle-plugin@3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.3.4.tgz#555e1a887cadb4d727eebf65e715d27ce598a8f1"
+  integrity sha512-vUHCpBxTzutuk6IB8VGGgGcvt6c7h6SakKLTCZBjpb3ssRPvWUEVDix7xrKwJt5sea+KB/WIVeRzlHuecfjvIw==
   dependencies:
     "@snyk/cli-interface" "2.3.2"
+    "@snyk/dep-graph" "^1.17.0"
     "@types/debug" "^4.1.4"
-    chalk "^2.4.2"
+    chalk "^3.0.0"
     debug "^4.1.1"
-    tmp "0.0.33"
-    tslib "^1.9.3"
+    tmp "0.2.1"
+    tslib "^2.0.0"
+
+snyk-module@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-3.1.0.tgz#3e088ff473ddf0d4e253a46ea6749d76d8e6e7ba"
+  integrity sha512-HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw==
+  dependencies:
+    debug "^4.1.1"
+    hosted-git-info "^3.0.4"
 
-snyk-module@1.9.1, snyk-module@^1.6.0:
+snyk-module@^1.6.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-1.9.1.tgz#b2a78f736600b0ab680f1703466ed7309c980804"
   integrity sha512-A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA==
@@ -14695,40 +13979,38 @@ snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1:
     then-fs "^2.0.0"
 
 snyk@^1.319.1:
-  version "1.321.0"
-  resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.321.0.tgz#b4de326eb3ffac7ca02d450e70be598be446293f"
-  integrity sha512-0uczPo7A/XD5g8HZwfmO3kwp4QUtuuHelg97O9JcnfLT7Hh6RoyJuuBdEmIECgdCIFZXVV9kAfMAAs6hpgOXsA==
+  version "1.332.1"
+  resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.332.1.tgz#3fa8e6e688bb2c367527bdbab7af529e43398a48"
+  integrity sha512-hJoHlAQi4KfNll5pDiUy+1LacbJTZQjOk4bSGgE2cURyMHqJAV0mOPKe2zCr9AYYCVaVB4ZvLtV55+u06JS7KQ==
   dependencies:
     "@snyk/cli-interface" "2.6.0"
-    "@snyk/configstore" "^3.2.0-rc1"
     "@snyk/dep-graph" "1.18.3"
     "@snyk/gemfile" "1.2.0"
     "@snyk/graphlib" "2.1.9-patch"
     "@snyk/inquirer" "6.2.2-patch"
     "@snyk/lodash" "^4.17.15-patch"
     "@snyk/ruby-semver" "2.2.0"
-    "@snyk/snyk-cocoapods-plugin" "2.2.0"
-    "@snyk/update-notifier" "^2.5.1-rc2"
-    "@types/agent-base" "^4.2.0"
+    "@snyk/snyk-cocoapods-plugin" "2.3.0"
     abbrev "^1.1.1"
     ansi-escapes "3.2.0"
     chalk "^2.4.2"
     cli-spinner "0.2.10"
+    configstore "^5.0.1"
     debug "^3.1.0"
     diff "^4.0.1"
-    git-url-parse "11.1.2"
     glob "^7.1.3"
-    needle "^2.2.4"
+    ipaddr.js "^1.9.1"
+    needle "^2.5.0"
     open "^7.0.3"
     os-name "^3.0.0"
     proxy-agent "^3.1.1"
     proxy-from-env "^1.0.0"
     semver "^6.0.0"
     snyk-config "3.1.0"
-    snyk-docker-plugin "3.2.0"
-    snyk-go-plugin "1.14.0"
-    snyk-gradle-plugin "3.2.7"
-    snyk-module "1.9.1"
+    snyk-docker-plugin "3.6.3"
+    snyk-go-plugin "1.14.2"
+    snyk-gradle-plugin "3.3.4"
+    snyk-module "3.1.0"
     snyk-mvn-plugin "2.15.2"
     snyk-nodejs-lockfile-parser "1.22.0"
     snyk-nuget-plugin "1.18.1"
@@ -14744,6 +14026,7 @@ snyk@^1.319.1:
     strip-ansi "^5.2.0"
     tempfile "^2.0.0"
     then-fs "^2.0.0"
+    update-notifier "^4.1.0"
     uuid "^3.3.2"
     wrap-ansi "^5.1.0"
 
@@ -14814,11 +14097,7 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-<<<<<<< HEAD
 source-map-support@^0.5.11, source-map-support@^0.5.16, source-map-support@^0.5.19, source-map-support@^0.5.6, source-map-support@^0.5.7, source-map-support@~0.5.12:
-=======
-source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12:
->>>>>>> bb1ab34... Add auth package.
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -14894,11 +14173,7 @@ spdy-transport@^3.0.0:
     readable-stream "^3.0.6"
     wbuf "^1.7.3"
 
-<<<<<<< HEAD
 spdy@^4.0.2:
-=======
-spdy@^4.0.1:
->>>>>>> bb1ab34... Add auth package.
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
   integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
@@ -14909,6 +14184,11 @@ spdy@^4.0.1:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
+split-ca@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/split-ca/-/split-ca-1.0.1.tgz#6c83aff3692fa61256e0cd197e05e9de157691a6"
+  integrity sha1-bIOv82kvphJW4M0ZfgXp3hV2kaY=
+
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -14935,6 +14215,22 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
+ssh2-streams@~0.4.10:
+  version "0.4.10"
+  resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.4.10.tgz#48ef7e8a0e39d8f2921c30521d56dacb31d23a34"
+  integrity sha512-8pnlMjvnIZJvmTzUIIA5nT4jr2ZWNNVHwyXfMGdRJbug9TpI3kd99ffglgfSWqujVv/0gxwMsDn9j9RVst8yhQ==
+  dependencies:
+    asn1 "~0.2.0"
+    bcrypt-pbkdf "^1.0.2"
+    streamsearch "~0.1.2"
+
+ssh2@^0.8.7:
+  version "0.8.9"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.9.tgz#54da3a6c4ba3daf0d8477a538a481326091815f3"
+  integrity sha512-GmoNPxWDMkVpMFa9LVVzQZHF6EW3WKmBwL+4/GeILf2hFmix5Isxm7Amamo8o7bHiU0tC+wXsGcUXOxp8ChPaw==
+  dependencies:
+    ssh2-streams "~0.4.10"
+
 sshpk@^1.7.0:
   version "1.16.1"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
@@ -15012,7 +14308,7 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
-streamsearch@0.1.2:
+streamsearch@0.1.2, streamsearch@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
   integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=
@@ -15044,7 +14340,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.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -15255,15 +14551,9 @@ subscriptions-transport-ws@^0.9.11:
     ws "^5.2.0"
 
 sucrase@^3.10.1:
-<<<<<<< HEAD
   version "3.15.0"
   resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.15.0.tgz#78596a78be7264a65b52ed8d873883413ef0220c"
   integrity sha512-05TJOUfMgckH7wKqfk/1p4G6q16nIeW/GHQwD44vkT0mQMqqzgfHCwkX3whNmwyOo7nVF0jDLwVu/qOBTtsscw==
-=======
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.13.0.tgz#68eb000dea32dd2ec84b91de97c76dcb83a1a2ff"
-  integrity sha512-koXmWc8Iq8q7quNJ9v/TuDIRBeGul1D+QL36PnfzFvYFoQbWcYpSmpJElpSM+eCa0nFthyQqgCGrEKAepnFMtQ==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     commander "^4.0.0"
     glob "7.1.6"
@@ -15448,11 +14738,6 @@ term-size@^2.1.0:
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753"
   integrity sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==
 
-term-size@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753"
-  integrity sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==
-
 terminal-link@^2.0.0, terminal-link@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
@@ -15477,15 +14762,9 @@ terser-webpack-plugin@^1.4.3:
     worker-farm "^1.7.0"
 
 terser@^4.1.2, terser@^4.6.3:
-<<<<<<< HEAD
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.7.0.tgz#15852cf1a08e3256a80428e865a2fa893ffba006"
   integrity sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==
-=======
-  version "4.6.13"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.13.tgz#e879a7364a5e0db52ba4891ecde007422c56a916"
-  integrity sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -15541,7 +14820,7 @@ throat@^5.0.0:
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
   integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
 
-through2@^2.0.0, through2@^2.0.2:
+through2@^2.0.0, through2@^2.0.2, through2@^2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -15592,6 +14871,13 @@ tmp@0.1.0, tmp@^0.1.0:
   dependencies:
     rimraf "^2.6.3"
 
+tmp@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+  dependencies:
+    rimraf "^3.0.0"
+
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
@@ -15744,7 +15030,6 @@ ts-invariant@^0.4.0, ts-invariant@^0.4.4:
   dependencies:
     tslib "^1.9.3"
 
-<<<<<<< HEAD
 tslib@1.11.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
@@ -15754,12 +15039,11 @@ tslib@^1, tslib@^1.10.0, tslib@^1.11.1, tslib@^1.11.2, tslib@^1.8.1, tslib@^1.9.
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
   integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
-=======
-tslib@1.11.1, tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
-  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
->>>>>>> bb1ab34... Add auth package.
+
+tslib@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3"
+  integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==
 
 tsutils@^3.17.1:
   version "3.17.1"
@@ -15847,21 +15131,15 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.8.3, typescript@^3.8.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
-  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
+typescript@^3.8.3:
+  version "3.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a"
+  integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==
 
 uglify-js@^3.1.4:
-<<<<<<< HEAD
-  version "3.9.3"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.3.tgz#4a285d1658b8a2ebaef9e51366b3a0f7acd79ec2"
-  integrity sha512-r5ImcL6QyzQGVimQoov3aL2ZScywrOgBXGndbWrdehKoSvGe/RmiE5Jpw/v+GvxODt6l2tpBXwA7n+qZVlHBMA==
-=======
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.2.tgz#012b74fb6a2e440d9ba1f79110a479d3b1f2d48d"
-  integrity sha512-zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q==
->>>>>>> bb1ab34... Add auth package.
+  version "3.9.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.4.tgz#867402377e043c1fc7b102253a22b64e5862401b"
+  integrity sha512-8RZBJq5smLOa7KslsNsVcSH+KOXf1uDU8yqLeNuVKwmT0T3FA0ZoXlinQfRad7SDcbZZRZE4ov+2v71EnxNyCA==
   dependencies:
     commander "~2.20.3"
 
@@ -15876,9 +15154,9 @@ umask@^1.1.0:
   integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
 
 unbzip2-stream@^1.0.9:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz#84eb9e783b186d8fb397515fbb656f312f1a7dbf"
-  integrity sha512-pZMVAofMrrHX6Ik39hCk470kulCbmZ2SWfQLPmTWqfJV/oUm0gn1CblvHdUu4+54Je6Jq34x8kY6XjTy6dMkOg==
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
+  integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==
   dependencies:
     buffer "^5.2.1"
     through "^2.3.8"
@@ -15890,15 +15168,12 @@ undefsafe@^2.0.2:
   dependencies:
     debug "^2.2.0"
 
-<<<<<<< HEAD
-undici@mcollina/undici:
+"undici@github:mcollina/undici":
   version "0.5.0"
-  resolved "https://codeload.github.com/mcollina/undici/tar.gz/6c3d7eed592cab9c4b63d56164ecd3cc9358945a"
+  resolved "https://codeload.github.com/mcollina/undici/tar.gz/2fd3d84e4a47ba158e4c0af707ffeb1b7b17137e"
   dependencies:
     http-parser-js "^0.5.2"
 
-=======
->>>>>>> bb1ab34... Add auth package.
 unfetch@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.1.0.tgz#6ec2dd0de887e58a4dee83a050ded80ffc4137db"
@@ -16007,7 +15282,7 @@ upath@^1.1.1, upath@^1.2.0:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-update-notifier@^4.0.0:
+update-notifier@^4.0.0, update-notifier@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz#4866b98c3bc5b5473c020b1250583628f9a328f3"
   integrity sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==
@@ -16054,13 +15329,6 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
-url-parse-lax@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
-  dependencies:
-    prepend-http "^2.0.0"
-
 url-parse@^1.4.3, url-parse@^1.4.7:
   version "1.4.7"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
@@ -16151,6 +15419,11 @@ uuid@^7.0.3:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
   integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
 
+uuid@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d"
+  integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==
+
 v8-compile-cache@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
@@ -16162,15 +15435,9 @@ v8-compile-cache@^2.0.3:
   integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
 
 v8-to-istanbul@^4.1.3:
-<<<<<<< HEAD
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz#b97936f21c0e2d9996d4985e5c5156e9d4e49cd6"
   integrity sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ==
-=======
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz#22fe35709a64955f49a08a7c7c959f6520ad6f20"
-  integrity sha512-sAjOC+Kki6aJVbUOXJbcR0MnbfjvBzwKZazEJymA2IX49uoOdEdk+4fBq5cXgYgiyKtAyrrJNtBZdOeDIF+Fng==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
@@ -16250,7 +15517,6 @@ walker@^1.0.7, walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-<<<<<<< HEAD
 watchpack-chokidar2@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"
@@ -16263,14 +15529,6 @@ watchpack@^1.6.1:
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz#c02e4d4d49913c3e7e122c3325365af9d331e9aa"
   integrity sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==
   dependencies:
-=======
-watchpack@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2"
-  integrity sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==
-  dependencies:
-    chokidar "^2.1.8"
->>>>>>> bb1ab34... Add auth package.
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
   optionalDependencies:
@@ -16302,15 +15560,9 @@ webidl-conversions@^5.0.0:
   integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
 
 webpack-bundle-analyzer@^3.6.1:
-<<<<<<< HEAD
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz#ce6b3f908daf069fd1f7266f692cbb3bded9ba16"
   integrity sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==
-=======
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.7.0.tgz#84da434e89442899b884d9ad38e466d0db02a56f"
-  integrity sha512-mETdjZ30a3Yf+NTB/wqTgACK7rAYQl5uxKK0WVTNmF0sM3Uv8s3R58YZMW7Rhu0Lk2Rmuhdj5dcH5Q76zCDVdA==
->>>>>>> bb1ab34... Add auth package.
   dependencies:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
@@ -16534,13 +15786,6 @@ widest-line@^3.1.0:
   dependencies:
     string-width "^4.0.0"
 
-widest-line@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
-  integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==
-  dependencies:
-    string-width "^4.0.0"
-
 window-size@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
@@ -16699,20 +15944,9 @@ ws@^6.0.0, ws@^6.2.1:
     async-limiter "~1.0.0"
 
 ws@^7.0.0:
-<<<<<<< HEAD
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz#4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd"
   integrity sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==
-=======
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d"
-  integrity sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==
->>>>>>> bb1ab34... Add auth package.
-
-xdg-basedir@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
-  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
 xdg-basedir@^4.0.0:
   version "4.0.0"
@@ -16789,14 +16023,11 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-<<<<<<< HEAD
 yallist@^2.0.0, yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-=======
->>>>>>> bb1ab34... Add auth package.
 yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
@@ -16808,17 +16039,9 @@ yallist@^4.0.0:
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
 yaml@^1.7.2:
-<<<<<<< HEAD
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
   integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
-=======
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.9.2.tgz#f0cfa865f003ab707663e4f04b3956957ea564ed"
-  integrity sha512-HPT7cGGI0DuRcsO51qC1j9O16Dh1mZ2bnXwsi0jrSpsLz0WxOLSLXfkABVl6bZO629py3CU+OMJtpNHDLB97kg==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
->>>>>>> bb1ab34... Add auth package.
 
 yargs-parser@^10.0.0:
   version "10.1.0"
@@ -16827,17 +16050,6 @@ yargs-parser@^10.0.0:
   dependencies:
     camelcase "^4.1.0"
 
-<<<<<<< HEAD
-=======
-yargs-parser@^11.1.1:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
-  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
->>>>>>> bb1ab34... Add auth package.
 yargs-parser@^13.1.0, yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
@@ -16854,11 +16066,7 @@ yargs-parser@^15.0.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-<<<<<<< HEAD
 yargs-parser@^18.1.1, yargs-parser@^18.1.3:
-=======
-yargs-parser@^18.1.1:
->>>>>>> bb1ab34... Add auth package.
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
   integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
@@ -16883,11 +16091,7 @@ yargs@13.2.4:
     y18n "^4.0.0"
     yargs-parser "^13.1.0"
 
-<<<<<<< HEAD
 yargs@^13.3.0, yargs@^13.3.2:
-=======
-yargs@^13.3.0:
->>>>>>> bb1ab34... Add auth package.
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
   integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==

From dbb04434b2f105e9f416174cec2f6eddf1b9d732 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Sat, 30 May 2020 14:36:53 -0400
Subject: [PATCH 23/25] fix regressions from template changes

---
 .../__tests__/fixtures/assets/scaffold.css    | 498 +++++++-----------
 .../fixtures/components/foreignKeys/edit.js   |   8 +-
 .../__tests__/fixtures/components/form.js     |   5 +-
 .../fixtures/components/indexCell.js          |   5 +-
 .../__tests__/fixtures/components/show.js     |  48 +-
 .../__tests__/fixtures/layouts/layout.js      |  10 +-
 6 files changed, 227 insertions(+), 347 deletions(-)

diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/assets/scaffold.css b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/assets/scaffold.css
index aed2eec96c50..b2d02eda61a2 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/assets/scaffold.css
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/assets/scaffold.css
@@ -2,45 +2,32 @@
   normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css
 */
 
-.rw-scaffold main {
-  display: block;
-}
-.rw-scaffold h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
-.rw-scaffold a {
-  background-color: transparent;
-}
-.rw-scaffold input {
-  font-family: inherit;
-  font-size: 100%;
-  line-height: 1.15;
-  margin: 0;
-}
-.rw-scaffold input {
-  overflow: visible;
-}
 .rw-scaffold *,
 .rw-scaffold ::after,
 .rw-scaffold ::before {
   box-sizing: inherit;
+  border-width: 0;
+  border-style: solid;
+  border-color: #e2e8f0;
+}
+.rw-scaffold main {
+  display: block;
 }
 .rw-scaffold h1,
 .rw-scaffold h2 {
   margin: 0;
 }
+.rw-scaffold a {
+  background-color: transparent;
+}
 .rw-scaffold ul {
-  list-style: none;
   margin: 0;
   padding: 0;
 }
-.rw-scaffold *,
-.rw-scaffold ::after,
-.rw-scaffold ::before {
-  border-width: 0;
-  border-style: solid;
-  border-color: #e2e8f0;
+.rw-scaffold input {
+  font-family: inherit;
+  font-size: 100%;
+  overflow: visible;
 }
 .rw-scaffold input:-ms-input-placeholder {
   color: #a0aec0;
@@ -54,352 +41,257 @@
 .rw-scaffold table {
   border-collapse: collapse;
 }
-.rw-scaffold h1,
-.rw-scaffold .rw-scaffold h2 {
-  font-size: inherit;
-  font-weight: inherit;
-}
-.rw-scaffold a {
-  color: inherit;
-  text-decoration: inherit;
-}
-.rw-scaffold input {
-  padding: 0;
-  line-height: inherit;
-  color: inherit;
-}
 
 /*
   Style
 */
 
-.rw-scaffold .bg-white {
+.rw-scaffold {
   background-color: #fff;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+    'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji',
+    'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
 }
-.rw-scaffold .bg-gray-100 {
-  background-color: #f7fafc;
+.rw-header {
+  display: flex;
+  justify-content: space-between;
+  padding: 1rem 2rem 1rem 2rem;
 }
-.rw-scaffold .bg-gray-300 {
-  background-color: #e2e8f0;
+.rw-main {
+  margin-left: 1rem;
+  margin-right: 1rem;
+  padding-bottom: 1rem;
 }
-.rw-scaffold .bg-red-100 {
-  background-color: #fff5f5;
+.rw-segment {
+  background-color: #fff;
+  border-width: 1px;
+  border-radius: 0.5rem;
+  overflow: hidden;
 }
-.rw-scaffold .bg-red-600 {
-  background-color: #e53e3e;
+.rw-segment-header {
+  background-color: #e2e8f0;
+  color: #4a5568;
+  padding: 0.75rem 1rem;
 }
-.rw-scaffold .bg-green-500 {
-  background-color: #48bb78;
+.rw-segment-main {
+  background-color: #f7fafc;
+  padding: 1rem;
 }
-.rw-scaffold .bg-blue-600 {
-  background-color: #3182ce;
+.rw-link {
+  color: #4299e1;
+  text-decoration: underline;
 }
-.rw-scaffold .hover\:bg-gray-600:hover {
-  background-color: #718096;
+.rw-link:hover {
+  color: #2b6cb0;
 }
-.rw-scaffold .hover\:bg-red-600:hover {
-  background-color: #e53e3e;
+.rw-heading {
+  font-weight: 600;
 }
-.rw-scaffold .hover\:bg-red-700:hover {
-  background-color: #c53030;
+.rw-heading.rw-heading-primary {
+  font-size: 1.25rem;
 }
-.rw-scaffold .hover\:bg-green-600:hover {
-  background-color: #38a169;
+.rw-heading.rw-heading-secondary {
+  font-size: 0.875rem;
 }
-.rw-scaffold .hover\:bg-blue-600:hover {
-  background-color: #3182ce;
+.rw-heading .rw-link {
+  color: #4a5568;
+  text-decoration: none;
 }
-.rw-scaffold .hover\:bg-blue-700:hover {
-  background-color: #2b6cb0;
+.rw-heading .rw-link:hover {
+  color: #1a202c;
+  text-decoration: underline;
 }
-.rw-scaffold .border-gray-300 {
-  border-color: #e2e8f0;
+.rw-form-wrapper {
+  box-sizing: border-box;
+  font-size: 0.875rem;
+  margin-top: -1rem;
 }
-.rw-scaffold .border-red-300 {
+.rw-form-error-wrapper {
+  padding: 1rem;
+  background-color: #fff5f5;
+  color: #c53030;
+  border-width: 1px;
   border-color: #feb2b2;
-}
-.rw-scaffold .border-red-700 {
-  border-color: #c53030;
-}
-.rw-scaffold .focus\:border-gray-500:focus {
-  border-color: #a0aec0;
-}
-.rw-scaffold .rounded-sm {
-  border-radius: 0.125rem;
-}
-.rw-scaffold .rounded {
   border-radius: 0.25rem;
+  margin: 1rem 0;
 }
-.rw-scaffold .rounded-lg {
-  border-radius: 0.5rem;
-}
-.rw-scaffold .border {
-  border-width: 1px;
-}
-.rw-scaffold .border-t {
-  border-top-width: 1px;
-}
-.rw-scaffold .block {
-  display: block;
+.rw-form-error-title {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-weight: 600;
 }
-.rw-scaffold .inline-block {
-  display: inline-block;
+.rw-form-error-list {
+  margin-top: 0.5rem;
+  list-style-type: disc;
+  list-style-position: inside;
 }
-.rw-scaffold .flex {
+.rw-button {
+  color: #718096;
+  cursor: pointer;
   display: flex;
-}
-.rw-scaffold .table {
-  display: table;
-}
-.rw-scaffold .justify-between {
-  justify-content: space-between;
-}
-.rw-scaffold .font-sans {
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
-    'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji',
-    'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
-}
-.rw-scaffold .font-semibold {
+  justify-content: center;
+  font-size: 0.75rem;
   font-weight: 600;
-}
-.rw-scaffold .leading-none {
-  line-height: 1;
-}
-.rw-scaffold .leading-loose {
+  padding: 0.25rem 1rem;
+  text-transform: uppercase;
+  text-decoration: none;
+  letter-spacing: 0.025em;
+  border-radius: 0.25rem;
   line-height: 2;
 }
-.rw-scaffold .list-inside {
-  list-style-position: inside;
-}
-.rw-scaffold .list-disc {
-  list-style-type: disc;
-}
-.rw-scaffold .mx-2 {
-  margin-left: 0.5rem;
-  margin-right: 0.5rem;
+.rw-button:hover {
+  background-color: #718096;
+  color: #fff;
 }
-.rw-scaffold .my-4 {
-  margin-top: 1rem;
-  margin-bottom: 1rem;
+.rw-button.rw-button-small {
+  font-size: 0.75rem;
+  border-radius: 0.125rem;
+  padding: 0.25rem 0.5rem;
+  line-height: inherit;
 }
-.rw-scaffold .mx-4 {
-  margin-left: 1rem;
-  margin-right: 1rem;
+.rw-button.rw-button-green {
+  background-color: #48bb78;
+  color: #fff;
 }
-.rw-scaffold .mt-0 {
-  margin-top: 0;
+.rw-button.rw-button-green:hover {
+  background-color: #38a169;
+  color: #fff;
 }
-.rw-scaffold .mt-1 {
-  margin-top: 0.25rem;
+.rw-button.rw-button-blue {
+  background-color: #3182ce;
+  color: #fff;
 }
-.rw-scaffold .ml-1 {
-  margin-left: 0.25rem;
+.rw-button.rw-button-blue:hover {
+  background-color: #2b6cb0;
 }
-.rw-scaffold .mt-2 {
-  margin-top: 0.5rem;
+.rw-button.rw-button-red {
+  background-color: #e53e3e;
+  color: #fff;
 }
-.rw-scaffold .ml-2 {
-  margin-left: 0.5rem;
+.rw-button.rw-button-red:hover {
+  background-color: #c53030;
 }
-.rw-scaffold .mt-4 {
-  margin-top: 1rem;
+.rw-button-icon {
+  font-size: 1.25rem;
+  line-height: 1;
+  margin-right: 0.25rem;
 }
-.rw-scaffold .mb-4 {
-  margin-bottom: 1rem;
+.rw-button-group {
+  display: flex;
+  justify-content: center;
+  margin: 0.75rem 0.5rem;
 }
-.rw-scaffold .mt-6 {
-  margin-top: 1.5rem;
+.rw-button-group .rw-button {
+  margin: 0 0.25rem;
 }
-.rw-scaffold .mt-8 {
+.rw-form-wrapper .rw-button-group {
   margin-top: 2rem;
+  margin-bottom: 0;
 }
-.rw-scaffold .-mt-4 {
-  margin-top: -1rem;
-}
-.rw-scaffold .focus\:outline-none:focus {
-  outline: 0;
-}
-.rw-scaffold .overflow-hidden {
-  overflow: hidden;
+.rw-label {
+  display: block;
+  margin-top: 1.5rem;
+  color: #4a5568;
+  font-weight: 600;
 }
-.rw-scaffold .overflow-x-scroll {
-  overflow-x: scroll;
+.rw-label.rw-label-error {
+  color: #c53030;
 }
-.rw-scaffold .p-2 {
+.rw-input {
+  display: block;
+  margin-top: 0.5rem;
+  width: 100%;
   padding: 0.5rem;
+  border-width: 1px;
+  border-color: #e2e8f0;
+  color: #4a5568;
+  border-radius: 0.25rem;
+  outline: none;
 }
-.rw-scaffold .p-3 {
-  padding: 0.75rem;
-}
-.rw-scaffold .p-4 {
-  padding: 1rem;
-}
-.rw-scaffold .py-1 {
-  padding-top: 0.25rem;
-  padding-bottom: 0.25rem;
-}
-.rw-scaffold .py-2 {
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-}
-.rw-scaffold .px-2 {
-  padding-left: 0.5rem;
-  padding-right: 0.5rem;
-}
-.rw-scaffold .py-3 {
-  padding-top: 0.75rem;
-  padding-bottom: 0.75rem;
+.rw-input:focus {
+  border-color: #a0aec0;
 }
-.rw-scaffold .px-3 {
-  padding-left: 0.75rem;
-  padding-right: 0.75rem;
+.rw-input-error {
+  border-color: #c53030;
+  color: #c53030;
 }
-.rw-scaffold .py-4 {
-  padding-top: 1rem;
-  padding-bottom: 1rem;
+.rw-field-error {
+  display: block;
+  margin-top: 0.25rem;
+  font-weight: 600;
+  text-transform: uppercase;
+  font-size: 0.75rem;
+  color: #c53030;
 }
-.rw-scaffold .px-4 {
-  padding-left: 1rem;
-  padding-right: 1rem;
+.rw-table-wrapper-responsive {
+  overflow-x: scroll;
 }
-.rw-scaffold .px-8 {
-  padding-left: 2rem;
-  padding-right: 2rem;
+.rw-table-wrapper-responsive .rw-table {
+  min-width: 48rem;
 }
-.rw-scaffold .pr-4 {
-  padding-right: 1rem;
+.rw-table {
+  table-layout: auto;
+  width: 100%;
+  font-size: 0.875rem;
 }
-.rw-scaffold .pb-4 {
-  padding-bottom: 1rem;
+.rw-table th,
+.rw-table td {
+  padding: 0.75rem;
 }
-.rw-scaffold .table-auto {
-  table-layout: auto;
+.rw-table thead tr {
+  background-color: #e2e8f0;
+  color: #4a5568;
 }
-.rw-scaffold .text-left {
+.rw-table th {
+  font-weight: 600;
   text-align: left;
 }
-.rw-scaffold .text-center {
-  text-align: center;
+.rw-table thead th {
+  text-align: left;
 }
-.rw-scaffold .text-right {
+.rw-table tbody th {
   text-align: right;
 }
-.rw-scaffold .text-white {
-  color: #fff;
-}
-.rw-scaffold .text-gray-600 {
-  color: #718096;
-}
-.rw-scaffold .text-gray-700 {
-  color: #4a5568;
+@media (min-width: 768px) {
+  .rw-table tbody th {
+    width: 20%;
+  }
 }
-.rw-scaffold .text-gray-900 {
-  color: #1a202c;
+.rw-table tbody tr {
+  background-color: #f7fafc;
+  border-top-width: 1px;
 }
-.rw-scaffold .text-red-600 {
-  color: #e53e3e;
+.rw-table tbody tr:nth-child(even) {
+  background-color: #fff;
 }
-.rw-scaffold .text-red-700 {
-  color: #c53030;
+.rw-table-actions {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  height: 17px;
+  padding-right: 0.25rem;
 }
-.rw-scaffold .text-red-900 {
-  color: #742a2a;
+.rw-table-actions .rw-button {
+  background-color: transparent;
 }
-.rw-scaffold .text-blue-500 {
-  color: #4299e1;
+.rw-table-actions .rw-button:hover {
+  background-color: #718096;
+  color: #fff;
 }
-.rw-scaffold .text-blue-600 {
+.rw-table-actions .rw-button-blue {
   color: #3182ce;
 }
-.rw-scaffold .hover\:text-white:hover {
+.rw-table-actions .rw-button-blue:hover {
+  background-color: #3182ce;
   color: #fff;
 }
-.rw-scaffold .hover\:text-gray-900:hover {
-  color: #1a202c;
-}
-.rw-scaffold .hover\:text-blue-700:hover {
-  color: #2b6cb0;
-}
-.rw-scaffold .text-xs {
-  font-size: 0.75rem;
-}
-.rw-scaffold .text-sm {
-  font-size: 0.875rem;
-}
-.rw-scaffold .text-xl {
-  font-size: 1.25rem;
-}
-.rw-scaffold .uppercase {
-  text-transform: uppercase;
-}
-.rw-scaffold .underline {
-  text-decoration: underline;
-}
-.rw-scaffold .hover\:underline:hover {
-  text-decoration: underline;
-}
-.rw-scaffold .tracking-wide {
-  letter-spacing: 0.025em;
-}
-.rw-scaffold .whitespace-no-wrap {
-  white-space: nowrap;
-}
-.rw-scaffold .truncate {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.rw-scaffold .w-full {
-  width: 100%;
-}
-.rw-scaffold .box-border {
-  box-sizing: border-box;
-}
-@media (min-width: 768px) {
-  .rw-scaffold .md\:w-1\/5 {
-    width: 20%;
-  }
-}
-
-/*
-  Here are variants (:odd, :even) that aren't enabled in Tailwind by default.
-  If you decide to include Tailwind yourself and still want scaffolds to look
-  the same then you can tell it to build these variants by adding the following
-  to tailwind.config.js:
-
-    module.exports = {
-      variants: {
-        backgroundColor: ['hover', 'focus', 'odd', 'even']
-      }
-    }
-
-  Tailwind variant customization docs: https://tailwindcss.com/docs/configuring-variants
-*/
-
-.rw-scaffold .odd\:bg-gray-100:nth-child(odd) {
-  background-color: #f7fafc;
+.rw-table-actions .rw-button-red {
+  color: #e53e3e;
 }
-.rw-scaffold .even\:bg-white:nth-child(even) {
-  background-color: #ffffff;
+.rw-table-actions .rw-button-red:hover {
+  background-color: #e53e3e;
+  color: #fff;
 }
-
-/*
-  Any custom styles that Tailwind doesn't provide. You can add these to your
-  own install of Tailwind by adding the following to tailwind.config.js:
-
-    module.exports = {
-      theme: {
-        extend: {
-          minWidth: {
-            '3xl': '48rem'
-          }
-        }
-      }
-    }
-
-  Tailwind theme extension docs: https://tailwindcss.com/docs/theme#extending-the-default-theme
-*/
-
-.rw-scaffold .min-w-3xl {
-  min-width: 48rem;
+.rw-text-center {
+  text-align: center;
 }
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/edit.js b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/edit.js
index ac561d214f0d..e9abd011cac1 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/edit.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/foreignKeys/edit.js
@@ -40,13 +40,13 @@ export const Success = ({ userProfile }) => {
   }
 
   return (
-    <div className="bg-white border rounded-lg overflow-hidden">
-      <header className="bg-gray-300 text-gray-700 py-3 px-4">
-        <h2 className="text-sm font-semibold">
+    <div className="rw-segment">
+      <header className="rw-segment-header">
+        <h2 className="rw-heading rw-heading-secondary">
           Edit UserProfile {userProfile.id}
         </h2>
       </header>
-      <div className="bg-gray-100 p-4">
+      <div className="rw-segment-main">
         <UserProfileForm
           userProfile={userProfile}
           onSave={onSave}
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/form.js b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/form.js
index 2257544ff813..5cc0f446d9e0 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/form.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/form.js
@@ -119,10 +119,7 @@ const PostForm = (props) => {
         <FieldError name="postedAt" className="rw-field-error" />
 
         <div className="rw-button-group">
-          <Submit
-            disabled={props.loading}
-            className="rw-button rw-button-blue"
-          >
+          <Submit disabled={props.loading} className="rw-button rw-button-blue">
             Save
           </Submit>
         </div>
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/indexCell.js b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/indexCell.js
index 60bcbaa84402..82f2bc780dd5 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/indexCell.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/indexCell.js
@@ -26,10 +26,7 @@ export const Empty = () => {
   return (
     <div className="rw-text-center">
       {'No posts yet. '}
-      <Link
-        to={routes.newPost()}
-        className="rw-link"
-      >
+      <Link to={routes.newPost()} className="rw-link">
         {'Create one?'}
       </Link>
     </div>
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/show.js b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/show.js
index 13555c1f2958..38cc5a444d0a 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/show.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/components/show.js
@@ -27,39 +27,39 @@ const Post = ({ post }) => {
     <>
       <div className="rw-segment">
         <header className="rw-segment-header">
-          <h2 className="rw-heading rw-heading-secondary">Post {post.id} Detail</h2>
+          <h2 className="rw-heading rw-heading-secondary">
+            Post {post.id} Detail
+          </h2>
         </header>
         <table className="rw-table">
           <tbody>
-            <tr className="odd:bg-gray-100 even:bg-white border-t">
-              <td className="font-semibold p-3 text-right md:w-1/5">id</td>
-              <td className="p-3">{post.id}</td>
+            <tr>
+              <th>id</th>
+              <td>{post.id}</td>
             </tr>
-            <tr className="odd:bg-gray-100 even:bg-white border-t">
-              <td className="font-semibold p-3 text-right md:w-1/5">title</td>
-              <td className="p-3">{post.title}</td>
+            <tr>
+              <th>title</th>
+              <td>{post.title}</td>
             </tr>
-            <tr className="odd:bg-gray-100 even:bg-white border-t">
-              <td className="font-semibold p-3 text-right md:w-1/5">slug</td>
-              <td className="p-3">{post.slug}</td>
+            <tr>
+              <th>slug</th>
+              <td>{post.slug}</td>
             </tr>
-            <tr className="odd:bg-gray-100 even:bg-white border-t">
-              <td className="font-semibold p-3 text-right md:w-1/5">author</td>
-              <td className="p-3">{post.author}</td>
+            <tr>
+              <th>author</th>
+              <td>{post.author}</td>
             </tr>
-            <tr className="odd:bg-gray-100 even:bg-white border-t">
-              <td className="font-semibold p-3 text-right md:w-1/5">body</td>
-              <td className="p-3">{post.body}</td>
+            <tr>
+              <th>body</th>
+              <td>{post.body}</td>
             </tr>
-            <tr className="odd:bg-gray-100 even:bg-white border-t">
-              <td className="font-semibold p-3 text-right md:w-1/5">image</td>
-              <td className="p-3">{post.image}</td>
+            <tr>
+              <th>image</th>
+              <td>{post.image}</td>
             </tr>
-            <tr className="odd:bg-gray-100 even:bg-white border-t">
-              <td className="font-semibold p-3 text-right md:w-1/5">
-                postedAt
-              </td>
-              <td className="p-3">{post.postedAt}</td>
+            <tr>
+              <th>postedAt</th>
+              <td>{post.postedAt}</td>
             </tr>
           </tbody>
         </table>
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/layouts/layout.js b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/layouts/layout.js
index 142eb142c7c3..9d473b98ce85 100644
--- a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/layouts/layout.js
+++ b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/layouts/layout.js
@@ -5,17 +5,11 @@ const PostsLayout = (props) => {
     <div className="rw-scaffold">
       <header className="rw-header">
         <h1 className="rw-heading rw-heading-primary">
-          <Link
-            to={routes.posts()}
-            className="rw-link"
-          >
+          <Link to={routes.posts()} className="rw-link">
             Posts
           </Link>
         </h1>
-        <Link
-          to={routes.newPost()}
-          className="rw-button rw-button-green"
-        >
+        <Link to={routes.newPost()} className="rw-button rw-button-green">
           <div className="rw-button-icon">+</div> New Post
         </Link>
       </header>

From 12b457a3268f030d2f6c1990e0ec221d060dd467 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Sat, 30 May 2020 14:38:01 -0400
Subject: [PATCH 24/25] fixing bad rebase

---
 packages/dev-server/src/main.ts | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/packages/dev-server/src/main.ts b/packages/dev-server/src/main.ts
index 1d885e8c41f5..317111c74ee3 100644
--- a/packages/dev-server/src/main.ts
+++ b/packages/dev-server/src/main.ts
@@ -21,32 +21,9 @@ export const getArgsForSide = (
   const paths = getPaths()
 
   return {
-    httpMethod: request.method,
-    headers: request.headers,
-    path: request.path,
-    queryStringParameters: qs.parse(request.url.split(/\?(.+)/)[1]),
-    requestContext: {
-      identity: {
-        sourceIp: request.ip,
-      },
-    },
-    ...parseBody(request.body), // adds `body` and `isBase64Encoded`
-  } as APIGatewayProxyEvent
-}
-
-const expressResponseForLambdaResult = (
-  expressResFn: Response,
-  lambdaResult: APIGatewayProxyResult
-) => {
-  // The response object must be compatible with JSON.stringify according
-  // to the aws lambda docs, but the type definition specifies that it has
-  // to be a string. Let's double check this.
-  const { statusCode = 200, headers, body = '' } = lambdaResult
-  if (headers) {
-    Object.keys(headers).forEach((headerName) => {
-      const headerValue: any = headers[headerName]
-      expressResFn.setHeader(headerName, headerValue)
-    })
+    port,
+    host,
+    paths: paths[side],
   }
 }
 

From ab53b6b669a86eaf74babc9cd7da639ccd635a55 Mon Sep 17 00:00:00 2001
From: Justin Reidy <justin.reidy@airbnb.com>
Date: Sat, 30 May 2020 14:42:09 -0400
Subject: [PATCH 25/25] more merge fixes

---
 packages/api/package.json              |  3 +-
 packages/api/src/getUserFromContext.ts | 45 --------------------------
 packages/api/src/main.ts               |  2 +-
 packages/api/src/types.ts              |  8 -----
 4 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 packages/api/src/getUserFromContext.ts

diff --git a/packages/api/package.json b/packages/api/package.json
index a409e1ad462f..bf7fd57c0996 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -41,10 +41,9 @@
     ]
   },
   "scripts": {
-    "build": "yarn build:clean && yarn build:js && yarn build:types",
+    "build": "yarn build:clean && yarn build:js",
     "build:js": "yarn cross-env NODE_ENV=production babel src -d dist --extensions \".js,.ts\" --source-maps inline && yarn move-cli ./dist/importAll.macro.js ./importAll.macro.js",
     "build:clean": "yarn del-cli dist importAll.macro.js",
-    "build:types": "tsc --declaration --emitDeclarationOnly",
     "prepublishOnly": "yarn build",
     "build:watch": "nodemon --watch src --ext 'js,ts,tsx' --ignore dist --ignore importAll.macro.js --exec 'yarn build'",
     "test": "yarn jest",
diff --git a/packages/api/src/getUserFromContext.ts b/packages/api/src/getUserFromContext.ts
deleted file mode 100644
index 9b08888f23f1..000000000000
--- a/packages/api/src/getUserFromContext.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import type { APIGatewayProxyEvent, Context } from 'aws-lambda'
-import fetch from 'node-fetch'
-
-export type SupportedAuthTypes = 'auth0' | 'netlify'
-
-type NetlifyClientContext = Context & {
-  clientContext: {
-    user?: any
-  }
-}
-
-// TODO: Define what an Auth0 user looks like.
-const REDWOOD_AUTH_TYPE_HEADER = 'x-redwood-auth-type'
-
-export const getUserFromContext = async ({
-  event,
-  context,
-}: {
-  event: APIGatewayProxyEvent
-  context: NetlifyClientContext
-}) => {
-  const type = event?.headers[REDWOOD_AUTH_TYPE_HEADER] as SupportedAuthTypes
-  switch (type) {
-    case 'netlify':
-      return context.clientContext?.user
-    case 'auth0': {
-      // We need a strategy for fetching, caching and invalidating users from Auth0.
-      // It would be amazing if Netlify could do this automatically for us:
-      // As an example if we passed in an `X-Redwood-Auth-Type: Auth0` header,
-      // and it fetch this and placed it in `clientContext.user`,
-      // just like Netlify identity does it.
-      const response = await fetch(
-        `https://${process.env.AUTH0_DOMAIN}/userinfo`,
-        {
-          headers: {
-            Authorization: event.headers?.authorization,
-          },
-        }
-      )
-      return response.json()
-    }
-    default:
-      return undefined
-  }
-}
diff --git a/packages/api/src/main.ts b/packages/api/src/main.ts
index 8ab4981e911e..4546aee675a3 100644
--- a/packages/api/src/main.ts
+++ b/packages/api/src/main.ts
@@ -4,4 +4,4 @@ export * from './makeServices'
 export * from './makeMergedSchema/makeMergedSchema'
 export * from './functions/graphQLServer'
 export * from './globalContext'
-export * from './getUserFromContext'
+export * from './auth/authHeaders'
diff --git a/packages/api/src/types.ts b/packages/api/src/types.ts
index 1370f9da75d4..1fa70d8776e1 100644
--- a/packages/api/src/types.ts
+++ b/packages/api/src/types.ts
@@ -1,5 +1,3 @@
-import { GraphQLResolveInfo } from 'graphql'
-
 export type Services = { [funcName: string]: any }
 export type ImportedServices = {
   [serviceName: string]: Services
@@ -8,9 +6,3 @@ export interface MakeServicesInterface {
   services: ImportedServices
 }
 export type MakeServices = (args: MakeServicesInterface) => Services
-
-export interface ResolverArgs<M> {
-  root: M
-  context: any
-  info: GraphQLResolveInfo
-}