From 5f4c19da35e90ffa2f3ae27e9b309ee48f9d4e16 Mon Sep 17 00:00:00 2001
From: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
Date: Wed, 12 May 2021 02:35:00 -0400
Subject: [PATCH] [TypeScript] Phase 1 & 2 (#3370)

Co-authored-by: Opender Singh <opender.singh@konghq.com>
---
 .editorconfig                                 |     1 +
 .eslintignore                                 |     5 +-
 .eslintrc.js                                  |   101 +
 .eslintrc.json                                |    52 -
 .github/workflows/test.yml                    |     2 +
 .gitignore                                    |     2 +
 .prettierignore                               |     7 -
 .prettierrc                                   |     9 -
 jest.config.js                                |    20 +
 package-lock.json                             |  5309 +++--
 package.json                                  |    34 +-
 packages/insomnia-app/.babelrc                |    38 -
 packages/insomnia-app/.eslintignore           |     7 +
 packages/insomnia-app/.eslintrc.js            |    12 +
 packages/insomnia-app/.flowconfig             |    20 -
 packages/insomnia-app/.gitignore              |     3 +-
 packages/insomnia-app/.storybook/config.js    |     6 +-
 .../insomnia-app/.storybook/webpack.config.js |     3 +-
 .../{before-each.js => before-each.ts}        |    12 +-
 ...te-for-test.js => redux-state-for-test.ts} |     8 +-
 ...{setup-after-env.js => setup-after-env.ts} |     1 +
 packages/insomnia-app/app/__jest__/setup.js   |    30 -
 packages/insomnia-app/app/__jest__/setup.ts   |    49 +
 .../@grpc/{grpc-js.js => grpc-js.ts}          |     3 +
 packages/insomnia-app/app/__mocks__/dummy.js  |     1 -
 packages/insomnia-app/app/__mocks__/dummy.ts  |     2 +
 .../__mocks__/{electron.js => electron.ts}    |    37 +-
 .../app/__mocks__/font-scanner.js             |     1 -
 .../app/__mocks__/font-scanner.ts             |     2 +
 .../{isomorphic-git.js => isomorphic-git.ts}  |     5 +
 .../{node-forge.js => node-forge.ts}          |    25 +-
 .../{node-libcurl.js => node-libcurl.ts}      |   149 +-
 .../{install.test.js => install.test.ts}      |    26 +-
 .../{package.test.js => package.test.ts}      |     1 +
 .../{renderer.test.js => renderer.test.ts}    |     1 -
 .../{crypt.test.js => crypt.test.ts}          |     9 -
 .../app/account/{crypt.js => crypt.ts}        |    96 +-
 .../app/account/{fetch.js => fetch.ts}        |    16 +-
 .../app/account/{session.js => session.ts}    |    53 +-
 .../{nestedfolders.js => nestedfolders.ts}    |    12 +-
 .../__mocks__/{analytics.js => analytics.ts}  |     1 +
 .../app/common/__mocks__/render.js            |     6 -
 .../app/common/__mocks__/render.ts            |     6 +
 .../{analytics.test.js => analytics.test.ts}  |     9 +-
 .../{api-specs.test.js => api-specs.test.ts}  |    23 +-
 .../{constants.test.js => constants.test.ts}  |     0
 .../{database.test.js => database.test.ts}    |   430 +-
 ...{grpc-paths.test.js => grpc-paths.test.ts} |    30 +-
 .../__tests__/{har.test.js => har.test.ts}    |   234 +-
 .../{import.test.js => import.test.ts}        |   247 +-
 ...-storage.test.js => local-storage.test.ts} |    32 +-
 .../__tests__/{misc.test.js => misc.test.ts}  |   171 +-
 .../{render.test.js => render.test.ts}        |   147 +-
 .../app/common/__tests__/sorting.test.js      |   360 -
 .../app/common/__tests__/sorting.test.ts      |  1018 +
 .../{strings.test.js => strings.test.ts}      |     1 -
 .../app/common/{analytics.js => analytics.ts} |   205 +-
 .../app/common/{api-specs.js => api-specs.ts} |    18 +-
 .../app/common/{constants.js => constants.ts} |   194 +-
 packages/insomnia-app/app/common/database.js  |   812 -
 packages/insomnia-app/app/common/database.ts  |   830 +
 .../{documentation.js => documentation.ts}    |    12 +-
 .../app/common/electron-helpers.ts            |    50 +
 ...kspace-label.js => get-workspace-label.ts} |     1 -
 .../common/{grpc-events.js => grpc-events.ts} |    12 +-
 .../common/{grpc-paths.js => grpc-paths.ts}   |    37 +-
 .../app/common/{har.js => har.ts}             |   420 +-
 ...otkeys-listener.js => hotkeys-listener.ts} |    43 +-
 .../app/common/{hotkeys.js => hotkeys.ts}     |   138 +-
 .../app/common/{import.js => import.ts}       |   197 +-
 .../{keyboard-keys.js => keyboard-keys.ts}    |     4 +-
 .../app/common/{log.js => log.ts}             |     5 +-
 ...arkdown-to-html.js => markdown-to-html.ts} |     1 +
 ...m-designer.js => migrate-from-designer.ts} |    98 +-
 .../app/common/{misc.js => misc.ts}           |   208 +-
 .../app/common/{render.js => render.ts}       |   117 +-
 ...-or-folder.js => select-file-or-folder.ts} |    50 +-
 .../{send-request.js => send-request.ts}      |    26 +-
 .../app/common/{sorting.js => sorting.ts}     |     8 +-
 .../app/common/{strings.js => strings.ts}     |     1 -
 ...ess-token-urls.js => access-token-urls.ts} |     0
 ...rization-urls.js => authorization-urls.ts} |     0
 .../app/datasets/{charsets.js => charsets.ts} |     0
 .../{content-types.js => content-types.ts}    |     0
 .../datasets/{encodings.js => encodings.ts}   |     0
 .../{header-names.js => header-names.ts}      |     0
 packages/insomnia-app/app/global.d.ts         |    26 +
 ...ain.development.js => main.development.ts} |    37 +-
 ...ipc-main.test.js => grpc-ipc-main.test.ts} |    17 +-
 .../{error-handling.js => error-handling.ts}  |     3 +-
 .../{grpc-ipc-main.js => grpc-ipc-main.ts}    |     5 +-
 .../{local-storage.js => local-storage.ts}    |    15 +-
 ...quirrel-startup.js => squirrel-startup.ts} |     6 +-
 .../app/main/{updates.js => updates.ts}       |    53 +-
 .../main/{window-utils.js => window-utils.ts} |   241 +-
 .../app/models/__mocks__/{uuid.js => uuid.ts} |     2 +
 ...meta.test.js => grpc-request-meta.test.ts} |    22 +-
 ...c-request.test.js => grpc-request.test.ts} |    17 +-
 .../{index.test.js => index.test.ts}          |     4 +-
 ...{proto-file.test.js => proto-file.test.ts} |    12 +-
 ...uest-meta.test.js => request-meta.test.ts} |    12 +-
 .../{request.test.js => request.test.ts}      |   213 +-
 .../{response.test.js => response.test.ts}    |    47 +-
 .../{workspace.test.js => workspace.test.ts}  |    45 +-
 .../app/models/{api-spec.js => api-spec.ts}   |    45 +-
 .../app/models/client-certificate.js          |    72 -
 .../app/models/client-certificate.ts          |    74 +
 .../models/{cookie-jar.js => cookie-jar.ts}   |    74 +-
 .../models/{environment.js => environment.ts} |    83 +-
 .../insomnia-app/app/models/git-repository.js |    64 -
 .../insomnia-app/app/models/git-repository.ts |    66 +
 ...c-request-meta.js => grpc-request-meta.ts} |    48 +-
 .../insomnia-app/app/models/grpc-request.js   |   102 -
 .../insomnia-app/app/models/grpc-request.ts   |   111 +
 ...ame.test.js => get-workspace-name.test.ts} |     2 -
 ...t.js => git-repository-operations.test.ts} |    17 +-
 .../{is-model.test.js => is-model.test.ts}    |    74 +-
 ...st.js => query-all-workspace-urls.test.ts} |    27 +-
 ...orkspace-name.js => get-workspace-name.ts} |     4 +-
 ...ations.js => git-repository-operations.ts} |     7 +-
 .../app/models/helpers/is-model.js            |    46 -
 .../app/models/helpers/is-model.ts            |    55 +
 ...ce-urls.js => query-all-workspace-urls.ts} |    19 +-
 ...st-operations.js => request-operations.ts} |    14 +-
 ...-operations.js => workspace-operations.ts} |    25 +-
 .../app/models/{index.js => index.ts}         |    37 +-
 .../insomnia-app/app/models/o-auth-2-token.js |    84 -
 .../insomnia-app/app/models/o-auth-2-token.ts |    88 +
 .../insomnia-app/app/models/plugin-data.js    |    58 -
 .../insomnia-app/app/models/plugin-data.ts    |    69 +
 .../app/models/proto-directory.js             |    59 -
 .../app/models/proto-directory.ts             |    69 +
 .../insomnia-app/app/models/proto-file.js     |    64 -
 .../insomnia-app/app/models/proto-file.ts     |    74 +
 .../app/models/request-group-meta.js          |    50 -
 .../app/models/request-group-meta.ts          |    49 +
 .../insomnia-app/app/models/request-group.js  |    86 -
 .../insomnia-app/app/models/request-group.ts  |    93 +
 .../{request-meta.js => request-meta.ts}      |    57 +-
 ...{request-version.js => request-version.ts} |    43 +-
 .../app/models/{request.js => request.ts}     |   215 +-
 .../app/models/{response.js => response.ts}   |   195 +-
 .../app/models/{settings.js => settings.ts}   |   150 +-
 .../app/models/{stats.js => stats.ts}         |    76 +-
 ...nit-test-result.js => unit-test-result.ts} |    23 +-
 .../app/models/unit-test-suite.js             |    52 -
 .../app/models/unit-test-suite.ts             |    51 +
 packages/insomnia-app/app/models/unit-test.js |    53 -
 packages/insomnia-app/app/models/unit-test.ts |    55 +
 .../insomnia-app/app/models/workspace-meta.js |   110 -
 .../insomnia-app/app/models/workspace-meta.ts |   110 +
 .../app/models/{workspace.js => workspace.ts} |    68 +-
 ...ication.test.js => authentication.test.ts} |    39 +-
 ....test.js => certificate-url-parse.test.ts} |    10 +-
 .../{multipart.test.js => multipart.test.ts}  |    66 +-
 .../{network.test.js => network.test.ts}      |   304 +-
 ....test.js => url-matches-cert-host.test.ts} |     3 +
 .../{authentication.js => authentication.ts}  |    35 +-
 .../{axios-request.js => axios-request.ts}    |    17 +-
 ...{get-header.test.js => get-header.test.ts} |     1 +
 .../{get-header.js => get-header.ts}          |    17 +-
 .../{get-header.js => get-header.ts}          |     9 +-
 packages/insomnia-app/app/network/ca-certs.js |     3 +-
 ...-url-parse.js => certificate-url-parse.ts} |     5 +-
 .../app/network/grpc/__mocks__/index.js       |     7 -
 .../app/network/grpc/__mocks__/index.ts       |     7 +
 ...a.js => grpc-ipc-message-params-schema.ts} |     5 +-
 ...a.js => grpc-ipc-request-params-schema.ts} |     2 +-
 ...{call-cache.test.js => call-cache.test.ts} |    45 +-
 .../{index.test.js => index.test.ts}          |   274 +-
 .../{method.test.js => method.test.ts}        |    38 +-
 ...rpc-url.test.js => parse-grpc-url.test.ts} |     0
 .../{prepare.test.js => prepare.test.ts}      |    47 +-
 ...tion.test.js => proto-integration.test.ts} |    28 +-
 ...cks.test.js => response-callbacks.test.ts} |    18 +-
 .../grpc/{call-cache.js => call-cache.ts}     |    21 +-
 .../app/network/grpc/{index.js => index.ts}   |    60 +-
 .../app/network/grpc/{method.js => method.ts} |    26 +-
 .../app/network/grpc/parse-grpc-url.js        |    17 -
 .../app/network/grpc/parse-grpc-url.ts        |    34 +
 .../network/grpc/{prepare.js => prepare.ts}   |    31 +-
 .../__mocks__/{index.js => index.ts}          |     0
 .../{index.test.js => index.test.ts}          |    19 +-
 ...-file.test.js => write-proto-file.test.ts} |    55 +-
 .../grpc/proto-loader/{index.js => index.ts}  |    26 +-
 ...rite-proto-file.js => write-proto-file.ts} |    40 +-
 .../{index.test.js => index.test.ts}          |   126 +-
 ...test.js => ingest-proto-directory.test.ts} |    29 +-
 .../proto-manager/{index.js => index.tsx}     |    49 +-
 ...directory.js => ingest-proto-directory.ts} |    46 +-
 ...nse-callbacks.js => response-callbacks.ts} |    12 +-
 .../{service-error.js => service-error.ts}    |    16 +-
 .../network/{multipart.js => multipart.ts}    |    26 +-
 .../app/network/{network.js => network.ts}    |   283 +-
 .../o-auth-1/{constants.js => constants.ts}   |     1 -
 .../o-auth-1/{get-token.js => get-token.ts}   |    46 +-
 ...st.js => grant-authorization-code.test.ts} |   115 +-
 ...st.js => grant-client-credentials.test.ts} |    77 +-
 ...mplicit.test.js => grant-implicit.test.ts} |     4 +-
 ...assword.test.js => grant-password.test.ts} |    87 +-
 .../__tests__/{helpers.js => helpers.ts}      |     5 +
 .../__tests__/{misc.test.js => misc.test.ts}  |     9 -
 .../o-auth-2/{constants.js => constants.ts}   |     3 -
 .../o-auth-2/{get-token.js => get-token.ts}   |    23 +-
 ...on-code.js => grant-authorization-code.ts} |   168 +-
 ...entials.js => grant-client-credentials.ts} |    60 +-
 .../{grant-implicit.js => grant-implicit.ts}  |    55 +-
 .../{grant-password.js => grant-password.ts}  |    60 +-
 .../app/network/o-auth-2/{misc.js => misc.ts} |    21 +-
 .../{refresh-token.js => refresh-token.ts}    |    40 +-
 ...-cert-host.js => url-matches-cert-host.ts} |     4 +-
 .../__tests__/{app.test.js => app.test.ts}    |    28 +-
 .../__tests__/{data.test.js => data.test.ts}  |    23 +-
 .../{request.test.js => request.test.ts}      |   106 +-
 .../{response.test.js => response.test.ts}    |    34 +-
 .../{store.test.js => store.test.ts}          |    27 +-
 .../app/plugins/context/{app.js => app.tsx}   |    66 +-
 .../app/plugins/context/{data.js => data.ts}  |    39 +-
 .../plugins/context/{index.js => index.ts}    |     1 -
 .../app/plugins/context/network.js            |    18 -
 .../app/plugins/context/network.ts            |    16 +
 .../context/{request.js => request.ts}        |   148 +-
 .../context/{response.js => response.ts}      |    57 +-
 .../insomnia-app/app/plugins/context/store.js |    43 -
 .../insomnia-app/app/plugins/context/store.ts |    57 +
 .../app/plugins/{create.js => create.ts}      |     5 +-
 .../app/plugins/{index.js => index.ts}        |   286 +-
 .../app/plugins/{install.js => install.ts}    |    68 +-
 .../app/plugins/{misc.js => misc.ts}          |   136 +-
 packages/insomnia-app/app/renderer.html       |     9 +-
 .../app/{renderer.js => renderer.ts}          |     0
 .../__tests__/{diff.test.js => diff.test.ts}  |    51 +-
 .../{patch.test.js => patch.test.ts}          |     2 +-
 .../app/sync/delta/{diff.js => diff.ts}       |    42 +-
 .../app/sync/delta/{patch.js => patch.ts}     |     3 +-
 .../sync/git/__mocks__/{path.js => path.ts}   |     5 +-
 .../app/sync/git/__mocks__/shallow-clone.js   |     3 -
 .../app/sync/git/__mocks__/shallow-clone.ts   |     4 +
 ...-rollback.test.js => git-rollback.test.ts} |   102 +-
 .../{git-vcs.test.js => git-vcs.test.ts}      |    86 +-
 ...{mem-client.test.js => mem-client.test.ts} |    87 +-
 ...db-client.test.js => ne-db-client.test.ts} |   101 +-
 ...it-path.test.js => parse-git-path.test.ts} |    11 -
 .../{path-sep.test.js => path-sep.test.ts}    |     4 +-
 ...ent.test.js => routable-fs-client.test.ts} |    11 +-
 .../sync/git/__tests__/{util.js => util.ts}   |     2 +-
 .../{utils.test.js => utils.test.ts}          |     1 -
 .../sync/git/{fs-client.js => fs-client.ts}   |    24 +-
 .../git/{git-rollback.js => git-rollback.ts}  |    15 +-
 .../app/sync/git/{git-vcs.js => git-vcs.ts}   |   211 +-
 .../git/{http-client.js => http-client.ts}    |     2 +-
 .../sync/git/{mem-client.js => mem-client.ts} |   226 +-
 .../git/{ne-db-client.js => ne-db-client.ts}  |    78 +-
 .../{parse-git-path.js => parse-git-path.ts}  |    17 +-
 .../app/sync/git/{path-sep.js => path-sep.ts} |     1 -
 ...ble-fs-client.js => routable-fs-client.ts} |    15 +-
 .../{shallow-clone.js => shallow-clone.ts}    |    16 +-
 .../app/sync/git/{stat.js => stat.ts}         |    18 +-
 .../insomnia-app/app/sync/git/system-error.ts |    46 +
 .../app/sync/git/{utils.js => utils.ts}       |    12 +-
 ...test.js => deterministicStringify.test.ts} |    15 +-
 ...Stringify.js => deterministicStringify.ts} |    16 +-
 .../{index.test.js => index.test.ts}          |    45 +-
 .../sync/store/drivers/{base.js => base.ts}   |    10 +-
 ...system-driver.js => file-system-driver.ts} |    41 +-
 .../{memory-driver.js => memory-driver.ts}    |    21 +-
 .../{compress.test.js => compress.test.ts}    |     0
 .../store/hooks/{compress.js => compress.ts}  |     5 +-
 .../app/sync/store/{index.js => index.ts}     |    27 +-
 packages/insomnia-app/app/sync/types.js       |   107 -
 packages/insomnia-app/app/sync/types.ts       |   104 +
 .../{index.test.js => index.test.ts}          |   369 +-
 .../{paths.test.js => paths.test.ts}          |     0
 .../__tests__/{util.test.js => util.test.ts}  |   343 +-
 .../app/sync/vcs/{index.js => index.ts}       |   452 +-
 packages/insomnia-app/app/sync/vcs/paths.js   |    42 -
 packages/insomnia-app/app/sync/vcs/paths.ts   |    41 +
 .../app/sync/vcs/{util.js => util.ts}         |   145 +-
 .../{utils.test.js => utils.test.ts}          |   224 +-
 .../{base-extension.js => base-extension.ts}  |    61 +-
 .../app/templating/extensions/index.js        |   100 -
 .../app/templating/extensions/index.ts        |   100 +
 .../app/templating/{index.js => index.ts}     |    57 +-
 .../app/templating/{utils.js => utils.ts}     |   160 +-
 .../app/{test-utils.js => test-utils.ts}      |    29 +-
 ...activity-toggle.js => activity-toggle.tsx} |    37 +-
 .../{analytics.js => analytics.tsx}           |    27 +-
 .../{editable.test.js => editable.test.ts}    |     0
 .../components/base/{button.js => button.tsx} |    40 +-
 .../base/{copy-button.js => copy-button.tsx}  |    54 +-
 ...debounced-input.js => debounced-input.tsx} |    70 +-
 ...dropdown-button.js => dropdown-button.tsx} |    18 +-
 ...opdown-divider.js => dropdown-divider.tsx} |    15 +-
 .../{dropdown-hint.js => dropdown-hint.tsx}   |    11 +-
 .../{dropdown-item.js => dropdown-item.tsx}   |    48 +-
 .../{dropdown-right.js => dropdown-right.tsx} |    15 +-
 .../dropdown/{dropdown.js => dropdown.tsx}    |   183 +-
 .../base/dropdown/{index.js => index.ts}      |     0
 ...itable.stories.js => editable.stories.tsx} |     4 +-
 .../base/{editable.js => editable.tsx}        |    69 +-
 ...-input-button.js => file-input-button.tsx} |    37 +-
 .../base/{highlight.js => highlight.tsx}      |    23 +-
 ...checkbox.js => indeterminate-checkbox.tsx} |    22 +-
 .../ui/components/base/{lazy.js => lazy.ts}   |    28 +-
 .../ui/components/base/{link.js => link.tsx}  |    44 +-
 .../components/base/{mailto.js => mailto.tsx} |    31 +-
 .../base/{modal-body.js => modal-body.tsx}    |    18 +-
 .../{modal-footer.js => modal-footer.tsx}     |    18 +-
 .../{modal-header.js => modal-header.tsx}     |    22 +-
 .../components/base/{modal.js => modal.tsx}   |    90 +-
 ...n.stories.js => prompt-button.stories.tsx} |     4 +-
 .../{prompt-button.js => prompt-button.tsx}   |   105 +-
 ...tton.test.js => grpc-send-button.test.tsx} |    14 -
 ...pc-send-button.js => grpc-send-button.tsx} |    21 +-
 ...settings-button.js => settings-button.tsx} |    25 +-
 ...button.js => check-for-updates-button.tsx} |    54 +-
 .../{base-imports.js => base-imports.ts}      |     5 +-
 .../{code-editor.js => code-editor.tsx}       |   403 +-
 .../{autocomplete.js => autocomplete.ts}      |   100 +-
 .../extensions/{clickable.js => clickable.ts} |    15 +-
 .../{nunjucks-tags.js => nunjucks-tags.ts}    |   153 +-
 ...async-lint.js => javascript-async-lint.ts} |    12 +-
 .../lint/{openapi.js => openapi.ts}           |     3 +-
 .../codemirror/modes/{curl.js => curl.ts}     |    16 +-
 .../modes/{nunjucks.js => nunjucks.ts}        |    15 +-
 .../modes/{openapi.js => openapi.ts}          |    12 +-
 ...one-line-editor.js => one-line-editor.tsx} |   171 +-
 .../{cookie-list.js => cookie-list.tsx}       |    54 +-
 ...count-dropdown.js => account-dropdown.tsx} |    19 +-
 .../{auth-dropdown.js => auth-dropdown.tsx}   |    27 +-
 ...-dropdown.js => content-type-dropdown.tsx} |    32 +-
 ...dropdown.js => document-card-dropdown.tsx} |    69 +-
 ...-dropdown.js => environments-dropdown.tsx} |    51 +-
 ...sync-dropdown.js => git-sync-dropdown.tsx} |   176 +-
 ...s => grpc-method-dropdown-button.test.tsx} |     5 -
 ....test.js => grpc-method-dropdown.test.tsx} |    17 -
 ...ton.js => grpc-method-dropdown-button.tsx} |    13 +-
 ...d-dropdown.js => grpc-method-dropdown.tsx} |    32 +-
 .../{index.js => index.ts}                    |     0
 ...method-dropdown.js => method-dropdown.tsx} |    40 +-
 ...-dropdown.js => preview-mode-dropdown.tsx} |    20 +-
 ...down.js => remote-workspaces-dropdown.tsx} |    74 +-
 ...opdown.js => request-actions-dropdown.tsx} |   110 +-
 ....js => request-group-actions-dropdown.tsx} |    85 +-
 ...pdown.js => response-history-dropdown.tsx} |    85 +-
 .../{sync-dropdown.js => sync-dropdown.tsx}   |   210 +-
 ...ace-dropdown.js => workspace-dropdown.tsx} |   101 +-
 ...tor.test.js => environment-editor.test.ts} |     1 -
 ...ditor.test.js => password-editor.test.tsx} |     4 +-
 .../auth/{asap-auth.js => asap-auth.tsx}      |    54 +-
 .../{auth-wrapper.js => auth-wrapper.tsx}     |    40 +-
 .../auth/{aws-auth.js => aws-auth.tsx}        |    34 +-
 .../auth/{basic-auth.js => basic-auth.tsx}    |    33 +-
 .../auth/{bearer-auth.js => bearer-auth.tsx}  |    29 +-
 .../auth/{digest-auth.js => digest-auth.tsx}  |    34 +-
 .../auth/{hawk-auth.js => hawk-auth.tsx}      |    81 +-
 .../auth/{netrc-auth.js => netrc-auth.tsx}    |     0
 .../auth/{ntlm-auth.js => ntlm-auth.tsx}      |    33 +-
 .../{o-auth-1-auth.js => o-auth-1-auth.tsx}   |   120 +-
 .../{o-auth-2-auth.js => o-auth-2-auth.tsx}   |   245 +-
 .../body/{body-editor.js => body-editor.tsx}  |    57 +-
 .../body/{file-editor.js => file-editor.tsx}  |    18 +-
 .../body/{form-editor.js => form-editor.tsx}  |    26 +-
 ...graph-ql-editor.js => graph-ql-editor.tsx} |   253 +-
 .../body/{raw-editor.js => raw-editor.tsx}    |    50 +-
 ...coded-editor.js => url-encoded-editor.tsx} |    26 +-
 ...nment-editor.js => environment-editor.tsx} |    79 +-
 .../{grpc-editor.js => grpc-editor.tsx}       |    27 +-
 ...password-editor.js => password-editor.tsx} |    44 +-
 ...s-editor.js => request-headers-editor.tsx} |    47 +-
 ...ditor.js => request-parameters-editor.tsx} |    42 +-
 .../{error-boundary.js => error-boundary.tsx} |    69 +-
 ...est-group-row.js => request-group-row.tsx} |    38 +-
 .../{request-row.js => request-row.tsx}       |    21 +-
 .../export-requests/{tree.js => tree.tsx}     |    22 +-
 .../{forms.stories.js => forms.stories.tsx}   |     4 +-
 ...lt-value.js => graph-ql-default-value.tsx} |    14 +-
 ...rer-enum.js => graph-ql-explorer-enum.tsx} |    17 +-
 ...nk.js => graph-ql-explorer-field-link.tsx} |    18 +-
 ...r-field.js => graph-ql-explorer-field.tsx} |    28 +-
 ...schema.js => graph-ql-explorer-schema.tsx} |    28 +-
 ...ink.js => graph-ql-explorer-type-link.tsx} |    28 +-
 ...rer-type.js => graph-ql-explorer-type.tsx} |    51 +-
 ...h-ql-explorer.js => graph-ql-explorer.tsx} |    77 +-
 .../app/ui/components/grpc-spinner.js         |    17 -
 .../app/ui/components/grpc-spinner.tsx        |    15 +
 .../app/ui/components/help-tooltip.js         |    29 -
 ...ip.stories.js => help-tooltip.stories.tsx} |     4 +-
 .../app/ui/components/help-tooltip.tsx        |    33 +
 .../ui/components/{hotkey.js => hotkey.tsx}   |    33 +-
 ...nt-wrapper.js => html-element-wrapper.tsx} |    16 +-
 .../{editor.js => editor.tsx}                 |   150 +-
 .../key-value-editor/{row.js => row.tsx}      |   288 +-
 .../{keydown-binder.js => keydown-binder.ts}  |    23 +-
 ...markdown-editor.js => markdown-editor.tsx} |    60 +-
 ...rkdown-preview.js => markdown-preview.tsx} |    66 +-
 .../modals/__mocks__/{index.js => index.ts}   |     1 +
 ...modal.js => add-key-combination-modal.tsx} |    43 +-
 .../{alert-modal.js => alert-modal.tsx}       |    53 +-
 .../modals/{ask-modal.js => ask-modal.tsx}    |    57 +-
 ...-prompt-modal.js => code-prompt-modal.tsx} |    88 +-
 ...odify-modal.js => cookie-modify-modal.tsx} |   102 +-
 .../{cookies-modal.js => cookies-modal.tsx}   |    76 +-
 ...it-modal.js => environment-edit-modal.tsx} |    65 +-
 .../{error-modal.js => error-modal.tsx}       |    46 +-
 ...sts-modal.js => export-requests-modal.tsx} |    80 +-
 ...er-help-modal.js => filter-help-modal.tsx} |    25 +-
 ...-code-modal.js => generate-code-modal.tsx} |    90 +-
 ...fig-modal.js => generate-config-modal.tsx} |    74 +-
 ...anches-modal.js => git-branches-modal.tsx} |   112 +-
 .../{git-log-modal.js => git-log-modal.tsx}   |    43 +-
 ...l.js => git-repository-settings-modal.tsx} |    83 +-
 ...staging-modal.js => git-staging-modal.tsx} |   144 +-
 .../components/modals/{index.js => index.ts}  |    13 +-
 .../{login-modal.js => login-modal.tsx}       |    64 +-
 ...-modal.js => move-request-group-modal.tsx} |    56 +-
 .../{nunjucks-modal.js => nunjucks-modal.tsx} |    58 +-
 ...odal.js => payment-notification-modal.tsx} |    16 +-
 .../{prompt-modal.js => prompt-modal.tsx}     |   148 +-
 ...o-files-modal.js => proto-files-modal.tsx} |    85 +-
 ...eate-modal.js => request-create-modal.tsx} |    85 +-
 ...odal.js => request-render-error-modal.tsx} |    29 +-
 ...gs-modal.js => request-settings-modal.tsx} |   156 +-
 ...er-modal.js => request-switcher-modal.tsx} |   170 +-
 ...ebug-modal.js => response-debug-modal.tsx} |    46 +-
 .../{select-modal.js => select-modal.tsx}     |    68 +-
 .../{settings-modal.js => settings-modal.tsx} |    91 +-
 ...nches-modal.js => sync-branches-modal.tsx} |   123 +-
 ...-delete-modal.js => sync-delete-modal.tsx} |    57 +-
 ...istory-modal.js => sync-history-modal.tsx} |    52 +-
 ...nc-merge-modal.js => sync-merge-modal.tsx} |    55 +-
 ...nc-share-modal.js => sync-share-modal.tsx} |    67 +-
 ...taging-modal.js => sync-staging-modal.tsx} |   126 +-
 ... => workspace-environments-edit-modal.tsx} |   195 +-
 ...-modal.js => workspace-settings-modal.tsx} |   151 +-
 .../{wrapper-modal.js => wrapper-modal.tsx}   |    60 +-
 .../{notice.stories.js => notice.stories.tsx} |     4 +-
 .../ui/components/{notice.js => notice.tsx}   |    35 +-
 ...-container.js => onboarding-container.tsx} |    13 +-
 .../{page-layout.js => page-layout.tsx}       |    72 +-
 .../panes/{blank-pane.js => blank-pane.tsx}   |    11 +-
 ....test.js => use-proto-file-reload.test.ts} |    39 +-
 .../grpc-request-pane/{index.js => index.tsx} |    43 +-
 ...ion-handlers.js => use-action-handlers.ts} |    20 +-
 ...nge-handlers.js => use-change-handlers.ts} |    38 +-
 ...grpc-urls.js => use-existing-grpc-urls.ts} |     1 -
 ...ile-reload.js => use-proto-file-reload.ts} |     8 +-
 ...ected-method.js => use-selected-method.ts} |    33 +-
 ...esponse-pane.js => grpc-response-pane.tsx} |    19 +-
 .../ui/components/panes/{pane.js => pane.tsx} |    30 +-
 ...t-pane.js => placeholder-request-pane.tsx} |    19 +-
 ...-pane.js => placeholder-response-pane.tsx} |    11 +-
 .../{request-pane.js => request-pane.tsx}     |   107 +-
 .../{response-pane.js => response-pane.tsx}   |    88 +-
 ...-item.js => proto-directory-list-item.tsx} |    20 +-
 ...-list-item.js => proto-file-list-item.tsx} |    41 +-
 ...proto-file-list.js => proto-file-list.tsx} |    26 +-
 ...{proto-list-item.js => proto-list-item.ts} |     7 +-
 ...ry-string.js => rendered-query-string.tsx} |    67 +-
 .../app/ui/components/rendered-text.js        |    59 -
 .../app/ui/components/rendered-text.tsx       |    64 +
 ...request-url-bar.js => request-url-bar.tsx} |   146 +-
 .../{response-timer.js => response-timer.tsx} |    45 +-
 .../settings/{account.js => account.tsx}      |    91 +-
 .../settings/{general.js => general.tsx}      |   155 +-
 .../{import-export.js => import-export.tsx}   |    28 +-
 .../settings/{plugins.js => plugins.tsx}      |   113 +-
 .../settings/{shortcuts.js => shortcuts.tsx}  |    50 +-
 .../settings/{theme.js => theme.tsx}          |    61 +-
 ...debar-children.js => sidebar-children.tsx} |   116 +-
 ...ropdown.js => sidebar-create-dropdown.tsx} |    28 +-
 .../{sidebar-filter.js => sidebar-filter.tsx} |    39 +-
 ...p-row.js => sidebar-request-group-row.tsx} |   108 +-
 ...request-row.js => sidebar-request-row.tsx} |   180 +-
 .../sidebar/sidebar-sort-dropdown.js          |    27 -
 .../sidebar/sidebar-sort-dropdown.tsx         |    22 +
 .../sidebar/{sidebar.js => sidebar.tsx}       |    36 +-
 ...tor-sidebar.js => spec-editor-sidebar.tsx} |    64 +-
 ...nc-pull-button.js => sync-pull-button.tsx} |    47 +-
 ...grpc-method-tag.js => grpc-method-tag.tsx} |    12 +-
 .../app/ui/components/tags/grpc-status-tag.js |    34 -
 .../ui/components/tags/grpc-status-tag.tsx    |    32 +
 .../tags/{grpc-tag.js => grpc-tag.tsx}        |     5 +-
 .../tags/{method-tag.js => method-tag.tsx}    |    23 +-
 .../tags/{size-tag.js => size-tag.tsx}        |    33 +-
 .../tags/{status-tag.js => status-tag.tsx}    |    36 +-
 .../tags/{time-tag.js => time-tag.tsx}        |    29 +-
 .../tags/{url-tag.js => url-tag.tsx}          |    33 +-
 .../{tag-editor.js => tag-editor.tsx}         |   187 +-
 ...variable-editor.js => variable-editor.tsx} |    56 +-
 .../{time-from-now.js => time-from-now.tsx}   |    44 +-
 .../app/ui/components/{toast.js => toast.tsx} |   105 +-
 ...tooltip.stories.js => tooltip.stories.tsx} |    17 +-
 .../ui/components/{tooltip.js => tooltip.tsx} |   119 +-
 .../app/ui/components/unit-test-editable.js   |    12 -
 .../app/ui/components/unit-test-editable.tsx  |    13 +
 ...d-messages.js => grpc-tabbed-messages.tsx} |    51 +-
 ...-viewer.js => response-cookies-viewer.tsx} |    27 +-
 ...-csv-viewer.js => response-csv-viewer.tsx} |    37 +-
 .../{response-error.js => response-error.tsx} |    23 +-
 ...-viewer.js => response-headers-viewer.tsx} |    32 +-
 ...se-multipart.js => response-multipart.tsx} |   124 +-
 ...-pdf-viewer.js => response-pdf-viewer.tsx} |    53 +-
 .../{response-raw.js => response-raw.tsx}     |    18 +-
 ...viewer.js => response-timeline-viewer.tsx} |    36 +-
 ...response-viewer.js => response-viewer.tsx} |   114 +-
 ...onse-web-view.js => response-web-view.tsx} |    36 +-
 ...ge-header.js => workspace-page-header.tsx} |    32 +-
 ...per-analytics.js => wrapper-analytics.tsx} |    15 +-
 .../{wrapper-debug.js => wrapper-debug.tsx}   |    94 +-
 .../{wrapper-design.js => wrapper-design.tsx} |    68 +-
 .../{wrapper-home.js => wrapper-home.tsx}     |   139 +-
 ...per-migration.js => wrapper-migration.tsx} |   103 +-
 ...r-onboarding.js => wrapper-onboarding.tsx} |    45 +-
 ...per-unit-test.js => wrapper-unit-test.tsx} |   171 +-
 .../ui/components/{wrapper.js => wrapper.tsx} |   383 +-
 .../app/ui/containers/{app.js => app.tsx}     |   617 +-
 ...g-drop-context.js => drag-drop-context.ts} |     2 +-
 .../{grpc-actions.js => grpc-actions.ts}      |     1 +
 ...ssage-schema.js => grpc-message-schema.ts} |     2 +-
 ...ma.js => grpc-method-definition-schema.ts} |     2 +-
 .../__schemas__/grpc-status-object-schema.js  |     9 -
 .../__schemas__/grpc-status-object-schema.ts  |     9 +
 .../grpc/__schemas__/{index.js => index.ts}   |     0
 ...tate-schema.js => request-state-schema.ts} |     2 -
 ...-context.test.js => grpc-context.test.tsx} |     5 -
 ...erer.test.js => grpc-ipc-renderer.test.ts} |    20 +-
 ...c-reducer.test.js => grpc-reducer.test.ts} |   153 +-
 .../grpc/{grpc-actions.js => grpc-actions.ts} |   103 +-
 .../{grpc-context.js => grpc-context.tsx}     |    32 +-
 ...c-ipc-renderer.js => grpc-ipc-renderer.ts} |     2 -
 .../grpc/{grpc-reducer.js => grpc-reducer.ts} |    65 +-
 .../ui/context/grpc/{index.js => index.ts}    |     2 -
 packages/insomnia-app/app/ui/dnd-backend.js   |    38 -
 packages/insomnia-app/app/ui/dnd-backend.ts   |    46 +
 .../app/ui/{index.js => index.tsx}            |    16 +-
 ...ectors.test.js => proto-selectors.test.ts} |   105 +-
 ...tors.test.js => sidebar-selectors.test.ts} |    42 +-
 .../app/ui/redux/{create.js => create.ts}     |     9 +-
 .../__tests__/{git.test.js => git.test.tsx}   |   267 +-
 .../{global.test.js => global.test.ts}        |   256 +-
 .../{helpers.test.js => helpers.test.ts}      |     6 -
 .../{workspace.test.js => workspace.test.ts}  |    46 +-
 .../modules/{entities.js => entities.ts}      |    24 +-
 .../app/ui/redux/modules/{git.js => git.tsx}  |    56 +-
 .../redux/modules/{global.js => global.tsx}   |   236 +-
 .../redux/modules/{helpers.js => helpers.ts}  |    17 +-
 .../ui/redux/modules/{index.js => index.ts}   |    11 +-
 .../modules/{workspace.js => workspace.ts}    |    28 +-
 ...{proto-selectors.js => proto-selectors.ts} |    33 +-
 .../ui/redux/{selectors.js => selectors.ts}   |    59 +-
 ...ebar-selectors.js => sidebar-selectors.ts} |    15 +-
 packages/insomnia-app/bin/yarn-standalone.js  |     2 +-
 packages/insomnia-app/config/index.js         |    10 -
 packages/insomnia-app/flow-typed/anybase.js   |     5 -
 .../flow-typed/autobind-decorator.js          |     5 -
 packages/insomnia-app/flow-typed/aws4.js      |     7 -
 .../insomnia-app/flow-typed/classnames.js     |     5 -
 packages/insomnia-app/flow-typed/clone.js     |     5 -
 .../insomnia-app/flow-typed/codemirror.js     |    35 -
 packages/insomnia-app/flow-typed/color.js     |    15 -
 .../insomnia-app/flow-typed/deep-equal.js     |     5 -
 .../flow-typed/electron-context-menu.js       |     5 -
 .../flow-typed/electron-squirrel-startup.js   |     5 -
 .../flow-typed/electron-updater.js            |    10 -
 packages/insomnia-app/flow-typed/electron.js  |    27 -
 packages/insomnia-app/flow-typed/events.js    |     5 -
 .../insomnia-app/flow-typed/font-scanner.js   |     5 -
 packages/insomnia-app/flow-typed/fs-extra.js  |     7 -
 packages/insomnia-app/flow-typed/fuzzysort.js |     8 -
 packages/insomnia-app/flow-typed/hawk.js      |     5 -
 .../insomnia-app/flow-typed/iconv-lite.js     |     5 -
 .../flow-typed/insomnia-cookies.js            |     9 -
 .../flow-typed/insomnia-importers.js          |    18 -
 .../flow-typed/insomnia-plugin-hash.js        |     9 -
 .../flow-typed/insomnia-prettify.js           |     7 -
 .../insomnia-app/flow-typed/insomnia-url.js   |    13 -
 .../insomnia-app/flow-typed/isomorphic-git.js |     5 -
 packages/insomnia-app/flow-typed/jest.js      |  1186 --
 .../insomnia-app/flow-typed/json-order.js     |    25 -
 packages/insomnia-app/flow-typed/jsonpath.js  |     7 -
 .../flow-typed/jwt-authentication.js          |     5 -
 .../insomnia-app/flow-typed/mime-types.js     |     8 -
 packages/insomnia-app/flow-typed/mkdirp.js    |     7 -
 packages/insomnia-app/flow-typed/moment.js    |    12 -
 .../insomnia-app/flow-typed/multiparty.js     |     5 -
 packages/insomnia-app/flow-typed/nedb.js      |    12 -
 .../insomnia-app/flow-typed/node-libcurl.js   |    62 -
 packages/insomnia-app/flow-typed/nunjucks.js  |    27 -
 .../insomnia-app/flow-typed/oauth-1.0a.js     |    30 -
 .../insomnia-app/flow-typed/objectpath.js     |     5 -
 .../insomnia-app/flow-typed/openapi-2-kong.js |     9 -
 packages/insomnia-app/flow-typed/papaparse.js |     7 -
 .../insomnia-app/flow-typed/pdfjs-dist.js     |     5 -
 packages/insomnia-app/flow-typed/react-dom.js |    11 -
 .../flow-typed/react-sortable-hoc.js          |    11 -
 .../insomnia-app/flow-typed/react-tabs.js     |    12 -
 packages/insomnia-app/flow-typed/reselect.js  |     7 -
 packages/insomnia-app/flow-typed/rimraf.js    |     7 -
 .../flow-typed/styled-components.js           |   432 -
 .../flow-typed/swagger-ui-react.js            |     5 -
 .../insomnia-app/flow-typed/tough-cookie.js   |     5 -
 packages/insomnia-app/flow-typed/url-join.js  |     5 -
 packages/insomnia-app/flow-typed/uuid.js      |     8 -
 packages/insomnia-app/flow-typed/xmldom.js    |     7 -
 packages/insomnia-app/flow-typed/yaml.js      |     9 -
 packages/insomnia-app/jest.config.js          |    35 +
 packages/insomnia-app/package-lock.json       |  1414 +-
 packages/insomnia-app/package.json            |   118 +-
 .../insomnia-app/scripts/afterSignHook.js     |    17 +-
 packages/insomnia-app/scripts/build.js        |   247 -
 packages/insomnia-app/scripts/build.ts        |   247 +
 ...{getBuildContext.js => getBuildContext.ts} |    50 +-
 packages/insomnia-app/scripts/package.js      |    77 -
 packages/insomnia-app/scripts/package.ts      |    82 +
 packages/insomnia-app/scripts/release.js      |    93 -
 packages/insomnia-app/scripts/release.ts      |   103 +
 .../scripts/startDevServer.ts}                |     0
 .../send-request/{index.js => index.ts}       |     0
 packages/insomnia-app/tsconfig.build.json     |    35 +
 packages/insomnia-app/tsconfig.build.sr.json  |    11 +
 packages/insomnia-app/tsconfig.json           |    20 +
 packages/insomnia-app/tsconfig.webpack.json   |    19 +
 ...g.base.babel.js => webpack.config.base.ts} |    33 +-
 .../webpack.config.development.babel.js       |    55 -
 .../webpack/webpack.config.development.ts     |    58 +
 ...on.babel.js => webpack.config.electron.ts} |    30 +-
 ....babel.js => webpack.config.production.ts} |    12 +-
 .../webpack.config.sr.ts}                     |    30 +-
 packages/insomnia-components/.babelrc         |    20 -
 packages/insomnia-components/.eslintignore    |     2 +
 packages/insomnia-components/.eslintrc.js     |     7 +
 packages/insomnia-components/.flowconfig      |    16 -
 packages/insomnia-components/.gitignore       |     2 +-
 .../.storybook/configs/contexts.js            |     2 +-
 .../insomnia-components/.storybook/main.js    |     9 +
 .../insomnia-components/.storybook/manager.js |    58 +-
 .../insomnia-components/.storybook/preview.js |     2 +-
 packages/insomnia-components/.svgrrc.json     |     8 -
 .../insomnia-components/__mocks__/dummy.js    |     1 -
 .../components/breadcrumb.stories.js          |     8 -
 .../components/button/async-button.js         |    49 -
 .../components/button/index.js                |     3 -
 .../components/card-container.js              |    17 -
 .../components/header.stories.js              |    24 -
 .../list-group/unit-test-result-badge.js      |    39 -
 .../list-group/unit-test-result-item.js       |    53 -
 .../components/multi-switch.stories.js        |    20 -
 .../components/radio-button-group.stories.js  |    23 -
 .../components/sidebar/sidebar-info.js        |    42 -
 .../sidebar/sidebar-invalid-section.js        |    18 -
 .../components/sidebar/sidebar-panel.js       |    24 -
 .../components/svg-icon.js                    |   221 -
 .../components/switch.stories.js              |    22 -
 .../insomnia-components/components/table.js   |   123 -
 .../flow-typed/@storybook/addon-knobs.js      |    11 -
 .../flow-typed/@storybook/framer-motion.js    |    10 -
 .../flow-typed/autobind-decorator.js          |     5 -
 .../flow-typed/class-autobind-decorator.js    |     5 -
 .../insomnia-components/flow-typed/md5.js     |     5 -
 .../flow-typed/npm/classnames_v2.x.x.js       |    23 -
 .../npm/styled-components_v4.x.x.js           |   432 -
 .../flow-typed/react-dom.js                   |    10 -
 .../flow-typed/react-switch.js                |     7 -
 .../flow-typed/react-use.js                   |     7 -
 packages/insomnia-components/index.js         |    48 -
 packages/insomnia-components/jest.config.js   |    21 +
 .../insomnia-components/package-lock.json     | 16130 ++++++++++++----
 packages/insomnia-components/package.json     |    83 +-
 .../{ => src}/assets/icn-arrow-right.svg      |     0
 .../{ => src}/assets/icn-bitbucket-logo.svg   |     0
 .../{ => src}/assets/icn-brackets.svg         |     0
 .../{ => src}/assets/icn-burger-menu.svg      |     0
 .../{ => src}/assets/icn-checkmark.svg        |     0
 .../{ => src}/assets/icn-chevron-down.svg     |     0
 .../{ => src}/assets/icn-chevron-up.svg       |     0
 .../{ => src}/assets/icn-clock.svg            |     0
 .../{ => src}/assets/icn-cookie.svg           |     0
 .../{ => src}/assets/icn-drag-grip.svg        |     0
 .../{ => src}/assets/icn-elevator.svg         |     0
 .../{ => src}/assets/icn-ellipsis-circle.svg  |     0
 .../{ => src}/assets/icn-ellipsis.svg         |     0
 .../{ => src}/assets/icn-empty.svg            |     0
 .../{ => src}/assets/icn-errors.svg           |     0
 .../{ => src}/assets/icn-file.svg             |     0
 .../{ => src}/assets/icn-folder-open.svg      |     0
 .../{ => src}/assets/icn-folder.svg           |     0
 .../{ => src}/assets/icn-gear.svg             |     0
 .../{ => src}/assets/icn-git-branch.svg       |     0
 .../{ => src}/assets/icn-github-logo.svg      |     0
 .../{ => src}/assets/icn-gitlab-logo.svg      |     0
 .../{ => src}/assets/icn-gui.svg              |     0
 .../{ => src}/assets/icn-indentation.svg      |     0
 .../{ => src}/assets/icn-info.svg             |     0
 .../{ => src}/assets/icn-key.svg              |     0
 .../assets/icn-minus-circle-fill.svg          |     0
 .../{ => src}/assets/icn-minus-circle.svg     |     0
 .../{ => src}/assets/icn-placeholder.svg      |     0
 .../{ => src}/assets/icn-play.svg             |     0
 .../{ => src}/assets/icn-plus.svg             |     0
 .../{ => src}/assets/icn-prohibited.svg       |     0
 .../{ => src}/assets/icn-question-fill.svg    |     0
 .../{ => src}/assets/icn-question.svg         |     0
 .../{ => src}/assets/icn-search.svg           |     0
 .../{ => src}/assets/icn-sec-cert.svg         |     0
 .../{ => src}/assets/icn-success.svg          |     0
 .../{ => src}/assets/icn-sync.svg             |     0
 .../{ => src}/assets/icn-trashcan.svg         |     0
 .../{ => src}/assets/icn-triangle.svg         |     0
 .../{ => src}/assets/icn-user.svg             |     0
 .../{ => src}/assets/icn-warning-circle.svg   |     0
 .../{ => src}/assets/icn-warning.svg          |     0
 .../{ => src}/assets/icn-x.svg                |     0
 .../src/breadcrumb.stories.tsx                |    13 +
 .../breadcrumb.js => src/breadcrumb.tsx}      |    30 +-
 .../button/async-button.stories.tsx}          |    19 +-
 .../src/button/async-button.tsx               |    50 +
 .../button/button.stories.tsx}                |    41 +-
 .../button.js => src/button/button.tsx}       |    42 +-
 .../button/circle-button.stories.tsx}         |    10 +-
 .../button/circle-button.tsx}                 |    16 +-
 .../insomnia-components/src/button/index.ts   |     3 +
 .../src/card-container.tsx                    |    14 +
 .../card.stories.js => src/card.stories.tsx}  |     7 +-
 .../{components/card.js => src/card.tsx}      |    58 +-
 .../dropdown/dropdown-divider.tsx}            |    11 +-
 .../dropdown/dropdown-item.tsx}               |    62 +-
 .../dropdown/dropdown.stories.tsx}            |    15 +-
 .../dropdown.js => src/dropdown/dropdown.tsx} |   312 +-
 .../insomnia-components/src/dropdown/index.ts |     3 +
 .../src/header.stories.tsx                    |    29 +
 .../{components/header.js => src/header.tsx}  |    21 +-
 .../help-tooltip.stories.tsx}                 |    12 +-
 .../help-tooltip.js => src/help-tooltip.tsx}  |    32 +-
 packages/insomnia-components/src/index.ts     |    27 +
 .../jest/setup-after-env.ts}                  |     1 +
 .../src/list-group/index.ts                   |     7 +
 .../list-group/list-group-item.tsx}           |    13 +-
 .../list-group/list-group.stories.tsx}        |    60 +-
 .../list-group/list-group.tsx}                |    17 +-
 .../list-group/unit-test-item.tsx}            |    77 +-
 .../unit-test-request-selector.tsx}           |    26 +-
 .../src/list-group/unit-test-result-badge.tsx |    36 +
 .../src/list-group/unit-test-result-item.tsx  |    62 +
 .../unit-test-result-timestamp.tsx}           |    17 +-
 .../src/multi-switch.stories.tsx              |    31 +
 .../multi-switch.js => src/multi-switch.tsx}  |    13 +-
 .../notice-table.stories.tsx}                 |    33 +-
 .../notice-table.js => src/notice-table.tsx}  |    82 +-
 .../src/radio-button-group.stories.tsx        |    35 +
 .../radio-button-group.tsx}                   |    48 +-
 .../insomnia-components/src/sidebar/index.tsx |    18 +
 .../sidebar/sidebar-badge.tsx}                |    23 +-
 .../sidebar/sidebar-filter.tsx}               |    29 +-
 .../sidebar/sidebar-header.tsx}               |    39 +-
 .../sidebar/sidebar-headers.tsx}              |    31 +-
 .../src/sidebar/sidebar-info.tsx              |    55 +
 .../src/sidebar/sidebar-invalid-section.tsx   |    15 +
 .../sidebar/sidebar-item.tsx}                 |    21 +-
 .../src/sidebar/sidebar-panel.tsx             |    29 +
 .../sidebar/sidebar-parameters.tsx}           |    31 +-
 .../sidebar/sidebar-paths.tsx}                |    44 +-
 .../sidebar/sidebar-requests.tsx}             |    39 +-
 .../sidebar/sidebar-responses.tsx}            |    27 +-
 .../sidebar/sidebar-schemas.tsx}              |    25 +-
 .../sidebar/sidebar-section.tsx}              |    33 +-
 .../sidebar/sidebar-security.tsx}             |    29 +-
 .../sidebar/sidebar-servers.tsx}              |    35 +-
 .../sidebar/sidebar-text-item.tsx}            |    17 +-
 .../sidebar/sidebar.stories.tsx}              |    99 +-
 .../index.js => src/sidebar/sidebar.tsx}      |   116 +-
 .../svg-icon.stories.tsx}                     |    22 +-
 packages/insomnia-components/src/svg-icon.tsx |   220 +
 .../src/switch.stories.tsx                    |    36 +
 .../{components/switch.js => src/switch.tsx}  |    35 +-
 .../table.stories.tsx}                        |     7 +-
 packages/insomnia-components/src/table.tsx    |   112 +
 .../toggle-switch.stories.tsx}                |    15 +-
 .../toggle-switch.tsx}                        |    46 +-
 .../tooltip.stories.tsx}                      |    13 +-
 .../tooltip.test.js => src/tooltip.test.tsx}  |    16 +-
 .../tooltip.js => src/tooltip.tsx}            |   130 +-
 packages/insomnia-components/svgr.config.js   |    24 +
 .../insomnia-components/tsconfig.build.json   |    19 +
 packages/insomnia-components/tsconfig.json    |    16 +
 .../webpack/webpack.common.js                 |    25 +-
 .../webpack/webpack.dev.js                    |     7 +-
 .../webpack/webpack.prod.js                   |     5 +-
 packages/insomnia-cookies/.eslintignore       |     3 +
 packages/insomnia-cookies/jest.config.js      |    17 +
 packages/insomnia-cookies/package.json        |    16 +-
 .../index.test.js => src/cookies.test.ts}     |    17 +-
 .../{index.js => src/cookies.ts}              |    35 +-
 packages/insomnia-cookies/src/index.ts        |     1 +
 .../insomnia-cookies/src/tough-cookie.d.ts    |   244 +
 packages/insomnia-cookies/tsconfig.build.json |    15 +
 packages/insomnia-cookies/tsconfig.json       |    14 +
 packages/insomnia-importers/.eslintignore     |     2 +
 packages/insomnia-importers/.eslintrc.js      |     8 +
 packages/insomnia-importers/README.md         |     4 +-
 packages/insomnia-importers/bin/cli           |     2 +-
 packages/insomnia-importers/index.js          |    45 -
 packages/insomnia-importers/jest.config.js    |    17 +
 packages/insomnia-importers/package-lock.json |   274 +-
 packages/insomnia-importers/package.json      |    29 +-
 .../insomnia-importers/src/{cli.js => cli.ts} |    24 +-
 .../import-errors.test.js => convert.test.ts} |     6 +-
 packages/insomnia-importers/src/convert.ts    |    49 +
 packages/insomnia-importers/src/entities.ts   |   101 +
 .../src/importers/apiconnect-wsdl.d.ts        |    62 +
 .../insomnia-importers/src/importers/curl.js  |   258 -
 .../insomnia-importers/src/importers/curl.ts  |   344 +
 .../fixtures/curl/complex-input.sh            |     0
 .../fixtures/curl/complex-output.json         |     0
 .../fixtures/curl/dollar-sign-input.sh        |     0
 .../fixtures/curl/dollar-sign-output.json     |     0
 .../fixtures/curl/form-input.sh               |     0
 .../fixtures/curl/form-output.json            |     0
 .../fixtures/curl/from-chrome-input.sh        |     0
 .../fixtures/curl/from-chrome-output.json     |     0
 .../fixtures/curl/get-input.sh                |     0
 .../fixtures/curl/get-output.json             |     0
 .../fixtures/curl/header-colon-input.sh       |     0
 .../fixtures/curl/header-colon-output.json    |     0
 .../fixtures/curl/multi-data-input.sh         |     0
 .../fixtures/curl/multi-data-output.json      |     0
 .../fixtures/curl/multi-input.sh              |     0
 .../fixtures/curl/multi-output.json           |     0
 .../fixtures/curl/no-url-input.sh             |     0
 .../fixtures/curl/no-url-output.json          |     0
 .../fixtures/curl/question-mark-input.sh      |     0
 .../fixtures/curl/question-mark-output.json   |     0
 .../fixtures/curl/simple-url-input.sh         |     0
 .../fixtures/curl/simple-url-output.json      |     0
 .../fixtures/curl/skip-squished-input.sh      |     0
 .../fixtures/curl/squished-output.json        |     0
 .../fixtures/curl/url-only-input.sh           |     0
 .../fixtures/curl/url-only-output.json        |     0
 .../fixtures/curl/urlencoded-input.sh         |     0
 .../fixtures/curl/urlencoded-output.json      |     0
 .../fixtures/har/deep-input.json              |     0
 .../fixtures/har/deep-output.json             |     0
 .../fixtures/har/form-data-input.json         |     0
 .../fixtures/har/form-data-output.json        |     0
 .../fixtures/har/minimal-input.json           |     0
 .../fixtures/har/minimal-output.json          |     0
 .../fixtures/har/no-requests-input.json       |     0
 .../fixtures/har/no-requests-output.json      |     0
 .../fixtures/har/shallow-input.json           |     0
 .../fixtures/har/shallow-output.json          |     0
 .../fixtures/insomnia-1/complex-input.json    |     0
 .../fixtures/insomnia-1/complex-output.json   |     0
 .../fixtures/insomnia-1/form-input.json       |     0
 .../fixtures/insomnia-1/form-output.json      |     0
 .../fixtures/insomnia-1/minimal-input.json    |     0
 .../fixtures/insomnia-1/minimal-output.json   |     0
 .../fixtures/insomnia-2/complex-input.json    |     0
 .../fixtures/insomnia-2/complex-output.json   |     0
 .../fixtures/insomnia-3/basic-input.json      |     0
 .../fixtures/insomnia-3/basic-output.json     |     0
 .../fixtures/insomnia-4/basic-input.yaml      |     0
 .../fixtures/insomnia-4/basic-output.json     |     0
 .../fixtures/openapi3/dereferenced-input.json |     0
 .../openapi3/dereferenced-output.json         |     0
 .../dereferenced-with-tags-input.json         |     0
 .../dereferenced-with-tags-output.json        |     0
 .../openapi3/endpoint-security-input.yaml     |     0
 .../openapi3/endpoint-security-output.json    |     0
 .../example-with-server-variables-input.yaml  |     0
 .../example-with-server-variables-output.json |     0
 .../example-without-servers-input.yaml        |     0
 .../example-without-servers-output.json       |     0
 .../openapi3/global-security-input.yaml       |     0
 .../openapi3/global-security-output.json      |     0
 .../fixtures/openapi3/path-plugin-input.yaml  |     0
 .../fixtures/openapi3/path-plugin-output.json |     0
 .../fixtures/openapi3/petstore-input.json     |     0
 .../fixtures/openapi3/petstore-output.json    |     0
 .../openapi3/petstore-readonly-input.yml      |     0
 .../openapi3/petstore-readonly-output.json    |     0
 .../openapi3/petstore-with-tags-input.json    |     0
 .../openapi3/petstore-with-tags-output.json   |     0
 .../fixtures/openapi3/petstore-yml-input.yml  |     0
 .../openapi3/petstore-yml-output.json         |     0
 .../openapi3/petstore-yml-with-tags-input.yml |     0
 .../petstore-yml-with-tags-output.json        |     0
 .../fixtures/postman-env/basic-input.json     |     0
 .../fixtures/postman-env/basic-output.json    |     0
 .../fixtures/postman-env/no-name-input.json   |     0
 .../fixtures/postman-env/no-name-output.json  |     0
 .../aws-signature-auth-v2_0-input.json        |     0
 .../aws-signature-auth-v2_0-output.json       |     0
 .../aws-signature-auth-v2_1-input.json        |     0
 .../aws-signature-auth-v2_1-output.json       |     0
 .../postman/basic-auth-v2_0-input.json        |     0
 .../postman/basic-auth-v2_0-output.json       |     0
 .../postman/basic-auth-v2_1-input.json        |     0
 .../postman/basic-auth-v2_1-output.json       |     0
 .../postman/bearer-token-v2_0-input.json      |     0
 .../postman/bearer-token-v2_0-output.json     |     0
 .../postman/bearer-token-v2_1-input.json      |     0
 .../postman/bearer-token-v2_1-output.json     |     0
 .../postman/complex-url-v2_0-input.json       |     0
 .../postman/complex-url-v2_0-output.json      |     0
 .../postman/complex-url-v2_1-input.json       |     0
 .../postman/complex-url-v2_1-output.json      |     0
 .../fixtures/postman/complex-v2_0-input.json  |     0
 .../fixtures/postman/complex-v2_0-output.json |     0
 .../fixtures/postman/complex-v2_1-input.json  |     0
 .../fixtures/postman/complex-v2_1-output.json |     0
 .../postman/digest-auth-v2_0-input.json       |     0
 .../postman/digest-auth-v2_0-output.json      |     0
 .../postman/digest-auth-v2_1-input.json       |     0
 .../postman/digest-auth-v2_1-output.json      |     0
 .../fixtures/postman/minimal-v2_0-input.json  |     0
 .../fixtures/postman/minimal-v2_0-output.json |     0
 .../fixtures/postman/minimal-v2_1-input.json  |     0
 .../fixtures/postman/minimal-v2_1-output.json |     0
 .../postman/oauth1_0-auth-v2_0-input.json     |     0
 .../postman/oauth1_0-auth-v2_0-output.json    |     0
 .../postman/oauth1_0-auth-v2_1-input.json     |     0
 .../postman/oauth1_0-auth-v2_1-output.json    |     0
 .../postman/oauth2_0-auth-v2_0-input.json     |     0
 .../postman/oauth2_0-auth-v2_0-output.json    |     0
 .../postman/oauth2_0-auth-v2_1-input.json     |     0
 .../postman/oauth2_0-auth-v2_1-output.json    |     0
 .../fixtures/swagger2/dereferenced-input.json |     0
 .../swagger2/dereferenced-output.json         |     0
 .../dereferenced-with-tags-input.json         |     0
 .../dereferenced-with-tags-output.json        |     0
 .../fixtures/swagger2/petstore-input.json     |     0
 .../fixtures/swagger2/petstore-output.json    |     0
 .../swagger2/petstore-with-tags-input.json    |     0
 .../swagger2/petstore-with-tags-output.json   |     0
 .../fixtures/swagger2/petstore-yml-input.yml  |     0
 .../swagger2/petstore-yml-output.json         |     0
 .../swagger2/petstore-yml-with-tags-input.yml |     0
 .../petstore-yml-with-tags-output.json        |     0
 .../fixtures/swagger2/user-example-input.json |     0
 .../swagger2/user-example-output.json         |     0
 .../fixtures/wsdl/addition-input.wsdl         |     0
 .../fixtures/wsdl/addition-output.json        |     0
 .../fixtures/wsdl/calculator-input.wsdl       |     0
 .../fixtures/wsdl/calculator-output.json      |     0
 .../insomnia-importers/src/importers/har.js   |   137 -
 .../insomnia-importers/src/importers/har.ts   |   119 +
 .../index.test.ts}                            |    48 +-
 .../insomnia-importers/src/importers/index.ts |    32 +
 .../src/importers/insomnia-1.js               |   118 -
 .../src/importers/insomnia-1.ts               |   170 +
 .../src/importers/insomnia-2.js               |    37 -
 .../src/importers/insomnia-2.ts               |    46 +
 .../src/importers/insomnia-3.js               |    22 -
 .../src/importers/insomnia-3.ts               |    28 +
 .../src/importers/insomnia-4.js               |    24 -
 .../src/importers/insomnia-4.ts               |    28 +
 .../src/importers/openapi-3.ts                |   744 +
 .../src/importers/openapi3.js                 |   717 -
 .../src/importers/postman-2.0.types.ts        |   657 +
 .../src/importers/postman-2.1.types.ts        |   646 +
 .../src/importers/postman-env.js              |    38 -
 .../src/importers/postman-env.ts              |    54 +
 .../src/importers/postman.js                  |   411 -
 .../src/importers/postman.ts                  |   513 +
 .../src/importers/swagger-2.ts                |   589 +
 .../src/importers/swagger2.js                 |   521 -
 .../src/importers/{wsdl.js => wsdl.ts}        |   119 +-
 packages/insomnia-importers/src/index.ts      |     3 +
 packages/insomnia-importers/src/utils.js      |    64 -
 .../utils.test.js => utils.test.ts}           |    47 +-
 packages/insomnia-importers/src/utils.ts      |    49 +
 .../insomnia-importers/tsconfig.build.json    |    19 +
 packages/insomnia-importers/tsconfig.json     |    18 +
 packages/insomnia-inso/.babelrc               |    16 -
 packages/insomnia-inso/.eslintignore          |     3 +
 packages/insomnia-inso/.eslintrc.js           |     7 +
 packages/insomnia-inso/.flowconfig            |    14 -
 packages/insomnia-inso/README.md              |    16 +-
 packages/insomnia-inso/__jest__/before.js     |    27 -
 .../insomnia-inso/__mocks__/cosmiconfig.js    |     5 -
 packages/insomnia-inso/__mocks__/enquirer.js  |    20 -
 .../__mocks__/insomnia-send-request.js        |     3 -
 .../__mocks__/insomnia-testing.js             |     8 -
 packages/insomnia-inso/bin/inso               |     3 +-
 .../flow-typed/@stoplight/spectral.js         |     5 -
 .../insomnia-inso/flow-typed/commander.js     |     5 -
 packages/insomnia-inso/flow-typed/consola.js  |     5 -
 .../insomnia-inso/flow-typed/cosmiconfig.js   |     5 -
 packages/insomnia-inso/flow-typed/enquirer.js |     5 -
 packages/insomnia-inso/flow-typed/execa.js    |     5 -
 .../insomnia-inso/flow-typed/get-bin-path.js  |     5 -
 .../flow-typed/insomnia-send-request.js       |    11 -
 .../flow-typed/insomnia-testing.js            |     5 -
 packages/insomnia-inso/flow-typed/jest.js     |  1186 --
 .../flow-typed/lodash.flattendeep.js          |     5 -
 packages/insomnia-inso/flow-typed/mkdirp.js   |     7 -
 packages/insomnia-inso/flow-typed/nedb.js     |     5 -
 .../flow-typed/openapi-2-kong.js              |    38 -
 .../insomnia-inso/flow-typed/string-argv.js   |     5 -
 packages/insomnia-inso/flow-typed/yaml.js     |     9 -
 packages/insomnia-inso/jest.config.js         |    35 +
 packages/insomnia-inso/package-lock.json      |  2747 +--
 packages/insomnia-inso/package.json           |    60 +-
 .../src/__mocks__/cosmiconfig.ts              |     4 +
 .../src/__mocks__/{util.js => util.ts}        |     1 -
 .../inso-snapshot.test.ts.snap}               |     4 +-
 .../{__tests__/cli.test.js => cli.test.ts}    |    86 +-
 packages/insomnia-inso/src/{cli.js => cli.ts} |   140 +-
 .../__mocks__/insomnia-send-request.ts        |     1 +
 .../commands/__mocks__/insomnia-testing.ts    |     4 +
 .../commands/__mocks__/openapi-2-kong.ts}     |     4 +-
 ...n.test.js => export-specification.test.ts} |    34 +-
 ...ecification.js => export-specification.ts} |    18 +-
 .../openapi-spec.yaml                         |     0
 ...config.test.js => generate-config.test.ts} |    96 +-
 ...{generate-config.js => generate-config.ts} |    59 +-
 ...ion.test.js => lint-specification.test.ts} |    36 +-
 ...specification.js => lint-specification.ts} |    24 +-
 .../run-tests.test.js => run-tests.test.ts}   |    58 +-
 .../commands/{run-tests.js => run-tests.ts}   |    70 +-
 ...rectory.test.js => data-directory.test.ts} |    43 +-
 .../{data-directory.js => data-directory.ts}  |    12 +-
 .../src/db/__mocks__/{index.js => index.ts}   |     3 -
 ...it-adapter.test.js => git-adapter.test.ts} |     8 +-
 .../{git-adapter.js => git-adapter.ts}        |    27 +-
 .../src/db/adapters/ne-db-adapter.js          |    44 -
 ...-adapter.test.js => ne-db-adapter.test.ts} |     8 +-
 .../src/db/adapters/ne-db-adapter.ts          |    38 +
 .../spc_46c5a4a40e83445a9bd9d9758b86c16c.yml  |     0
 ...046a738f001eb3090261a537b1b78f86c2094c.yml |     0
 ...738f001eb3090261a537b1b78f86c2094c_sub.yml |     0
 ...2d4860c7da418a85ffea7406e1292a21946b60.yml |     0
 ...2d4860c7da418a85ffea7406e1292ab410454b.yml |     0
 ...2d4860c7da418a85ffea7406e1292a30baa249.yml |     0
 .../wrk_012d4860c7da418a85ffea7406e1292a.yml  |     0
 .../spc_46c5a4a40e83445a9bd9d9758b86c16c.yml  |     0
 ...046a738f001eb3090261a537b1b78f86c2094c.yml |     0
 ...738f001eb3090261a537b1b78f86c2094c_sub.yml |     0
 ...2d4860c7da418a85ffea7406e1292a21946b60.yml |     0
 ...2d4860c7da418a85ffea7406e1292ab410454b.yml |     0
 ...2d4860c7da418a85ffea7406e1292a30baa249.yml |     0
 .../ut_6b214a8cd07046f2a8f43237ca913c73.yml   |     0
 .../ut_8c0c020fb9e341c2a3162e723445faf1.yml   |     0
 .../ut_8fc42ec7f82a45d09e691ddfe212fd85.yml   |     0
 .../ut_97a197104e83454ebf5f4e0dc0ba4bc6.yml   |     0
 .../uts_7f0f85548b0147f4ba6b5e442d137613.yml  |     0
 .../uts_fe901c6565044f00aa620d3fe47f443f.yml  |     0
 .../wrk_012d4860c7da418a85ffea7406e1292a.yml  |     0
 .../nedb/insomnia.ApiSpec.db                  |     0
 .../nedb/insomnia.Environment.db              |     0
 .../nedb/insomnia.Request.db                  |     0
 .../nedb/insomnia.RequestGroup.db             |     0
 .../nedb/insomnia.UnitTest.db                 |     0
 .../nedb/insomnia.UnitTestSuite.db            |     0
 .../nedb/insomnia.Workspace.db                |     0
 .../index.test.js => index.test.ts}           |    51 +-
 .../src/db/{index.js => index.ts}             |    46 +-
 .../src/db/models/__mocks__/enquirer.ts       |    20 +
 .../api-spec.test.ts.snap}                    |     0
 .../environment.test.ts.snap}                 |     0
 .../unit-test-suite.test.ts.snap}             |     0
 .../insomnia-inso/src/db/models/api-spec.js   |    32 -
 .../api-spec.test.js => api-spec.test.ts}     |    27 +-
 .../insomnia-inso/src/db/models/api-spec.ts   |    46 +
 ...nvironment.test.js => environment.test.ts} |    43 +-
 .../models/{environment.js => environment.ts} |    35 +-
 packages/insomnia-inso/src/db/models/types.js |    45 -
 packages/insomnia-inso/src/db/models/types.ts |    42 +
 ...-suite.test.js => unit-test-suite.test.ts} |    33 +-
 ...{unit-test-suite.js => unit-test-suite.ts} |    50 +-
 packages/insomnia-inso/src/db/models/util.js  |    54 -
 packages/insomnia-inso/src/db/models/util.ts  |    63 +
 .../insomnia-inso/src/db/models/workspace.js  |    13 -
 .../workspace.test.js => workspace.test.ts}   |    21 +-
 .../insomnia-inso/src/db/models/workspace.ts  |    15 +
 .../src/{errors.js => errors.ts}              |     7 +-
 .../src/fixtures/.insorc-blank.yaml           |     0
 .../.insorc-missing-properties.yaml           |     0
 .../.insorc-with-scripts.yaml                 |     0
 .../{__fixtures__ => fixtures}/.insorc.yaml   |     0
 ...et-options.test.js => get-options.test.ts} |    95 +-
 .../src/{get-options.js => get-options.ts}    |    58 +-
 packages/insomnia-inso/src/global.d.ts        |     8 +
 packages/insomnia-inso/src/index.ts           |     1 +
 ...snapshot.test.js => inso-snapshot.test.ts} |    11 +-
 .../jest/__mocks__/node-libcurl.ts}           |     2 +-
 packages/insomnia-inso/src/jest/before.ts     |    35 +
 .../{__jest__/setup.js => src/jest/setup.ts}  |     1 -
 packages/insomnia-inso/src/logger.js          |    24 -
 .../logger.test.js => logger.test.ts}         |    11 +-
 packages/insomnia-inso/src/logger.ts          |    43 +
 .../insomnia-inso/src/openapi-2-kong.d.ts     |    57 +
 packages/insomnia-inso/src/types.ts           |     8 +
 .../{__tests__/util.test.js => util.test.ts}  |    54 +-
 .../insomnia-inso/src/{util.js => util.ts}    |    26 +-
 .../write-file.test.js => write-file.test.ts} |    34 +-
 .../src/{write-file.js => write-file.ts}      |     2 +-
 packages/insomnia-inso/tsconfig.build.json    |    27 +
 packages/insomnia-inso/tsconfig.json          |    14 +
 .../webpack/webpack.config.base.js            |    22 +-
 .../webpack/webpack.config.development.js     |     3 +-
 .../webpack/webpack.config.production.js      |     3 +-
 packages/insomnia-prettify/.eslintignore      |     1 +
 packages/insomnia-prettify/.eslintrc.js       |     7 +
 packages/insomnia-prettify/index.js           |     3 -
 packages/insomnia-prettify/jest.config.js     |    17 +
 packages/insomnia-prettify/package-lock.json  |  4866 +++++
 packages/insomnia-prettify/package.json       |    14 +-
 .../escaped-characters-input.json             |     0
 .../escaped-characters-output.json            |     0
 .../escaped-unicode-input.json                |     0
 .../escaped-unicode-output.json               |     0
 .../extra-whitespace-input.json               |     0
 .../extra-whitespace-output.json              |     0
 .../minimal-whitespace-input.json             |     0
 .../minimal-whitespace-output.json            |     0
 .../nunjucks-input.json                       |     0
 .../nunjucks-output.json                      |     0
 .../precision-input.json                      |     0
 .../precision-output.json                     |     0
 .../root-array-input.json                     |     0
 .../root-array-output.json                    |     0
 .../root-string-input.json                    |     0
 .../root-string-output.json                   |     0
 .../trailing-comma-input.json                 |     0
 .../trailing-comma-output.json                |     0
 .../unquoted-strings-input.json               |     0
 .../unquoted-strings-output.json              |     0
 packages/insomnia-prettify/src/index.ts       |     1 +
 .../{__tests__/json.test.js => json.test.ts}  |     8 +-
 .../src/{json.js => json.ts}                  |    55 +-
 .../insomnia-prettify/tsconfig.build.json     |    15 +
 packages/insomnia-prettify/tsconfig.json      |    15 +
 packages/insomnia-send-request/package.json   |     1 +
 packages/insomnia-smoke-test/core/app.test.js |     5 +-
 packages/insomnia-smoke-test/modules/debug.js |     2 +
 .../insomnia-smoke-test/modules/dropdown.js   |    10 +-
 packages/insomnia-smoke-test/modules/home.js  |    12 +-
 .../insomnia-smoke-test/package-lock.json     |  1616 +-
 packages/insomnia-smoke-test/package.json     |     2 +-
 packages/insomnia-testing/.babelrc            |    16 -
 packages/insomnia-testing/.eslintignore       |     2 +
 packages/insomnia-testing/.eslintrc.js        |     7 +
 packages/insomnia-testing/.flowconfig         |    15 -
 packages/insomnia-testing/flow-typed/axios.js |     9 -
 packages/insomnia-testing/flow-typed/chai.js  |     5 -
 packages/insomnia-testing/flow-typed/jest.js  |  1186 --
 .../insomnia-testing/flow-typed/mkdirp.js     |     7 -
 packages/insomnia-testing/flow-typed/mocha.js |    25 -
 packages/insomnia-testing/index.js            |     3 -
 packages/insomnia-testing/jest.config.js      |    20 +
 packages/insomnia-testing/package-lock.json   |  4862 +----
 packages/insomnia-testing/package.json        |    29 +-
 .../insomnia-testing/src/__mocks__/axios.js   |    27 -
 .../insomnia-testing/src/__mocks__/axios.ts   |    47 +
 .../01_empty.input.json                       |     0
 .../01_empty.output.js                        |     0
 .../02_empty-suite.input.json                 |     0
 .../02_empty-suite.output.js                  |     0
 .../03_basic-suite.input.json                 |     0
 .../03_basic-suite.output.js                  |     0
 .../04_nested-suite.input.json                |     0
 .../04_nested-suite.output.js                 |     0
 .../05_complex-suite.input.json               |     0
 .../05_complex-suite.output.js                |     0
 .../fixtures.test.js => generate.test.ts}     |    18 +-
 .../src/generate/{index.js => generate.ts}    |    81 +-
 .../insomnia-testing/src/generate/index.ts    |     6 +
 .../{__tests__/util.test.js => util.test.ts}  |    12 +-
 .../src/generate/{util.js => util.ts}         |    12 +-
 packages/insomnia-testing/src/index.ts        |    12 +
 .../integration.test.ts}                      |    54 +-
 packages/insomnia-testing/src/run/entities.ts |    32 +
 packages/insomnia-testing/src/run/index.js    |   144 -
 packages/insomnia-testing/src/run/index.ts    |     8 +
 packages/insomnia-testing/src/run/insomnia.js |   120 -
 packages/insomnia-testing/src/run/insomnia.ts |   124 +
 .../src/run/java-script-reporter.js           |   111 -
 .../src/run/javascript-reporter.ts            |   105 +
 .../{__tests__/index.test.js => run.test.ts}  |    29 +-
 packages/insomnia-testing/src/run/run.ts      |   113 +
 packages/insomnia-testing/tsconfig.build.json |    16 +
 packages/insomnia-testing/tsconfig.json       |    15 +
 packages/insomnia-testing/webpack.config.js   |    21 +-
 packages/insomnia-url/.eslintignore           |     1 +
 packages/insomnia-url/.eslintrc.js            |     7 +
 packages/insomnia-url/index.js                |    12 -
 packages/insomnia-url/jest.config.js          |    17 +
 packages/insomnia-url/package-lock.json       |  4866 +++++
 packages/insomnia-url/package.json            |    14 +-
 packages/insomnia-url/src/index.ts            |    11 +
 .../protocol.test.js => protocol.test.ts}     |     2 +-
 .../src/{protocol.js => protocol.ts}          |     7 +-
 ...uerystring.test.js => querystring.test.ts} |     9 +-
 .../src/{querystring.js => querystring.ts}    |    95 +-
 packages/insomnia-url/tsconfig.build.json     |    15 +
 packages/insomnia-url/tsconfig.json           |    15 +
 packages/insomnia-xpath/.eslintignore         |     1 +
 .../insomnia-xpath/__tests__/index.test.js    |    36 -
 packages/insomnia-xpath/index.js              |    45 -
 packages/insomnia-xpath/jest.config.js        |    17 +
 packages/insomnia-xpath/package-lock.json     |     6 +
 packages/insomnia-xpath/package.json          |    17 +-
 packages/insomnia-xpath/src/index.ts          |     1 +
 packages/insomnia-xpath/src/query.test.ts     |    34 +
 packages/insomnia-xpath/src/query.ts          |    53 +
 packages/insomnia-xpath/tsconfig.build.json   |    15 +
 packages/insomnia-xpath/tsconfig.json         |    13 +
 packages/openapi-2-kong/.babelrc              |    16 -
 packages/openapi-2-kong/.eslintignore         |     1 +
 packages/openapi-2-kong/.eslintrc.js          |    10 +
 packages/openapi-2-kong/.flowconfig           |    16 -
 packages/openapi-2-kong/flow-typed/jest.js    |  1186 --
 packages/openapi-2-kong/flow-typed/slugify.js |     5 -
 .../flow-typed/swagger-parser.js              |    11 -
 .../openapi-2-kong/flow-typed/url-join.js     |     5 -
 packages/openapi-2-kong/jest.config.js        |    19 +
 packages/openapi-2-kong/package-lock.json     |  2661 +--
 packages/openapi-2-kong/package.json          |    28 +-
 .../common.test.js => common.test.ts}         |   209 +-
 .../src/{common.js => common.ts}              |    61 +-
 .../{index.js => generate.ts}                 |     6 +-
 .../src/declarative-config/index.ts           |     1 +
 .../names.test.js => names.test.ts}           |    19 +-
 .../plugins.test.js => plugins.test.ts}       |   109 +-
 .../{plugins.js => plugins.ts}                |   100 +-
 ...ugins.test.js => security-plugins.test.ts} |     9 +-
 ...ecurity-plugins.js => security-plugins.ts} |    83 +-
 .../services.test.js => services.test.ts}     |   179 +-
 .../{services.js => services.ts}              |    34 +-
 .../upstreams.test.js => upstreams.test.ts}   |    11 +-
 .../{upstreams.js => upstreams.ts}            |    13 +-
 .../{__tests__/utils.js => utils.ts}          |    15 +-
 .../fixtures.test.js => fixtures.test.ts}     |    14 +-
 .../api-with-examples.expected.json           |     0
 .../api-with-examples.yaml                    |     0
 .../callback-example.expected.json            |     0
 .../callback-example.yaml                     |     0
 .../httpbin.expected.json                     |     0
 .../{__fixtures__ => fixtures}/httpbin.yaml   |     0
 .../link-example.expected.json                |     0
 .../link-example.yaml                         |     0
 .../no-targets-example.expected.json          |     0
 .../no-targets-example.yaml                   |     0
 .../petstore-expanded.expected.json           |     0
 .../petstore-expanded.yaml                    |     0
 .../petstore.expected.json                    |     0
 .../{__fixtures__ => fixtures}/petstore.yaml  |     0
 .../request-validator-plugin.expected.json    |     0
 .../request-validator-plugin.yaml             |     0
 .../security.expected.json                    |     0
 .../{__fixtures__ => fixtures}/security.yaml  |     0
 .../uspto.expected.json                       |     0
 .../src/{__fixtures__ => fixtures}/uspto.yaml |     0
 .../index.test.js => generate.test.ts}        |    22 +-
 .../src/{index.js => generate.ts}             |    35 +-
 packages/openapi-2-kong/src/index.ts          |     6 +
 .../index.test.js => generate.test.ts}        |   186 +-
 .../src/kubernetes/{index.js => generate.ts}  |    94 +-
 .../openapi-2-kong/src/kubernetes/index.ts    |    10 +
 .../plugin-helpers.js => plugin-helpers.ts}   |    56 +-
 .../plugins.test.js => plugins.test.ts}       |   229 +-
 .../src/kubernetes/{plugins.js => plugins.ts} |    97 +-
 .../variables.test.js => variables.test.ts}   |    23 +-
 .../kubernetes/{variables.js => variables.ts} |     7 +-
 .../src/types/declarative-config.ts           |    56 +
 .../openapi-2-kong/src/types/k8plugins.ts     |    27 +
 .../src/types/kubernetes-config.ts            |    67 +
 packages/openapi-2-kong/src/types/openapi3.ts |   248 +
 packages/openapi-2-kong/src/types/outputs.ts  |    32 +
 packages/openapi-2-kong/tsconfig.build.json   |    16 +
 packages/openapi-2-kong/tsconfig.json         |    15 +
 .../types/declarative-config.flow.js          |    47 -
 .../openapi-2-kong/types/k8plugins.flow.js    |    25 -
 .../types/kubernetes-config.flow.js           |    62 -
 .../openapi-2-kong/types/openapi3.flow.js     |   240 -
 packages/openapi-2-kong/types/outputs.flow.js |    31 -
 packages/openapi-2-kong/webpack.config.js     |    25 -
 .../package-lock.json                         |     4 +-
 .../package-lock.json                         |   122 +
 .../insomnia-plugin-kong-portal/package.json  |     5 +-
 scripts/check-version.js                      |     1 +
 scripts/convert-to-typescript                 |    64 +
 tsconfig.base.json                            |    24 +
 tsconfig.eslint.json                          |     7 +
 1285 files changed, 60440 insertions(+), 44623 deletions(-)
 create mode 100644 .eslintrc.js
 delete mode 100644 .eslintrc.json
 delete mode 100644 .prettierignore
 delete mode 100644 .prettierrc
 create mode 100644 jest.config.js
 delete mode 100644 packages/insomnia-app/.babelrc
 create mode 100644 packages/insomnia-app/.eslintignore
 create mode 100644 packages/insomnia-app/.eslintrc.js
 delete mode 100644 packages/insomnia-app/.flowconfig
 rename packages/insomnia-app/app/__jest__/{before-each.js => before-each.ts} (59%)
 rename packages/insomnia-app/app/__jest__/{redux-state-for-test.js => redux-state-for-test.ts} (77%)
 rename packages/insomnia-app/app/__jest__/{setup-after-env.js => setup-after-env.ts} (58%)
 delete mode 100644 packages/insomnia-app/app/__jest__/setup.js
 create mode 100644 packages/insomnia-app/app/__jest__/setup.ts
 rename packages/insomnia-app/app/__mocks__/@grpc/{grpc-js.js => grpc-js.ts} (95%)
 delete mode 100644 packages/insomnia-app/app/__mocks__/dummy.js
 create mode 100644 packages/insomnia-app/app/__mocks__/dummy.ts
 rename packages/insomnia-app/app/__mocks__/{electron.js => electron.ts} (56%)
 delete mode 100644 packages/insomnia-app/app/__mocks__/font-scanner.js
 create mode 100644 packages/insomnia-app/app/__mocks__/font-scanner.ts
 rename packages/insomnia-app/app/__mocks__/{isomorphic-git.js => isomorphic-git.ts} (54%)
 rename packages/insomnia-app/app/__mocks__/{node-forge.js => node-forge.ts} (79%)
 rename packages/insomnia-app/app/__mocks__/{node-libcurl.js => node-libcurl.ts} (61%)
 rename packages/insomnia-app/app/__tests__/{install.test.js => install.test.ts} (94%)
 rename packages/insomnia-app/app/__tests__/{package.test.js => package.test.ts} (99%)
 rename packages/insomnia-app/app/__tests__/{renderer.test.js => renderer.test.ts} (99%)
 rename packages/insomnia-app/app/account/__tests__/{crypt.test.js => crypt.test.ts} (99%)
 rename packages/insomnia-app/app/account/{crypt.js => crypt.ts} (86%)
 rename packages/insomnia-app/app/account/{fetch.js => fetch.ts} (91%)
 rename packages/insomnia-app/app/account/{session.js => session.ts} (95%)
 rename packages/insomnia-app/app/common/__fixtures__/{nestedfolders.js => nestedfolders.ts} (77%)
 rename packages/insomnia-app/app/common/__mocks__/{analytics.js => analytics.ts} (50%)
 delete mode 100644 packages/insomnia-app/app/common/__mocks__/render.js
 create mode 100644 packages/insomnia-app/app/common/__mocks__/render.ts
 rename packages/insomnia-app/app/common/__tests__/{analytics.test.js => analytics.test.ts} (99%)
 rename packages/insomnia-app/app/common/__tests__/{api-specs.test.js => api-specs.test.ts} (93%)
 rename packages/insomnia-app/app/common/__tests__/{constants.test.js => constants.test.ts} (100%)
 rename packages/insomnia-app/app/common/__tests__/{database.test.js => database.test.ts} (67%)
 rename packages/insomnia-app/app/common/__tests__/{grpc-paths.test.js => grpc-paths.test.ts} (92%)
 rename packages/insomnia-app/app/common/__tests__/{har.test.js => har.test.ts} (71%)
 rename packages/insomnia-app/app/common/__tests__/{import.test.js => import.test.ts} (72%)
 rename packages/insomnia-app/app/common/__tests__/{local-storage.test.js => local-storage.test.ts} (93%)
 rename packages/insomnia-app/app/common/__tests__/{misc.test.js => misc.test.ts} (77%)
 rename packages/insomnia-app/app/common/__tests__/{render.test.js => render.test.ts} (94%)
 delete mode 100644 packages/insomnia-app/app/common/__tests__/sorting.test.js
 create mode 100644 packages/insomnia-app/app/common/__tests__/sorting.test.ts
 rename packages/insomnia-app/app/common/__tests__/{strings.test.js => strings.test.ts} (98%)
 rename packages/insomnia-app/app/common/{analytics.js => analytics.ts} (72%)
 rename packages/insomnia-app/app/common/{api-specs.js => api-specs.ts} (79%)
 rename packages/insomnia-app/app/common/{constants.js => constants.ts} (87%)
 delete mode 100644 packages/insomnia-app/app/common/database.js
 create mode 100644 packages/insomnia-app/app/common/database.ts
 rename packages/insomnia-app/app/common/{documentation.js => documentation.ts} (65%)
 create mode 100644 packages/insomnia-app/app/common/electron-helpers.ts
 rename packages/insomnia-app/app/common/{get-workspace-label.js => get-workspace-label.ts} (96%)
 rename packages/insomnia-app/app/common/{grpc-events.js => grpc-events.ts} (64%)
 rename packages/insomnia-app/app/common/{grpc-paths.js => grpc-paths.ts} (78%)
 rename packages/insomnia-app/app/common/{har.js => har.ts} (60%)
 rename packages/insomnia-app/app/common/{hotkeys-listener.js => hotkeys-listener.ts} (58%)
 rename packages/insomnia-app/app/common/{hotkeys.js => hotkeys.ts} (94%)
 rename packages/insomnia-app/app/common/{import.js => import.ts} (78%)
 rename packages/insomnia-app/app/common/{keyboard-keys.js => keyboard-keys.ts} (99%)
 rename packages/insomnia-app/app/common/{log.js => log.ts} (82%)
 rename packages/insomnia-app/app/common/{markdown-to-html.js => markdown-to-html.ts} (81%)
 rename packages/insomnia-app/app/common/{migrate-from-designer.js => migrate-from-designer.ts} (81%)
 rename packages/insomnia-app/app/common/{misc.js => misc.ts} (62%)
 rename packages/insomnia-app/app/common/{render.js => render.ts} (91%)
 rename packages/insomnia-app/app/common/{select-file-or-folder.js => select-file-or-folder.ts} (57%)
 rename packages/insomnia-app/app/common/{send-request.js => send-request.ts} (77%)
 rename packages/insomnia-app/app/common/{sorting.js => sorting.ts} (92%)
 rename packages/insomnia-app/app/common/{strings.js => strings.ts} (96%)
 rename packages/insomnia-app/app/datasets/{access-token-urls.js => access-token-urls.ts} (100%)
 rename packages/insomnia-app/app/datasets/{authorization-urls.js => authorization-urls.ts} (100%)
 rename packages/insomnia-app/app/datasets/{charsets.js => charsets.ts} (100%)
 rename packages/insomnia-app/app/datasets/{content-types.js => content-types.ts} (100%)
 rename packages/insomnia-app/app/datasets/{encodings.js => encodings.ts} (100%)
 rename packages/insomnia-app/app/datasets/{header-names.js => header-names.ts} (100%)
 create mode 100644 packages/insomnia-app/app/global.d.ts
 rename packages/insomnia-app/app/{main.development.js => main.development.ts} (92%)
 rename packages/insomnia-app/app/main/__tests__/{grpc-ipc-main.test.js => grpc-ipc-main.test.ts} (97%)
 rename packages/insomnia-app/app/main/{error-handling.js => error-handling.ts} (79%)
 rename packages/insomnia-app/app/main/{grpc-ipc-main.js => grpc-ipc-main.ts} (88%)
 rename packages/insomnia-app/app/main/{local-storage.js => local-storage.ts} (83%)
 rename packages/insomnia-app/app/main/{squirrel-startup.js => squirrel-startup.ts} (91%)
 rename packages/insomnia-app/app/main/{updates.js => updates.ts} (82%)
 rename packages/insomnia-app/app/main/{window-utils.js => window-utils.ts} (65%)
 rename packages/insomnia-app/app/models/__mocks__/{uuid.js => uuid.ts} (98%)
 rename packages/insomnia-app/app/models/__tests__/{grpc-request-meta.test.js => grpc-request-meta.test.ts} (83%)
 rename packages/insomnia-app/app/models/__tests__/{grpc-request.test.js => grpc-request.test.ts} (88%)
 rename packages/insomnia-app/app/models/__tests__/{index.test.js => index.test.ts} (98%)
 rename packages/insomnia-app/app/models/__tests__/{proto-file.test.js => proto-file.test.ts} (89%)
 rename packages/insomnia-app/app/models/__tests__/{request-meta.test.js => request-meta.test.ts} (63%)
 rename packages/insomnia-app/app/models/__tests__/{request.test.js => request.test.ts} (73%)
 rename packages/insomnia-app/app/models/__tests__/{response.test.js => response.test.ts} (94%)
 rename packages/insomnia-app/app/models/__tests__/{workspace.test.js => workspace.test.ts} (78%)
 rename packages/insomnia-app/app/models/{api-spec.js => api-spec.ts} (50%)
 delete mode 100644 packages/insomnia-app/app/models/client-certificate.js
 create mode 100644 packages/insomnia-app/app/models/client-certificate.ts
 rename packages/insomnia-app/app/models/{cookie-jar.js => cookie-jar.ts} (53%)
 rename packages/insomnia-app/app/models/{environment.js => environment.ts} (55%)
 delete mode 100644 packages/insomnia-app/app/models/git-repository.js
 create mode 100644 packages/insomnia-app/app/models/git-repository.ts
 rename packages/insomnia-app/app/models/{grpc-request-meta.js => grpc-request-meta.ts} (58%)
 delete mode 100644 packages/insomnia-app/app/models/grpc-request.js
 create mode 100644 packages/insomnia-app/app/models/grpc-request.ts
 rename packages/insomnia-app/app/models/helpers/__tests__/{get-workspace-name.test.js => get-workspace-name.test.ts} (98%)
 rename packages/insomnia-app/app/models/helpers/__tests__/{git-repository-operations.test.js => git-repository-operations.test.ts} (94%)
 rename packages/insomnia-app/app/models/helpers/__tests__/{is-model.test.js => is-model.test.ts} (78%)
 rename packages/insomnia-app/app/models/helpers/__tests__/{query-all-workspace-urls.test.js => query-all-workspace-urls.test.ts} (91%)
 rename packages/insomnia-app/app/models/helpers/{get-workspace-name.js => get-workspace-name.ts} (91%)
 rename packages/insomnia-app/app/models/helpers/{git-repository-operations.js => git-repository-operations.ts} (86%)
 delete mode 100644 packages/insomnia-app/app/models/helpers/is-model.js
 create mode 100644 packages/insomnia-app/app/models/helpers/is-model.ts
 rename packages/insomnia-app/app/models/helpers/{query-all-workspace-urls.js => query-all-workspace-urls.ts} (53%)
 rename packages/insomnia-app/app/models/helpers/{request-operations.js => request-operations.ts} (58%)
 rename packages/insomnia-app/app/models/helpers/{workspace-operations.js => workspace-operations.ts} (55%)
 rename packages/insomnia-app/app/models/{index.js => index.ts} (88%)
 delete mode 100644 packages/insomnia-app/app/models/o-auth-2-token.js
 create mode 100644 packages/insomnia-app/app/models/o-auth-2-token.ts
 delete mode 100644 packages/insomnia-app/app/models/plugin-data.js
 create mode 100644 packages/insomnia-app/app/models/plugin-data.ts
 delete mode 100644 packages/insomnia-app/app/models/proto-directory.js
 create mode 100644 packages/insomnia-app/app/models/proto-directory.ts
 delete mode 100644 packages/insomnia-app/app/models/proto-file.js
 create mode 100644 packages/insomnia-app/app/models/proto-file.ts
 delete mode 100644 packages/insomnia-app/app/models/request-group-meta.js
 create mode 100644 packages/insomnia-app/app/models/request-group-meta.ts
 delete mode 100644 packages/insomnia-app/app/models/request-group.js
 create mode 100644 packages/insomnia-app/app/models/request-group.ts
 rename packages/insomnia-app/app/models/{request-meta.js => request-meta.ts} (62%)
 rename packages/insomnia-app/app/models/{request-version.js => request-version.ts} (70%)
 rename packages/insomnia-app/app/models/{request.js => request.ts} (76%)
 rename packages/insomnia-app/app/models/{response.js => response.ts} (65%)
 rename packages/insomnia-app/app/models/{settings.js => settings.ts} (54%)
 rename packages/insomnia-app/app/models/{stats.js => stats.ts} (54%)
 rename packages/insomnia-app/app/models/{unit-test-result.js => unit-test-result.ts} (62%)
 delete mode 100644 packages/insomnia-app/app/models/unit-test-suite.js
 create mode 100644 packages/insomnia-app/app/models/unit-test-suite.ts
 delete mode 100644 packages/insomnia-app/app/models/unit-test.js
 create mode 100644 packages/insomnia-app/app/models/unit-test.ts
 delete mode 100644 packages/insomnia-app/app/models/workspace-meta.js
 create mode 100644 packages/insomnia-app/app/models/workspace-meta.ts
 rename packages/insomnia-app/app/models/{workspace.js => workspace.ts} (68%)
 rename packages/insomnia-app/app/network/__tests__/{authentication.test.js => authentication.test.ts} (87%)
 rename packages/insomnia-app/app/network/__tests__/{certificate-url-parse.test.js => certificate-url-parse.test.ts} (99%)
 rename packages/insomnia-app/app/network/__tests__/{multipart.test.js => multipart.test.ts} (78%)
 rename packages/insomnia-app/app/network/__tests__/{network.test.js => network.test.ts} (83%)
 rename packages/insomnia-app/app/network/__tests__/{url-matches-cert-host.test.js => url-matches-cert-host.test.ts} (99%)
 rename packages/insomnia-app/app/network/{authentication.js => authentication.ts} (88%)
 rename packages/insomnia-app/app/network/{axios-request.js => axios-request.ts} (72%)
 rename packages/insomnia-app/app/network/basic-auth/__tests__/{get-header.test.js => get-header.test.ts} (99%)
 rename packages/insomnia-app/app/network/basic-auth/{get-header.js => get-header.ts} (55%)
 rename packages/insomnia-app/app/network/bearer-auth/{get-header.js => get-header.ts} (68%)
 rename packages/insomnia-app/app/network/{certificate-url-parse.js => certificate-url-parse.ts} (90%)
 delete mode 100644 packages/insomnia-app/app/network/grpc/__mocks__/index.js
 create mode 100644 packages/insomnia-app/app/network/grpc/__mocks__/index.ts
 rename packages/insomnia-app/app/network/grpc/__schemas__/{grpc-ipc-message-params-schema.js => grpc-ipc-message-params-schema.ts} (84%)
 rename packages/insomnia-app/app/network/grpc/__schemas__/{grpc-ipc-request-params-schema.js => grpc-ipc-request-params-schema.ts} (85%)
 rename packages/insomnia-app/app/network/grpc/__tests__/{call-cache.test.js => call-cache.test.ts} (76%)
 rename packages/insomnia-app/app/network/grpc/__tests__/{index.test.js => index.test.ts} (77%)
 rename packages/insomnia-app/app/network/grpc/__tests__/{method.test.js => method.test.ts} (68%)
 rename packages/insomnia-app/app/network/grpc/__tests__/{parse-grpc-url.test.js => parse-grpc-url.test.ts} (100%)
 rename packages/insomnia-app/app/network/grpc/__tests__/{prepare.test.js => prepare.test.ts} (72%)
 rename packages/insomnia-app/app/network/grpc/__tests__/{proto-integration.test.js => proto-integration.test.ts} (92%)
 rename packages/insomnia-app/app/network/grpc/__tests__/{response-callbacks.test.js => response-callbacks.test.ts} (94%)
 rename packages/insomnia-app/app/network/grpc/{call-cache.js => call-cache.ts} (66%)
 rename packages/insomnia-app/app/network/grpc/{index.js => index.ts} (86%)
 rename packages/insomnia-app/app/network/grpc/{method.js => method.ts} (67%)
 delete mode 100644 packages/insomnia-app/app/network/grpc/parse-grpc-url.js
 create mode 100644 packages/insomnia-app/app/network/grpc/parse-grpc-url.ts
 rename packages/insomnia-app/app/network/grpc/{prepare.js => prepare.ts} (69%)
 rename packages/insomnia-app/app/network/grpc/proto-loader/__mocks__/{index.js => index.ts} (100%)
 rename packages/insomnia-app/app/network/grpc/proto-loader/__tests__/{index.test.js => index.test.ts} (79%)
 rename packages/insomnia-app/app/network/grpc/proto-loader/__tests__/{write-proto-file.test.js => write-proto-file.test.ts} (97%)
 rename packages/insomnia-app/app/network/grpc/proto-loader/{index.js => index.ts} (65%)
 rename packages/insomnia-app/app/network/grpc/proto-loader/{write-proto-file.js => write-proto-file.ts} (87%)
 rename packages/insomnia-app/app/network/grpc/proto-manager/__tests__/{index.test.js => index.test.ts} (80%)
 rename packages/insomnia-app/app/network/grpc/proto-manager/__tests__/{ingest-proto-directory.test.js => ingest-proto-directory.test.ts} (85%)
 rename packages/insomnia-app/app/network/grpc/proto-manager/{index.js => index.tsx} (86%)
 rename packages/insomnia-app/app/network/grpc/proto-manager/{ingest-proto-directory.js => ingest-proto-directory.ts} (76%)
 rename packages/insomnia-app/app/network/grpc/{response-callbacks.js => response-callbacks.ts} (76%)
 rename packages/insomnia-app/app/network/grpc/{service-error.js => service-error.ts} (61%)
 rename packages/insomnia-app/app/network/{multipart.js => multipart.ts} (89%)
 rename packages/insomnia-app/app/network/{network.js => network.ts} (88%)
 rename packages/insomnia-app/app/network/o-auth-1/{constants.js => constants.ts} (97%)
 rename packages/insomnia-app/app/network/o-auth-1/{get-token.js => get-token.ts} (73%)
 rename packages/insomnia-app/app/network/o-auth-2/__tests__/{grant-authorization-code.test.js => grant-authorization-code.test.ts} (74%)
 rename packages/insomnia-app/app/network/o-auth-2/__tests__/{grant-client-credentials.test.js => grant-client-credentials.test.ts} (75%)
 rename packages/insomnia-app/app/network/o-auth-2/__tests__/{grant-implicit.test.js => grant-implicit.test.ts} (99%)
 rename packages/insomnia-app/app/network/o-auth-2/__tests__/{grant-password.test.js => grant-password.test.ts} (72%)
 rename packages/insomnia-app/app/network/o-auth-2/__tests__/{helpers.js => helpers.ts} (99%)
 rename packages/insomnia-app/app/network/o-auth-2/__tests__/{misc.test.js => misc.test.ts} (99%)
 rename packages/insomnia-app/app/network/o-auth-2/{constants.js => constants.ts} (99%)
 rename packages/insomnia-app/app/network/o-auth-2/{get-token.js => get-token.ts} (97%)
 rename packages/insomnia-app/app/network/o-auth-2/{grant-authorization-code.js => grant-authorization-code.ts} (62%)
 rename packages/insomnia-app/app/network/o-auth-2/{grant-client-credentials.js => grant-client-credentials.ts} (69%)
 rename packages/insomnia-app/app/network/o-auth-2/{grant-implicit.js => grant-implicit.ts} (64%)
 rename packages/insomnia-app/app/network/o-auth-2/{grant-password.js => grant-password.ts} (70%)
 rename packages/insomnia-app/app/network/o-auth-2/{misc.js => misc.ts} (91%)
 rename packages/insomnia-app/app/network/o-auth-2/{refresh-token.js => refresh-token.ts} (82%)
 rename packages/insomnia-app/app/network/{url-matches-cert-host.js => url-matches-cert-host.ts} (88%)
 rename packages/insomnia-app/app/plugins/context/__tests__/{app.test.js => app.test.ts} (91%)
 rename packages/insomnia-app/app/plugins/context/__tests__/{data.test.js => data.test.ts} (90%)
 rename packages/insomnia-app/app/plugins/context/__tests__/{request.test.js => request.test.ts} (84%)
 rename packages/insomnia-app/app/plugins/context/__tests__/{response.test.js => response.test.ts} (83%)
 rename packages/insomnia-app/app/plugins/context/__tests__/{store.test.js => store.test.ts} (86%)
 rename packages/insomnia-app/app/plugins/context/{app.js => app.tsx} (76%)
 rename packages/insomnia-app/app/plugins/context/{data.js => data.ts} (66%)
 rename packages/insomnia-app/app/plugins/context/{index.js => index.ts} (98%)
 delete mode 100644 packages/insomnia-app/app/plugins/context/network.js
 create mode 100644 packages/insomnia-app/app/plugins/context/network.ts
 rename packages/insomnia-app/app/plugins/context/{request.js => request.ts} (58%)
 rename packages/insomnia-app/app/plugins/context/{response.js => response.ts} (70%)
 delete mode 100644 packages/insomnia-app/app/plugins/context/store.js
 create mode 100644 packages/insomnia-app/app/plugins/context/store.ts
 rename packages/insomnia-app/app/plugins/{create.js => create.ts} (96%)
 rename packages/insomnia-app/app/plugins/{index.js => index.ts} (60%)
 rename packages/insomnia-app/app/plugins/{install.js => install.ts} (84%)
 rename packages/insomnia-app/app/plugins/{misc.js => misc.ts} (82%)
 rename packages/insomnia-app/app/{renderer.js => renderer.ts} (100%)
 rename packages/insomnia-app/app/sync/delta/__tests__/{diff.test.js => diff.test.ts} (70%)
 rename packages/insomnia-app/app/sync/delta/__tests__/{patch.test.js => patch.test.ts} (100%)
 rename packages/insomnia-app/app/sync/delta/{diff.js => diff.ts} (85%)
 rename packages/insomnia-app/app/sync/delta/{patch.js => patch.ts} (77%)
 rename packages/insomnia-app/app/sync/git/__mocks__/{path.js => path.ts} (57%)
 delete mode 100644 packages/insomnia-app/app/sync/git/__mocks__/shallow-clone.js
 create mode 100644 packages/insomnia-app/app/sync/git/__mocks__/shallow-clone.ts
 rename packages/insomnia-app/app/sync/git/__tests__/{git-rollback.test.js => git-rollback.test.ts} (79%)
 rename packages/insomnia-app/app/sync/git/__tests__/{git-vcs.test.js => git-vcs.test.ts} (92%)
 rename packages/insomnia-app/app/sync/git/__tests__/{mem-client.test.js => mem-client.test.ts} (85%)
 rename packages/insomnia-app/app/sync/git/__tests__/{ne-db-client.test.js => ne-db-client.test.ts} (77%)
 rename packages/insomnia-app/app/sync/git/__tests__/{parse-git-path.test.js => parse-git-path.test.ts} (98%)
 rename packages/insomnia-app/app/sync/git/__tests__/{path-sep.test.js => path-sep.test.ts} (98%)
 rename packages/insomnia-app/app/sync/git/__tests__/{routable-fs-client.test.js => routable-fs-client.test.ts} (92%)
 rename packages/insomnia-app/app/sync/git/__tests__/{util.js => util.ts} (100%)
 rename packages/insomnia-app/app/sync/git/__tests__/{utils.test.js => utils.test.ts} (99%)
 rename packages/insomnia-app/app/sync/git/{fs-client.js => fs-client.ts} (72%)
 rename packages/insomnia-app/app/sync/git/{git-rollback.js => git-rollback.ts} (79%)
 rename packages/insomnia-app/app/sync/git/{git-vcs.js => git-vcs.ts} (74%)
 rename packages/insomnia-app/app/sync/git/{http-client.js => http-client.ts} (95%)
 rename packages/insomnia-app/app/sync/git/{mem-client.js => mem-client.ts} (69%)
 rename packages/insomnia-app/app/sync/git/{ne-db-client.js => ne-db-client.ts} (73%)
 rename packages/insomnia-app/app/sync/git/{parse-git-path.js => parse-git-path.ts} (89%)
 rename packages/insomnia-app/app/sync/git/{path-sep.js => path-sep.ts} (98%)
 rename packages/insomnia-app/app/sync/git/{routable-fs-client.js => routable-fs-client.ts} (84%)
 rename packages/insomnia-app/app/sync/git/{shallow-clone.js => shallow-clone.ts} (80%)
 rename packages/insomnia-app/app/sync/git/{stat.js => stat.ts} (80%)
 create mode 100644 packages/insomnia-app/app/sync/git/system-error.ts
 rename packages/insomnia-app/app/sync/git/{utils.js => utils.ts} (57%)
 rename packages/insomnia-app/app/sync/lib/__tests__/{deterministicStringify.test.js => deterministicStringify.test.ts} (86%)
 rename packages/insomnia-app/app/sync/lib/{deterministicStringify.js => deterministicStringify.ts} (83%)
 rename packages/insomnia-app/app/sync/store/__tests__/{index.test.js => index.test.ts} (69%)
 rename packages/insomnia-app/app/sync/store/drivers/{base.js => base.ts} (82%)
 rename packages/insomnia-app/app/sync/store/drivers/{file-system-driver.js => file-system-driver.ts} (80%)
 rename packages/insomnia-app/app/sync/store/drivers/{memory-driver.js => memory-driver.ts} (66%)
 rename packages/insomnia-app/app/sync/store/hooks/__tests__/{compress.test.js => compress.test.ts} (100%)
 rename packages/insomnia-app/app/sync/store/hooks/{compress.js => compress.ts} (90%)
 rename packages/insomnia-app/app/sync/store/{index.js => index.ts} (81%)
 delete mode 100644 packages/insomnia-app/app/sync/types.js
 create mode 100644 packages/insomnia-app/app/sync/types.ts
 rename packages/insomnia-app/app/sync/vcs/__tests__/{index.test.js => index.test.ts} (77%)
 rename packages/insomnia-app/app/sync/vcs/__tests__/{paths.test.js => paths.test.ts} (100%)
 rename packages/insomnia-app/app/sync/vcs/__tests__/{util.test.js => util.test.ts} (82%)
 rename packages/insomnia-app/app/sync/vcs/{index.js => index.ts} (84%)
 delete mode 100644 packages/insomnia-app/app/sync/vcs/paths.js
 create mode 100644 packages/insomnia-app/app/sync/vcs/paths.ts
 rename packages/insomnia-app/app/sync/vcs/{util.js => util.ts} (86%)
 rename packages/insomnia-app/app/templating/__tests__/{utils.test.js => utils.test.ts} (58%)
 rename packages/insomnia-app/app/templating/{base-extension.js => base-extension.ts} (72%)
 delete mode 100644 packages/insomnia-app/app/templating/extensions/index.js
 create mode 100644 packages/insomnia-app/app/templating/extensions/index.ts
 rename packages/insomnia-app/app/templating/{index.js => index.ts} (83%)
 rename packages/insomnia-app/app/templating/{utils.js => utils.ts} (69%)
 rename packages/insomnia-app/app/{test-utils.js => test-utils.ts} (68%)
 rename packages/insomnia-app/app/ui/components/{activity-toggle.js => activity-toggle.tsx} (51%)
 rename packages/insomnia-app/app/ui/components/{analytics.js => analytics.tsx} (76%)
 rename packages/insomnia-app/app/ui/components/base/__tests__/{editable.test.js => editable.test.ts} (100%)
 rename packages/insomnia-app/app/ui/components/base/{button.js => button.tsx} (51%)
 rename packages/insomnia-app/app/ui/components/base/{copy-button.js => copy-button.tsx} (63%)
 rename packages/insomnia-app/app/ui/components/base/{debounced-input.js => debounced-input.tsx} (60%)
 rename packages/insomnia-app/app/ui/components/base/dropdown/{dropdown-button.js => dropdown-button.tsx} (50%)
 rename packages/insomnia-app/app/ui/components/base/dropdown/{dropdown-divider.js => dropdown-divider.tsx} (66%)
 rename packages/insomnia-app/app/ui/components/base/dropdown/{dropdown-hint.js => dropdown-hint.tsx} (64%)
 rename packages/insomnia-app/app/ui/components/base/dropdown/{dropdown-item.js => dropdown-item.tsx} (55%)
 rename packages/insomnia-app/app/ui/components/base/dropdown/{dropdown-right.js => dropdown-right.tsx} (57%)
 rename packages/insomnia-app/app/ui/components/base/dropdown/{dropdown.js => dropdown.tsx} (77%)
 rename packages/insomnia-app/app/ui/components/base/dropdown/{index.js => index.ts} (100%)
 rename packages/insomnia-app/app/ui/components/base/{editable.stories.js => editable.stories.tsx} (84%)
 rename packages/insomnia-app/app/ui/components/base/{editable.js => editable.tsx} (77%)
 rename packages/insomnia-app/app/ui/components/base/{file-input-button.js => file-input-button.tsx} (68%)
 rename packages/insomnia-app/app/ui/components/base/{highlight.js => highlight.tsx} (69%)
 rename packages/insomnia-app/app/ui/components/base/{indeterminate-checkbox.js => indeterminate-checkbox.tsx} (56%)
 rename packages/insomnia-app/app/ui/components/base/{lazy.js => lazy.ts} (65%)
 rename packages/insomnia-app/app/ui/components/base/{link.js => link.tsx} (53%)
 rename packages/insomnia-app/app/ui/components/base/{mailto.js => mailto.tsx} (59%)
 rename packages/insomnia-app/app/ui/components/base/{modal-body.js => modal-body.tsx} (60%)
 rename packages/insomnia-app/app/ui/components/base/{modal-footer.js => modal-footer.tsx} (50%)
 rename packages/insomnia-app/app/ui/components/base/{modal-header.js => modal-header.tsx} (64%)
 rename packages/insomnia-app/app/ui/components/base/{modal.js => modal.tsx} (76%)
 rename packages/insomnia-app/app/ui/components/base/{prompt-button.stories.js => prompt-button.stories.tsx} (82%)
 rename packages/insomnia-app/app/ui/components/base/{prompt-button.js => prompt-button.tsx} (53%)
 rename packages/insomnia-app/app/ui/components/buttons/__tests__/{grpc-send-button.test.js => grpc-send-button.test.tsx} (99%)
 rename packages/insomnia-app/app/ui/components/buttons/{grpc-send-button.js => grpc-send-button.tsx} (62%)
 rename packages/insomnia-app/app/ui/components/buttons/{settings-button.js => settings-button.tsx} (67%)
 rename packages/insomnia-app/app/ui/components/{check-for-updates-button.js => check-for-updates-button.tsx} (58%)
 rename packages/insomnia-app/app/ui/components/codemirror/{base-imports.js => base-imports.ts} (97%)
 rename packages/insomnia-app/app/ui/components/codemirror/{code-editor.js => code-editor.tsx} (78%)
 rename packages/insomnia-app/app/ui/components/codemirror/extensions/{autocomplete.js => autocomplete.ts} (90%)
 rename packages/insomnia-app/app/ui/components/codemirror/extensions/{clickable.js => clickable.ts} (81%)
 rename packages/insomnia-app/app/ui/components/codemirror/extensions/{nunjucks-tags.js => nunjucks-tags.ts} (73%)
 rename packages/insomnia-app/app/ui/components/codemirror/lint/{javascript-async-lint.js => javascript-async-lint.ts} (98%)
 rename packages/insomnia-app/app/ui/components/codemirror/lint/{openapi.js => openapi.ts} (85%)
 rename packages/insomnia-app/app/ui/components/codemirror/modes/{curl.js => curl.ts} (80%)
 rename packages/insomnia-app/app/ui/components/codemirror/modes/{nunjucks.js => nunjucks.ts} (97%)
 rename packages/insomnia-app/app/ui/components/codemirror/modes/{openapi.js => openapi.ts} (99%)
 rename packages/insomnia-app/app/ui/components/codemirror/{one-line-editor.js => one-line-editor.tsx} (72%)
 rename packages/insomnia-app/app/ui/components/{cookie-list.js => cookie-list.tsx} (76%)
 rename packages/insomnia-app/app/ui/components/dropdowns/{account-dropdown.js => account-dropdown.tsx} (82%)
 rename packages/insomnia-app/app/ui/components/dropdowns/{auth-dropdown.js => auth-dropdown.tsx} (88%)
 rename packages/insomnia-app/app/ui/components/dropdowns/{content-type-dropdown.js => content-type-dropdown.tsx} (90%)
 rename packages/insomnia-app/app/ui/components/dropdowns/{document-card-dropdown.js => document-card-dropdown.tsx} (79%)
 rename packages/insomnia-app/app/ui/components/dropdowns/{environments-dropdown.js => environments-dropdown.tsx} (81%)
 rename packages/insomnia-app/app/ui/components/dropdowns/{git-sync-dropdown.js => git-sync-dropdown.tsx} (78%)
 rename packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/__tests__/{grpc-method-dropdown-button.test.js => grpc-method-dropdown-button.test.tsx} (99%)
 rename packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/__tests__/{grpc-method-dropdown.test.js => grpc-method-dropdown.test.tsx} (99%)
 rename packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/{grpc-method-dropdown-button.js => grpc-method-dropdown-button.tsx} (78%)
 rename packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/{grpc-method-dropdown.js => grpc-method-dropdown.tsx} (74%)
 rename packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/{index.js => index.ts} (100%)
 rename packages/insomnia-app/app/ui/components/dropdowns/{method-dropdown.js => method-dropdown.tsx} (83%)
 rename packages/insomnia-app/app/ui/components/dropdowns/{preview-mode-dropdown.js => preview-mode-dropdown.tsx} (86%)
 rename packages/insomnia-app/app/ui/components/dropdowns/{remote-workspaces-dropdown.js => remote-workspaces-dropdown.tsx} (83%)
 rename packages/insomnia-app/app/ui/components/dropdowns/{request-actions-dropdown.js => request-actions-dropdown.tsx} (68%)
 rename packages/insomnia-app/app/ui/components/dropdowns/{request-group-actions-dropdown.js => request-group-actions-dropdown.tsx} (74%)
 rename packages/insomnia-app/app/ui/components/dropdowns/{response-history-dropdown.js => response-history-dropdown.tsx} (77%)
 rename packages/insomnia-app/app/ui/components/dropdowns/{sync-dropdown.js => sync-dropdown.tsx} (85%)
 rename packages/insomnia-app/app/ui/components/dropdowns/{workspace-dropdown.js => workspace-dropdown.tsx} (72%)
 rename packages/insomnia-app/app/ui/components/editors/__tests__/{environment-editor.test.js => environment-editor.test.ts} (99%)
 rename packages/insomnia-app/app/ui/components/editors/__tests__/{password-editor.test.js => password-editor.test.tsx} (99%)
 rename packages/insomnia-app/app/ui/components/editors/auth/{asap-auth.js => asap-auth.tsx} (89%)
 rename packages/insomnia-app/app/ui/components/editors/auth/{auth-wrapper.js => auth-wrapper.tsx} (89%)
 rename packages/insomnia-app/app/ui/components/editors/auth/{aws-auth.js => aws-auth.tsx} (86%)
 rename packages/insomnia-app/app/ui/components/editors/auth/{basic-auth.js => basic-auth.tsx} (89%)
 rename packages/insomnia-app/app/ui/components/editors/auth/{bearer-auth.js => bearer-auth.tsx} (89%)
 rename packages/insomnia-app/app/ui/components/editors/auth/{digest-auth.js => digest-auth.tsx} (86%)
 rename packages/insomnia-app/app/ui/components/editors/auth/{hawk-auth.js => hawk-auth.tsx} (82%)
 rename packages/insomnia-app/app/ui/components/editors/auth/{netrc-auth.js => netrc-auth.tsx} (100%)
 rename packages/insomnia-app/app/ui/components/editors/auth/{ntlm-auth.js => ntlm-auth.tsx} (86%)
 rename packages/insomnia-app/app/ui/components/editors/auth/{o-auth-1-auth.js => o-auth-1-auth.tsx} (84%)
 rename packages/insomnia-app/app/ui/components/editors/auth/{o-auth-2-auth.js => o-auth-2-auth.tsx} (82%)
 rename packages/insomnia-app/app/ui/components/editors/body/{body-editor.js => body-editor.tsx} (86%)
 rename packages/insomnia-app/app/ui/components/editors/body/{file-editor.js => file-editor.tsx} (90%)
 rename packages/insomnia-app/app/ui/components/editors/body/{form-editor.js => form-editor.tsx} (73%)
 rename packages/insomnia-app/app/ui/components/editors/body/{graph-ql-editor.js => graph-ql-editor.tsx} (81%)
 rename packages/insomnia-app/app/ui/components/editors/body/{raw-editor.js => raw-editor.tsx} (57%)
 rename packages/insomnia-app/app/ui/components/editors/body/{url-encoded-editor.js => url-encoded-editor.tsx} (72%)
 rename packages/insomnia-app/app/ui/components/editors/{environment-editor.js => environment-editor.tsx} (77%)
 rename packages/insomnia-app/app/ui/components/editors/{grpc-editor.js => grpc-editor.tsx} (66%)
 rename packages/insomnia-app/app/ui/components/editors/{password-editor.js => password-editor.tsx} (71%)
 rename packages/insomnia-app/app/ui/components/editors/{request-headers-editor.js => request-headers-editor.tsx} (85%)
 rename packages/insomnia-app/app/ui/components/editors/{request-parameters-editor.js => request-parameters-editor.tsx} (81%)
 rename packages/insomnia-app/app/ui/components/{error-boundary.js => error-boundary.tsx} (66%)
 rename packages/insomnia-app/app/ui/components/export-requests/{request-group-row.js => request-group-row.tsx} (79%)
 rename packages/insomnia-app/app/ui/components/export-requests/{request-row.js => request-row.tsx} (76%)
 rename packages/insomnia-app/app/ui/components/export-requests/{tree.js => tree.tsx} (79%)
 rename packages/insomnia-app/app/ui/components/{forms.stories.js => forms.stories.tsx} (98%)
 rename packages/insomnia-app/app/ui/components/graph-ql-explorer/{graph-ql-default-value.js => graph-ql-default-value.tsx} (71%)
 rename packages/insomnia-app/app/ui/components/graph-ql-explorer/{graph-ql-explorer-enum.js => graph-ql-explorer-enum.tsx} (88%)
 rename packages/insomnia-app/app/ui/components/graph-ql-explorer/{graph-ql-explorer-field-link.js => graph-ql-explorer-field-link.tsx} (62%)
 rename packages/insomnia-app/app/ui/components/graph-ql-explorer/{graph-ql-explorer-field.js => graph-ql-explorer-field.tsx} (78%)
 rename packages/insomnia-app/app/ui/components/graph-ql-explorer/{graph-ql-explorer-schema.js => graph-ql-explorer-schema.tsx} (82%)
 rename packages/insomnia-app/app/ui/components/graph-ql-explorer/{graph-ql-explorer-type-link.js => graph-ql-explorer-type-link.tsx} (63%)
 rename packages/insomnia-app/app/ui/components/graph-ql-explorer/{graph-ql-explorer-type.js => graph-ql-explorer-type.tsx} (81%)
 rename packages/insomnia-app/app/ui/components/graph-ql-explorer/{graph-ql-explorer.js => graph-ql-explorer.tsx} (77%)
 delete mode 100644 packages/insomnia-app/app/ui/components/grpc-spinner.js
 create mode 100644 packages/insomnia-app/app/ui/components/grpc-spinner.tsx
 delete mode 100644 packages/insomnia-app/app/ui/components/help-tooltip.js
 rename packages/insomnia-app/app/ui/components/{help-tooltip.stories.js => help-tooltip.stories.tsx} (84%)
 create mode 100644 packages/insomnia-app/app/ui/components/help-tooltip.tsx
 rename packages/insomnia-app/app/ui/components/{hotkey.js => hotkey.tsx} (73%)
 rename packages/insomnia-app/app/ui/components/{html-element-wrapper.js => html-element-wrapper.tsx} (77%)
 rename packages/insomnia-app/app/ui/components/key-value-editor/{editor.js => editor.tsx} (85%)
 rename packages/insomnia-app/app/ui/components/key-value-editor/{row.js => row.tsx} (71%)
 rename packages/insomnia-app/app/ui/components/{keydown-binder.js => keydown-binder.ts} (85%)
 rename packages/insomnia-app/app/ui/components/{markdown-editor.js => markdown-editor.tsx} (77%)
 rename packages/insomnia-app/app/ui/components/{markdown-preview.js => markdown-preview.tsx} (71%)
 rename packages/insomnia-app/app/ui/components/modals/__mocks__/{index.js => index.ts} (67%)
 rename packages/insomnia-app/app/ui/components/modals/{add-key-combination-modal.js => add-key-combination-modal.tsx} (85%)
 rename packages/insomnia-app/app/ui/components/modals/{alert-modal.js => alert-modal.tsx} (70%)
 rename packages/insomnia-app/app/ui/components/modals/{ask-modal.js => ask-modal.tsx} (73%)
 rename packages/insomnia-app/app/ui/components/modals/{code-prompt-modal.js => code-prompt-modal.tsx} (78%)
 rename packages/insomnia-app/app/ui/components/modals/{cookie-modify-modal.js => cookie-modify-modal.tsx} (83%)
 rename packages/insomnia-app/app/ui/components/modals/{cookies-modal.js => cookies-modal.tsx} (80%)
 rename packages/insomnia-app/app/ui/components/modals/{environment-edit-modal.js => environment-edit-modal.tsx} (75%)
 rename packages/insomnia-app/app/ui/components/modals/{error-modal.js => error-modal.tsx} (79%)
 rename packages/insomnia-app/app/ui/components/modals/{export-requests-modal.js => export-requests-modal.tsx} (86%)
 rename packages/insomnia-app/app/ui/components/modals/{filter-help-modal.js => filter-help-modal.tsx} (91%)
 rename packages/insomnia-app/app/ui/components/modals/{generate-code-modal.js => generate-code-modal.tsx} (78%)
 rename packages/insomnia-app/app/ui/components/modals/{generate-config-modal.js => generate-config-modal.tsx} (81%)
 rename packages/insomnia-app/app/ui/components/modals/{git-branches-modal.js => git-branches-modal.tsx} (83%)
 rename packages/insomnia-app/app/ui/components/modals/{git-log-modal.js => git-log-modal.tsx} (84%)
 rename packages/insomnia-app/app/ui/components/modals/{git-repository-settings-modal.js => git-repository-settings-modal.tsx} (84%)
 rename packages/insomnia-app/app/ui/components/modals/{git-staging-modal.js => git-staging-modal.tsx} (85%)
 rename packages/insomnia-app/app/ui/components/modals/{index.js => index.ts} (99%)
 rename packages/insomnia-app/app/ui/components/modals/{login-modal.js => login-modal.tsx} (71%)
 rename packages/insomnia-app/app/ui/components/modals/{move-request-group-modal.js => move-request-group-modal.tsx} (77%)
 rename packages/insomnia-app/app/ui/components/modals/{nunjucks-modal.js => nunjucks-modal.tsx} (73%)
 rename packages/insomnia-app/app/ui/components/modals/{payment-notification-modal.js => payment-notification-modal.tsx} (89%)
 rename packages/insomnia-app/app/ui/components/modals/{prompt-modal.js => prompt-modal.tsx} (70%)
 rename packages/insomnia-app/app/ui/components/modals/{proto-files-modal.js => proto-files-modal.tsx} (74%)
 rename packages/insomnia-app/app/ui/components/modals/{request-create-modal.js => request-create-modal.tsx} (74%)
 rename packages/insomnia-app/app/ui/components/modals/{request-render-error-modal.js => request-render-error-modal.tsx} (86%)
 rename packages/insomnia-app/app/ui/components/modals/{request-settings-modal.js => request-settings-modal.tsx} (81%)
 rename packages/insomnia-app/app/ui/components/modals/{request-switcher-modal.js => request-switcher-modal.tsx} (84%)
 rename packages/insomnia-app/app/ui/components/modals/{response-debug-modal.js => response-debug-modal.tsx} (73%)
 rename packages/insomnia-app/app/ui/components/modals/{select-modal.js => select-modal.tsx} (66%)
 rename packages/insomnia-app/app/ui/components/modals/{settings-modal.js => settings-modal.tsx} (83%)
 rename packages/insomnia-app/app/ui/components/modals/{sync-branches-modal.js => sync-branches-modal.tsx} (80%)
 rename packages/insomnia-app/app/ui/components/modals/{sync-delete-modal.js => sync-delete-modal.tsx} (74%)
 rename packages/insomnia-app/app/ui/components/modals/{sync-history-modal.js => sync-history-modal.tsx} (84%)
 rename packages/insomnia-app/app/ui/components/modals/{sync-merge-modal.js => sync-merge-modal.tsx} (79%)
 rename packages/insomnia-app/app/ui/components/modals/{sync-share-modal.js => sync-share-modal.tsx} (83%)
 rename packages/insomnia-app/app/ui/components/modals/{sync-staging-modal.js => sync-staging-modal.tsx} (82%)
 rename packages/insomnia-app/app/ui/components/modals/{workspace-environments-edit-modal.js => workspace-environments-edit-modal.tsx} (81%)
 rename packages/insomnia-app/app/ui/components/modals/{workspace-settings-modal.js => workspace-settings-modal.tsx} (86%)
 rename packages/insomnia-app/app/ui/components/modals/{wrapper-modal.js => wrapper-modal.tsx} (52%)
 rename packages/insomnia-app/app/ui/components/{notice.stories.js => notice.stories.tsx} (95%)
 rename packages/insomnia-app/app/ui/components/{notice.js => notice.tsx} (78%)
 rename packages/insomnia-app/app/ui/components/{onboarding-container.js => onboarding-container.tsx} (75%)
 rename packages/insomnia-app/app/ui/components/{page-layout.js => page-layout.tsx} (78%)
 rename packages/insomnia-app/app/ui/components/panes/{blank-pane.js => blank-pane.tsx} (50%)
 rename packages/insomnia-app/app/ui/components/panes/grpc-request-pane/__tests__/{use-proto-file-reload.test.js => use-proto-file-reload.test.ts} (84%)
 rename packages/insomnia-app/app/ui/components/panes/grpc-request-pane/{index.js => index.tsx} (87%)
 rename packages/insomnia-app/app/ui/components/panes/grpc-request-pane/{use-action-handlers.js => use-action-handlers.ts} (87%)
 rename packages/insomnia-app/app/ui/components/panes/grpc-request-pane/{use-change-handlers.js => use-change-handlers.ts} (69%)
 rename packages/insomnia-app/app/ui/components/panes/grpc-request-pane/{use-existing-grpc-urls.js => use-existing-grpc-urls.ts} (98%)
 rename packages/insomnia-app/app/ui/components/panes/grpc-request-pane/{use-proto-file-reload.js => use-proto-file-reload.ts} (89%)
 rename packages/insomnia-app/app/ui/components/panes/grpc-request-pane/{use-selected-method.js => use-selected-method.ts} (70%)
 rename packages/insomnia-app/app/ui/components/panes/{grpc-response-pane.js => grpc-response-pane.tsx} (81%)
 rename packages/insomnia-app/app/ui/components/panes/{pane.js => pane.tsx} (51%)
 rename packages/insomnia-app/app/ui/components/panes/{placeholder-request-pane.js => placeholder-request-pane.tsx} (85%)
 rename packages/insomnia-app/app/ui/components/panes/{placeholder-response-pane.js => placeholder-response-pane.tsx} (90%)
 rename packages/insomnia-app/app/ui/components/panes/{request-pane.js => request-pane.tsx} (87%)
 rename packages/insomnia-app/app/ui/components/panes/{response-pane.js => response-pane.tsx} (89%)
 rename packages/insomnia-app/app/ui/components/proto-file/{proto-directory-list-item.js => proto-directory-list-item.tsx} (69%)
 rename packages/insomnia-app/app/ui/components/proto-file/{proto-file-list-item.js => proto-file-list-item.tsx} (75%)
 rename packages/insomnia-app/app/ui/components/proto-file/{proto-file-list.js => proto-file-list.tsx} (79%)
 rename packages/insomnia-app/app/ui/components/proto-file/{proto-list-item.js => proto-list-item.ts} (68%)
 rename packages/insomnia-app/app/ui/components/{rendered-query-string.js => rendered-query-string.tsx} (64%)
 delete mode 100644 packages/insomnia-app/app/ui/components/rendered-text.js
 create mode 100644 packages/insomnia-app/app/ui/components/rendered-text.tsx
 rename packages/insomnia-app/app/ui/components/{request-url-bar.js => request-url-bar.tsx} (79%)
 rename packages/insomnia-app/app/ui/components/{response-timer.js => response-timer.tsx} (72%)
 rename packages/insomnia-app/app/ui/components/settings/{account.js => account.tsx} (80%)
 rename packages/insomnia-app/app/ui/components/settings/{general.js => general.tsx} (85%)
 rename packages/insomnia-app/app/ui/components/settings/{import-export.js => import-export.tsx} (87%)
 rename packages/insomnia-app/app/ui/components/settings/{plugins.js => plugins.tsx} (82%)
 rename packages/insomnia-app/app/ui/components/settings/{shortcuts.js => shortcuts.tsx} (84%)
 rename packages/insomnia-app/app/ui/components/settings/{theme.js => theme.tsx} (87%)
 rename packages/insomnia-app/app/ui/components/sidebar/{sidebar-children.js => sidebar-children.tsx} (73%)
 rename packages/insomnia-app/app/ui/components/sidebar/{sidebar-create-dropdown.js => sidebar-create-dropdown.tsx} (68%)
 rename packages/insomnia-app/app/ui/components/sidebar/{sidebar-filter.js => sidebar-filter.tsx} (78%)
 rename packages/insomnia-app/app/ui/components/sidebar/{sidebar-request-group-row.js => sidebar-request-group-row.tsx} (78%)
 rename packages/insomnia-app/app/ui/components/sidebar/{sidebar-request-row.js => sidebar-request-row.tsx} (72%)
 delete mode 100644 packages/insomnia-app/app/ui/components/sidebar/sidebar-sort-dropdown.js
 create mode 100644 packages/insomnia-app/app/ui/components/sidebar/sidebar-sort-dropdown.tsx
 rename packages/insomnia-app/app/ui/components/sidebar/{sidebar.js => sidebar.tsx} (66%)
 rename packages/insomnia-app/app/ui/components/spec-editor/{spec-editor-sidebar.js => spec-editor-sidebar.tsx} (76%)
 rename packages/insomnia-app/app/ui/components/{sync-pull-button.js => sync-pull-button.tsx} (74%)
 rename packages/insomnia-app/app/ui/components/tags/{grpc-method-tag.js => grpc-method-tag.tsx} (75%)
 delete mode 100644 packages/insomnia-app/app/ui/components/tags/grpc-status-tag.js
 create mode 100644 packages/insomnia-app/app/ui/components/tags/grpc-status-tag.tsx
 rename packages/insomnia-app/app/ui/components/tags/{grpc-tag.js => grpc-tag.tsx} (78%)
 rename packages/insomnia-app/app/ui/components/tags/{method-tag.js => method-tag.tsx} (75%)
 rename packages/insomnia-app/app/ui/components/tags/{size-tag.js => size-tag.tsx} (75%)
 rename packages/insomnia-app/app/ui/components/tags/{status-tag.js => status-tag.tsx} (77%)
 rename packages/insomnia-app/app/ui/components/tags/{time-tag.js => time-tag.tsx} (72%)
 rename packages/insomnia-app/app/ui/components/tags/{url-tag.js => url-tag.tsx} (57%)
 rename packages/insomnia-app/app/ui/components/templating/{tag-editor.js => tag-editor.tsx} (88%)
 rename packages/insomnia-app/app/ui/components/templating/{variable-editor.js => variable-editor.tsx} (77%)
 rename packages/insomnia-app/app/ui/components/{time-from-now.js => time-from-now.tsx} (69%)
 rename packages/insomnia-app/app/ui/components/{toast.js => toast.tsx} (78%)
 rename packages/insomnia-app/app/ui/components/{tooltip.stories.js => tooltip.stories.tsx} (91%)
 rename packages/insomnia-app/app/ui/components/{tooltip.js => tooltip.tsx} (69%)
 delete mode 100644 packages/insomnia-app/app/ui/components/unit-test-editable.js
 create mode 100644 packages/insomnia-app/app/ui/components/unit-test-editable.tsx
 rename packages/insomnia-app/app/ui/components/viewers/{grpc-tabbed-messages.js => grpc-tabbed-messages.tsx} (76%)
 rename packages/insomnia-app/app/ui/components/viewers/{response-cookies-viewer.js => response-cookies-viewer.tsx} (81%)
 rename packages/insomnia-app/app/ui/components/viewers/{response-csv-viewer.js => response-csv-viewer.tsx} (71%)
 rename packages/insomnia-app/app/ui/components/viewers/{response-error.js => response-error.tsx} (79%)
 rename packages/insomnia-app/app/ui/components/viewers/{response-headers-viewer.js => response-headers-viewer.tsx} (69%)
 rename packages/insomnia-app/app/ui/components/viewers/{response-multipart.js => response-multipart.tsx} (80%)
 rename packages/insomnia-app/app/ui/components/viewers/{response-pdf-viewer.js => response-pdf-viewer.tsx} (77%)
 rename packages/insomnia-app/app/ui/components/viewers/{response-raw.js => response-raw.tsx} (83%)
 rename packages/insomnia-app/app/ui/components/viewers/{response-timeline-viewer.js => response-timeline-viewer.tsx} (86%)
 rename packages/insomnia-app/app/ui/components/viewers/{response-viewer.js => response-viewer.tsx} (87%)
 rename packages/insomnia-app/app/ui/components/viewers/{response-web-view.js => response-web-view.tsx} (76%)
 rename packages/insomnia-app/app/ui/components/{workspace-page-header.js => workspace-page-header.tsx} (79%)
 rename packages/insomnia-app/app/ui/components/{wrapper-analytics.js => wrapper-analytics.tsx} (76%)
 rename packages/insomnia-app/app/ui/components/{wrapper-debug.js => wrapper-debug.tsx} (82%)
 rename packages/insomnia-app/app/ui/components/{wrapper-design.js => wrapper-design.tsx} (89%)
 rename packages/insomnia-app/app/ui/components/{wrapper-home.js => wrapper-home.tsx} (80%)
 rename packages/insomnia-app/app/ui/components/{wrapper-migration.js => wrapper-migration.tsx} (77%)
 rename packages/insomnia-app/app/ui/components/{wrapper-onboarding.js => wrapper-onboarding.tsx} (86%)
 rename packages/insomnia-app/app/ui/components/{wrapper-unit-test.js => wrapper-unit-test.tsx} (82%)
 rename packages/insomnia-app/app/ui/components/{wrapper.js => wrapper.tsx} (79%)
 rename packages/insomnia-app/app/ui/containers/{app.js => app.tsx} (75%)
 rename packages/insomnia-app/app/ui/context/app/{drag-drop-context.js => drag-drop-context.ts} (78%)
 rename packages/insomnia-app/app/ui/context/grpc/__mocks__/{grpc-actions.js => grpc-actions.ts} (73%)
 rename packages/insomnia-app/app/ui/context/grpc/__schemas__/{grpc-message-schema.js => grpc-message-schema.ts} (86%)
 rename packages/insomnia-app/app/ui/context/grpc/__schemas__/{grpc-method-definition-schema.js => grpc-method-definition-schema.ts} (89%)
 delete mode 100644 packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-status-object-schema.js
 create mode 100644 packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-status-object-schema.ts
 rename packages/insomnia-app/app/ui/context/grpc/__schemas__/{index.js => index.ts} (100%)
 rename packages/insomnia-app/app/ui/context/grpc/__schemas__/{request-state-schema.js => request-state-schema.ts} (97%)
 rename packages/insomnia-app/app/ui/context/grpc/__tests__/{grpc-context.test.js => grpc-context.test.tsx} (97%)
 rename packages/insomnia-app/app/ui/context/grpc/__tests__/{grpc-ipc-renderer.test.js => grpc-ipc-renderer.test.ts} (98%)
 rename packages/insomnia-app/app/ui/context/grpc/__tests__/{grpc-reducer.test.js => grpc-reducer.test.ts} (83%)
 rename packages/insomnia-app/app/ui/context/grpc/{grpc-actions.js => grpc-actions.ts} (58%)
 rename packages/insomnia-app/app/ui/context/grpc/{grpc-context.js => grpc-context.tsx} (67%)
 rename packages/insomnia-app/app/ui/context/grpc/{grpc-ipc-renderer.js => grpc-ipc-renderer.ts} (99%)
 rename packages/insomnia-app/app/ui/context/grpc/{grpc-reducer.js => grpc-reducer.ts} (77%)
 rename packages/insomnia-app/app/ui/context/grpc/{index.js => index.ts} (97%)
 delete mode 100644 packages/insomnia-app/app/ui/dnd-backend.js
 create mode 100644 packages/insomnia-app/app/ui/dnd-backend.ts
 rename packages/insomnia-app/app/ui/{index.js => index.tsx} (90%)
 rename packages/insomnia-app/app/ui/redux/__tests__/{proto-selectors.test.js => proto-selectors.test.ts} (68%)
 rename packages/insomnia-app/app/ui/redux/__tests__/{sidebar-selectors.test.js => sidebar-selectors.test.ts} (66%)
 rename packages/insomnia-app/app/ui/redux/{create.js => create.ts} (74%)
 rename packages/insomnia-app/app/ui/redux/modules/__tests__/{git.test.js => git.test.tsx} (80%)
 rename packages/insomnia-app/app/ui/redux/modules/__tests__/{global.test.js => global.test.ts} (70%)
 rename packages/insomnia-app/app/ui/redux/modules/__tests__/{helpers.test.js => helpers.test.ts} (98%)
 rename packages/insomnia-app/app/ui/redux/modules/__tests__/{workspace.test.js => workspace.test.ts} (80%)
 rename packages/insomnia-app/app/ui/redux/modules/{entities.js => entities.ts} (94%)
 rename packages/insomnia-app/app/ui/redux/modules/{git.js => git.tsx} (88%)
 rename packages/insomnia-app/app/ui/redux/modules/{global.js => global.tsx} (86%)
 rename packages/insomnia-app/app/ui/redux/modules/{helpers.js => helpers.ts} (72%)
 rename packages/insomnia-app/app/ui/redux/modules/{index.js => index.ts} (90%)
 rename packages/insomnia-app/app/ui/redux/modules/{workspace.js => workspace.ts} (73%)
 rename packages/insomnia-app/app/ui/redux/{proto-selectors.js => proto-selectors.ts} (77%)
 rename packages/insomnia-app/app/ui/redux/{selectors.js => selectors.ts} (88%)
 rename packages/insomnia-app/app/ui/redux/{sidebar-selectors.js => sidebar-selectors.ts} (94%)
 delete mode 100644 packages/insomnia-app/config/index.js
 delete mode 100644 packages/insomnia-app/flow-typed/anybase.js
 delete mode 100644 packages/insomnia-app/flow-typed/autobind-decorator.js
 delete mode 100644 packages/insomnia-app/flow-typed/aws4.js
 delete mode 100644 packages/insomnia-app/flow-typed/classnames.js
 delete mode 100644 packages/insomnia-app/flow-typed/clone.js
 delete mode 100644 packages/insomnia-app/flow-typed/codemirror.js
 delete mode 100644 packages/insomnia-app/flow-typed/color.js
 delete mode 100644 packages/insomnia-app/flow-typed/deep-equal.js
 delete mode 100644 packages/insomnia-app/flow-typed/electron-context-menu.js
 delete mode 100644 packages/insomnia-app/flow-typed/electron-squirrel-startup.js
 delete mode 100644 packages/insomnia-app/flow-typed/electron-updater.js
 delete mode 100644 packages/insomnia-app/flow-typed/electron.js
 delete mode 100644 packages/insomnia-app/flow-typed/events.js
 delete mode 100644 packages/insomnia-app/flow-typed/font-scanner.js
 delete mode 100644 packages/insomnia-app/flow-typed/fs-extra.js
 delete mode 100644 packages/insomnia-app/flow-typed/fuzzysort.js
 delete mode 100644 packages/insomnia-app/flow-typed/hawk.js
 delete mode 100644 packages/insomnia-app/flow-typed/iconv-lite.js
 delete mode 100644 packages/insomnia-app/flow-typed/insomnia-cookies.js
 delete mode 100644 packages/insomnia-app/flow-typed/insomnia-importers.js
 delete mode 100644 packages/insomnia-app/flow-typed/insomnia-plugin-hash.js
 delete mode 100644 packages/insomnia-app/flow-typed/insomnia-prettify.js
 delete mode 100644 packages/insomnia-app/flow-typed/insomnia-url.js
 delete mode 100644 packages/insomnia-app/flow-typed/isomorphic-git.js
 delete mode 100644 packages/insomnia-app/flow-typed/jest.js
 delete mode 100644 packages/insomnia-app/flow-typed/json-order.js
 delete mode 100644 packages/insomnia-app/flow-typed/jsonpath.js
 delete mode 100644 packages/insomnia-app/flow-typed/jwt-authentication.js
 delete mode 100644 packages/insomnia-app/flow-typed/mime-types.js
 delete mode 100644 packages/insomnia-app/flow-typed/mkdirp.js
 delete mode 100644 packages/insomnia-app/flow-typed/moment.js
 delete mode 100644 packages/insomnia-app/flow-typed/multiparty.js
 delete mode 100644 packages/insomnia-app/flow-typed/nedb.js
 delete mode 100644 packages/insomnia-app/flow-typed/node-libcurl.js
 delete mode 100644 packages/insomnia-app/flow-typed/nunjucks.js
 delete mode 100644 packages/insomnia-app/flow-typed/oauth-1.0a.js
 delete mode 100644 packages/insomnia-app/flow-typed/objectpath.js
 delete mode 100644 packages/insomnia-app/flow-typed/openapi-2-kong.js
 delete mode 100644 packages/insomnia-app/flow-typed/papaparse.js
 delete mode 100644 packages/insomnia-app/flow-typed/pdfjs-dist.js
 delete mode 100644 packages/insomnia-app/flow-typed/react-dom.js
 delete mode 100644 packages/insomnia-app/flow-typed/react-sortable-hoc.js
 delete mode 100644 packages/insomnia-app/flow-typed/react-tabs.js
 delete mode 100644 packages/insomnia-app/flow-typed/reselect.js
 delete mode 100644 packages/insomnia-app/flow-typed/rimraf.js
 delete mode 100644 packages/insomnia-app/flow-typed/styled-components.js
 delete mode 100644 packages/insomnia-app/flow-typed/swagger-ui-react.js
 delete mode 100644 packages/insomnia-app/flow-typed/tough-cookie.js
 delete mode 100644 packages/insomnia-app/flow-typed/url-join.js
 delete mode 100644 packages/insomnia-app/flow-typed/uuid.js
 delete mode 100644 packages/insomnia-app/flow-typed/xmldom.js
 delete mode 100644 packages/insomnia-app/flow-typed/yaml.js
 create mode 100644 packages/insomnia-app/jest.config.js
 delete mode 100644 packages/insomnia-app/scripts/build.js
 create mode 100644 packages/insomnia-app/scripts/build.ts
 rename packages/insomnia-app/scripts/{getBuildContext.js => getBuildContext.ts} (64%)
 delete mode 100644 packages/insomnia-app/scripts/package.js
 create mode 100644 packages/insomnia-app/scripts/package.ts
 delete mode 100644 packages/insomnia-app/scripts/release.js
 create mode 100644 packages/insomnia-app/scripts/release.ts
 rename packages/{insomnia-inso/src/__fixtures__/.insorc-blank.yaml => insomnia-app/scripts/startDevServer.ts} (100%)
 rename packages/insomnia-app/send-request/{index.js => index.ts} (100%)
 create mode 100644 packages/insomnia-app/tsconfig.build.json
 create mode 100644 packages/insomnia-app/tsconfig.build.sr.json
 create mode 100644 packages/insomnia-app/tsconfig.json
 create mode 100644 packages/insomnia-app/tsconfig.webpack.json
 rename packages/insomnia-app/webpack/{webpack.config.base.babel.js => webpack.config.base.ts} (69%)
 delete mode 100644 packages/insomnia-app/webpack/webpack.config.development.babel.js
 create mode 100644 packages/insomnia-app/webpack/webpack.config.development.ts
 rename packages/insomnia-app/webpack/{webpack.config.electron.babel.js => webpack.config.electron.ts} (59%)
 rename packages/insomnia-app/webpack/{webpack.config.production.babel.js => webpack.config.production.ts} (61%)
 rename packages/insomnia-app/{send-request/webpack.config.babel.js => webpack/webpack.config.sr.ts} (58%)
 delete mode 100644 packages/insomnia-components/.babelrc
 create mode 100644 packages/insomnia-components/.eslintignore
 create mode 100644 packages/insomnia-components/.eslintrc.js
 delete mode 100644 packages/insomnia-components/.flowconfig
 delete mode 100644 packages/insomnia-components/.svgrrc.json
 delete mode 100644 packages/insomnia-components/__mocks__/dummy.js
 delete mode 100644 packages/insomnia-components/components/breadcrumb.stories.js
 delete mode 100644 packages/insomnia-components/components/button/async-button.js
 delete mode 100644 packages/insomnia-components/components/button/index.js
 delete mode 100644 packages/insomnia-components/components/card-container.js
 delete mode 100644 packages/insomnia-components/components/header.stories.js
 delete mode 100644 packages/insomnia-components/components/list-group/unit-test-result-badge.js
 delete mode 100644 packages/insomnia-components/components/list-group/unit-test-result-item.js
 delete mode 100644 packages/insomnia-components/components/multi-switch.stories.js
 delete mode 100644 packages/insomnia-components/components/radio-button-group.stories.js
 delete mode 100644 packages/insomnia-components/components/sidebar/sidebar-info.js
 delete mode 100644 packages/insomnia-components/components/sidebar/sidebar-invalid-section.js
 delete mode 100644 packages/insomnia-components/components/sidebar/sidebar-panel.js
 delete mode 100644 packages/insomnia-components/components/svg-icon.js
 delete mode 100644 packages/insomnia-components/components/switch.stories.js
 delete mode 100644 packages/insomnia-components/components/table.js
 delete mode 100644 packages/insomnia-components/flow-typed/@storybook/addon-knobs.js
 delete mode 100644 packages/insomnia-components/flow-typed/@storybook/framer-motion.js
 delete mode 100644 packages/insomnia-components/flow-typed/autobind-decorator.js
 delete mode 100644 packages/insomnia-components/flow-typed/class-autobind-decorator.js
 delete mode 100644 packages/insomnia-components/flow-typed/md5.js
 delete mode 100644 packages/insomnia-components/flow-typed/npm/classnames_v2.x.x.js
 delete mode 100644 packages/insomnia-components/flow-typed/npm/styled-components_v4.x.x.js
 delete mode 100644 packages/insomnia-components/flow-typed/react-dom.js
 delete mode 100644 packages/insomnia-components/flow-typed/react-switch.js
 delete mode 100644 packages/insomnia-components/flow-typed/react-use.js
 delete mode 100644 packages/insomnia-components/index.js
 create mode 100644 packages/insomnia-components/jest.config.js
 rename packages/insomnia-components/{ => src}/assets/icn-arrow-right.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-bitbucket-logo.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-brackets.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-burger-menu.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-checkmark.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-chevron-down.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-chevron-up.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-clock.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-cookie.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-drag-grip.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-elevator.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-ellipsis-circle.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-ellipsis.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-empty.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-errors.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-file.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-folder-open.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-folder.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-gear.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-git-branch.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-github-logo.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-gitlab-logo.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-gui.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-indentation.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-info.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-key.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-minus-circle-fill.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-minus-circle.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-placeholder.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-play.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-plus.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-prohibited.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-question-fill.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-question.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-search.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-sec-cert.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-success.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-sync.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-trashcan.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-triangle.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-user.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-warning-circle.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-warning.svg (100%)
 rename packages/insomnia-components/{ => src}/assets/icn-x.svg (100%)
 create mode 100644 packages/insomnia-components/src/breadcrumb.stories.tsx
 rename packages/insomnia-components/{components/breadcrumb.js => src/breadcrumb.tsx} (63%)
 rename packages/insomnia-components/{components/button/async-button.stories.js => src/button/async-button.stories.tsx} (59%)
 create mode 100644 packages/insomnia-components/src/button/async-button.tsx
 rename packages/insomnia-components/{components/button/button.stories.js => src/button/button.stories.tsx} (73%)
 rename packages/insomnia-components/{components/button/button.js => src/button/button.tsx} (81%)
 rename packages/insomnia-components/{components/button/circle-button.stories.js => src/button/circle-button.stories.tsx} (82%)
 rename packages/insomnia-components/{components/button/circle-button.js => src/button/circle-button.tsx} (56%)
 create mode 100644 packages/insomnia-components/src/button/index.ts
 create mode 100644 packages/insomnia-components/src/card-container.tsx
 rename packages/insomnia-components/{components/card.stories.js => src/card.stories.tsx} (97%)
 rename packages/insomnia-components/{components/card.js => src/card.tsx} (87%)
 rename packages/insomnia-components/{components/dropdown/dropdown-divider.js => src/dropdown/dropdown-divider.tsx} (80%)
 rename packages/insomnia-components/{components/dropdown/dropdown-item.js => src/dropdown/dropdown-item.tsx} (72%)
 rename packages/insomnia-components/{components/dropdown/dropdown.stories.js => src/dropdown/dropdown.stories.tsx} (89%)
 rename packages/insomnia-components/{components/dropdown/dropdown.js => src/dropdown/dropdown.tsx} (67%)
 create mode 100644 packages/insomnia-components/src/dropdown/index.ts
 create mode 100644 packages/insomnia-components/src/header.stories.tsx
 rename packages/insomnia-components/{components/header.js => src/header.tsx} (77%)
 rename packages/insomnia-components/{components/help-tooltip.stories.js => src/help-tooltip.stories.tsx} (78%)
 rename packages/insomnia-components/{components/help-tooltip.js => src/help-tooltip.tsx} (50%)
 create mode 100644 packages/insomnia-components/src/index.ts
 rename packages/insomnia-components/{__jest__/setup-after-env.js => src/jest/setup-after-env.ts} (58%)
 create mode 100644 packages/insomnia-components/src/list-group/index.ts
 rename packages/insomnia-components/{components/list-group/list-group-item.js => src/list-group/list-group-item.tsx} (61%)
 rename packages/insomnia-components/{components/list-group/list-group.stories.js => src/list-group/list-group.stories.tsx} (88%)
 rename packages/insomnia-components/{components/list-group/list-group.js => src/list-group/list-group.tsx} (54%)
 rename packages/insomnia-components/{components/list-group/unit-test-item.js => src/list-group/unit-test-item.tsx} (56%)
 rename packages/insomnia-components/{components/list-group/unit-test-request-selector.js => src/list-group/unit-test-request-selector.tsx} (72%)
 create mode 100644 packages/insomnia-components/src/list-group/unit-test-result-badge.tsx
 create mode 100644 packages/insomnia-components/src/list-group/unit-test-result-item.tsx
 rename packages/insomnia-components/{components/list-group/unit-test-result-timestamp.js => src/list-group/unit-test-result-timestamp.tsx} (58%)
 create mode 100644 packages/insomnia-components/src/multi-switch.stories.tsx
 rename packages/insomnia-components/{components/multi-switch.js => src/multi-switch.tsx} (60%)
 rename packages/insomnia-components/{components/notice-table.stories.js => src/notice-table.stories.tsx} (65%)
 rename packages/insomnia-components/{components/notice-table.js => src/notice-table.tsx} (73%)
 create mode 100644 packages/insomnia-components/src/radio-button-group.stories.tsx
 rename packages/insomnia-components/{components/radio-button-group.js => src/radio-button-group.tsx} (65%)
 create mode 100644 packages/insomnia-components/src/sidebar/index.tsx
 rename packages/insomnia-components/{components/sidebar/sidebar-badge.js => src/sidebar/sidebar-badge.tsx} (84%)
 rename packages/insomnia-components/{components/sidebar/sidebar-filter.js => src/sidebar/sidebar-filter.tsx} (65%)
 rename packages/insomnia-components/{components/sidebar/sidebar-header.js => src/sidebar/sidebar-header.tsx} (67%)
 rename packages/insomnia-components/{components/sidebar/sidebar-headers.js => src/sidebar/sidebar-headers.tsx} (61%)
 create mode 100644 packages/insomnia-components/src/sidebar/sidebar-info.tsx
 create mode 100644 packages/insomnia-components/src/sidebar/sidebar-invalid-section.tsx
 rename packages/insomnia-components/{components/sidebar/sidebar-item.js => src/sidebar/sidebar-item.tsx} (81%)
 create mode 100644 packages/insomnia-components/src/sidebar/sidebar-panel.tsx
 rename packages/insomnia-components/{components/sidebar/sidebar-parameters.js => src/sidebar/sidebar-parameters.tsx} (61%)
 rename packages/insomnia-components/{components/sidebar/sidebar-paths.js => src/sidebar/sidebar-paths.tsx} (57%)
 rename packages/insomnia-components/{components/sidebar/sidebar-requests.js => src/sidebar/sidebar-requests.tsx} (77%)
 rename packages/insomnia-components/{components/sidebar/sidebar-responses.js => src/sidebar/sidebar-responses.tsx} (64%)
 rename packages/insomnia-components/{components/sidebar/sidebar-schemas.js => src/sidebar/sidebar-schemas.tsx} (62%)
 rename packages/insomnia-components/{components/sidebar/sidebar-section.js => src/sidebar/sidebar-section.tsx} (60%)
 rename packages/insomnia-components/{components/sidebar/sidebar-security.js => src/sidebar/sidebar-security.tsx} (59%)
 rename packages/insomnia-components/{components/sidebar/sidebar-servers.js => src/sidebar/sidebar-servers.tsx} (56%)
 rename packages/insomnia-components/{components/sidebar/sidebar-text-item.js => src/sidebar/sidebar-text-item.tsx} (50%)
 rename packages/insomnia-components/{components/sidebar/sidebar.stories.js => src/sidebar/sidebar.stories.tsx} (98%)
 rename packages/insomnia-components/{components/sidebar/index.js => src/sidebar/sidebar.tsx} (65%)
 rename packages/insomnia-components/{components/svg-icon.stories.js => src/svg-icon.stories.tsx} (75%)
 create mode 100644 packages/insomnia-components/src/svg-icon.tsx
 create mode 100644 packages/insomnia-components/src/switch.stories.tsx
 rename packages/insomnia-components/{components/switch.js => src/switch.tsx} (74%)
 rename packages/insomnia-components/{components/table.stories.js => src/table.stories.tsx} (96%)
 create mode 100644 packages/insomnia-components/src/table.tsx
 rename packages/insomnia-components/{components/toggle-switch.stories.js => src/toggle-switch.stories.tsx} (67%)
 rename packages/insomnia-components/{components/toggle-switch.js => src/toggle-switch.tsx} (55%)
 rename packages/insomnia-components/{components/tooltip.stories.js => src/tooltip.stories.tsx} (88%)
 rename packages/insomnia-components/{components/__tests__/tooltip.test.js => src/tooltip.test.tsx} (82%)
 rename packages/insomnia-components/{components/tooltip.js => src/tooltip.tsx} (70%)
 create mode 100644 packages/insomnia-components/svgr.config.js
 create mode 100644 packages/insomnia-components/tsconfig.build.json
 create mode 100644 packages/insomnia-components/tsconfig.json
 create mode 100644 packages/insomnia-cookies/.eslintignore
 create mode 100644 packages/insomnia-cookies/jest.config.js
 rename packages/insomnia-cookies/{__tests__/index.test.js => src/cookies.test.ts} (79%)
 rename packages/insomnia-cookies/{index.js => src/cookies.ts} (52%)
 create mode 100644 packages/insomnia-cookies/src/index.ts
 create mode 100644 packages/insomnia-cookies/src/tough-cookie.d.ts
 create mode 100644 packages/insomnia-cookies/tsconfig.build.json
 create mode 100644 packages/insomnia-cookies/tsconfig.json
 create mode 100644 packages/insomnia-importers/.eslintignore
 create mode 100644 packages/insomnia-importers/.eslintrc.js
 delete mode 100755 packages/insomnia-importers/index.js
 create mode 100644 packages/insomnia-importers/jest.config.js
 rename packages/insomnia-importers/src/{cli.js => cli.ts} (74%)
 mode change 100755 => 100644
 rename packages/insomnia-importers/src/{__tests__/import-errors.test.js => convert.test.ts} (70%)
 mode change 100755 => 100644
 create mode 100644 packages/insomnia-importers/src/convert.ts
 create mode 100644 packages/insomnia-importers/src/entities.ts
 create mode 100644 packages/insomnia-importers/src/importers/apiconnect-wsdl.d.ts
 delete mode 100755 packages/insomnia-importers/src/importers/curl.js
 create mode 100644 packages/insomnia-importers/src/importers/curl.ts
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/complex-input.sh (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/complex-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/dollar-sign-input.sh (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/dollar-sign-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/form-input.sh (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/form-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/from-chrome-input.sh (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/from-chrome-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/get-input.sh (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/get-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/header-colon-input.sh (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/header-colon-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/multi-data-input.sh (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/multi-data-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/multi-input.sh (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/multi-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/no-url-input.sh (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/no-url-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/question-mark-input.sh (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/question-mark-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/simple-url-input.sh (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/simple-url-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/skip-squished-input.sh (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/squished-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/url-only-input.sh (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/url-only-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/urlencoded-input.sh (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/curl/urlencoded-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/har/deep-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/har/deep-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/har/form-data-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/har/form-data-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/har/minimal-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/har/minimal-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/har/no-requests-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/har/no-requests-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/har/shallow-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/har/shallow-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/insomnia-1/complex-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/insomnia-1/complex-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/insomnia-1/form-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/insomnia-1/form-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/insomnia-1/minimal-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/insomnia-1/minimal-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/insomnia-2/complex-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/insomnia-2/complex-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/insomnia-3/basic-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/insomnia-3/basic-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/insomnia-4/basic-input.yaml (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/insomnia-4/basic-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/dereferenced-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/dereferenced-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/dereferenced-with-tags-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/dereferenced-with-tags-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/endpoint-security-input.yaml (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/endpoint-security-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/example-with-server-variables-input.yaml (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/example-with-server-variables-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/example-without-servers-input.yaml (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/example-without-servers-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/global-security-input.yaml (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/global-security-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/path-plugin-input.yaml (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/path-plugin-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/petstore-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/petstore-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/petstore-readonly-input.yml (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/petstore-readonly-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/petstore-with-tags-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/petstore-with-tags-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/petstore-yml-input.yml (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/petstore-yml-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/petstore-yml-with-tags-input.yml (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/openapi3/petstore-yml-with-tags-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman-env/basic-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman-env/basic-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman-env/no-name-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman-env/no-name-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/aws-signature-auth-v2_0-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/aws-signature-auth-v2_0-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/aws-signature-auth-v2_1-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/aws-signature-auth-v2_1-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/basic-auth-v2_0-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/basic-auth-v2_0-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/basic-auth-v2_1-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/basic-auth-v2_1-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/bearer-token-v2_0-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/bearer-token-v2_0-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/bearer-token-v2_1-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/bearer-token-v2_1-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/complex-url-v2_0-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/complex-url-v2_0-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/complex-url-v2_1-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/complex-url-v2_1-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/complex-v2_0-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/complex-v2_0-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/complex-v2_1-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/complex-v2_1-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/digest-auth-v2_0-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/digest-auth-v2_0-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/digest-auth-v2_1-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/digest-auth-v2_1-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/minimal-v2_0-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/minimal-v2_0-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/minimal-v2_1-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/minimal-v2_1-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/oauth1_0-auth-v2_0-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/oauth1_0-auth-v2_0-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/oauth1_0-auth-v2_1-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/oauth1_0-auth-v2_1-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/oauth2_0-auth-v2_0-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/oauth2_0-auth-v2_0-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/oauth2_0-auth-v2_1-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/postman/oauth2_0-auth-v2_1-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/swagger2/dereferenced-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/swagger2/dereferenced-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/swagger2/dereferenced-with-tags-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/swagger2/dereferenced-with-tags-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/swagger2/petstore-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/swagger2/petstore-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/swagger2/petstore-with-tags-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/swagger2/petstore-with-tags-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/swagger2/petstore-yml-input.yml (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/swagger2/petstore-yml-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/swagger2/petstore-yml-with-tags-input.yml (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/swagger2/petstore-yml-with-tags-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/swagger2/user-example-input.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/swagger2/user-example-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/wsdl/addition-input.wsdl (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/wsdl/addition-output.json (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/wsdl/calculator-input.wsdl (100%)
 rename packages/insomnia-importers/src/{__tests__ => importers}/fixtures/wsdl/calculator-output.json (100%)
 delete mode 100755 packages/insomnia-importers/src/importers/har.js
 create mode 100644 packages/insomnia-importers/src/importers/har.ts
 rename packages/insomnia-importers/src/{__tests__/fixtures.test.js => importers/index.test.ts} (55%)
 mode change 100755 => 100644
 create mode 100644 packages/insomnia-importers/src/importers/index.ts
 delete mode 100755 packages/insomnia-importers/src/importers/insomnia-1.js
 create mode 100644 packages/insomnia-importers/src/importers/insomnia-1.ts
 delete mode 100755 packages/insomnia-importers/src/importers/insomnia-2.js
 create mode 100644 packages/insomnia-importers/src/importers/insomnia-2.ts
 delete mode 100755 packages/insomnia-importers/src/importers/insomnia-3.js
 create mode 100644 packages/insomnia-importers/src/importers/insomnia-3.ts
 delete mode 100644 packages/insomnia-importers/src/importers/insomnia-4.js
 create mode 100644 packages/insomnia-importers/src/importers/insomnia-4.ts
 create mode 100644 packages/insomnia-importers/src/importers/openapi-3.ts
 delete mode 100644 packages/insomnia-importers/src/importers/openapi3.js
 create mode 100644 packages/insomnia-importers/src/importers/postman-2.0.types.ts
 create mode 100644 packages/insomnia-importers/src/importers/postman-2.1.types.ts
 delete mode 100755 packages/insomnia-importers/src/importers/postman-env.js
 create mode 100644 packages/insomnia-importers/src/importers/postman-env.ts
 delete mode 100755 packages/insomnia-importers/src/importers/postman.js
 create mode 100644 packages/insomnia-importers/src/importers/postman.ts
 create mode 100644 packages/insomnia-importers/src/importers/swagger-2.ts
 delete mode 100644 packages/insomnia-importers/src/importers/swagger2.js
 rename packages/insomnia-importers/src/importers/{wsdl.js => wsdl.ts} (50%)
 create mode 100755 packages/insomnia-importers/src/index.ts
 delete mode 100755 packages/insomnia-importers/src/utils.js
 rename packages/insomnia-importers/src/{__tests__/utils.test.js => utils.test.ts} (62%)
 mode change 100755 => 100644
 create mode 100644 packages/insomnia-importers/src/utils.ts
 create mode 100644 packages/insomnia-importers/tsconfig.build.json
 create mode 100644 packages/insomnia-importers/tsconfig.json
 delete mode 100644 packages/insomnia-inso/.babelrc
 create mode 100644 packages/insomnia-inso/.eslintignore
 create mode 100644 packages/insomnia-inso/.eslintrc.js
 delete mode 100644 packages/insomnia-inso/.flowconfig
 delete mode 100644 packages/insomnia-inso/__jest__/before.js
 delete mode 100644 packages/insomnia-inso/__mocks__/cosmiconfig.js
 delete mode 100644 packages/insomnia-inso/__mocks__/enquirer.js
 delete mode 100644 packages/insomnia-inso/__mocks__/insomnia-send-request.js
 delete mode 100644 packages/insomnia-inso/__mocks__/insomnia-testing.js
 delete mode 100644 packages/insomnia-inso/flow-typed/@stoplight/spectral.js
 delete mode 100644 packages/insomnia-inso/flow-typed/commander.js
 delete mode 100644 packages/insomnia-inso/flow-typed/consola.js
 delete mode 100644 packages/insomnia-inso/flow-typed/cosmiconfig.js
 delete mode 100644 packages/insomnia-inso/flow-typed/enquirer.js
 delete mode 100644 packages/insomnia-inso/flow-typed/execa.js
 delete mode 100644 packages/insomnia-inso/flow-typed/get-bin-path.js
 delete mode 100644 packages/insomnia-inso/flow-typed/insomnia-send-request.js
 delete mode 100644 packages/insomnia-inso/flow-typed/insomnia-testing.js
 delete mode 100644 packages/insomnia-inso/flow-typed/jest.js
 delete mode 100644 packages/insomnia-inso/flow-typed/lodash.flattendeep.js
 delete mode 100644 packages/insomnia-inso/flow-typed/mkdirp.js
 delete mode 100644 packages/insomnia-inso/flow-typed/nedb.js
 delete mode 100644 packages/insomnia-inso/flow-typed/openapi-2-kong.js
 delete mode 100644 packages/insomnia-inso/flow-typed/string-argv.js
 delete mode 100644 packages/insomnia-inso/flow-typed/yaml.js
 create mode 100644 packages/insomnia-inso/jest.config.js
 create mode 100644 packages/insomnia-inso/src/__mocks__/cosmiconfig.ts
 rename packages/insomnia-inso/src/__mocks__/{util.js => util.ts} (99%)
 rename packages/insomnia-inso/src/{__tests__/__snapshots__/inso-snapshot.test.js.snap => __snapshots__/inso-snapshot.test.ts.snap} (98%)
 rename packages/insomnia-inso/src/{__tests__/cli.test.js => cli.test.ts} (84%)
 rename packages/insomnia-inso/src/{cli.js => cli.ts} (54%)
 mode change 100755 => 100644
 create mode 100644 packages/insomnia-inso/src/commands/__mocks__/insomnia-send-request.ts
 create mode 100644 packages/insomnia-inso/src/commands/__mocks__/insomnia-testing.ts
 rename packages/insomnia-inso/{__mocks__/openapi-2-kong.js => src/commands/__mocks__/openapi-2-kong.ts} (56%)
 rename packages/insomnia-inso/src/commands/{__tests__/export-specification.test.js => export-specification.test.ts} (76%)
 rename packages/insomnia-inso/src/commands/{export-specification.js => export-specification.ts} (76%)
 rename packages/insomnia-inso/src/commands/{__fixtures__ => fixtures}/openapi-spec.yaml (100%)
 rename packages/insomnia-inso/src/commands/{__tests__/generate-config.test.js => generate-config.test.ts} (70%)
 rename packages/insomnia-inso/src/commands/{generate-config.js => generate-config.ts} (57%)
 rename packages/insomnia-inso/src/commands/{__tests__/lint-specification.test.js => lint-specification.test.ts} (76%)
 rename packages/insomnia-inso/src/commands/{lint-specification.js => lint-specification.ts} (82%)
 rename packages/insomnia-inso/src/commands/{__tests__/run-tests.test.js => run-tests.test.ts} (63%)
 rename packages/insomnia-inso/src/commands/{run-tests.js => run-tests.ts} (58%)
 rename packages/insomnia-inso/src/{__tests__/data-directory.test.js => data-directory.test.ts} (77%)
 rename packages/insomnia-inso/src/{data-directory.js => data-directory.ts} (71%)
 rename packages/insomnia-inso/src/db/__mocks__/{index.js => index.ts} (98%)
 rename packages/insomnia-inso/src/db/adapters/{__tests__/git-adapter.test.js => git-adapter.test.ts} (92%)
 rename packages/insomnia-inso/src/db/adapters/{git-adapter.js => git-adapter.ts} (65%)
 delete mode 100644 packages/insomnia-inso/src/db/adapters/ne-db-adapter.js
 rename packages/insomnia-inso/src/db/adapters/{__tests__/ne-db-adapter.test.js => ne-db-adapter.test.ts} (92%)
 create mode 100644 packages/insomnia-inso/src/db/adapters/ne-db-adapter.ts
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo-malformed-spec/.insomnia/ApiSpec/spc_46c5a4a40e83445a9bd9d9758b86c16c.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo-malformed-spec/.insomnia/Environment/env_ca046a738f001eb3090261a537b1b78f86c2094c.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo-malformed-spec/.insomnia/Environment/env_env_ca046a738f001eb3090261a537b1b78f86c2094c_sub.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo-malformed-spec/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292a21946b60.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo-malformed-spec/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292ab410454b.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo-malformed-spec/.insomnia/RequestGroup/fld_wrk_012d4860c7da418a85ffea7406e1292a30baa249.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo-malformed-spec/.insomnia/Workspace/wrk_012d4860c7da418a85ffea7406e1292a.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo/.insomnia/ApiSpec/spc_46c5a4a40e83445a9bd9d9758b86c16c.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo/.insomnia/Environment/env_ca046a738f001eb3090261a537b1b78f86c2094c.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo/.insomnia/Environment/env_env_ca046a738f001eb3090261a537b1b78f86c2094c_sub.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292a21946b60.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292ab410454b.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo/.insomnia/RequestGroup/fld_wrk_012d4860c7da418a85ffea7406e1292a30baa249.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo/.insomnia/UnitTest/ut_6b214a8cd07046f2a8f43237ca913c73.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo/.insomnia/UnitTest/ut_8c0c020fb9e341c2a3162e723445faf1.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo/.insomnia/UnitTest/ut_8fc42ec7f82a45d09e691ddfe212fd85.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo/.insomnia/UnitTest/ut_97a197104e83454ebf5f4e0dc0ba4bc6.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo/.insomnia/UnitTestSuite/uts_7f0f85548b0147f4ba6b5e442d137613.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo/.insomnia/UnitTestSuite/uts_fe901c6565044f00aa620d3fe47f443f.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/git-repo/.insomnia/Workspace/wrk_012d4860c7da418a85ffea7406e1292a.yml (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/nedb/insomnia.ApiSpec.db (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/nedb/insomnia.Environment.db (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/nedb/insomnia.Request.db (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/nedb/insomnia.RequestGroup.db (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/nedb/insomnia.UnitTest.db (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/nedb/insomnia.UnitTestSuite.db (100%)
 rename packages/insomnia-inso/src/db/{__fixtures__ => fixtures}/nedb/insomnia.Workspace.db (100%)
 rename packages/insomnia-inso/src/db/{__tests__/index.test.js => index.test.ts} (74%)
 rename packages/insomnia-inso/src/db/{index.js => index.ts} (69%)
 create mode 100644 packages/insomnia-inso/src/db/models/__mocks__/enquirer.ts
 rename packages/insomnia-inso/src/db/models/{__tests__/__snapshots__/api-spec.test.js.snap => __snapshots__/api-spec.test.ts.snap} (100%)
 rename packages/insomnia-inso/src/db/models/{__tests__/__snapshots__/environment.test.js.snap => __snapshots__/environment.test.ts.snap} (100%)
 rename packages/insomnia-inso/src/db/models/{__tests__/__snapshots__/unit-test-suite.test.js.snap => __snapshots__/unit-test-suite.test.ts.snap} (100%)
 delete mode 100644 packages/insomnia-inso/src/db/models/api-spec.js
 rename packages/insomnia-inso/src/db/models/{__tests__/api-spec.test.js => api-spec.test.ts} (83%)
 create mode 100644 packages/insomnia-inso/src/db/models/api-spec.ts
 rename packages/insomnia-inso/src/db/models/{__tests__/environment.test.js => environment.test.ts} (81%)
 rename packages/insomnia-inso/src/db/models/{environment.js => environment.ts} (68%)
 delete mode 100644 packages/insomnia-inso/src/db/models/types.js
 create mode 100644 packages/insomnia-inso/src/db/models/types.ts
 rename packages/insomnia-inso/src/db/models/{__tests__/unit-test-suite.test.js => unit-test-suite.test.ts} (84%)
 rename packages/insomnia-inso/src/db/models/{unit-test-suite.js => unit-test-suite.ts} (55%)
 delete mode 100644 packages/insomnia-inso/src/db/models/util.js
 create mode 100644 packages/insomnia-inso/src/db/models/util.ts
 delete mode 100644 packages/insomnia-inso/src/db/models/workspace.js
 rename packages/insomnia-inso/src/db/models/{__tests__/workspace.test.js => workspace.test.ts} (72%)
 create mode 100644 packages/insomnia-inso/src/db/models/workspace.ts
 rename packages/insomnia-inso/src/{errors.js => errors.ts} (88%)
 create mode 100644 packages/insomnia-inso/src/fixtures/.insorc-blank.yaml
 rename packages/insomnia-inso/src/{__fixtures__ => fixtures}/.insorc-missing-properties.yaml (100%)
 rename packages/insomnia-inso/src/{__fixtures__ => fixtures}/.insorc-with-scripts.yaml (100%)
 rename packages/insomnia-inso/src/{__fixtures__ => fixtures}/.insorc.yaml (100%)
 rename packages/insomnia-inso/src/{__tests__/get-options.test.js => get-options.test.ts} (73%)
 rename packages/insomnia-inso/src/{get-options.js => get-options.ts} (58%)
 create mode 100644 packages/insomnia-inso/src/global.d.ts
 create mode 100644 packages/insomnia-inso/src/index.ts
 rename packages/insomnia-inso/src/{__tests__/inso-snapshot.test.js => inso-snapshot.test.ts} (70%)
 rename packages/insomnia-inso/{__mocks__/node-libcurl.js => src/jest/__mocks__/node-libcurl.ts} (85%)
 create mode 100644 packages/insomnia-inso/src/jest/before.ts
 rename packages/insomnia-inso/{__jest__/setup.js => src/jest/setup.ts} (99%)
 delete mode 100644 packages/insomnia-inso/src/logger.js
 rename packages/insomnia-inso/src/{__tests__/logger.test.js => logger.test.ts} (75%)
 create mode 100644 packages/insomnia-inso/src/logger.ts
 create mode 100644 packages/insomnia-inso/src/openapi-2-kong.d.ts
 create mode 100644 packages/insomnia-inso/src/types.ts
 rename packages/insomnia-inso/src/{__tests__/util.test.js => util.test.ts} (86%)
 rename packages/insomnia-inso/src/{util.js => util.ts} (51%)
 rename packages/insomnia-inso/src/{__tests__/write-file.test.js => write-file.test.ts} (82%)
 rename packages/insomnia-inso/src/{write-file.js => write-file.ts} (98%)
 create mode 100644 packages/insomnia-inso/tsconfig.build.json
 create mode 100644 packages/insomnia-inso/tsconfig.json
 create mode 100644 packages/insomnia-prettify/.eslintignore
 create mode 100644 packages/insomnia-prettify/.eslintrc.js
 delete mode 100644 packages/insomnia-prettify/index.js
 create mode 100644 packages/insomnia-prettify/jest.config.js
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/escaped-characters-input.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/escaped-characters-output.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/escaped-unicode-input.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/escaped-unicode-output.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/extra-whitespace-input.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/extra-whitespace-output.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/minimal-whitespace-input.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/minimal-whitespace-output.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/nunjucks-input.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/nunjucks-output.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/precision-input.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/precision-output.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/root-array-input.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/root-array-output.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/root-string-input.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/root-string-output.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/trailing-comma-input.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/trailing-comma-output.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/unquoted-strings-input.json (100%)
 rename packages/insomnia-prettify/src/{__fixtures__ => fixtures}/unquoted-strings-output.json (100%)
 create mode 100644 packages/insomnia-prettify/src/index.ts
 rename packages/insomnia-prettify/src/{__tests__/json.test.js => json.test.ts} (78%)
 rename packages/insomnia-prettify/src/{json.js => json.ts} (78%)
 create mode 100644 packages/insomnia-prettify/tsconfig.build.json
 create mode 100644 packages/insomnia-prettify/tsconfig.json
 delete mode 100644 packages/insomnia-testing/.babelrc
 create mode 100644 packages/insomnia-testing/.eslintignore
 create mode 100644 packages/insomnia-testing/.eslintrc.js
 delete mode 100644 packages/insomnia-testing/.flowconfig
 delete mode 100644 packages/insomnia-testing/flow-typed/axios.js
 delete mode 100644 packages/insomnia-testing/flow-typed/chai.js
 delete mode 100644 packages/insomnia-testing/flow-typed/jest.js
 delete mode 100644 packages/insomnia-testing/flow-typed/mkdirp.js
 delete mode 100644 packages/insomnia-testing/flow-typed/mocha.js
 delete mode 100644 packages/insomnia-testing/index.js
 create mode 100644 packages/insomnia-testing/jest.config.js
 delete mode 100644 packages/insomnia-testing/src/__mocks__/axios.js
 create mode 100644 packages/insomnia-testing/src/__mocks__/axios.ts
 rename packages/insomnia-testing/src/generate/{__fixtures__ => fixtures}/01_empty.input.json (100%)
 rename packages/insomnia-testing/src/generate/{__fixtures__ => fixtures}/01_empty.output.js (100%)
 rename packages/insomnia-testing/src/generate/{__fixtures__ => fixtures}/02_empty-suite.input.json (100%)
 rename packages/insomnia-testing/src/generate/{__fixtures__ => fixtures}/02_empty-suite.output.js (100%)
 rename packages/insomnia-testing/src/generate/{__fixtures__ => fixtures}/03_basic-suite.input.json (100%)
 rename packages/insomnia-testing/src/generate/{__fixtures__ => fixtures}/03_basic-suite.output.js (100%)
 rename packages/insomnia-testing/src/generate/{__fixtures__ => fixtures}/04_nested-suite.input.json (100%)
 rename packages/insomnia-testing/src/generate/{__fixtures__ => fixtures}/04_nested-suite.output.js (100%)
 rename packages/insomnia-testing/src/generate/{__fixtures__ => fixtures}/05_complex-suite.input.json (100%)
 rename packages/insomnia-testing/src/generate/{__fixtures__ => fixtures}/05_complex-suite.output.js (100%)
 rename packages/insomnia-testing/src/generate/{__tests__/fixtures.test.js => generate.test.ts} (63%)
 rename packages/insomnia-testing/src/generate/{index.js => generate.ts} (57%)
 create mode 100644 packages/insomnia-testing/src/generate/index.ts
 rename packages/insomnia-testing/src/generate/{__tests__/util.test.js => util.test.ts} (68%)
 rename packages/insomnia-testing/src/generate/{util.js => util.ts} (50%)
 create mode 100644 packages/insomnia-testing/src/index.ts
 rename packages/insomnia-testing/src/{__tests__/integration.test.js => integration/integration.test.ts} (76%)
 create mode 100644 packages/insomnia-testing/src/run/entities.ts
 delete mode 100644 packages/insomnia-testing/src/run/index.js
 create mode 100644 packages/insomnia-testing/src/run/index.ts
 delete mode 100644 packages/insomnia-testing/src/run/insomnia.js
 create mode 100644 packages/insomnia-testing/src/run/insomnia.ts
 delete mode 100644 packages/insomnia-testing/src/run/java-script-reporter.js
 create mode 100644 packages/insomnia-testing/src/run/javascript-reporter.ts
 rename packages/insomnia-testing/src/run/{__tests__/index.test.js => run.test.ts} (76%)
 create mode 100644 packages/insomnia-testing/src/run/run.ts
 create mode 100644 packages/insomnia-testing/tsconfig.build.json
 create mode 100644 packages/insomnia-testing/tsconfig.json
 create mode 100644 packages/insomnia-url/.eslintignore
 create mode 100644 packages/insomnia-url/.eslintrc.js
 delete mode 100644 packages/insomnia-url/index.js
 create mode 100644 packages/insomnia-url/jest.config.js
 create mode 100644 packages/insomnia-url/src/index.ts
 rename packages/insomnia-url/src/{__tests__/protocol.test.js => protocol.test.ts} (94%)
 rename packages/insomnia-url/src/{protocol.js => protocol.ts} (65%)
 rename packages/insomnia-url/src/{__tests__/querystring.test.js => querystring.test.ts} (97%)
 rename packages/insomnia-url/src/{querystring.js => querystring.ts} (69%)
 create mode 100644 packages/insomnia-url/tsconfig.build.json
 create mode 100644 packages/insomnia-url/tsconfig.json
 create mode 100644 packages/insomnia-xpath/.eslintignore
 delete mode 100644 packages/insomnia-xpath/__tests__/index.test.js
 delete mode 100644 packages/insomnia-xpath/index.js
 create mode 100644 packages/insomnia-xpath/jest.config.js
 create mode 100644 packages/insomnia-xpath/src/index.ts
 create mode 100644 packages/insomnia-xpath/src/query.test.ts
 create mode 100644 packages/insomnia-xpath/src/query.ts
 create mode 100644 packages/insomnia-xpath/tsconfig.build.json
 create mode 100644 packages/insomnia-xpath/tsconfig.json
 delete mode 100644 packages/openapi-2-kong/.babelrc
 create mode 100644 packages/openapi-2-kong/.eslintignore
 create mode 100644 packages/openapi-2-kong/.eslintrc.js
 delete mode 100644 packages/openapi-2-kong/.flowconfig
 delete mode 100644 packages/openapi-2-kong/flow-typed/jest.js
 delete mode 100644 packages/openapi-2-kong/flow-typed/slugify.js
 delete mode 100644 packages/openapi-2-kong/flow-typed/swagger-parser.js
 delete mode 100644 packages/openapi-2-kong/flow-typed/url-join.js
 create mode 100644 packages/openapi-2-kong/jest.config.js
 rename packages/openapi-2-kong/src/{__tests__/common.test.js => common.test.ts} (68%)
 rename packages/openapi-2-kong/src/{common.js => common.ts} (80%)
 rename packages/openapi-2-kong/src/declarative-config/{index.js => generate.ts} (86%)
 create mode 100644 packages/openapi-2-kong/src/declarative-config/index.ts
 rename packages/openapi-2-kong/src/declarative-config/{__tests__/names.test.js => names.test.ts} (79%)
 rename packages/openapi-2-kong/src/declarative-config/{__tests__/plugins.test.js => plugins.test.ts} (87%)
 rename packages/openapi-2-kong/src/declarative-config/{plugins.js => plugins.ts} (72%)
 rename packages/openapi-2-kong/src/declarative-config/{__tests__/security-plugins.test.js => security-plugins.test.ts} (60%)
 rename packages/openapi-2-kong/src/declarative-config/{security-plugins.js => security-plugins.ts} (60%)
 rename packages/openapi-2-kong/src/declarative-config/{__tests__/services.test.js => services.test.ts} (81%)
 rename packages/openapi-2-kong/src/declarative-config/{services.js => services.ts} (88%)
 rename packages/openapi-2-kong/src/declarative-config/{__tests__/upstreams.test.js => upstreams.test.ts} (89%)
 rename packages/openapi-2-kong/src/declarative-config/{upstreams.js => upstreams.ts} (72%)
 rename packages/openapi-2-kong/src/declarative-config/{__tests__/utils.js => utils.ts} (68%)
 rename packages/openapi-2-kong/src/{__tests__/fixtures.test.js => fixtures.test.ts} (80%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/api-with-examples.expected.json (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/api-with-examples.yaml (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/callback-example.expected.json (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/callback-example.yaml (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/httpbin.expected.json (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/httpbin.yaml (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/link-example.expected.json (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/link-example.yaml (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/no-targets-example.expected.json (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/no-targets-example.yaml (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/petstore-expanded.expected.json (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/petstore-expanded.yaml (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/petstore.expected.json (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/petstore.yaml (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/request-validator-plugin.expected.json (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/request-validator-plugin.yaml (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/security.expected.json (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/security.yaml (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/uspto.expected.json (100%)
 rename packages/openapi-2-kong/src/{__fixtures__ => fixtures}/uspto.yaml (100%)
 rename packages/openapi-2-kong/src/{__tests__/index.test.js => generate.test.ts} (80%)
 rename packages/openapi-2-kong/src/{index.js => generate.ts} (68%)
 create mode 100644 packages/openapi-2-kong/src/index.ts
 rename packages/openapi-2-kong/src/kubernetes/{__tests__/index.test.js => generate.test.ts} (84%)
 rename packages/openapi-2-kong/src/kubernetes/{index.js => generate.ts} (79%)
 create mode 100644 packages/openapi-2-kong/src/kubernetes/index.ts
 rename packages/openapi-2-kong/src/kubernetes/{__tests__/util/plugin-helpers.js => plugin-helpers.ts} (71%)
 rename packages/openapi-2-kong/src/kubernetes/{__tests__/plugins.test.js => plugins.test.ts} (88%)
 rename packages/openapi-2-kong/src/kubernetes/{plugins.js => plugins.ts} (72%)
 rename packages/openapi-2-kong/src/kubernetes/{__tests__/variables.test.js => variables.test.ts} (95%)
 rename packages/openapi-2-kong/src/kubernetes/{variables.js => variables.ts} (95%)
 create mode 100644 packages/openapi-2-kong/src/types/declarative-config.ts
 create mode 100644 packages/openapi-2-kong/src/types/k8plugins.ts
 create mode 100644 packages/openapi-2-kong/src/types/kubernetes-config.ts
 create mode 100644 packages/openapi-2-kong/src/types/openapi3.ts
 create mode 100644 packages/openapi-2-kong/src/types/outputs.ts
 create mode 100644 packages/openapi-2-kong/tsconfig.build.json
 create mode 100644 packages/openapi-2-kong/tsconfig.json
 delete mode 100644 packages/openapi-2-kong/types/declarative-config.flow.js
 delete mode 100644 packages/openapi-2-kong/types/k8plugins.flow.js
 delete mode 100644 packages/openapi-2-kong/types/kubernetes-config.flow.js
 delete mode 100644 packages/openapi-2-kong/types/openapi3.flow.js
 delete mode 100644 packages/openapi-2-kong/types/outputs.flow.js
 delete mode 100644 packages/openapi-2-kong/webpack.config.js
 create mode 100755 scripts/convert-to-typescript
 create mode 100644 tsconfig.base.json
 create mode 100644 tsconfig.eslint.json

diff --git a/.editorconfig b/.editorconfig
index 5cf5ac2d95..b0ad35f528 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,3 +5,4 @@ indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 end_of_line = lf
+quote_type = single
diff --git a/.eslintignore b/.eslintignore
index 293ffdaa77..221cd0faf1 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -8,13 +8,12 @@ screenshots/
 **/.cache/
 **/coverage/
 **/node_modules/
-**/webpack/
 **/bin/
 **/__fixtures__/
+**/fixtures
 **/__snapshots__/
-**/flow-typed/
 **/dist/
 **/.cache/
 **/svgr/
 **/storybook-static/
-*.md
+*.md
\ No newline at end of file
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000000..6fcc223c66
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,101 @@
+/** @type { import('eslint').Linter.Config } */
+module.exports = {
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    project: [
+      './tsconfig.eslint.json',
+      './packages/*/tsconfig.json',
+      './plugins/*/tsconfig.json',
+    ],
+    tsconfigRootDir: __dirname,
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
+  extends: [
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:@typescript-eslint/recommended',
+    'semistandard',
+    'plugin:react-hooks/recommended',
+  ],
+  plugins: [
+    '@typescript-eslint',
+    'react',
+    'jest',
+    'html',
+    'json',
+    'filenames',
+    'react-hooks',
+  ],
+  globals: {
+    __DEV__: true,
+    fail: true,
+    NodeJS: true,
+    HTMLDivElement: true,
+    HTMLElement: true,
+    HTMLInputElement: true,
+    HTMLSelectElement: true,
+    JSX: true,
+  },
+  env: {
+    browser: true,
+    commonjs: true,
+    es6: true,
+    'jest/globals': true,
+    node: true,
+  },
+  overrides: [
+    {
+      files: ['*.js'],
+      rules: {
+        '@typescript-eslint/no-var-requires': 'off',
+      },
+    },
+  ],
+  rules: {
+    'comma-dangle': ['error', 'always-multiline'],
+    indent: 'off',
+    'no-var': 'error',
+    'no-async-promise-executor': 'off',
+    'no-case-declarations': 'off',
+    'no-prototype-builtins': 'off',
+    'no-duplicate-imports': 'off',
+    'react/jsx-uses-react': 'error',
+    'react/jsx-uses-vars': 'error',
+    'space-in-parens': 'off',
+    'react-hooks/rules-of-hooks': 'error',
+    'react-hooks/exhaustive-deps': 'error',
+    camelcase: ['error', { allow: ['__export_format', '__export_date', '__export_source'] }],
+    'space-before-function-paren': [
+      'error',
+      {
+        anonymous: 'never',
+        named: 'never',
+        asyncArrow: 'always',
+      },
+    ],
+    'filenames/match-exported': [
+      'error',
+      'kebab',
+    ],
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': ['error', { ignoreRestSiblings: true }],
+    '@typescript-eslint/ban-types': 'off',
+    '@typescript-eslint/no-empty-function': 'off',
+    '@typescript-eslint/no-namespace': ['error', { allowDeclarations: true }],
+    'spaced-comment': ['error', 'always', {
+      exceptions: ['/', '*', '-', '* '], // for ASCII art :)
+      markers: [
+        '/', // for TypeScript directives, doxygen, vsdoc, etc. (which use `///`)
+        '?', // for Quokka
+      ],
+    }],
+    '@typescript-eslint/array-type': ['error', { default: 'array', readonly: 'array' }],
+    '@typescript-eslint/consistent-type-definitions': ['error', 'interface'],
+    quotes: 'off',
+    '@typescript-eslint/quotes': ['error', 'single', { avoidEscape: true }],
+    'no-use-before-define': 'off',
+    '@typescript-eslint/no-use-before-define': 'error',
+  },
+};
diff --git a/.eslintrc.json b/.eslintrc.json
deleted file mode 100644
index 0674b6bc80..0000000000
--- a/.eslintrc.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "parser": "babel-eslint",
-  "extends": ["semistandard", "plugin:flowtype/recommended", "plugin:prettier/recommended", "plugin:react-hooks/recommended"],
-  "plugins": ["react", "jest", "html", "json", "filenames", "flowtype", "react-hooks"],
-  "parserOptions": {
-    "ecmaFeatures": {
-      "jsx": true
-    }
-  },
-  "globals": {
-    "__DEV__": true,
-    "fail": true,
-    "HTMLDivElement": true,
-    "HTMLElement": true,
-    "HTMLInputElement": true,
-    "HTMLSelectElement": true
-  },
-  "env": {
-    "jest/globals": true
-  },
-  "rules": {
-    "comma-dangle": ["error", "always-multiline"],
-    "indent": "off",
-    "no-var": "error",
-    "no-async-promise-executor": "off",
-    "no-case-declarations": "off",
-    "no-prototype-builtins": "off",
-    "no-duplicate-imports": "off",
-    "flowtype/space-after-type-colon": "off",
-    "react/jsx-uses-react": "error",
-    "react/jsx-uses-vars": "error",
-    "space-in-parens": "off",
-    "react-hooks/rules-of-hooks": "error",
-    "react-hooks/exhaustive-deps": "error",
-    "space-before-function-paren": [
-      "error",
-      {
-        "anonymous": "never",
-        "named": "never",
-        "asyncArrow": "always"
-      }
-    ],
-    "filenames/match-exported": ["error", "kebab"],
-    "flowtype/array-style-simple-type": "error",
-    "flowtype/array-style-complex-type": "error"
-  },
-  "settings": {
-    "flowtype": {
-      "onlyFilesWithFlowAnnotation": true
-    }
-  }
-}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 16f28c8525..ccb62da08b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,6 +28,8 @@ jobs:
           node-version: ${{ steps.nvm.outputs.NVMRC }}
       - name: Bootstrap packages
         run: npm run bootstrap
+      - name: Lint
+        run: npm run lint
       - name: Run tests
         run: npm test
       - name: Build for smoke tests
diff --git a/.gitignore b/.gitignore
index 012d4bb754..aca846eeba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@ graphql.config.json
 .graphqlconfig
 schema.graphql
 packages/insomnia-smoke-test/screenshots
+*.tsbuildinfo
+dist
\ No newline at end of file
diff --git a/.prettierignore b/.prettierignore
deleted file mode 100644
index 7e27ffbdd7..0000000000
--- a/.prettierignore
+++ /dev/null
@@ -1,7 +0,0 @@
-**/bin/*
-**/build/*
-**/dist/*
-**/__fixtures__/*
-**/flow-typed/*
-*.md
-**/__snapshots__/
diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index 1001dcf271..0000000000
--- a/.prettierrc
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "bracketSpacing": true,
-    "jsxBracketSameLine": true,
-    "semi": true,
-    "singleQuote": true,
-    "tabWidth": 2,
-    "trailingComma": "all",
-    "printWidth": 100
-}
diff --git a/jest.config.js b/jest.config.js
new file mode 100644
index 0000000000..31aa926f2b
--- /dev/null
+++ b/jest.config.js
@@ -0,0 +1,20 @@
+/** @type { import('@jest/types').Config.InitialOptions } */
+module.exports = {
+  globals: {
+    'ts-jest': {
+      isolatedModules: true,
+    },
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+  testMatch: [
+    '**/*.test.ts',
+  ],
+  verbose: false,
+  resetMocks: true,
+  resetModules: true,
+  collectCoverage: false,
+};
diff --git a/package-lock.json b/package-lock.json
index db438723a3..f9bd28dfea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,6 +41,12 @@
             "readdirp": "^2.2.1",
             "upath": "^1.1.1"
           }
+        },
+        "slash": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "dev": true
         }
       }
     },
@@ -65,43 +71,276 @@
       }
     },
     "@babel/core": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.5.tgz",
-      "integrity": "sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.0.tgz",
+      "integrity": "sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.10.5",
-        "@babel/helper-module-transforms": "^7.10.5",
-        "@babel/helpers": "^7.10.4",
-        "@babel/parser": "^7.10.5",
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.5",
-        "@babel/types": "^7.10.5",
+        "@babel/code-frame": "^7.12.13",
+        "@babel/generator": "^7.14.0",
+        "@babel/helper-compilation-targets": "^7.13.16",
+        "@babel/helper-module-transforms": "^7.14.0",
+        "@babel/helpers": "^7.14.0",
+        "@babel/parser": "^7.14.0",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.14.0",
+        "@babel/types": "^7.14.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.1",
+        "gensync": "^1.0.0-beta.2",
         "json5": "^2.1.2",
-        "lodash": "^4.17.19",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
+        "semver": "^6.3.0",
         "source-map": "^0.5.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "@babel/code-frame": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "@babel/highlight": "^7.12.13"
           }
         },
+        "@babel/compat-data": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz",
+          "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==",
+          "dev": true
+        },
+        "@babel/generator": {
+          "version": "7.14.1",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz",
+          "integrity": "sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.14.1",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-compilation-targets": {
+          "version": "7.13.16",
+          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz",
+          "integrity": "sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==",
+          "dev": true,
+          "requires": {
+            "@babel/compat-data": "^7.13.15",
+            "@babel/helper-validator-option": "^7.12.17",
+            "browserslist": "^4.14.5",
+            "semver": "^6.3.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-member-expression-to-functions": {
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz",
+          "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.13.12"
+          }
+        },
+        "@babel/helper-module-imports": {
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
+          "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.13.12"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz",
+          "integrity": "sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-module-imports": "^7.13.12",
+            "@babel/helper-replace-supers": "^7.13.12",
+            "@babel/helper-simple-access": "^7.13.12",
+            "@babel/helper-split-export-declaration": "^7.12.13",
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "@babel/template": "^7.12.13",
+            "@babel/traverse": "^7.14.0",
+            "@babel/types": "^7.14.0"
+          }
+        },
+        "@babel/helper-optimise-call-expression": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
+          "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-replace-supers": {
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz",
+          "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-member-expression-to-functions": "^7.13.12",
+            "@babel/helper-optimise-call-expression": "^7.12.13",
+            "@babel/traverse": "^7.13.0",
+            "@babel/types": "^7.13.12"
+          }
+        },
+        "@babel/helper-simple-access": {
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz",
+          "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.13.12"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.14.1",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.1.tgz",
+          "integrity": "sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
+          "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.14.0",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-split-export-declaration": "^7.12.13",
+            "@babel/parser": "^7.14.0",
+            "@babel/types": "^7.14.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.14.1",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz",
+          "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "browserslist": {
+          "version": "4.16.6",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "^1.0.30001219",
+            "colorette": "^1.2.2",
+            "electron-to-chromium": "^1.3.723",
+            "escalade": "^3.1.1",
+            "node-releases": "^1.1.71"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001227",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001227.tgz",
+          "integrity": "sha512-HHZT4QpUw4Pf45IE3xxKAPgAN3q2aRai/x5TSHP8lrrKzARoH0IeBviwStcRi5lsFlscTkBbXC7gXyms43151A==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "electron-to-chromium": {
+          "version": "1.3.727",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz",
+          "integrity": "sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg==",
+          "dev": true
+        },
+        "escalade": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+          "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+          "dev": true
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.71",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
+          "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
         }
       }
     },
@@ -351,6 +590,12 @@
       "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
       "dev": true
     },
+    "@babel/helper-validator-option": {
+      "version": "7.12.17",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
+      "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
+      "dev": true
+    },
     "@babel/helper-wrap-function": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
@@ -364,14 +609,140 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
-      "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz",
+      "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.14.0",
+        "@babel/types": "^7.14.0"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.12.13"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.14.1",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz",
+          "integrity": "sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.14.1",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.14.1",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.1.tgz",
+          "integrity": "sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
+          "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.14.0",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-split-export-declaration": "^7.12.13",
+            "@babel/parser": "^7.14.0",
+            "@babel/types": "^7.14.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.14.1",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz",
+          "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "@babel/highlight": {
@@ -1333,6 +1704,15 @@
         "which": "^1.3.1"
       },
       "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
         "safe-buffer": {
           "version": "5.2.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -1370,125 +1750,25 @@
       "dev": true
     },
     "@jest/console": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.5.0.tgz",
-      "integrity": "sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
+      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.5.0",
-        "chalk": "^3.0.0",
-        "jest-message-util": "^25.5.0",
-        "jest-util": "^25.5.0",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^26.6.2",
+        "jest-util": "^26.6.2",
         "slash": "^3.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jest/core": {
-      "version": "25.5.4",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-25.5.4.tgz",
-      "integrity": "sha512-3uSo7laYxF00Dg/DMgbn4xMJKmDdWvZnf89n8Xj/5/AeQ2dOQmn6b6Hkj/MleyzZWXpwv+WSdYWl4cLsy2JsoA==",
-      "dev": true,
-      "requires": {
-        "@jest/console": "^25.5.0",
-        "@jest/reporters": "^25.5.1",
-        "@jest/test-result": "^25.5.0",
-        "@jest/transform": "^25.5.1",
-        "@jest/types": "^25.5.0",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^3.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^25.5.0",
-        "jest-config": "^25.5.4",
-        "jest-haste-map": "^25.5.1",
-        "jest-message-util": "^25.5.0",
-        "jest-regex-util": "^25.2.6",
-        "jest-resolve": "^25.5.1",
-        "jest-resolve-dependencies": "^25.5.4",
-        "jest-runner": "^25.5.4",
-        "jest-runtime": "^25.5.4",
-        "jest-snapshot": "^25.5.1",
-        "jest-util": "^25.5.0",
-        "jest-validate": "^25.5.0",
-        "jest-watcher": "^25.5.0",
-        "micromatch": "^4.0.2",
-        "p-each-series": "^2.1.0",
-        "realpath-native": "^2.0.0",
-        "rimraf": "^3.0.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -1502,9 +1782,9 @@
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -1547,6 +1827,265 @@
           "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
           "dev": true
         },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
+          }
+        },
+        "slash": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "@jest/core": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
+      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^26.6.2",
+        "@jest/reporters": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-changed-files": "^26.6.2",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-resolve-dependencies": "^26.6.3",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "jest-watcher": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "p-each-series": "^2.1.0",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "@jest/transform": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
+          "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.1.0",
+            "@jest/types": "^26.6.2",
+            "babel-plugin-istanbul": "^6.0.0",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^1.4.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "graceful-fs": "^4.2.4",
+            "jest-haste-map": "^26.6.2",
+            "jest-regex-util": "^26.0.0",
+            "jest-util": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "pirates": "^4.0.1",
+            "slash": "^3.0.0",
+            "source-map": "^0.6.1",
+            "write-file-atomic": "^3.0.0"
+          }
+        },
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "anymatch": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "jest-haste-map": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+          "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/graceful-fs": "^4.1.2",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.1.2",
+            "graceful-fs": "^4.2.4",
+            "jest-regex-util": "^26.0.0",
+            "jest-serializer": "^26.6.2",
+            "jest-util": "^26.6.2",
+            "jest-worker": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "sane": "^4.0.3",
+            "walker": "^1.0.7"
+          }
+        },
+        "jest-regex-util": {
+          "version": "26.0.0",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+          "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+          "dev": true
+        },
+        "jest-serializer": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+          "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "graceful-fs": "^4.2.4"
+          }
+        },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "jest-worker": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+          "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        },
         "micromatch": {
           "version": "4.0.2",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
@@ -1572,6 +2111,12 @@
           "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
           "dev": true
         },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
         "strip-ansi": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -1582,9 +2127,9 @@
           }
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -1602,212 +2147,37 @@
       }
     },
     "@jest/environment": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.5.0.tgz",
-      "integrity": "sha512-U2VXPEqL07E/V7pSZMSQCvV5Ea4lqOlT+0ZFijl/i316cRMHvZ4qC+jBdryd+lmRetjQo0YIQr6cVPNxxK87mA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
+      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^25.5.0",
-        "@jest/types": "^25.5.0",
-        "jest-mock": "^25.5.0"
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2"
       }
     },
     "@jest/fake-timers": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.5.0.tgz",
-      "integrity": "sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
+      "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.5.0",
-        "jest-message-util": "^25.5.0",
-        "jest-mock": "^25.5.0",
-        "jest-util": "^25.5.0",
-        "lolex": "^5.0.0"
-      }
-    },
-    "@jest/globals": {
-      "version": "25.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-25.5.2.tgz",
-      "integrity": "sha512-AgAS/Ny7Q2RCIj5kZ+0MuKM1wbF0WMLxbCVl/GOMoCNbODRdJ541IxJ98xnZdVSZXivKpJlNPIWa3QmY0l4CXA==",
-      "dev": true,
-      "requires": {
-        "@jest/environment": "^25.5.0",
-        "@jest/types": "^25.5.0",
-        "expect": "^25.5.0"
-      }
-    },
-    "@jest/reporters": {
-      "version": "25.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-25.5.1.tgz",
-      "integrity": "sha512-3jbd8pPDTuhYJ7vqiHXbSwTJQNavczPs+f1kRprRDxETeE3u6srJ+f0NPuwvOmk+lmunZzPkYWIFZDLHQPkviw==",
-      "dev": true,
-      "requires": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^25.5.0",
-        "@jest/test-result": "^25.5.0",
-        "@jest/transform": "^25.5.1",
-        "@jest/types": "^25.5.0",
-        "chalk": "^3.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.2.4",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^4.0.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^25.5.1",
-        "jest-resolve": "^25.5.1",
-        "jest-util": "^25.5.0",
-        "jest-worker": "^25.5.0",
-        "node-notifier": "^6.0.0",
-        "slash": "^3.0.0",
-        "source-map": "^0.6.0",
-        "string-length": "^3.1.0",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^4.1.3"
+        "@jest/types": "^26.6.2",
+        "@sinonjs/fake-timers": "^6.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jest/source-map": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.5.0.tgz",
-      "integrity": "sha512-eIGx0xN12yVpMcPaVpjXPnn3N30QGJCJQSkEDUt9x1fI1Gdvb07Ml6K5iN2hG7NmMP6FDmtPEssE3z6doOYUwQ==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.4",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "@jest/test-result": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.5.0.tgz",
-      "integrity": "sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A==",
-      "dev": true,
-      "requires": {
-        "@jest/console": "^25.5.0",
-        "@jest/types": "^25.5.0",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      }
-    },
-    "@jest/test-sequencer": {
-      "version": "25.5.4",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.5.4.tgz",
-      "integrity": "sha512-pTJGEkSeg1EkCO2YWq6hbFvKNXk8ejqlxiOg1jBNLnWrgXOkdY6UmqZpwGFXNnRt9B8nO1uWMzLLZ4eCmhkPNA==",
-      "dev": true,
-      "requires": {
-        "@jest/test-result": "^25.5.0",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^25.5.1",
-        "jest-runner": "^25.5.4",
-        "jest-runtime": "^25.5.4"
-      }
-    },
-    "@jest/transform": {
-      "version": "25.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz",
-      "integrity": "sha512-Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.1.0",
-        "@jest/types": "^25.5.0",
-        "babel-plugin-istanbul": "^6.0.0",
-        "chalk": "^3.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^25.5.1",
-        "jest-regex-util": "^25.2.6",
-        "jest-util": "^25.5.0",
-        "micromatch": "^4.0.2",
-        "pirates": "^4.0.1",
-        "realpath-native": "^2.0.0",
-        "slash": "^3.0.0",
-        "source-map": "^0.6.1",
-        "write-file-atomic": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -1821,9 +2191,9 @@
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -1866,6 +2236,261 @@
           "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
           "dev": true
         },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "@jest/globals": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
+      "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "expect": "^26.6.2"
+      }
+    },
+    "@jest/reporters": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
+      "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
+      "dev": true,
+      "requires": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.2.4",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^4.0.3",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.0.2",
+        "jest-haste-map": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "node-notifier": "^8.0.0",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^4.0.1",
+        "terminal-link": "^2.0.0",
+        "v8-to-istanbul": "^7.0.0"
+      },
+      "dependencies": {
+        "@jest/transform": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
+          "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.1.0",
+            "@jest/types": "^26.6.2",
+            "babel-plugin-istanbul": "^6.0.0",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^1.4.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "graceful-fs": "^4.2.4",
+            "jest-haste-map": "^26.6.2",
+            "jest-regex-util": "^26.0.0",
+            "jest-util": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "pirates": "^4.0.1",
+            "slash": "^3.0.0",
+            "source-map": "^0.6.1",
+            "write-file-atomic": "^3.0.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "anymatch": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "jest-haste-map": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+          "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/graceful-fs": "^4.1.2",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.1.2",
+            "graceful-fs": "^4.2.4",
+            "jest-regex-util": "^26.0.0",
+            "jest-serializer": "^26.6.2",
+            "jest-util": "^26.6.2",
+            "jest-worker": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "sane": "^4.0.3",
+            "walker": "^1.0.7"
+          }
+        },
+        "jest-regex-util": {
+          "version": "26.0.0",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+          "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+          "dev": true
+        },
+        "jest-serializer": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+          "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "graceful-fs": "^4.2.4"
+          }
+        },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "jest-worker": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+          "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        },
         "micromatch": {
           "version": "4.0.2",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
@@ -1889,9 +2514,227 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "@jest/source-map": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
+      "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.4",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "@jest/test-result": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
+      "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      }
+    },
+    "@jest/test-sequencer": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
+      "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
+      "dev": true,
+      "requires": {
+        "@jest/test-result": "^26.6.2",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.6.2",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "anymatch": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "jest-haste-map": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+          "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/graceful-fs": "^4.1.2",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.1.2",
+            "graceful-fs": "^4.2.4",
+            "jest-regex-util": "^26.0.0",
+            "jest-serializer": "^26.6.2",
+            "jest-util": "^26.6.2",
+            "jest-worker": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "sane": "^4.0.3",
+            "walker": "^1.0.7"
+          }
+        },
+        "jest-regex-util": {
+          "version": "26.0.0",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+          "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+          "dev": true
+        },
+        "jest-serializer": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+          "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "graceful-fs": "^4.2.4"
+          }
+        },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "jest-worker": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+          "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -1909,31 +2752,31 @@
       }
     },
     "@jest/types": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
-      "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^1.1.1",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
         "@types/yargs": "^15.0.0",
-        "chalk": "^3.0.0"
+        "chalk": "^4.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -1962,9 +2805,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -2224,6 +3067,14 @@
         "minimatch": "^3.0.4",
         "npmlog": "^4.1.2",
         "slash": "^2.0.0"
+      },
+      "dependencies": {
+        "slash": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "dev": true
+        }
       }
     },
     "@lerna/command": {
@@ -2302,6 +3153,12 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
+        },
+        "slash": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "dev": true
         }
       }
     },
@@ -2496,6 +3353,14 @@
         "@lerna/symlink-dependencies": "3.17.0",
         "p-map": "^2.1.0",
         "slash": "^2.0.0"
+      },
+      "dependencies": {
+        "slash": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "dev": true
+        }
       }
     },
     "@lerna/list": {
@@ -2925,6 +3790,15 @@
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
           "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
           "dev": true
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
         }
       }
     },
@@ -3073,6 +3947,12 @@
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         },
+        "slash": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "dev": true
+        },
         "type-fest": {
           "version": "0.3.1",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
@@ -3114,12 +3994,40 @@
         "glob-to-regexp": "^0.3.0"
       }
     },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
+      "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.4",
+        "run-parallel": "^1.1.9"
+      },
+      "dependencies": {
+        "@nodelib/fs.stat": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
+          "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==",
+          "dev": true
+        }
+      }
+    },
     "@nodelib/fs.stat": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
       "dev": true
     },
+    "@nodelib/fs.walk": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
+      "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.4",
+        "fastq": "^1.6.0"
+      }
+    },
     "@octokit/auth-token": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.2.tgz",
@@ -3304,14 +4212,23 @@
       }
     },
     "@sinonjs/commons": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
-      "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz",
+      "integrity": "sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==",
       "dev": true,
       "requires": {
         "type-detect": "4.0.8"
       }
     },
+    "@sinonjs/fake-timers": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
+      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
+      "dev": true,
+      "requires": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
     "@types/babel__core": {
       "version": "7.1.9",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz",
@@ -3353,12 +4270,34 @@
         "@babel/types": "^7.3.0"
       }
     },
+    "@types/chai": {
+      "version": "4.2.15",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.15.tgz",
+      "integrity": "sha512-rYff6FI+ZTKAPkJUoyz7Udq3GaoDZnxYDEvdEdFZASiA7PoErltHezDishqQiSDWrGxvxmplH304jyzQmjp0AQ==",
+      "dev": true
+    },
     "@types/color-name": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
       "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
       "dev": true
     },
+    "@types/eslint": {
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-4.16.1.tgz",
+      "integrity": "sha512-lRUXQAULl5geixTiP2K0iYvMUbCkEnuOwvLGjwff12I4ECxoW5QaWML5UUOZ1CvpQLILkddBdMPMZz4ByQizsg==",
+      "dev": true,
+      "requires": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "@types/estree": {
+      "version": "0.0.46",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz",
+      "integrity": "sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==",
+      "dev": true
+    },
     "@types/glob": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
@@ -3394,15 +4333,24 @@
       }
     },
     "@types/istanbul-reports": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
-      "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
+      "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
       "dev": true,
       "requires": {
-        "@types/istanbul-lib-coverage": "*",
         "@types/istanbul-lib-report": "*"
       }
     },
+    "@types/jest": {
+      "version": "26.0.23",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.23.tgz",
+      "integrity": "sha512-ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA==",
+      "dev": true,
+      "requires": {
+        "jest-diff": "^26.0.0",
+        "pretty-format": "^26.0.0"
+      }
+    },
     "@types/json-schema": {
       "version": "7.0.5",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz",
@@ -3428,9 +4376,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "14.0.27",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz",
-      "integrity": "sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==",
+      "version": "14.14.35",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.35.tgz",
+      "integrity": "sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==",
       "dev": true
     },
     "@types/normalize-package-data": {
@@ -3446,32 +4394,351 @@
       "dev": true
     },
     "@types/prettier": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-1.19.1.tgz",
-      "integrity": "sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.2.3.tgz",
+      "integrity": "sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==",
       "dev": true
     },
+    "@types/rimraf": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.0.tgz",
+      "integrity": "sha512-7WhJ0MdpFgYQPXlF4Dx+DhgvlPCfz/x5mHaeDQAKhcenvQP1KCpLQ18JklAqeGMYSAT2PxLpzd0g2/HE7fj7hQ==",
+      "dev": true,
+      "requires": {
+        "@types/glob": "*",
+        "@types/node": "*"
+      }
+    },
     "@types/stack-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
-      "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
+      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
       "dev": true
     },
     "@types/yargs": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-      "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
+      "version": "15.0.13",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
+      "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
-      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
+      "version": "20.2.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
+      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
       "dev": true
     },
+    "@typescript-eslint/eslint-plugin": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.18.0.tgz",
+      "integrity": "sha512-Lzkc/2+7EoH7+NjIWLS2lVuKKqbEmJhtXe3rmfA8cyiKnZm3IfLf51irnBcmow8Q/AptVV0XBZmBJKuUJTe6cQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/experimental-utils": "4.18.0",
+        "@typescript-eslint/scope-manager": "4.18.0",
+        "debug": "^4.1.1",
+        "functional-red-black-tree": "^1.0.1",
+        "lodash": "^4.17.15",
+        "regexpp": "^3.0.0",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "semver": {
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
+    "@typescript-eslint/experimental-utils": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.18.0.tgz",
+      "integrity": "sha512-92h723Kblt9JcT2RRY3QS2xefFKar4ZQFVs3GityOKWQYgtajxt/tuXIzL7sVCUlM1hgreiV5gkGYyBpdOwO6A==",
+      "dev": true,
+      "requires": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.18.0",
+        "@typescript-eslint/types": "4.18.0",
+        "@typescript-eslint/typescript-estree": "4.18.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      }
+    },
+    "@typescript-eslint/parser": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.18.0.tgz",
+      "integrity": "sha512-W3z5S0ZbecwX3PhJEAnq4mnjK5JJXvXUDBYIYGoweCyWyuvAKfGHvzmpUzgB5L4cRBb+cTu9U/ro66dx7dIimA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/scope-manager": "4.18.0",
+        "@typescript-eslint/types": "4.18.0",
+        "@typescript-eslint/typescript-estree": "4.18.0",
+        "debug": "^4.1.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
+      }
+    },
+    "@typescript-eslint/scope-manager": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.18.0.tgz",
+      "integrity": "sha512-olX4yN6rvHR2eyFOcb6E4vmhDPsfdMyfQ3qR+oQNkAv8emKKlfxTWUXU5Mqxs2Fwe3Pf1BoPvrwZtwngxDzYzQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "4.18.0",
+        "@typescript-eslint/visitor-keys": "4.18.0"
+      }
+    },
+    "@typescript-eslint/types": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.18.0.tgz",
+      "integrity": "sha512-/BRociARpj5E+9yQ7cwCF/SNOWwXJ3qhjurMuK2hIFUbr9vTuDeu476Zpu+ptxY2kSxUHDGLLKy+qGq2sOg37A==",
+      "dev": true
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.18.0.tgz",
+      "integrity": "sha512-wt4xvF6vvJI7epz+rEqxmoNQ4ZADArGQO9gDU+cM0U5fdVv7N+IAuVoVAoZSOZxzGHBfvE3XQMLdy+scsqFfeg==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "4.18.0",
+        "@typescript-eslint/visitor-keys": "4.18.0",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      },
+      "dependencies": {
+        "@nodelib/fs.stat": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
+          "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==",
+          "dev": true
+        },
+        "array-union": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+          "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+          "dev": true
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "dir-glob": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+          "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+          "dev": true,
+          "requires": {
+            "path-type": "^4.0.0"
+          }
+        },
+        "fast-glob": {
+          "version": "3.2.5",
+          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
+          "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+          "dev": true,
+          "requires": {
+            "@nodelib/fs.stat": "^2.0.2",
+            "@nodelib/fs.walk": "^1.2.3",
+            "glob-parent": "^5.1.0",
+            "merge2": "^1.3.0",
+            "micromatch": "^4.0.2",
+            "picomatch": "^2.2.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "globby": {
+          "version": "11.0.2",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz",
+          "integrity": "sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==",
+          "dev": true,
+          "requires": {
+            "array-union": "^2.1.0",
+            "dir-glob": "^3.0.1",
+            "fast-glob": "^3.1.1",
+            "ignore": "^5.1.4",
+            "merge2": "^1.3.0",
+            "slash": "^3.0.0"
+          }
+        },
+        "ignore": {
+          "version": "5.1.8",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "path-type": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+          "dev": true
+        },
+        "semver": {
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "slash": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+          "dev": true
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
+    "@typescript-eslint/visitor-keys": {
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.18.0.tgz",
+      "integrity": "sha512-Q9t90JCvfYaN0OfFUgaLqByOfz8yPeTAdotn/XYNm5q9eHax90gzdb+RJ6E9T5s97Kv/UHWKERTmqA0jTKAEHw==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "4.18.0",
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+          "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+          "dev": true
+        }
+      }
+    },
     "@zkochan/cmd-shim": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz",
@@ -3494,9 +4761,9 @@
       }
     },
     "abab": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
-      "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
       "dev": true
     },
     "abbrev": {
@@ -3512,21 +4779,13 @@
       "dev": true
     },
     "acorn-globals": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
-      "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
       "dev": true,
       "requires": {
-        "acorn": "^6.0.1",
-        "acorn-walk": "^6.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
-          "dev": true
-        }
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
       }
     },
     "acorn-jsx": {
@@ -3536,9 +4795,9 @@
       "dev": true
     },
     "acorn-walk": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
-      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
       "dev": true
     },
     "agent-base": {
@@ -3701,12 +4960,6 @@
       "integrity": "sha512-KbUpJgx909ZscOc/7CLATBFam7P1Z1QRQInvgT0UztM9Q72aGKCunKASAl7WNW0tnPmPyEMeMhdsfWhfmW037w==",
       "dev": true
     },
-    "array-equal": {
-      "version": "1.0.0",
-      "resolved": "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
-      "dev": true
-    },
     "array-find-index": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
@@ -3848,94 +5101,6 @@
       "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==",
       "dev": true
     },
-    "babel-eslint": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
-      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.0",
-        "@babel/traverse": "^7.7.0",
-        "@babel/types": "^7.7.0",
-        "eslint-visitor-keys": "^1.0.0",
-        "resolve": "^1.12.0"
-      }
-    },
-    "babel-jest": {
-      "version": "25.5.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.5.1.tgz",
-      "integrity": "sha512-9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ==",
-      "dev": true,
-      "requires": {
-        "@jest/transform": "^25.5.1",
-        "@jest/types": "^25.5.0",
-        "@types/babel__core": "^7.1.7",
-        "babel-plugin-istanbul": "^6.0.0",
-        "babel-preset-jest": "^25.5.0",
-        "chalk": "^3.0.0",
-        "graceful-fs": "^4.2.4",
-        "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "babel-loader": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
@@ -3984,21 +5149,10 @@
         "test-exclude": "^6.0.0"
       }
     },
-    "babel-plugin-jest-hoist": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz",
-      "integrity": "sha512-u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__traverse": "^7.0.6"
-      }
-    },
     "babel-plugin-styled-components": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz",
-      "integrity": "sha512-YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz",
+      "integrity": "sha512-FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.0.0",
@@ -4013,35 +5167,6 @@
       "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
       "dev": true
     },
-    "babel-preset-current-node-syntax": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz",
-      "integrity": "sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ==",
-      "dev": true,
-      "requires": {
-        "@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-import-meta": "^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": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz",
-      "integrity": "sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==",
-      "dev": true,
-      "requires": {
-        "babel-plugin-jest-hoist": "^25.5.0",
-        "babel-preset-current-node-syntax": "^0.1.2"
-      }
-    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -4192,23 +5317,6 @@
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
       "dev": true
     },
-    "browser-resolve": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
-      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
-      "dev": true,
-      "requires": {
-        "resolve": "1.1.7"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-          "dev": true
-        }
-      }
-    },
     "browserslist": {
       "version": "4.13.0",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz",
@@ -4221,6 +5329,15 @@
         "node-releases": "^1.1.58"
       }
     },
+    "bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "requires": {
+        "fast-json-stable-stringify": "2.x"
+      }
+    },
     "bser": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
@@ -4281,6 +5398,17 @@
         "ssri": "^6.0.1",
         "unique-filename": "^1.1.1",
         "y18n": "^4.0.0"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "cache-base": {
@@ -4387,6 +5515,12 @@
         "supports-color": "^5.3.0"
       }
     },
+    "char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true
+    },
     "chardet": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
@@ -4405,6 +5539,12 @@
       "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
       "dev": true
     },
+    "cjs-module-lexer": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
+      "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
+      "dev": true
+    },
     "clap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz",
@@ -4607,9 +5747,9 @@
           "dev": true
         },
         "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
           "dev": true,
           "requires": {
             "emoji-regex": "^8.0.0",
@@ -4697,6 +5837,12 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
+    "colorette": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+      "dev": true
+    },
     "colors": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
@@ -5289,6 +6435,17 @@
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4",
         "run-queue": "^1.0.0"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "copy-descriptor": {
@@ -5488,14 +6645,42 @@
       }
     },
     "data-urls": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
-      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
       "dev": true,
       "requires": {
-        "abab": "^2.0.0",
-        "whatwg-mimetype": "^2.2.0",
-        "whatwg-url": "^7.0.0"
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      },
+      "dependencies": {
+        "tr46": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
+          "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
+          "dev": true,
+          "requires": {
+            "punycode": "^2.1.1"
+          }
+        },
+        "webidl-conversions": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+          "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+          "dev": true
+        },
+        "whatwg-url": {
+          "version": "8.4.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz",
+          "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==",
+          "dev": true,
+          "requires": {
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^2.0.2",
+            "webidl-conversions": "^6.1.0"
+          }
+        }
       }
     },
     "dateformat": {
@@ -5543,6 +6728,12 @@
         }
       }
     },
+    "decimal.js": {
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
+      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "dev": true
+    },
     "decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
@@ -5667,9 +6858,9 @@
       }
     },
     "diff-sequences": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
-      "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
       "dev": true
     },
     "dir-glob": {
@@ -5708,12 +6899,20 @@
       }
     },
     "domexception": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
-      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
       "dev": true,
       "requires": {
-        "webidl-conversions": "^4.0.2"
+        "webidl-conversions": "^5.0.0"
+      },
+      "dependencies": {
+        "webidl-conversions": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+          "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+          "dev": true
+        }
       }
     },
     "dot-prop": {
@@ -5759,6 +6958,12 @@
       "integrity": "sha512-8vb8zKIeGlZigeDzNWWthmGeLzo5CC43Lc+CZshMs7UXFVMPNLtXJGa/txedpu3OJFrXXVheBwp9PqOJJlHQ8w==",
       "dev": true
     },
+    "emittery": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
+      "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
+      "dev": true
+    },
     "emoji-regex": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
@@ -5894,18 +7099,24 @@
       "dev": true
     },
     "escodegen": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
       "dev": true,
       "requires": {
         "esprima": "^4.0.1",
-        "estraverse": "^4.2.0",
+        "estraverse": "^5.2.0",
         "esutils": "^2.0.2",
         "optionator": "^0.8.1",
         "source-map": "~0.6.1"
       },
       "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        },
         "levn": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -6075,6 +7286,14 @@
           "dev": true,
           "requires": {
             "type-fest": "^0.8.1"
+          },
+          "dependencies": {
+            "type-fest": {
+              "version": "0.8.1",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+              "dev": true
+            }
           }
         },
         "has-flag": {
@@ -6136,15 +7355,6 @@
         }
       }
     },
-    "eslint-config-prettier": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz",
-      "integrity": "sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^6.0.0"
-      }
-    },
     "eslint-config-semistandard": {
       "version": "15.0.1",
       "resolved": "https://registry.npmjs.org/eslint-config-semistandard/-/eslint-config-semistandard-15.0.1.tgz",
@@ -11841,6 +13051,12 @@
       "integrity": "sha512-0E4OIgBJVlAmf1KfYFtZ3gYxgUzC5Eb3Jzmrc9ikI1OY+/cM8Kh72Ti7KfpeHNeD3HJNf9SmEfmvQLIz44Hrhw==",
       "dev": true
     },
+    "eslint-plugin-jest-formatting": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest-formatting/-/eslint-plugin-jest-formatting-2.0.1.tgz",
+      "integrity": "sha512-t6oc6GcXqzQ4lwatnVoKxGTLqo8kFIdA5kpaS3mrkwnTNxhsgFo9reMFdrtNtllx72ohNUsXsay7RJR/LLLk3Q==",
+      "dev": true
+    },
     "eslint-plugin-json": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-json/-/eslint-plugin-json-1.4.0.tgz",
@@ -11870,15 +13086,6 @@
         }
       }
     },
-    "eslint-plugin-prettier": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz",
-      "integrity": "sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==",
-      "dev": true,
-      "requires": {
-        "prettier-linter-helpers": "^1.0.0"
-      }
-    },
     "eslint-plugin-promise": {
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.8.0.tgz",
@@ -12076,26 +13283,25 @@
       }
     },
     "expect": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz",
-      "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.5.0",
+        "@jest/types": "^26.6.2",
         "ansi-styles": "^4.0.0",
-        "jest-get-type": "^25.2.6",
-        "jest-matcher-utils": "^25.5.0",
-        "jest-message-util": "^25.5.0",
-        "jest-regex-util": "^25.2.6"
+        "jest-get-type": "^26.3.0",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -12113,6 +13319,12 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
+        },
+        "jest-regex-util": {
+          "version": "26.0.0",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+          "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+          "dev": true
         }
       }
     },
@@ -12231,12 +13443,6 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
-    "fast-diff": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
-      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
-      "dev": true
-    },
     "fast-glob": {
       "version": "2.2.7",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
@@ -12263,6 +13469,15 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
+    "fastq": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
+      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
     "fb-watchman": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
@@ -12384,12 +13599,6 @@
       "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
       "dev": true
     },
-    "flow-bin": {
-      "version": "0.122.0",
-      "resolved": "https://registry.npmjs.org/flow-bin/-/flow-bin-0.122.0.tgz",
-      "integrity": "sha512-my8N5jgl/A+UVby9E7NDppHdhLgRbWgKbmFZSx2MSYMRh3d9YGnM2MM+wexpUpl0ftY1IM6ZcUwaAhrypLyvlA==",
-      "dev": true
-    },
     "flush-write-stream": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
@@ -12554,9 +13763,9 @@
       "dev": true
     },
     "gensync": {
-      "version": "1.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true
     },
     "get-caller-file": {
@@ -12757,12 +13966,6 @@
       "integrity": "sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==",
       "dev": true
     },
-    "get-stdin": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
-      "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==",
-      "dev": true
-    },
     "get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -13309,6 +14512,14 @@
         "ignore": "^4.0.3",
         "pify": "^4.0.1",
         "slash": "^2.0.0"
+      },
+      "dependencies": {
+        "slash": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "dev": true
+        }
       }
     },
     "graceful-fs": {
@@ -13442,12 +14653,12 @@
       "dev": true
     },
     "html-encoding-sniffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
-      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
       "dev": true,
       "requires": {
-        "whatwg-encoding": "^1.0.1"
+        "whatwg-encoding": "^1.0.5"
       }
     },
     "html-escaper": {
@@ -13845,12 +15056,6 @@
       "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
       "dev": true
     },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-      "dev": true
-    },
     "is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
@@ -13908,6 +15113,15 @@
         "ci-info": "^2.0.0"
       }
     },
+    "is-core-module": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -13960,9 +15174,9 @@
       "dev": true
     },
     "is-docker": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz",
-      "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
+      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
       "dev": true,
       "optional": true
     },
@@ -14046,6 +15260,12 @@
         "isobject": "^3.0.1"
       }
     },
+    "is-potential-custom-element-name": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
+      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
+      "dev": true
+    },
     "is-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
@@ -14211,9 +15431,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -14233,12 +15453,12 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
@@ -14266,30 +15486,38 @@
       }
     },
     "jest": {
-      "version": "25.5.4",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-25.5.4.tgz",
-      "integrity": "sha512-hHFJROBTqZahnO+X+PMtT6G2/ztqAZJveGqz//FnWWHurizkD05PQGzRZOhF3XP6z7SJmL+5tCfW8qV06JypwQ==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
+      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
       "dev": true,
       "requires": {
-        "@jest/core": "^25.5.4",
+        "@jest/core": "^26.6.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^25.5.4"
+        "jest-cli": "^26.6.3"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -14311,53 +15539,100 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
         "jest-cli": {
-          "version": "25.5.4",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-25.5.4.tgz",
-          "integrity": "sha512-rG8uJkIiOUpnREh1768/N3n27Cm+xPFkSNFO91tgg+8o2rXeVLStz+vkXkGr4UtzH6t1SNbjwoiswd7p4AhHTw==",
+          "version": "26.6.3",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
+          "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
           "dev": true,
           "requires": {
-            "@jest/core": "^25.5.4",
-            "@jest/test-result": "^25.5.0",
-            "@jest/types": "^25.5.0",
-            "chalk": "^3.0.0",
+            "@jest/core": "^26.6.3",
+            "@jest/test-result": "^26.6.2",
+            "@jest/types": "^26.6.2",
+            "chalk": "^4.0.0",
             "exit": "^0.1.2",
             "graceful-fs": "^4.2.4",
             "import-local": "^3.0.2",
             "is-ci": "^2.0.0",
-            "jest-config": "^25.5.4",
-            "jest-util": "^25.5.0",
-            "jest-validate": "^25.5.0",
+            "jest-config": "^26.6.3",
+            "jest-util": "^26.6.2",
+            "jest-validate": "^26.6.2",
             "prompts": "^2.0.1",
-            "realpath-native": "^2.0.0",
-            "yargs": "^15.3.1"
+            "yargs": "^15.4.1"
+          }
+        },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
           }
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
         }
       }
     },
     "jest-changed-files": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-25.5.0.tgz",
-      "integrity": "sha512-EOw9QEqapsDT7mKF162m8HFzRPbmP8qJQny6ldVOdOVBz3ACgPm/1nAn5fPQ/NDaYhX/AHkrGwwkCncpAVSXcw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
+      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.5.0",
-        "execa": "^3.2.0",
+        "@jest/types": "^26.6.2",
+        "execa": "^4.0.0",
         "throat": "^5.0.0"
       },
       "dependencies": {
@@ -14373,9 +15648,9 @@
           }
         },
         "execa": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
-          "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+          "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
           "dev": true,
           "requires": {
             "cross-spawn": "^7.0.0",
@@ -14385,15 +15660,14 @@
             "merge-stream": "^2.0.0",
             "npm-run-path": "^4.0.0",
             "onetime": "^5.1.0",
-            "p-finally": "^2.0.0",
             "signal-exit": "^3.0.2",
             "strip-final-newline": "^2.0.0"
           }
         },
         "get-stream": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
           "dev": true,
           "requires": {
             "pump": "^3.0.0"
@@ -14414,12 +15688,6 @@
             "path-key": "^3.0.0"
           }
         },
-        "p-finally": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
-          "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
-          "dev": true
-        },
         "path-key": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -14444,42 +15712,131 @@
       }
     },
     "jest-config": {
-      "version": "25.5.4",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.5.4.tgz",
-      "integrity": "sha512-SZwR91SwcdK6bz7Gco8qL7YY2sx8tFJYzvg216DLihTWf+LKY/DoJXpM9nTzYakSyfblbqeU48p/p7Jzy05Atg==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^25.5.4",
-        "@jest/types": "^25.5.0",
-        "babel-jest": "^25.5.1",
-        "chalk": "^3.0.0",
+        "@jest/test-sequencer": "^26.6.3",
+        "@jest/types": "^26.6.2",
+        "babel-jest": "^26.6.3",
+        "chalk": "^4.0.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.1",
         "graceful-fs": "^4.2.4",
-        "jest-environment-jsdom": "^25.5.0",
-        "jest-environment-node": "^25.5.0",
-        "jest-get-type": "^25.2.6",
-        "jest-jasmine2": "^25.5.4",
-        "jest-regex-util": "^25.2.6",
-        "jest-resolve": "^25.5.1",
-        "jest-util": "^25.5.0",
-        "jest-validate": "^25.5.0",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-jasmine2": "^26.6.3",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
         "micromatch": "^4.0.2",
-        "pretty-format": "^25.5.0",
-        "realpath-native": "^2.0.0"
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+        "@jest/transform": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
+          "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.1.0",
+            "@jest/types": "^26.6.2",
+            "babel-plugin-istanbul": "^6.0.0",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^1.4.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "graceful-fs": "^4.2.4",
+            "jest-haste-map": "^26.6.2",
+            "jest-regex-util": "^26.0.0",
+            "jest-util": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "pirates": "^4.0.1",
+            "slash": "^3.0.0",
+            "source-map": "^0.6.1",
+            "write-file-atomic": "^3.0.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
+        "anymatch": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "babel-jest": {
+          "version": "26.6.3",
+          "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
+          "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
+          "dev": true,
+          "requires": {
+            "@jest/transform": "^26.6.2",
+            "@jest/types": "^26.6.2",
+            "@types/babel__core": "^7.1.7",
+            "babel-plugin-istanbul": "^6.0.0",
+            "babel-preset-jest": "^26.6.2",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "slash": "^3.0.0"
+          }
+        },
+        "babel-plugin-jest-hoist": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
+          "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.3.3",
+            "@babel/types": "^7.3.3",
+            "@types/babel__core": "^7.0.0",
+            "@types/babel__traverse": "^7.0.6"
+          }
+        },
+        "babel-preset-current-node-syntax": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+          "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+          "dev": true,
+          "requires": {
+            "@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-import-meta": "^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/plugin-syntax-top-level-await": "^7.8.3"
+          }
+        },
+        "babel-preset-jest": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
+          "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
+          "dev": true,
+          "requires": {
+            "babel-plugin-jest-hoist": "^26.6.2",
+            "babel-preset-current-node-syntax": "^1.0.0"
+          }
+        },
         "braces": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
@@ -14490,9 +15847,9 @@
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -14523,6 +15880,13 @@
             "to-regex-range": "^5.0.1"
           }
         },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -14535,6 +15899,69 @@
           "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
           "dev": true
         },
+        "jest-haste-map": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+          "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/graceful-fs": "^4.1.2",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.1.2",
+            "graceful-fs": "^4.2.4",
+            "jest-regex-util": "^26.0.0",
+            "jest-serializer": "^26.6.2",
+            "jest-util": "^26.6.2",
+            "jest-worker": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "sane": "^4.0.3",
+            "walker": "^1.0.7"
+          }
+        },
+        "jest-regex-util": {
+          "version": "26.0.0",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+          "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+          "dev": true
+        },
+        "jest-serializer": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+          "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "graceful-fs": "^4.2.4"
+          }
+        },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "jest-worker": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+          "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        },
         "micromatch": {
           "version": "4.0.2",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
@@ -14545,10 +15972,22 @@
             "picomatch": "^2.0.5"
           }
         },
+        "slash": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -14566,31 +16005,30 @@
       }
     },
     "jest-diff": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
-      "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
       "dev": true,
       "requires": {
-        "chalk": "^3.0.0",
-        "diff-sequences": "^25.2.6",
-        "jest-get-type": "^25.2.6",
-        "pretty-format": "^25.5.0"
+        "chalk": "^4.0.0",
+        "diff-sequences": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -14619,9 +16057,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -14630,152 +16068,36 @@
       }
     },
     "jest-docblock": {
-      "version": "25.3.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.3.0.tgz",
-      "integrity": "sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg==",
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
+      "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
       "dev": true,
       "requires": {
         "detect-newline": "^3.0.0"
       }
     },
     "jest-each": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.5.0.tgz",
-      "integrity": "sha512-QBogUxna3D8vtiItvn54xXde7+vuzqRrEeaw8r1s+1TG9eZLVJE5ZkKoSUlqFwRjnlaA4hyKGiu9OlkFIuKnjA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
+      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.5.0",
-        "chalk": "^3.0.0",
-        "jest-get-type": "^25.2.6",
-        "jest-util": "^25.5.0",
-        "pretty-format": "^25.5.0"
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-environment-jsdom": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.5.0.tgz",
-      "integrity": "sha512-7Jr02ydaq4jaWMZLY+Skn8wL5nVIYpWvmeatOHL3tOcV3Zw8sjnPpx+ZdeBfc457p8jCR9J6YCc+Lga0oIy62A==",
-      "dev": true,
-      "requires": {
-        "@jest/environment": "^25.5.0",
-        "@jest/fake-timers": "^25.5.0",
-        "@jest/types": "^25.5.0",
-        "jest-mock": "^25.5.0",
-        "jest-util": "^25.5.0",
-        "jsdom": "^15.2.1"
-      }
-    },
-    "jest-environment-node": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.5.0.tgz",
-      "integrity": "sha512-iuxK6rQR2En9EID+2k+IBs5fCFd919gVVK5BeND82fYeLWPqvRcFNPKu9+gxTwfB5XwBGBvZ0HFQa+cHtIoslA==",
-      "dev": true,
-      "requires": {
-        "@jest/environment": "^25.5.0",
-        "@jest/fake-timers": "^25.5.0",
-        "@jest/types": "^25.5.0",
-        "jest-mock": "^25.5.0",
-        "jest-util": "^25.5.0",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "jest-get-type": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
-      "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
-      "dev": true
-    },
-    "jest-haste-map": {
-      "version": "25.5.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz",
-      "integrity": "sha512-dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^25.5.0",
-        "@types/graceful-fs": "^4.1.2",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "fsevents": "^2.1.2",
-        "graceful-fs": "^4.2.4",
-        "jest-serializer": "^25.5.0",
-        "jest-util": "^25.5.0",
-        "jest-worker": "^25.5.0",
-        "micromatch": "^4.0.2",
-        "sane": "^4.0.3",
-        "walker": "^1.0.7",
-        "which": "^2.0.2"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-          "dev": true,
-          "requires": {
-            "normalize-path": "^3.0.0",
-            "picomatch": "^2.0.4"
-          }
-        },
         "braces": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
@@ -14785,6 +16107,31 @@
             "fill-range": "^7.0.1"
           }
         },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
         "fill-range": {
           "version": "7.0.1",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -14794,12 +16141,11 @@
             "to-regex-range": "^5.0.1"
           }
         },
-        "fsevents": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-          "dev": true,
-          "optional": true
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
         },
         "is-number": {
           "version": "7.0.0",
@@ -14807,6 +16153,20 @@
           "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
           "dev": true
         },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
         "micromatch": {
           "version": "4.0.2",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
@@ -14817,6 +16177,15 @@
             "picomatch": "^2.0.5"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "to-regex-range": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -14828,180 +16197,27 @@
         }
       }
     },
-    "jest-jasmine2": {
-      "version": "25.5.4",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.5.4.tgz",
-      "integrity": "sha512-9acbWEfbmS8UpdcfqnDO+uBUgKa/9hcRh983IHdM+pKmJPL77G0sWAAK0V0kr5LK3a8cSBfkFSoncXwQlRZfkQ==",
+    "jest-environment-jsdom": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
+      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
       "dev": true,
       "requires": {
-        "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^25.5.0",
-        "@jest/source-map": "^25.5.0",
-        "@jest/test-result": "^25.5.0",
-        "@jest/types": "^25.5.0",
-        "chalk": "^3.0.0",
-        "co": "^4.6.0",
-        "expect": "^25.5.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^25.5.0",
-        "jest-matcher-utils": "^25.5.0",
-        "jest-message-util": "^25.5.0",
-        "jest-runtime": "^25.5.4",
-        "jest-snapshot": "^25.5.1",
-        "jest-util": "^25.5.0",
-        "pretty-format": "^25.5.0",
-        "throat": "^5.0.0"
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jsdom": "^16.4.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-leak-detector": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.5.0.tgz",
-      "integrity": "sha512-rV7JdLsanS8OkdDpZtgBf61L5xZ4NnYLBq72r6ldxahJWWczZjXawRsoHyXzibM5ed7C2QRjpp6ypgwGdKyoVA==",
-      "dev": true,
-      "requires": {
-        "jest-get-type": "^25.2.6",
-        "pretty-format": "^25.5.0"
-      }
-    },
-    "jest-matcher-utils": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz",
-      "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==",
-      "dev": true,
-      "requires": {
-        "chalk": "^3.0.0",
-        "jest-diff": "^25.5.0",
-        "jest-get-type": "^25.2.6",
-        "pretty-format": "^25.5.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-message-util": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz",
-      "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^25.5.0",
-        "@types/stack-utils": "^1.0.1",
-        "chalk": "^3.0.0",
-        "graceful-fs": "^4.2.4",
-        "micromatch": "^4.0.2",
-        "slash": "^3.0.0",
-        "stack-utils": "^1.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -15015,9 +16231,469 @@
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "jest-environment-node": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
+      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "jest-get-type": {
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+      "dev": true
+    },
+    "jest-jasmine2": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
+      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
+      "dev": true,
+      "requires": {
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "expect": "^26.6.2",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2",
+        "throat": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "jest-leak-detector": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
+      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+      "dev": true,
+      "requires": {
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      }
+    },
+    "jest-matcher-utils": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "jest-message-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -15077,9 +16753,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -15097,12 +16773,13 @@
       }
     },
     "jest-mock": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.5.0.tgz",
-      "integrity": "sha512-eXWuTV8mKzp/ovHc5+3USJMYsTBhyQ+5A1Mak35dey/RG8GlM4YWVylZuGgVXinaW6tpvk/RSecmF37FKUlpXA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
+      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.5.0"
+        "@jest/types": "^26.6.2",
+        "@types/node": "*"
       }
     },
     "jest-pnp-resolver": {
@@ -15111,43 +16788,44 @@
       "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
       "dev": true
     },
-    "jest-regex-util": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz",
-      "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==",
-      "dev": true
-    },
     "jest-resolve": {
-      "version": "25.5.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.5.1.tgz",
-      "integrity": "sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.5.0",
-        "browser-resolve": "^1.11.3",
-        "chalk": "^3.0.0",
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
-        "jest-pnp-resolver": "^1.2.1",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^26.6.2",
         "read-pkg-up": "^7.0.1",
-        "realpath-native": "^2.0.0",
-        "resolve": "^1.17.0",
+        "resolve": "^1.18.1",
         "slash": "^3.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -15169,21 +16847,60 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
+          }
+        },
         "parse-json": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.1.tgz",
-          "integrity": "sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+          "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.0.0",
             "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1",
+            "json-parse-even-better-errors": "^2.3.0",
             "lines-and-columns": "^1.1.6"
           }
         },
@@ -15216,6 +16933,24 @@
             "find-up": "^4.1.0",
             "read-pkg": "^5.2.0",
             "type-fest": "^0.8.1"
+          },
+          "dependencies": {
+            "type-fest": {
+              "version": "0.8.1",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+              "dev": true
+            }
+          }
+        },
+        "resolve": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+          "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.2.0",
+            "path-parse": "^1.0.6"
           }
         },
         "slash": {
@@ -15225,68 +16960,104 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
         }
       }
     },
     "jest-resolve-dependencies": {
-      "version": "25.5.4",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-25.5.4.tgz",
-      "integrity": "sha512-yFmbPd+DAQjJQg88HveObcGBA32nqNZ02fjYmtL16t1xw9bAttSn5UGRRhzMHIQbsep7znWvAvnD4kDqOFM0Uw==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
+      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.5.0",
-        "jest-regex-util": "^25.2.6",
-        "jest-snapshot": "^25.5.1"
+        "@jest/types": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-snapshot": "^26.6.2"
+      },
+      "dependencies": {
+        "jest-regex-util": {
+          "version": "26.0.0",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+          "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+          "dev": true
+        }
       }
     },
     "jest-runner": {
-      "version": "25.5.4",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.5.4.tgz",
-      "integrity": "sha512-V/2R7fKZo6blP8E9BL9vJ8aTU4TH2beuqGNxHbxi6t14XzTb+x90B3FRgdvuHm41GY8ch4xxvf0ATH4hdpjTqg==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
+      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^25.5.0",
-        "@jest/environment": "^25.5.0",
-        "@jest/test-result": "^25.5.0",
-        "@jest/types": "^25.5.0",
-        "chalk": "^3.0.0",
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.7.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^25.5.4",
-        "jest-docblock": "^25.3.0",
-        "jest-haste-map": "^25.5.1",
-        "jest-jasmine2": "^25.5.4",
-        "jest-leak-detector": "^25.5.0",
-        "jest-message-util": "^25.5.0",
-        "jest-resolve": "^25.5.1",
-        "jest-runtime": "^25.5.4",
-        "jest-util": "^25.5.0",
-        "jest-worker": "^25.5.0",
+        "jest-config": "^26.6.3",
+        "jest-docblock": "^26.0.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-leak-detector": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "source-map-support": "^0.5.6",
         "throat": "^5.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
+        "anymatch": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -15308,71 +17079,217 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "jest-haste-map": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+          "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/graceful-fs": "^4.1.2",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.1.2",
+            "graceful-fs": "^4.2.4",
+            "jest-regex-util": "^26.0.0",
+            "jest-serializer": "^26.6.2",
+            "jest-util": "^26.6.2",
+            "jest-worker": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "sane": "^4.0.3",
+            "walker": "^1.0.7"
+          }
+        },
+        "jest-regex-util": {
+          "version": "26.0.0",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+          "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+          "dev": true
+        },
+        "jest-serializer": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+          "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "graceful-fs": "^4.2.4"
+          }
+        },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "jest-worker": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+          "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
+          }
+        },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
         }
       }
     },
     "jest-runtime": {
-      "version": "25.5.4",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.5.4.tgz",
-      "integrity": "sha512-RWTt8LeWh3GvjYtASH2eezkc8AehVoWKK20udV6n3/gC87wlTbE1kIA+opCvNWyyPeBs6ptYsc6nyHUb1GlUVQ==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
+      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
       "dev": true,
       "requires": {
-        "@jest/console": "^25.5.0",
-        "@jest/environment": "^25.5.0",
-        "@jest/globals": "^25.5.2",
-        "@jest/source-map": "^25.5.0",
-        "@jest/test-result": "^25.5.0",
-        "@jest/transform": "^25.5.1",
-        "@jest/types": "^25.5.0",
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/globals": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/yargs": "^15.0.0",
-        "chalk": "^3.0.0",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^0.6.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^25.5.4",
-        "jest-haste-map": "^25.5.1",
-        "jest-message-util": "^25.5.0",
-        "jest-mock": "^25.5.0",
-        "jest-regex-util": "^25.2.6",
-        "jest-resolve": "^25.5.1",
-        "jest-snapshot": "^25.5.1",
-        "jest-util": "^25.5.0",
-        "jest-validate": "^25.5.0",
-        "realpath-native": "^2.0.0",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0",
-        "yargs": "^15.3.1"
+        "yargs": "^15.4.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+        "@jest/transform": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
+          "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.1.0",
+            "@jest/types": "^26.6.2",
+            "babel-plugin-istanbul": "^6.0.0",
+            "chalk": "^4.0.0",
+            "convert-source-map": "^1.4.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "graceful-fs": "^4.2.4",
+            "jest-haste-map": "^26.6.2",
+            "jest-regex-util": "^26.0.0",
+            "jest-util": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "pirates": "^4.0.1",
+            "slash": "^3.0.0",
+            "source-map": "^0.6.1",
+            "write-file-atomic": "^3.0.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
+        "anymatch": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -15394,18 +17311,119 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "jest-haste-map": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+          "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/graceful-fs": "^4.1.2",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.1.2",
+            "graceful-fs": "^4.2.4",
+            "jest-regex-util": "^26.0.0",
+            "jest-serializer": "^26.6.2",
+            "jest-util": "^26.6.2",
+            "jest-worker": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "sane": "^4.0.3",
+            "walker": "^1.0.7"
+          }
+        },
+        "jest-regex-util": {
+          "version": "26.0.0",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+          "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+          "dev": true
+        },
+        "jest-serializer": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+          "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "graceful-fs": "^4.2.4"
+          }
+        },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "jest-worker": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+          "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
+          }
+        },
         "slash": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
           "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
           "dev": true
         },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
         "strip-bom": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
@@ -15413,62 +17431,81 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
         }
       }
     },
-    "jest-serializer": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz",
-      "integrity": "sha512-LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.2.4"
-      }
-    },
     "jest-snapshot": {
-      "version": "25.5.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.5.1.tgz",
-      "integrity": "sha512-C02JE1TUe64p2v1auUJ2ze5vcuv32tkv9PyhEb318e8XOKF7MOyXdJ7kdjbvrp3ChPLU2usI7Rjxs97Dj5P0uQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
+      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0",
-        "@jest/types": "^25.5.0",
-        "@types/prettier": "^1.19.0",
-        "chalk": "^3.0.0",
-        "expect": "^25.5.0",
+        "@jest/types": "^26.6.2",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^26.6.2",
         "graceful-fs": "^4.2.4",
-        "jest-diff": "^25.5.0",
-        "jest-get-type": "^25.2.6",
-        "jest-matcher-utils": "^25.5.0",
-        "jest-message-util": "^25.5.0",
-        "jest-resolve": "^25.5.1",
-        "make-dir": "^3.0.0",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^25.5.0",
-        "semver": "^6.3.0"
+        "pretty-format": "^26.6.2",
+        "semver": "^7.3.2"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
+        "anymatch": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -15490,85 +17527,21 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
           "dev": true,
           "requires": {
-            "semver": "^6.0.0"
+            "to-regex-range": "^5.0.1"
           }
         },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
           "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-util": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz",
-      "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^25.5.0",
-        "chalk": "^3.0.0",
-        "graceful-fs": "^4.2.4",
-        "is-ci": "^2.0.0",
-        "make-dir": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
+          "optional": true
         },
         "has-flag": {
           "version": "4.0.0",
@@ -15576,60 +17549,162 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "jest-haste-map": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+          "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
           "dev": true,
           "requires": {
-            "semver": "^6.0.0"
+            "@jest/types": "^26.6.2",
+            "@types/graceful-fs": "^4.1.2",
+            "@types/node": "*",
+            "anymatch": "^3.0.3",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.1.2",
+            "graceful-fs": "^4.2.4",
+            "jest-regex-util": "^26.0.0",
+            "jest-serializer": "^26.6.2",
+            "jest-util": "^26.6.2",
+            "jest-worker": "^26.6.2",
+            "micromatch": "^4.0.2",
+            "sane": "^4.0.3",
+            "walker": "^1.0.7"
+          }
+        },
+        "jest-regex-util": {
+          "version": "26.0.0",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+          "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+          "dev": true
+        },
+        "jest-serializer": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+          "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "graceful-fs": "^4.2.4"
+          }
+        },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "jest-worker": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+          "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
           }
         },
         "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
         }
       }
     },
     "jest-validate": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.5.0.tgz",
-      "integrity": "sha512-okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
+      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.5.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^3.0.0",
-        "jest-get-type": "^25.2.6",
+        "@jest/types": "^26.6.2",
+        "camelcase": "^6.0.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
         "leven": "^3.1.0",
-        "pretty-format": "^25.5.0"
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
+        "camelcase": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+          "dev": true
+        },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -15658,9 +17733,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -15669,33 +17744,42 @@
       }
     },
     "jest-watcher": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-25.5.0.tgz",
-      "integrity": "sha512-XrSfJnVASEl+5+bb51V0Q7WQx65dTSk7NL4yDdVjPnRNpM0hG+ncFmDYJo9O8jaSRcAitVbuVawyXCRoxGrT5Q==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
+      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^25.5.0",
-        "@jest/types": "^25.5.0",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
         "ansi-escapes": "^4.2.1",
-        "chalk": "^3.0.0",
-        "jest-util": "^25.5.0",
-        "string-length": "^3.1.0"
+        "chalk": "^4.0.0",
+        "jest-util": "^26.6.2",
+        "string-length": "^4.0.1"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -15717,46 +17801,67 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
+          }
+        },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
-        }
-      }
-    },
-    "jest-worker": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
-      "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
-      "dev": true,
-      "requires": {
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
         },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "is-number": "^7.0.0"
           }
         }
       }
@@ -15784,37 +17889,71 @@
       "dev": true
     },
     "jsdom": {
-      "version": "15.2.1",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz",
-      "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==",
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.5.1.tgz",
+      "integrity": "sha512-pF73EOsJgwZekbDHEY5VO/yKXUkab/DuvrQB/ANVizbr6UAHJsDdHXuotZYwkJSGQl1JM+ivXaqY+XBDDL4TiA==",
       "dev": true,
       "requires": {
-        "abab": "^2.0.0",
-        "acorn": "^7.1.0",
-        "acorn-globals": "^4.3.2",
-        "array-equal": "^1.0.0",
-        "cssom": "^0.4.1",
-        "cssstyle": "^2.0.0",
-        "data-urls": "^1.1.0",
-        "domexception": "^1.0.1",
-        "escodegen": "^1.11.1",
-        "html-encoding-sniffer": "^1.0.2",
+        "abab": "^2.0.5",
+        "acorn": "^8.0.5",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.1",
+        "domexception": "^2.0.1",
+        "escodegen": "^2.0.0",
+        "html-encoding-sniffer": "^2.0.1",
+        "is-potential-custom-element-name": "^1.0.0",
         "nwsapi": "^2.2.0",
-        "parse5": "5.1.0",
-        "pn": "^1.1.0",
-        "request": "^2.88.0",
-        "request-promise-native": "^1.0.7",
-        "saxes": "^3.1.9",
-        "symbol-tree": "^3.2.2",
-        "tough-cookie": "^3.0.1",
-        "w3c-hr-time": "^1.0.1",
-        "w3c-xmlserializer": "^1.1.2",
-        "webidl-conversions": "^4.0.2",
+        "parse5": "6.0.1",
+        "request": "^2.88.2",
+        "request-promise-native": "^1.0.9",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
         "whatwg-encoding": "^1.0.5",
         "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^7.0.0",
-        "ws": "^7.0.0",
+        "whatwg-url": "^8.0.0",
+        "ws": "^7.4.4",
         "xml-name-validator": "^3.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.0.tgz",
+          "integrity": "sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==",
+          "dev": true
+        },
+        "tr46": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
+          "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
+          "dev": true,
+          "requires": {
+            "punycode": "^2.1.1"
+          }
+        },
+        "webidl-conversions": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+          "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+          "dev": true
+        },
+        "whatwg-url": {
+          "version": "8.4.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz",
+          "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==",
+          "dev": true,
+          "requires": {
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^2.0.2",
+            "webidl-conversions": "^6.1.0"
+          }
+        }
       }
     },
     "jsesc": {
@@ -15829,6 +17968,12 @@
       "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
       "dev": true
     },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -16589,15 +18734,6 @@
         }
       }
     },
-    "lolex": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz",
-      "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==",
-      "dev": true,
-      "requires": {
-        "@sinonjs/commons": "^1.7.0"
-      }
-    },
     "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -16642,6 +18778,12 @@
         "semver": "^5.6.0"
       }
     },
+    "make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
     "make-fetch-happen": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
@@ -16963,6 +19105,17 @@
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4",
         "run-queue": "^1.0.3"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "ms": {
@@ -17080,6 +19233,15 @@
         "which": "^1.3.1"
       },
       "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
         "which": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -17104,35 +19266,53 @@
       "dev": true
     },
     "node-notifier": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-6.0.0.tgz",
-      "integrity": "sha512-SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
       "dev": true,
       "optional": true,
       "requires": {
         "growly": "^1.3.0",
-        "is-wsl": "^2.1.1",
-        "semver": "^6.3.0",
+        "is-wsl": "^2.2.0",
+        "semver": "^7.3.2",
         "shellwords": "^0.1.1",
-        "which": "^1.3.1"
+        "uuid": "^8.3.0",
+        "which": "^2.0.2"
       },
       "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true,
-          "optional": true
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
           "dev": true,
           "optional": true,
           "requires": {
-            "isexe": "^2.0.0"
+            "yallist": "^4.0.0"
           }
+        },
+        "semver": {
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "dev": true,
+          "optional": true
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -17498,9 +19678,9 @@
       }
     },
     "p-each-series": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
-      "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
+      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
       "dev": true
     },
     "p-finally": {
@@ -17636,9 +19816,9 @@
       }
     },
     "parse5": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
-      "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
       "dev": true
     },
     "pascalcase": {
@@ -17790,12 +19970,6 @@
         "semver-compare": "^1.0.0"
       }
     },
-    "pn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
-      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
-      "dev": true
-    },
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -17808,31 +19982,16 @@
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
-    "prettier": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
-      "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
-      "dev": true
-    },
-    "prettier-linter-helpers": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
-      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
-      "dev": true,
-      "requires": {
-        "fast-diff": "^1.1.2"
-      }
-    },
     "pretty-format": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
-      "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.5.0",
+        "@jest/types": "^26.6.2",
         "ansi-regex": "^5.0.0",
         "ansi-styles": "^4.0.0",
-        "react-is": "^16.12.0"
+        "react-is": "^17.0.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -17842,12 +20001,11 @@
           "dev": true
         },
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -17865,6 +20023,12 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
+        },
+        "react-is": {
+          "version": "17.0.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz",
+          "integrity": "sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==",
+          "dev": true
         }
       }
     },
@@ -17897,13 +20061,13 @@
       }
     },
     "prompts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz",
+      "integrity": "sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.4"
+        "sisteransi": "^1.0.5"
       }
     },
     "promzard": {
@@ -18004,6 +20168,12 @@
       "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
       "dev": true
     },
+    "queue-microtask": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz",
+      "integrity": "sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==",
+      "dev": true
+    },
     "quick-lru": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
@@ -18169,12 +20339,6 @@
         "readable-stream": "^2.0.2"
       }
     },
-    "realpath-native": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz",
-      "integrity": "sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==",
-      "dev": true
-    },
     "redent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
@@ -18458,10 +20622,16 @@
       "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
       "dev": true
     },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
     "rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "dev": true,
       "requires": {
         "glob": "^7.1.3"
@@ -18479,6 +20649,15 @@
       "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
       "dev": true
     },
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
     "run-queue": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
@@ -18542,12 +20721,12 @@
       "dev": true
     },
     "saxes": {
-      "version": "3.1.11",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
-      "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
       "dev": true,
       "requires": {
-        "xmlchars": "^2.1.1"
+        "xmlchars": "^2.2.0"
       }
     },
     "schema-utils": {
@@ -18661,12 +20840,6 @@
       "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
       "dev": true
     },
-    "slash": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-      "dev": true
-    },
     "slice-ansi": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
@@ -18972,10 +21145,21 @@
       }
     },
     "stack-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
-      "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==",
-      "dev": true
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+          "dev": true
+        }
+      }
     },
     "static-extend": {
       "version": "0.1.2",
@@ -19027,28 +21211,28 @@
       "dev": true
     },
     "string-length": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-3.1.0.tgz",
-      "integrity": "sha512-Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
       "requires": {
-        "astral-regex": "^1.0.0",
-        "strip-ansi": "^5.2.0"
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
         "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "^5.0.0"
           }
         }
       }
@@ -19214,9 +21398,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -19464,14 +21648,14 @@
       }
     },
     "tough-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
       "dev": true,
       "requires": {
-        "ip-regex": "^2.1.0",
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
       }
     },
     "tr46": {
@@ -19495,6 +21679,174 @@
       "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=",
       "dev": true
     },
+    "ts-jest": {
+      "version": "26.5.6",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.5.6.tgz",
+      "integrity": "sha512-rua+rCP8DxpA8b4DQD/6X2HQS8Zy/xzViVYfEs2OQu68tkCuKLV0Md8pmX55+W24uRIyAsf/BajRfxOs+R2MKA==",
+      "dev": true,
+      "requires": {
+        "bs-logger": "0.x",
+        "buffer-from": "1.x",
+        "fast-json-stable-stringify": "2.x",
+        "jest-util": "^26.1.0",
+        "json5": "2.x",
+        "lodash": "4.x",
+        "make-error": "1.x",
+        "mkdirp": "1.x",
+        "semver": "7.x",
+        "yargs-parser": "20.x"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "jest-util": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^2.0.0",
+            "micromatch": "^4.0.2"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "picomatch": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+          "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+          "dev": true
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        },
+        "yargs-parser": {
+          "version": "20.2.7",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+          "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+          "dev": true
+        }
+      }
+    },
     "tsconfig-paths": {
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
@@ -19524,6 +21876,15 @@
       "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
       "dev": true
     },
+    "tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.8.1"
+      }
+    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -19555,9 +21916,9 @@
       "dev": true
     },
     "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.0.2.tgz",
+      "integrity": "sha512-a720oz3Kjbp3ll0zkeN9qjRhO7I34MKMhPGQiQJAmaZQZQ1lo+NWThK322f7sXV+kTg9B1Ybt16KgBXWgteT8w==",
       "dev": true
     },
     "typedarray": {
@@ -19575,6 +21936,12 @@
         "is-typedarray": "^1.0.0"
       }
     },
+    "typescript": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz",
+      "integrity": "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==",
+      "dev": true
+    },
     "uglify-js": {
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz",
@@ -19762,9 +22129,9 @@
       "dev": true
     },
     "v8-to-istanbul": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz",
-      "integrity": "sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz",
+      "integrity": "sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -19857,13 +22224,11 @@
       }
     },
     "w3c-xmlserializer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
-      "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
       "dev": true,
       "requires": {
-        "domexception": "^1.0.1",
-        "webidl-conversions": "^4.0.2",
         "xml-name-validator": "^3.0.0"
       }
     },
@@ -20184,9 +22549,9 @@
       }
     },
     "ws": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
+      "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==",
       "dev": true
     },
     "xml-name-validator": {
@@ -20263,9 +22628,9 @@
           "dev": true
         },
         "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
           "dev": true,
           "requires": {
             "emoji-regex": "^8.0.0",
diff --git a/package.json b/package.json
index 3c271db413..1d54ccf173 100644
--- a/package.json
+++ b/package.json
@@ -10,15 +10,15 @@
   },
   "homepage": "https://github.com/kong/insomnia#readme",
   "scripts": {
-    "lint": "eslint . --ext .js,.json",
-    "lint:fix": "npm run lint -- --fix",
+    "build": "lerna run build --parallel",
+    "lint": "lerna run lint --parallel --stream --no-bail",
+    "lint:fix": "lerna run lint:fix --parallel --stream --no-bail",
     "bootstrap": "npm install && lerna bootstrap && lerna run --parallel --stream bootstrap",
     "version": "lerna version --exact --preid beta --force-publish",
     "version:dry": "npm run version -- --no-git-tag-version",
     "publish": "lerna publish from-git --pre-dist-tag beta",
     "clean": "lerna clean --yes && rimraf node_modules",
-    "typecheck": "lerna run --parallel --stream typecheck",
-    "test": "npm run lint && npm run typecheck && lerna run --stream --parallel test",
+    "test": "lerna run --stream --parallel test",
     "test:pre-release": "npm run test --prefix packages/insomnia-app",
     "inso-start": "npm start --prefix packages/insomnia-inso",
     "app-start": "npm start --prefix packages/insomnia-app",
@@ -35,7 +35,7 @@
     "test:smoke:cli": "npm run test:cli --prefix packages/insomnia-smoke-test"
   },
   "lint-staged": {
-    "{packages,plugins}/**/*.{js,json}": [
+    "{packages,plugins}/**/*.{js,json,ts,tsx}": [
       "eslint --fix"
     ]
   },
@@ -51,14 +51,19 @@
     "@babel/preset-env": "^7.4.3",
     "@babel/preset-flow": "^7.9.0",
     "@babel/preset-react": "^7.9.4",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^25.3.0",
+    "@jest/types": "^26.6.2",
+    "@types/chai": "^4.2.15",
+    "@types/eslint": "4.16.1",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^14.14.32",
+    "@types/rimraf": "^3.0.0",
+    "@typescript-eslint/eslint-plugin": "^4.16.1",
+    "@typescript-eslint/parser": "^4.16.1",
     "babel-loader": "^8.0.5",
     "babel-plugin-inline-react-svg": "^1.1.0",
-    "babel-plugin-styled-components": "^1.10.6",
+    "babel-plugin-styled-components": "^1.12.0",
     "cross-env": "^7.0.2",
     "eslint": "^7.2.0",
-    "eslint-config-prettier": "^6.11.0",
     "eslint-config-semistandard": "^15.0.0",
     "eslint-config-standard": "^14.1.1",
     "eslint-plugin-filenames": "^1.2.0",
@@ -66,19 +71,20 @@
     "eslint-plugin-html": "^6.0.1",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-jest": "^21.15.1",
+    "eslint-plugin-jest-formatting": "^2.0.1",
     "eslint-plugin-json": "^1.2.0",
     "eslint-plugin-node": "^6.0.1",
-    "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-promise": "^3.7.0",
     "eslint-plugin-react": "^7.19.0",
     "eslint-plugin-react-hooks": "^4.0.4",
     "eslint-plugin-standard": "^4.0.1",
-    "flow-bin": "^0.122.0",
     "husky": "^4.2.5",
-    "jest": "^25.3.0",
+    "jest": "^26.6.3",
     "lerna": "^3.22.0",
     "lint-staged": "^10.2.2",
-    "prettier": "^1.16.4",
-    "rimraf": "^2.6.3"
+    "rimraf": "^3.0.2",
+    "ts-jest": "^26.5.6",
+    "type-fest": "^1.0.2",
+    "typescript": "^4.2.3"
   }
 }
diff --git a/packages/insomnia-app/.babelrc b/packages/insomnia-app/.babelrc
deleted file mode 100644
index 3f3ed6140e..0000000000
--- a/packages/insomnia-app/.babelrc
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "presets": [
-    "@babel/preset-react",
-    "@babel/preset-flow"
-  ],
-  "plugins": [
-    "babel-plugin-styled-components",
-    [
-      "@babel/plugin-proposal-decorators",
-      {
-        "legacy": true
-      }
-    ],
-    ["@babel/plugin-proposal-class-properties", { "loose" : true }],
-    "@babel/plugin-proposal-optional-chaining"
-  ],
-  "env": {
-    "development": {
-      "plugins": [
-        "react-hot-loader/babel"
-      ]
-    },
-    "test": {
-      "presets": [
-        [
-          "@babel/preset-env",
-          {
-            "targets": {
-              "node": "12"
-            }
-          }
-        ],
-        // We need to add this again because it has to run before es2015
-        "@babel/preset-flow"
-      ]
-    }
-  }
-}
diff --git a/packages/insomnia-app/.eslintignore b/packages/insomnia-app/.eslintignore
new file mode 100644
index 0000000000..1a729db3be
--- /dev/null
+++ b/packages/insomnia-app/.eslintignore
@@ -0,0 +1,7 @@
+build
+bin
+send-request
+**/main.min.js
+webpack.config.*.js
+webpack.config.*.js.map
+webpack.config.*.d.ts
\ No newline at end of file
diff --git a/packages/insomnia-app/.eslintrc.js b/packages/insomnia-app/.eslintrc.js
new file mode 100644
index 0000000000..4054179923
--- /dev/null
+++ b/packages/insomnia-app/.eslintrc.js
@@ -0,0 +1,12 @@
+/** @type { import('eslint').Linter.Config } */
+module.exports = {
+  extends: '../../.eslintrc.js',
+  rules: {
+    'filenames/match-exported': 'off',
+    camelcase: 'off',
+    '@typescript-eslint/array-type': ['error', { default: 'generic', readonly: 'generic' }],
+    '@typescript-eslint/no-use-before-define': 'off', // TSCONVERSION
+    '@typescript-eslint/no-explicit-any': 'off', // TSCONVERSION
+    // 'padding-line-between-statements': ['error', { blankLine: "always", prev: ["*"], next: "export"}],
+  },
+};
diff --git a/packages/insomnia-app/.flowconfig b/packages/insomnia-app/.flowconfig
deleted file mode 100644
index 0ec87474c0..0000000000
--- a/packages/insomnia-app/.flowconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-[ignore]
-.*/node_modules/.*
-.*/__fixtures__/.*
-!<PROJECT_ROOT>/node_modules/graphql
-!<PROJECT_ROOT>/node_modules/iterall
-
-[include]
-
-[libs]
-
-[options]
-esproposal.decorators=ignore
-module.file_ext=.css
-esproposal.optional_chaining=enable
-
-[lints]
-
-[untyped]
-<PROJECT_ROOT>/node_modules/graphql
-<PROJECT_ROOT>/node_modules/iterall
diff --git a/packages/insomnia-app/.gitignore b/packages/insomnia-app/.gitignore
index 935bdcd88d..96d3f85116 100644
--- a/packages/insomnia-app/.gitignore
+++ b/packages/insomnia-app/.gitignore
@@ -2,5 +2,4 @@ dist
 build
 
 # Generated
-app/main.min.js
-
+app/main.min.js
\ No newline at end of file
diff --git a/packages/insomnia-app/.storybook/config.js b/packages/insomnia-app/.storybook/config.js
index 247b9abc1f..3cb8f264b7 100644
--- a/packages/insomnia-app/.storybook/config.js
+++ b/packages/insomnia-app/.storybook/config.js
@@ -1,10 +1,6 @@
 import { configure, addDecorator } from '@storybook/react';
 import { withInfo } from '@storybook/addon-info';
 
-addDecorator(
-  withInfo({
-    inline: true,
-  }),
-);
+addDecorator(withInfo({ inline: true }));
 
 configure(require.context('../app/ui', true, /\.stories\.js$/), module);
diff --git a/packages/insomnia-app/.storybook/webpack.config.js b/packages/insomnia-app/.storybook/webpack.config.js
index 669d8e4bf2..1a4ab2d7bb 100644
--- a/packages/insomnia-app/.storybook/webpack.config.js
+++ b/packages/insomnia-app/.storybook/webpack.config.js
@@ -1,4 +1,5 @@
-module.exports = async function({ config, mode }) {
+/** @type { import('webpack').Configuration } */
+module.exports = ({ config }) => {
   config.module.rules.push({
     test: /\.less$/,
     use: [
diff --git a/packages/insomnia-app/app/__jest__/before-each.js b/packages/insomnia-app/app/__jest__/before-each.ts
similarity index 59%
rename from packages/insomnia-app/app/__jest__/before-each.js
rename to packages/insomnia-app/app/__jest__/before-each.ts
index 7f2189fea9..a359be4e65 100644
--- a/packages/insomnia-app/app/__jest__/before-each.js
+++ b/packages/insomnia-app/app/__jest__/before-each.ts
@@ -1,10 +1,16 @@
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import * as models from '../models';
 import * as fetch from '../account/fetch';
 
 export async function globalBeforeEach() {
   // Setup the local database in case it's used
-
   fetch.setup('insomnia-tests', 'http://localhost:8000');
-  await db.init(models.types(), { inMemoryOnly: true }, true, () => {});
+  await db.init(
+    models.types(),
+    {
+      inMemoryOnly: true,
+    },
+    true,
+    () => {},
+  );
 }
diff --git a/packages/insomnia-app/app/__jest__/redux-state-for-test.js b/packages/insomnia-app/app/__jest__/redux-state-for-test.ts
similarity index 77%
rename from packages/insomnia-app/app/__jest__/redux-state-for-test.js
rename to packages/insomnia-app/app/__jest__/redux-state-for-test.ts
index 6141928d7c..05bc282263 100644
--- a/packages/insomnia-app/app/__jest__/redux-state-for-test.js
+++ b/packages/insomnia-app/app/__jest__/redux-state-for-test.ts
@@ -1,10 +1,10 @@
-// @flow
-
 import * as entities from '../ui/redux/modules/entities';
 
-const reduxStateForTest = async (activeWorkspaceId: string): Promise<Object> => ({
+const reduxStateForTest = async (activeWorkspaceId: string): Promise<Record<string, any>> => ({
   entities: entities.reducer({}, entities.initializeWith(await entities.allDocs())),
-  global: { activeWorkspaceId },
+  global: {
+    activeWorkspaceId,
+  },
 });
 
 export default reduxStateForTest;
diff --git a/packages/insomnia-app/app/__jest__/setup-after-env.js b/packages/insomnia-app/app/__jest__/setup-after-env.ts
similarity index 58%
rename from packages/insomnia-app/app/__jest__/setup-after-env.js
rename to packages/insomnia-app/app/__jest__/setup-after-env.ts
index 666127af39..22c352d6a0 100644
--- a/packages/insomnia-app/app/__jest__/setup-after-env.js
+++ b/packages/insomnia-app/app/__jest__/setup-after-env.ts
@@ -1 +1,2 @@
+import '@testing-library/jest-dom';
 import '@testing-library/jest-dom/extend-expect';
diff --git a/packages/insomnia-app/app/__jest__/setup.js b/packages/insomnia-app/app/__jest__/setup.js
deleted file mode 100644
index f6191a5127..0000000000
--- a/packages/insomnia-app/app/__jest__/setup.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import 'whatwg-fetch';
-
-const localStorageMock = (function() {
-  let store = {};
-
-  return {
-    getItem(key) {
-      return store[key];
-    },
-    setItem(key, value) {
-      store[key] = value.toString();
-    },
-    clear() {
-      store = {};
-    },
-  };
-})();
-
-global.__DEV__ = false;
-global.localStorage = localStorageMock;
-global.requestAnimationFrame = cb => process.nextTick(cb);
-global.require = require;
-
-// Don't console log real logs that start with a tag (eg. [db] ...). It's annoying
-const log = console.log;
-global.console.log = (...args) => {
-  if (!(typeof args[0] === 'string' && args[0][0] === '[')) {
-    log(...args);
-  }
-};
diff --git a/packages/insomnia-app/app/__jest__/setup.ts b/packages/insomnia-app/app/__jest__/setup.ts
new file mode 100644
index 0000000000..0167347440
--- /dev/null
+++ b/packages/insomnia-app/app/__jest__/setup.ts
@@ -0,0 +1,49 @@
+import 'whatwg-fetch';
+
+const localStorageMock: Storage = (function() {
+  let store: Record<string, string> = {};
+  return {
+    get length() {
+      return Object.keys(store).length;
+    },
+
+    clear() {
+      store = {};
+    },
+
+    getItem(key: string) {
+      return store[key];
+    },
+
+    key() {
+      return null;
+    },
+
+    removeItem(key: string) {
+      delete store[key];
+    },
+
+    setItem(key: string, value: string) {
+      store[key] = value.toString();
+    },
+  };
+})();
+
+global.__DEV__ = false;
+global.localStorage = localStorageMock;
+
+global.requestAnimationFrame = (callback: FrameRequestCallback) => {
+  process.nextTick(callback);
+  // note: the spec indicates that the return of this function (the request id) is a non-zero number.  hopefully returning 0 here will indicate that this is a mock if the return is ever to be used accidentally.
+  return 0;
+};
+
+global.require = require;
+// Don't console log real logs that start with a tag (eg. [db] ...). It's annoying
+const log = console.log;
+
+global.console.log = (...args) => {
+  if (!(typeof args[0] === 'string' && args[0][0] === '[')) {
+    log(...args);
+  }
+};
diff --git a/packages/insomnia-app/app/__mocks__/@grpc/grpc-js.js b/packages/insomnia-app/app/__mocks__/@grpc/grpc-js.ts
similarity index 95%
rename from packages/insomnia-app/app/__mocks__/@grpc/grpc-js.js
rename to packages/insomnia-app/app/__mocks__/@grpc/grpc-js.ts
index 4b85bc7a14..9f69aafd10 100644
--- a/packages/insomnia-app/app/__mocks__/@grpc/grpc-js.js
+++ b/packages/insomnia-app/app/__mocks__/@grpc/grpc-js.ts
@@ -1,9 +1,12 @@
 import { EventEmitter } from 'events';
+const grpcJs = jest.requireActual('@grpc/grpc-js');
 
 const mockCallWrite = jest.fn();
 const mockCallEnd = jest.fn();
 const mockCallCancel = jest.fn();
 
+export const status = grpcJs.status;
+
 class MockCall extends EventEmitter {
   write(...args) {
     mockCallWrite(...args);
diff --git a/packages/insomnia-app/app/__mocks__/dummy.js b/packages/insomnia-app/app/__mocks__/dummy.js
deleted file mode 100644
index f053ebf797..0000000000
--- a/packages/insomnia-app/app/__mocks__/dummy.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = {};
diff --git a/packages/insomnia-app/app/__mocks__/dummy.ts b/packages/insomnia-app/app/__mocks__/dummy.ts
new file mode 100644
index 0000000000..4d7bf6801f
--- /dev/null
+++ b/packages/insomnia-app/app/__mocks__/dummy.ts
@@ -0,0 +1,2 @@
+// WARNING: changing this to `export default` will break the mock and be incredibly hard to debug. Ask me how I know.
+module.exports = {};
diff --git a/packages/insomnia-app/app/__mocks__/electron.js b/packages/insomnia-app/app/__mocks__/electron.ts
similarity index 56%
rename from packages/insomnia-app/app/__mocks__/electron.js
rename to packages/insomnia-app/app/__mocks__/electron.ts
index 989667a572..2027125713 100644
--- a/packages/insomnia-app/app/__mocks__/electron.js
+++ b/packages/insomnia-app/app/__mocks__/electron.ts
@@ -1,11 +1,9 @@
 import mkdirp from 'mkdirp';
-import events from 'events';
+import { EventEmitter } from 'events';
 import os from 'os';
 import path from 'path';
 
-const RANDOM_STRING = Math.random()
-  .toString()
-  .replace('.', '');
+const RANDOM_STRING = Math.random().toString().replace('.', '');
 
 const remote = {
   app: {
@@ -14,14 +12,18 @@ const remote = {
       mkdirp.sync(dir);
       return dir;
     },
+
     getLocale() {
       return 'en-US';
     },
   },
   net: {
-    request(url) {
-      const req = new events.EventEmitter();
+    request() {
+      const req = new EventEmitter();
+
+      // @ts-expect-error -- TSCONVERSION appears to be genuine
       req.end = function() {};
+
       return req;
     },
   },
@@ -29,32 +31,47 @@ const remote = {
     getAllWindows() {
       return [];
     },
+
     getFocusedWindow() {
       return {
         getContentBounds() {
-          return { width: 1900, height: 1060 };
+          return {
+            width: 1900,
+            height: 1060,
+          };
         },
       };
     },
   },
   screen: {
     getPrimaryDisplay() {
-      return { workAreaSize: { width: 1920, height: 1080 } };
+      return {
+        workAreaSize: {
+          width: 1920,
+          height: 1080,
+        },
+      };
     },
   },
 };
 
-module.exports = {
+const electron = {
   ...remote,
-  remote: remote,
+  remote,
   ipcMain: {
     on: jest.fn(),
+
     once() {},
   },
   ipcRenderer: {
     on: jest.fn(),
     removeAllListeners: jest.fn(),
+
     once() {},
+
     send: jest.fn(),
   },
 };
+
+// WARNING: changing this to `export default` will break the mock and be incredibly hard to debug. Ask me how I know.
+module.exports = electron;
diff --git a/packages/insomnia-app/app/__mocks__/font-scanner.js b/packages/insomnia-app/app/__mocks__/font-scanner.js
deleted file mode 100644
index f053ebf797..0000000000
--- a/packages/insomnia-app/app/__mocks__/font-scanner.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = {};
diff --git a/packages/insomnia-app/app/__mocks__/font-scanner.ts b/packages/insomnia-app/app/__mocks__/font-scanner.ts
new file mode 100644
index 0000000000..4d7bf6801f
--- /dev/null
+++ b/packages/insomnia-app/app/__mocks__/font-scanner.ts
@@ -0,0 +1,2 @@
+// WARNING: changing this to `export default` will break the mock and be incredibly hard to debug. Ask me how I know.
+module.exports = {};
diff --git a/packages/insomnia-app/app/__mocks__/isomorphic-git.js b/packages/insomnia-app/app/__mocks__/isomorphic-git.ts
similarity index 54%
rename from packages/insomnia-app/app/__mocks__/isomorphic-git.js
rename to packages/insomnia-app/app/__mocks__/isomorphic-git.ts
index cc8aa489fb..62736d2eb7 100644
--- a/packages/insomnia-app/app/__mocks__/isomorphic-git.js
+++ b/packages/insomnia-app/app/__mocks__/isomorphic-git.ts
@@ -2,6 +2,11 @@
 const git = jest.requireActual('isomorphic-git');
 const mock = jest.genMockFromModule('isomorphic-git');
 
+// @ts-expect-error -- TSCONVERSION
 git.push = mock.push;
+
+// @ts-expect-error -- TSCONVERSION
 git.clone = mock.clone;
+
+// WARNING: changing this to `export default` will break the mock and be incredibly hard to debug. Ask me how I know.
 module.exports = git;
diff --git a/packages/insomnia-app/app/__mocks__/node-forge.js b/packages/insomnia-app/app/__mocks__/node-forge.ts
similarity index 79%
rename from packages/insomnia-app/app/__mocks__/node-forge.js
rename to packages/insomnia-app/app/__mocks__/node-forge.ts
index 90850d1607..88b3a08bde 100644
--- a/packages/insomnia-app/app/__mocks__/node-forge.js
+++ b/packages/insomnia-app/app/__mocks__/node-forge.ts
@@ -3,8 +3,9 @@
  * The reason it is needed is because the Forge module loader doesn't
  * play along with Jest.
  */
-const forge = require('../../node_modules/node-forge/lib/index');
+import forge from '../../node_modules/node-forge/lib/index';
 
+// WARNING: changing this to `export default` will break the mock and be incredibly hard to debug. Ask me how I know.
 module.exports = {
   jsbn: forge.jsbn,
   util: forge.util,
@@ -17,25 +18,28 @@ module.exports = {
   rsa: {
     setPublicKey() {
       return {
-        encrypt(str) {
+        encrypt(str: string) {
           return str;
         },
       };
     },
+
     setPrivateKey() {
       return {
-        decrypt(str) {
+        decrypt(str: string) {
           return str;
         },
       };
     },
   },
   random: {
-    getBytesSync(n) {
+    getBytesSync(n: number) {
       let s = '';
+
       for (let i = 0; i < n; i++) {
         s += 'a';
       }
+
       return s;
     },
   },
@@ -62,28 +66,35 @@ module.exports = {
     },
   },
   cipher: {
-    createCipher(alg, key) {
+    createCipher() {
       return {
         start(config) {
           this._config = config;
         },
+
         update(buffer) {
           this._data = buffer;
         },
+
         finish() {
-          this.mode = { tag: 'tag' };
+          this.mode = {
+            tag: 'tag',
+          };
           this.output = this._data;
         },
       };
     },
-    createDecipher(alg, key) {
+
+    createDecipher() {
       return {
         start(config) {
           this._config = config;
         },
+
         update(buffer) {
           this.output = buffer;
         },
+
         finish() {
           return true;
         },
diff --git a/packages/insomnia-app/app/__mocks__/node-libcurl.js b/packages/insomnia-app/app/__mocks__/node-libcurl.ts
similarity index 61%
rename from packages/insomnia-app/app/__mocks__/node-libcurl.js
rename to packages/insomnia-app/app/__mocks__/node-libcurl.ts
index 321ec29569..f04aa16d4c 100644
--- a/packages/insomnia-app/app/__mocks__/node-libcurl.js
+++ b/packages/insomnia-app/app/__mocks__/node-libcurl.ts
@@ -1,6 +1,5 @@
 import { EventEmitter } from 'events';
 import fs from 'fs';
-
 import { CurlAuth } from 'node-libcurl/dist/enum/CurlAuth';
 import { CurlCode } from 'node-libcurl/dist/enum/CurlCode';
 import { CurlInfoDebug } from 'node-libcurl/dist/enum/CurlInfoDebug';
@@ -9,11 +8,60 @@ import { CurlNetrc } from 'node-libcurl/dist/enum/CurlNetrc';
 import { CurlHttpVersion } from 'node-libcurl/dist/enum/CurlHttpVersion';
 
 class Curl extends EventEmitter {
-  constructor() {
-    super();
-    this._options = {};
-    this._meta = {};
-    this._features = {};
+  _options = {};
+  _meta = {};
+  _features = {};
+
+  // cannot include these from node-libcurl because they come from the native library
+  // and it's not possible to load it while testing (as it was built to run with Electron)
+  static info = {
+    COOKIELIST: 'COOKIELIST',
+    EFFECTIVE_URL: 'EFFECTIVE_URL',
+    SIZE_DOWNLOAD: 'SIZE_DOWNLOAD',
+    TOTAL_TIME: 'TOTAL_TIME',
+  }
+
+  static option = {
+    ACCEPT_ENCODING: 'ACCEPT_ENCODING',
+    CAINFO: 'CAINFO',
+    COOKIEFILE: 'COOKIEFILE',
+    COOKIELIST: 'COOKIELIST',
+    CUSTOMREQUEST: 'CUSTOMREQUEST',
+    DEBUGFUNCTION: 'DEBUGFUNCTION',
+    FOLLOWLOCATION: 'FOLLOWLOCATION',
+    HTTPAUTH: 'HTTPAUTH',
+    HTTPGET: 'HTTPGET',
+    HTTPHEADER: 'HTTPHEADER',
+    HTTPPOST: 'HTTPPOST',
+    HTTP_VERSION: 'HTTP_VERSION',
+    INFILESIZE_LARGE: 'INFILESIZE_LARGE',
+    KEYPASSWD: 'KEYPASSWD',
+    MAXREDIRS: 'MAXREDIRS',
+    NETRC: 'NETRC',
+    NOBODY: 'NOBODY',
+    NOPROGRESS: 'NOPROGRESS',
+    NOPROXY: 'NOPROXY',
+    PASSWORD: 'PASSWORD',
+    POST: 'POST',
+    POSTFIELDS: 'POSTFIELDS',
+    PROXY: 'PROXY',
+    PROXYAUTH: 'PROXYAUTH',
+    READDATA: 'READDATA',
+    READFUNCTION: 'READFUNCTION',
+    SSLCERT: 'SSLCERT',
+    SSLCERTTYPE: 'SSLCERTTYPE',
+    SSLKEY: 'SSLKEY',
+    SSL_VERIFYHOST: 'SSL_VERIFYHOST',
+    SSL_VERIFYPEER: 'SSL_VERIFYPEER',
+    TIMEOUT_MS: 'TIMEOUT_MS',
+    UNIX_SOCKET_PATH: 'UNIX_SOCKET_PATH',
+    UPLOAD: 'UPLOAD',
+    URL: 'URL',
+    USERAGENT: 'USERAGENT',
+    USERNAME: 'USERNAME',
+    VERBOSE: 'VERBOSE',
+    WRITEFUNCTION: 'WRITEFUNCTION',
+    XFERINFOFUNCTION: 'XFERINFOFUNCTION',
   }
 
   static getVersion() {
@@ -36,13 +84,16 @@ class Curl extends EventEmitter {
 
     if (name === Curl.option.READFUNCTION) {
       let body = '';
+
       // Only limiting this to prevent infinite loops
       for (let i = 0; i < 1000; i++) {
         const buffer = Buffer.alloc(23);
         const bytes = value(buffer);
+
         if (bytes === 0) {
           break;
         }
+
         body += buffer.slice(0, bytes);
       }
 
@@ -52,6 +103,7 @@ class Curl extends EventEmitter {
     if (name === Curl.option.COOKIELIST) {
       // This can be set multiple times
       this._options[name] = this._options[name] || [];
+
       this._options[name].push(value);
     } else if (name === Curl.option.READDATA) {
       const { size } = fs.fstatSync(value);
@@ -67,12 +119,16 @@ class Curl extends EventEmitter {
     switch (name) {
       case Curl.info.COOKIELIST:
         return [`#HttpOnly_.insomnia.rest\tTRUE\t/url/path\tTRUE\t${Date.now() / 1000}\tfoo\tbar`];
+
       case Curl.info.EFFECTIVE_URL:
         return this._options[Curl.option.URL];
+
       case Curl.info.TOTAL_TIME:
         return 700;
+
       case Curl.info.SIZE_DOWNLOAD:
         return 800;
+
       default:
         throw new Error(`Invalid info ${name}`);
     }
@@ -87,8 +143,9 @@ class Curl extends EventEmitter {
           features: this._features,
         }),
       );
-
       this.emit('data', data);
+
+      // @ts-expect-error -- TSCONVERSION
       this._options.WRITEFUNCTION(data);
 
       process.nextTick(() => {
@@ -110,78 +167,32 @@ class Curl extends EventEmitter {
   close() {}
 }
 
-// cannot include these from node-libcurl because they come from the native library
-//  and it's not possible to load it while testing (as it was built to run with Electron)
-Curl.info = {
-  COOKIELIST: 'COOKIELIST',
-  EFFECTIVE_URL: 'EFFECTIVE_URL',
-  SIZE_DOWNLOAD: 'SIZE_DOWNLOAD',
-  TOTAL_TIME: 'TOTAL_TIME',
-};
-
-Curl.option = {
-  ACCEPT_ENCODING: 'ACCEPT_ENCODING',
-  CAINFO: 'CAINFO',
-  COOKIEFILE: 'COOKIEFILE',
-  COOKIELIST: 'COOKIELIST',
-  CUSTOMREQUEST: 'CUSTOMREQUEST',
-  DEBUGFUNCTION: 'DEBUGFUNCTION',
-  FOLLOWLOCATION: 'FOLLOWLOCATION',
-  HTTPAUTH: 'HTTPAUTH',
-  HTTPGET: 'HTTPGET',
-  HTTPHEADER: 'HTTPHEADER',
-  HTTPPOST: 'HTTPPOST',
-  HTTP_VERSION: 'HTTP_VERSION',
-  INFILESIZE_LARGE: 'INFILESIZE_LARGE',
-  KEYPASSWD: 'KEYPASSWD',
-  MAXREDIRS: 'MAXREDIRS',
-  NETRC: 'NETRC',
-  NOBODY: 'NOBODY',
-  NOPROGRESS: 'NOPROGRESS',
-  NOPROXY: 'NOPROXY',
-  PASSWORD: 'PASSWORD',
-  POST: 'POST',
-  POSTFIELDS: 'POSTFIELDS',
-  PROXY: 'PROXY',
-  PROXYAUTH: 'PROXYAUTH',
-  READDATA: 'READDATA',
-  READFUNCTION: 'READFUNCTION',
-  SSLCERT: 'SSLCERT',
-  SSLCERTTYPE: 'SSLCERTTYPE',
-  SSLKEY: 'SSLKEY',
-  SSL_VERIFYHOST: 'SSL_VERIFYHOST',
-  SSL_VERIFYPEER: 'SSL_VERIFYPEER',
-  TIMEOUT_MS: 'TIMEOUT_MS',
-  UNIX_SOCKET_PATH: 'UNIX_SOCKET_PATH',
-  UPLOAD: 'UPLOAD',
-  URL: 'URL',
-  USERAGENT: 'USERAGENT',
-  USERNAME: 'USERNAME',
-  VERBOSE: 'VERBOSE',
-  WRITEFUNCTION: 'WRITEFUNCTION',
-  XFERINFOFUNCTION: 'XFERINFOFUNCTION',
-};
-
-// This is just to make it easier to test
-// node-libcurl Enum exports (CurlAuth, CurlCode, etc) are TypeScript enums, which are
-//  converted to an object with format:
-// { EnumKey: 0, 0: EnumKey }
-// We only want the named members (non-number ones)
+/**
+ * This is just to make it easier to test
+ * node-libcurl Enum exports (CurlAuth, CurlCode, etc) are TypeScript enums, which are converted to an object with format:
+ * ```ts
+ * const myEnum = {
+ *   EnumKey: 0,
+ *   0: EnumKey,
+ * }
+ * ```
+ * We only want the named members (non-number ones)
+ */
 const getTsEnumOnlyWithNamedMembers = enumObj => {
   let obj = {};
+
   for (const member in enumObj) {
     if (typeof enumObj[member] === 'number') {
-      obj = {
-        ...obj,
-        [member]: member,
-      };
+      obj = { ...obj, [member]: member };
     }
   }
+
   return obj;
 };
 
+// WARNING: changing this to `export default` will break the mock and be incredibly hard to debug. Ask me how I know.
 module.exports = {
-  Curl: Curl,
+  Curl,
   CurlAuth: getTsEnumOnlyWithNamedMembers(CurlAuth),
   CurlCode: getTsEnumOnlyWithNamedMembers(CurlCode),
   CurlInfoDebug: getTsEnumOnlyWithNamedMembers(CurlInfoDebug),
diff --git a/packages/insomnia-app/app/__tests__/install.test.js b/packages/insomnia-app/app/__tests__/install.test.ts
similarity index 94%
rename from packages/insomnia-app/app/__tests__/install.test.js
rename to packages/insomnia-app/app/__tests__/install.test.ts
index 6da6b00164..b88c34ac50 100644
--- a/packages/insomnia-app/app/__tests__/install.test.js
+++ b/packages/insomnia-app/app/__tests__/install.test.ts
@@ -4,36 +4,29 @@ describe('install.js', () => {
   describe('containsOnlyDeprecationWarning', () => {
     it('should return true when all lines in stderr are deprecation warnings', () => {
       const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
-
-      const stderr =
-        // Warning #1
+      const stderr = // Warning #1
         'warning insomnia-plugin-xxx-yyy > xyz > xyz > xyz > xyz > xyz: ' +
         'xyz is no longer maintained and not recommended for usage due to the number of issues. ' +
-        'Please, upgrade your dependencies to the actual version of xyz.\r\n' +
-        // Warning #2
+        'Please, upgrade your dependencies to the actual version of xyz.\r\n' + // Warning #2
         'warning insomnia-plugin-xxx-yyy > xyz > xyz > xyz > xyz > xyz: ' +
         'xyz is no longer maintained and not recommended for usage due to the number of issues. ' +
-        'Please, upgrade your dependencies to the actual version of xyz.\n' +
-        // Warning #3
+        'Please, upgrade your dependencies to the actual version of xyz.\n' + // Warning #3
         'warning insomnia-plugin-xxx-yyy > xyz > xyz > xyz > xyz > xyz: ' +
         'xyz is no longer maintained and not recommended for usage due to the number of issues. ' +
         'Please, upgrade your dependencies to the actual version of xyz.';
       expect(containsOnlyDeprecationWarnings(stderr)).toBe(true);
       expect(consoleWarnSpy).toHaveBeenCalledTimes(3);
     });
+
     it('should return false when stderr contains a deprecation warning and an error', () => {
       const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
-
-      const stderr =
-        // Warning #1
+      const stderr = // Warning #1
         'warning insomnia-plugin-xxx-yyy > xyz > xyz > xyz > xyz > xyz: ' +
         'xyz is no longer maintained and not recommended for usage due to the number of issues. ' +
-        'Please, upgrade your dependencies to the actual version of xyz.\r\n' +
-        // Error #1
+        'Please, upgrade your dependencies to the actual version of xyz.\r\n' + // Error #1
         'error https://npm.example.net/@types%example/-/nello-1.3.5.tgz:' +
         'Integrity check failed for "@types/example"' +
-        '(computed integrity doesn\'t match our records, got "sha512-z4kkSfaPg==")\n' +
-        // Warning #2
+        '(computed integrity doesn\'t match our records, got "sha512-z4kkSfaPg==")\n' + // Warning #2
         'warning insomnia-plugin-xxx-yyy > xyz > xyz > xyz > xyz > xyz: ' +
         'xyz is no longer maintained and not recommended for usage due to the number of issues. ' +
         'Please, upgrade your dependencies to the actual version of xyz.';
@@ -41,12 +34,14 @@ describe('install.js', () => {
       expect(consoleWarnSpy).toHaveBeenCalledTimes(2);
     });
   });
+
   describe('isDeprecatedDependencies', () => {
     it('should not match when the message is falsy', () => {
       expect(isDeprecatedDependencies('')).toBe(false);
       expect(isDeprecatedDependencies(null)).toBe(false);
       expect(isDeprecatedDependencies(undefined)).toBe(false);
     });
+
     it('should match with multiple nested dependencies', () => {
       const msg =
         'warning insomnia-plugin-xxx-yyy > xyz > xyz > xyz > xyz > xyz: ' +
@@ -54,6 +49,7 @@ describe('install.js', () => {
         'Please, upgrade your dependencies to the actual version of xyz.';
       expect(isDeprecatedDependencies(msg)).toBe(true);
     });
+
     it('should match with one nested dependency', () => {
       const msg =
         'warning insomnia-plugin-xxx-yyy > xyz: ' +
@@ -61,12 +57,14 @@ describe('install.js', () => {
         'Please, upgrade your dependencies to the actual version of xyz.';
       expect(isDeprecatedDependencies(msg)).toBe(true);
     });
+
     it('should not match with an unrelated warning', () => {
       const msg =
         'warning You are using Node "6.0.0" which is not supported and may encounter bugs or unexpected behaviour. ' +
         'Yarn supports the following server range: "^4.8.0 || ^5.7.0 || ^6.2.2 || >=8.0.0"';
       expect(isDeprecatedDependencies(msg)).toBe(false);
     });
+
     it('should not match with an unrelated error', () => {
       const msg =
         'error https://npm.example.net/@types%example/-/nello-1.3.5.tgz: ' +
diff --git a/packages/insomnia-app/app/__tests__/package.test.js b/packages/insomnia-app/app/__tests__/package.test.ts
similarity index 99%
rename from packages/insomnia-app/app/__tests__/package.test.js
rename to packages/insomnia-app/app/__tests__/package.test.ts
index bd56a3ca28..4b8b7a098a 100644
--- a/packages/insomnia-app/app/__tests__/package.test.js
+++ b/packages/insomnia-app/app/__tests__/package.test.ts
@@ -3,6 +3,7 @@ import { globalBeforeEach } from '../__jest__/before-each';
 
 describe('package.json', () => {
   beforeEach(globalBeforeEach);
+
   it('all packed dependencies should exist', () => {
     for (const name of globalPackage.packedDependencies) {
       const version = globalPackage.dependencies[name];
diff --git a/packages/insomnia-app/app/__tests__/renderer.test.js b/packages/insomnia-app/app/__tests__/renderer.test.ts
similarity index 99%
rename from packages/insomnia-app/app/__tests__/renderer.test.js
rename to packages/insomnia-app/app/__tests__/renderer.test.ts
index 6a034925e5..dfdc551b73 100644
--- a/packages/insomnia-app/app/__tests__/renderer.test.js
+++ b/packages/insomnia-app/app/__tests__/renderer.test.ts
@@ -1,7 +1,6 @@
 // Broken for now...
 // import * as renderer from '../renderer';
 // import { globalBeforeEach } from '../__jest__/before-each';
-
 // describe('imports', () => {
 //   beforeEach(globalBeforeEach);
 //   it('ui module should import successfully', () => {
diff --git a/packages/insomnia-app/app/account/__tests__/crypt.test.js b/packages/insomnia-app/app/account/__tests__/crypt.test.ts
similarity index 99%
rename from packages/insomnia-app/app/account/__tests__/crypt.test.js
rename to packages/insomnia-app/app/account/__tests__/crypt.test.ts
index f87f6921f5..6ed8491a07 100644
--- a/packages/insomnia-app/app/account/__tests__/crypt.test.js
+++ b/packages/insomnia-app/app/account/__tests__/crypt.test.ts
@@ -5,7 +5,6 @@ describe('crypt', () => {
     it('derives a key properly', async () => {
       const result = await crypt.deriveKey('Password', 'email', 'salt');
       const expected = 'fb058595c02ae9660ed7098273bf50e49407942ecc437bf317638d76c4578eae';
-
       expect(result).toBe(expected);
     });
   });
@@ -19,10 +18,8 @@ describe('crypt', () => {
         key_ops: ['encrypt', 'decrypt'],
         k: '5hs1f2xuiNPHUp11i6SWlsqYpWe_hWPcEKucZlwBfFE',
       };
-
       const resultEncrypted = crypt.encryptAES(key, 'Hello World!', 'additional data');
       const resultDecrypted = crypt.decryptAES(key, resultEncrypted);
-
       expect(resultDecrypted).toEqual('Hello World!');
     });
   });
@@ -36,10 +33,8 @@ describe('crypt', () => {
         key_ops: ['encrypt', 'decrypt'],
         k: '5hs1f2xuiNPHUp11i6SWlsqYpWe_hWPcEKucZlwBfFE',
       };
-
       const resultEncrypted = crypt.encryptAESBuffer(key, Buffer.from('Hello World!', 'utf8'));
       const resultDecrypted = crypt.decryptAESToBuffer(key, resultEncrypted);
-
       expect(resultDecrypted).toEqual(Buffer.from('Hello World!', 'utf8'));
     });
   });
@@ -78,7 +73,6 @@ describe('crypt', () => {
           'FMVx12_ioueu052xgFxWdIS_lImUGTrw8Iiw_kp-KKsONtofs91A5GVRtyg_wdXpG2qyomaet1hTlHhLnoI23L2a' +
           'EkQ87SokIpoR9lR8jfIRwLwKKXMc33_bRRQXvWop0yvTzmSGaC0gULcqj0OHiUR1u9Ver1ZvgGz2jh4mP_E',
       };
-
       const publicKey = {
         alg: 'RSA-OAEP-256',
         kty: 'RSA',
@@ -90,12 +84,9 @@ describe('crypt', () => {
           'Om4kAhLVfmdzYB1nZmq9xH1O8_acIUoWDbAWX6fIXhPhn7jCuCO4WZQVDxZ5_bc27UVhR4VYe2Our7aESUQ5Zy' +
           'MtYNymo9Oy0y_m3OS6W_JR_feXBbxRCBuGf7fjnvV9ohx1ZqLpJFx9_xL7naoVCQhBDfVE31iYz3L6KTIhFQ',
       };
-
       const resultEncrypted = crypt.encryptRSAWithJWK(publicKey, 'aaaaaaaaa');
       const resultDecrypted = crypt.decryptRSAWithJWK(privateKey, resultEncrypted);
-
       const expectedDecrypted = 'aaaaaaaaa';
-
       expect(resultDecrypted.toString()).toEqual(expectedDecrypted);
     });
   });
diff --git a/packages/insomnia-app/app/account/crypt.js b/packages/insomnia-app/app/account/crypt.ts
similarity index 86%
rename from packages/insomnia-app/app/account/crypt.js
rename to packages/insomnia-app/app/account/crypt.ts
index d86b0121b0..a84174b154 100644
--- a/packages/insomnia-app/app/account/crypt.js
+++ b/packages/insomnia-app/app/account/crypt.ts
@@ -36,9 +36,11 @@ export function encryptRSAWithJWK(publicKeyJWK, plaintext) {
   const encodedPlaintext = encodeURIComponent(plaintext);
 
   const n = _b64UrlToBigInt(publicKeyJWK.n);
-  const e = _b64UrlToBigInt(publicKeyJWK.e);
-  const publicKey = forge.rsa.setPublicKey(n, e);
 
+  const e = _b64UrlToBigInt(publicKeyJWK.e);
+
+  // @ts-expect-error -- TSCONVERSION appears not to be exported for some reason
+  const publicKey = forge.rsa.setPublicKey(n, e);
   const encrypted = publicKey.encrypt(encodedPlaintext, 'RSA-OAEP', {
     md: forge.md.sha256.create(),
   });
@@ -47,20 +49,27 @@ export function encryptRSAWithJWK(publicKeyJWK, plaintext) {
 
 export function decryptRSAWithJWK(privateJWK, encryptedBlob) {
   const n = _b64UrlToBigInt(privateJWK.n);
+
   const e = _b64UrlToBigInt(privateJWK.e);
+
   const d = _b64UrlToBigInt(privateJWK.d);
+
   const p = _b64UrlToBigInt(privateJWK.p);
+
   const q = _b64UrlToBigInt(privateJWK.q);
+
   const dP = _b64UrlToBigInt(privateJWK.dp);
+
   const dQ = _b64UrlToBigInt(privateJWK.dq);
+
   const qInv = _b64UrlToBigInt(privateJWK.qi);
 
+  // @ts-expect-error -- TSCONVERSION appears not to be exported for some reason
   const privateKey = forge.rsa.setPrivateKey(n, e, d, p, q, dP, dQ, qInv);
   const bytes = forge.util.hexToBytes(encryptedBlob);
   const decrypted = privateKey.decrypt(bytes, 'RSA-OAEP', {
     md: forge.md.sha256.create(),
   });
-
   return decodeURIComponent(decrypted);
 }
 
@@ -76,18 +85,21 @@ export function encryptAESBuffer(jwkOrKey, buff, additionalData = '') {
   // TODO: Add assertion checks for JWK
   const rawKey = typeof jwkOrKey === 'string' ? jwkOrKey : _b64UrlToHex(jwkOrKey.k);
   const key = forge.util.hexToBytes(rawKey);
-
   const iv = forge.random.getBytesSync(12);
   const cipher = forge.cipher.createCipher('AES-GCM', key);
-
-  cipher.start({ additionalData, iv, tagLength: 128 });
+  cipher.start({
+    additionalData,
+    iv,
+    tagLength: 128,
+  });
   cipher.update(forge.util.createBuffer(buff));
   cipher.finish();
-
   return {
     iv: forge.util.bytesToHex(iv),
+      // @ts-expect-error -- TSCONVERSION needs to be converted to string
     t: forge.util.bytesToHex(cipher.mode.tag),
     ad: forge.util.bytesToHex(additionalData),
+    // @ts-expect-error -- TSCONVERSION needs to be converted to string
     d: forge.util.bytesToHex(cipher.output),
   };
 }
@@ -104,21 +116,23 @@ export function encryptAES(jwkOrKey, plaintext, additionalData = '') {
   // TODO: Add assertion checks for JWK
   const rawKey = typeof jwkOrKey === 'string' ? jwkOrKey : _b64UrlToHex(jwkOrKey.k);
   const key = forge.util.hexToBytes(rawKey);
-
   const iv = forge.random.getBytesSync(12);
   const cipher = forge.cipher.createCipher('AES-GCM', key);
-
   // Plaintext could contain weird unicode, so we have to encode that
   const encodedPlaintext = encodeURIComponent(plaintext);
-
-  cipher.start({ additionalData, iv, tagLength: 128 });
+  cipher.start({
+    additionalData,
+    iv,
+    tagLength: 128,
+  });
   cipher.update(forge.util.createBuffer(encodedPlaintext));
   cipher.finish();
-
   return {
     iv: forge.util.bytesToHex(iv),
+    // @ts-expect-error -- TSCONVERSION needs to be converted to string
     t: forge.util.bytesToHex(cipher.mode.tag),
     ad: forge.util.bytesToHex(additionalData),
+    // @ts-expect-error -- TSCONVERSION needs to be converted to string
     d: forge.util.bytesToHex(cipher.output),
   };
 }
@@ -134,19 +148,17 @@ export function decryptAES(jwkOrKey, encryptedResult) {
   // TODO: Add assertion checks for JWK
   const rawKey = typeof jwkOrKey === 'string' ? jwkOrKey : _b64UrlToHex(jwkOrKey.k);
   const key = forge.util.hexToBytes(rawKey);
-
   // ~~~~~~~~~~~~~~~~~~~~ //
   // Decrypt with AES-GCM //
   // ~~~~~~~~~~~~~~~~~~~~ //
-
   const decipher = forge.cipher.createDecipher('AES-GCM', key);
   decipher.start({
     iv: forge.util.hexToBytes(encryptedResult.iv),
     tagLength: encryptedResult.t.length * 4,
+    // @ts-expect-error -- TSCONVERSION needs to be converted to string
     tag: forge.util.hexToBytes(encryptedResult.t),
     additionalData: forge.util.hexToBytes(encryptedResult.ad),
   });
-
   decipher.update(forge.util.createBuffer(forge.util.hexToBytes(encryptedResult.d)));
 
   if (decipher.finish()) {
@@ -166,22 +178,21 @@ export function decryptAESToBuffer(jwkOrKey, encryptedResult) {
   // TODO: Add assertion checks for JWK
   const rawKey = typeof jwkOrKey === 'string' ? jwkOrKey : _b64UrlToHex(jwkOrKey.k);
   const key = forge.util.hexToBytes(rawKey);
-
   // ~~~~~~~~~~~~~~~~~~~~ //
   // Decrypt with AES-GCM //
   // ~~~~~~~~~~~~~~~~~~~~ //
-
   const decipher = forge.cipher.createDecipher('AES-GCM', key);
   decipher.start({
     iv: forge.util.hexToBytes(encryptedResult.iv),
     tagLength: encryptedResult.t.length * 4,
+    // @ts-expect-error -- TSCONVERSION needs to be converted to string
     tag: forge.util.hexToBytes(encryptedResult.t),
     additionalData: forge.util.hexToBytes(encryptedResult.ad),
   });
-
   decipher.update(forge.util.createBuffer(forge.util.hexToBytes(encryptedResult.d)));
 
   if (decipher.finish()) {
+    // @ts-expect-error -- TSCONVERSION needs to be converted to string
     return Buffer.from(forge.util.bytesToHex(decipher.output), 'hex');
   } else {
     throw new Error('Failed to decrypt data');
@@ -210,14 +221,19 @@ export function srpGenKey() {
  */
 export async function generateAES256Key() {
   const c = window.crypto;
+  // @ts-expect-error -- TSCONVERSION: likely needs a module augmentation for webkit
   const subtle = c ? c.subtle || c.webkitSubtle : null;
 
   if (subtle) {
     console.log('[crypt] Using Native AES Key Generation');
-    const key = await subtle.generateKey({ name: 'AES-GCM', length: 256 }, true, [
-      'encrypt',
-      'decrypt',
-    ]);
+    const key = await subtle.generateKey(
+      {
+        name: 'AES-GCM',
+        length: 256,
+      },
+      true,
+      ['encrypt', 'decrypt'],
+    );
     return subtle.exportKey('jwk', key);
   } else {
     console.log('[crypt] Using Fallback Forge AES Key Generation');
@@ -243,7 +259,6 @@ export async function generateKeyPairJWK() {
 
   if (subtle) {
     console.log('[crypt] Using Native RSA Generation');
-
     const pair = await subtle.generateKey(
       {
         name: 'RSA-OAEP',
@@ -254,15 +269,16 @@ export async function generateKeyPairJWK() {
       true,
       ['encrypt', 'decrypt'],
     );
-
     return {
       publicKey: await subtle.exportKey('jwk', pair.publicKey),
       privateKey: await subtle.exportKey('jwk', pair.privateKey),
     };
   } else {
     console.log('[crypt] Using Forge RSA Generation');
-
-    const pair = forge.pki.rsa.generateKeyPair({ bits: 2048, e: 0x10001 });
+    const pair = forge.pki.rsa.generateKeyPair({
+      bits: 2048,
+      e: 0x10001,
+    });
     const privateKey = {
       alg: 'RSA-OAEP-256',
       kty: 'RSA',
@@ -277,7 +293,6 @@ export async function generateKeyPairJWK() {
       q: _bigIntToB64Url(pair.privateKey.q),
       qi: _bigIntToB64Url(pair.privateKey.qInv),
     };
-
     const publicKey = {
       alg: 'RSA-OAEP-256',
       kty: 'RSA',
@@ -285,8 +300,10 @@ export async function generateKeyPairJWK() {
       e: _bigIntToB64Url(pair.publicKey.e),
       n: _bigIntToB64Url(pair.publicKey.n),
     };
-
-    return { privateKey, publicKey };
+    return {
+      privateKey,
+      publicKey,
+    };
   }
 }
 
@@ -302,7 +319,7 @@ export async function generateKeyPairJWK() {
  * @returns {Promise}
  */
 async function _hkdfSalt(rawSalt, rawEmail) {
-  return new Promise(resolve => {
+  return new Promise<string>(resolve => {
     const hkdf = new HKDF('sha256', rawSalt, rawEmail);
     hkdf.derive('', DEFAULT_BYTE_LENGTH, buffer => resolve(buffer.toString('hex')));
   });
@@ -321,18 +338,15 @@ function _bigIntToB64Url(n) {
 
 function _hexToB64Url(h) {
   const bytes = forge.util.hexToBytes(h);
-  return window
-    .btoa(bytes)
-    .replace(/=/g, '')
-    .replace(/\+/g, '-')
-    .replace(/\//g, '_');
+  return window.btoa(bytes).replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
 }
 
-function _b64UrlToBigInt(s) {
+function _b64UrlToBigInt(s: string) {
+  // @ts-expect-error -- TSCONVERSION needs investigation in forge types
   return new forge.jsbn.BigInteger(_b64UrlToHex(s), 16);
 }
 
-function _b64UrlToHex(s) {
+function _b64UrlToHex(s: string) {
   const b64 = s.replace(/-/g, '+').replace(/_/g, '/');
   return forge.util.bytesToHex(window.atob(b64));
 }
@@ -346,22 +360,21 @@ function _b64UrlToHex(s) {
 async function _pbkdf2Passphrase(passphrase, salt) {
   if (window.crypto && window.crypto.subtle) {
     console.log('[crypt] Using native PBKDF2');
-
     const k = await window.crypto.subtle.importKey(
       'raw',
       Buffer.from(passphrase, 'utf8'),
-      { name: 'PBKDF2' },
+      {
+        name: 'PBKDF2',
+      },
       false,
       ['deriveBits'],
     );
-
     const algo = {
       name: 'PBKDF2',
       salt: Buffer.from(salt, 'hex'),
       iterations: DEFAULT_PBKDF2_ITERATIONS,
       hash: 'SHA-256',
     };
-
     const derivedKeyRaw = await window.crypto.subtle.deriveBits(algo, k, DEFAULT_BYTE_LENGTH * 8);
     return Buffer.from(derivedKeyRaw).toString('hex');
   } else {
@@ -373,7 +386,6 @@ async function _pbkdf2Passphrase(passphrase, salt) {
       DEFAULT_BYTE_LENGTH,
       forge.md.sha256.create(),
     );
-
     return forge.util.bytesToHex(derivedKeyRaw);
   }
 }
diff --git a/packages/insomnia-app/app/account/fetch.js b/packages/insomnia-app/app/account/fetch.ts
similarity index 91%
rename from packages/insomnia-app/app/account/fetch.js
rename to packages/insomnia-app/app/account/fetch.ts
index 267f933e16..2f0a6ee302 100644
--- a/packages/insomnia-app/app/account/fetch.js
+++ b/packages/insomnia-app/app/account/fetch.ts
@@ -1,17 +1,16 @@
 import { delay } from '../common/misc';
 import { parse as urlParse } from 'url';
 import zlib from 'zlib';
-
 let _userAgent = '';
 let _baseUrl = '';
-const _commandListeners = [];
+const _commandListeners: Array<Function> = [];
 
 export function setup(userAgent, baseUrl) {
   _userAgent = userAgent;
   _baseUrl = baseUrl;
 }
 
-export function onCommand(callback) {
+export function onCommand(callback: Function) {
   _commandListeners.push(callback);
 }
 
@@ -32,7 +31,11 @@ async function _fetch(method, path, obj, sessionId, compressBody = false, retrie
     throw new Error(`No session ID provided to ${method}:${path}`);
   }
 
-  const config = {
+  const config: {
+    method: string;
+    headers: HeadersInit;
+    body?: string | Buffer;
+  } = {
     method: method,
     headers: {},
   };
@@ -56,7 +59,9 @@ async function _fetch(method, path, obj, sessionId, compressBody = false, retrie
   }
 
   let response;
+
   const url = _getUrl(path);
+
   try {
     response = await window.fetch(url, config);
 
@@ -69,12 +74,14 @@ async function _fetch(method, path, obj, sessionId, compressBody = false, retrie
   } catch (err) {
     throw new Error(`Failed to fetch '${url}'`);
   }
+
   const uri = response.headers.get('x-insomnia-command');
   uri && _notifyCommandListeners(uri);
 
   if (!response.ok) {
     const err = new Error(`Response ${response.status} for ${path}`);
     err.message = await response.text();
+    // @ts-expect-error -- TSCONVERSION
     err.statusCode = response.status;
     throw err;
   }
@@ -96,7 +103,6 @@ function _getUrl(path) {
 
 function _notifyCommandListeners(uri) {
   const parsed = urlParse(uri, true);
-
   const command = `${parsed.hostname}${parsed.pathname}`;
   const args = JSON.parse(JSON.stringify(parsed.query));
 
diff --git a/packages/insomnia-app/app/account/session.js b/packages/insomnia-app/app/account/session.ts
similarity index 95%
rename from packages/insomnia-app/app/account/session.js
rename to packages/insomnia-app/app/account/session.ts
index 198b3da690..7d9ab73f92 100644
--- a/packages/insomnia-app/app/account/session.js
+++ b/packages/insomnia-app/app/account/session.ts
@@ -2,11 +2,12 @@ import * as srp from 'srp-js';
 import * as crypt from './crypt';
 import * as fetch from './fetch';
 
-const loginCallbacks = [];
+const loginCallbacks: Array<Function> = [];
 
 function _callCallbacks() {
   const loggedIn = isLoggedIn();
   console.log('[session] Sync state changed loggedIn=' + loggedIn);
+
   for (const cb of loginCallbacks) {
     if (typeof cb === 'function') {
       cb(loggedIn);
@@ -14,7 +15,7 @@ function _callCallbacks() {
   }
 }
 
-export function onLoginLogout(callback) {
+export function onLoginLogout(callback: Function) {
   loginCallbacks.push(callback);
 }
 
@@ -23,14 +24,13 @@ export async function login(rawEmail, rawPassphrase) {
   // ~~~~~~~~~~~~~~~ //
   // Sanitize Inputs //
   // ~~~~~~~~~~~~~~~ //
-
   const email = _sanitizeEmail(rawEmail);
+
   const passphrase = _sanitizePassphrase(rawPassphrase);
 
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
   // Fetch Salt and Submit A To Server //
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
-
   const { saltKey, saltAuth } = await _getAuthSalts(email);
   const authSecret = await crypt.deriveKey(passphrase, email, saltKey);
   const secret1 = await crypt.srpGenKey();
@@ -39,6 +39,7 @@ export async function login(rawEmail, rawPassphrase) {
     Buffer.from(saltAuth, 'hex'),
     Buffer.from(email, 'utf8'),
     Buffer.from(authSecret, 'hex'),
+    // @ts-expect-error -- TSCONVERSION missing type from srpGenKey
     Buffer.from(secret1, 'hex'),
   );
   const srpA = c.computeA().toString('hex');
@@ -50,11 +51,9 @@ export async function login(rawEmail, rawPassphrase) {
     },
     null,
   );
-
   // ~~~~~~~~~~~~~~~~~~~~~ //
   // Compute and Submit M1 //
   // ~~~~~~~~~~~~~~~~~~~~~ //
-
   c.setB(Buffer.from(srpB, 'hex'));
   const srpM1 = c.computeM1().toString('hex');
   const { srpM2 } = await fetch.post(
@@ -65,20 +64,15 @@ export async function login(rawEmail, rawPassphrase) {
     },
     null,
   );
-
   // ~~~~~~~~~~~~~~~~~~~~~~~~~ //
   // Verify Server Identity M2 //
   // ~~~~~~~~~~~~~~~~~~~~~~~~~ //
-
   c.checkM2(Buffer.from(srpM2, 'hex'));
-
   // ~~~~~~~~~~~~~~~~~~~~~~ //
   // Initialize the Session //
   // ~~~~~~~~~~~~~~~~~~~~~~ //
-
   // Compute K (used for session ID)
   const sessionId = c.computeK().toString('hex');
-
   // Get and store some extra info (salts and keys)
   const {
     publicKey,
@@ -89,10 +83,8 @@ export async function login(rawEmail, rawPassphrase) {
     firstName,
     lastName,
   } = await _whoami(sessionId);
-
   const derivedSymmetricKey = await crypt.deriveKey(passphrase, email, saltEnc);
   const symmetricKeyStr = await crypt.decryptAES(derivedSymmetricKey, JSON.parse(encSymmetricKey));
-
   // Store the information for later
   setSessionData(
     sessionId,
@@ -107,20 +99,18 @@ export async function login(rawEmail, rawPassphrase) {
 
   _callCallbacks();
 }
-
 export async function changePasswordWithToken(rawNewPassphrase, confirmationCode) {
   // Sanitize inputs
   const newPassphrase = _sanitizePassphrase(rawNewPassphrase);
+
   const newEmail = getEmail(); // Use the same one
 
   // Fetch some things
   const { saltEnc, encSymmetricKey } = await _whoami();
   const { saltKey, saltAuth } = await _getAuthSalts(newEmail);
-
   // Generate some secrets for the user base'd on password
   const newSecret = await crypt.deriveKey(newPassphrase, newEmail, saltEnc);
   const newAuthSecret = await crypt.deriveKey(newPassphrase, newEmail, saltKey);
-
   const newVerifier = srp
     .computeVerifier(
       _getSrpParams(),
@@ -129,12 +119,10 @@ export async function changePasswordWithToken(rawNewPassphrase, confirmationCode
       Buffer.from(newAuthSecret, 'hex'),
     )
     .toString('hex');
-
   // Re-encrypt existing keys with new secret
   const symmetricKey = JSON.stringify(_getSymmetricKey());
   const newEncSymmetricKeyJSON = crypt.encryptAES(newSecret, symmetricKey);
   const newEncSymmetricKey = JSON.stringify(newEncSymmetricKeyJSON);
-
   return fetch.post(
     '/auth/change-password',
     {
@@ -147,21 +135,18 @@ export async function changePasswordWithToken(rawNewPassphrase, confirmationCode
     getCurrentSessionId(),
   );
 }
-
 export function sendPasswordChangeCode() {
   return fetch.post('/auth/send-password-code', null, getCurrentSessionId());
 }
-
 export function getPublicKey() {
   return _getSessionData().publicKey;
 }
-
 export function getPrivateKey() {
   const { symmetricKey, encPrivateKey } = _getSessionData();
+
   const privateKeyStr = crypt.decryptAES(symmetricKey, encPrivateKey);
   return JSON.parse(privateKeyStr);
 }
-
 export function getCurrentSessionId() {
   if (window) {
     return window.localStorage.getItem('currentSessionId');
@@ -169,23 +154,18 @@ export function getCurrentSessionId() {
     return '';
   }
 }
-
 export function getAccountId() {
   return _getSessionData().accountId;
 }
-
 export function getEmail() {
   return _getSessionData().email;
 }
-
 export function getFirstName() {
   return _getSessionData().firstName;
 }
-
 export function getLastName() {
   return _getSessionData().lastName;
 }
-
 export function getFullName() {
   return `${getFirstName()} ${getLastName()}`.trim();
 }
@@ -206,6 +186,7 @@ export async function logout() {
   }
 
   _unsetSessionData();
+
   _callCallbacks();
 }
 
@@ -230,17 +211,13 @@ export function setSessionData(
     firstName: firstName,
     lastName: lastName,
   });
-
   window.localStorage.setItem(_getSessionKey(sessionId), dataStr);
-
   // NOTE: We're setting this last because the stuff above might fail
   window.localStorage.setItem('currentSessionId', sessionId);
 }
-
 export async function listTeams() {
   return fetch.get('/api/teams', getCurrentSessionId());
 }
-
 export async function endTrial() {
   await fetch.put('/api/billing/end-trial', null, getCurrentSessionId());
 }
@@ -248,9 +225,9 @@ export async function endTrial() {
 // ~~~~~~~~~~~~~~~~ //
 // Helper Functions //
 // ~~~~~~~~~~~~~~~~ //
-
 function _getSymmetricKey() {
   const sessionData = _getSessionData();
+
   return sessionData.symmetricKey;
 }
 
@@ -259,16 +236,26 @@ function _whoami(sessionId = null) {
 }
 
 function _getAuthSalts(email) {
-  return fetch.post('/auth/login-s', { email }, getCurrentSessionId());
+  return fetch.post(
+    '/auth/login-s',
+    {
+      email,
+    },
+    getCurrentSessionId(),
+  );
 }
 
 function _getSessionData() {
   const sessionId = getCurrentSessionId();
+
   if (!sessionId || !window) {
     return {};
   }
 
   const dataStr = window.localStorage.getItem(_getSessionKey(sessionId));
+  if (dataStr === null) {
+    return null;
+  }
   return JSON.parse(dataStr);
 }
 
diff --git a/packages/insomnia-app/app/common/__fixtures__/nestedfolders.js b/packages/insomnia-app/app/common/__fixtures__/nestedfolders.ts
similarity index 77%
rename from packages/insomnia-app/app/common/__fixtures__/nestedfolders.js
rename to packages/insomnia-app/app/common/__fixtures__/nestedfolders.ts
index dd0e3be052..a8109640dc 100644
--- a/packages/insomnia-app/app/common/__fixtures__/nestedfolders.js
+++ b/packages/insomnia-app/app/common/__fixtures__/nestedfolders.ts
@@ -1,14 +1,13 @@
-import * as models from '../../models';
+import { workspace, requestGroup, request, BaseModel } from '../../models';
 
-export const data = {
-  [models.workspace.type]: [
+export const data: Record<string, Array<Partial<BaseModel>>> = {
+  [workspace.type]: [
     {
       _id: 'wrk_1',
       name: 'Wrk 1',
     },
   ],
-
-  [models.requestGroup.type]: [
+  [requestGroup.type]: [
     {
       _id: 'fld_1',
       parentId: 'wrk_1',
@@ -25,8 +24,7 @@ export const data = {
       name: 'Fld 3',
     },
   ],
-
-  [models.request.type]: [
+  [request.type]: [
     {
       _id: 'req_1',
       parentId: 'fld_1',
diff --git a/packages/insomnia-app/app/common/__mocks__/analytics.js b/packages/insomnia-app/app/common/__mocks__/analytics.ts
similarity index 50%
rename from packages/insomnia-app/app/common/__mocks__/analytics.js
rename to packages/insomnia-app/app/common/__mocks__/analytics.ts
index 39211e48fa..2fc6eabde0 100644
--- a/packages/insomnia-app/app/common/__mocks__/analytics.js
+++ b/packages/insomnia-app/app/common/__mocks__/analytics.ts
@@ -1,3 +1,4 @@
+// WARNING: changing this to `export default` will break the mock and be incredibly hard to debug. Ask me how I know.
 const trackEvent = jest.fn();
 const trackSegmentEvent = jest.fn();
 module.exports = { trackEvent, trackSegmentEvent };
diff --git a/packages/insomnia-app/app/common/__mocks__/render.js b/packages/insomnia-app/app/common/__mocks__/render.js
deleted file mode 100644
index 13f1c76d38..0000000000
--- a/packages/insomnia-app/app/common/__mocks__/render.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const render = jest.requireActual('../render');
-
-render.getRenderedGrpcRequest = jest.fn();
-render.getRenderedGrpcRequestMessage = jest.fn();
-
-module.exports = render;
diff --git a/packages/insomnia-app/app/common/__mocks__/render.ts b/packages/insomnia-app/app/common/__mocks__/render.ts
new file mode 100644
index 0000000000..65ce8f9aed
--- /dev/null
+++ b/packages/insomnia-app/app/common/__mocks__/render.ts
@@ -0,0 +1,6 @@
+const _render = jest.requireActual('../render');
+_render.getRenderedGrpcRequest = jest.fn();
+_render.getRenderedGrpcRequestMessage = jest.fn();
+
+// WARNING: changing this to `export default` will break the mock and be incredibly hard to debug. Ask me how I know.
+module.exports = _render;
diff --git a/packages/insomnia-app/app/common/__tests__/analytics.test.js b/packages/insomnia-app/app/common/__tests__/analytics.test.ts
similarity index 99%
rename from packages/insomnia-app/app/common/__tests__/analytics.test.js
rename to packages/insomnia-app/app/common/__tests__/analytics.test.ts
index 183dba3256..1efbce36fb 100644
--- a/packages/insomnia-app/app/common/__tests__/analytics.test.js
+++ b/packages/insomnia-app/app/common/__tests__/analytics.test.ts
@@ -16,9 +16,11 @@ import {
 describe('init()', () => {
   beforeEach(async () => {
     await globalBeforeEach();
-    electron.net.request = jest.fn(url => {
+    electron.net.request = jest.fn(() => {
       const req = new EventEmitter();
+
       req.end = function() {};
+
       return req;
     });
     jest.useFakeTimers();
@@ -31,7 +33,6 @@ describe('init()', () => {
     });
     expect(settings.enableAnalytics).toBe(false);
     expect(electron.net.request.mock.calls).toEqual([]);
-
     await _trackEvent(true, 'Foo', 'Bar');
     jest.runAllTimers();
     expect(electron.net.request.mock.calls).toEqual([]);
@@ -44,7 +45,6 @@ describe('init()', () => {
     });
     expect(settings.enableAnalytics).toBe(true);
     expect(electron.net.request.mock.calls).toEqual([]);
-
     await _trackEvent(true, 'Foo', 'Bar');
     jest.runAllTimers();
     expect(electron.net.request.mock.calls).toEqual([
@@ -78,7 +78,6 @@ describe('init()', () => {
       deviceId: 'device',
       enableAnalytics: true,
     });
-
     await _trackEvent(false, 'Foo', 'Bar');
     jest.runAllTimers();
     expect(electron.net.request.mock.calls).toEqual([
@@ -113,7 +112,6 @@ describe('init()', () => {
       deviceId: 'device',
       enableAnalytics: true,
     });
-
     await _trackPageView('/my/path');
     jest.runAllTimers();
     expect(electron.net.request.mock.calls).toEqual([
@@ -145,7 +143,6 @@ describe('init()', () => {
       deviceId: 'device',
       enableAnalytics: true,
     });
-
     await _trackPageView('/my/path');
     jest.runAllTimers();
     await _trackEvent(true, 'cat', 'act', 'lab', 'val');
diff --git a/packages/insomnia-app/app/common/__tests__/api-specs.test.js b/packages/insomnia-app/app/common/__tests__/api-specs.test.ts
similarity index 93%
rename from packages/insomnia-app/app/common/__tests__/api-specs.test.js
rename to packages/insomnia-app/app/common/__tests__/api-specs.test.ts
index 30392032bc..155e0ef4ec 100644
--- a/packages/insomnia-app/app/common/__tests__/api-specs.test.js
+++ b/packages/insomnia-app/app/common/__tests__/api-specs.test.ts
@@ -8,18 +8,17 @@ describe('parseApiSpec()', () => {
   it('parses YAML and JSON OpenAPI specs', () => {
     const objSpec = {
       openapi: '3.0.0',
-      info: { title: 'My API' },
+      info: {
+        title: 'My API',
+      },
     };
-
     const yamlSpec = YAML.stringify(objSpec);
     const jsonSpec = JSON.stringify(objSpec);
-
     const expected = {
       format: 'openapi',
       formatVersion: '3.0.0',
       contents: objSpec,
     };
-
     expect(parseApiSpec(yamlSpec)).toEqual({ ...expected, rawContents: yamlSpec });
     expect(parseApiSpec(jsonSpec)).toEqual({ ...expected, rawContents: jsonSpec });
   });
@@ -27,18 +26,17 @@ describe('parseApiSpec()', () => {
   it('parses YAML and JSON Swagger specs', () => {
     const objSpec = {
       swagger: '2.0.0',
-      info: { title: 'My API' },
+      info: {
+        title: 'My API',
+      },
     };
-
     const expected = {
       format: 'swagger',
       formatVersion: '2.0.0',
       contents: objSpec,
     };
-
     const yamlSpec = YAML.stringify(objSpec);
     const jsonSpec = JSON.stringify(objSpec);
-
     expect(parseApiSpec(yamlSpec)).toEqual({ ...expected, rawContents: yamlSpec });
     expect(parseApiSpec(jsonSpec)).toEqual({ ...expected, rawContents: jsonSpec });
   });
@@ -46,18 +44,17 @@ describe('parseApiSpec()', () => {
   it('parses YAML and JSON Unknown specs', () => {
     const objSpec = {
       funnyBusiness: '2.0.0',
-      info: { title: 'My API' },
+      info: {
+        title: 'My API',
+      },
     };
-
     const expected = {
       format: null,
       formatVersion: null,
       contents: objSpec,
     };
-
     const yamlSpec = YAML.stringify(objSpec);
     const jsonSpec = JSON.stringify(objSpec);
-
     expect(parseApiSpec(yamlSpec)).toEqual({ ...expected, rawContents: yamlSpec });
     expect(parseApiSpec(jsonSpec)).toEqual({ ...expected, rawContents: jsonSpec });
   });
@@ -69,13 +66,11 @@ describe('parseApiSpec()', () => {
       contents: null,
       rawContents: '',
     };
-
     expect(parseApiSpec('')).toEqual(expected);
   });
 
   it('Fails on malformed JSON/YAML', () => {
     const rawSpec = ['openapi: 3.0.0', 'info: {{{'].join('\n');
-
     expect(() => parseApiSpec(rawSpec)).toThrowError('Failed to parse API spec');
   });
 });
diff --git a/packages/insomnia-app/app/common/__tests__/constants.test.js b/packages/insomnia-app/app/common/__tests__/constants.test.ts
similarity index 100%
rename from packages/insomnia-app/app/common/__tests__/constants.test.js
rename to packages/insomnia-app/app/common/__tests__/constants.test.ts
diff --git a/packages/insomnia-app/app/common/__tests__/database.test.js b/packages/insomnia-app/app/common/__tests__/database.test.ts
similarity index 67%
rename from packages/insomnia-app/app/common/__tests__/database.test.js
rename to packages/insomnia-app/app/common/__tests__/database.test.ts
index e15d9ff447..f830e65bbf 100644
--- a/packages/insomnia-app/app/common/__tests__/database.test.js
+++ b/packages/insomnia-app/app/common/__tests__/database.test.ts
@@ -1,52 +1,58 @@
 import * as models from '../../models';
-import * as db from '../database';
+import { database as db, _repairDatabase } from '../database';
 import { globalBeforeEach } from '../../__jest__/before-each';
+import { data as fixtures } from '../__fixtures__/nestedfolders';
 
-function loadFixture(name) {
-  const fixtures = require(`../__fixtures__/${name}`).data;
-  const promises = [];
+function loadFixture() {
+  const promises: Array<Promise<models.BaseModel>> = [];
   for (const type of Object.keys(fixtures)) {
     for (const doc of fixtures[type]) {
-      promises.push(db.insert(Object.assign({}, doc, { type })));
+      // @ts-expect-error -- TSCONVERSION
+      promises.push(db.insert<models.BaseModel>({ ...doc, type }));
     }
   }
-
   return Promise.all(promises);
 }
 
 describe('init()', () => {
   beforeEach(globalBeforeEach);
+
   it('handles being initialized twice', async () => {
-    await db.init(models.types(), { inMemoryOnly: true });
-    await db.init(models.types(), { inMemoryOnly: true });
+    await db.init(models.types(), {
+      inMemoryOnly: true,
+    });
+    await db.init(models.types(), {
+      inMemoryOnly: true,
+    });
     expect((await db.all(models.request.type)).length).toBe(0);
   });
 });
 
 describe('onChange()', () => {
   beforeEach(globalBeforeEach);
+
   it('handles change listeners', async () => {
     const doc = {
       type: models.request.type,
       parentId: 'nothing',
       name: 'foo',
     };
+    const changesSeen: Array<Function> = [];
 
-    const changesSeen = [];
     const callback = change => {
       changesSeen.push(change);
     };
+
     db.onChange(callback);
-
     const newDoc = await models.request.create(doc);
-    const updatedDoc = await models.request.update(newDoc, { name: 'bar' });
+    const updatedDoc = await models.request.update(newDoc, {
+      name: 'bar',
+    });
     expect(changesSeen.length).toBe(2);
-
     expect(changesSeen).toEqual([
       [[db.CHANGE_INSERT, newDoc, false]],
       [[db.CHANGE_UPDATE, updatedDoc, false]],
     ]);
-
     db.offChange(callback);
     await models.request.create(doc);
     expect(changesSeen.length).toBe(2);
@@ -55,26 +61,26 @@ describe('onChange()', () => {
 
 describe('bufferChanges()', () => {
   beforeEach(globalBeforeEach);
+
   it('properly buffers changes', async () => {
     const doc = {
       type: models.request.type,
       parentId: 'n/a',
       name: 'foo',
     };
+    const changesSeen: Array<Function> = [];
 
-    const changesSeen = [];
     const callback = change => {
       changesSeen.push(change);
     };
-    db.onChange(callback);
 
+    db.onChange(callback);
     await db.bufferChanges();
     const newDoc = await models.request.create(doc);
+    // @ts-expect-error -- TSCONVERSION appears to be genuine
     const updatedDoc = await models.request.update(newDoc, true);
-
     // Assert no change seen before flush
     expect(changesSeen.length).toBe(0);
-
     // Assert changes seen after flush
     await db.flushChanges();
     expect(changesSeen).toEqual([
@@ -83,7 +89,6 @@ describe('bufferChanges()', () => {
         [db.CHANGE_UPDATE, updatedDoc, false],
       ],
     ]);
-
     // Assert no more changes seen after flush again
     await db.flushChanges();
     expect(changesSeen).toEqual([
@@ -100,20 +105,19 @@ describe('bufferChanges()', () => {
       parentId: 'n/a',
       name: 'foo',
     };
+    const changesSeen: Array<Function> = [];
 
-    const changesSeen = [];
     const callback = change => {
       changesSeen.push(change);
     };
-    db.onChange(callback);
 
+    db.onChange(callback);
     await db.bufferChanges();
     const newDoc = await models.request.create(doc);
+    // @ts-expect-error -- TSCONVERSION appears to be genuine
     const updatedDoc = await models.request.update(newDoc, true);
-
     // Default flush timeout is 1000ms after starting buffering
     await new Promise(resolve => setTimeout(resolve, 1500));
-
     expect(changesSeen).toEqual([
       [
         [db.CHANGE_INSERT, newDoc, false],
@@ -128,19 +132,18 @@ describe('bufferChanges()', () => {
       parentId: 'n/a',
       name: 'foo',
     };
+    const changesSeen: Array<Function> = [];
 
-    const changesSeen = [];
     const callback = change => {
       changesSeen.push(change);
     };
-    db.onChange(callback);
 
+    db.onChange(callback);
     await db.bufferChanges(500);
     const newDoc = await models.request.create(doc);
+    // @ts-expect-error -- TSCONVERSION appears to be genuine
     const updatedDoc = await models.request.update(newDoc, true);
-
     await new Promise(resolve => setTimeout(resolve, 1000));
-
     expect(changesSeen).toEqual([
       [
         [db.CHANGE_INSERT, newDoc, false],
@@ -152,29 +155,28 @@ describe('bufferChanges()', () => {
 
 describe('bufferChangesIndefinitely()', () => {
   beforeEach(globalBeforeEach);
+
   it('should not auto flush', async () => {
     const doc = {
       type: models.request.type,
       parentId: 'n/a',
       name: 'foo',
     };
+    const changesSeen: Array<Function> = [];
 
-    const changesSeen = [];
     const callback = change => {
       changesSeen.push(change);
     };
-    db.onChange(callback);
 
+    db.onChange(callback);
     await db.bufferChangesIndefinitely();
     const newDoc = await models.request.create(doc);
+    // @ts-expect-error -- TSCONVERSION appears to be genuine
     const updatedDoc = await models.request.update(newDoc, true);
-
     // Default flush timeout is 1000ms after starting buffering
     await new Promise(resolve => setTimeout(resolve, 1500));
-
     // Assert no change seen before flush
     expect(changesSeen.length).toBe(0);
-
     // Assert changes seen after flush
     await db.flushChanges();
     expect(changesSeen).toEqual([
@@ -188,17 +190,15 @@ describe('bufferChangesIndefinitely()', () => {
 
 describe('requestCreate()', () => {
   beforeEach(globalBeforeEach);
+
   it('creates a valid request', async () => {
     const now = Date.now();
-
     const patch = {
       name: 'My Request',
       parentId: 'wrk_123',
     };
-
     const r = await models.request.create(patch);
     expect(Object.keys(r).length).toBe(21);
-
     expect(r._id).toMatch(/^req_[a-zA-Z0-9]{32}$/);
     expect(r.created).toBeGreaterThanOrEqual(now);
     expect(r.modified).toBeGreaterThanOrEqual(now);
@@ -215,7 +215,11 @@ describe('requestCreate()', () => {
   });
 
   it('throws when missing parentID', () => {
-    const fn = () => models.request.create({ name: 'My Request' });
+    const fn = () =>
+      models.request.create({
+        name: 'My Request',
+      });
+
     expect(fn).toThrowError('New Requests missing `parentId`');
   });
 });
@@ -223,17 +227,20 @@ describe('requestCreate()', () => {
 describe('requestGroupDuplicate()', () => {
   beforeEach(async () => {
     await globalBeforeEach();
-    await loadFixture('nestedfolders');
+    await loadFixture();
   });
 
   it('duplicates a RequestGroup', async () => {
     const requestGroup = await models.requestGroup.getById('fld_1');
-    expect(requestGroup.name).toBe('Fld 1');
+    expect(requestGroup).not.toEqual(null);
+    if (requestGroup === null) {
+      return;
+    }
 
+    expect(requestGroup.name).toBe('Fld 1');
     const newRequestGroup = await models.requestGroup.duplicate(requestGroup);
     expect(newRequestGroup._id).not.toBe(requestGroup._id);
     expect(newRequestGroup.name).toBe('Fld 1 (Copy)');
-
     const allRequests = await models.request.all();
     const allRequestGroups = await models.requestGroup.all();
     const childRequests = await models.request.findByParentId(requestGroup._id);
@@ -244,10 +251,8 @@ describe('requestGroupDuplicate()', () => {
     // to see that the recursion worked (for the most part)
     expect(allRequests.length).toBe(8);
     expect(allRequestGroups.length).toBe(5);
-
     expect(childRequests.length).toBe(2);
     expect(childRequestGroups.length).toBe(1);
-
     expect(newChildRequests.length).toBe(2);
     expect(newChildRequestGroups.length).toBe(1);
   });
@@ -258,190 +263,354 @@ describe('_repairDatabase()', () => {
 
   it('fixes duplicate environments', async () => {
     // Create Workspace with no children
-    const workspace = await models.workspace.create({ _id: 'w1' });
+    const workspace = await models.workspace.create({
+      _id: 'w1',
+    });
     const spec = await models.apiSpec.getByParentId(workspace._id);
-
     expect((await db.withDescendants(workspace)).length).toBe(2);
-
     // Create one set of sub environments
     await models.environment.create({
       _id: 'b1',
       parentId: 'w1',
-      data: { foo: 'b1', b1: true },
+      data: {
+        foo: 'b1',
+        b1: true,
+      },
     });
     await models.environment.create({
       _id: 'b1_sub1',
       parentId: 'b1',
-      data: { foo: '1' },
+      data: {
+        foo: '1',
+      },
     });
     await models.environment.create({
       _id: 'b1_sub2',
       parentId: 'b1',
-      data: { foo: '2' },
+      data: {
+        foo: '2',
+      },
     });
-
     // Create second set of sub environments
     await models.environment.create({
       _id: 'b2',
       parentId: 'w1',
-      data: { foo: 'b2', b2: true },
+      data: {
+        foo: 'b2',
+        b2: true,
+      },
     });
     await models.environment.create({
       _id: 'b2_sub1',
       parentId: 'b2',
-      data: { foo: '3' },
+      data: {
+        foo: '3',
+      },
     });
     await models.environment.create({
       _id: 'b2_sub2',
       parentId: 'b2',
-      data: { foo: '4' },
+      data: {
+        foo: '4',
+      },
     });
-
     // Make sure we have everything
     expect((await db.withDescendants(workspace)).length).toBe(8);
     const descendants = (await db.withDescendants(workspace)).map(d => ({
       _id: d._id,
       parentId: d.parentId,
+      // @ts-expect-error -- TSCONVERSION appears to be genuine
       data: d.data || null,
     }));
     expect(descendants).toEqual([
-      { _id: 'w1', data: null, parentId: null },
-      { _id: 'b1', data: { foo: 'b1', b1: true }, parentId: 'w1' },
-      { _id: 'b2', data: { foo: 'b2', b2: true }, parentId: 'w1' },
-      expect.objectContaining({ _id: spec._id, parentId: 'w1' }),
-      { _id: 'b1_sub1', data: { foo: '1' }, parentId: 'b1' },
-      { _id: 'b1_sub2', data: { foo: '2' }, parentId: 'b1' },
-      { _id: 'b2_sub1', data: { foo: '3' }, parentId: 'b2' },
-      { _id: 'b2_sub2', data: { foo: '4' }, parentId: 'b2' },
+      {
+        _id: 'w1',
+        data: null,
+        parentId: null,
+      },
+      {
+        _id: 'b1',
+        data: {
+          foo: 'b1',
+          b1: true,
+        },
+        parentId: 'w1',
+      },
+      {
+        _id: 'b2',
+        data: {
+          foo: 'b2',
+          b2: true,
+        },
+        parentId: 'w1',
+      },
+      expect.objectContaining({
+        _id: spec?._id,
+        parentId: 'w1',
+      }),
+      {
+        _id: 'b1_sub1',
+        data: {
+          foo: '1',
+        },
+        parentId: 'b1',
+      },
+      {
+        _id: 'b1_sub2',
+        data: {
+          foo: '2',
+        },
+        parentId: 'b1',
+      },
+      {
+        _id: 'b2_sub1',
+        data: {
+          foo: '3',
+        },
+        parentId: 'b2',
+      },
+      {
+        _id: 'b2_sub2',
+        data: {
+          foo: '4',
+        },
+        parentId: 'b2',
+      },
     ]);
 
     // Run the fix algorithm
-    await db._repairDatabase();
+    await _repairDatabase();
 
     // Make sure things get adjusted
     const descendants2 = (await db.withDescendants(workspace)).map(d => ({
       _id: d._id,
       parentId: d.parentId,
+      // @ts-expect-error -- TSCONVERSION appears to be genuine
       data: d.data || null,
     }));
     expect(descendants2).toEqual([
-      { _id: 'w1', data: null, parentId: null },
-      { _id: 'b1', data: { foo: 'b1', b1: true, b2: true }, parentId: 'w1' },
-      expect.objectContaining({ _id: spec._id, parentId: 'w1' }),
-
-      // Extra base environments should have been deleted
+      {
+        _id: 'w1',
+        data: null,
+        parentId: null,
+      },
+      {
+        _id: 'b1',
+        data: {
+          foo: 'b1',
+          b1: true,
+          b2: true,
+        },
+        parentId: 'w1',
+      },
+      expect.objectContaining({
+        _id: spec?._id,
+        parentId: 'w1',
+      }), // Extra base environments should have been deleted
       // {_id: 'b2', data: {foo: 'bar'}, parentId: 'w1'},
-
       // Sub environments should have been moved to new "master" base environment
-      { _id: 'b1_sub1', data: { foo: '1' }, parentId: 'b1' },
-      { _id: 'b1_sub2', data: { foo: '2' }, parentId: 'b1' },
-      { _id: 'b2_sub1', data: { foo: '3' }, parentId: 'b1' },
-      { _id: 'b2_sub2', data: { foo: '4' }, parentId: 'b1' },
+      {
+        _id: 'b1_sub1',
+        data: {
+          foo: '1',
+        },
+        parentId: 'b1',
+      },
+      {
+        _id: 'b1_sub2',
+        data: {
+          foo: '2',
+        },
+        parentId: 'b1',
+      },
+      {
+        _id: 'b2_sub1',
+        data: {
+          foo: '3',
+        },
+        parentId: 'b1',
+      },
+      {
+        _id: 'b2_sub2',
+        data: {
+          foo: '4',
+        },
+        parentId: 'b1',
+      },
     ]);
   });
 
   it('fixes duplicate cookie jars', async () => {
     // Create Workspace with no children
-    const workspace = await models.workspace.create({ _id: 'w1' });
+    const workspace = await models.workspace.create({
+      _id: 'w1',
+    });
     const spec = await models.apiSpec.getByParentId(workspace._id);
-
     expect((await db.withDescendants(workspace)).length).toBe(2);
-
     // Create one set of sub environments
     await models.cookieJar.create({
       _id: 'j1',
       parentId: 'w1',
       cookies: [
-        { id: '1', key: 'foo', value: '1' },
-        { id: 'j1_1', key: 'j1', value: '1' },
+        // @ts-expect-error -- TSCONVERSION
+        {
+          id: '1',
+          key: 'foo',
+          value: '1',
+        },
+        // @ts-expect-error -- TSCONVERSION
+        {
+          id: 'j1_1',
+          key: 'j1',
+          value: '1',
+        },
       ],
     });
-
     await models.cookieJar.create({
       _id: 'j2',
       parentId: 'w1',
       cookies: [
-        { id: '1', key: 'foo', value: '2' },
-        { id: 'j2_1', key: 'j2', value: '2' },
+        // @ts-expect-error -- TSCONVERSION
+        {
+          id: '1',
+          key: 'foo',
+          value: '2',
+        },
+        // @ts-expect-error -- TSCONVERSION
+        {
+          id: 'j2_1',
+          key: 'j2',
+          value: '2',
+        },
       ],
     });
-
     // Make sure we have everything
     expect((await db.withDescendants(workspace)).length).toBe(4);
     const descendants = (await db.withDescendants(workspace)).map(d => ({
       _id: d._id,
+      // @ts-expect-error -- TSCONVERSION
       cookies: d.cookies || null,
       parentId: d.parentId,
     }));
     expect(descendants).toEqual([
-      { _id: 'w1', cookies: null, parentId: null },
+      {
+        _id: 'w1',
+        cookies: null,
+        parentId: null,
+      },
       {
         _id: 'j1',
         parentId: 'w1',
         cookies: [
-          { id: '1', key: 'foo', value: '1' },
-          { id: 'j1_1', key: 'j1', value: '1' },
+          {
+            id: '1',
+            key: 'foo',
+            value: '1',
+          },
+          {
+            id: 'j1_1',
+            key: 'j1',
+            value: '1',
+          },
         ],
       },
       {
         _id: 'j2',
         parentId: 'w1',
         cookies: [
-          { id: '1', key: 'foo', value: '2' },
-          { id: 'j2_1', key: 'j2', value: '2' },
+          {
+            id: '1',
+            key: 'foo',
+            value: '2',
+          },
+          {
+            id: 'j2_1',
+            key: 'j2',
+            value: '2',
+          },
         ],
       },
-      expect.objectContaining({ _id: spec._id, parentId: 'w1' }),
+      expect.objectContaining({
+        _id: spec?._id,
+        parentId: 'w1',
+      }),
     ]);
-
     // Run the fix algorithm
-    await db._repairDatabase();
-
+    await _repairDatabase();
     // Make sure things get adjusted
     const descendants2 = (await db.withDescendants(workspace)).map(d => ({
       _id: d._id,
+      // @ts-expect-error -- TSCONVERSION
       cookies: d.cookies || null,
       parentId: d.parentId,
     }));
     expect(descendants2).toEqual([
-      { _id: 'w1', cookies: null, parentId: null },
+      {
+        _id: 'w1',
+        cookies: null,
+        parentId: null,
+      },
       {
         _id: 'j1',
         parentId: 'w1',
         cookies: [
-          { id: '1', key: 'foo', value: '1' },
-          { id: 'j1_1', key: 'j1', value: '1' },
-          { id: 'j2_1', key: 'j2', value: '2' },
+          {
+            id: '1',
+            key: 'foo',
+            value: '1',
+          },
+          {
+            id: 'j1_1',
+            key: 'j1',
+            value: '1',
+          },
+          {
+            id: 'j2_1',
+            key: 'j2',
+            value: '2',
+          },
         ],
       },
-      expect.objectContaining({ _id: spec._id, parentId: 'w1' }),
+      expect.objectContaining({
+        _id: spec?._id,
+        parentId: 'w1',
+      }),
     ]);
   });
 
   it('fixes the filename on an apiSpec', async () => {
     // Create Workspace with apiSpec child (migration in workspace will automatically create this as it is not mocked)
-    const w1 = await models.workspace.create({ _id: 'w1', name: 'Workspace 1' });
-    const w2 = await models.workspace.create({ _id: 'w2', name: 'Workspace 2' });
-    const w3 = await models.workspace.create({ _id: 'w3', name: 'Workspace 3' });
-
-    await models.apiSpec.updateOrCreateForParentId(w1._id, { fileName: '' });
+    const w1 = await models.workspace.create({
+      _id: 'w1',
+      name: 'Workspace 1',
+    });
+    const w2 = await models.workspace.create({
+      _id: 'w2',
+      name: 'Workspace 2',
+    });
+    const w3 = await models.workspace.create({
+      _id: 'w3',
+      name: 'Workspace 3',
+    });
+    await models.apiSpec.updateOrCreateForParentId(w1._id, {
+      fileName: '',
+    });
     await models.apiSpec.updateOrCreateForParentId(w2._id, {
       fileName: models.apiSpec.init().fileName,
     });
-    await models.apiSpec.updateOrCreateForParentId(w3._id, { fileName: 'Unique name' });
-
+    await models.apiSpec.updateOrCreateForParentId(w3._id, {
+      fileName: 'Unique name',
+    });
     // Make sure we have everything
-    expect((await models.apiSpec.getByParentId(w1._id)).fileName).toBe('');
-    expect((await models.apiSpec.getByParentId(w2._id)).fileName).toBe('New Document');
-    expect((await models.apiSpec.getByParentId(w3._id)).fileName).toBe('Unique name');
-
+    expect((await models.apiSpec.getByParentId(w1._id))?.fileName).toBe('');
+    expect((await models.apiSpec.getByParentId(w2._id))?.fileName).toBe('New Document');
+    expect((await models.apiSpec.getByParentId(w3._id))?.fileName).toBe('Unique name');
     // Run the fix algorithm
-    await db._repairDatabase();
-
+    await _repairDatabase();
     // Make sure things get adjusted
-    expect((await models.apiSpec.getByParentId(w1._id)).fileName).toBe('Workspace 1'); // Should fix
-    expect((await models.apiSpec.getByParentId(w2._id)).fileName).toBe('Workspace 2'); // Should fix
-    expect((await models.apiSpec.getByParentId(w3._id)).fileName).toBe('Unique name'); // should not fix
+    expect((await models.apiSpec.getByParentId(w1._id))?.fileName).toBe('Workspace 1'); // Should fix
+    expect((await models.apiSpec.getByParentId(w2._id))?.fileName).toBe('Workspace 2'); // Should fix
+    expect((await models.apiSpec.getByParentId(w3._id))?.fileName).toBe('Unique name'); // should not fix
   });
 
   it('fixes old git uris', async () => {
@@ -459,9 +628,7 @@ describe('_repairDatabase()', () => {
     const newRepoWithoutSuffix = await models.gitRepository.create({
       uri: 'https://github.com/foo/bar',
     });
-
-    await db._repairDatabase();
-
+    await _repairDatabase();
     expect(await db.get(models.gitRepository.type, oldRepoWithSuffix._id)).toEqual(
       expect.objectContaining({
         uri: 'https://github.com/foo/bar.git',
@@ -496,18 +663,18 @@ describe('duplicate()', () => {
   it('should overwrite appropriate fields on the parent when duplicating', async () => {
     const date = 1478795580200;
     Date.now = jest.fn().mockReturnValue(date);
-
     const workspace = await models.workspace.create({
       name: 'Test Workspace',
     });
-
     const newDescription = 'test';
-    const duplicated = await db.duplicate(workspace, { description: newDescription });
-
+    const duplicated = await db.duplicate(workspace, {
+      description: newDescription,
+    });
     expect(duplicated._id).not.toEqual(workspace._id);
     expect(duplicated._id).toMatch(/^wrk_[a-z0-9]{32}$/);
-
+    // @ts-expect-error -- TSCONVERSION
     delete workspace._id;
+    // @ts-expect-error -- TSCONVERSION
     delete duplicated._id;
     expect(duplicated).toEqual({
       ...workspace,
@@ -517,11 +684,11 @@ describe('duplicate()', () => {
       type: models.workspace.type,
     });
   });
+
   it('should should not call migrate when duplicating', async () => {
     const workspace = await models.workspace.create({
       name: 'Test Workspace',
     });
-
     const spy = jest.spyOn(models.workspace, 'migrate');
     await db.duplicate(workspace);
     expect(spy).not.toHaveBeenCalled();
@@ -534,11 +701,9 @@ describe('docCreate()', () => {
 
   it('should call migrate when creating', async () => {
     const spy = jest.spyOn(models.workspace, 'migrate');
-
     await db.docCreate(models.workspace.type, {
       name: 'Test Workspace',
     });
-
     // TODO: This is actually called twice, not once - we should avoid the double model.init() call.
     expect(spy).toHaveBeenCalled();
   });
@@ -549,24 +714,30 @@ describe('withAncestors()', () => {
 
   it('should return itself and all parents but exclude siblings', async () => {
     const wrk = await models.workspace.create();
-    const wrkReq = await models.request.create({ parentId: wrk._id });
-    const wrkGrpcReq = await models.grpcRequest.create({ parentId: wrk._id });
-    const grp = await models.requestGroup.create({ parentId: wrk._id });
-    const grpReq = await models.request.create({ parentId: grp._id });
-    const grpGrpcReq = await models.grpcRequest.create({ parentId: grp._id });
-
+    const wrkReq = await models.request.create({
+      parentId: wrk._id,
+    });
+    const wrkGrpcReq = await models.grpcRequest.create({
+      parentId: wrk._id,
+    });
+    const grp = await models.requestGroup.create({
+      parentId: wrk._id,
+    });
+    const grpReq = await models.request.create({
+      parentId: grp._id,
+    });
+    const grpGrpcReq = await models.grpcRequest.create({
+      parentId: grp._id,
+    });
     // Workspace child searching for ancestors
     await expect(db.withAncestors(wrk)).resolves.toStrictEqual([wrk]);
     await expect(db.withAncestors(wrkReq)).resolves.toStrictEqual([wrkReq, wrk]);
     await expect(db.withAncestors(wrkGrpcReq)).resolves.toStrictEqual([wrkGrpcReq, wrk]);
-
     // Group searching for ancestors
     await expect(db.withAncestors(grp)).resolves.toStrictEqual([grp, wrk]);
-
     // Group child searching for ancestors
     await expect(db.withAncestors(grpReq)).resolves.toStrictEqual([grpReq, grp, wrk]);
     await expect(db.withAncestors(grpGrpcReq)).resolves.toStrictEqual([grpGrpcReq, grp, wrk]);
-
     // Group child searching for ancestors with filters
     await expect(db.withAncestors(grpGrpcReq, [models.requestGroup.type])).resolves.toStrictEqual([
       grpGrpcReq,
@@ -575,7 +746,6 @@ describe('withAncestors()', () => {
     await expect(
       db.withAncestors(grpGrpcReq, [models.requestGroup.type, models.workspace.type]),
     ).resolves.toStrictEqual([grpGrpcReq, grp, wrk]);
-
     // Group child searching for ancestors but excluding groups will not find the workspace
     await expect(db.withAncestors(grpGrpcReq, [models.workspace.type])).resolves.toStrictEqual([
       grpGrpcReq,
diff --git a/packages/insomnia-app/app/common/__tests__/grpc-paths.test.js b/packages/insomnia-app/app/common/__tests__/grpc-paths.test.ts
similarity index 92%
rename from packages/insomnia-app/app/common/__tests__/grpc-paths.test.js
rename to packages/insomnia-app/app/common/__tests__/grpc-paths.test.ts
index 23d3cc0e10..04f0c76cbf 100644
--- a/packages/insomnia-app/app/common/__tests__/grpc-paths.test.js
+++ b/packages/insomnia-app/app/common/__tests__/grpc-paths.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import {
   getGrpcPathSegments,
   getShortGrpcPath,
@@ -45,9 +43,14 @@ describe('getShortGrpcPath', () => {
     const serviceName = 'service';
     const methodName = 'method';
     const fullPath = '/package.service/method';
-
-    const shortPath = getShortGrpcPath({ packageName, serviceName, methodName }, fullPath);
-
+    const shortPath = getShortGrpcPath(
+      {
+        packageName,
+        serviceName,
+        methodName,
+      },
+      fullPath,
+    );
     expect(shortPath).toBe('/service/method');
   });
 
@@ -56,13 +59,17 @@ describe('getShortGrpcPath', () => {
     const serviceName = 'service';
     const methodName = 'method';
     const fullPath = '/service/method';
-
-    const shortPath = getShortGrpcPath({ packageName, serviceName, methodName }, fullPath);
-
+    const shortPath = getShortGrpcPath(
+      {
+        packageName,
+        serviceName,
+        methodName,
+      },
+      fullPath,
+    );
     expect(shortPath).toBe(fullPath);
   });
 });
-
 const methodBuilder = createBuilder(grpcMethodDefinitionSchema);
 
 describe('groupGrpcMethodsByPackage', () => {
@@ -87,16 +94,13 @@ describe('groupGrpcMethodsByPackage', () => {
       .requestStream(true)
       .responseStream(true)
       .build();
-
     const grouped = groupGrpcMethodsByPackage([
       packageMethod1,
       packageMethod2,
       newPackage,
       noPackage,
     ]);
-
     expect(Object.keys(grouped).length).toBe(3);
-
     expect(grouped[NO_PACKAGE_KEY]).toStrictEqual([
       {
         segments: {
@@ -108,7 +112,6 @@ describe('groupGrpcMethodsByPackage', () => {
         fullPath: noPackage.path,
       },
     ]);
-
     expect(grouped.package1).toStrictEqual([
       {
         segments: {
@@ -129,7 +132,6 @@ describe('groupGrpcMethodsByPackage', () => {
         fullPath: packageMethod2.path,
       },
     ]);
-
     expect(grouped.package2).toStrictEqual([
       {
         segments: {
diff --git a/packages/insomnia-app/app/common/__tests__/har.test.js b/packages/insomnia-app/app/common/__tests__/har.test.ts
similarity index 71%
rename from packages/insomnia-app/app/common/__tests__/har.test.js
rename to packages/insomnia-app/app/common/__tests__/har.test.ts
index 75eb881db7..0bfaf581fd 100644
--- a/packages/insomnia-app/app/common/__tests__/har.test.js
+++ b/packages/insomnia-app/app/common/__tests__/har.test.ts
@@ -7,6 +7,7 @@ import { globalBeforeEach } from '../../__jest__/before-each';
 
 describe('exportHar()', () => {
   beforeEach(globalBeforeEach);
+
   it('exports single requests', async () => {
     const wrk = await models.workspace.create({
       _id: 'wrk_1',
@@ -16,7 +17,6 @@ describe('exportHar()', () => {
       _id: 'req_1',
       name: 'Request 1',
       parentId: wrk._id,
-
       url: 'https://httpstat.us/200',
       method: 'POST',
       body: {
@@ -24,26 +24,44 @@ describe('exportHar()', () => {
         text: '{}',
       },
       headers: [
-        { name: 'Content-Type', value: 'application/json' },
-        { name: 'Accept', value: 'application/json', disabled: false },
-        { name: 'X-Disabled', value: 'X-Disabled', disabled: true },
+        {
+          name: 'Content-Type',
+          value: 'application/json',
+        },
+        {
+          name: 'Accept',
+          value: 'application/json',
+          disabled: false,
+        },
+        {
+          name: 'X-Disabled',
+          value: 'X-Disabled',
+          disabled: true,
+        },
       ],
     });
     await models.response.create({
       parentId: req1._id,
-
       statusCode: 200,
       statusMessage: 'OK',
       elapsedTime: 999,
-      headers: [{ name: 'Content-Type', value: 'application/json' }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: 'application/json',
+        },
+      ],
       contentType: 'application/json',
       bodyPath: path.join(__dirname, '../__fixtures__/har/test-response.json'),
       bodyCompression: null,
     });
-
-    const exportRequests = [{ requestId: req1._id, environmentId: 'n/a' }];
+    const exportRequests = [
+      {
+        requestId: req1._id,
+        environmentId: 'n/a',
+      },
+    ];
     const harExport = await harUtils.exportHar(exportRequests);
-
     expect(harExport).toMatchObject({
       log: {
         version: '1.2',
@@ -60,8 +78,14 @@ describe('exportHar()', () => {
               httpVersion: 'HTTP/1.1',
               cookies: [],
               headers: [
-                { name: 'Content-Type', value: 'application/json' },
-                { name: 'Accept', value: 'application/json' },
+                {
+                  name: 'Content-Type',
+                  value: 'application/json',
+                },
+                {
+                  name: 'Accept',
+                  value: 'application/json',
+                },
               ],
               queryString: [],
               postData: {
@@ -77,7 +101,12 @@ describe('exportHar()', () => {
               statusText: 'OK',
               httpVersion: 'HTTP/1.1',
               cookies: [],
-              headers: [{ name: 'Content-Type', value: 'application/json' }],
+              headers: [
+                {
+                  name: 'Content-Type',
+                  value: 'application/json',
+                },
+              ],
               content: {
                 size: 15,
                 mimeType: 'application/json',
@@ -109,34 +138,45 @@ describe('exportHar()', () => {
       _id: 'wrk_1',
       name: 'Workspace',
     });
-
     const baseReq = await models.request.create({
       _id: 'req_0',
       type: models.request.type,
       name: 'Request',
       parentId: workspace._id,
-
       url: 'http://localhost',
       method: 'GET',
       body: {},
-      headers: [{ name: 'X-Environment', value: '{{ envvalue }}' }],
+      headers: [
+        {
+          name: 'X-Environment',
+          value: '{{ envvalue }}',
+        },
+      ],
     });
     const req1 = await models.request.duplicate(baseReq);
     req1._id = 'req_1';
     req1.name = 'Request 1';
-    req1.headers.push({ name: 'X-Request', value: '1' });
+    req1.headers.push({
+      name: 'X-Request',
+      value: '1',
+    });
     await models.request.create(req1);
     const req2 = await models.request.duplicate(baseReq);
     req2._id = 'req_2';
     req2.name = 'Request 2';
-    req2.headers.push({ name: 'X-Request', value: '2' });
+    req2.headers.push({
+      name: 'X-Request',
+      value: '2',
+    });
     await models.request.create(req2);
     const req3 = await models.request.duplicate(baseReq);
     req3._id = 'req_3';
     req3.name = 'Request 3';
-    req3.headers.push({ name: 'X-Request', value: '3' });
+    req3.headers.push({
+      name: 'X-Request',
+      value: '3',
+    });
     await models.request.create(req3);
-
     const envBase = await models.environment.getOrCreateForWorkspace(workspace);
     await models.environment.update(envBase, {
       data: {
@@ -160,7 +200,6 @@ describe('exportHar()', () => {
         envvalue: 'private',
       },
     });
-
     await models.response.create({
       _id: 'res_1',
       parentId: req1._id,
@@ -176,14 +215,21 @@ describe('exportHar()', () => {
       parentId: req3._id,
       statusCode: 500,
     });
-
     const exportRequests = [
-      { requestId: req1._id, environmentId: null },
-      { requestId: req2._id, environmentId: envPublic._id },
-      { requestId: req3._id, environmentId: envPrivate._id },
+      {
+        requestId: req1._id,
+        environmentId: null,
+      },
+      {
+        requestId: req2._id,
+        environmentId: envPublic._id,
+      },
+      {
+        requestId: req3._id,
+        environmentId: envPrivate._id,
+      },
     ];
     const harExport = await harUtils.exportHar(exportRequests);
-
     expect(harExport).toMatchObject({
       log: {
         version: '1.2',
@@ -194,8 +240,14 @@ describe('exportHar()', () => {
           {
             request: {
               headers: [
-                { name: 'X-Environment', value: '' },
-                { name: 'X-Request', value: '1' },
+                {
+                  name: 'X-Environment',
+                  value: '',
+                },
+                {
+                  name: 'X-Request',
+                  value: '1',
+                },
               ],
             },
             response: {
@@ -206,8 +258,14 @@ describe('exportHar()', () => {
           {
             request: {
               headers: [
-                { name: 'X-Environment', value: 'public' },
-                { name: 'X-Request', value: '2' },
+                {
+                  name: 'X-Environment',
+                  value: 'public',
+                },
+                {
+                  name: 'X-Request',
+                  value: '2',
+                },
               ],
             },
             response: {
@@ -218,8 +276,14 @@ describe('exportHar()', () => {
           {
             request: {
               headers: [
-                { name: 'X-Environment', value: 'private' },
-                { name: 'X-Request', value: '3' },
+                {
+                  name: 'X-Environment',
+                  value: 'private',
+                },
+                {
+                  name: 'X-Request',
+                  value: '3',
+                },
               ],
             },
             response: {
@@ -235,11 +299,10 @@ describe('exportHar()', () => {
 
 describe('exportHarResponse()', () => {
   beforeEach(globalBeforeEach);
+
   it('exports a default har response for an empty response', async () => {
     const notFoundResponse = null;
-
     const harResponse = await harUtils.exportHarResponse(notFoundResponse);
-
     expect(harResponse).toMatchObject({
       status: 0,
       statusText: '',
@@ -250,6 +313,7 @@ describe('exportHarResponse()', () => {
       },
     });
   });
+
   it('exports a valid har response for a non empty response', async () => {
     const response = Object.assign(models.response.init(), {
       _id: 'res_123',
@@ -257,20 +321,26 @@ describe('exportHarResponse()', () => {
       parentId: 'req_123',
       modified: 0,
       created: 0,
-
       statusCode: 200,
       statusMessage: 'OK',
       headers: [
-        { name: 'Content-Type', value: 'application/json' },
-        { name: 'Content-Length', value: '2' },
-        { name: 'Set-Cookie', value: 'sessionid=12345; HttpOnly; Path=/' },
+        {
+          name: 'Content-Type',
+          value: 'application/json',
+        },
+        {
+          name: 'Content-Length',
+          value: '2',
+        },
+        {
+          name: 'Set-Cookie',
+          value: 'sessionid=12345; HttpOnly; Path=/',
+        },
       ],
       contentType: 'application/json',
       bodyPath: path.join(__dirname, '../__fixtures__/har/test-response.json'),
     });
-
     const harResponse = await harUtils.exportHarResponse(response);
-
     expect(harResponse).toMatchObject({
       status: 200,
       statusText: 'OK',
@@ -284,9 +354,18 @@ describe('exportHarResponse()', () => {
         },
       ],
       headers: [
-        { name: 'Content-Type', value: 'application/json' },
-        { name: 'Content-Length', value: '2' },
-        { name: 'Set-Cookie', value: 'sessionid=12345; HttpOnly; Path=/' },
+        {
+          name: 'Content-Type',
+          value: 'application/json',
+        },
+        {
+          name: 'Content-Length',
+          value: '2',
+        },
+        {
+          name: 'Set-Cookie',
+          value: 'sessionid=12345; HttpOnly; Path=/',
+        },
       ],
       content: {
         size: 15,
@@ -302,6 +381,7 @@ describe('exportHarResponse()', () => {
 
 describe('exportHarWithRequest()', () => {
   beforeEach(globalBeforeEach);
+
   it('renders does it correctly', async () => {
     const workspace = await models.workspace.create();
     const cookies = [
@@ -316,18 +396,26 @@ describe('exportHarWithRequest()', () => {
         lastAccessed: new Date('2096-10-05T04:40:49.505Z'),
       },
     ];
-
     const cookieJar = await models.cookieJar.getOrCreateForParentId(workspace._id);
     await models.cookieJar.update(cookieJar, {
       parentId: workspace._id,
       cookies,
     });
-
     const request = Object.assign(models.request.init(), {
       _id: 'req_123',
       parentId: workspace._id,
-      headers: [{ name: 'Content-Type', value: 'application/json' }],
-      parameters: [{ name: 'foo bar', value: 'hello&world' }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: 'application/json',
+        },
+      ],
+      parameters: [
+        {
+          name: 'foo bar',
+          value: 'hello&world',
+        },
+      ],
       method: 'POST',
       body: {
         text: 'foo bar',
@@ -339,10 +427,8 @@ describe('exportHarWithRequest()', () => {
         password: 'pass',
       },
     });
-
     const { request: renderedRequest } = await render.getRenderedRequestAndContext(request);
     const har = await harUtils.exportHarWithRequest(renderedRequest);
-
     expect(har.cookies.length).toBe(1);
     expect(har).toEqual({
       bodySize: -1,
@@ -356,8 +442,14 @@ describe('exportHarWithRequest()', () => {
         },
       ],
       headers: [
-        { name: 'Content-Type', value: 'application/json' },
-        { name: 'Authorization', value: 'Basic dXNlcjpwYXNz' },
+        {
+          name: 'Content-Type',
+          value: 'application/json',
+        },
+        {
+          name: 'Authorization',
+          value: 'Basic dXNlcjpwYXNz',
+        },
       ],
       headersSize: -1,
       httpVersion: 'HTTP/1.1',
@@ -367,7 +459,12 @@ describe('exportHarWithRequest()', () => {
         params: [],
         text: 'foo bar',
       },
-      queryString: [{ name: 'foo bar', value: 'hello&world' }],
+      queryString: [
+        {
+          name: 'foo bar',
+          value: 'hello&world',
+        },
+      ],
       url: 'http://google.com/',
       settingEncodeUrl: true,
     });
@@ -378,28 +475,49 @@ describe('exportHarWithRequest()', () => {
     const request = Object.assign(models.request.init(), {
       _id: 'req_123',
       parentId: workspace._id,
-      headers: [{ name: 'Content-Type', value: 'multipart/form-data' }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: 'multipart/form-data',
+        },
+      ],
       parameters: [],
       method: 'POST',
       body: {
         mimeType: 'multipart/form-data',
         params: [
-          { name: 'a_file', value: '', fileName: '/tmp/my_file', type: 'file' },
-          { name: 'a_simple_field', value: 'a_simple_value' },
-          { name: 'a_second_file', value: '', fileName: '/tmp/my_file_2', type: 'file' },
+          {
+            name: 'a_file',
+            value: '',
+            fileName: '/tmp/my_file',
+            type: 'file',
+          },
+          {
+            name: 'a_simple_field',
+            value: 'a_simple_value',
+          },
+          {
+            name: 'a_second_file',
+            value: '',
+            fileName: '/tmp/my_file_2',
+            type: 'file',
+          },
         ],
       },
       url: 'http://example.com/post',
       authentication: {},
     });
-
     const { request: renderedRequest } = await render.getRenderedRequestAndContext(request);
     const har = await harUtils.exportHarWithRequest(renderedRequest);
-
     expect(har).toEqual({
       bodySize: -1,
       cookies: [],
-      headers: [{ name: 'Content-Type', value: 'multipart/form-data' }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: 'multipart/form-data',
+        },
+      ],
       headersSize: -1,
       httpVersion: 'HTTP/1.1',
       method: 'POST',
diff --git a/packages/insomnia-app/app/common/__tests__/import.test.js b/packages/insomnia-app/app/common/__tests__/import.test.ts
similarity index 72%
rename from packages/insomnia-app/app/common/__tests__/import.test.js
rename to packages/insomnia-app/app/common/__tests__/import.test.ts
index 5eba1f3429..2c8b9682d1 100644
--- a/packages/insomnia-app/app/common/__tests__/import.test.js
+++ b/packages/insomnia-app/app/common/__tests__/import.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as models from '../../models';
 import * as importUtil from '../import';
 import { getAppVersion } from '../constants';
@@ -8,6 +6,7 @@ import YAML from 'yaml';
 
 describe('exportWorkspacesHAR() and exportRequestsHAR()', () => {
   beforeEach(globalBeforeEach);
+
   it('exports a single workspace and some requests only as an HTTP Archive', async () => {
     const wrk1 = await models.workspace.create({
       _id: 'wrk_1',
@@ -17,7 +16,12 @@ describe('exportWorkspacesHAR() and exportRequestsHAR()', () => {
       _id: 'req_1',
       name: 'Request 1',
       parentId: wrk1._id,
-      headers: [{ name: 'X-Environment', value: '{{ envvalue }}' }],
+      headers: [
+        {
+          name: 'X-Environment',
+          value: '{{ envvalue }}',
+        },
+      ],
       metaSortKey: 0,
     });
     const req2 = await models.request.create({
@@ -43,7 +47,6 @@ describe('exportWorkspacesHAR() and exportRequestsHAR()', () => {
       parentId: wrk1._id,
       activeEnvironmentId: env1Private._id,
     });
-
     const wrk2 = await models.workspace.create({
       _id: 'wrk_2',
       name: 'Workspace 2',
@@ -53,9 +56,7 @@ describe('exportWorkspacesHAR() and exportRequestsHAR()', () => {
       name: 'Request 3',
       parentId: wrk2._id,
     });
-
     const includePrivateDocs = true;
-
     // Test export whole workspace.
     const exportWorkspacesJson = await importUtil.exportWorkspacesHAR(wrk1, includePrivateDocs);
     const exportWorkspacesData = JSON.parse(exportWorkspacesJson);
@@ -64,7 +65,12 @@ describe('exportWorkspacesHAR() and exportRequestsHAR()', () => {
         entries: [
           {
             request: {
-              headers: [{ name: 'X-Environment', value: 'private1' }],
+              headers: [
+                {
+                  name: 'X-Environment',
+                  value: 'private1',
+                },
+              ],
             },
             comment: req1.name,
           },
@@ -75,7 +81,6 @@ describe('exportWorkspacesHAR() and exportRequestsHAR()', () => {
       },
     });
     expect(exportWorkspacesData.log.entries.length).toBe(2);
-
     // Test export some requests only.
     const exportRequestsJson = await importUtil.exportRequestsHAR([req1], includePrivateDocs);
     const exportRequestsData = JSON.parse(exportRequestsJson);
@@ -84,7 +89,12 @@ describe('exportWorkspacesHAR() and exportRequestsHAR()', () => {
         entries: [
           {
             request: {
-              headers: [{ name: 'X-Environment', value: 'private1' }],
+              headers: [
+                {
+                  name: 'X-Environment',
+                  value: 'private1',
+                },
+              ],
             },
             comment: req1.name,
           },
@@ -93,6 +103,7 @@ describe('exportWorkspacesHAR() and exportRequestsHAR()', () => {
     });
     expect(exportRequestsData.log.entries.length).toBe(1);
   });
+
   it('exports all workspaces as an HTTP Archive', async () => {
     const wrk1 = await models.workspace.create({
       _id: 'wrk_1',
@@ -106,15 +117,24 @@ describe('exportWorkspacesHAR() and exportRequestsHAR()', () => {
       _id: 'req_1',
       name: 'Request 1',
       parentId: wrk1._id,
-      headers: [{ name: 'X-Environment', value: '{{ envvalue }}' }],
+      headers: [
+        {
+          name: 'X-Environment',
+          value: '{{ envvalue }}',
+        },
+      ],
     });
     await models.request.create({
       _id: 'req_2',
       name: 'Request 2',
       parentId: wrk2._id,
-      headers: [{ name: 'X-Environment', value: '{{ envvalue }}' }],
+      headers: [
+        {
+          name: 'X-Environment',
+          value: '{{ envvalue }}',
+        },
+      ],
     });
-
     let env1Base = await models.environment.getOrCreateForWorkspace(wrk1);
     env1Base = await models.environment.update(env1Base, {
       data: {
@@ -142,7 +162,6 @@ describe('exportWorkspacesHAR() and exportRequestsHAR()', () => {
         envvalue: 'private2',
       },
     });
-
     await models.workspaceMeta.create({
       parentId: wrk1._id,
       activeEnvironmentId: env1Public._id,
@@ -151,23 +170,31 @@ describe('exportWorkspacesHAR() and exportRequestsHAR()', () => {
       parentId: wrk2._id,
       activeEnvironmentId: env2Private._id,
     });
-
     const includePrivateDocs = false;
     const json = await importUtil.exportWorkspacesHAR(null, includePrivateDocs);
     const data = JSON.parse(json);
-
     expect(data).toMatchObject({
       log: {
         entries: expect.arrayContaining([
           expect.objectContaining({
             request: expect.objectContaining({
-              headers: [{ name: 'X-Environment', value: 'public1' }],
+              headers: [
+                {
+                  name: 'X-Environment',
+                  value: 'public1',
+                },
+              ],
             }),
             comment: 'Request 1',
           }),
           expect.objectContaining({
             request: expect.objectContaining({
-              headers: [{ name: 'X-Environment', value: 'base2' }],
+              headers: [
+                {
+                  name: 'X-Environment',
+                  value: 'base2',
+                },
+              ],
             }),
             comment: 'Request 2',
           }),
@@ -179,9 +206,13 @@ describe('exportWorkspacesHAR() and exportRequestsHAR()', () => {
 
 describe('export', () => {
   beforeEach(globalBeforeEach);
+
   it('exports all workspaces and some requests only', async () => {
-    const w = await models.workspace.create({ name: 'Workspace' });
+    const w = await models.workspace.create({
+      name: 'Workspace',
+    });
     const spec = await models.apiSpec.getByParentId(w._id); // Created by workspace migration
+
     const jar = await models.cookieJar.getOrCreateForParentId(w._id);
     const r1 = await models.request.create({
       name: 'Request 1',
@@ -227,70 +258,108 @@ describe('export', () => {
       isPrivate: true,
       parentId: eBase._id,
     });
-
     // Test export whole workspace.
     const exportedWorkspacesJson = await importUtil.exportWorkspacesData(null, false, 'json');
     const exportedWorkspacesYaml = await importUtil.exportWorkspacesData(null, false, 'yaml');
     const exportWorkspacesDataJson = JSON.parse(exportedWorkspacesJson);
     const exportWorkspacesDataYaml = YAML.parse(exportedWorkspacesYaml);
-
     // Ensure JSON is the same as YAML
     expect(exportWorkspacesDataJson.resources).toEqual(exportWorkspacesDataYaml.resources);
-
     expect(exportWorkspacesDataJson).toMatchObject({
       _type: 'export',
       __export_format: 4,
       __export_date: expect.stringMatching(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/),
       __export_source: `insomnia.desktop.app:v${getAppVersion()}`,
       resources: expect.arrayContaining([
-        expect.objectContaining({ _id: w._id }),
-        expect.objectContaining({ _id: spec._id }),
-        expect.objectContaining({ _id: eBase._id }),
-        expect.objectContaining({ _id: jar._id }),
-        expect.objectContaining({ _id: r1._id }),
-        expect.objectContaining({ _id: f2._id }),
-        expect.objectContaining({ _id: r2._id }),
-        expect.objectContaining({ _id: ePub._id }),
-        expect.objectContaining({ _id: gr1._id }),
-        expect.objectContaining({ _id: pd._id }),
-        expect.objectContaining({ _id: pf1._id }),
-        expect.objectContaining({ _id: gr2._id }),
-        expect.objectContaining({ _id: pf2._id }),
+        expect.objectContaining({
+          _id: w._id,
+        }),
+        expect.objectContaining({
+          _id: spec._id,
+        }),
+        expect.objectContaining({
+          _id: eBase._id,
+        }),
+        expect.objectContaining({
+          _id: jar._id,
+        }),
+        expect.objectContaining({
+          _id: r1._id,
+        }),
+        expect.objectContaining({
+          _id: f2._id,
+        }),
+        expect.objectContaining({
+          _id: r2._id,
+        }),
+        expect.objectContaining({
+          _id: ePub._id,
+        }),
+        expect.objectContaining({
+          _id: gr1._id,
+        }),
+        expect.objectContaining({
+          _id: pd._id,
+        }),
+        expect.objectContaining({
+          _id: pf1._id,
+        }),
+        expect.objectContaining({
+          _id: gr2._id,
+        }),
+        expect.objectContaining({
+          _id: pf2._id,
+        }),
       ]),
     });
     expect(exportWorkspacesDataJson.resources.length).toBe(13);
-
     // Test export some requests only.
     const exportRequestsJson = await importUtil.exportRequestsData([r1, gr1], false, 'json');
     const exportRequestsYaml = await importUtil.exportRequestsData([r1, gr1], false, 'yaml');
     const exportRequestsDataJSON = JSON.parse(exportRequestsJson);
     const exportRequestsDataYAML = YAML.parse(exportRequestsYaml);
-
     expect(exportRequestsDataJSON).toMatchObject({
       _type: 'export',
       __export_format: 4,
       __export_date: expect.stringMatching(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/),
       __export_source: `insomnia.desktop.app:v${getAppVersion()}`,
       resources: expect.arrayContaining([
-        expect.objectContaining({ _id: w._id }),
-        expect.objectContaining({ _id: eBase._id }),
-        expect.objectContaining({ _id: jar._id }),
-        expect.objectContaining({ _id: r1._id }),
-        expect.objectContaining({ _id: ePub._id }),
-        expect.objectContaining({ _id: gr1._id }),
-        expect.objectContaining({ _id: pf1._id }),
-        expect.objectContaining({ _id: pf2._id }),
+        expect.objectContaining({
+          _id: w._id,
+        }),
+        expect.objectContaining({
+          _id: eBase._id,
+        }),
+        expect.objectContaining({
+          _id: jar._id,
+        }),
+        expect.objectContaining({
+          _id: r1._id,
+        }),
+        expect.objectContaining({
+          _id: ePub._id,
+        }),
+        expect.objectContaining({
+          _id: gr1._id,
+        }),
+        expect.objectContaining({
+          _id: pf1._id,
+        }),
+        expect.objectContaining({
+          _id: pf2._id,
+        }),
       ]),
     });
-
     expect(exportRequestsDataJSON.resources.length).toBe(10);
     expect(exportRequestsDataYAML.resources.length).toBe(10);
-
     // Ensure JSON and YAML are the same
     expect(exportRequestsDataJSON.resources).toEqual(exportRequestsDataYAML.resources);
   });
+
   it('exports correct models', async () => {
-    const w = await models.workspace.create({ name: 'Workspace' });
+    const w = await models.workspace.create({
+      name: 'Workspace',
+    });
     const spec = await models.apiSpec.getOrCreateForParentId(w._id, {
       type: 'yaml',
       contents: 'openapi: "3.0.0"',
@@ -348,29 +417,55 @@ describe('export', () => {
       isPrivate: true,
       parentId: eBase._id,
     });
-
     const result = await importUtil.exportWorkspacesData(w, false, 'json');
-
     expect(JSON.parse(result)).toEqual({
       _type: 'export',
       __export_format: 4,
       __export_date: expect.stringMatching(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/),
       __export_source: `insomnia.desktop.app:v${getAppVersion()}`,
       resources: expect.arrayContaining([
-        expect.objectContaining({ _id: w._id }),
-        expect.objectContaining({ _id: eBase._id }),
-        expect.objectContaining({ _id: jar._id }),
-        expect.objectContaining({ _id: pd._id }),
-        expect.objectContaining({ _id: pf1._id }),
-        expect.objectContaining({ _id: pf2._id }),
-        expect.objectContaining({ _id: r1._id }),
-        expect.objectContaining({ _id: r2._id }),
-        expect.objectContaining({ _id: gr1._id }),
-        expect.objectContaining({ _id: gr2._id }),
-        expect.objectContaining({ _id: uts1._id }),
-        expect.objectContaining({ _id: ut1._id }),
-        expect.objectContaining({ _id: ePub._id }),
-        expect.objectContaining({ _id: spec._id }),
+        expect.objectContaining({
+          _id: w._id,
+        }),
+        expect.objectContaining({
+          _id: eBase._id,
+        }),
+        expect.objectContaining({
+          _id: jar._id,
+        }),
+        expect.objectContaining({
+          _id: pd._id,
+        }),
+        expect.objectContaining({
+          _id: pf1._id,
+        }),
+        expect.objectContaining({
+          _id: pf2._id,
+        }),
+        expect.objectContaining({
+          _id: r1._id,
+        }),
+        expect.objectContaining({
+          _id: r2._id,
+        }),
+        expect.objectContaining({
+          _id: gr1._id,
+        }),
+        expect.objectContaining({
+          _id: gr2._id,
+        }),
+        expect.objectContaining({
+          _id: uts1._id,
+        }),
+        expect.objectContaining({
+          _id: ut1._id,
+        }),
+        expect.objectContaining({
+          _id: ePub._id,
+        }),
+        expect.objectContaining({
+          _id: spec._id,
+        }),
       ]),
     });
   });
@@ -378,24 +473,38 @@ describe('export', () => {
 
 describe('isApiSpecImport()', () => {
   it.each(['swagger2', 'openapi3'])('should return true if spec id is %o', (id: string) => {
-    expect(importUtil.isApiSpecImport({ id })).toBe(true);
+    expect(
+      importUtil.isApiSpecImport({
+        id,
+      }),
+    ).toBe(true);
   });
 
   it('should return false if spec id is not valid', () => {
     const id = 'invalid-id';
-
-    expect(importUtil.isApiSpecImport({ id })).toBe(false);
+    expect(
+      importUtil.isApiSpecImport({
+        id,
+      }),
+    ).toBe(false);
   });
 });
 
 describe('isInsomniaV4Import()', () => {
   it.each(['insomnia-4'])('should return true if spec id is %o', (id: string) => {
-    expect(importUtil.isInsomniaV4Import({ id })).toBe(true);
+    expect(
+      importUtil.isInsomniaV4Import({
+        id,
+      }),
+    ).toBe(true);
   });
 
   it('should return false if spec id is not valid', () => {
     const id = 'invalid-id';
-
-    expect(importUtil.isInsomniaV4Import({ id })).toBe(false);
+    expect(
+      importUtil.isInsomniaV4Import({
+        id,
+      }),
+    ).toBe(false);
   });
 });
diff --git a/packages/insomnia-app/app/common/__tests__/local-storage.test.js b/packages/insomnia-app/app/common/__tests__/local-storage.test.ts
similarity index 93%
rename from packages/insomnia-app/app/common/__tests__/local-storage.test.js
rename to packages/insomnia-app/app/common/__tests__/local-storage.test.ts
index e21a4f2871..736ee5a706 100644
--- a/packages/insomnia-app/app/common/__tests__/local-storage.test.js
+++ b/packages/insomnia-app/app/common/__tests__/local-storage.test.ts
@@ -7,7 +7,6 @@ describe('LocalStorage()', () => {
   beforeEach(async () => {
     await globalBeforeEach();
     jest.useFakeTimers();
-
     // There has to be a better way to reset this...
     setTimeout.mock.calls = [];
   });
@@ -27,16 +26,19 @@ describe('LocalStorage()', () => {
   it('does basic operations', () => {
     const basePath = `/tmp/insomnia-localstorage-${Math.random()}`;
     const localStorage = new LocalStorage(basePath);
-
     // Test get and set
     localStorage.setItem('foo', 'bar 1');
     localStorage.setItem('foo', 'bar');
     expect(localStorage.getItem('foo', 'BAD')).toBe('bar');
-
     // Test Object storage
-    localStorage.setItem('obj', { foo: 'bar', arr: [1, 2, 3] });
-    expect(localStorage.getItem('obj')).toEqual({ foo: 'bar', arr: [1, 2, 3] });
-
+    localStorage.setItem('obj', {
+      foo: 'bar',
+      arr: [1, 2, 3],
+    });
+    expect(localStorage.getItem('obj')).toEqual({
+      foo: 'bar',
+      arr: [1, 2, 3],
+    });
     // Test default values
     expect(localStorage.getItem('dne', 'default')).toEqual('default');
     expect(localStorage.getItem('dne')).toEqual('default');
@@ -44,30 +46,26 @@ describe('LocalStorage()', () => {
 
   it('does handles malformed files', () => {
     const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
-
     const basePath = `/tmp/insomnia-localstorage-${Math.random()}`;
     const localStorage = new LocalStorage(basePath);
-
     // Assert default is returned on bad JSON
     fs.writeFileSync(path.join(basePath, 'key'), '{bad JSON');
     expect(localStorage.getItem('key', 'default')).toBe('default');
-
     // Assert that writing our file actually works
     fs.writeFileSync(path.join(basePath, 'key'), '{"good": "JSON"}');
-    expect(localStorage.getItem('key', 'default')).toEqual({ good: 'JSON' });
+    expect(localStorage.getItem('key', 'default')).toEqual({
+      good: 'JSON',
+    });
     expect(consoleErrorSpy).toHaveBeenCalled();
   });
 
   it('does handles failing to write file', () => {
     const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
-
     const basePath = `/tmp/insomnia-localstorage-${Math.random()}`;
     const localStorage = new LocalStorage(basePath);
     fs.rmdirSync(basePath);
     localStorage.setItem('key', 'value');
-
     jest.runAllTimers();
-
     // Since the above operation failed to write, we should now get back
     // the default value
     expect(localStorage.getItem('key', 'different')).toBe('different');
@@ -78,17 +76,13 @@ describe('LocalStorage()', () => {
     const basePath = `/tmp/insomnia-localstorage-${Math.random()}`;
     const localStorage = new LocalStorage(basePath);
     localStorage.setItem('foo', 'bar');
-
     // Assert timeouts are called
     expect(setTimeout.mock.calls.length).toBe(1);
     expect(setTimeout.mock.calls[0][1]).toBe(100);
-
     // Force debouncer to flush
     jest.runAllTimers();
-
     // Assert there is one item stored
     expect(fs.readdirSync(basePath).length).toEqual(1);
-
     // Assert the contents are correct
     const contents = fs.readFileSync(path.join(basePath, 'foo'), 'utf8');
     expect(contents).toEqual('"bar"');
@@ -100,18 +94,14 @@ describe('LocalStorage()', () => {
     localStorage.setItem('foo', 'bar1');
     localStorage.setItem('another', 10);
     localStorage.setItem('foo', 'bar3');
-
     // Assert timeouts are called
     expect(setTimeout.mock.calls.length).toBe(3);
     expect(setTimeout.mock.calls[0][1]).toBe(100);
     expect(setTimeout.mock.calls[1][1]).toBe(100);
     expect(setTimeout.mock.calls[2][1]).toBe(100);
-
     expect(fs.readdirSync(basePath).length).toEqual(0);
-
     // Force flush
     jest.runAllTimers();
-
     // Make sure only one item exists
     expect(fs.readdirSync(basePath).length).toEqual(2);
     expect(fs.readFileSync(path.join(basePath, 'foo'), 'utf8')).toEqual('"bar3"');
diff --git a/packages/insomnia-app/app/common/__tests__/misc.test.js b/packages/insomnia-app/app/common/__tests__/misc.test.ts
similarity index 77%
rename from packages/insomnia-app/app/common/__tests__/misc.test.js
rename to packages/insomnia-app/app/common/__tests__/misc.test.ts
index 48d6fd705d..9521ae0188 100644
--- a/packages/insomnia-app/app/common/__tests__/misc.test.js
+++ b/packages/insomnia-app/app/common/__tests__/misc.test.ts
@@ -10,27 +10,39 @@ import {
 
 describe('hasAuthHeader()', () => {
   beforeEach(globalBeforeEach);
+
   it('finds valid header', () => {
     const yes = misc.hasAuthHeader([
-      { name: 'foo', value: 'bar' },
-      { name: 'authorization', value: 'foo' },
+      {
+        name: 'foo',
+        value: 'bar',
+      },
+      {
+        name: 'authorization',
+        value: 'foo',
+      },
     ]);
-
     expect(yes).toEqual(true);
   });
 
   it('finds valid header case insensitive', () => {
     const yes = misc.hasAuthHeader([
-      { name: 'foo', value: 'bar' },
-      { name: 'AuthOrizAtiOn', value: 'foo' },
+      {
+        name: 'foo',
+        value: 'bar',
+      },
+      {
+        name: 'AuthOrizAtiOn',
+        value: 'foo',
+      },
     ]);
-
     expect(yes).toEqual(true);
   });
 });
 
 describe('generateId()', () => {
   beforeEach(globalBeforeEach);
+
   it('generates a valid ID', () => {
     const id = misc.generateId('foo');
     expect(id).toMatch(/^foo_[a-z0-9]{32}$/);
@@ -44,18 +56,72 @@ describe('generateId()', () => {
 
 describe('filterHeaders()', () => {
   beforeEach(globalBeforeEach);
+
   it('handles bad headers', () => {
     expect(misc.filterHeaders(null, null)).toEqual([]);
     expect(misc.filterHeaders([], null)).toEqual([]);
     expect(misc.filterHeaders(['bad'], null)).toEqual([]);
     expect(misc.filterHeaders(['bad'], 'good')).toEqual([]);
     expect(misc.filterHeaders(null, 'good')).toEqual([]);
-    expect(misc.filterHeaders([{ name: '', value: 'valid' }], '')).toEqual([]);
-    expect(misc.filterHeaders([{ name: 123, value: 123 }], 123)).toEqual([]);
-    expect(misc.filterHeaders([{ name: 'good', value: 'valid' }], 123)).toEqual([]);
-    expect(misc.filterHeaders([{ name: 'good', value: 'valid' }], null)).toEqual([]);
-    expect(misc.filterHeaders([{ name: 'good', value: 'valid' }], 'good')).toEqual([
-      { name: 'good', value: 'valid' },
+    expect(
+      misc.filterHeaders(
+        [
+          {
+            name: '',
+            value: 'valid',
+          },
+        ],
+        '',
+      ),
+    ).toEqual([]);
+    expect(
+      misc.filterHeaders(
+        [
+          {
+            name: 123,
+            value: 123,
+          },
+        ],
+        123,
+      ),
+    ).toEqual([]);
+    expect(
+      misc.filterHeaders(
+        [
+          {
+            name: 'good',
+            value: 'valid',
+          },
+        ],
+        123,
+      ),
+    ).toEqual([]);
+    expect(
+      misc.filterHeaders(
+        [
+          {
+            name: 'good',
+            value: 'valid',
+          },
+        ],
+        null,
+      ),
+    ).toEqual([]);
+    expect(
+      misc.filterHeaders(
+        [
+          {
+            name: 'good',
+            value: 'valid',
+          },
+        ],
+        'good',
+      ),
+    ).toEqual([
+      {
+        name: 'good',
+        value: 'valid',
+      },
     ]);
   });
 });
@@ -71,18 +137,14 @@ describe('keyedDebounce()', () => {
     const fn = misc.keyedDebounce(results => {
       resultsList.push(results);
     }, 100);
-
     fn('foo', 'bar');
     fn('baz', 'bar');
     fn('foo', 'bar2');
     fn('foo', 'bar3');
     fn('multi', 'foo', 'bar', 'baz');
-
     expect(setTimeout.mock.calls.length).toBe(5);
     expect(resultsList).toEqual([]);
-
     jest.runAllTimers();
-
     expect(resultsList).toEqual([
       {
         foo: ['bar3'],
@@ -104,31 +166,27 @@ describe('debounce()', () => {
     const fn = misc.debounce((...args) => {
       resultList.push(args);
     }, 100);
-
     fn('foo');
     fn('foo');
     fn('multi', 'foo', 'bar', 'baz');
     fn('baz', 'bar');
     fn('foo', 'bar3');
-
     expect(setTimeout.mock.calls.length).toBe(5);
     expect(resultList).toEqual([]);
-
     jest.runAllTimers();
-
     expect(resultList).toEqual([['foo', 'bar3']]);
   });
 });
 
 describe('fuzzyMatch()', () => {
   beforeEach(globalBeforeEach);
+
   it('can get a positive fuzzy match on a single field', () => {
     expect(misc.fuzzyMatch('test', 'testing')).toEqual({
       score: -3,
       indexes: [0, 1, 2, 3],
       target: 'testing',
     });
-
     expect(misc.fuzzyMatch('tst', 'testing')).toEqual({
       score: -2004,
       indexes: [0, 2, 3],
@@ -144,6 +202,7 @@ describe('fuzzyMatch()', () => {
 
 describe('fuzzyMatchAll()', () => {
   beforeEach(globalBeforeEach);
+
   it('can get a positive fuzzy match on multiple fields', () => {
     expect(misc.fuzzyMatchAll('', [undefined])).toEqual(null);
     expect(misc.fuzzyMatchAll('', ['testing'])).toEqual(null);
@@ -153,7 +212,11 @@ describe('fuzzyMatchAll()', () => {
       indexes: [0, 1, 2, 3],
       target: 'testing foo',
     });
-    expect(misc.fuzzyMatchAll('test foo', ['testing', 'foo'], { splitSpace: true })).toEqual({
+    expect(
+      misc.fuzzyMatchAll('test foo', ['testing', 'foo'], {
+        splitSpace: true,
+      }),
+    ).toEqual({
       score: 0,
       indexes: [0, 1, 2, 3, 0, 1, 2],
       target: 'testing foo',
@@ -225,32 +288,65 @@ describe('pluralize()', () => {
 });
 
 describe('diffPatchObj()', () => {
-  const a = { x: 1 };
-  const b = { x: 2, y: 3 };
-  const c = { x: 4, y: { z: 5 } };
+  const a = {
+    x: 1,
+  };
+  const b = {
+    x: 2,
+    y: 3,
+  };
+  const c = {
+    x: 4,
+    y: {
+      z: 5,
+    },
+  };
 
   it('does a basic merge', () => {
-    expect(diffPatchObj(a, b)).toEqual({ x: 2, y: 3 });
-
-    expect(diffPatchObj(b, a)).toEqual({ x: 1, y: 3 });
+    expect(diffPatchObj(a, b)).toEqual({
+      x: 2,
+      y: 3,
+    });
+    expect(diffPatchObj(b, a)).toEqual({
+      x: 1,
+      y: 3,
+    });
   });
 
   it.skip('does a basic merge, deep', () => {
-    expect(diffPatchObj(a, c, true)).toEqual({ x: 2, y: 3 });
-
-    expect(diffPatchObj(c, a, true)).toEqual({ x: 1 });
+    expect(diffPatchObj(a, c, true)).toEqual({
+      x: 2,
+      y: 3,
+    });
+    expect(diffPatchObj(c, a, true)).toEqual({
+      x: 1,
+    });
   });
 
   it.skip('does a basic nested merge', () => {
-    expect(diffPatchObj(a, b)).toEqual({ x: 2, y: 3 });
-
-    expect(diffPatchObj(b, a)).toEqual({ x: 1, y: { z: 5 } });
+    expect(diffPatchObj(a, b)).toEqual({
+      x: 2,
+      y: 3,
+    });
+    expect(diffPatchObj(b, a)).toEqual({
+      x: 1,
+      y: {
+        z: 5,
+      },
+    });
   });
 
   it.skip('does a basic nested merge, deep', () => {
-    expect(diffPatchObj(a, c, true)).toEqual({ x: 2, y: 3 });
-
-    expect(diffPatchObj(c, a, true)).toEqual({ x: 1, y: { z: 5 } });
+    expect(diffPatchObj(a, c, true)).toEqual({
+      x: 2,
+      y: 3,
+    });
+    expect(diffPatchObj(c, a, true)).toEqual({
+      x: 1,
+      y: {
+        z: 5,
+      },
+    });
   });
 });
 
@@ -297,7 +393,6 @@ describe('isNotNullOrUndefined', () => {
     expect(isNotNullOrUndefined(0)).toBe(true);
     expect(isNotNullOrUndefined('')).toBe(true);
     expect(isNotNullOrUndefined(false)).toBe(true);
-
     expect(isNotNullOrUndefined(null)).toBe(false);
     expect(isNotNullOrUndefined(undefined)).toBe(false);
   });
diff --git a/packages/insomnia-app/app/common/__tests__/render.test.js b/packages/insomnia-app/app/common/__tests__/render.test.ts
similarity index 94%
rename from packages/insomnia-app/app/common/__tests__/render.test.js
rename to packages/insomnia-app/app/common/__tests__/render.test.ts
index b14535fef1..b506368274 100644
--- a/packages/insomnia-app/app/common/__tests__/render.test.js
+++ b/packages/insomnia-app/app/common/__tests__/render.test.ts
@@ -6,6 +6,7 @@ jest.mock('electron');
 
 describe('render()', () => {
   beforeEach(globalBeforeEach);
+
   it('renders hello world', async () => {
     const rendered = await renderUtils.render('Hello {{ msg }}!', {
       msg: 'World',
@@ -25,14 +26,20 @@ describe('render()', () => {
 
   it('renders nested object', async () => {
     const rendered = await renderUtils.render('Hello {{ users[0].name }}!', {
-      users: [{ name: 'Niji' }],
+      users: [
+        {
+          name: 'Niji',
+        },
+      ],
     });
     expect(rendered).toBe('Hello Niji!');
   });
 
   it('fails on invalid template', async () => {
     try {
-      await renderUtils.render('Hello {{ msg }!', { msg: 'World' });
+      await renderUtils.render('Hello {{ msg }!', {
+        msg: 'World',
+      });
       fail('Render should have failed');
     } catch (err) {
       expect(err.message).toContain('expected variable end');
@@ -52,16 +59,13 @@ describe('render()', () => {
         '&': ['value', 'replaced', 'hashed', 'consume'],
       },
     };
-
     const context = await renderUtils.buildRenderContext([], rootEnvironment);
-
     expect(context).toEqual({
       value: 'ThisIsATopSecretValue',
       hashed: 'f67565de946a899a534fd908e7eef872',
       replaced: 'f67565de946a899a534fd908e7eef872',
       consume: 'f67565de946a899a534fd908e7eef872',
     });
-
     // In runtime, this context is used to render, which re-evaluates the expression for replaced in the rootEnvironment by using the built context
     // Regression test from issue 1917 - https://github.com/Kong/insomnia/issues/1917
     const renderExpression = await renderUtils.render(rootEnvironment.data.replaced, context);
@@ -71,6 +75,7 @@ describe('render()', () => {
 
 describe('buildRenderContext()', () => {
   beforeEach(globalBeforeEach);
+
   it('cascades properly', async () => {
     const ancestors = [
       {
@@ -88,7 +93,6 @@ describe('buildRenderContext()', () => {
         },
       },
     ];
-
     const rootEnvironment = {
       type: models.environment.type,
       data: {
@@ -96,7 +100,6 @@ describe('buildRenderContext()', () => {
         root: true,
       },
     };
-
     const subEnvironment = {
       type: models.environment.type,
       data: {
@@ -104,13 +107,11 @@ describe('buildRenderContext()', () => {
         sub: true,
       },
     };
-
     const context = await renderUtils.buildRenderContext(
       ancestors,
       rootEnvironment,
       subEnvironment,
     );
-
     expect(context).toEqual({
       foo: 'parent',
       ancestor: true,
@@ -124,12 +125,12 @@ describe('buildRenderContext()', () => {
       {
         // Sub Environment
         type: models.requestGroup.type,
-        environment: { recursive: '{{ recursive }}/hello' },
+        environment: {
+          recursive: '{{ recursive }}/hello',
+        },
       },
     ];
-
     const context = await renderUtils.buildRenderContext(ancestors);
-
     // This is longer than 3 because it multiplies every time (1 -> 2 -> 4 -> 8)
     expect(context).toEqual({
       recursive: '{{ recursive }}/hello/hello/hello/hello/hello/hello/hello/hello',
@@ -145,7 +146,6 @@ describe('buildRenderContext()', () => {
         url: '{{ proto }}://{{ domain }}',
       },
     };
-
     const sub = {
       type: models.environment.type,
       data: {
@@ -155,7 +155,6 @@ describe('buildRenderContext()', () => {
         url: '{{ proto }}://{{ domain }}:{{ port }}',
       },
     };
-
     const ancestors = [
       {
         // Folder Environment
@@ -167,9 +166,7 @@ describe('buildRenderContext()', () => {
         },
       },
     ];
-
     const context = await renderUtils.buildRenderContext(ancestors, root, sub);
-
     expect(context).toEqual({
       proto: 'https',
       domain: 'folder.com',
@@ -181,14 +178,16 @@ describe('buildRenderContext()', () => {
   it('does the thing', async () => {
     const root = {
       type: models.environment.type,
-      data: { url: 'insomnia.rest' },
+      data: {
+        url: 'insomnia.rest',
+      },
     };
-
     const sub = {
       type: models.environment.type,
-      data: { url: '{{ url }}/sub' },
+      data: {
+        url: '{{ url }}/sub',
+      },
     };
-
     const ancestors = [
       {
         // Folder Environment
@@ -199,9 +198,7 @@ describe('buildRenderContext()', () => {
         },
       },
     ];
-
     const context = await renderUtils.buildRenderContext(ancestors, root, sub);
-
     expect(context).toEqual({
       url: 'insomnia.rest/sub/folder',
       name: 'folder',
@@ -222,9 +219,7 @@ describe('buildRenderContext()', () => {
         },
       },
     ];
-
     const context = await renderUtils.buildRenderContext(ancestors);
-
     expect(context).toEqual({
       d: '/d',
       c: '/c/d',
@@ -245,9 +240,7 @@ describe('buildRenderContext()', () => {
         },
       },
     ];
-
     const context = await renderUtils.buildRenderContext(ancestors);
-
     expect(context).toEqual({
       sibling: 'sibling',
       test: 'sibling/hello',
@@ -271,9 +264,7 @@ describe('buildRenderContext()', () => {
         },
       },
     ];
-
     const context = await renderUtils.buildRenderContext(ancestors);
-
     expect(context).toEqual({
       grandparent: 'grandparent',
       test: 'grandparent parent',
@@ -297,10 +288,10 @@ describe('buildRenderContext()', () => {
         },
       },
     ];
-
     const context = await renderUtils.buildRenderContext(ancestors);
-
-    expect(context).toEqual({ base_url: 'https://insomnia.rest/resource' });
+    expect(context).toEqual({
+      base_url: 'https://insomnia.rest/resource',
+    });
   });
 
   it('rendered parent, ignoring sibling environment variables', async () => {
@@ -329,7 +320,6 @@ describe('buildRenderContext()', () => {
         },
       },
     ];
-
     const context = await renderUtils.buildRenderContext(ancestors);
     expect(await renderUtils.render('{{ urls.admin }}/foo', context)).toBe(
       'https://parent.com/admin/foo',
@@ -356,9 +346,7 @@ describe('buildRenderContext()', () => {
         },
       },
     ];
-
     const context = await renderUtils.buildRenderContext(ancestors);
-
     expect(context).toEqual({
       parent: 'parent',
       test: 'parent grandparent',
@@ -376,23 +364,41 @@ describe('buildRenderContext()', () => {
         name: 'Grandparent',
         type: models.requestGroup.type,
         environment: {
-          users: [{ name: 'Mike' }, { name: 'Opender' }],
+          users: [
+            {
+              name: 'Mike',
+            },
+            {
+              name: 'Opender',
+            },
+          ],
         },
       },
     ];
-
     const context = await renderUtils.buildRenderContext(ancestors);
-
     expect(context).toEqual({
-      users: [{ name: 'Mike' }, { name: 'Opender' }],
+      users: [
+        {
+          name: 'Mike',
+        },
+        {
+          name: 'Opender',
+        },
+      ],
     });
   });
 
   it('works with ordered objects', async () => {
     const obj = {
       users: [
-        { name: 'Mike', id: 1 },
-        { name: 'Opender', id: 2 },
+        {
+          name: 'Mike',
+          id: 1,
+        },
+        {
+          name: 'Opender',
+          id: 2,
+        },
       ],
     };
     const order = {
@@ -400,39 +406,39 @@ describe('buildRenderContext()', () => {
       '&~|users~|0': ['id', 'name'],
       '&~|users~|1': ['id', 'name'],
     };
-
     const requestGroup = {
       name: 'Parent',
       type: models.requestGroup.type,
       environment: obj,
       environmentPropertyOrder: order,
     };
-
     const rootEnvironment = {
       name: 'Parent',
       type: models.environment.type,
       data: obj,
       dataPropertyOrder: order,
     };
-
     const subEnvironment = {
       name: 'Sub',
       type: models.environment.type,
       data: obj,
       dataPropertyOrder: order,
     };
-
     const groupCtx = await renderUtils.buildRenderContext([requestGroup]);
     const rootCtx = await renderUtils.buildRenderContext([], rootEnvironment);
     const subCtx = await renderUtils.buildRenderContext([], null, subEnvironment);
-
     const expected = {
       users: [
-        { id: 1, name: 'Mike' },
-        { id: 2, name: 'Opender' },
+        {
+          id: 1,
+          name: 'Mike',
+        },
+        {
+          id: 2,
+          name: 'Opender',
+        },
       ],
     };
-
     expect(groupCtx).toEqual(expected);
     expect(rootCtx).toEqual(expected);
     expect(subCtx).toEqual(expected);
@@ -465,9 +471,7 @@ describe('buildRenderContext()', () => {
         },
       },
     ];
-
     const context = await renderUtils.buildRenderContext(ancestors);
-
     expect(context).toEqual({
       parent: 'parent',
       test: 'parent grandparent',
@@ -499,7 +503,6 @@ describe('buildRenderContext()', () => {
         },
       },
     ];
-
     const subEnvironment = {
       type: models.environment.type,
       data: {
@@ -508,7 +511,6 @@ describe('buildRenderContext()', () => {
         base_url: 'https://insomnia.rest',
       },
     };
-
     const rootEnvironment = {
       type: models.environment.type,
       data: {
@@ -517,13 +519,11 @@ describe('buildRenderContext()', () => {
         base_url: 'ignore this',
       },
     };
-
     const context = await renderUtils.buildRenderContext(
       ancestors,
       rootEnvironment,
       subEnvironment,
     );
-
     expect(context).toEqual({
       base_url: 'https://insomnia.rest',
       url: 'https://insomnia.rest/resource',
@@ -547,9 +547,7 @@ describe('buildRenderContext()', () => {
         '&': ['value', 'hashed', 'replaced', 'consume'],
       },
     };
-
     const context = await renderUtils.buildRenderContext([], rootEnvironment);
-
     expect(context).toEqual({
       value: 'ThisIsATopSecretValue',
       hashed: 'f67565de946a899a534fd908e7eef872',
@@ -570,9 +568,7 @@ describe('buildRenderContext()', () => {
         secret: 'ThisIsATopSecretValue',
       },
     };
-
     const context = await renderUtils.buildRenderContext([], rootEnvironment);
-
     expect(context).toEqual({
       hash_input: '123456789012345ThisIsATopSecretValue',
       hash_input_expected: '123456789012345ThisIsATopSecretValue',
@@ -589,19 +585,18 @@ describe('buildRenderContext()', () => {
     const ancestors = null;
     const rootEnvironment = null;
     const subEnvironment = null;
-
     const context = await renderUtils.buildRenderContext(
       ancestors,
       rootEnvironment,
       subEnvironment,
     );
-
     expect(context).toEqual({});
   });
 });
 
 describe('render()', () => {
   beforeEach(globalBeforeEach);
+
   it('correctly renders simple Object', async () => {
     const newObj = await renderUtils.render(
       {
@@ -614,7 +609,6 @@ describe('render()', () => {
         bad: 'hi',
       },
     );
-
     expect(newObj).toEqual({
       foo: 'bar',
       bar: 'bar',
@@ -636,9 +630,9 @@ describe('render()', () => {
         arr: [1, 2, '{{ foo }}'],
       },
     };
-
-    const newObj = await renderUtils.render(obj, { foo: 'bar' });
-
+    const newObj = await renderUtils.render(obj, {
+      foo: 'bar',
+    });
     expect(newObj).toEqual({
       foo: 'bar',
       null: null,
@@ -651,7 +645,6 @@ describe('render()', () => {
         arr: [1, 2, 'bar'],
       },
     });
-
     // Make sure original request isn't changed
     expect(obj.foo).toBe('{{ foo }}');
     expect(obj.nested.foo).toBe('{{ foo }}');
@@ -666,7 +659,9 @@ describe('render()', () => {
           bar: 'bar',
           baz: '{{ bad }}',
         },
-        { foo: 'bar' },
+        {
+          foo: 'bar',
+        },
       );
       fail('Render should have failed');
     } catch (err) {
@@ -676,16 +671,17 @@ describe('render()', () => {
 
   it('keep on error setting', async () => {
     const template = '{{ foo }} {% invalid "hi" %}';
-    const context = { foo: 'bar' };
-
+    const context = {
+      foo: 'bar',
+    };
     const resultOnlyVars = await renderUtils.render(
       template,
       context,
       null,
       renderUtils.KEEP_ON_ERROR,
     );
-
     expect(resultOnlyVars).toBe('{{ foo }} {% invalid "hi" %}');
+
     try {
       await renderUtils.render(template, context, null);
       fail('Render should not have succeeded');
@@ -696,7 +692,11 @@ describe('render()', () => {
 
   it('outputs correct error path', async () => {
     const template = {
-      foo: [{ bar: '{% foo %}' }],
+      foo: [
+        {
+          bar: '{% foo %}',
+        },
+      ],
     };
 
     try {
@@ -709,7 +709,11 @@ describe('render()', () => {
 
   it('outputs correct error path when private first node', async () => {
     const template = {
-      _foo: { _bar: { baz: '{% foo %}' } },
+      _foo: {
+        _bar: {
+          baz: '{% foo %}',
+        },
+      },
     };
 
     try {
@@ -733,7 +737,6 @@ describe('getRenderedGrpcRequestMessage()', () => {
         host: 'testb.in:9000',
       },
     });
-
     const grpcRequest = await models.grpcRequest.create({
       parentId: w1._id,
       name: 'hi {{ foo }}',
diff --git a/packages/insomnia-app/app/common/__tests__/sorting.test.js b/packages/insomnia-app/app/common/__tests__/sorting.test.js
deleted file mode 100644
index 92744d757f..0000000000
--- a/packages/insomnia-app/app/common/__tests__/sorting.test.js
+++ /dev/null
@@ -1,360 +0,0 @@
-import {
-  ascendingNumberSort,
-  descendingNumberSort,
-  metaSortKeySort,
-  sortMethodMap,
-} from '../sorting';
-import { request, requestGroup, grpcRequest } from '../../models';
-import {
-  METHOD_DELETE,
-  METHOD_GET,
-  METHOD_HEAD,
-  METHOD_OPTIONS,
-  METHOD_PATCH,
-  METHOD_POST,
-  METHOD_PUT,
-  SORT_CREATED_ASC,
-  SORT_CREATED_DESC,
-  SORT_HTTP_METHOD,
-  SORT_NAME_ASC,
-  SORT_NAME_DESC,
-  SORT_TYPE_ASC,
-  SORT_TYPE_DESC,
-} from '../constants';
-
-describe('Sorting methods', () => {
-  it('sorts by name', () => {
-    const ascendingNameSort = sortMethodMap[SORT_NAME_ASC];
-    expect(ascendingNameSort({ name: 'a' }, { name: 'b' })).toBe(-1);
-    expect(ascendingNameSort({ name: 'b' }, { name: 'a' })).toBe(1);
-    expect(ascendingNameSort({ name: 'ab' }, { name: 'abb' })).toBe(-1);
-    expect(ascendingNameSort({ name: 'abb' }, { name: 'ab' })).toBe(1);
-    expect(ascendingNameSort({ name: 'Abb' }, { name: 'bbb' })).toBe(-1);
-    expect(ascendingNameSort({ name: 'bbb' }, { name: 'Abb' })).toBe(1);
-    expect(ascendingNameSort({ name: 'abb' }, { name: 'Bbb' })).toBe(-1);
-    expect(ascendingNameSort({ name: 'Bbb' }, { name: 'abb' })).toBe(1);
-    expect(ascendingNameSort({ name: 'åbb' }, { name: 'bbb' })).toBe(-1);
-    expect(ascendingNameSort({ name: 'bbb' }, { name: 'åbb' })).toBe(1);
-    expect(ascendingNameSort({ name: 'abcdef' }, { name: 'abcdef' })).toBe(0);
-
-    const descendingNameSort = sortMethodMap[SORT_NAME_DESC];
-    expect(descendingNameSort({ name: 'a' }, { name: 'b' })).toBe(1);
-    expect(descendingNameSort({ name: 'b' }, { name: 'a' })).toBe(-1);
-    expect(descendingNameSort({ name: 'ab' }, { name: 'abb' })).toBe(1);
-    expect(descendingNameSort({ name: 'abb' }, { name: 'ab' })).toBe(-1);
-    expect(descendingNameSort({ name: 'Abb' }, { name: 'bbb' })).toBe(1);
-    expect(descendingNameSort({ name: 'bbb' }, { name: 'Abb' })).toBe(-1);
-    expect(descendingNameSort({ name: 'abb' }, { name: 'Bbb' })).toBe(1);
-    expect(descendingNameSort({ name: 'Bbb' }, { name: 'abb' })).toBe(-1);
-    expect(descendingNameSort({ name: 'åbb' }, { name: 'bbb' })).toBe(1);
-    expect(descendingNameSort({ name: 'bbb' }, { name: 'åbb' })).toBe(-1);
-    expect(descendingNameSort({ name: 'abcdef' }, { name: 'abcdef' })).toBe(0);
-  });
-
-  it('sorts by timestamp', () => {
-    const createdFirstSort = sortMethodMap[SORT_CREATED_ASC];
-    expect(createdFirstSort({ created: 1000 }, { created: 1100 })).toBe(-1);
-    expect(createdFirstSort({ created: 1100 }, { created: 1000 })).toBe(1);
-    expect(createdFirstSort({ created: 0 }, { created: 1 })).toBe(-1);
-    expect(createdFirstSort({ created: 1 }, { created: 0 })).toBe(1);
-    expect(createdFirstSort({ created: 123456789 }, { created: 123456789 })).toBe(0);
-
-    const createdLastSort = sortMethodMap[SORT_CREATED_DESC];
-    expect(createdLastSort({ created: 1000 }, { created: 1100 })).toBe(1);
-    expect(createdLastSort({ created: 1100 }, { created: 1000 })).toBe(-1);
-    expect(createdLastSort({ created: 0 }, { created: 1 })).toBe(1);
-    expect(createdLastSort({ created: 1 }, { created: 0 })).toBe(-1);
-    expect(createdLastSort({ created: 123456789 }, { created: 123456789 })).toBe(0);
-  });
-
-  it('sorts by type', () => {
-    const ascendingTypeSort = sortMethodMap[SORT_TYPE_ASC];
-    expect(
-      ascendingTypeSort(
-        { type: request.type, metaSortKey: 2 },
-        { type: requestGroup.type, metaSortKey: 1 },
-      ),
-    ).toBe(-1);
-    expect(
-      ascendingTypeSort(
-        { type: requestGroup.type, metaSortKey: 1 },
-        { type: request.type, metaSortKey: 2 },
-      ),
-    ).toBe(1);
-    expect(
-      ascendingTypeSort(
-        { type: request.type, metaSortKey: 2 },
-        { type: grpcRequest.type, metaSortKey: 1 },
-      ),
-    ).toBe(1);
-    expect(
-      ascendingTypeSort(
-        { type: grpcRequest.type, metaSortKey: 1 },
-        { type: request.type, metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      ascendingTypeSort(
-        { type: grpcRequest.type, metaSortKey: 2 },
-        { type: requestGroup.type, metaSortKey: 1 },
-      ),
-    ).toBe(-1);
-    expect(
-      ascendingTypeSort(
-        { type: requestGroup.type, metaSortKey: 1 },
-        { type: grpcRequest.type, metaSortKey: 2 },
-      ),
-    ).toBe(1);
-    expect(
-      ascendingTypeSort(
-        { type: request.type, metaSortKey: 1 },
-        { type: request.type, metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      ascendingTypeSort(
-        { type: request.type, metaSortKey: 2 },
-        { type: request.type, metaSortKey: 1 },
-      ),
-    ).toBe(1);
-    expect(
-      ascendingTypeSort(
-        { type: requestGroup.type, metaSortKey: 1 },
-        { type: requestGroup.type, metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      ascendingTypeSort(
-        { type: requestGroup.type, metaSortKey: 2 },
-        { type: requestGroup.type, metaSortKey: 1 },
-      ),
-    ).toBe(1);
-    expect(
-      ascendingTypeSort(
-        { type: grpcRequest.type, metaSortKey: 1 },
-        { type: grpcRequest.type, metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      ascendingTypeSort(
-        { type: grpcRequest.type, metaSortKey: 2 },
-        { type: grpcRequest.type, metaSortKey: 1 },
-      ),
-    ).toBe(1);
-
-    const descendingTypeSort = sortMethodMap[SORT_TYPE_DESC];
-    expect(
-      descendingTypeSort(
-        { type: request.type, metaSortKey: 2 },
-        { type: requestGroup.type, metaSortKey: 1 },
-      ),
-    ).toBe(1);
-    expect(
-      descendingTypeSort(
-        { type: requestGroup.type, metaSortKey: 1 },
-        { type: request.type, metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      descendingTypeSort(
-        { type: request.type, metaSortKey: 2 },
-        { type: grpcRequest.type, metaSortKey: 1 },
-      ),
-    ).toBe(1);
-    expect(
-      descendingTypeSort(
-        { type: grpcRequest.type, metaSortKey: 1 },
-        { type: request.type, metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      descendingTypeSort(
-        { type: grpcRequest.type, metaSortKey: 2 },
-        { type: requestGroup.type, metaSortKey: 1 },
-      ),
-    ).toBe(1);
-    expect(
-      descendingTypeSort(
-        { type: requestGroup.type, metaSortKey: 1 },
-        { type: grpcRequest.type, metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      descendingTypeSort(
-        { type: request.type, metaSortKey: 1 },
-        { type: request.type, metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      descendingTypeSort(
-        { type: request.type, metaSortKey: 2 },
-        { type: request.type, metaSortKey: 1 },
-      ),
-    ).toBe(1);
-    expect(
-      descendingTypeSort(
-        { type: requestGroup.type, metaSortKey: 1 },
-        { type: requestGroup.type, metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      descendingTypeSort(
-        { type: requestGroup.type, metaSortKey: 2 },
-        { type: requestGroup.type, metaSortKey: 1 },
-      ),
-    ).toBe(1);
-    expect(
-      descendingTypeSort(
-        { type: grpcRequest.type, metaSortKey: 1 },
-        { type: grpcRequest.type, metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      descendingTypeSort(
-        { type: grpcRequest.type, metaSortKey: 2 },
-        { type: grpcRequest.type, metaSortKey: 1 },
-      ),
-    ).toBe(1);
-  });
-
-  it('sorts by HTTP method', () => {
-    const httpMethodSort = sortMethodMap[SORT_HTTP_METHOD];
-    expect(httpMethodSort({ type: request.type }, { type: requestGroup.type })).toBe(-1);
-    expect(httpMethodSort({ type: requestGroup.type }, { type: request.type })).toBe(1);
-    expect(httpMethodSort({ type: request.type }, { type: grpcRequest.type })).toBe(-1);
-    expect(httpMethodSort({ type: grpcRequest.type }, { type: request.type })).toBe(1);
-    expect(httpMethodSort({ type: requestGroup.type }, { type: grpcRequest.type })).toBe(1);
-    expect(httpMethodSort({ type: grpcRequest.type }, { type: requestGroup.type })).toBe(-1);
-    expect(
-      httpMethodSort(
-        { type: requestGroup.type, metaSortKey: 1 },
-        { type: requestGroup.type, metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      httpMethodSort(
-        { type: requestGroup.type, metaSortKey: 2 },
-        { type: requestGroup.type, metaSortKey: 1 },
-      ),
-    ).toBe(1);
-    expect(
-      httpMethodSort(
-        { type: grpcRequest.type, metaSortKey: 1 },
-        { type: grpcRequest.type, metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      httpMethodSort(
-        { type: grpcRequest.type, metaSortKey: 2 },
-        { type: grpcRequest.type, metaSortKey: 1 },
-      ),
-    ).toBe(1);
-
-    expect(
-      httpMethodSort(
-        { type: request.type, method: 'CUSTOM_A' },
-        { type: request.type, method: 'CUSTOM_B' },
-      ),
-    ).toBe(-1);
-    expect(
-      httpMethodSort(
-        { type: request.type, method: 'CUSTOM' },
-        { type: request.type, method: METHOD_GET },
-      ),
-    ).toBe(-1);
-    expect(
-      httpMethodSort(
-        { type: request.type, method: METHOD_GET },
-        { type: request.type, method: METHOD_POST },
-      ),
-    ).toBe(-1);
-    expect(
-      httpMethodSort(
-        { type: request.type, method: METHOD_POST },
-        { type: request.type, method: METHOD_PUT },
-      ),
-    ).toBe(-1);
-    expect(
-      httpMethodSort(
-        { type: request.type, method: METHOD_PUT },
-        { type: request.type, method: METHOD_PATCH },
-      ),
-    ).toBe(-1);
-    expect(
-      httpMethodSort(
-        { type: request.type, method: METHOD_PATCH },
-        { type: request.type, method: METHOD_DELETE },
-      ),
-    ).toBe(-1);
-    expect(
-      httpMethodSort(
-        { type: request.type, method: METHOD_DELETE },
-        { type: request.type, method: METHOD_OPTIONS },
-      ),
-    ).toBe(-1);
-    expect(
-      httpMethodSort(
-        { type: request.type, method: METHOD_OPTIONS },
-        { type: request.type, method: METHOD_HEAD },
-      ),
-    ).toBe(-1);
-
-    expect(
-      httpMethodSort(
-        { type: request.type, method: 'CUSTOM', metaSortKey: 1 },
-        { type: request.type, method: 'CUSTOM', metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      httpMethodSort(
-        { type: request.type, method: 'CUSTOM', metaSortKey: 2 },
-        { type: request.type, method: 'CUSTOM', metaSortKey: 1 },
-      ),
-    ).toBe(1);
-    expect(
-      httpMethodSort(
-        { type: request.type, method: METHOD_GET, metaSortKey: 1 },
-        { type: request.type, method: METHOD_GET, metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      httpMethodSort(
-        { type: request.type, method: METHOD_GET, metaSortKey: 2 },
-        { type: request.type, method: METHOD_GET, metaSortKey: 1 },
-      ),
-    ).toBe(1);
-    expect(
-      httpMethodSort(
-        { type: request.type, method: METHOD_DELETE, metaSortKey: 1 },
-        { type: request.type, method: METHOD_DELETE, metaSortKey: 2 },
-      ),
-    ).toBe(-1);
-    expect(
-      httpMethodSort(
-        { type: request.type, method: METHOD_DELETE, metaSortKey: 2 },
-        { type: request.type, method: METHOD_DELETE, metaSortKey: 1 },
-      ),
-    ).toBe(1);
-  });
-
-  it('sorts by metaSortKey', () => {
-    expect(metaSortKeySort({ metaSortKey: 1 }, { metaSortKey: 2 })).toBe(-1);
-    expect(metaSortKeySort({ metaSortKey: 2 }, { metaSortKey: 1 })).toBe(1);
-    expect(metaSortKeySort({ metaSortKey: -2 }, { metaSortKey: 1 })).toBe(-1);
-    expect(metaSortKeySort({ metaSortKey: 1 }, { metaSortKey: -2 })).toBe(1);
-    expect(metaSortKeySort({ metaSortKey: 1, _id: 2 }, { metaSortKey: 1, _id: 1 })).toBe(-1);
-    expect(metaSortKeySort({ metaSortKey: 1, _id: 1 }, { metaSortKey: 1, _id: 2 })).toBe(1);
-  });
-
-  it('sorts by number', () => {
-    expect(ascendingNumberSort(1, 2)).toBe(-1);
-    expect(ascendingNumberSort(-2, 1)).toBe(-1);
-    expect(ascendingNumberSort(2, 1)).toBe(1);
-    expect(ascendingNumberSort(1, -2)).toBe(1);
-
-    expect(descendingNumberSort(1, 2)).toBe(1);
-    expect(descendingNumberSort(-2, 1)).toBe(1);
-    expect(descendingNumberSort(2, 1)).toBe(-1);
-    expect(descendingNumberSort(1, -2)).toBe(-1);
-  });
-});
diff --git a/packages/insomnia-app/app/common/__tests__/sorting.test.ts b/packages/insomnia-app/app/common/__tests__/sorting.test.ts
new file mode 100644
index 0000000000..05b1cd4b8a
--- /dev/null
+++ b/packages/insomnia-app/app/common/__tests__/sorting.test.ts
@@ -0,0 +1,1018 @@
+import {
+  ascendingNumberSort,
+  descendingNumberSort,
+  metaSortKeySort,
+  sortMethodMap,
+} from '../sorting';
+import { request, requestGroup, grpcRequest } from '../../models';
+import {
+  METHOD_DELETE,
+  METHOD_GET,
+  METHOD_HEAD,
+  METHOD_OPTIONS,
+  METHOD_PATCH,
+  METHOD_POST,
+  METHOD_PUT,
+  SORT_CREATED_ASC,
+  SORT_CREATED_DESC,
+  SORT_HTTP_METHOD,
+  SORT_NAME_ASC,
+  SORT_NAME_DESC,
+  SORT_TYPE_ASC,
+  SORT_TYPE_DESC,
+} from '../constants';
+
+describe('Sorting methods', () => {
+  it('sorts by name', () => {
+    const ascendingNameSort = sortMethodMap[SORT_NAME_ASC];
+    expect(
+      ascendingNameSort(
+        {
+          name: 'a',
+        },
+        {
+          name: 'b',
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      ascendingNameSort(
+        {
+          name: 'b',
+        },
+        {
+          name: 'a',
+        },
+      ),
+    ).toBe(1);
+    expect(
+      ascendingNameSort(
+        {
+          name: 'ab',
+        },
+        {
+          name: 'abb',
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      ascendingNameSort(
+        {
+          name: 'abb',
+        },
+        {
+          name: 'ab',
+        },
+      ),
+    ).toBe(1);
+    expect(
+      ascendingNameSort(
+        {
+          name: 'Abb',
+        },
+        {
+          name: 'bbb',
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      ascendingNameSort(
+        {
+          name: 'bbb',
+        },
+        {
+          name: 'Abb',
+        },
+      ),
+    ).toBe(1);
+    expect(
+      ascendingNameSort(
+        {
+          name: 'abb',
+        },
+        {
+          name: 'Bbb',
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      ascendingNameSort(
+        {
+          name: 'Bbb',
+        },
+        {
+          name: 'abb',
+        },
+      ),
+    ).toBe(1);
+    expect(
+      ascendingNameSort(
+        {
+          name: 'åbb',
+        },
+        {
+          name: 'bbb',
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      ascendingNameSort(
+        {
+          name: 'bbb',
+        },
+        {
+          name: 'åbb',
+        },
+      ),
+    ).toBe(1);
+    expect(
+      ascendingNameSort(
+        {
+          name: 'abcdef',
+        },
+        {
+          name: 'abcdef',
+        },
+      ),
+    ).toBe(0);
+    const descendingNameSort = sortMethodMap[SORT_NAME_DESC];
+    expect(
+      descendingNameSort(
+        {
+          name: 'a',
+        },
+        {
+          name: 'b',
+        },
+      ),
+    ).toBe(1);
+    expect(
+      descendingNameSort(
+        {
+          name: 'b',
+        },
+        {
+          name: 'a',
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      descendingNameSort(
+        {
+          name: 'ab',
+        },
+        {
+          name: 'abb',
+        },
+      ),
+    ).toBe(1);
+    expect(
+      descendingNameSort(
+        {
+          name: 'abb',
+        },
+        {
+          name: 'ab',
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      descendingNameSort(
+        {
+          name: 'Abb',
+        },
+        {
+          name: 'bbb',
+        },
+      ),
+    ).toBe(1);
+    expect(
+      descendingNameSort(
+        {
+          name: 'bbb',
+        },
+        {
+          name: 'Abb',
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      descendingNameSort(
+        {
+          name: 'abb',
+        },
+        {
+          name: 'Bbb',
+        },
+      ),
+    ).toBe(1);
+    expect(
+      descendingNameSort(
+        {
+          name: 'Bbb',
+        },
+        {
+          name: 'abb',
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      descendingNameSort(
+        {
+          name: 'åbb',
+        },
+        {
+          name: 'bbb',
+        },
+      ),
+    ).toBe(1);
+    expect(
+      descendingNameSort(
+        {
+          name: 'bbb',
+        },
+        {
+          name: 'åbb',
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      descendingNameSort(
+        {
+          name: 'abcdef',
+        },
+        {
+          name: 'abcdef',
+        },
+      ),
+    ).toBe(0);
+  });
+
+  it('sorts by timestamp', () => {
+    const createdFirstSort = sortMethodMap[SORT_CREATED_ASC];
+    expect(
+      createdFirstSort(
+        {
+          created: 1000,
+        },
+        {
+          created: 1100,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      createdFirstSort(
+        {
+          created: 1100,
+        },
+        {
+          created: 1000,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      createdFirstSort(
+        {
+          created: 0,
+        },
+        {
+          created: 1,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      createdFirstSort(
+        {
+          created: 1,
+        },
+        {
+          created: 0,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      createdFirstSort(
+        {
+          created: 123456789,
+        },
+        {
+          created: 123456789,
+        },
+      ),
+    ).toBe(0);
+    const createdLastSort = sortMethodMap[SORT_CREATED_DESC];
+    expect(
+      createdLastSort(
+        {
+          created: 1000,
+        },
+        {
+          created: 1100,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      createdLastSort(
+        {
+          created: 1100,
+        },
+        {
+          created: 1000,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      createdLastSort(
+        {
+          created: 0,
+        },
+        {
+          created: 1,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      createdLastSort(
+        {
+          created: 1,
+        },
+        {
+          created: 0,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      createdLastSort(
+        {
+          created: 123456789,
+        },
+        {
+          created: 123456789,
+        },
+      ),
+    ).toBe(0);
+  });
+
+  it('sorts by type', () => {
+    const ascendingTypeSort = sortMethodMap[SORT_TYPE_ASC];
+    expect(
+      ascendingTypeSort(
+        {
+          type: request.type,
+          metaSortKey: 2,
+        },
+        {
+          type: requestGroup.type,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      ascendingTypeSort(
+        {
+          type: requestGroup.type,
+          metaSortKey: 1,
+        },
+        {
+          type: request.type,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      ascendingTypeSort(
+        {
+          type: request.type,
+          metaSortKey: 2,
+        },
+        {
+          type: grpcRequest.type,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      ascendingTypeSort(
+        {
+          type: grpcRequest.type,
+          metaSortKey: 1,
+        },
+        {
+          type: request.type,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      ascendingTypeSort(
+        {
+          type: grpcRequest.type,
+          metaSortKey: 2,
+        },
+        {
+          type: requestGroup.type,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      ascendingTypeSort(
+        {
+          type: requestGroup.type,
+          metaSortKey: 1,
+        },
+        {
+          type: grpcRequest.type,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      ascendingTypeSort(
+        {
+          type: request.type,
+          metaSortKey: 1,
+        },
+        {
+          type: request.type,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      ascendingTypeSort(
+        {
+          type: request.type,
+          metaSortKey: 2,
+        },
+        {
+          type: request.type,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      ascendingTypeSort(
+        {
+          type: requestGroup.type,
+          metaSortKey: 1,
+        },
+        {
+          type: requestGroup.type,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      ascendingTypeSort(
+        {
+          type: requestGroup.type,
+          metaSortKey: 2,
+        },
+        {
+          type: requestGroup.type,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      ascendingTypeSort(
+        {
+          type: grpcRequest.type,
+          metaSortKey: 1,
+        },
+        {
+          type: grpcRequest.type,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      ascendingTypeSort(
+        {
+          type: grpcRequest.type,
+          metaSortKey: 2,
+        },
+        {
+          type: grpcRequest.type,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+    const descendingTypeSort = sortMethodMap[SORT_TYPE_DESC];
+    expect(
+      descendingTypeSort(
+        {
+          type: request.type,
+          metaSortKey: 2,
+        },
+        {
+          type: requestGroup.type,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      descendingTypeSort(
+        {
+          type: requestGroup.type,
+          metaSortKey: 1,
+        },
+        {
+          type: request.type,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      descendingTypeSort(
+        {
+          type: request.type,
+          metaSortKey: 2,
+        },
+        {
+          type: grpcRequest.type,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      descendingTypeSort(
+        {
+          type: grpcRequest.type,
+          metaSortKey: 1,
+        },
+        {
+          type: request.type,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      descendingTypeSort(
+        {
+          type: grpcRequest.type,
+          metaSortKey: 2,
+        },
+        {
+          type: requestGroup.type,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      descendingTypeSort(
+        {
+          type: requestGroup.type,
+          metaSortKey: 1,
+        },
+        {
+          type: grpcRequest.type,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      descendingTypeSort(
+        {
+          type: request.type,
+          metaSortKey: 1,
+        },
+        {
+          type: request.type,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      descendingTypeSort(
+        {
+          type: request.type,
+          metaSortKey: 2,
+        },
+        {
+          type: request.type,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      descendingTypeSort(
+        {
+          type: requestGroup.type,
+          metaSortKey: 1,
+        },
+        {
+          type: requestGroup.type,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      descendingTypeSort(
+        {
+          type: requestGroup.type,
+          metaSortKey: 2,
+        },
+        {
+          type: requestGroup.type,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      descendingTypeSort(
+        {
+          type: grpcRequest.type,
+          metaSortKey: 1,
+        },
+        {
+          type: grpcRequest.type,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      descendingTypeSort(
+        {
+          type: grpcRequest.type,
+          metaSortKey: 2,
+        },
+        {
+          type: grpcRequest.type,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+  });
+
+  it('sorts by HTTP method', () => {
+    const httpMethodSort = sortMethodMap[SORT_HTTP_METHOD];
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+        },
+        {
+          type: requestGroup.type,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: requestGroup.type,
+        },
+        {
+          type: request.type,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+        },
+        {
+          type: grpcRequest.type,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: grpcRequest.type,
+        },
+        {
+          type: request.type,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      httpMethodSort(
+        {
+          type: requestGroup.type,
+        },
+        {
+          type: grpcRequest.type,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      httpMethodSort(
+        {
+          type: grpcRequest.type,
+        },
+        {
+          type: requestGroup.type,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: requestGroup.type,
+          metaSortKey: 1,
+        },
+        {
+          type: requestGroup.type,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: requestGroup.type,
+          metaSortKey: 2,
+        },
+        {
+          type: requestGroup.type,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      httpMethodSort(
+        {
+          type: grpcRequest.type,
+          metaSortKey: 1,
+        },
+        {
+          type: grpcRequest.type,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: grpcRequest.type,
+          metaSortKey: 2,
+        },
+        {
+          type: grpcRequest.type,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+          method: 'CUSTOM_A',
+        },
+        {
+          type: request.type,
+          method: 'CUSTOM_B',
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+          method: 'CUSTOM',
+        },
+        {
+          type: request.type,
+          method: METHOD_GET,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+          method: METHOD_GET,
+        },
+        {
+          type: request.type,
+          method: METHOD_POST,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+          method: METHOD_POST,
+        },
+        {
+          type: request.type,
+          method: METHOD_PUT,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+          method: METHOD_PUT,
+        },
+        {
+          type: request.type,
+          method: METHOD_PATCH,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+          method: METHOD_PATCH,
+        },
+        {
+          type: request.type,
+          method: METHOD_DELETE,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+          method: METHOD_DELETE,
+        },
+        {
+          type: request.type,
+          method: METHOD_OPTIONS,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+          method: METHOD_OPTIONS,
+        },
+        {
+          type: request.type,
+          method: METHOD_HEAD,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+          method: 'CUSTOM',
+          metaSortKey: 1,
+        },
+        {
+          type: request.type,
+          method: 'CUSTOM',
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+          method: 'CUSTOM',
+          metaSortKey: 2,
+        },
+        {
+          type: request.type,
+          method: 'CUSTOM',
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+          method: METHOD_GET,
+          metaSortKey: 1,
+        },
+        {
+          type: request.type,
+          method: METHOD_GET,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+          method: METHOD_GET,
+          metaSortKey: 2,
+        },
+        {
+          type: request.type,
+          method: METHOD_GET,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+          method: METHOD_DELETE,
+          metaSortKey: 1,
+        },
+        {
+          type: request.type,
+          method: METHOD_DELETE,
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      httpMethodSort(
+        {
+          type: request.type,
+          method: METHOD_DELETE,
+          metaSortKey: 2,
+        },
+        {
+          type: request.type,
+          method: METHOD_DELETE,
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+  });
+
+  it('sorts by metaSortKey', () => {
+    expect(
+      metaSortKeySort(
+        {
+          metaSortKey: 1,
+        },
+        {
+          metaSortKey: 2,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      metaSortKeySort(
+        {
+          metaSortKey: 2,
+        },
+        {
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      metaSortKeySort(
+        {
+          metaSortKey: -2,
+        },
+        {
+          metaSortKey: 1,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      metaSortKeySort(
+        {
+          metaSortKey: 1,
+        },
+        {
+          metaSortKey: -2,
+        },
+      ),
+    ).toBe(1);
+    expect(
+      metaSortKeySort(
+        {
+          metaSortKey: 1,
+          _id: 2,
+        },
+        {
+          metaSortKey: 1,
+          _id: 1,
+        },
+      ),
+    ).toBe(-1);
+    expect(
+      metaSortKeySort(
+        {
+          metaSortKey: 1,
+          _id: 1,
+        },
+        {
+          metaSortKey: 1,
+          _id: 2,
+        },
+      ),
+    ).toBe(1);
+  });
+
+  it('sorts by number', () => {
+    expect(ascendingNumberSort(1, 2)).toBe(-1);
+    expect(ascendingNumberSort(-2, 1)).toBe(-1);
+    expect(ascendingNumberSort(2, 1)).toBe(1);
+    expect(ascendingNumberSort(1, -2)).toBe(1);
+    expect(descendingNumberSort(1, 2)).toBe(1);
+    expect(descendingNumberSort(-2, 1)).toBe(1);
+    expect(descendingNumberSort(2, 1)).toBe(-1);
+    expect(descendingNumberSort(1, -2)).toBe(-1);
+  });
+});
diff --git a/packages/insomnia-app/app/common/__tests__/strings.test.js b/packages/insomnia-app/app/common/__tests__/strings.test.ts
similarity index 98%
rename from packages/insomnia-app/app/common/__tests__/strings.test.js
rename to packages/insomnia-app/app/common/__tests__/strings.test.ts
index ab27aa9daa..318de788e1 100644
--- a/packages/insomnia-app/app/common/__tests__/strings.test.js
+++ b/packages/insomnia-app/app/common/__tests__/strings.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import * as models from '../../models';
 import { strings } from '../strings';
 import { getWorkspaceLabel } from '../get-workspace-label';
diff --git a/packages/insomnia-app/app/common/analytics.js b/packages/insomnia-app/app/common/analytics.ts
similarity index 72%
rename from packages/insomnia-app/app/common/analytics.js
rename to packages/insomnia-app/app/common/analytics.ts
index e015c958d1..66cc0e22e5 100644
--- a/packages/insomnia-app/app/common/analytics.js
+++ b/packages/insomnia-app/app/common/analytics.ts
@@ -1,8 +1,7 @@
-// @flow
 import { buildQueryStringFromParams, joinUrlAndQueryString } from 'insomnia-url';
 import * as electron from 'electron';
 import * as models from '../models/index';
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import * as uuid from 'uuid';
 import {
   getAppId,
@@ -15,13 +14,12 @@ import {
   isDevelopment,
 } from './constants';
 import type { RequestParameter } from '../models/request';
-import { getScreenResolution, getUserLanguage, getViewportSize } from './misc';
+import { getScreenResolution, getUserLanguage, getViewportSize } from './electron-helpers';
 import Analytics from 'analytics-node';
 import { getAccountId } from '../account/session';
 
 const DIMENSION_PLATFORM = 1;
 const DIMENSION_VERSION = 2;
-
 const KEY_TRACKING_ID = 'tid';
 const KEY_VERSION = 'v';
 const KEY_CLIENT_ID = 'cid';
@@ -42,12 +40,15 @@ const KEY_ANONYMIZE_IP = 'aip';
 const KEY_APPLICATION_NAME = 'an';
 const KEY_APPLICATION_ID = 'aid';
 const KEY_APPLICATION_VERSION = 'av';
-
 const KEY_CUSTOM_DIMENSION_PREFIX = 'cd';
-
 let _currentLocationPath = '/';
 
-export function trackEvent(category: string, action: string, label: ?string, value: ?string) {
+export function trackEvent(
+  category: string,
+  action: string,
+  label?: string | null,
+  value?: string | null,
+) {
   process.nextTick(async () => {
     await _trackEvent(true, category, action, label, value);
   });
@@ -56,8 +57,8 @@ export function trackEvent(category: string, action: string, label: ?string, val
 export function trackNonInteractiveEvent(
   category: string,
   action: string,
-  label: ?string,
-  value: ?string,
+  label?: string | null,
+  value?: string | null,
 ) {
   process.nextTick(async () => {
     await _trackEvent(false, category, action, label, value, false);
@@ -79,8 +80,8 @@ export function trackNonInteractiveEvent(
 export function trackNonInteractiveEventQueueable(
   category: string,
   action: string,
-  label: ?string,
-  value: ?string,
+  label?: string | null,
+  value?: string | null,
 ) {
   process.nextTick(async () => {
     await _trackEvent(false, category, action, label, value, true);
@@ -93,25 +94,27 @@ export function trackPageView(path: string) {
   });
 }
 
-export async function getDeviceId(): Promise<string> {
+export async function getDeviceId() {
   const settings = await models.settings.getOrCreate();
-
   let { deviceId } = settings;
+
   if (!deviceId) {
     // Migrate old GA ID into settings model if needed
     const oldId = (window && window.localStorage.getItem('gaClientId')) || null;
     deviceId = oldId || uuid.v4();
-
-    await models.settings.update(settings, { deviceId });
+    await models.settings.update(settings, {
+      deviceId,
+    });
   }
 
   return deviceId;
 }
 
-let segmentClient = null;
+let segmentClient: Analytics | null = null;
 
-export async function trackSegmentEvent(event: String, properties?: Object) {
+export async function trackSegmentEvent(event: string, properties?: Record<string, any>) {
   const settings = await models.settings.getOrCreate();
+
   if (!settings.enableAnalytics) {
     return;
   }
@@ -119,19 +122,20 @@ export async function trackSegmentEvent(event: String, properties?: Object) {
   try {
     if (!segmentClient) {
       segmentClient = new Analytics(getSegmentWriteKey(), {
+      // @ts-expect-error -- TSCONVERSION
         axiosConfig: {
           // This is needed to ensure that we use the NodeJS adapter in the render process
-          ...(global?.require && { adapter: global.require('axios/lib/adapters/http') }),
+          ...(global?.require && {
+            adapter: global.require('axios/lib/adapters/http'),
+          }),
         },
       });
     }
 
     const anonymousId = await getDeviceId();
-
     // TODO: This currently always returns an empty string in the main process
     // This is due to the session data being stored in localStorage
     const userId = getAccountId();
-
     segmentClient.track({
       anonymousId,
       userId,
@@ -156,14 +160,16 @@ export async function trackSegmentEvent(event: String, properties?: Object) {
 // ~~~~~~~~~~~~~~~~~ //
 // Private Functions //
 // ~~~~~~~~~~~~~~~~~ //
-
-function _getOsName(): string {
+function _getOsName() {
   const platform = getAppPlatform();
+
   switch (platform) {
     case 'darwin':
       return 'mac';
+
     case 'win32':
       return 'windows';
+
     default:
       return platform;
   }
@@ -174,69 +180,133 @@ export async function _trackEvent(
   interactive: boolean,
   category: string,
   action: string,
-  label: ?string,
-  value: ?string,
-  queuable: ?boolean,
+  label?: string | null,
+  value?: string | null,
+  queuable?: boolean | null,
 ) {
   const prefix = interactive ? '[ga] Event' : '[ga] Non-interactive';
   console.log(prefix, [category, action, label, value].filter(Boolean).join(', '));
-
   const params = [
-    { name: KEY_HIT_TYPE, value: 'event' },
-    { name: KEY_EVENT_CATEGORY, value: category },
-    { name: KEY_EVENT_ACTION, value: action },
+    {
+      name: KEY_HIT_TYPE,
+      value: 'event',
+    },
+    {
+      name: KEY_EVENT_CATEGORY,
+      value: category,
+    },
+    {
+      name: KEY_EVENT_ACTION,
+      value: action,
+    },
   ];
-
-  !interactive && params.push({ name: KEY_NON_INTERACTION, value: '1' });
-  label && params.push({ name: KEY_EVENT_LABEL, value: label });
-  value && params.push({ name: KEY_EVENT_VALUE, value: value });
-
+  !interactive &&
+    params.push({
+      name: KEY_NON_INTERACTION,
+      value: '1',
+    });
+  label &&
+    params.push({
+      name: KEY_EVENT_LABEL,
+      value: label,
+    });
+  value &&
+    params.push({
+      name: KEY_EVENT_VALUE,
+      value: value,
+    });
+  // @ts-expect-error -- TSCONVERSION appears to be a genuine error
   await _sendToGoogle(params, !!queuable);
 }
 
 export async function _trackPageView(location: string) {
   _currentLocationPath = location;
   console.log('[ga] Page', _currentLocationPath);
-
-  const params = [{ name: KEY_HIT_TYPE, value: 'pageview' }];
-
+  const params = [
+    {
+      name: KEY_HIT_TYPE,
+      value: 'pageview',
+    },
+  ];
+  // @ts-expect-error -- TSCONVERSION appears to be a genuine error
   await _sendToGoogle(params, false);
 }
 
 async function _getDefaultParams(): Promise<Array<RequestParameter>> {
   const deviceId = await getDeviceId();
-
   // Prepping user agent string prior to sending to GA due to Electron base UA not being GA friendly.
   const ua = String(window?.navigator?.userAgent)
     .replace(new RegExp(`${getAppId()}\\/\\d+\\.\\d+\\.\\d+ `), '')
     .replace(/Electron\/\d+\.\d+\.\d+ /, '');
-
   const params = [
-    { name: KEY_VERSION, value: '1' },
-    { name: KEY_TRACKING_ID, value: getGoogleAnalyticsId() },
-    { name: KEY_CLIENT_ID, value: deviceId },
-    { name: KEY_USER_AGENT, value: ua },
-    { name: KEY_LOCATION, value: getGoogleAnalyticsLocation() + _currentLocationPath },
-    { name: KEY_SCREEN_RESOLUTION, value: getScreenResolution() },
-    { name: KEY_USER_LANGUAGE, value: getUserLanguage() },
-    { name: KEY_TITLE, value: `${getAppId()}:${getAppVersion()}` },
-    { name: KEY_CUSTOM_DIMENSION_PREFIX + DIMENSION_PLATFORM, value: getAppPlatform() },
-    { name: KEY_CUSTOM_DIMENSION_PREFIX + DIMENSION_VERSION, value: getAppVersion() },
-    { name: KEY_ANONYMIZE_IP, value: '1' },
-    { name: KEY_APPLICATION_NAME, value: getAppName() },
-    { name: KEY_APPLICATION_ID, value: getAppId() },
-    { name: KEY_APPLICATION_VERSION, value: getAppVersion() },
+    {
+      name: KEY_VERSION,
+      value: '1',
+    },
+    {
+      name: KEY_TRACKING_ID,
+      value: getGoogleAnalyticsId(),
+    },
+    {
+      name: KEY_CLIENT_ID,
+      value: deviceId,
+    },
+    {
+      name: KEY_USER_AGENT,
+      value: ua,
+    },
+    {
+      name: KEY_LOCATION,
+      value: getGoogleAnalyticsLocation() + _currentLocationPath,
+    },
+    {
+      name: KEY_SCREEN_RESOLUTION,
+      value: getScreenResolution(),
+    },
+    {
+      name: KEY_USER_LANGUAGE,
+      value: getUserLanguage(),
+    },
+    {
+      name: KEY_TITLE,
+      value: `${getAppId()}:${getAppVersion()}`,
+    },
+    {
+      name: KEY_CUSTOM_DIMENSION_PREFIX + DIMENSION_PLATFORM,
+      value: getAppPlatform(),
+    },
+    {
+      name: KEY_CUSTOM_DIMENSION_PREFIX + DIMENSION_VERSION,
+      value: getAppVersion(),
+    },
+    {
+      name: KEY_ANONYMIZE_IP,
+      value: '1',
+    },
+    {
+      name: KEY_APPLICATION_NAME,
+      value: getAppName(),
+    },
+    {
+      name: KEY_APPLICATION_ID,
+      value: getAppId(),
+    },
+    {
+      name: KEY_APPLICATION_VERSION,
+      value: getAppVersion(),
+    },
   ];
-
   const viewport = getViewportSize();
-  viewport && params.push({ name: KEY_VIEWPORT_SIZE, value: viewport });
-
+  viewport &&
+    params.push({
+      name: KEY_VIEWPORT_SIZE,
+      value: viewport,
+    });
   global.document &&
     params.push({
       name: KEY_DOCUMENT_ENCODING,
       value: global.document.inputEncoding,
     });
-
   return params;
 }
 
@@ -245,6 +315,7 @@ async function _getDefaultParams(): Promise<Array<RequestParameter>> {
 db.onChange(async changes => {
   for (const change of changes) {
     const [event, doc] = change;
+
     if (doc.type === models.settings.type && event === 'update') {
       if (doc.enableAnalytics) {
         await _flushQueuedEvents();
@@ -253,38 +324,40 @@ db.onChange(async changes => {
   }
 });
 
-async function _sendToGoogle(params: Array<RequestParameter>, queueable: boolean) {
+async function _sendToGoogle(params: RequestParameter, queueable: boolean) {
   const settings = await models.settings.getOrCreate();
+
   if (!settings.enableAnalytics) {
     if (queueable) {
       console.log('[ga] Queued event', params);
+
       _queuedEvents.push(params);
     }
+
     return;
   }
 
   const baseParams = await _getDefaultParams();
+  // @ts-expect-error -- TSCONVERSION appears to be a genuine error
   const allParams = [...baseParams, ...params];
   const qs = buildQueryStringFromParams(allParams);
   const baseUrl = isDevelopment()
     ? 'https://www.google-analytics.com/debug/collect'
     : 'https://www.google-analytics.com/collect';
   const url = joinUrlAndQueryString(baseUrl, qs);
-
   const net = (electron.remote || electron).net;
   const request = net.request(url);
-
   request.once('error', err => {
     console.warn('[ga] Network error', err);
   });
-
   request.once('response', response => {
     const { statusCode } = response;
+
     if (statusCode < 200 && statusCode >= 300) {
       console.warn('[ga] Bad status code ' + statusCode);
     }
 
-    const chunks = [];
+    const chunks: Array<Buffer> = [];
     const [contentType] = response.headers['content-type'] || [];
 
     if (contentType !== 'application/json') {
@@ -294,9 +367,11 @@ async function _sendToGoogle(params: Array<RequestParameter>, queueable: boolean
 
     response.on('end', () => {
       const jsonStr = Buffer.concat(chunks).toString('utf8');
+
       try {
         const data = JSON.parse(jsonStr);
         const { hitParsingResult } = data;
+
         if (hitParsingResult.valid) {
           return;
         }
@@ -310,12 +385,10 @@ async function _sendToGoogle(params: Array<RequestParameter>, queueable: boolean
         console.warn('[ga] Failed to parse response', err);
       }
     });
-
     response.on('data', chunk => {
       chunks.push(chunk);
     });
   });
-
   request.end();
 }
 
@@ -325,13 +398,11 @@ async function _sendToGoogle(params: Array<RequestParameter>, queueable: boolean
  * @returns {Promise<void>}
  * @private
  */
-let _queuedEvents = [];
+let _queuedEvents: Array<RequestParameter> = [];
 
 async function _flushQueuedEvents() {
   console.log(`[ga] Flushing ${_queuedEvents.length} queued events`);
-
   const tmp = [..._queuedEvents];
-
   // Clear queue before we even start sending to prevent races
   _queuedEvents = [];
 
diff --git a/packages/insomnia-app/app/common/api-specs.js b/packages/insomnia-app/app/common/api-specs.ts
similarity index 79%
rename from packages/insomnia-app/app/common/api-specs.js
rename to packages/insomnia-app/app/common/api-specs.ts
index 03c20660bf..97efc58ad3 100644
--- a/packages/insomnia-app/app/common/api-specs.js
+++ b/packages/insomnia-app/app/common/api-specs.ts
@@ -1,16 +1,16 @@
-// @flow
-
 import YAML from 'yaml';
 
+export interface ParsedApiSpec {
+  contents: Record<string, any> | null;
+  rawContents: string;
+  format: 'openapi' | 'swagger' | null;
+  formatVersion: string | null;
+}
+
 export function parseApiSpec(
   rawDocument: string,
-): {
-  contents: Object | null,
-  rawContents: string,
-  format: 'openapi' | 'swagger' | null,
-  formatVersion: string | null,
-} {
-  const result = {
+) {
+  const result: ParsedApiSpec = {
     contents: null,
     rawContents: rawDocument,
     format: null,
diff --git a/packages/insomnia-app/app/common/constants.js b/packages/insomnia-app/app/common/constants.ts
similarity index 87%
rename from packages/insomnia-app/app/common/constants.js
rename to packages/insomnia-app/app/common/constants.ts
index 90007fb271..a5621a5a5b 100644
--- a/packages/insomnia-app/app/common/constants.js
+++ b/packages/insomnia-app/app/common/constants.ts
@@ -1,96 +1,33 @@
-// @flow
-import { appConfig } from '../../config';
-import * as electron from 'electron';
+import appConfig from '../../config/config.json';
 import path from 'path';
-import mkdirp from 'mkdirp';
-import { getDataDirectory } from './misc';
+import { ValueOf } from 'type-fest';
+import { getDataDirectory } from './electron-helpers';
 
 // App Stuff
+export const getAppVersion = () => appConfig.version;
+export const getAppLongName = () => appConfig.longName;
+export const getAppName = () => appConfig.productName;
+export const getAppDefaultTheme = () => appConfig.theme;
+export const getAppDefaultLightTheme = () => appConfig.lightTheme;
+export const getAppDefaultDarkTheme = () => appConfig.darkTheme;
+export const getAppSynopsis = () => appConfig.synopsis;
+export const getAppId = () => appConfig.appId;
+export const getGoogleAnalyticsId = () => appConfig.gaId;
+export const getGoogleAnalyticsLocation = () => appConfig.gaLocation;
+export const getAppPlatform = () => process.platform;
+export const isMac = () => getAppPlatform() === 'darwin';
+export const isLinux = () => getAppPlatform() === 'linux';
+export const isWindows = () => getAppPlatform() === 'win32';
+export const getAppEnvironment = () => process.env.INSOMNIA_ENV || 'production';
+export const isDevelopment = () => getAppEnvironment() === 'development';
+export const getSegmentWriteKey = () => appConfig.segmentWriteKeys[isDevelopment() ? 'development' : 'production'];
+export const getAppReleaseDate = () => new Date(process.env.RELEASE_DATE ?? '').toLocaleDateString();
 
-export function getAppVersion() {
-  return appConfig().version;
-}
-
-export function getAppLongName() {
-  return appConfig().longName;
-}
-
-export function getAppName() {
-  return appConfig().productName;
-}
-
-export function getAppDefaultTheme() {
-  return appConfig().theme;
-}
-
-export function getAppDefaultLightTheme() {
-  return appConfig().lightTheme;
-}
-
-export function getAppDefaultDarkTheme() {
-  return appConfig().darkTheme;
-}
-
-export function getAppSynopsis() {
-  return appConfig().synopsis;
-}
-
-export function getAppId() {
-  return appConfig().appId;
-}
-
-export function getGoogleAnalyticsId() {
-  return appConfig().gaId;
-}
-
-export function getGoogleAnalyticsLocation() {
-  return appConfig().gaLocation;
-}
-
-export function getSegmentWriteKey() {
-  if (isDevelopment()) {
-    return appConfig().segmentWriteKeys.development;
-  }
-
-  return appConfig().segmentWriteKeys.production;
-}
-
-export function getAppPlatform() {
-  return process.platform;
-}
-
-export function getAppEnvironment() {
-  return process.env.INSOMNIA_ENV || 'production';
-}
-
-export function getAppReleaseDate() {
-  return new Date(process.env.RELEASE_DATE).toLocaleDateString();
-}
-
-export function getBrowserUserAgent() {
-  const ua = encodeURIComponent(
-    String(window.navigator.userAgent)
-      .replace(new RegExp(`${getAppId()}\\/\\d+\\.\\d+\\.\\d+ `), '')
-      .replace(/Electron\/\d+\.\d+\.\d+ /, ''),
-  ).replace('%2C', ',');
-  return ua;
-}
-
-export function getTempDir() {
-  // NOTE: Using a fairly unique name here because "insomnia" is a common word
-  const { app } = electron.remote || electron;
-  const dir = path.join(app.getPath('temp'), `insomnia_${getAppVersion()}`);
-  mkdirp.sync(dir);
-  return dir;
-}
-
-export function isMac() {
-  return getAppPlatform() === 'darwin';
-}
-
-export function isLinux() {
-  return getAppPlatform() === 'linux';
-}
+export const getBrowserUserAgent = () => encodeURIComponent(
+  String(window.navigator.userAgent)
+    .replace(new RegExp(`${getAppId()}\\/\\d+\\.\\d+\\.\\d+ `), '')
+    .replace(/Electron\/\d+\.\d+\.\d+ /, ''),
+).replace('%2C', ',');
 
 export function updatesSupported() {
   // Updates are not supported on Linux
@@ -106,21 +43,8 @@ export function updatesSupported() {
   return true;
 }
 
-export function isWindows() {
-  return getAppPlatform() === 'win32';
-}
-
-export function isDevelopment() {
-  return getAppEnvironment() === 'development';
-}
-
-export function getClientString() {
-  return `${getAppEnvironment()}::${getAppPlatform()}::${getAppVersion()}`;
-}
-
-export function changelogUrl(): string {
-  return appConfig().changelogUrl;
-}
+export const getClientString = () => `${getAppEnvironment()}::${getAppPlatform()}::${getAppVersion()}`;
+export const changelogUrl = () => appConfig.changelogUrl;
 
 // Global Stuff
 export const DB_PERSIST_INTERVAL = 1000 * 60 * 30; // Compact every once in a while
@@ -140,33 +64,33 @@ export const AUTOBIND_CFG = {
   ],
 };
 
-// Available editor key maps
+// Available editor key map
 export const EDITOR_KEY_MAP_DEFAULT = 'default';
 export const EDITOR_KEY_MAP_EMACS = 'emacs';
 export const EDITOR_KEY_MAP_SUBLIME = 'sublime';
 export const EDITOR_KEY_MAP_VIM = 'vim';
 
-// Hotkeys
+// Hotkey
 export const MNEMONIC_SYM = isMac() ? '' : '&';
 export const CTRL_SYM = isMac() ? '⌃' : 'Ctrl';
 export const ALT_SYM = isMac() ? '⌥' : 'Alt';
 export const SHIFT_SYM = isMac() ? '⇧' : 'Shift';
 export const META_SYM = isMac() ? '⌘' : 'Super';
 
-// Updates
+// Update
 export const UPDATE_CHANNEL_STABLE = 'stable';
 export const UPDATE_CHANNEL_BETA = 'beta';
 export const UPDATE_URL_MAC = 'https://updates.insomnia.rest/builds/check/mac';
 export const UPDATE_URL_WINDOWS = 'https://updates.insomnia.rest/updates/win';
 
-// API
+// AP
 export const API_BASE_URL = 'https://api.insomnia.rest';
 
-// PLUGINS
+// PLUGIN
 export const PLUGIN_HUB_BASE = 'https://insomnia.rest/plugins';
 export const NPM_PACKAGE_BASE = 'https://www.npmjs.com/package';
 
-// UI Stuff
+// UI Stuf
 export const MAX_SIDEBAR_REMS = 45;
 export const MIN_SIDEBAR_REMS = 0.75;
 export const COLLAPSE_SIDEBAR_REMS = 3;
@@ -201,12 +125,13 @@ export const ACTIVITY_MIGRATION: GlobalActivity = 'migration';
 export const ACTIVITY_ANALYTICS: GlobalActivity = 'analytics';
 export const DEPRECATED_ACTIVITY_INSOMNIA = 'insomnia';
 
-export const isWorkspaceActivity = (activity: GlobalActivity): boolean => {
+export const isWorkspaceActivity = (activity: string): activity is GlobalActivity => {
   switch (activity) {
     case ACTIVITY_SPEC:
     case ACTIVITY_DEBUG:
     case ACTIVITY_UNIT_TEST:
       return true;
+
     case ACTIVITY_HOME:
     case ACTIVITY_ONBOARDING:
     case ACTIVITY_MIGRATION:
@@ -216,7 +141,7 @@ export const isWorkspaceActivity = (activity: GlobalActivity): boolean => {
   }
 };
 
-export const isValidActivity = (activity: GlobalActivity): boolean => {
+export const isValidActivity = (activity: string): activity is GlobalActivity => {
   switch (activity) {
     case ACTIVITY_SPEC:
     case ACTIVITY_DEBUG:
@@ -226,6 +151,7 @@ export const isValidActivity = (activity: GlobalActivity): boolean => {
     case ACTIVITY_MIGRATION:
     case ACTIVITY_ANALYTICS:
       return true;
+
     default:
       return false;
   }
@@ -256,13 +182,11 @@ export const METHOD_GRPC = 'GRPC';
 export const PREVIEW_MODE_FRIENDLY = 'friendly';
 export const PREVIEW_MODE_SOURCE = 'source';
 export const PREVIEW_MODE_RAW = 'raw';
-
 const previewModeMap = {
   [PREVIEW_MODE_FRIENDLY]: ['Preview', 'Visual Preview'],
   [PREVIEW_MODE_SOURCE]: ['Source', 'Source Code'],
   [PREVIEW_MODE_RAW]: ['Raw', 'Raw Data'],
 };
-
 export const PREVIEW_MODES = Object.keys(previewModeMap);
 
 // Content Types
@@ -275,7 +199,6 @@ export const CONTENT_TYPE_FORM_DATA = 'multipart/form-data';
 export const CONTENT_TYPE_FILE = 'application/octet-stream';
 export const CONTENT_TYPE_GRAPHQL = 'application/graphql';
 export const CONTENT_TYPE_OTHER = '';
-
 const contentTypesMap = {
   [CONTENT_TYPE_EDN]: ['EDN', 'EDN'],
   [CONTENT_TYPE_FILE]: ['File', 'Binary File'],
@@ -300,7 +223,6 @@ export const AUTH_HAWK = 'hawk';
 export const AUTH_AWS_IAM = 'iam';
 export const AUTH_NETRC = 'netrc';
 export const AUTH_ASAP = 'asap';
-
 export const HAWK_ALGORITHM_SHA256 = 'sha256';
 export const HAWK_ALGORITHM_SHA1 = 'sha1';
 
@@ -315,9 +237,8 @@ export const HttpVersions = {
   V2_0: 'V2_0',
   v3: 'v3',
   default: 'default',
-};
-
-export type HttpVersion = $Keys<typeof HttpVersions>;
+} as const;
+export type HttpVersion = ValueOf<typeof HttpVersions>;
 
 const authTypesMap = {
   [AUTH_BASIC]: ['Basic', 'Basic Auth'],
@@ -330,15 +251,15 @@ const authTypesMap = {
   [AUTH_AWS_IAM]: ['AWS', 'AWS IAM v4'],
   [AUTH_ASAP]: ['ASAP', 'Atlassian ASAP'],
   [AUTH_NETRC]: ['Netrc', 'Netrc File'],
-};
+} as const;
 
 // Sort Orders
 export type SortOrder =
   | 'name-asc'
   | 'name-desc'
-  | 'created-first'
-  | 'created-last'
-  | 'method'
+  | 'created-asc'
+  | 'created-desc'
+  | 'http-method'
   | 'type-desc'
   | 'type-asc';
 export const SORT_NAME_ASC: SortOrder = 'name-asc';
@@ -357,8 +278,7 @@ export const SORT_ORDERS = [
   SORT_TYPE_DESC,
   SORT_TYPE_ASC,
 ];
-
-export const sortOrderName: { [SortOrder]: string } = {
+export const sortOrderName: Record<SortOrder, string> = {
   [SORT_NAME_ASC]: 'Name Ascending',
   [SORT_NAME_DESC]: 'Name Descending',
   [SORT_CREATED_ASC]: 'Oldest First',
@@ -376,7 +296,7 @@ export function getPreviewModeName(previewMode, useLong = false) {
   }
 }
 
-export function getContentTypeName(contentType, useLong = false) {
+export function getContentTypeName(contentType?: string | null, useLong = false) {
   if (typeof contentType !== 'string') {
     return '';
   }
@@ -396,7 +316,7 @@ export function getAuthTypeName(authType, useLong = false) {
   }
 }
 
-export function getContentTypeFromHeaders(headers, defaultValue = null) {
+export function getContentTypeFromHeaders(headers, defaultValue: string | null = null) {
   if (!Array.isArray(headers)) {
     return null;
   }
@@ -410,14 +330,10 @@ export const RESPONSE_CODE_DESCRIPTIONS = {
   // Special
   [STATUS_CODE_PLUGIN_ERROR]:
     'An Insomnia plugin threw an error which prevented the request from sending',
-
   // 100s
-
   100: 'This interim response indicates that everything so far is OK and that the client should continue with the request or ignore it if it is already finished.',
   101: 'This code is sent in response to an Upgrade: request header by the client and indicates the protocol the server is switching to. It was introduced to allow migration to an incompatible protocol version, and it is not in common use.',
-
   // 200s
-
   200: 'The request has succeeded.',
   201: 'The request has succeeded and a new resource has been created as a result. This is typically the response sent after POST requests, or some PUT requests.',
   202: 'The request has been received but not yet acted upon. It is non-committal, meaning that there is no way in HTTP to later send an asynchronous response indicating the outcome of processing the request. It is intended for cases where another process or server handles the request, or for batch processing.',
@@ -428,9 +344,7 @@ export const RESPONSE_CODE_DESCRIPTIONS = {
   207: 'A Multi-Status response conveys information about multiple resources in situations where multiple status codes might be appropriate.',
   208: 'Used inside a DAV: propstat response element to avoid enumerating the internal members of multiple bindings to the same collection repeatedly.',
   226: 'The server has fulfilled a GET request for the resource, and the response is a representation of the result of one or more instance-manipulations applied to the current instance.',
-
   // 300s
-
   300: 'The request has more than one possible responses. User-agent or user should choose one of them. There is no standardized way to choose one of the responses.',
   301: 'This response code means that URI of requested resource has been changed. Probably, new URI would be given in the response.',
   302: 'This response code means that URI of requested resource has been changed temporarily. New changes in the URI might be made in the future. Therefore, this same URI should be used by the client in future requests.',
@@ -440,9 +354,7 @@ export const RESPONSE_CODE_DESCRIPTIONS = {
   306: 'This response code is no longer used and is just reserved currently. It was used in a previous version of the HTTP 1.1 specification.',
   307: 'Server sent this response to directing client to get requested resource to another URI with same method that used prior request. This has the same semantic than the 302 Found HTTP response code, with the exception that the user agent must not change the HTTP method used: if a POST was used in the first request, a POST must be used in the second request.',
   308: 'This means that the resource is now permanently located at another URI, specified by the Location: HTTP Response header. This has the same semantics as the 301 Moved Permanently HTTP response code, with the exception that the user agent must not change the HTTP method used: if a POST was used in the first request, a POST must be used in the second request.',
-
   // 400s
-
   400: 'This response means that the server could not understand the request due to invalid syntax.',
   401: 'Authentication is needed to get the requested response. This is similar to 403, but is different in that authentication is possible.',
   402: 'This response code is reserved for future use. Initial aim for creating this code was using it for digital payment systems, but it is not used currently.',
@@ -471,9 +383,7 @@ export const RESPONSE_CODE_DESCRIPTIONS = {
   429: 'The user has sent too many requests in a given amount of time ("rate limiting").',
   431: 'The server is unwilling to process the request because its header fields are too large. The request MAY be resubmitted after reducing the size of the request header fields.',
   451: 'The user requests an illegal resource, such as a web page censored by a government.',
-
   // 500s
-
   500: "The server has encountered a situation it doesn't know how to handle.",
   501: 'The request method is not supported by the server and cannot be handled. The only methods that servers are required to support (and therefore that must not return this code) are GET and HEAD.',
   502: 'This error response means that the server, while working as a gateway to get a response needed to handle the request, got an invalid response.',
@@ -490,14 +400,10 @@ export const RESPONSE_CODE_DESCRIPTIONS = {
 export const RESPONSE_CODE_REASONS = {
   // Special
   [STATUS_CODE_PLUGIN_ERROR]: 'Plugin Error',
-
   // 100s
-
   100: 'Continue',
   101: 'Switching Protocols',
-
   // 200s
-
   200: 'OK',
   201: 'Created',
   202: 'Accepted',
@@ -508,9 +414,7 @@ export const RESPONSE_CODE_REASONS = {
   207: 'Multi-Status',
   208: 'Already Reported',
   226: 'IM Used',
-
   // 300s
-
   300: 'Multiple Choices',
   301: 'Moved Permanently',
   302: 'Found',
@@ -520,9 +424,7 @@ export const RESPONSE_CODE_REASONS = {
   306: 'Switch Proxy',
   307: 'Temporary Redirect',
   308: 'Permanent Redirect',
-
   // 400s
-
   400: 'Bad Request',
   401: 'Unauthorized',
   402: 'Payment Required',
@@ -552,9 +454,7 @@ export const RESPONSE_CODE_REASONS = {
   429: 'Too Many Requests',
   431: 'Request Header Fields Too Large',
   451: 'Unavailable For Legal Reasons',
-
   // 500s
-
   500: 'Internal Server Error',
   501: 'Not Implemented',
   502: 'Bad Gateway',
diff --git a/packages/insomnia-app/app/common/database.js b/packages/insomnia-app/app/common/database.js
deleted file mode 100644
index 292167ebaf..0000000000
--- a/packages/insomnia-app/app/common/database.js
+++ /dev/null
@@ -1,812 +0,0 @@
-// @flow
-import type { BaseModel } from '../models/index';
-import * as models from '../models/index';
-import electron from 'electron';
-import NeDB from 'nedb';
-import fsPath from 'path';
-import { DB_PERSIST_INTERVAL } from './constants';
-import * as uuid from 'uuid';
-import { generateId, getDataDirectory } from './misc';
-import { mustGetModel } from '../models';
-import type { Workspace } from '../models/workspace';
-
-export const CHANGE_INSERT = 'insert';
-export const CHANGE_UPDATE = 'update';
-export const CHANGE_REMOVE = 'remove';
-
-const database = {};
-const db = ({
-  _empty: true,
-}: Object);
-
-// ~~~~~~~ //
-// HELPERS //
-// ~~~~~~~ //
-
-function allTypes() {
-  return Object.keys(db);
-}
-
-function getDBFilePath(modelType) {
-  // NOTE: Do not EVER change this. EVER!
-  return fsPath.join(getDataDirectory(), `insomnia.${modelType}.db`);
-}
-
-export async function initClient() {
-  electron.ipcRenderer.on('db.changes', async (e, changes) => {
-    for (const fn of changeListeners) {
-      await fn(changes);
-    }
-  });
-  console.log('[db] Initialized DB client');
-}
-
-export async function init(
-  types: Array<string>,
-  config: Object = {},
-  forceReset: boolean = false,
-  consoleLog: () => void = console.log,
-) {
-  if (forceReset) {
-    changeListeners = [];
-    for (const attr of Object.keys(db)) {
-      if (attr === '_empty') {
-        continue;
-      }
-
-      delete db[attr];
-    }
-  }
-
-  // Fill in the defaults
-  for (const modelType of types) {
-    if (db[modelType]) {
-      consoleLog(`[db] Already initialized DB.${modelType}`);
-      continue;
-    }
-
-    const filePath = getDBFilePath(modelType);
-    const collection = new NeDB(
-      Object.assign(
-        {
-          autoload: true,
-          filename: filePath,
-          corruptAlertThreshold: 0.9,
-        },
-        config,
-      ),
-    );
-
-    collection.persistence.setAutocompactionInterval(DB_PERSIST_INTERVAL);
-
-    db[modelType] = collection;
-  }
-
-  delete db._empty;
-
-  electron.ipcMain.on('db.fn', async (e, fnName, replyChannel, ...args) => {
-    try {
-      const result = await database[fnName](...args);
-      e.sender.send(replyChannel, null, result);
-    } catch (err) {
-      e.sender.send(replyChannel, { message: err.message, stack: err.stack });
-    }
-  });
-
-  // NOTE: Only repair the DB if we're not running in memory. Repairing here causes tests to
-  // hang indefinitely for some reason.
-  // TODO: Figure out why this makes tests hang
-  if (!config.inMemoryOnly) {
-    await _repairDatabase();
-  }
-
-  if (!config.inMemoryOnly) {
-    consoleLog(`[db] Initialized DB at ${getDBFilePath('$TYPE')}`);
-  }
-
-  // This isn't the best place for this but w/e
-  // Listen for response deletions and delete corresponding response body files
-  onChange(async changes => {
-    for (const [type, doc] of changes) {
-      const m: Object | null = models.getModel(doc.type);
-
-      if (!m) {
-        continue;
-      }
-
-      if (type === CHANGE_REMOVE && typeof m.hookRemove === 'function') {
-        try {
-          await m.hookRemove(doc, consoleLog);
-        } catch (err) {
-          consoleLog(`[db] Delete hook failed for ${type} ${doc._id}: ${err.message}`);
-        }
-      }
-
-      if (type === CHANGE_INSERT && typeof m.hookInsert === 'function') {
-        try {
-          await m.hookInsert(doc, consoleLog);
-        } catch (err) {
-          consoleLog(`[db] Insert hook failed for ${type} ${doc._id}: ${err.message}`);
-        }
-      }
-
-      if (type === CHANGE_UPDATE && typeof m.hookUpdate === 'function') {
-        try {
-          await m.hookUpdate(doc, consoleLog);
-        } catch (err) {
-          consoleLog(`[db] Update hook failed for ${type} ${doc._id}: ${err.message}`);
-        }
-      }
-    }
-  });
-
-  for (const model of models.all()) {
-    if (typeof model.hookDatabaseInit === 'function') {
-      await model.hookDatabaseInit(consoleLog);
-    }
-  }
-}
-
-// ~~~~~~~~~~~~~~~~ //
-// Change Listeners //
-// ~~~~~~~~~~~~~~~~ //
-
-let bufferingChanges = false;
-let bufferChangesId = 1;
-let changeBuffer = [];
-let changeListeners = [];
-
-export function onChange(callback: Function): void {
-  changeListeners.push(callback);
-}
-
-export function offChange(callback: Function): void {
-  changeListeners = changeListeners.filter(l => l !== callback);
-}
-
-/** buffers database changes and returns a buffer id */
-export const bufferChanges = (database.bufferChanges = async function(
-  millis: number = 1000,
-): Promise<number> {
-  if (db._empty) return _send('bufferChanges', ...arguments);
-
-  bufferingChanges = true;
-  setTimeout(database.flushChanges, millis);
-
-  return ++bufferChangesId;
-});
-
-/** buffers database changes and returns a buffer id */
-export const bufferChangesIndefinitely = (database.bufferChangesIndefinitely = async function(): Promise<number> {
-  if (db._empty) return _send('bufferChangesIndefinitely', ...arguments);
-
-  bufferingChanges = true;
-
-  return ++bufferChangesId;
-});
-
-export const flushChangesAsync = (database.flushChangesAsync = async function(
-  fake: boolean = false,
-) {
-  process.nextTick(async () => {
-    await flushChanges(0, fake);
-  });
-});
-
-export const flushChanges = (database.flushChanges = async function(
-  id: number = 0,
-  fake: boolean = false,
-) {
-  if (db._empty) return _send('flushChanges', ...arguments);
-
-  // Only flush if ID is 0 or the current flush ID is the same as passed
-  if (id !== 0 && bufferChangesId !== id) {
-    return;
-  }
-
-  bufferingChanges = false;
-  const changes = [...changeBuffer];
-  changeBuffer = [];
-
-  if (changes.length === 0) {
-    // No work to do
-    return;
-  }
-
-  if (fake) {
-    console.log(`[db] Dropped ${changes.length} changes.`);
-    return;
-  }
-
-  // Notify local listeners too
-  for (const fn of changeListeners) {
-    await fn(changes);
-  }
-
-  // Notify remote listeners
-  const windows = electron.BrowserWindow.getAllWindows();
-  for (const window of windows) {
-    window.webContents.send('db.changes', changes);
-  }
-});
-
-async function notifyOfChange(event: string, doc: BaseModel, fromSync: boolean): Promise<void> {
-  changeBuffer.push([event, doc, fromSync]);
-
-  // Flush right away if we're not buffering
-  if (!bufferingChanges) {
-    await database.flushChanges();
-  }
-}
-
-// ~~~~~~~ //
-// Helpers //
-// ~~~~~~~ //
-
-export const getMostRecentlyModified = (database.getMostRecentlyModified = async function<T>(
-  type: string,
-  query: Object = {},
-): Promise<T | null> {
-  if (db._empty) return _send('getMostRecentlyModified', ...arguments);
-
-  const docs = await database.findMostRecentlyModified(type, query, 1);
-  return docs.length ? docs[0] : null;
-});
-
-export const findMostRecentlyModified = (database.findMostRecentlyModified = async function<T>(
-  type: string,
-  query: Object = {},
-  limit: number | null = null,
-): Promise<Array<T>> {
-  if (db._empty) return _send('findMostRecentlyModified', ...arguments);
-
-  return new Promise(resolve => {
-    db[type]
-      .find(query)
-      .sort({ modified: -1 })
-      .limit(limit)
-      .exec(async (err, rawDocs) => {
-        if (err) {
-          console.warn('[db] Failed to find docs', err);
-          resolve([]);
-          return;
-        }
-
-        const docs = [];
-        for (const rawDoc of rawDocs) {
-          docs.push(await models.initModel(type, rawDoc));
-        }
-
-        resolve(docs);
-      });
-  });
-});
-
-export const find = (database.find = async function<T: BaseModel>(
-  type: string,
-  query: Object = {},
-  sort: Object = { created: 1 },
-): Promise<Array<T>> {
-  if (db._empty) return _send('find', ...arguments);
-
-  return new Promise((resolve, reject) => {
-    db[type]
-      .find(query)
-      .sort(sort)
-      .exec(async (err, rawDocs) => {
-        if (err) {
-          return reject(err);
-        }
-
-        const docs = [];
-        for (const rawDoc of rawDocs) {
-          docs.push(await models.initModel(type, rawDoc));
-        }
-
-        resolve(docs);
-      });
-  });
-});
-
-export const all = (database.all = async function<T: BaseModel>(type: string): Promise<Array<T>> {
-  if (db._empty) return _send('all', ...arguments);
-
-  return database.find(type);
-});
-
-export const getWhere = (database.getWhere = async function<T: BaseModel>(
-  type: string,
-  query: Object,
-): Promise<T | null> {
-  if (db._empty) return _send('getWhere', ...arguments);
-
-  const docs = await database.find(type, query);
-  return docs.length ? docs[0] : null;
-});
-
-export const get = (database.get = async function<T: BaseModel>(
-  type: string,
-  id: string,
-): Promise<T | null> {
-  if (db._empty) return _send('get', ...arguments);
-
-  // Short circuit IDs used to represent nothing
-  if (!id || id === 'n/a') {
-    return null;
-  } else {
-    return database.getWhere(type, { _id: id });
-  }
-});
-
-export const count = (database.count = async function(
-  type: string,
-  query: Object = {},
-): Promise<number> {
-  if (db._empty) return _send('count', ...arguments);
-
-  return new Promise((resolve, reject) => {
-    db[type].count(query, (err, count) => {
-      if (err) {
-        return reject(err);
-      }
-
-      resolve(count);
-    });
-  });
-});
-
-export const upsert = (database.upsert = async function(
-  doc: BaseModel,
-  fromSync: boolean = false,
-): Promise<BaseModel> {
-  if (db._empty) return _send('upsert', ...arguments);
-
-  const existingDoc = await database.get(doc.type, doc._id);
-  if (existingDoc) {
-    return database.update(doc, fromSync);
-  } else {
-    return database.insert(doc, fromSync);
-  }
-});
-
-export const insert = (database.insert = async function<T: BaseModel>(
-  doc: T,
-  fromSync: boolean = false,
-  initializeModel: boolean = true,
-): Promise<T> {
-  if (db._empty) return _send('insert', ...arguments);
-
-  return new Promise(async (resolve, reject) => {
-    let docWithDefaults;
-    try {
-      if (initializeModel) {
-        docWithDefaults = await models.initModel(doc.type, doc);
-      } else {
-        docWithDefaults = doc;
-      }
-    } catch (err) {
-      return reject(err);
-    }
-
-    db[doc.type].insert(docWithDefaults, (err, newDoc) => {
-      if (err) {
-        return reject(err);
-      }
-
-      resolve(newDoc);
-
-      // NOTE: This needs to be after we resolve
-      notifyOfChange(CHANGE_INSERT, newDoc, fromSync);
-    });
-  });
-});
-
-export const update = (database.update = async function<T: BaseModel>(
-  doc: T,
-  fromSync: boolean = false,
-): Promise<T> {
-  if (db._empty) return _send('update', ...arguments);
-
-  return new Promise(async (resolve, reject) => {
-    let docWithDefaults;
-    try {
-      docWithDefaults = await models.initModel(doc.type, doc);
-    } catch (err) {
-      return reject(err);
-    }
-
-    db[doc.type].update({ _id: docWithDefaults._id }, docWithDefaults, err => {
-      if (err) {
-        return reject(err);
-      }
-
-      resolve(docWithDefaults);
-
-      // NOTE: This needs to be after we resolve
-      notifyOfChange(CHANGE_UPDATE, docWithDefaults, fromSync);
-    });
-  });
-});
-
-export const remove = (database.remove = async function<T: BaseModel>(
-  doc: T,
-  fromSync: boolean = false,
-): Promise<void> {
-  if (db._empty) return _send('remove', ...arguments);
-
-  const flushId = await database.bufferChanges();
-
-  const docs = await database.withDescendants(doc);
-  const docIds = docs.map(d => d._id);
-  const types = [...new Set(docs.map(d => d.type))];
-
-  // Don't really need to wait for this to be over;
-  types.map(t => db[t].remove({ _id: { $in: docIds } }, { multi: true }));
-
-  docs.map(d => notifyOfChange(CHANGE_REMOVE, d, fromSync));
-
-  await database.flushChanges(flushId);
-});
-
-/** Removes entries without removing their children */
-export const unsafeRemove = (database.unsafeRemove = async function<T: BaseModel>(
-  doc: T,
-  fromSync: boolean = false,
-): Promise<void> {
-  if (db._empty) return _send('unsafeRemove', ...arguments);
-
-  db[doc.type].remove({ _id: doc._id });
-  notifyOfChange(CHANGE_REMOVE, doc, fromSync);
-});
-
-export const removeWhere = (database.removeWhere = async function(
-  type: string,
-  query: Object,
-): Promise<void> {
-  if (db._empty) return _send('removeWhere', ...arguments);
-
-  const flushId = await database.bufferChanges();
-
-  for (const doc of await database.find(type, query)) {
-    const docs = await database.withDescendants(doc);
-    const docIds = docs.map(d => d._id);
-    const types = [...new Set(docs.map(d => d.type))];
-
-    // Don't really need to wait for this to be over;
-    types.map(t => db[t].remove({ _id: { $in: docIds } }, { multi: true }));
-
-    docs.map(d => notifyOfChange(CHANGE_REMOVE, d, false));
-  }
-
-  await database.flushChanges(flushId);
-});
-
-export const batchModifyDocs = (database.batchModifyDocs = async function(operations: {
-  upsert: Array<Object>,
-  remove: Array<Object>,
-}): Promise<void> {
-  if (db._empty) return _send('batchModifyDocs', ...arguments);
-
-  const flushId = await bufferChanges();
-
-  const promisesUpserted = [];
-  const promisesDeleted = [];
-  for (const doc: BaseModel of operations.upsert) {
-    promisesUpserted.push(upsert(doc, true));
-  }
-
-  for (const doc: BaseModel of operations.remove) {
-    promisesDeleted.push(unsafeRemove(doc, true));
-  }
-
-  // Perform from least to most dangerous
-  await Promise.all(promisesUpserted);
-  await Promise.all(promisesDeleted);
-
-  await flushChanges(flushId);
-});
-
-// ~~~~~~~~~~~~~~~~~~~ //
-// DEFAULT MODEL STUFF //
-// ~~~~~~~~~~~~~~~~~~~ //
-
-export async function docUpdate<T: BaseModel>(
-  originalDoc: T,
-  ...patches: Array<Object>
-): Promise<T> {
-  // No need to re-initialize the model during update; originalDoc will be in a valid state by virtue of loading
-  const doc = await models.initModel(
-    originalDoc.type,
-    originalDoc,
-
-    // NOTE: This is before `patch` because we want `patch.modified` to win if it has it
-    { modified: Date.now() },
-
-    ...patches,
-  );
-
-  return database.update(doc);
-}
-
-export async function docCreate<T: BaseModel>(type: string, ...patches: Array<Object>): Promise<T> {
-  const doc = await models.initModel(
-    type,
-    ...patches,
-
-    // Fields that the user can't touch
-    { type: type },
-  );
-
-  return database.insert(doc);
-}
-
-// ~~~~~~~ //
-// GENERAL //
-// ~~~~~~~ //
-
-export const withDescendants = (database.withDescendants = async function(
-  doc: BaseModel | null,
-  stopType: string | null = null,
-): Promise<Array<BaseModel>> {
-  if (db._empty) return _send('withDescendants', ...arguments);
-
-  let docsToReturn = doc ? [doc] : [];
-
-  async function next(docs: Array<BaseModel | null>): Promise<Array<BaseModel>> {
-    let foundDocs = [];
-
-    for (const d of docs) {
-      if (stopType && d && d.type === stopType) {
-        continue;
-      }
-
-      const promises = [];
-      for (const type of allTypes()) {
-        // If the doc is null, we want to search for parentId === null
-        const parentId = d ? d._id : null;
-        promises.push(database.find(type, { parentId }));
-      }
-
-      for (const more of await Promise.all(promises)) {
-        foundDocs = [...foundDocs, ...more];
-      }
-    }
-
-    if (foundDocs.length === 0) {
-      // Didn't find anything. We're done
-      return docsToReturn;
-    }
-
-    // Continue searching for children
-    docsToReturn = [...docsToReturn, ...foundDocs];
-    return next(foundDocs);
-  }
-
-  return next([doc]);
-});
-
-export const withAncestors = (database.withAncestors = async function(
-  doc: BaseModel | null,
-  types: Array<string> = allTypes(),
-): Promise<Array<BaseModel>> {
-  if (db._empty) return _send('withAncestors', ...arguments);
-
-  if (!doc) {
-    return [];
-  }
-
-  let docsToReturn = doc ? [doc] : [];
-
-  async function next(docs: Array<BaseModel>): Promise<Array<BaseModel>> {
-    const foundDocs = [];
-    for (const d: BaseModel of docs) {
-      for (const type of types) {
-        // If the doc is null, we want to search for parentId === null
-        const another = await database.get(type, d.parentId);
-        another && foundDocs.push(another);
-      }
-    }
-
-    if (foundDocs.length === 0) {
-      // Didn't find anything. We're done
-      return docsToReturn;
-    }
-
-    // Continue searching for children
-    docsToReturn = [...docsToReturn, ...foundDocs];
-    return next(foundDocs);
-  }
-
-  return next([doc]);
-});
-
-export const duplicate = (database.duplicate = async function<T: BaseModel>(
-  originalDoc: T,
-  patch: Object = {},
-): Promise<T> {
-  if (db._empty) return _send('duplicate', ...arguments);
-
-  const flushId = await database.bufferChanges();
-
-  async function next<T: BaseModel>(docToCopy: T, patch: Object): Promise<T> {
-    const model = mustGetModel(docToCopy.type);
-
-    const overrides = {
-      _id: generateId(model.prefix),
-      modified: Date.now(),
-      created: Date.now(),
-      type: docToCopy.type, // Ensure this is not overwritten by the patch
-    };
-
-    // 1. Copy the doc
-    const newDoc = Object.assign({}, docToCopy, patch, overrides);
-
-    // Don't initialize the model during insert, and simply duplicate
-    const createdDoc = await database.insert(newDoc, false, false);
-
-    // 2. Get all the children
-    for (const type of allTypes()) {
-      // Note: We never want to duplicate a response
-      if (!models.canDuplicate(type)) {
-        continue;
-      }
-
-      const parentId = docToCopy._id;
-      const children = await database.find(type, { parentId });
-      for (const doc of children) {
-        await next(doc, { parentId: createdDoc._id });
-      }
-    }
-
-    return createdDoc;
-  }
-
-  const createdDoc = await next(originalDoc, patch);
-
-  await database.flushChanges(flushId);
-
-  return createdDoc;
-});
-
-// ~~~~~~~ //
-// Helpers //
-// ~~~~~~~ //
-
-async function _send<T>(fnName: string, ...args: Array<any>): Promise<T> {
-  return new Promise((resolve, reject) => {
-    const replyChannel = `db.fn.reply:${uuid.v4()}`;
-    electron.ipcRenderer.send('db.fn', fnName, replyChannel, ...args);
-    electron.ipcRenderer.once(replyChannel, (e, err, result) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(result);
-      }
-    });
-  });
-}
-
-/**
- * Run various database repair scripts
- */
-export async function _repairDatabase() {
-  console.log('[fix] Running database repairs');
-  for (const workspace of await find(models.workspace.type)) {
-    await _repairBaseEnvironments(workspace);
-    await _fixMultipleCookieJars(workspace);
-    await _applyApiSpecName(workspace);
-  }
-
-  for (const gitRepository of await find(models.gitRepository.type)) {
-    await _fixOldGitURIs(gitRepository);
-  }
-}
-
-/**
- * This function ensures that apiSpec exists for each workspace
- * If the filename on the apiSpec is not set or is the default initialized name
- * It will apply the workspace name to it
- */
-async function _applyApiSpecName(workspace: Workspace) {
-  const apiSpec = await models.apiSpec.getByParentId(workspace._id);
-
-  if (!apiSpec.fileName || apiSpec.fileName === models.apiSpec.init().fileName) {
-    await models.apiSpec.update(apiSpec, { fileName: workspace.name });
-  }
-}
-
-/**
- * This function repairs workspaces that have multiple base environments. Since a workspace
- * can only have one, this function walks over all base environments, merges the data, and
- * moves all children as well.
- */
-async function _repairBaseEnvironments(workspace) {
-  const baseEnvironments = await find(models.environment.type, {
-    parentId: workspace._id,
-  });
-
-  // Nothing to do here
-  if (baseEnvironments.length <= 1) {
-    return;
-  }
-
-  const chosenBase = baseEnvironments[0];
-  for (const baseEnvironment of baseEnvironments) {
-    if (baseEnvironment._id === chosenBase._id) {
-      continue;
-    }
-
-    chosenBase.data = Object.assign(baseEnvironment.data, chosenBase.data);
-    const subEnvironments = await find(models.environment.type, {
-      parentId: baseEnvironment._id,
-    });
-
-    for (const subEnvironment of subEnvironments) {
-      await docUpdate(subEnvironment, { parentId: chosenBase._id });
-    }
-
-    // Remove unnecessary base env
-    await remove(baseEnvironment);
-  }
-
-  // Update remaining base env
-  await update(chosenBase);
-
-  console.log(`[fix] Merged ${baseEnvironments.length} base environments under ${workspace.name}`);
-}
-
-/**
- * This function repairs workspaces that have multiple cookie jars. Since a workspace
- * can only have one, this function walks over all jars and merges them and their cookies
- * together.
- */
-async function _fixMultipleCookieJars(workspace) {
-  const cookieJars = await find(models.cookieJar.type, {
-    parentId: workspace._id,
-  });
-
-  // Nothing to do here
-  if (cookieJars.length <= 1) {
-    return;
-  }
-
-  const chosenJar = cookieJars[0];
-  for (const cookieJar of cookieJars) {
-    if (cookieJar._id === chosenJar._id) {
-      continue;
-    }
-
-    for (const cookie of cookieJar.cookies) {
-      if (chosenJar.cookies.find(c => c.id === cookie.id)) {
-        continue;
-      }
-
-      chosenJar.cookies.push(cookie);
-    }
-
-    // Remove unnecessary jar
-    await remove(cookieJar);
-  }
-
-  // Update remaining jar
-  await update(chosenJar);
-
-  console.log(`[fix] Merged ${cookieJars.length} cookie jars under ${workspace.name}`);
-}
-
-// Append .git to old git URIs to mimic previous isomorphic-git behaviour
-async function _fixOldGitURIs(doc: GitRepository) {
-  if (!doc.uriNeedsMigration) {
-    return;
-  }
-
-  if (!doc.uri.endsWith('.git')) {
-    doc.uri += '.git';
-  }
-
-  doc.uriNeedsMigration = false;
-
-  await update(doc);
-
-  console.log(`[fix] Fixed git URI for ${doc._id}`);
-}
diff --git a/packages/insomnia-app/app/common/database.ts b/packages/insomnia-app/app/common/database.ts
new file mode 100644
index 0000000000..a206de7e5f
--- /dev/null
+++ b/packages/insomnia-app/app/common/database.ts
@@ -0,0 +1,830 @@
+/* eslint-disable prefer-rest-params -- don't want to change ...arguments usage for these sensitive functions without more testing */
+import type { BaseModel } from '../models/index';
+import * as models from '../models/index';
+import electron from 'electron';
+import NeDB from 'nedb';
+import fsPath from 'path';
+import { DB_PERSIST_INTERVAL } from './constants';
+import * as uuid from 'uuid';
+import { generateId } from './misc';
+import { getDataDirectory } from './electron-helpers';
+import { mustGetModel } from '../models';
+import type { Workspace } from '../models/workspace';
+import { GitRepository } from '../models/git-repository';
+import { CookieJar } from '../models/cookie-jar';
+import { Environment } from '../models/environment';
+
+export interface Query {
+  _id?: string | SpecificQuery;
+  parentId?: string | null;
+  plugin?: string;
+  key?: string;
+  environmentId?: string | null;
+  protoFileId?: string;
+}
+
+type Sort = Record<string, any>;
+
+interface Operation {
+  upsert?: Array<BaseModel>;
+  remove?: Array<BaseModel>;
+}
+
+export interface SpecificQuery {
+  $gt?: number;
+  $in?: Array<string>;
+  $nin?: Array<string>;
+}
+
+export type ModelQuery<T extends BaseModel> = Partial<Record<keyof T, SpecificQuery>>;
+
+export const database = {
+  all: async function<T extends BaseModel>(type: string) {
+    if (db._empty) return _send<Array<T>>('all', ...arguments);
+    return database.find<T>(type);
+  },
+
+  batchModifyDocs: async function(operation: Operation) {
+    if (db._empty) return _send<void>('batchModifyDocs', ...arguments);
+    const flushId = await database.bufferChanges();
+    const promisesUpserted: Array<Promise<BaseModel>> = [];
+    const promisesDeleted: Array<Promise<void>> = [];
+
+    // @ts-expect-error -- TSCONVERSION upsert operations are optional
+    for (const doc of operation.upsert) {
+      promisesUpserted.push(database.upsert(doc, true));
+    }
+
+    // @ts-expect-error -- TSCONVERSION remove operations are optional
+    for (const doc of operation.remove) {
+      promisesDeleted.push(database.unsafeRemove(doc, true));
+    }
+
+    // Perform from least to most dangerous
+    await Promise.all(promisesUpserted);
+    await Promise.all(promisesDeleted);
+
+    await database.flushChanges(flushId);
+  },
+
+  /** buffers database changes and returns a buffer id */
+  bufferChanges: async function(millis = 1000) {
+    if (db._empty) return _send<number>('bufferChanges', ...arguments);
+    bufferingChanges = true;
+    setTimeout(database.flushChanges, millis);
+    return ++bufferChangesId;
+  },
+
+  /** buffers database changes and returns a buffer id */
+  bufferChangesIndefinitely: async function() {
+    if (db._empty) return _send<number>('bufferChangesIndefinitely', ...arguments);
+    bufferingChanges = true;
+    return ++bufferChangesId;
+  },
+
+  CHANGE_INSERT: 'insert',
+
+  CHANGE_UPDATE: 'update',
+
+  CHANGE_REMOVE: 'remove',
+
+  count: async function<T extends BaseModel>(type: string, query: Query = {}) {
+    if (db._empty) return _send<number>('count', ...arguments);
+    return new Promise<number>((resolve, reject) => {
+      (db[type] as NeDB<T>).count(query, (err, count) => {
+        if (err) {
+          return reject(err);
+        }
+
+        resolve(count);
+      });
+    });
+  },
+
+  docCreate: async <T extends BaseModel>(type: string, ...patches: Array<Patch<T>>) => {
+    const doc = await models.initModel<T>(
+      type,
+      ...patches,
+      // Fields that the user can't touch
+      {
+        type: type,
+      },
+    );
+    return database.insert<T>(doc);
+  },
+
+  docUpdate: async <T extends BaseModel>(originalDoc: T, ...patches: Array<Patch<T>>) => {
+    // No need to re-initialize the model during update; originalDoc will be in a valid state by virtue of loading
+    const doc = await models.initModel<T>(
+      originalDoc.type,
+      originalDoc,
+
+      // NOTE: This is before `patches` because we want `patch.modified` to win if it has it
+      {
+        modified: Date.now(),
+      },
+      ...patches,
+    );
+    return database.update<T>(doc);
+  },
+
+  duplicate: async function<T extends BaseModel>(originalDoc: T, patch: Patch<T> = {}) {
+    if (db._empty) return _send<T>('duplicate', ...arguments);
+    const flushId = await database.bufferChanges();
+
+    async function next<T extends BaseModel>(docToCopy: T, patch: Patch<T>) {
+      const model = mustGetModel(docToCopy.type);
+      const overrides = {
+        _id: generateId(model.prefix),
+        modified: Date.now(),
+        created: Date.now(),
+        type: docToCopy.type, // Ensure this is not overwritten by the patch
+      };
+
+      // 1. Copy the doc
+      const newDoc = Object.assign({}, docToCopy, patch, overrides);
+
+      // Don't initialize the model during insert, and simply duplicate
+      const createdDoc = await database.insert(newDoc, false, false);
+
+      // 2. Get all the children
+      for (const type of allTypes()) {
+        // Note: We never want to duplicate a response
+        if (!models.canDuplicate(type)) {
+          continue;
+        }
+
+        const parentId = docToCopy._id;
+        const children = await database.find(type, { parentId });
+
+        for (const doc of children) {
+          await next(doc, { parentId: createdDoc._id });
+        }
+      }
+
+      return createdDoc;
+    }
+
+    const createdDoc = await next(originalDoc, patch);
+    await database.flushChanges(flushId);
+    return createdDoc;
+  },
+
+  find: async function<T extends BaseModel>(
+    type: string,
+    query: Query | string = {},
+    sort: Sort = { created: 1 },
+  ) {
+    if (db._empty) return _send<Array<T>>('find', ...arguments);
+    return new Promise<Array<T>>((resolve, reject) => {
+      (db[type] as NeDB<T>)
+        .find(query)
+        .sort(sort)
+        .exec(async (err, rawDocs) => {
+          if (err) {
+            reject(err);
+            return;
+          }
+
+          const docs: Array<T> = [];
+
+          for (const rawDoc of rawDocs) {
+            docs.push(await models.initModel(type, rawDoc));
+          }
+
+          resolve(docs);
+        });
+    });
+  },
+
+  findMostRecentlyModified: async function<T extends BaseModel>(
+    type: string,
+    query: Query = {},
+    limit: number | null = null,
+  ) {
+    if (db._empty) return _send<Array<T>>('findMostRecentlyModified', ...arguments);
+    return new Promise<Array<T>>(resolve => {
+      (db[type] as NeDB<T>)
+        .find(query)
+        .sort({
+          modified: -1,
+        })
+        // @ts-expect-error -- TSCONVERSION limit shouldn't be applied if it's null, or default to something that means no-limit
+        .limit(limit)
+        .exec(async (err, rawDocs) => {
+          if (err) {
+            console.warn('[db] Failed to find docs', err);
+            resolve([]);
+            return;
+          }
+
+          const docs: Array<T> = [];
+
+          for (const rawDoc of rawDocs) {
+            docs.push(await models.initModel(type, rawDoc));
+          }
+
+          resolve(docs);
+        });
+    });
+  },
+
+  flushChanges: async function(id = 0, fake = false) {
+    if (db._empty) return _send<void>('flushChanges', ...arguments);
+
+    // Only flush if ID is 0 or the current flush ID is the same as passed
+    if (id !== 0 && bufferChangesId !== id) {
+      return;
+    }
+
+    bufferingChanges = false;
+    const changes = [...changeBuffer];
+    changeBuffer = [];
+
+    if (changes.length === 0) {
+      // No work to do
+      return;
+    }
+
+    if (fake) {
+      console.log(`[db] Dropped ${changes.length} changes.`);
+      return;
+    }
+
+    // Notify local listeners too
+    for (const fn of changeListeners) {
+      await fn(changes);
+    }
+
+    // Notify remote listeners
+    const windows = electron.BrowserWindow.getAllWindows();
+
+    for (const window of windows) {
+      window.webContents.send('db.changes', changes);
+    }
+  },
+
+  flushChangesAsync: async (fake = false) => {
+    process.nextTick(async () => {
+      await database.flushChanges(0, fake);
+    });
+  },
+
+  get: async function<T extends BaseModel>(type: string, id?: string) {
+    if (db._empty) return _send<T>('get', ...arguments);
+
+    // Short circuit IDs used to represent nothing
+    if (!id || id === 'n/a') {
+      return null;
+    } else {
+      return database.getWhere<T>(type, { _id: id });
+    }
+  },
+
+  getMostRecentlyModified: async function<T extends BaseModel>(type: string, query: Query = {}) {
+    if (db._empty) return _send<T>('getMostRecentlyModified', ...arguments);
+    const docs = await database.findMostRecentlyModified<T>(type, query, 1);
+    return docs.length ? docs[0] : null;
+  },
+
+  getWhere: async function<T extends BaseModel>(type: string, query: ModelQuery<T> | Query) {
+    if (db._empty) return _send<T>('getWhere', ...arguments);
+    // @ts-expect-error -- TSCONVERSION type narrowing needed
+    const docs = await database.find<T>(type, query);
+    return docs.length ? docs[0] : null;
+  },
+
+  init: async (
+    types: Array<string>,
+    config: NeDB.DataStoreOptions = {},
+    forceReset = false,
+    consoleLog: typeof console.log = console.log,
+  ) => {
+    if (forceReset) {
+      changeListeners = [];
+
+      for (const attr of Object.keys(db)) {
+        if (attr === '_empty') {
+          continue;
+        }
+
+        delete db[attr];
+      }
+    }
+
+    // Fill in the defaults
+    for (const modelType of types) {
+      if (db[modelType]) {
+        consoleLog(`[db] Already initialized DB.${modelType}`);
+        continue;
+      }
+
+      const filePath = getDBFilePath(modelType);
+      const collection = new NeDB(
+        Object.assign(
+          {
+            autoload: true,
+            filename: filePath,
+            corruptAlertThreshold: 0.9,
+          },
+          config,
+        ),
+      );
+      collection.persistence.setAutocompactionInterval(DB_PERSIST_INTERVAL);
+      db[modelType] = collection;
+    }
+
+    delete db._empty;
+    electron.ipcMain.on('db.fn', async (e, fnName, replyChannel, ...args) => {
+      try {
+        const result = await database[fnName](...args);
+        e.sender.send(replyChannel, null, result);
+      } catch (err) {
+        e.sender.send(replyChannel, {
+          message: err.message,
+          stack: err.stack,
+        });
+      }
+    });
+
+    // NOTE: Only repair the DB if we're not running in memory. Repairing here causes tests to hang indefinitely for some reason.
+    // TODO: Figure out why this makes tests hang
+    if (!config.inMemoryOnly) {
+      await _repairDatabase();
+      consoleLog(`[db] Initialized DB at ${getDBFilePath('$TYPE')}`);
+    }
+
+    // This isn't the best place for this but w/e
+    // Listen for response deletions and delete corresponding response body files
+    database.onChange(async changes => {
+      for (const [type, doc] of changes) {
+        // TODO(TSCONVERSION) what's returned here is the entire model implementation, not just a model
+        // The type definition will be a little confusing
+        const m: Record<string, any> | null = models.getModel(doc.type);
+
+        if (!m) {
+          continue;
+        }
+
+        if (type === database.CHANGE_REMOVE && typeof m.hookRemove === 'function') {
+          try {
+            await m.hookRemove(doc, consoleLog);
+          } catch (err) {
+            consoleLog(`[db] Delete hook failed for ${type} ${doc._id}: ${err.message}`);
+          }
+        }
+
+        if (type === database.CHANGE_INSERT && typeof m.hookInsert === 'function') {
+          try {
+            await m.hookInsert(doc, consoleLog);
+          } catch (err) {
+            consoleLog(`[db] Insert hook failed for ${type} ${doc._id}: ${err.message}`);
+          }
+        }
+
+        if (type === database.CHANGE_UPDATE && typeof m.hookUpdate === 'function') {
+          try {
+            await m.hookUpdate(doc, consoleLog);
+          } catch (err) {
+            consoleLog(`[db] Update hook failed for ${type} ${doc._id}: ${err.message}`);
+          }
+        }
+      }
+    });
+
+    for (const model of models.all()) {
+      // @ts-expect-error -- TSCONVERSION optional type on response
+      if (typeof model.hookDatabaseInit === 'function') {
+        // @ts-expect-error -- TSCONVERSION optional type on response
+        await model.hookDatabaseInit?.(consoleLog);
+      }
+    }
+  },
+
+  initClient: async () => {
+    electron.ipcRenderer.on('db.changes', async (_e, changes) => {
+      for (const fn of changeListeners) {
+        await fn(changes);
+      }
+    });
+    console.log('[db] Initialized DB client');
+  },
+
+  insert: async function<T extends BaseModel>(doc: T, fromSync = false, initializeModel = true) {
+    if (db._empty) return _send<T>('insert', ...arguments);
+    return new Promise<T>(async (resolve, reject) => {
+      let docWithDefaults: T | null = null;
+
+      try {
+        if (initializeModel) {
+          docWithDefaults = await models.initModel<T>(doc.type, doc);
+        } else {
+          docWithDefaults = doc;
+        }
+      } catch (err) {
+        return reject(err);
+      }
+
+      (db[doc.type] as NeDB<T>).insert(docWithDefaults, (err, newDoc: T) => {
+        if (err) {
+          return reject(err);
+        }
+
+        resolve(newDoc);
+        // NOTE: This needs to be after we resolve
+        notifyOfChange(database.CHANGE_INSERT, newDoc, fromSync);
+      });
+    });
+  },
+
+  onChange: (callback: ChangeListener) => {
+    changeListeners.push(callback);
+  },
+
+  offChange: (callback: ChangeListener) => {
+    changeListeners = changeListeners.filter(l => l !== callback);
+  },
+
+  remove: async function<T extends BaseModel>(doc: T, fromSync = false) {
+    if (db._empty) return _send<void>('remove', ...arguments);
+
+    const flushId = await database.bufferChanges();
+
+    const docs = await database.withDescendants(doc);
+    const docIds = docs.map(d => d._id);
+    const types = [...new Set(docs.map(d => d.type))];
+
+    // Don't really need to wait for this to be over;
+    types.map(t =>
+      db[t].remove(
+        {
+          _id: {
+            $in: docIds,
+          },
+        },
+        {
+          multi: true,
+        },
+      ),
+    );
+
+    docs.map(d => notifyOfChange(database.CHANGE_REMOVE, d, fromSync));
+    await database.flushChanges(flushId);
+  },
+
+  removeWhere: async function<T extends BaseModel>(type: string, query: Query) {
+    if (db._empty) return _send<void>('removeWhere', ...arguments);
+    const flushId = await database.bufferChanges();
+
+    for (const doc of await database.find<T>(type, query)) {
+      const docs = await database.withDescendants(doc);
+      const docIds = docs.map(d => d._id);
+      const types = [...new Set(docs.map(d => d.type))];
+
+      // Don't really need to wait for this to be over;
+      types.map(t =>
+        db[t].remove(
+          {
+            _id: {
+              $in: docIds,
+            },
+          },
+          {
+            multi: true,
+          },
+        ),
+      );
+      docs.map(d => notifyOfChange(database.CHANGE_REMOVE, d, false));
+    }
+
+    await database.flushChanges(flushId);
+  },
+
+  /** Removes entries without removing their children */
+  unsafeRemove: async function<T extends BaseModel>(doc: T, fromSync = false) {
+    if (db._empty) return _send<void>('unsafeRemove', ...arguments);
+
+    (db[doc.type] as NeDB<T>).remove({ _id: doc._id });
+    notifyOfChange(database.CHANGE_REMOVE, doc, fromSync);
+  },
+
+  update: async function<T extends BaseModel>(doc: T, fromSync = false) {
+    if (db._empty) return _send<T>('update', ...arguments);
+
+    return new Promise<T>(async (resolve, reject) => {
+      let docWithDefaults: T;
+
+      try {
+        docWithDefaults = await models.initModel<T>(doc.type, doc);
+      } catch (err) {
+        return reject(err);
+      }
+
+      (db[doc.type] as NeDB<T>).update(
+        { _id: docWithDefaults._id },
+        docWithDefaults,
+        // TODO(TSCONVERSION) see comment below, upsert can happen automatically as part of the update
+        // @ts-expect-error -- TSCONVERSION expects 4 args but only sent 3. Need to validate what UpdateOptions should be.
+        err => {
+          if (err) {
+            return reject(err);
+          }
+
+          resolve(docWithDefaults);
+          // NOTE: This needs to be after we resolve
+          notifyOfChange(database.CHANGE_UPDATE, docWithDefaults, fromSync);
+        },
+      );
+    });
+  },
+
+  // TODO(TSCONVERSION) the update method above can now take an upsert property
+  upsert: async function<T extends BaseModel>(doc: T, fromSync = false) {
+    if (db._empty) return _send<T>('upsert', ...arguments);
+    const existingDoc = await database.get<T>(doc.type, doc._id);
+
+    if (existingDoc) {
+      return database.update<T>(doc, fromSync);
+    } else {
+      return database.insert<T>(doc, fromSync);
+    }
+  },
+
+  withAncestors: async function<T extends BaseModel>(doc: T | null, types: Array<string> = allTypes()) {
+    if (db._empty) return _send<Array<T>>('withAncestors', ...arguments);
+
+    if (!doc) {
+      return [];
+    }
+
+    let docsToReturn: Array<T> = doc ? [doc] : [];
+
+    async function next(docs: Array<T>) {
+      const foundDocs: Array<T> = [];
+
+      for (const d of docs) {
+        for (const type of types) {
+          // If the doc is null, we want to search for parentId === null
+          const another = await database.get<T>(type, d.parentId);
+          another && foundDocs.push(another);
+        }
+      }
+
+      if (foundDocs.length === 0) {
+        // Didn't find anything. We're done
+        return docsToReturn;
+      }
+
+      // Continue searching for children
+      docsToReturn = [
+        ...docsToReturn,
+        ...foundDocs,
+      ];
+      return next(foundDocs);
+    }
+
+    return next([doc]);
+  },
+
+  withDescendants: async function<T extends BaseModel>(doc: T | null, stopType: string | null = null) {
+    if (db._empty) return _send<Array<T>>('withDescendants', ...arguments);
+    let docsToReturn = doc ? [doc] : [];
+
+    async function next(docs: Array<T | null>): Promise<Array<T>> {
+      let foundDocs: Array<T> = [];
+
+      for (const doc of docs) {
+        if (stopType && doc && doc.type === stopType) {
+          continue;
+        }
+
+        const promises: Array<Promise<Array<T>>> = [];
+
+        for (const type of allTypes()) {
+          // If the doc is null, we want to search for parentId === null
+          const parentId = doc ? doc._id : null;
+          const promise = database.find<T>(type, { parentId });
+          promises.push(promise);
+        }
+
+        for (const more of await Promise.all(promises)) {
+          foundDocs = [
+            ...foundDocs,
+            ...more,
+          ];
+        }
+      }
+
+      if (foundDocs.length === 0) {
+        // Didn't find anything. We're done
+        return docsToReturn;
+      }
+
+      // Continue searching for children
+      docsToReturn = [...docsToReturn, ...foundDocs];
+      return next(foundDocs);
+    }
+
+    return next([doc]);
+  },
+};
+
+interface DB {
+  [index: string]: NeDB;
+}
+
+// @ts-expect-error -- TSCONVERSION _empty doesn't match the index signature, use something other than _empty in future
+const db: DB = {
+  _empty: true,
+} as DB;
+
+// ~~~~~~~ //
+// HELPERS //
+// ~~~~~~~ //
+const allTypes = () => Object.keys(db);
+
+function getDBFilePath(modelType: string) {
+  // NOTE: Do not EVER change this. EVER!
+  return fsPath.join(getDataDirectory(), `insomnia.${modelType}.db`);
+}
+
+// ~~~~~~~~~~~~~~~~ //
+// Change Listeners //
+// ~~~~~~~~~~~~~~~~ //
+let bufferingChanges = false;
+let bufferChangesId = 1;
+
+type ChangeBufferEvent = [
+  event: string,
+  doc: BaseModel,
+  fromSync: boolean
+];
+
+let changeBuffer: Array<ChangeBufferEvent> = [];
+
+type ChangeListener = Function;
+
+let changeListeners: Array<ChangeListener> = [];
+
+async function notifyOfChange<T extends BaseModel>(event: string, doc: T, fromSync: boolean) {
+  changeBuffer.push([event, doc, fromSync]);
+
+  // Flush right away if we're not buffering
+  if (!bufferingChanges) {
+    await database.flushChanges();
+  }
+}
+
+// ~~~~~~~~~~~~~~~~~~~ //
+// DEFAULT MODEL STUFF //
+// ~~~~~~~~~~~~~~~~~~~ //
+
+type Patch<T> = Partial<T>;
+
+// ~~~~~~~ //
+// Helpers //
+// ~~~~~~~ //
+async function _send<T>(fnName: string, ...args: Array<any>) {
+  return new Promise<T>((resolve, reject) => {
+    const replyChannel = `db.fn.reply:${uuid.v4()}`;
+    electron.ipcRenderer.send('db.fn', fnName, replyChannel, ...args);
+    electron.ipcRenderer.once(replyChannel, (_e, err, result: T) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(result);
+      }
+    });
+  });
+}
+
+/**
+ * Run various database repair scripts
+ */
+export async function _repairDatabase() {
+  console.log('[fix] Running database repairs');
+
+  for (const workspace of await database.find<Workspace>(models.workspace.type)) {
+    await _repairBaseEnvironments(workspace);
+    await _fixMultipleCookieJars(workspace);
+    await _applyApiSpecName(workspace);
+  }
+
+  for (const gitRepository of await database.find<GitRepository>(models.gitRepository.type)) {
+    await _fixOldGitURIs(gitRepository);
+  }
+}
+
+/**
+ * This function ensures that apiSpec exists for each workspace
+ * If the filename on the apiSpec is not set or is the default initialized name
+ * It will apply the workspace name to it
+ */
+async function _applyApiSpecName(workspace: Workspace) {
+  const apiSpec = await models.apiSpec.getByParentId(workspace._id);
+  if (apiSpec === null) {
+    return;
+  }
+
+  if (!apiSpec.fileName || apiSpec.fileName === models.apiSpec.init().fileName) {
+    await models.apiSpec.update(apiSpec, {
+      fileName: workspace.name,
+    });
+  }
+}
+
+/**
+ * This function repairs workspaces that have multiple base environments. Since a workspace
+ * can only have one, this function walks over all base environments, merges the data, and
+ * moves all children as well.
+ */
+async function _repairBaseEnvironments(workspace: Workspace) {
+  const baseEnvironments = await database.find<Environment>(models.environment.type, {
+    parentId: workspace._id,
+  });
+
+  // Nothing to do here
+  if (baseEnvironments.length <= 1) {
+    return;
+  }
+
+  const chosenBase = baseEnvironments[0];
+
+  for (const baseEnvironment of baseEnvironments) {
+    if (baseEnvironment._id === chosenBase._id) {
+      continue;
+    }
+
+    chosenBase.data = Object.assign(baseEnvironment.data, chosenBase.data);
+    const subEnvironments = await database.find<Environment>(models.environment.type, {
+      parentId: baseEnvironment._id,
+    });
+
+    for (const subEnvironment of subEnvironments) {
+      await database.docUpdate(subEnvironment, {
+        parentId: chosenBase._id,
+      });
+    }
+
+    // Remove unnecessary base env
+    await database.remove(baseEnvironment);
+  }
+
+  // Update remaining base env
+  await database.update(chosenBase);
+  console.log(`[fix] Merged ${baseEnvironments.length} base environments under ${workspace.name}`);
+}
+
+/**
+ * This function repairs workspaces that have multiple cookie jars. Since a workspace
+ * can only have one, this function walks over all jars and merges them and their cookies
+ * together.
+ */
+async function _fixMultipleCookieJars(workspace: Workspace) {
+  const cookieJars = await database.find<CookieJar>(models.cookieJar.type, {
+    parentId: workspace._id,
+  });
+
+  // Nothing to do here
+  if (cookieJars.length <= 1) {
+    return;
+  }
+
+  const chosenJar = cookieJars[0];
+
+  for (const cookieJar of cookieJars) {
+    if (cookieJar._id === chosenJar._id) {
+      continue;
+    }
+
+    for (const cookie of cookieJar.cookies) {
+      if (chosenJar.cookies.find(c => c.id === cookie.id)) {
+        continue;
+      }
+
+      chosenJar.cookies.push(cookie);
+    }
+
+    // Remove unnecessary jar
+    await database.remove(cookieJar);
+  }
+
+  // Update remaining jar
+  await database.update(chosenJar);
+  console.log(`[fix] Merged ${cookieJars.length} cookie jars under ${workspace.name}`);
+}
+
+// Append .git to old git URIs to mimic previous isomorphic-git behaviour
+async function _fixOldGitURIs(doc: GitRepository) {
+  if (!doc.uriNeedsMigration) {
+    return;
+  }
+
+  if (!doc.uri.endsWith('.git')) {
+    doc.uri += '.git';
+  }
+
+  doc.uriNeedsMigration = false;
+  await database.update(doc);
+  console.log(`[fix] Fixed git URI for ${doc._id}`);
+}
diff --git a/packages/insomnia-app/app/common/documentation.js b/packages/insomnia-app/app/common/documentation.ts
similarity index 65%
rename from packages/insomnia-app/app/common/documentation.js
rename to packages/insomnia-app/app/common/documentation.ts
index b596ad6a11..9af6142986 100644
--- a/packages/insomnia-app/app/common/documentation.js
+++ b/packages/insomnia-app/app/common/documentation.ts
@@ -1,7 +1,4 @@
-// @flow
-function insomniaDocs(slug: string): string {
-  return `https://support.insomnia.rest${slug}`;
-}
+const insomniaDocs = (slug: string) => `https://support.insomnia.rest${slug}`;
 
 export const docsBase = insomniaDocs('/');
 export const docsGitSync = insomniaDocs('/article/193-git-sync');
@@ -9,12 +6,9 @@ export const docsTemplateTags = insomniaDocs('/article/171-template-tags');
 export const docsVersionControl = insomniaDocs('/article/165-version-control-sync');
 export const docsPlugins = insomniaDocs('/article/173-plugins');
 export const docsImportExport = insomniaDocs('/article/172-importing-and-exporting-data');
-
 export const docsGitAccessToken = {
-  github:
-    'https://docs.github.com/github/authenticating-to-github/creating-a-personal-access-token',
+  github: 'https://docs.github.com/github/authenticating-to-github/creating-a-personal-access-token',
   gitlab: 'https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html',
   bitbucket: 'https://support.atlassian.com/bitbucket-cloud/docs/app-passwords/',
-  bitbucketServer:
-    'https://confluence.atlassian.com/bitbucketserver/personal-access-tokens-939515499.html',
+  bitbucketServer: 'https://confluence.atlassian.com/bitbucketserver/personal-access-tokens-939515499.html',
 };
diff --git a/packages/insomnia-app/app/common/electron-helpers.ts b/packages/insomnia-app/app/common/electron-helpers.ts
new file mode 100644
index 0000000000..7d4d7d3876
--- /dev/null
+++ b/packages/insomnia-app/app/common/electron-helpers.ts
@@ -0,0 +1,50 @@
+import * as electron from 'electron';
+import { join } from 'path';
+import appConfig from '../../config/config.json';
+import mkdirp from 'mkdirp';
+
+export function clickLink(href: string) {
+  electron.shell.openExternal(href);
+}
+
+export function getDesignerDataDir() {
+  const { app } = electron.remote || electron;
+  return process.env.DESIGNER_DATA_PATH || join(app.getPath('appData'), 'Insomnia Designer');
+}
+
+export function getDataDirectory() {
+  const { app } = electron.remote || electron;
+  return process.env.INSOMNIA_DATA_PATH || app.getPath('userData');
+}
+
+export function getViewportSize(): string | null {
+  const { BrowserWindow } = electron.remote || electron;
+  const browserWindow = BrowserWindow.getFocusedWindow() || BrowserWindow.getAllWindows()[0];
+
+  if (browserWindow) {
+    const { width, height } = browserWindow.getContentBounds();
+    return `${width}x${height}`;
+  } else {
+    // No windows open
+    return null;
+  }
+}
+
+export function getScreenResolution() {
+  const { screen } = electron.remote || electron;
+  const { width, height } = screen.getPrimaryDisplay().workAreaSize;
+  return `${width}x${height}`;
+}
+
+export function getUserLanguage() {
+  const { app } = electron.remote || electron;
+  return app.getLocale();
+}
+
+export function getTempDir() {
+  // NOTE: Using a fairly unique name here because "insomnia" is a common word
+  const { app } = electron.remote || electron;
+  const dir = join(app.getPath('temp'), `insomnia_${appConfig.version}`);
+  mkdirp.sync(dir);
+  return dir;
+}
diff --git a/packages/insomnia-app/app/common/get-workspace-label.js b/packages/insomnia-app/app/common/get-workspace-label.ts
similarity index 96%
rename from packages/insomnia-app/app/common/get-workspace-label.js
rename to packages/insomnia-app/app/common/get-workspace-label.ts
index abc6dc8ada..97f95f1e26 100644
--- a/packages/insomnia-app/app/common/get-workspace-label.js
+++ b/packages/insomnia-app/app/common/get-workspace-label.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { Workspace } from '../models/workspace';
 import { isDesign } from '../models/helpers/is-model';
 import { strings } from './strings';
diff --git a/packages/insomnia-app/app/common/grpc-events.js b/packages/insomnia-app/app/common/grpc-events.ts
similarity index 64%
rename from packages/insomnia-app/app/common/grpc-events.js
rename to packages/insomnia-app/app/common/grpc-events.ts
index 9bf7422938..d2db5a0c35 100644
--- a/packages/insomnia-app/app/common/grpc-events.js
+++ b/packages/insomnia-app/app/common/grpc-events.ts
@@ -1,4 +1,4 @@
-// @flow
+import { ValueOf } from 'type-fest';
 
 export const GrpcRequestEventEnum = {
   start: 'GRPC_START',
@@ -6,8 +6,9 @@ export const GrpcRequestEventEnum = {
   commit: 'GRPC_COMMIT',
   cancel: 'GRPC_CANCEL',
   cancelMultiple: 'GRPC_CANCEL_MULTIPLE',
-};
-export type GrpcRequestEvent = $Values<typeof GrpcRequestEventEnum>;
+} as const;
+
+export type GrpcRequestEvent = ValueOf<typeof GrpcRequestEventEnum>;
 
 export const GrpcResponseEventEnum = {
   start: 'GRPC_START',
@@ -15,5 +16,6 @@ export const GrpcResponseEventEnum = {
   error: 'GRPC_ERROR',
   end: 'GRPC_END',
   status: 'GRPC_STATUS',
-};
-export type GrpcResponseEvent = $Values<typeof GrpcResponseEventEnum>;
+} as const;
+
+export type GrpcResponseEvent = ValueOf<typeof GrpcResponseEventEnum>;
diff --git a/packages/insomnia-app/app/common/grpc-paths.js b/packages/insomnia-app/app/common/grpc-paths.ts
similarity index 78%
rename from packages/insomnia-app/app/common/grpc-paths.js
rename to packages/insomnia-app/app/common/grpc-paths.ts
index 3877defa20..4f8f2b4bda 100644
--- a/packages/insomnia-app/app/common/grpc-paths.js
+++ b/packages/insomnia-app/app/common/grpc-paths.ts
@@ -1,26 +1,25 @@
-// @flow
-
 import type { GrpcMethodDefinition, GrpcMethodType } from '../network/grpc/method';
 import { groupBy } from 'lodash';
 import { getMethodType } from '../network/grpc/method';
-
 const PROTO_PATH_REGEX = /^\/(?:(?<package>[\w.]+)\.)?(?<service>\w+)\/(?<method>\w+)$/;
 
-type GrpcPathSegments = {
-  packageName?: string,
-  serviceName?: string,
-  methodName?: string,
-};
+interface GrpcPathSegments {
+  packageName?: string;
+  serviceName?: string;
+  methodName?: string;
+}
 
 // Split a full gRPC path into it's segments
 export const getGrpcPathSegments = (path: string): GrpcPathSegments => {
   const result = PROTO_PATH_REGEX.exec(path);
-
   const packageName = result?.groups?.package;
   const serviceName = result?.groups?.service;
   const methodName = result?.groups?.method;
-
-  return { packageName, serviceName, methodName };
+  return {
+    packageName,
+    serviceName,
+    methodName,
+  };
 };
 
 // If all segments are found, return a shorter path, otherwise the original path
@@ -31,16 +30,12 @@ export const getShortGrpcPath = (
   return packageName && serviceName && methodName ? `/${serviceName}/${methodName}` : fullPath;
 };
 
-export type GrpcMethodInfo = {
-  segments: GrpcPathSegments,
-  type: GrpcMethodType,
-  fullPath: string,
-};
-
-type GroupedGrpcMethodInfo = {
-  [packageName: string]: Array<GrpcMethodInfo>,
-};
-
+export interface GrpcMethodInfo {
+  segments: GrpcPathSegments;
+  type: GrpcMethodType;
+  fullPath: string;
+}
+type GroupedGrpcMethodInfo = Record<string, Array<GrpcMethodInfo>>;
 export const NO_PACKAGE_KEY = 'no-package';
 
 const getMethodInfo = (method: GrpcMethodDefinition): GrpcMethodInfo => ({
diff --git a/packages/insomnia-app/app/common/har.js b/packages/insomnia-app/app/common/har.ts
similarity index 60%
rename from packages/insomnia-app/app/common/har.js
rename to packages/insomnia-app/app/common/har.ts
index 2765c8d0e1..8980a9740b 100644
--- a/packages/insomnia-app/app/common/har.js
+++ b/packages/insomnia-app/app/common/har.ts
@@ -1,4 +1,3 @@
-// @flow
 import fs from 'fs';
 import clone from 'clone';
 import { Cookie as toughCookie } from 'tough-cookie';
@@ -7,7 +6,7 @@ import type { RenderedRequest } from './render';
 import { getRenderedRequestAndContext } from './render';
 import { jarFromCookies } from 'insomnia-cookies';
 import * as pluginContexts from '../plugins/context/index';
-import * as misc from './misc';
+import { getSetCookieHeaders, filterHeaders, hasAuthHeader } from './misc';
 import type { Cookie } from '../models/cookie-jar';
 import type { Request } from '../models/request';
 import { newBodyRaw } from '../models/request';
@@ -18,173 +17,176 @@ import { RenderError } from '../templating/index';
 import { smartEncodeUrl } from 'insomnia-url';
 import * as plugins from '../plugins';
 
-export type HarCookie = {
-  name: string,
-  value: string,
-  path?: string,
-  domain?: string,
-  expires?: string,
-  httpOnly?: boolean,
-  secure?: boolean,
-  comment?: string,
-};
+export interface HarCookie {
+  name: string;
+  value: string;
+  path?: string;
+  domain?: string;
+  expires?: string;
+  httpOnly?: boolean;
+  secure?: boolean;
+  comment?: string;
+}
 
-export type HarHeader = {
-  name: string,
-  value: string,
-  comment?: string,
-};
+export interface HarHeader {
+  name: string;
+  value: string;
+  comment?: string;
+}
 
-export type HarQueryString = {
-  name: string,
-  value: string,
-  comment?: string,
-};
+export interface HarQueryString {
+  name: string;
+  value: string;
+  comment?: string;
+}
 
-export type HarPostParam = {
-  name: string,
-  value?: string,
-  fileName?: string,
-  contentType?: string,
-  comment?: string,
-};
+export interface HarPostParam {
+  name: string;
+  value?: string;
+  fileName?: string;
+  contentType?: string;
+  comment?: string;
+}
 
-export type HarPostData = {
-  mimeType: string,
-  params: Array<HarPostParam>,
-  text: string,
-  comment?: string,
-};
+export interface HarPostData {
+  mimeType: string;
+  params: Array<HarPostParam>;
+  text: string;
+  comment?: string;
+}
 
-export type HarRequest = {
-  method: string,
-  url: string,
-  httpVersion: string,
-  cookies: Array<HarCookie>,
-  headers: Array<HarHeader>,
-  queryString: Array<HarQueryString>,
-  postData?: HarPostData,
-  headersSize: number,
-  bodySize: number,
-  comment?: string,
-  settingEncodeUrl: boolean,
-};
+export interface HarRequest {
+  method: string;
+  url: string;
+  httpVersion: string;
+  cookies: Array<HarCookie>;
+  headers: Array<HarHeader>;
+  queryString: Array<HarQueryString>;
+  postData?: HarPostData;
+  headersSize: number;
+  bodySize: number;
+  comment?: string;
+  settingEncodeUrl: boolean;
+}
 
-export type HarContent = {
-  size: number,
-  compression?: number,
-  mimeType: string,
-  text?: string,
-  encoding?: string,
-  comment?: string,
-};
+export interface HarContent {
+  size: number;
+  compression?: number;
+  mimeType: string;
+  text?: string;
+  encoding?: string;
+  comment?: string;
+}
 
-export type HarResponse = {
-  status: number,
-  statusText: string,
-  httpVersion: string,
-  cookies: Array<HarCookie>,
-  headers: Array<HarHeader>,
-  content: HarContent,
-  redirectURL: string,
-  headersSize: number,
-  bodySize: number,
-  comment?: string,
-};
+export interface HarResponse {
+  status: number;
+  statusText: string;
+  httpVersion: string;
+  cookies: Array<HarCookie>;
+  headers: Array<HarHeader>;
+  content: HarContent;
+  redirectURL: string;
+  headersSize: number;
+  bodySize: number;
+  comment?: string;
+}
 
-export type HarRequestCache = {
-  expires?: string,
-  lastAccess: string,
-  eTag: string,
-  hitCount: number,
-  comment?: string,
-};
+export interface HarRequestCache {
+  expires?: string;
+  lastAccess: string;
+  eTag: string;
+  hitCount: number;
+  comment?: string;
+}
 
-export type HarCache = {
-  beforeRequest?: HarRequestCache,
-  afterRequest?: HarRequestCache,
-  comment?: string,
-};
+export interface HarCache {
+  beforeRequest?: HarRequestCache;
+  afterRequest?: HarRequestCache;
+  comment?: string;
+}
 
-export type HarEntryTimings = {
-  blocked?: number,
-  dns?: number,
-  connect?: number,
-  send: number,
-  wait: number,
-  receive: number,
-  ssl?: number,
-  comment?: string,
-};
+export interface HarEntryTimings {
+  blocked?: number;
+  dns?: number;
+  connect?: number;
+  send: number;
+  wait: number;
+  receive: number;
+  ssl?: number;
+  comment?: string;
+}
 
-export type HarEntry = {
-  pageref?: string,
-  startedDateTime: string,
-  time: number,
-  request: HarRequest,
-  response: HarResponse,
-  cache: HarCache,
-  timings: HarEntryTimings,
-  serverIPAddress?: string,
-  connection?: string,
-  comment?: string,
-};
+export interface HarEntry {
+  pageref?: string;
+  startedDateTime: string;
+  time: number;
+  request: HarRequest;
+  response: HarResponse;
+  cache: HarCache;
+  timings: HarEntryTimings;
+  serverIPAddress?: string;
+  connection?: string;
+  comment?: string;
+}
 
-export type HarPageTimings = {
-  onContentLoad?: number,
-  onLoad?: number,
-  comment?: string,
-};
+export interface HarPageTimings {
+  onContentLoad?: number;
+  onLoad?: number;
+  comment?: string;
+}
 
-export type HarPage = {
-  startedDateTime: string,
-  id: string,
-  title: string,
-  pageTimings: HarPageTimings,
-  comment?: string,
-};
+export interface HarPage {
+  startedDateTime: string;
+  id: string;
+  title: string;
+  pageTimings: HarPageTimings;
+  comment?: string;
+}
 
-export type HarCreator = {
-  name: string,
-  version: string,
-  comment?: string,
-};
+export interface HarCreator {
+  name: string;
+  version: string;
+  comment?: string;
+}
 
-export type HarBrowser = {
-  name: string,
-  version: string,
-  comment?: string,
-};
+export interface HarBrowser {
+  name: string;
+  version: string;
+  comment?: string;
+}
 
-export type HarLog = {
-  version: string,
-  creator: HarCreator,
-  browser?: HarBrowser,
-  pages?: Array<HarPage>,
-  entries: Array<HarEntry>,
-  comment?: string,
-};
+export interface HarLog {
+  version: string;
+  creator: HarCreator;
+  browser?: HarBrowser;
+  pages?: Array<HarPage>;
+  entries: Array<HarEntry>;
+  comment?: string;
+}
 
-export type Har = {
-  log: HarLog,
-};
+export interface Har {
+  log: HarLog;
+}
 
-export type ExportRequest = {
-  requestId: string,
-  environmentId: string | null,
-};
+export interface ExportRequest {
+  requestId: string;
+  environmentId: string | null;
+}
 
-export async function exportHar(exportRequests: Array<ExportRequest>): Promise<Har> {
+export async function exportHar(exportRequests: Array<ExportRequest>) {
   // Export HAR entries with the same start time in order to keep their workspace sort order.
   const startedDateTime = new Date().toISOString();
   const entries: Array<HarEntry> = [];
+
   for (const exportRequest of exportRequests) {
     const request: Request | null = await models.request.getById(exportRequest.requestId);
+
     if (!request) {
       continue;
     }
 
     const harRequest = await exportHarWithRequest(request, exportRequest.environmentId);
+
     if (!harRequest) {
       continue;
     }
@@ -194,6 +196,7 @@ export async function exportHar(exportRequests: Array<ExportRequest>): Promise<H
       exportRequest.environmentId || null,
     );
     const harResponse = await exportHarResponse(response);
+
     if (!harResponse) {
       continue;
     }
@@ -215,11 +218,10 @@ export async function exportHar(exportRequests: Array<ExportRequest>): Promise<H
       },
       comment: request.name,
     };
-
     entries.push(entry);
   }
 
-  return {
+  const har: Har = {
     log: {
       version: '1.2',
       creator: {
@@ -229,9 +231,10 @@ export async function exportHar(exportRequests: Array<ExportRequest>): Promise<H
       entries: entries,
     },
   };
+  return har;
 }
 
-export async function exportHarResponse(response: ResponseModel | null): Promise<HarResponse> {
+export async function exportHarResponse(response: ResponseModel | null) {
   if (!response) {
     return {
       status: 0,
@@ -249,7 +252,7 @@ export async function exportHarResponse(response: ResponseModel | null): Promise
     };
   }
 
-  return {
+  const harResponse: HarResponse = {
     status: response.statusCode,
     statusText: response.statusMessage,
     httpVersion: 'HTTP/1.1',
@@ -260,14 +263,16 @@ export async function exportHarResponse(response: ResponseModel | null): Promise
     headersSize: -1,
     bodySize: -1,
   };
+  return harResponse;
 }
 
 export async function exportHarRequest(
   requestId: string,
   environmentId: string,
-  addContentLength: boolean = false,
-): Promise<HarRequest | null> {
+  addContentLength = false,
+) {
   const request = await models.request.getById(requestId);
+
   if (!request) {
     return null;
   }
@@ -278,8 +283,8 @@ export async function exportHarRequest(
 export async function exportHarWithRequest(
   request: Request,
   environmentId: string | null,
-  addContentLength: boolean = false,
-): Promise<HarRequest | null> {
+  addContentLength = false,
+) {
   try {
     const renderResult = await getRenderedRequestAndContext(request, environmentId);
     const renderedRequest = await _applyRequestPluginHooks(
@@ -298,16 +303,16 @@ export async function exportHarWithRequest(
 
 async function _applyRequestPluginHooks(
   renderedRequest: RenderedRequest,
-  renderedContext: Object,
-): Promise<RenderedRequest> {
+  renderedContext: Record<string, any>,
+) {
   let newRenderedRequest = renderedRequest;
+
   for (const { plugin, hook } of await plugins.getRequestHooks()) {
     newRenderedRequest = clone(newRenderedRequest);
-
     const context = {
-      ...(pluginContexts.app.init(): Object),
-      ...(pluginContexts.request.init(newRenderedRequest, renderedContext): Object),
-      ...(pluginContexts.store.init(plugin): Object),
+      ...(pluginContexts.app.init() as Record<string, any>),
+      ...(pluginContexts.request.init(newRenderedRequest, renderedContext) as Record<string, any>),
+      ...(pluginContexts.store.init(plugin) as Record<string, any>),
     };
 
     try {
@@ -323,24 +328,28 @@ async function _applyRequestPluginHooks(
 
 export async function exportHarWithRenderedRequest(
   renderedRequest: RenderedRequest,
-  addContentLength: boolean = false,
-): Promise<HarRequest> {
+  addContentLength = false,
+) {
   const url = smartEncodeUrl(renderedRequest.url, renderedRequest.settingEncodeUrl);
 
   if (addContentLength) {
     const hasContentLengthHeader =
-      misc.filterHeaders(renderedRequest.headers, 'Content-Length').length > 0;
+      filterHeaders(renderedRequest.headers, 'Content-Length').length > 0;
 
     if (!hasContentLengthHeader) {
       const name = 'Content-Length';
       const value = Buffer.byteLength((renderedRequest.body || {}).text || '').toString();
-      renderedRequest.headers.push({ name, value });
+      renderedRequest.headers.push({
+        name,
+        value,
+      });
     }
   }
 
   // Set auth header if we have it
-  if (!misc.hasAuthHeader(renderedRequest.headers)) {
+  if (!hasAuthHeader(renderedRequest.headers)) {
     const header = await getAuthHeader(renderedRequest, url);
+
     if (header) {
       renderedRequest.headers.push({
         name: header.name,
@@ -349,7 +358,7 @@ export async function exportHarWithRenderedRequest(
     }
   }
 
-  return {
+  const harRequest: HarRequest = {
     method: renderedRequest.method,
     url,
     httpVersion: 'HTTP/1.1',
@@ -361,32 +370,39 @@ export async function exportHarWithRenderedRequest(
     bodySize: -1,
     settingEncodeUrl: renderedRequest.settingEncodeUrl,
   };
+  return harRequest;
 }
 
-function getRequestCookies(renderedRequest: RenderedRequest): Array<HarCookie> {
+function getRequestCookies(renderedRequest: RenderedRequest) {
   const jar = jarFromCookies(renderedRequest.cookieJar.cookies);
   const domainCookies = jar.getCookiesSync(renderedRequest.url);
-  return domainCookies.map(mapCookie);
+  const harCookies: Array<HarCookie> = domainCookies.map(mapCookie);
+  return harCookies;
 }
 
-function getReponseCookies(response: ResponseModel): Array<HarCookie> {
-  return misc
-    .getSetCookieHeaders(response.headers)
-    .map(h => {
-      let cookie;
-      try {
-        cookie = toughCookie.parse(h.value || '');
-      } catch (error) {}
-      if (!cookie) {
-        return null;
-      }
+function getReponseCookies(response: ResponseModel) {
+  const headers = response.headers.filter(Boolean) as Array<HarCookie>;
+  const responseCookies = getSetCookieHeaders(headers)
+  .reduce((accumulator, harCookie) => {
+    let cookie: null | undefined | toughCookie = null;
 
-      return mapCookie(cookie);
-    })
-    .filter(Boolean);
+    try {
+      cookie = toughCookie.parse(harCookie.value || '');
+    } catch (error) {}
+
+    if (cookie === null || cookie === undefined) {
+      return accumulator;
+    }
+
+    return [
+      ...accumulator,
+      mapCookie(cookie as unknown as Cookie),
+    ];
+  }, [] as Array<HarCookie>);
+  return responseCookies;
 }
 
-function mapCookie(cookie: Cookie): HarCookie {
+function mapCookie(cookie: Cookie) {
   const harCookie: HarCookie = {
     name: cookie.key,
     value: cookie.value,
@@ -401,7 +417,8 @@ function mapCookie(cookie: Cookie): HarCookie {
   }
 
   if (cookie.expires) {
-    let expires = null;
+    let expires: Date | null = null;
+
     if (cookie.expires instanceof Date) {
       expires = cookie.expires;
     } else if (typeof cookie.expires === 'string') {
@@ -427,59 +444,55 @@ function mapCookie(cookie: Cookie): HarCookie {
   return harCookie;
 }
 
-function getResponseContent(response: ResponseModel): HarContent {
-  let body: Buffer | null = models.response.getBodyBuffer(response);
+function getResponseContent(response: ResponseModel) {
+  let body = models.response.getBodyBuffer(response);
 
   if (body === null) {
     body = Buffer.alloc(0);
   }
 
-  return {
+  const harContent: HarContent = {
     size: body.byteLength,
     mimeType: response.contentType,
     text: body.toString('utf8'),
   };
+  return harContent;
 }
 
-function getResponseHeaders(response: ResponseModel): Array<HarHeader> {
+function getResponseHeaders(response: ResponseModel) {
   return response.headers
     .filter(header => header.name)
-    .map(h => {
-      return {
-        name: h.name,
-        value: h.value,
-      };
-    });
+    .map<HarHeader>(header => ({
+      name: header.name,
+      value: header.value,
+    }));
 }
 
-function getRequestHeaders(renderedRequest: RenderedRequest): Array<HarHeader> {
+function getRequestHeaders(renderedRequest: RenderedRequest) {
   return renderedRequest.headers
     .filter(header => header.name)
-    .map(header => {
-      return {
-        name: header.name,
-        value: header.value,
-      };
-    });
+    .map<HarHeader>(header => ({
+      name: header.name,
+      value: header.value,
+    }));
 }
 
 function getRequestQueryString(renderedRequest: RenderedRequest): Array<HarQueryString> {
-  return renderedRequest.parameters.map(parameter => {
-    return {
-      name: parameter.name,
-      value: parameter.value,
-    };
-  });
+  return renderedRequest.parameters.map<HarQueryString>(parameter => ({
+    name: parameter.name,
+    value: parameter.value,
+  }));
 }
 
-function getRequestPostData(renderedRequest: RenderedRequest): HarPostData | void {
+function getRequestPostData(renderedRequest: RenderedRequest): HarPostData | undefined {
   let body;
+
   if (renderedRequest.body.fileName) {
     try {
       body = newBodyRaw(fs.readFileSync(renderedRequest.body.fileName, 'base64'));
     } catch (e) {
       console.warn('[code gen] Failed to read file', e);
-      return undefined;
+      return;
     }
   } else {
     // For every other type, Insomnia uses the same body format as HAR
@@ -487,6 +500,7 @@ function getRequestPostData(renderedRequest: RenderedRequest): HarPostData | voi
   }
 
   let params = [];
+
   if (body.params) {
     params = body.params.map(param => {
       if (param.type === 'file') {
diff --git a/packages/insomnia-app/app/common/hotkeys-listener.js b/packages/insomnia-app/app/common/hotkeys-listener.ts
similarity index 58%
rename from packages/insomnia-app/app/common/hotkeys-listener.js
rename to packages/insomnia-app/app/common/hotkeys-listener.ts
index cf9f59b486..7258704d89 100644
--- a/packages/insomnia-app/app/common/hotkeys-listener.js
+++ b/packages/insomnia-app/app/common/hotkeys-listener.ts
@@ -1,15 +1,14 @@
-// @flow
 import type { HotKeyDefinition, KeyBindings, KeyCombination } from './hotkeys';
 import { areSameKeyCombinations, getPlatformKeyCombinations } from './hotkeys';
 import * as models from '../models';
 
-function _pressedHotKey(e: KeyboardEvent, bindings: KeyBindings): boolean {
+const _pressedHotKey = (event: KeyboardEvent, bindings: KeyBindings) => {
   const pressedKeyComb: KeyCombination = {
-    ctrl: e.ctrlKey,
-    alt: e.altKey,
-    shift: e.shiftKey,
-    meta: e.metaKey,
-    keyCode: e.keyCode,
+    ctrl: event.ctrlKey,
+    alt: event.altKey,
+    shift: event.shiftKey,
+    meta: event.metaKey,
+    keyCode: event.keyCode,
   };
   const keyCombList = getPlatformKeyCombinations(bindings);
 
@@ -20,35 +19,33 @@ function _pressedHotKey(e: KeyboardEvent, bindings: KeyBindings): boolean {
   }
 
   return false;
-}
+};
 
 /**
  * Check whether a hotkey has been pressed.
- * @param e the activated keyboard event.
+ * @param event the activated keyboard event.
  * @param definition the hotkey definition being checked.
- * @returns {Promise<boolean>}
  */
-export async function pressedHotKey(
-  e: KeyboardEvent,
+export const pressedHotKey = async (
+  event: KeyboardEvent,
   definition: HotKeyDefinition,
-): Promise<boolean> {
+) => {
   const settings = await models.settings.getOrCreate();
-  return _pressedHotKey(e, settings.hotKeyRegistry[definition.id]);
-}
+  return _pressedHotKey(event, settings.hotKeyRegistry[definition.id]);
+};
 
 /**
  * Call callback if the hotkey has been pressed.
- * @param e the activated keyboard event.
+ * @param event the activated keyboard event.
  * @param definition the hotkey definition being checked.
  * @param callback to be called if the hotkey has been activated.
- * @returns {Promise<void>}
  */
-export async function executeHotKey(
-  e: KeyboardEvent,
+export const executeHotKey = async <T extends Function>(
+  event: KeyboardEvent,
   definition: HotKeyDefinition,
-  callback: Function,
-): Promise<void> {
-  if (await pressedHotKey(e, definition)) {
+  callback: T,
+) => {
+  if (await pressedHotKey(event, definition)) {
     callback();
   }
-}
+};
diff --git a/packages/insomnia-app/app/common/hotkeys.js b/packages/insomnia-app/app/common/hotkeys.ts
similarity index 94%
rename from packages/insomnia-app/app/common/hotkeys.js
rename to packages/insomnia-app/app/common/hotkeys.ts
index d4e407c32a..ec31dd74a2 100644
--- a/packages/insomnia-app/app/common/hotkeys.js
+++ b/packages/insomnia-app/app/common/hotkeys.ts
@@ -1,4 +1,3 @@
-// @flow
 import { keyboardKeys } from './keyboard-keys';
 import { ALT_SYM, CTRL_SYM, isMac, META_SYM, SHIFT_SYM } from './constants';
 import { strings } from './strings';
@@ -7,38 +6,36 @@ import { strings } from './strings';
  * The readable definition of a hotkey.
  * The {@code id} the hotkey's reference id.
  */
-export type HotKeyDefinition = {
-  id: string,
-  description: string,
-};
+export interface HotKeyDefinition {
+  id: string;
+  description: string;
+}
 
 /**
  * The combination of key presses that will activate a hotkey if pressed.
  */
-export type KeyCombination = {
-  ctrl: boolean,
-  alt: boolean,
-  shift: boolean,
-  meta: boolean,
-  keyCode: number,
-};
+export interface KeyCombination {
+  ctrl: boolean;
+  alt: boolean;
+  shift: boolean;
+  meta: boolean;
+  keyCode: number;
+}
 
 /**
  * The collection of a hotkey's key combinations for each platforms.
  */
-export type KeyBindings = {
-  macKeys: Array<KeyCombination>,
+export interface KeyBindings {
+  macKeys: Array<KeyCombination>;
   // The key combinations for both Windows and Linux.
-  winLinuxKeys: Array<KeyCombination>,
-};
+  winLinuxKeys: Array<KeyCombination>;
+}
 
 /**
  * The collection of defined hotkeys.
  * The registry maps a hotkey by its reference id to its key bindings.
  */
-export type HotKeyRegistry = {
-  [refId: string]: KeyBindings,
-};
+export type HotKeyRegistry = Record<string, KeyBindings>;
 
 function defineHotKey(id: string, description: string): HotKeyDefinition {
   return {
@@ -85,84 +82,53 @@ function keyBinds(
  * The collection of available hotkeys' and their definitions.
  */
 // Not using dot, because NeDB prohibits field names to contain dots.
-export const hotKeyRefs: { [string]: HotKeyDefinition } = {
+export const hotKeyRefs: Record<string, HotKeyDefinition> = {
   WORKSPACE_SHOW_SETTINGS: defineHotKey(
     'workspace_showSettings',
     `Show ${strings.document} / ${strings.collection} Settings`,
   ),
-
   REQUEST_SHOW_SETTINGS: defineHotKey('request_showSettings', 'Show Request Settings'),
-
   PREFERENCES_SHOW_KEYBOARD_SHORTCUTS: defineHotKey(
     'preferences_showKeyboardShortcuts',
     'Show Keyboard Shortcuts',
   ),
-
   PREFERENCES_SHOW_GENERAL: defineHotKey('preferences_showGeneral', 'Show App Preferences'),
-
   TOGGLE_MAIN_MENU: defineHotKey('toggleMainMenu', 'Toggle Main Menu'),
-
   REQUEST_QUICK_SWITCH: defineHotKey('request_quickSwitch', 'Switch Requests'),
-
   SHOW_RECENT_REQUESTS: defineHotKey('request_showRecent', 'Show Recent Requests'),
-
   SHOW_RECENT_REQUESTS_PREVIOUS: defineHotKey(
     'request_showRecentPrevious',
     'Show Recent Requests (Previous)',
   ),
-
   PLUGIN_RELOAD: defineHotKey('plugin_reload', 'Reload Plugins'),
-
   SHOW_AUTOCOMPLETE: defineHotKey('showAutocomplete', 'Show Autocomplete'),
-
   REQUEST_SEND: defineHotKey('request_send', 'Send Request'),
-
   REQUEST_SHOW_OPTIONS: defineHotKey('request_showOptions', 'Send Request (Options)'),
-
   ENVIRONMENT_SHOW_EDITOR: defineHotKey('environment_showEditor', 'Show Environment Editor'),
-
   ENVIRONMENT_SHOW_SWITCH_MENU: defineHotKey('environment_showSwitchMenu', 'Switch Environments'),
-
   REQUEST_TOGGLE_HTTP_METHOD_MENU: defineHotKey(
     'request_toggleHttpMethodMenu',
     'Change HTTP Method',
   ),
-
   REQUEST_TOGGLE_HISTORY: defineHotKey('request_toggleHistory', 'Show Request History'),
-
   REQUEST_FOCUS_URL: defineHotKey('request_focusUrl', 'Focus URL'),
-
   REQUEST_SHOW_GENERATE_CODE_EDITOR: defineHotKey(
     'request_showGenerateCodeEditor',
     'Generate Code',
   ),
-
   SIDEBAR_FOCUS_FILTER: defineHotKey('sidebar_focusFilter', 'Filter Sidebar'),
-
   SIDEBAR_TOGGLE: defineHotKey('sidebar_toggle', 'Toggle Sidebar'),
-
   RESPONSE_FOCUS: defineHotKey('response_focus', 'Focus Response'),
-
   SHOW_COOKIES_EDITOR: defineHotKey('showCookiesEditor', 'Edit Cookies'),
-
   REQUEST_SHOW_CREATE: defineHotKey('request_showCreate', 'Create Request'),
-
   REQUEST_QUICK_CREATE: defineHotKey('request_quickCreate', 'Create Request (Quick)'),
-
   REQUEST_SHOW_DELETE: defineHotKey('request_showDelete', 'Delete Request'),
-
   REQUEST_SHOW_CREATE_FOLDER: defineHotKey('request_showCreateFolder', 'Create Folder'),
-
   REQUEST_SHOW_DUPLICATE: defineHotKey('request_showDuplicate', 'Duplicate Request'),
-
   REQUEST_TOGGLE_PIN: defineHotKey('request_togglePin', 'Pin/Unpin Request'),
-
   CLOSE_DROPDOWN: defineHotKey('closeDropdown', 'Close Dropdown'),
-
   CLOSE_MODAL: defineHotKey('closeModal', 'Close Modal'),
-
   ENVIRONMENT_UNCOVER_VARIABLES: defineHotKey('environment_uncoverVariables', 'Uncover Variables'),
-
   // Designer-specific
   SHOW_SPEC_EDITOR: defineHotKey('activity_specEditor', 'Show Spec Activity'),
   SHOW_TEST: defineHotKey('activity_test', 'Show Test Activity'),
@@ -179,52 +145,42 @@ const defaultRegistry: HotKeyRegistry = {
     keyComb(false, false, true, true, keyboardKeys.comma.keyCode),
     keyComb(true, false, true, false, keyboardKeys.comma.keyCode),
   ),
-
   [hotKeyRefs.REQUEST_SHOW_SETTINGS.id]: keyBinds(
     keyComb(false, true, true, true, keyboardKeys.comma.keyCode),
     keyComb(true, true, true, false, keyboardKeys.comma.keyCode),
   ),
-
   [hotKeyRefs.PREFERENCES_SHOW_KEYBOARD_SHORTCUTS.id]: keyBinds(
     keyComb(true, false, true, true, keyboardKeys.forwardslash.keyCode),
     keyComb(true, false, true, false, keyboardKeys.forwardslash.keyCode),
   ),
-
   [hotKeyRefs.PREFERENCES_SHOW_GENERAL.id]: keyBinds(
     keyComb(false, false, false, true, keyboardKeys.comma.keyCode),
     keyComb(true, false, false, false, keyboardKeys.comma.keyCode),
   ),
-
   [hotKeyRefs.TOGGLE_MAIN_MENU.id]: keyBinds(
     keyComb(false, true, false, true, keyboardKeys.comma.keyCode),
     keyComb(true, true, false, false, keyboardKeys.comma.keyCode),
   ),
-
   [hotKeyRefs.REQUEST_QUICK_SWITCH.id]: keyBinds(
     keyComb(false, false, false, true, keyboardKeys.p.keyCode),
     keyComb(true, false, false, false, keyboardKeys.p.keyCode),
   ),
-
   [hotKeyRefs.SHOW_RECENT_REQUESTS.id]: keyBinds(
     keyComb(true, false, false, false, keyboardKeys.tab.keyCode),
     keyComb(true, false, false, false, keyboardKeys.tab.keyCode),
   ),
-
   [hotKeyRefs.SHOW_RECENT_REQUESTS_PREVIOUS.id]: keyBinds(
     keyComb(true, false, true, false, keyboardKeys.tab.keyCode),
     keyComb(true, false, true, false, keyboardKeys.tab.keyCode),
   ),
-
   [hotKeyRefs.PLUGIN_RELOAD.id]: keyBinds(
     keyComb(false, false, true, true, keyboardKeys.r.keyCode),
     keyComb(true, false, true, false, keyboardKeys.r.keyCode),
   ),
-
   [hotKeyRefs.SHOW_AUTOCOMPLETE.id]: keyBinds(
     keyComb(true, false, false, false, keyboardKeys.space.keyCode),
     keyComb(true, false, false, false, keyboardKeys.space.keyCode),
   ),
-
   [hotKeyRefs.REQUEST_SEND.id]: keyBinds(
     [
       keyComb(false, false, false, true, keyboardKeys.enter.keyCode),
@@ -237,127 +193,102 @@ const defaultRegistry: HotKeyRegistry = {
       keyComb(false, false, false, false, keyboardKeys.f5.keyCode),
     ],
   ),
-
   [hotKeyRefs.REQUEST_SHOW_OPTIONS.id]: keyBinds(
     keyComb(false, false, true, true, keyboardKeys.enter.keyCode),
     keyComb(true, false, true, false, keyboardKeys.enter.keyCode),
   ),
-
   [hotKeyRefs.ENVIRONMENT_SHOW_EDITOR.id]: keyBinds(
     keyComb(false, false, false, true, keyboardKeys.e.keyCode),
     keyComb(true, false, false, false, keyboardKeys.e.keyCode),
   ),
-
   [hotKeyRefs.ENVIRONMENT_SHOW_SWITCH_MENU.id]: keyBinds(
     keyComb(false, false, true, true, keyboardKeys.e.keyCode),
     keyComb(true, false, true, false, keyboardKeys.e.keyCode),
   ),
-
   [hotKeyRefs.REQUEST_TOGGLE_HTTP_METHOD_MENU.id]: keyBinds(
     keyComb(false, false, true, true, keyboardKeys.l.keyCode),
     keyComb(true, false, true, false, keyboardKeys.l.keyCode),
   ),
-
   [hotKeyRefs.REQUEST_TOGGLE_HISTORY.id]: keyBinds(
     keyComb(false, false, true, true, keyboardKeys.h.keyCode),
     keyComb(true, false, true, false, keyboardKeys.h.keyCode),
   ),
-
   [hotKeyRefs.REQUEST_FOCUS_URL.id]: keyBinds(
     keyComb(false, false, false, true, keyboardKeys.l.keyCode),
     keyComb(true, false, false, false, keyboardKeys.l.keyCode),
   ),
-
   [hotKeyRefs.REQUEST_SHOW_GENERATE_CODE_EDITOR.id]: keyBinds(
     keyComb(false, false, true, true, keyboardKeys.g.keyCode),
     keyComb(true, false, true, false, keyboardKeys.g.keyCode),
   ),
-
   [hotKeyRefs.SIDEBAR_FOCUS_FILTER.id]: keyBinds(
     keyComb(false, false, true, true, keyboardKeys.f.keyCode),
     keyComb(true, false, true, false, keyboardKeys.f.keyCode),
   ),
-
   [hotKeyRefs.SIDEBAR_TOGGLE.id]: keyBinds(
     keyComb(false, false, false, true, keyboardKeys.backslash.keyCode),
     keyComb(true, false, false, false, keyboardKeys.backslash.keyCode),
   ),
-
   [hotKeyRefs.RESPONSE_FOCUS.id]: keyBinds(
     keyComb(false, false, false, true, keyboardKeys.singlequote.keyCode),
     keyComb(true, false, false, false, keyboardKeys.singlequote.keyCode),
   ),
-
   [hotKeyRefs.SHOW_COOKIES_EDITOR.id]: keyBinds(
     keyComb(false, false, false, true, keyboardKeys.k.keyCode),
     keyComb(true, false, false, false, keyboardKeys.k.keyCode),
   ),
-
   [hotKeyRefs.REQUEST_SHOW_CREATE.id]: keyBinds(
     keyComb(false, false, false, true, keyboardKeys.n.keyCode),
     keyComb(true, false, false, false, keyboardKeys.n.keyCode),
   ),
-
   [hotKeyRefs.REQUEST_QUICK_CREATE.id]: keyBinds(
     keyComb(false, true, false, true, keyboardKeys.n.keyCode),
     keyComb(true, true, false, false, keyboardKeys.n.keyCode),
   ),
-
   [hotKeyRefs.REQUEST_SHOW_DELETE.id]: keyBinds(
     keyComb(false, false, true, true, keyboardKeys.delete.keyCode),
     keyComb(true, false, true, false, keyboardKeys.delete.keyCode),
   ),
-
   [hotKeyRefs.REQUEST_SHOW_CREATE_FOLDER.id]: keyBinds(
     keyComb(false, false, true, true, keyboardKeys.n.keyCode),
     keyComb(true, false, true, false, keyboardKeys.n.keyCode),
   ),
-
   [hotKeyRefs.REQUEST_SHOW_DUPLICATE.id]: keyBinds(
     keyComb(false, false, false, true, keyboardKeys.d.keyCode),
     keyComb(true, false, false, false, keyboardKeys.d.keyCode),
   ),
-
   [hotKeyRefs.REQUEST_TOGGLE_PIN.id]: keyBinds(
     keyComb(false, false, true, true, keyboardKeys.p.keyCode),
     keyComb(true, false, true, false, keyboardKeys.p.keyCode),
   ),
-
   [hotKeyRefs.CLOSE_DROPDOWN.id]: keyBinds(
     keyComb(false, false, false, false, keyboardKeys.esc.keyCode),
     keyComb(false, false, false, false, keyboardKeys.esc.keyCode),
   ),
-
   [hotKeyRefs.CLOSE_MODAL.id]: keyBinds(
     keyComb(false, false, false, false, keyboardKeys.esc.keyCode),
     keyComb(false, false, false, false, keyboardKeys.esc.keyCode),
   ),
-
   [hotKeyRefs.ENVIRONMENT_UNCOVER_VARIABLES.id]: keyBinds(
     keyComb(false, true, true, false, keyboardKeys.u.keyCode),
     keyComb(false, true, true, false, keyboardKeys.u.keyCode),
   ),
-
   [hotKeyRefs.SHOW_SPEC_EDITOR.id]: keyBinds(
     keyComb(false, false, true, true, keyboardKeys.s.keyCode),
     keyComb(true, false, true, false, keyboardKeys.s.keyCode),
   ),
-
   [hotKeyRefs.SHOW_TEST.id]: keyBinds(
     keyComb(false, false, true, true, keyboardKeys.t.keyCode),
     keyComb(true, false, true, false, keyboardKeys.t.keyCode),
   ),
-
   [hotKeyRefs.SHOW_MONITOR.id]: keyBinds(
     keyComb(false, false, true, true, keyboardKeys.m.keyCode),
     keyComb(true, false, true, false, keyboardKeys.m.keyCode),
   ),
-
   [hotKeyRefs.SHOW_HOME.id]: keyBinds(
     keyComb(false, false, true, true, keyboardKeys.h.keyCode),
     keyComb(true, false, true, false, keyboardKeys.h.keyCode),
   ),
-
   [hotKeyRefs.FILTER_DOCUMENTS.id]: keyBinds(
     keyComb(false, false, false, true, keyboardKeys.f.keyCode),
     keyComb(true, false, false, false, keyboardKeys.f.keyCode),
@@ -391,12 +322,15 @@ export function newDefaultKeyBindings(hotKeyRefId: string): KeyBindings {
  */
 export function newDefaultRegistry(): HotKeyRegistry {
   const newDefaults: HotKeyRegistry = {};
+
   for (const refId in defaultRegistry) {
     if (!defaultRegistry.hasOwnProperty(refId)) {
       continue;
     }
+
     newDefaults[refId] = newDefaultKeyBindings(refId);
   }
+
   return newDefaults;
 }
 
@@ -409,6 +343,7 @@ export function getPlatformKeyCombinations(bindings: KeyBindings): Array<KeyComb
   if (isMac()) {
     return bindings.macKeys;
   }
+
   return bindings.winLinuxKeys;
 }
 
@@ -421,7 +356,7 @@ export function getPlatformKeyCombinations(bindings: KeyBindings): Array<KeyComb
 export function areSameKeyCombinations(
   keyComb1: KeyCombination,
   keyComb2: KeyCombination,
-): boolean {
+) {
   return (
     keyComb1.alt === keyComb2.alt &&
     keyComb1.shift === keyComb2.shift &&
@@ -438,22 +373,27 @@ export function areSameKeyCombinations(
  * @param keyBinds to check with the default ones.
  * @returns {boolean}
  */
-export function areKeyBindingsSameAsDefault(hotKeyRefId: string, keyBinds: KeyBindings): boolean {
+export function areKeyBindingsSameAsDefault(hotKeyRefId: string, keyBinds: KeyBindings) {
   const keyCombs = getPlatformKeyCombinations(keyBinds);
   const defaultKeyCombs = getPlatformKeyCombinations(defaultRegistry[hotKeyRefId]);
+
   if (keyCombs.length !== defaultKeyCombs.length) {
     return false;
   }
+
   for (const keyComb of keyCombs) {
     const found = defaultKeyCombs.find(defKeyComb => {
       if (areSameKeyCombinations(keyComb, defKeyComb)) {
         return true;
       }
+      return false;
     });
+
     if (found == null) {
       return false;
     }
   }
+
   return true;
 }
 
@@ -462,7 +402,7 @@ export function areKeyBindingsSameAsDefault(hotKeyRefId: string, keyBinds: KeyBi
  * @param keyCode
  * @returns {string}
  */
-export function getChar(keyCode: number): string {
+export function getChar(keyCode: number) {
   let char;
   const key = Object.keys(keyboardKeys).find(k => keyboardKeys[k].keyCode === keyCode);
 
@@ -475,10 +415,11 @@ export function getChar(keyCode: number): string {
   return char || 'unknown';
 }
 
-function joinHotKeys(mustUsePlus: boolean, keys: Array<string>): string {
+function joinHotKeys(mustUsePlus: boolean, keys: Array<string>) {
   if (!mustUsePlus && isMac()) {
     return keys.join('');
   }
+
   return keys.join('+');
 }
 
@@ -487,12 +428,11 @@ function joinHotKeys(mustUsePlus: boolean, keys: Array<string>): string {
  * @param keyCode
  * @returns {boolean}
  */
-export function isModifierKeyCode(keyCode: number): boolean {
+export function isModifierKeyCode(keyCode: number) {
   return (
     keyCode === keyboardKeys.alt.keyCode ||
     keyCode === keyboardKeys.shift.keyCode ||
-    keyCode === keyboardKeys.ctrl.keyCode ||
-    // Meta keys.
+    keyCode === keyboardKeys.ctrl.keyCode || // Meta keys.
     keyCode === keyboardKeys.leftwindowkey.keyCode ||
     keyCode === keyboardKeys.rightwindowkey.keyCode ||
     keyCode === keyboardKeys.selectkey.keyCode
@@ -512,22 +452,24 @@ export function isModifierKeyCode(keyCode: number): boolean {
 export function constructKeyCombinationDisplay(
   keyComb: KeyCombination,
   mustUsePlus: boolean,
-): string {
+) {
   const { ctrl, alt, shift, meta, keyCode } = keyComb;
-  const chars = [];
-
+  const chars: Array<string> = [];
   alt && chars.push(ALT_SYM);
   shift && chars.push(SHIFT_SYM);
   ctrl && chars.push(CTRL_SYM);
   meta && chars.push(META_SYM);
+
   if (keyCode != null && !isModifierKeyCode(keyCode)) {
     chars.push(getChar(keyCode));
   }
 
   let joint = joinHotKeys(mustUsePlus, chars);
+
   if (mustUsePlus && isModifierKeyCode(keyCode)) {
     joint += '+';
   }
+
   return joint;
 }
 
@@ -544,12 +486,14 @@ export function getHotKeyDisplay(
   hotKeyRegistry: HotKeyRegistry,
   mustUsePlus: boolean,
 ) {
-  const hotKey: ?KeyBindings = hotKeyRegistry[hotKeyDef.id];
+  const hotKey: KeyBindings | null | undefined = hotKeyRegistry[hotKeyDef.id];
+
   if (!hotKey) {
     return '';
   }
 
   const keyCombs: Array<KeyCombination> = getPlatformKeyCombinations(hotKey);
+
   if (keyCombs.length === 0) {
     return '';
   }
diff --git a/packages/insomnia-app/app/common/import.js b/packages/insomnia-app/app/common/import.ts
similarity index 78%
rename from packages/insomnia-app/app/common/import.js
rename to packages/insomnia-app/app/common/import.ts
index d43eaa8364..55ad2eb37e 100644
--- a/packages/insomnia-app/app/common/import.js
+++ b/packages/insomnia-app/app/common/import.ts
@@ -1,7 +1,6 @@
-// @flow
-import { convert } from 'insomnia-importers';
+import { convert, Insomnia4Data } from 'insomnia-importers';
 import clone from 'clone';
-import * as db from './database';
+import { database as db } from './database';
 import * as har from './har';
 import type { BaseModel } from '../models/index';
 import * as models from '../models/index';
@@ -20,14 +19,13 @@ import {
   isRequestGroup,
   isWorkspace,
 } from '../models/helpers/is-model';
-import type { Workspace, WorkspaceScope } from '../models/workspace';
+import type { Workspace } from '../models/workspace';
 import type { ApiSpec } from '../models/api-spec';
+import { ImportToWorkspacePrompt, SetWorkspaceScopePrompt } from '../ui/redux/modules/helpers';
 
 const WORKSPACE_ID_KEY = '__WORKSPACE_ID__';
 const BASE_ENVIRONMENT_ID_KEY = '__BASE_ENVIRONMENT_ID__';
-
 const EXPORT_FORMAT = 4;
-
 const EXPORT_TYPE_REQUEST = 'request';
 const EXPORT_TYPE_GRPC_REQUEST = 'grpc_request';
 const EXPORT_TYPE_REQUEST_GROUP = 'request_group';
@@ -39,10 +37,8 @@ const EXPORT_TYPE_ENVIRONMENT = 'environment';
 const EXPORT_TYPE_API_SPEC = 'api_spec';
 const EXPORT_TYPE_PROTO_FILE = 'proto_file';
 const EXPORT_TYPE_PROTO_DIRECTORY = 'proto_directory';
-
 // If we come across an ID of this form, we will replace it with a new one
 const REPLACE_ID_REGEX = /__\w+_\d+__/g;
-
 const MODELS = {
   [EXPORT_TYPE_REQUEST]: models.request,
   [EXPORT_TYPE_GRPC_REQUEST]: models.grpcRequest,
@@ -57,40 +53,40 @@ const MODELS = {
   [EXPORT_TYPE_PROTO_DIRECTORY]: models.protoDirectory,
 };
 
-export type ImportResult = {
-  source: string,
-  error: Error | null,
-  summary: { [string]: Array<BaseModel> },
-};
+export interface ImportResult {
+  source: string;
+  error: Error | null;
+  summary: Record<string, Array<BaseModel>>;
+}
 
-type ConvertResultType = {
-  id: string,
-  name: string,
-  description: string,
-};
+interface ConvertResultType {
+  id: string;
+  name: string;
+  description: string;
+}
 
-type ConvertResult = {
-  type: ConvertResultType,
+interface ConvertResult {
+  type: ConvertResultType;
   data: {
-    resources: Array<Object>,
-  },
-};
+    resources: Array<Record<string, any>>;
+  };
+}
 
-export type ImportRawConfig = {
-  getWorkspaceId: () => Promise<string | null>,
-  getWorkspaceScope?: string => Promise<WorkspaceScope>,
-  enableDiffBasedPatching?: boolean,
-  enableDiffDeep?: boolean,
+export interface ImportRawConfig {
+  getWorkspaceId: ImportToWorkspacePrompt;
+  getWorkspaceScope?: SetWorkspaceScopePrompt;
+  enableDiffBasedPatching?: boolean;
+  enableDiffDeep?: boolean;
   bypassDiffProps?: {
-    url: string,
-  },
-};
+    url: boolean;
+  };
+}
 
-export async function importUri(uri: string, importConfig: ImportRawConfig): Promise<ImportResult> {
+export async function importUri(uri: string, importConfig: ImportRawConfig) {
   let rawText;
-
   // If GH preview, force raw
   const url = new URL(uri);
+
   if (url.origin === 'https://github.com') {
     uri = uri
       .replace('https://github.com', 'https://raw.githubusercontent.com')
@@ -114,6 +110,7 @@ export async function importUri(uri: string, importConfig: ImportRawConfig): Pro
   if (error) {
     showError({
       title: 'Failed to import',
+      // @ts-expect-error -- TSCONVERSION appears to be a genuine error
       error: error.message,
       message: 'Import failed',
     });
@@ -127,15 +124,18 @@ export async function importUri(uri: string, importConfig: ImportRawConfig): Pro
       return count === 0 ? null : `${count} ${name}`;
     })
     .filter(s => s !== null);
-
   let message;
+
   if (statements.length === 0) {
     message = 'Nothing was found to import.';
   } else {
     message = `You imported ${statements.join(', ')}!`;
   }
-  showModal(AlertModal, { title: 'Import Succeeded', message });
 
+  showModal(AlertModal, {
+    title: 'Import Succeeded',
+    message,
+  });
   return result;
 }
 
@@ -148,22 +148,24 @@ export async function importRaw(
     enableDiffDeep,
     bypassDiffProps,
   }: ImportRawConfig,
-): Promise<ImportResult> {
+) {
   let results: ConvertResult;
+
   try {
     results = await convert(rawContent);
   } catch (err) {
-    return {
+    const importResult: ImportResult = {
       source: 'not found',
       error: err,
       summary: {},
     };
+    return importResult;
   }
 
   const { data, type: resultsType } = results;
-
   // Generate all the ids we may need
-  const generatedIds: { [string]: string | Function } = {};
+  const generatedIds: Record<string, string | ((...args: Array<any>) => any)> = {};
+
   for (const r of data.resources) {
     for (const key of r._id.match(REPLACE_ID_REGEX) || []) {
       generatedIds[key] = generateId(MODELS[r._type].prefix);
@@ -173,15 +175,11 @@ export async function importRaw(
   // Contains the ID of the workspace to be used with the import
   generatedIds[WORKSPACE_ID_KEY] = async () => {
     const workspaceId = await getWorkspaceId();
-
     // First try getting the workspace to overwrite
     const workspace = await models.workspace.getById(workspaceId || 'n/a');
-
     // Update this fn so it doesn't run again
     const idToUse = workspace?._id || generateId(models.workspace.prefix);
-
     generatedIds[WORKSPACE_ID_KEY] = idToUse;
-
     return idToUse;
   };
 
@@ -189,17 +187,15 @@ export async function importRaw(
   generatedIds[BASE_ENVIRONMENT_ID_KEY] = async () => {
     const parentId = await fnOrString(generatedIds[WORKSPACE_ID_KEY]);
     const baseEnvironment = await models.environment.getOrCreateForWorkspaceId(parentId);
-
     // Update this fn so it doesn't run again
     generatedIds[BASE_ENVIRONMENT_ID_KEY] = baseEnvironment._id;
-
     return baseEnvironment._id;
   };
 
   // Import everything backwards so they get inserted in the correct order
   data.resources.reverse();
-
   const importedDocs = {};
+
   for (const model of models.all()) {
     importedDocs[model.type] = [];
   }
@@ -227,7 +223,8 @@ export async function importRaw(
       }
     }
 
-    const model: Object = MODELS[resource._type];
+    const model = MODELS[resource._type];
+
     if (!model) {
       console.warn('Unknown doc type for import', resource._type);
       continue;
@@ -256,7 +253,10 @@ export async function importRaw(
     ) {
       try {
         JSON.parse(resource.body.text);
-        resource.headers.push({ name: 'Content-Type', value: 'application/json' });
+        resource.headers.push({
+          name: 'Content-Type',
+          value: 'application/json',
+        });
       } catch (err) {
         // Not JSON
       }
@@ -264,6 +264,7 @@ export async function importRaw(
 
     const existingDoc = await db.get(model.type, resource._id);
     let newDoc: BaseModel;
+
     if (existingDoc) {
       let updateDoc = resource;
 
@@ -279,20 +280,23 @@ export async function importRaw(
 
       // If workspace, don't overwrite the existing scope
       if (isWorkspace(model)) {
-        (updateDoc: Workspace).scope = (existingDoc: Workspace).scope;
+        (updateDoc as Workspace).scope = (existingDoc as Workspace).scope;
       }
 
       newDoc = await db.docUpdate(existingDoc, updateDoc);
     } else {
       if (isWorkspace(model)) {
-        await updateWorkspaceScope(resource, resultsType, getWorkspaceScope);
+        await updateWorkspaceScope(resource as Workspace, resultsType, getWorkspaceScope);
       }
+
       newDoc = await db.docCreate(model.type, resource);
 
       // Mark as not seen if we created a new workspace from sync
       if (isWorkspace(newDoc)) {
         const workspaceMeta = await models.workspaceMeta.getOrCreateByParentId(newDoc._id);
-        await models.workspaceMeta.update(workspaceMeta, { hasSeen: false });
+        await models.workspaceMeta.update(workspaceMeta, {
+          hasSeen: false,
+        });
       }
     }
 
@@ -306,13 +310,13 @@ export async function importRaw(
         contents: rawContent,
         contentType: 'yaml',
       });
-
       importedDocs[spec.type].push(spec);
     }
 
     // Set active environment when none is currently selected and one exists
     const meta = await models.workspaceMeta.getOrCreateByParentId(workspace._id);
     const envs = importedDocs[models.environment.type];
+
     if (!meta.activeEnvironmentId && envs.length > 0) {
       meta.activeEnvironmentId = envs[0]._id;
       await models.workspaceMeta.update(meta);
@@ -320,20 +324,19 @@ export async function importRaw(
   }
 
   await db.flushChanges();
-
   trackEvent('Data', 'Import', resultsType.id);
-
-  return {
+  const importRequest: ImportResult = {
     source: resultsType && typeof resultsType.id === 'string' ? resultsType.id : 'unknown',
     summary: importedDocs,
     error: null,
   };
+  return importRequest;
 }
 
 async function updateWorkspaceScope(
   resource: Workspace,
   resultType: ConvertResultType,
-  getWorkspaceScope?: string => Promise<WorkspaceScope>,
+  getWorkspaceScope?: SetWorkspaceScopePrompt,
 ) {
   // Set the workspace scope if creating a new workspace
   //  IF is creating a new workspace
@@ -342,6 +345,7 @@ async function updateWorkspaceScope(
   if ((!resource.hasOwnProperty('scope') || resource.scope === null) && getWorkspaceScope) {
     const workspaceName = resource.name;
     let specName;
+
     // If is from insomnia v4 and the spec has contents, add to the name when prompting
     if (isInsomniaV4Import(resultType)) {
       const spec: ApiSpec | null = await models.apiSpec.getByParentId(resource._id);
@@ -350,23 +354,24 @@ async function updateWorkspaceScope(
         specName = spec.fileName;
       }
     }
+
     const nameToPrompt = specName ? `${specName} / ${workspaceName}` : workspaceName;
-    (resource: Workspace).scope = await getWorkspaceScope(nameToPrompt);
+    (resource as Workspace).scope = await getWorkspaceScope(nameToPrompt);
   }
 }
 
-export function isApiSpecImport({ id }: ConvertResultType): boolean {
+export function isApiSpecImport({ id }: ConvertResultType) {
   return id === 'openapi3' || id === 'swagger2';
 }
 
-export function isInsomniaV4Import({ id }: ConvertResultType): boolean {
+export function isInsomniaV4Import({ id }: ConvertResultType) {
   return id === 'insomnia-4';
 }
 
 export async function exportWorkspacesHAR(
   parentDoc: BaseModel | null = null,
-  includePrivateDocs: boolean = false,
-): Promise<string> {
+  includePrivateDocs = false,
+) {
   const docs: Array<BaseModel> = await getDocWithDescendants(parentDoc, includePrivateDocs);
   const requests: Array<BaseModel> = docs.filter(isRequest);
   return exportRequestsHAR(requests, includePrivateDocs);
@@ -374,11 +379,12 @@ export async function exportWorkspacesHAR(
 
 export async function exportRequestsHAR(
   requests: Array<BaseModel>,
-  includePrivateDocs: boolean = false,
-): Promise<string> {
+  includePrivateDocs = false,
+) {
   const workspaces: Array<BaseModel> = [];
-  const mapRequestIdToWorkspace: Object = {};
-  const workspaceLookup: Object = {};
+  const mapRequestIdToWorkspace: Record<string, any> = {};
+  const workspaceLookup: Record<string, any> = {};
+
   for (const request of requests) {
     const ancestors: Array<BaseModel> = await db.withAncestors(request, [
       models.workspace.type,
@@ -386,32 +392,42 @@ export async function exportRequestsHAR(
     ]);
     const workspace = ancestors.find(isWorkspace);
     mapRequestIdToWorkspace[request._id] = workspace;
+
     if (workspace == null || workspaceLookup.hasOwnProperty(workspace._id)) {
       continue;
     }
+
     workspaceLookup[workspace._id] = true;
     workspaces.push(workspace);
   }
 
-  const mapWorkspaceIdToEnvironmentId: Object = {};
+  const mapWorkspaceIdToEnvironmentId: Record<string, any> = {};
+
   for (const workspace of workspaces) {
     const workspaceMeta = await models.workspaceMeta.getByParentId(workspace._id);
     let environmentId = workspaceMeta ? workspaceMeta.activeEnvironmentId : null;
     const environment = await models.environment.getById(environmentId || 'n/a');
+
     if (!environment || (environment.isPrivate && !includePrivateDocs)) {
       environmentId = 'n/a';
     }
+
     mapWorkspaceIdToEnvironmentId[workspace._id] = environmentId;
   }
 
-  requests = requests.sort((a: Object, b: Object) => (a.metaSortKey < b.metaSortKey ? -1 : 1));
-  const harRequests: Array<Object> = [];
+  requests = requests.sort((a: Record<string, any>, b: Record<string, any>) =>
+    a.metaSortKey < b.metaSortKey ? -1 : 1,
+  );
+  const harRequests: Array<har.ExportRequest> = [];
+
   for (const request of requests) {
     const workspace = mapRequestIdToWorkspace[request._id];
+
     if (workspace == null) {
       // Workspace not found for request, so don't export it.
       continue;
     }
+
     const environmentId = mapWorkspaceIdToEnvironmentId[workspace._id];
     harRequests.push({
       requestId: request._id,
@@ -420,9 +436,7 @@ export async function exportRequestsHAR(
   }
 
   const data = await har.exportHar(harRequests);
-
   trackEvent('Data', 'Export', 'HAR');
-
   return JSON.stringify(data, null, '\t');
 }
 
@@ -430,7 +444,7 @@ export async function exportWorkspacesData(
   parentDoc: BaseModel | null,
   includePrivateDocs: boolean,
   format: 'json' | 'yaml',
-): Promise<string> {
+) {
   const docs: Array<BaseModel> = await getDocWithDescendants(parentDoc, includePrivateDocs);
   const requests: Array<BaseModel> = docs.filter(doc => isRequest(doc) || isGrpcRequest(doc));
   return exportRequestsData(requests, includePrivateDocs, format);
@@ -440,8 +454,9 @@ export async function exportRequestsData(
   requests: Array<BaseModel>,
   includePrivateDocs: boolean,
   format: 'json' | 'yaml',
-): Promise<string> {
-  const data = {
+) {
+  const data: Insomnia4Data = {
+    // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
     _type: 'export',
     __export_format: EXPORT_FORMAT,
     __export_date: new Date(),
@@ -450,17 +465,21 @@ export async function exportRequestsData(
   };
   const docs: Array<BaseModel> = [];
   const workspaces: Array<BaseModel> = [];
-  const mapTypeAndIdToDoc: Object = {};
+  const mapTypeAndIdToDoc: Record<string, any> = {};
 
   for (const req of requests) {
     const ancestors: Array<BaseModel> = clone(await db.withAncestors(req));
+
     for (const ancestor of ancestors) {
       const key = ancestor.type + '___' + ancestor._id;
+
       if (mapTypeAndIdToDoc.hasOwnProperty(key)) {
         continue;
       }
+
       mapTypeAndIdToDoc[key] = ancestor;
       docs.push(ancestor);
+
       if (isWorkspace(ancestor)) {
         workspaces.push(ancestor);
       }
@@ -496,47 +515,64 @@ export async function exportRequestsData(
           isProtoFile(d) ||
           isProtoDirectory(d) ||
           isWorkspace(d) ||
+          // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
           d.type === models.cookieJar.type ||
+          // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
           d.type === models.environment.type ||
+          // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
           d.type === models.apiSpec.type
         )
       ) {
         return false;
       }
+
       // BaseModel doesn't have isPrivate, so cast it first.
-      return !(d: Object).isPrivate || includePrivateDocs;
+      return !d.isPrivate || includePrivateDocs;
     })
-    .map((d: Object) => {
+    .map(d => {
       if (isWorkspace(d)) {
+        // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
         d._type = EXPORT_TYPE_WORKSPACE;
       } else if (d.type === models.cookieJar.type) {
+        // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
         d._type = EXPORT_TYPE_COOKIE_JAR;
       } else if (d.type === models.environment.type) {
+        // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
         d._type = EXPORT_TYPE_ENVIRONMENT;
       } else if (d.type === models.unitTestSuite.type) {
+        // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
         d._type = EXPORT_TYPE_UNIT_TEST_SUITE;
       } else if (d.type === models.unitTest.type) {
+        // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
         d._type = EXPORT_TYPE_UNIT_TEST;
       } else if (isRequestGroup(d)) {
+        // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
         d._type = EXPORT_TYPE_REQUEST_GROUP;
       } else if (isRequest(d)) {
+        // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
         d._type = EXPORT_TYPE_REQUEST;
       } else if (isGrpcRequest(d)) {
+        // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
         d._type = EXPORT_TYPE_GRPC_REQUEST;
       } else if (isProtoFile(d)) {
+        // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
         d._type = EXPORT_TYPE_PROTO_FILE;
       } else if (isProtoDirectory(d)) {
+        // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
         d._type = EXPORT_TYPE_PROTO_DIRECTORY;
+        // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
       } else if (d.type === models.apiSpec.type) {
+        // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
         d._type = EXPORT_TYPE_API_SPEC;
       }
 
+      // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
       // Delete the things we don't want to export
       delete d.type;
       return d;
     });
-
   trackEvent('Data', 'Export', `Insomnia ${format}`);
+
   if (format.toLowerCase() === 'yaml') {
     return YAML.stringify(data);
   } else if (format.toLowerCase() === 'json') {
@@ -548,12 +584,11 @@ export async function exportRequestsData(
 
 async function getDocWithDescendants(
   parentDoc: BaseModel | null = null,
-  includePrivateDocs: boolean = false,
+  includePrivateDocs = false,
 ): Promise<Array<BaseModel>> {
   const docs = await db.withDescendants(parentDoc);
   return docs.filter(
-    d =>
-      // Don't include if private, except if we want to
-      !(d: any).isPrivate || includePrivateDocs,
+    // Don't include if private, except if we want to
+    doc => !doc?.isPrivate || includePrivateDocs,
   );
 }
diff --git a/packages/insomnia-app/app/common/keyboard-keys.js b/packages/insomnia-app/app/common/keyboard-keys.ts
similarity index 99%
rename from packages/insomnia-app/app/common/keyboard-keys.js
rename to packages/insomnia-app/app/common/keyboard-keys.ts
index 889bf36a2c..8ff3e9f9e8 100644
--- a/packages/insomnia-app/app/common/keyboard-keys.js
+++ b/packages/insomnia-app/app/common/keyboard-keys.ts
@@ -1,6 +1,4 @@
-// @flow
-
-export const keyboardKeys: Object = {
+export const keyboardKeys: Record<string, any> = {
   backspace: {
     keyCode: 8,
     label: 'Backspace',
diff --git a/packages/insomnia-app/app/common/log.js b/packages/insomnia-app/app/common/log.ts
similarity index 82%
rename from packages/insomnia-app/app/common/log.js
rename to packages/insomnia-app/app/common/log.ts
index 0fe1806335..a676101f6d 100644
--- a/packages/insomnia-app/app/common/log.js
+++ b/packages/insomnia-app/app/common/log.ts
@@ -1,4 +1,3 @@
-// @flow
 import log from 'electron-log';
 import { isDevelopment } from './constants';
 import { dirname } from 'path';
@@ -13,8 +12,8 @@ export const initializeLogging = () => {
     // Set the max log file size to 10mb
     // When the log file exceeds this limit, it will be rotated to {file name}.old.log file.
     fileTransport.maxSize = 1024 * 1024 * 10;
-
     // Rotate the log file every time we start the app
+    // @ts-expect-error -- TSCONVERSION seems like something is wrong here but I don't want to convert to string until I can take a closer look
     fileTransport.archiveLog(logFile);
     logFile.clear();
   }
@@ -23,7 +22,7 @@ export const initializeLogging = () => {
   Object.assign(console, log.functions);
 };
 
-export function getLogDirectory(): string {
+export function getLogDirectory() {
   const logPath = log.transports.file.getFile().path;
   return dirname(logPath);
 }
diff --git a/packages/insomnia-app/app/common/markdown-to-html.js b/packages/insomnia-app/app/common/markdown-to-html.ts
similarity index 81%
rename from packages/insomnia-app/app/common/markdown-to-html.js
rename to packages/insomnia-app/app/common/markdown-to-html.ts
index 73c90f5784..cacb236c47 100644
--- a/packages/insomnia-app/app/common/markdown-to-html.js
+++ b/packages/insomnia-app/app/common/markdown-to-html.ts
@@ -3,6 +3,7 @@ import marked from 'marked';
 marked.setOptions({
   renderer: new marked.Renderer(),
   gfm: true,
+  // @ts-expect-error -- TSCONVERSION missing from marked types
   tables: true,
   breaks: false,
   pedantic: false,
diff --git a/packages/insomnia-app/app/common/migrate-from-designer.js b/packages/insomnia-app/app/common/migrate-from-designer.ts
similarity index 81%
rename from packages/insomnia-app/app/common/migrate-from-designer.js
rename to packages/insomnia-app/app/common/migrate-from-designer.ts
index 1717ed542d..7139f794f8 100644
--- a/packages/insomnia-app/app/common/migrate-from-designer.js
+++ b/packages/insomnia-app/app/common/migrate-from-designer.ts
@@ -1,10 +1,9 @@
-// @flow
 import NeDB from 'nedb';
 import type { BaseModel } from '../models';
 import fsPath from 'path';
 import fs from 'fs';
 import * as models from '../models';
-import * as db from './database';
+import { database as db } from './database';
 import { getModelName } from '../models';
 import { difference } from 'lodash';
 import type { Workspace } from '../models/workspace';
@@ -14,17 +13,19 @@ import * as electron from 'electron';
 import { trackEvent } from './analytics';
 import { WorkspaceScopeKeys } from '../models/workspace';
 
-async function loadDesignerDb(types: Array<string>, designerDataDir: string): Promise<Object> {
+async function loadDesignerDb(
+  types: Array<string>,
+  designerDataDir: string,
+): Promise<Record<string, any>> {
   const designerDb = {};
-
   types.forEach(type => {
     designerDb[type] = []; // initialize each type to empty array
   });
-
   const promises = types.map(
     type =>
-      new Promise((resolve, reject) => {
+      new Promise<void>((resolve, reject) => {
         const filePath = fsPath.join(designerDataDir, `insomnia.${type}.db`);
+
         if (!fs.existsSync(filePath)) {
           console.log(`[db] db file for ${type} not found: ${filePath}`);
           resolve();
@@ -36,76 +37,64 @@ async function loadDesignerDb(types: Array<string>, designerDataDir: string): Pr
           filename: filePath,
           corruptAlertThreshold: 0.9,
         });
-
         // Find every entry and store in memory
         collection.find({}, (err, docs: Array<BaseModel>) => {
           if (err) {
             return reject(err);
           }
 
-          (designerDb[type]: Array<Object>).push(...docs);
+          (designerDb[type] as Array<Record<string, any>>).push(...docs);
           resolve();
         });
       }),
   );
-
   await Promise.all(promises);
-
   // Return entries, but no longer linked to the database files
   return designerDb;
 }
 
-type DBType = { [string]: Array<BaseModel> };
+type DBType = Record<string, Array<BaseModel>>;
 
-export type MigrationOptions = {
-  useDesignerSettings: boolean,
-  copyPlugins: boolean,
-  copyWorkspaces: boolean,
-  designerDataDir: string,
-  coreDataDir: string,
-};
+export interface MigrationOptions {
+  useDesignerSettings: boolean;
+  copyPlugins: boolean;
+  copyWorkspaces: boolean;
+  designerDataDir: string;
+  coreDataDir: string;
+}
 
-export type MigrationResult = {
-  error?: Error,
-};
+export interface MigrationResult {
+  error?: Error;
+}
 
 async function createCoreBackup(modelTypes: Array<string>, coreDataDir: string) {
-  console.log(`[db-merge] creating backup`);
-
+  console.log('[db-merge] creating backup');
   const backupDir = fsPath.join(coreDataDir, 'core-backup');
   await fsx.remove(backupDir);
   await fsx.ensureDir(backupDir);
-
   // Copy db files
   const filesToCopy = modelTypes.map(modelType => `insomnia.${modelType}.db`);
 
   for (const entryName of filesToCopy) {
     const src = fsPath.join(coreDataDir, entryName);
     const dest = fsPath.join(backupDir, entryName);
-
     await fsx.copy(src, dest);
   }
 
   // Copy dirs
   const dirsToCopy = ['plugins', 'responses', 'version-control'];
-
   await copyDirs(dirsToCopy, coreDataDir, backupDir);
-
   console.log(`[db-merge] backup created at ${backupDir}`);
-
   return backupDir;
 }
 
 async function migratePlugins(designerDataDir: string, coreDataDir: string) {
   const designerPluginDir = fsPath.join(designerDataDir, 'plugins');
   const corePluginDir = fsPath.join(coreDataDir, 'plugins');
-
   // get list of plugins in Designer
   const designerPlugins = await readDirs(designerPluginDir);
-
   await removeDirs(designerPlugins, corePluginDir);
   await copyDirs(designerPlugins, designerPluginDir, corePluginDir);
-
   // Remove plugin bundle from installed plugins because it's included with the app now
   const pluginsToDelete = [
     'insomnia-plugin-kong-bundle',
@@ -116,7 +105,7 @@ async function migratePlugins(designerDataDir: string, coreDataDir: string) {
   await removeDirs(pluginsToDelete, corePluginDir);
 }
 
-async function readDirs(srcDir: string): Array<string> {
+async function readDirs(srcDir: string) {
   if (existsAndIsDirectory(srcDir)) {
     return await fs.promises.readdir(srcDir);
   } else {
@@ -140,47 +129,46 @@ async function copyDirs(dirs: Array<string>, srcDir: string, destDir: string) {
 async function removeDirs(dirs: Array<string>, srcDir: string) {
   for (const dir of dirs.filter(c => c)) {
     const dirToRemove = fsPath.join(srcDir, dir);
+
     if (existsAndIsDirectory(dirToRemove)) {
       await fsx.remove(dirToRemove);
     }
   }
 }
 
-export function existsAndIsDirectory(name: string): boolean {
+export function existsAndIsDirectory(name: string) {
   return fs.existsSync(name) && fs.statSync(name).isDirectory();
 }
-
 export default async function migrateFromDesigner({
   useDesignerSettings,
   designerDataDir,
   coreDataDir,
   copyPlugins,
   copyWorkspaces,
-}: MigrationOptions): Promise<MigrationResult> {
+}: MigrationOptions) {
   console.log(
     `[db-merge] starting process for migrating from ${designerDataDir} to ${coreDataDir}`,
   );
-
   const nonWorkspaceModels = [
     models.stats.type, // TODO: investigate further any implications that may invalidate collected stats
     models.settings.type,
   ];
-
   // Every model except those to ignore and settings is a "workspace" model
   const workspaceModels = difference(models.types(), nonWorkspaceModels);
-
   const modelTypesToMerge = [];
 
   if (useDesignerSettings) {
     trackEvent('Data', 'Migration', 'Settings');
+    // @ts-expect-error -- TSCONVERSION
     modelTypesToMerge.push(models.settings.type);
-    console.log(`[db-merge] keeping settings from Insomnia Designer`);
+    console.log('[db-merge] keeping settings from Insomnia Designer');
   } else {
-    console.log(`[db-merge] keeping settings from Insomnia Core`);
+    console.log('[db-merge] keeping settings from Insomnia Core');
   }
 
   if (copyWorkspaces) {
     trackEvent('Data', 'Migration', 'Workspaces');
+    // @ts-expect-error -- TSCONVERSION
     modelTypesToMerge.push(...workspaceModels);
   }
 
@@ -189,7 +177,6 @@ export default async function migrateFromDesigner({
   try {
     // Create core backup
     backupDir = await createCoreBackup(modelTypesToMerge, coreDataDir);
-
     // Load designer database
     const designerDb: DBType = await loadDesignerDb(modelTypesToMerge, designerDataDir);
 
@@ -207,7 +194,7 @@ export default async function migrateFromDesigner({
         ];
         propertiesToPersist.forEach(s => {
           if (coreSettings.hasOwnProperty(s)) {
-            (entries[0]: Settings)[s] = coreSettings[s];
+            (entries[0] as Settings)[s] = coreSettings[s];
           }
         });
       }
@@ -215,7 +202,7 @@ export default async function migrateFromDesigner({
       // For each workspace coming from Designer, mark workspace.scope as 'design'
       if (modelType === models.workspace.type) {
         for (const workspace of entries) {
-          (workspace: Workspace).scope = WorkspaceScopeKeys.design;
+          (workspace as Workspace).scope = WorkspaceScopeKeys.design;
         }
       }
 
@@ -223,25 +210,26 @@ export default async function migrateFromDesigner({
       console.log(
         `[db-merge] merging ${entryCount} ${getModelName(modelType, entryCount)} from Designer`,
       );
-      await db.batchModifyDocs({ upsert: entries, remove: [] });
+      await db.batchModifyDocs({
+        upsert: entries,
+        remove: [],
+      });
     }
 
     if (copyWorkspaces) {
-      console.log(`[db-merge] migrating version control data from designer to core`);
+      console.log('[db-merge] migrating version control data from designer to core');
       await copyDirs(['version-control'], designerDataDir, coreDataDir);
-
-      console.log(`[db-merge] migrating response cache from designer to core`);
+      console.log('[db-merge] migrating response cache from designer to core');
       await copyDirs(['responses'], designerDataDir, coreDataDir);
     }
 
     if (copyPlugins) {
-      console.log(`[db-merge] migrating plugins from designer to core`);
+      console.log('[db-merge] migrating plugins from designer to core');
       trackEvent('Data', 'Migration', 'Plugins');
       await migratePlugins(designerDataDir, coreDataDir);
     }
 
     console.log('[db-merge] done!');
-
     trackEvent('Data', 'Migration', 'Success');
     return {};
   } catch (error) {
@@ -249,13 +237,14 @@ export default async function migrateFromDesigner({
     console.error(error);
     trackEvent('Data', 'Migration', 'Failure');
     await restoreCoreBackup(backupDir, coreDataDir);
-    return { error };
+    return {
+      error,
+    } as MigrationResult;
   }
 }
-
 export async function restoreCoreBackup(backupDir: string, coreDataDir: string) {
   if (!backupDir) {
-    console.log(`[db-merge] nothing to restore; no backup was created`);
+    console.log('[db-merge] nothing to restore; no backup was created');
     return;
   }
 
@@ -264,12 +253,11 @@ export async function restoreCoreBackup(backupDir: string, coreDataDir: string)
     return;
   }
 
-  console.log(`[db-merge] restoring from backup`);
+  console.log('[db-merge] restoring from backup');
   await removeDirs(['plugins', 'responses', 'version-control'], coreDataDir);
   await fsx.copy(backupDir, coreDataDir);
-  console.log(`[db-merge] restored from backup`);
+  console.log('[db-merge] restored from backup');
 }
-
 export function restartApp() {
   const { app } = electron.remote || electron;
   app.relaunch();
diff --git a/packages/insomnia-app/app/common/misc.js b/packages/insomnia-app/app/common/misc.ts
similarity index 62%
rename from packages/insomnia-app/app/common/misc.js
rename to packages/insomnia-app/app/common/misc.ts
index 78e59ed068..38cccc7d80 100644
--- a/packages/insomnia-app/app/common/misc.js
+++ b/packages/insomnia-app/app/common/misc.ts
@@ -1,5 +1,3 @@
-// @flow
-import * as electron from 'electron';
 import { Readable, Writable } from 'stream';
 import fuzzysort from 'fuzzysort';
 import * as uuid from 'uuid';
@@ -9,17 +7,20 @@ import { METHOD_OPTIONS, METHOD_DELETE, DEBOUNCE_MILLIS } from './constants';
 
 const ESCAPE_REGEX_MATCH = /[-[\]/{}()*+?.\\^$|]/g;
 
-type Header = {
-  name: string,
-  value: string,
-};
+interface Header {
+  name: string;
+  value: string;
+}
 
-type Parameter = {
-  name: string,
-  value: string,
-};
+interface Parameter {
+  name: string;
+  value: string;
+}
 
-export function filterParameters<T: Parameter>(parameters: Array<T>, name: string): Array<T> {
+export function filterParameters<T extends Parameter>(
+  parameters: Array<T>,
+  name: string,
+): Array<T> {
   if (!Array.isArray(parameters) || !name) {
     return [];
   }
@@ -27,75 +28,75 @@ export function filterParameters<T: Parameter>(parameters: Array<T>, name: strin
   return parameters.filter(h => (!h || !h.name ? false : h.name === name));
 }
 
-export function filterHeaders<T: Header>(headers: Array<T>, name: string): Array<T> {
-  if (!Array.isArray(headers) || !name || !(typeof name === 'string')) {
+export function filterHeaders<T extends Header>(headers: Array<T>, name?: string): Array<T> {
+  if (!Array.isArray(headers) || !name || typeof name !== 'string') {
     return [];
   }
 
-  return headers.filter(h => {
+  return headers.filter(header => {
     // Never match against invalid headers
-    if (!h || !h.name || typeof h.name !== 'string') {
+    if (!header || !header.name || typeof header.name !== 'string') {
       return false;
     }
 
-    return h.name.toLowerCase() === name.toLowerCase();
+    return header.name.toLowerCase() === name.toLowerCase();
   });
 }
 
-export function hasContentTypeHeader<T: Header>(headers: Array<T>): boolean {
+export function hasContentTypeHeader<T extends Header>(headers: Array<T>) {
   return filterHeaders(headers, 'content-type').length > 0;
 }
 
-export function hasContentLengthHeader<T: Header>(headers: Array<T>): boolean {
+export function hasContentLengthHeader<T extends Header>(headers: Array<T>) {
   return filterHeaders(headers, 'content-length').length > 0;
 }
 
-export function hasAuthHeader<T: Header>(headers: Array<T>): boolean {
+export function hasAuthHeader<T extends Header>(headers: Array<T>) {
   return filterHeaders(headers, 'authorization').length > 0;
 }
 
-export function hasAcceptHeader<T: Header>(headers: Array<T>): boolean {
+export function hasAcceptHeader<T extends Header>(headers: Array<T>) {
   return filterHeaders(headers, 'accept').length > 0;
 }
 
-export function hasUserAgentHeader<T: Header>(headers: Array<T>): boolean {
+export function hasUserAgentHeader<T extends Header>(headers: Array<T>) {
   return filterHeaders(headers, 'user-agent').length > 0;
 }
 
-export function hasAcceptEncodingHeader<T: Header>(headers: Array<T>): boolean {
+export function hasAcceptEncodingHeader<T extends Header>(headers: Array<T>) {
   return filterHeaders(headers, 'accept-encoding').length > 0;
 }
 
-export function getSetCookieHeaders<T: Header>(headers: Array<T>): Array<T> {
+export function getSetCookieHeaders<T extends Header>(headers: Array<T>): Array<T> {
   return filterHeaders(headers, 'set-cookie');
 }
 
-export function getLocationHeader<T: Header>(headers: Array<T>): T | null {
+export function getLocationHeader<T extends Header>(headers: Array<T>): T | null {
   const matches = filterHeaders(headers, 'location');
   return matches.length ? matches[0] : null;
 }
 
-export function getContentTypeHeader<T: Header>(headers: Array<T>): T | null {
+export function getContentTypeHeader<T extends Header>(headers: Array<T>): T | null {
   const matches = filterHeaders(headers, 'content-type');
   return matches.length ? matches[0] : null;
 }
 
-export function getMethodOverrideHeader<T: Header>(headers: Array<T>): T | null {
+export function getMethodOverrideHeader<T extends Header>(headers: Array<T>): T | null {
   const matches = filterHeaders(headers, 'x-http-method-override');
   return matches.length ? matches[0] : null;
 }
 
-export function getHostHeader<T: Header>(headers: Array<T>): T | null {
+export function getHostHeader<T extends Header>(headers: Array<T>): T | null {
   const matches = filterHeaders(headers, 'host');
   return matches.length ? matches[0] : null;
 }
 
-export function getContentDispositionHeader<T: Header>(headers: Array<T>): T | null {
+export function getContentDispositionHeader<T extends Header>(headers: Array<T>): T | null {
   const matches = filterHeaders(headers, 'content-disposition');
   return matches.length ? matches[0] : null;
 }
 
-export function getContentLengthHeader<T: Header>(headers: Array<T>): T | null {
+export function getContentLengthHeader<T extends Header>(headers: Array<T>): T | null {
   const matches = filterHeaders(headers, 'content-length');
   return matches.length ? matches[0] : null;
 }
@@ -105,7 +106,7 @@ export function getContentLengthHeader<T: Header>(headers: Array<T>): T | null {
  * @param prefix
  * @returns {string}
  */
-export function generateId(prefix: string): string {
+export function generateId(prefix?: string) {
   const id = uuid.v4().replace(/-/g, '');
 
   if (prefix) {
@@ -115,31 +116,32 @@ export function generateId(prefix: string): string {
   }
 }
 
-export function delay(milliseconds: number = DEBOUNCE_MILLIS): Promise<void> {
-  return new Promise(resolve => setTimeout(resolve, milliseconds));
+export function delay(milliseconds: number = DEBOUNCE_MILLIS) {
+  return new Promise<void>(resolve => setTimeout(resolve, milliseconds));
 }
 
-export function removeVowels(str: string): string {
+export function removeVowels(str: string) {
   return str.replace(/[aeiouyAEIOUY]/g, '');
 }
 
-export function formatMethodName(method: string): string {
+export function formatMethodName(method: string) {
   let methodName = method || '';
+
   if (method === METHOD_DELETE || method === METHOD_OPTIONS) {
     methodName = method.slice(0, 3);
   } else if (method.length > 4) {
     methodName = removeVowels(method).slice(0, 4);
   }
+
   return methodName;
 }
 
-export function keyedDebounce(callback: Function, millis: number = DEBOUNCE_MILLIS): Function {
+export function keyedDebounce<T extends Function>(callback: T, millis: number = DEBOUNCE_MILLIS): T {
   let timeout;
   let results = {};
-
-  return function(key, ...args) {
+  // @ts-expect-error -- TSCONVERSION
+  const t: T = function(key, ...args) {
     results[key] = args;
-
     clearTimeout(timeout);
     timeout = setTimeout(() => {
       if (!Object.keys(results).length) {
@@ -150,23 +152,27 @@ export function keyedDebounce(callback: Function, millis: number = DEBOUNCE_MILL
       results = {};
     }, millis);
   };
+  return t;
 }
 
-export function debounce(callback: Function, millis: number = DEBOUNCE_MILLIS): Function {
+export function debounce<T extends Function>(
+  callback: T,
+  milliseconds: number = DEBOUNCE_MILLIS,
+): T {
   // For regular debounce, just use a keyed debounce with a fixed key
   return keyedDebounce(results => {
+    // eslint-disable-next-line prefer-spread -- don't know if there was a "this binding" reason for this being this way so I'm leaving it alone
     callback.apply(null, results.__key__);
-  }, millis).bind(null, '__key__');
+  }, milliseconds).bind(null, '__key__');
 }
 
-export function describeByteSize(bytes: number, long: boolean = false): string {
+export function describeByteSize(bytes: number, long = false) {
   bytes = Math.round(bytes * 10) / 10;
   let size;
-
   // NOTE: We multiply these by 2 so we don't end up with
   // values like 0 GB
-
   let unit;
+
   if (bytes < 1024 * 2) {
     size = bytes;
     unit = long ? 'bytes' : 'B';
@@ -185,19 +191,15 @@ export function describeByteSize(bytes: number, long: boolean = false): string {
   return `${rounded} ${unit}`;
 }
 
-export function nullFn(): void {
+export function nullFn() {
   // Do nothing
 }
 
-export function preventDefault(e: Event): void {
+export function preventDefault(e: Event) {
   e.preventDefault();
 }
 
-export function clickLink(href: string): void {
-  electron.shell.openExternal(href);
-}
-
-export function fnOrString(v: string | Function, ...args: Array<any>) {
+export function fnOrString(v: string | ((...args: Array<any>) => any), ...args: Array<any>) {
   if (typeof v === 'string') {
     return v;
   } else {
@@ -205,7 +207,7 @@ export function fnOrString(v: string | Function, ...args: Array<any>) {
   }
 }
 
-export function compressObject(obj: any): string {
+export function compressObject(obj: any) {
   const compressed = zlib.gzipSync(JSON.stringify(obj));
   return compressed.toString('base64');
 }
@@ -219,7 +221,7 @@ export function decompressObject(input: string | null): any {
   return JSON.parse(jsonBuffer.toString('utf8'));
 }
 
-export function resolveHomePath(p: string): string {
+export function resolveHomePath(p: string) {
   if (p.indexOf('~/') === 0) {
     return pathJoin(process.env.HOME || '/', p.slice(1));
   } else {
@@ -235,7 +237,7 @@ export function jsonParseOr(str: string, fallback: any): any {
   }
 }
 
-export function escapeHTML(unsafeText: string): string {
+export function escapeHTML(unsafeText: string) {
   const div = document.createElement('div');
   div.innerText = unsafeText;
   return div.innerHTML;
@@ -246,37 +248,48 @@ export function escapeHTML(unsafeText: string): string {
  * @param str - string to escape
  * @returns {string} escaped string
  */
-export function escapeRegex(str: string): string {
+export function escapeRegex(str: string) {
   return str.replace(ESCAPE_REGEX_MATCH, '\\$&');
 }
 
 export function fuzzyMatch(
   searchString: string,
   text: string,
-  options: { splitSpace?: boolean, loose?: boolean } = {},
-): null | { score: number, indexes: Array<number> } {
+  options: {
+    splitSpace?: boolean;
+    loose?: boolean;
+  } = {},
+): null | {
+  score: number;
+  indexes: Array<number>;
+} {
   return fuzzyMatchAll(searchString, [text], options);
 }
 
 export function fuzzyMatchAll(
   searchString: string,
   allText: Array<string>,
-  options: { splitSpace?: boolean, loose?: boolean } = {},
-): null | { score: number, indexes: Array<number> } {
+  options: {
+    splitSpace?: boolean;
+    loose?: boolean;
+  } = {},
+) {
   if (!searchString || !searchString.trim()) {
     return null;
   }
 
   const words = searchString.split(' ').filter(w => w.trim());
   const terms = options.splitSpace ? [...words, searchString] : [searchString];
-
-  let maxScore = null;
-  let indexes = [];
+  let maxScore: number | null = null;
+  let indexes: Array<number> = [];
   let termsMatched = 0;
+
   for (const term of terms) {
     let matchedTerm = false;
+
     for (const text of allText.filter(t => !t || t.trim())) {
       const result = fuzzysort.single(term, text);
+
       if (!result) {
         continue;
       }
@@ -315,62 +328,30 @@ export function fuzzyMatchAll(
   };
 }
 
-export function getViewportSize(): string | null {
-  const { BrowserWindow } = electron.remote || electron;
-  const w = BrowserWindow.getFocusedWindow() || BrowserWindow.getAllWindows()[0];
-
-  if (w) {
-    const { width, height } = w.getContentBounds();
-    return `${width}x${height}`;
-  } else {
-    // No windows open
-    return null;
-  }
-}
-
-export function getScreenResolution(): string {
-  const { screen } = electron.remote || electron;
-  const { width, height } = screen.getPrimaryDisplay().workAreaSize;
-  return `${width}x${height}`;
-}
-
-export function getUserLanguage(): string {
-  const { app } = electron.remote || electron;
-  return app.getLocale();
-}
-
-export async function waitForStreamToFinish(s: Readable | Writable): Promise<void> {
-  return new Promise(resolve => {
-    if ((s: any)._readableState && (s: any)._readableState.finished) {
+export async function waitForStreamToFinish(stream: Readable | Writable) {
+  return new Promise<void>(resolve => {
+    // @ts-expect-error -- access of internal values that are intended to be private.  We should _not_ do this.
+    if (stream._readableState?.finished) {
       return resolve();
     }
 
-    if ((s: any)._writableState && (s: any)._writableState.finished) {
+    // @ts-expect-error -- access of internal values that are intended to be private.  We should _not_ do this.
+    if (stream._writableState?.finished) {
       return resolve();
     }
 
-    s.on('close', () => {
+    stream.on('close', () => {
       resolve();
     });
-
-    s.on('error', () => {
+    stream.on('error', () => {
       resolve();
     });
   });
 }
 
-export function getDesignerDataDir(): string {
-  const { app } = electron.remote || electron;
-  return process.env.DESIGNER_DATA_PATH || pathJoin(app.getPath('appData'), 'Insomnia Designer');
-}
+export function chunkArray<T>(arr: Array<T>, chunkSize: number) {
+  const chunks: Array<Array<T>> = [];
 
-export function getDataDirectory(): string {
-  const { app } = electron.remote || electron;
-  return process.env.INSOMNIA_DATA_PATH || app.getPath('userData');
-}
-
-export function chunkArray<T>(arr: Array<T>, chunkSize: number): Array<Array<T>> {
-  const chunks = [];
   for (let i = 0, j = arr.length; i < j; i += chunkSize) {
     chunks.push(arr.slice(i, i + chunkSize));
   }
@@ -378,7 +359,7 @@ export function chunkArray<T>(arr: Array<T>, chunkSize: number): Array<Array<T>>
   return chunks;
 }
 
-export function pluralize(text: string): string {
+export function pluralize(text: string) {
   let trailer = 's';
   let chop = 0;
 
@@ -398,7 +379,7 @@ export function pluralize(text: string): string {
   return `${text.slice(0, text.length - chop)}${trailer}`;
 }
 
-export function diffPatchObj(baseObj: {}, patchObj: {}, deep = false): ObjectComparison {
+export function diffPatchObj(baseObj: {}, patchObj: {}, deep = false) {
   const clonedBaseObj = JSON.parse(JSON.stringify(baseObj));
 
   for (const prop in baseObj) {
@@ -437,21 +418,20 @@ export function diffPatchObj(baseObj: {}, patchObj: {}, deep = false): ObjectCom
   return clonedBaseObj;
 }
 
-export function isObject(obj: any) {
+export function isObject(obj: unknown) {
   return obj !== null && typeof obj === 'object';
 }
 
+/**
+  Finds epoch's digit count and converts it to make it exactly 13 digits.
+  Which is the epoch millisecond represntation.
+*/
 export function convertEpochToMilliseconds(epoch: number) {
-  /* 
-    Finds epoch's digit count and converts it to make it exactly 13 digits. 
-    Which is the epoch millisecond represntation.
-  */
   const expDigitCount = epoch.toString().length;
-  const convertedEpoch = parseInt(epoch * 10 ** (13 - expDigitCount));
-  return convertedEpoch;
+  return parseInt(String(epoch * 10 ** (13 - expDigitCount)), 10);
 }
 
-export function snapNumberToLimits(value: number, min?: number, max?: number): number {
+export function snapNumberToLimits(value: number, min?: number, max?: number) {
   const moreThanMax = max && !Number.isNaN(max) && value > max;
   const lessThanMin = min && !Number.isNaN(min) && value < min;
 
@@ -464,6 +444,6 @@ export function snapNumberToLimits(value: number, min?: number, max?: number): n
   return value;
 }
 
-export function isNotNullOrUndefined(obj: any): boolean {
+export function isNotNullOrUndefined(obj: unknown) {
   return obj !== null && obj !== undefined;
 }
diff --git a/packages/insomnia-app/app/common/render.js b/packages/insomnia-app/app/common/render.ts
similarity index 91%
rename from packages/insomnia-app/app/common/render.js
rename to packages/insomnia-app/app/common/render.ts
index 47d5d93078..787ae62077 100644
--- a/packages/insomnia-app/app/common/render.js
+++ b/packages/insomnia-app/app/common/render.ts
@@ -1,12 +1,10 @@
-// @flow
 import type { Request } from '../models/request';
 import type { BaseModel } from '../models/index';
-
 import { setDefaultProtocol } from 'insomnia-url';
 import clone from 'clone';
 import * as models from '../models';
 import { CONTENT_TYPE_GRAPHQL, JSON_ORDER_SEPARATOR } from './constants';
-import * as db from './database';
+import { database as db } from './database';
 import * as templating from '../templating';
 import type { CookieJar } from '../models/cookie-jar';
 import type { Environment } from '../models/environment';
@@ -17,31 +15,49 @@ import { isRequestGroup } from '../models/helpers/is-model';
 
 export const KEEP_ON_ERROR = 'keep';
 export const THROW_ON_ERROR = 'throw';
-
 export type RenderPurpose = 'send' | 'general' | 'no-render';
-
 export const RENDER_PURPOSE_SEND: RenderPurpose = 'send';
 export const RENDER_PURPOSE_GENERAL: RenderPurpose = 'general';
 export const RENDER_PURPOSE_NO_RENDER: RenderPurpose = 'no-render';
 
 /** Key/value pairs to be provided to the render context */
-export type ExtraRenderInfo = Array<{ name: string, value: any }>;
+export type ExtraRenderInfo = Array<{
+  name: string;
+  value: any;
+}>;
 
 export type RenderedRequest = Request & {
-  cookies: Array<{ name: string, value: string, disabled?: boolean }>,
-  cookieJar: CookieJar,
+  cookies: Array<{
+    name: string;
+    value: string;
+    disabled?: boolean;
+  }>;
+  cookieJar: CookieJar;
 };
 
 export type RenderedGrpcRequest = GrpcRequest;
+
 export type RenderedGrpcRequestBody = GrpcRequestBody;
 
+export interface RenderContextAndKeys {
+  context: Record<string, any>;
+  keys: Array<{
+    name: string;
+    value: any;
+  }>
+}
+
+export type HandleGetRenderContext = () => Promise<RenderContextAndKeys>;
+
+export type HandleRender = <T>(object: T, contextCacheKey?: string | null) => Promise<T>;
+
 export async function buildRenderContext(
   ancestors: Array<BaseModel> | null,
   rootEnvironment: Environment | null,
   subEnvironment: Environment | null,
-  baseContext: Object = {},
-): Object {
-  const envObjects = [];
+  baseContext: Record<string, any> = {},
+) {
+  const envObjects: Array<Record<string, any>> = [];
 
   // Get root environment keys in correct order
   // Then get sub environment keys in correct order
@@ -52,7 +68,6 @@ export async function buildRenderContext(
       rootEnvironment.dataPropertyOrder,
       JSON_ORDER_SEPARATOR,
     );
-
     envObjects.push(ordered);
   }
 
@@ -62,13 +77,13 @@ export async function buildRenderContext(
       subEnvironment.dataPropertyOrder,
       JSON_ORDER_SEPARATOR,
     );
-
     envObjects.push(ordered);
   }
 
   for (const doc of (ancestors || []).reverse()) {
     const ancestor: any = doc;
     const { environment, environmentPropertyOrder } = ancestor;
+
     if (typeof environment === 'object' && environment !== null) {
       const ordered = orderedJSON.order(
         environment,
@@ -87,8 +102,12 @@ export async function buildRenderContext(
   let renderContext = baseContext;
 
   // Made the rendering into a recursive function to handle nested Objects
-  async function renderSubContext(subObject: Object, subContext: Object): Promise<any> {
+  async function renderSubContext(
+    subObject: Record<string, any>,
+    subContext: Record<string, any>,
+  ) {
     const keys = _getOrderedEnvironmentKeys(subObject);
+
     for (const key of keys) {
       /*
        * If we're overwriting a string, try to render it first using the same key from the base
@@ -126,10 +145,11 @@ export async function buildRenderContext(
         subContext[key] = subObject[key];
       }
     }
+
     return subContext;
   }
 
-  for (const envObject: Object of envObjects) {
+  for (const envObject of envObjects) {
     // For every environment render the Objects
     renderContext = await renderSubContext(envObject, renderContext);
   }
@@ -141,6 +161,7 @@ export async function buildRenderContext(
 
   // Render recursive references and tags.
   const skipNextTime = {};
+
   for (let i = 0; i < 3; i++) {
     for (const key of keys) {
       // Skip rendering keys that stayed the same multiple times. This is here because
@@ -168,6 +189,7 @@ export async function buildRenderContext(
       finalRenderContext[key] = renderResult;
     }
   }
+
   return finalRenderContext;
 }
 
@@ -182,15 +204,15 @@ export async function buildRenderContext(
  */
 export async function render<T>(
   obj: T,
-  context: Object = {},
+  context: Record<string, any> = {},
   blacklistPathRegex: RegExp | null = null,
   errorMode: string = THROW_ON_ERROR,
-  name: string = '',
-): Promise<T> {
+  name = '',
+) {
   // Make a deep copy so no one gets mad :)
   const newObj = clone(obj);
 
-  async function next(x: any, path: string, first: boolean = false): Promise<any> {
+  async function next<T>(x: T, path: string, first = false) {
     if (blacklistPathRegex && path.match(blacklistPathRegex)) {
       return x;
     }
@@ -210,12 +232,15 @@ export async function render<T>(
       // Do nothing to these types
     } else if (typeof x === 'string') {
       try {
+        // @ts-expect-error -- TSCONVERSION
         x = await templating.render(x, { context, path });
 
         // If the variable outputs a tag, render it again. This is a common use
         // case for environment variables:
         //   {{ foo }} => {% uuid 'v4' %} => dd265685-16a3-4d76-a59c-e8264c16835a
+        // @ts-expect-error -- TSCONVERSION
         if (x.includes('{%')) {
+          // @ts-expect-error -- TSCONVERSION
           x = await templating.render(x, { context, path });
         }
       } catch (err) {
@@ -230,11 +255,13 @@ export async function render<T>(
     } else if (typeof x === 'object' && x !== null) {
       // Don't even try rendering disabled objects
       // Note, this logic probably shouldn't be here, but w/e for now
+      // @ts-expect-error -- TSCONVERSION
       if (x.disabled) {
         return x;
       }
 
       const keys = Object.keys(x);
+
       for (const key of keys) {
         if (first && key.indexOf('_') === 0) {
           x[key] = await next(x[key], path);
@@ -248,21 +275,21 @@ export async function render<T>(
     return x;
   }
 
-  return next(newObj, name, true);
+  return next<T>(newObj, name, true);
 }
-
 export async function getRenderContext(
-  request: Request | GrpcRequest,
+  request: Request | GrpcRequest | null,
   environmentId: string | null,
   ancestors: Array<BaseModel> | null = null,
   purpose: RenderPurpose | null = null,
   extraInfo: ExtraRenderInfo | null = null,
-): Promise<Object> {
+): Promise<Record<string, any>> {
   if (!ancestors) {
     ancestors = await _getRequestAncestors(request);
   }
 
   const workspace = ancestors.find(doc => doc.type === models.workspace.type);
+
   if (!workspace) {
     throw new Error('Failed to render. Could not find workspace');
   }
@@ -271,7 +298,6 @@ export async function getRenderContext(
     workspace ? workspace._id : 'n/a',
   );
   const subEnvironment = await models.environment.getById(environmentId || 'n/a');
-
   const keySource = {};
 
   // Function that gets Keys and stores their Source location
@@ -283,6 +309,7 @@ export async function getRenderContext(
 
     // Recurse down for Objects and Arrays
     const typeStr = Object.prototype.toString.call(subObject);
+
     if (typeStr === '[object Object]') {
       for (const key of Object.keys(subObject)) {
         getKeySource(subObject[key], templatingUtils.forceBracketNotation(inKey, key), inSource);
@@ -295,7 +322,6 @@ export async function getRenderContext(
   }
 
   const inKey = templating.NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME;
-
   // Get Keys from root environment
   getKeySource((rootEnvironment || {}).data, inKey, 'root');
 
@@ -308,6 +334,7 @@ export async function getRenderContext(
   if (ancestors) {
     for (let idx = 0; idx < ancestors.length; idx++) {
       const ancestor: any = ancestors[idx] || {};
+
       if (
         isRequestGroup(ancestor) &&
         ancestor.hasOwnProperty('environment') &&
@@ -319,7 +346,8 @@ export async function getRenderContext(
   }
 
   // Add meta data helper function
-  const baseContext = {};
+  const baseContext: Record<string, any> = {};
+
   baseContext.getMeta = () => ({
     requestId: request ? request._id : null,
     workspaceId: workspace ? workspace._id : 'n/a',
@@ -330,6 +358,7 @@ export async function getRenderContext(
   });
 
   baseContext.getPurpose = () => purpose;
+
   baseContext.getExtraInfo = (key: string) => {
     if (!Array.isArray(extraInfo)) {
       return null;
@@ -344,14 +373,13 @@ export async function getRenderContext(
   // Generate the context we need to render
   return buildRenderContext(ancestors, rootEnvironment, subEnvironment, baseContext);
 }
-
 export async function getRenderedGrpcRequest(
   request: GrpcRequest,
   environmentId: string | null,
   purpose?: RenderPurpose,
   extraInfo?: ExtraRenderInfo,
   skipBody?: boolean,
-): Promise<{ request: RenderedGrpcRequest, context: Object }> {
+) {
   const renderContext = await getRenderContext(
     request,
     environmentId,
@@ -359,24 +387,18 @@ export async function getRenderedGrpcRequest(
     purpose,
     extraInfo || null,
   );
-
   const description = request.description;
-
   // Render description separately because it's lower priority
   request.description = '';
-
   // Ignore body by default and only include if specified to
   const ignorePathRegex = skipBody ? /^body.*/ : null;
-
   // Render all request properties
   const renderedRequest: RenderedGrpcRequest = await render(
     request,
     renderContext,
     ignorePathRegex,
   );
-
   renderedRequest.description = await render(description, renderContext, null, KEEP_ON_ERROR);
-
   return renderedRequest;
 }
 
@@ -385,7 +407,7 @@ export async function getRenderedGrpcRequestMessage(
   environmentId: string | null,
   purpose?: RenderPurpose,
   extraInfo?: ExtraRenderInfo,
-): Promise<RenderedGrpcRequestBody> {
+) {
   const renderContext = await getRenderContext(
     request,
     environmentId,
@@ -393,24 +415,20 @@ export async function getRenderedGrpcRequestMessage(
     purpose,
     extraInfo || null,
   );
-
   // Render request body
   const renderedBody: RenderedGrpcRequestBody = await render(request.body, renderContext);
-
   return renderedBody;
 }
-
 export async function getRenderedRequestAndContext(
   request: Request,
   environmentId: string | null,
   purpose?: RenderPurpose,
   extraInfo?: ExtraRenderInfo,
-): Promise<{ request: RenderedRequest, context: Object }> {
+) {
   const ancestors = await _getRequestAncestors(request);
   const workspace = ancestors.find(doc => doc.type === models.workspace.type);
   const parentId = workspace ? workspace._id : 'n/a';
   const cookieJar = await models.cookieJar.getOrCreateForParentId(parentId);
-
   const renderContext = await getRenderContext(
     request,
     environmentId,
@@ -427,26 +445,25 @@ export async function getRenderedRequestAndContext(
       o.query = o.query.replace(/#}/g, '# }');
       request.body.text = JSON.stringify(o);
     }
-  } catch (err) {}
+  } catch (err) { }
 
   // Render description separately because it's lower priority
   const description = request.description;
   request.description = '';
-
   // Render all request properties
   const renderResult = await render(
-    { _request: request, _cookieJar: cookieJar },
+    {
+      _request: request,
+      _cookieJar: cookieJar,
+    },
     renderContext,
     request.settingDisableRenderRequestBody ? /^body.*/ : null,
   );
-
   const renderedRequest = renderResult._request;
   const renderedCookieJar = renderResult._cookieJar;
   renderedRequest.description = await render(description, renderContext, null, KEEP_ON_ERROR);
-
   // Remove disabled params
   renderedRequest.parameters = renderedRequest.parameters.filter(p => !p.disabled);
-
   // Remove disabled headers
   renderedRequest.headers = renderedRequest.headers.filter(p => !p.disabled);
 
@@ -462,7 +479,6 @@ export async function getRenderedRequestAndContext(
 
   // Default the proto if it doesn't exist
   renderedRequest.url = setDefaultProtocol(renderedRequest.url);
-
   return {
     context: renderContext,
     request: {
@@ -470,7 +486,6 @@ export async function getRenderedRequestAndContext(
       cookieJar: renderedCookieJar,
       cookies: [],
       isPrivate: false,
-
       // NOTE: Flow doesn't like Object.assign, so we have to do each property manually
       // for now to convert Request to RenderedRequest.
       _id: renderedRequest._id,
@@ -509,15 +524,17 @@ function _nunjucksSortValue(v) {
   return v && v.match && v.match(/({{|{%)/) ? 2 : 1;
 }
 
-function _getOrderedEnvironmentKeys(finalRenderContext: Object): Array<string> {
+function _getOrderedEnvironmentKeys(finalRenderContext: Record<string, any>): Array<string> {
   return Object.keys(finalRenderContext).sort((k1, k2) => {
     const k1Sort = _nunjucksSortValue(finalRenderContext[k1]);
+
     const k2Sort = _nunjucksSortValue(finalRenderContext[k2]);
+
     return k1Sort - k2Sort;
   });
 }
 
-async function _getRequestAncestors(request: Request | GrpcRequest): Promise<Array<BaseModel>> {
+async function _getRequestAncestors(request: Request | GrpcRequest | null): Promise<Array<BaseModel>> {
   return await db.withAncestors(request, [
     models.request.type,
     models.grpcRequest.type,
diff --git a/packages/insomnia-app/app/common/select-file-or-folder.js b/packages/insomnia-app/app/common/select-file-or-folder.ts
similarity index 57%
rename from packages/insomnia-app/app/common/select-file-or-folder.js
rename to packages/insomnia-app/app/common/select-file-or-folder.ts
index b7ae07aa9f..a2d88c6899 100644
--- a/packages/insomnia-app/app/common/select-file-or-folder.js
+++ b/packages/insomnia-app/app/common/select-file-or-folder.ts
@@ -1,52 +1,66 @@
-// @flow
-
-import { remote } from 'electron';
-
-type Options = {
-  itemTypes?: Array<'file' | 'directory'>,
-  extensions?: Array<string>,
-};
-
-type FileSelection = {
-  filePath: string,
-  canceled: boolean,
-};
+import { OpenDialogOptions, remote } from 'electron';
+interface Options {
+  itemTypes?: Array<'file' | 'directory'>;
+  extensions?: Array<string>;
+}
+interface FileSelection {
+  filePath: string;
+  canceled: boolean;
+}
 
 const selectFileOrFolder = async ({ itemTypes, extensions }: Options): Promise<FileSelection> => {
   // If no types are selected then default to just files and not directories
   const types = itemTypes || ['file'];
   let title = 'Select ';
+
   if (types.includes('file')) {
     title += ' File';
+
     if (types.length > 2) {
       title += ' or';
     }
   }
+
   if (types.includes('directory')) {
     title += ' Directory';
   }
-  const options = {
+
+  const options: OpenDialogOptions = {
     title: title,
     buttonLabel: 'Select',
+    // @ts-expect-error -- TSCONVERSION we should update this to accept other properties types as well, which flow all the way up to plugins
     properties: types.map(type => {
       if (type === 'file') {
         return 'openFile';
       }
+
       if (type === 'directory') {
         return 'openDirectory';
       }
     }),
-    filters: [{ name: 'All Files', extensions: ['*'] }],
+    filters: [
+      {
+        name: 'All Files',
+        extensions: ['*'],
+      },
+    ],
   };
 
   // If extensions are provided then filter for just those extensions
   if (extensions?.length) {
-    options.filters = [{ name: 'Files', extensions: extensions }];
+    options.filters = [
+      {
+        name: 'Files',
+        extensions: extensions,
+      },
+    ];
   }
 
   const { canceled, filePaths } = await remote.dialog.showOpenDialog(options);
-
-  return { filePath: filePaths[0], canceled };
+  return {
+    filePath: filePaths[0],
+    canceled,
+  };
 };
 
 export default selectFileOrFolder;
diff --git a/packages/insomnia-app/app/common/send-request.js b/packages/insomnia-app/app/common/send-request.ts
similarity index 77%
rename from packages/insomnia-app/app/common/send-request.js
rename to packages/insomnia-app/app/common/send-request.ts
index 96da3cef91..0812fde806 100644
--- a/packages/insomnia-app/app/common/send-request.js
+++ b/packages/insomnia-app/app/common/send-request.ts
@@ -1,28 +1,36 @@
-import * as db from './database';
-import { types as modelTypes, stats } from '../models';
+import { database as db } from './database';
+import { types as modelTypes, stats, BaseModel } from '../models';
 import { send } from '../network/network';
 import { getBodyBuffer } from '../models/response';
 import * as plugins from '../plugins';
 
 export async function getSendRequestCallbackMemDb(environmentId, memDB) {
   // Initialize the DB in-memory and fill it with data if we're given one
-  await db.init(modelTypes(), { inMemoryOnly: true }, true, () => {});
+  await db.init(
+    modelTypes(),
+    {
+      inMemoryOnly: true,
+    },
+    true,
+    () => {},
+  );
+  const docs: Array<BaseModel> = [];
 
-  const docs = [];
   for (const type of Object.keys(memDB)) {
     for (const doc of memDB[type]) {
       docs.push(doc);
     }
   }
 
-  await db.batchModifyDocs({ upsert: docs, remove: [] });
-
+  await db.batchModifyDocs({
+    upsert: docs,
+    remove: [],
+  });
   // Return callback helper to send requests
   return async function sendRequest(requestId) {
     return sendAndTransform(requestId, environmentId);
   };
 }
-
 export function getSendRequestCallback(environmentId) {
   return async function sendRequest(requestId) {
     stats.incrementExecutedRequests();
@@ -35,13 +43,13 @@ async function sendAndTransform(requestId, environmentId) {
     plugins.ignorePlugin('insomnia-plugin-kong-bundle');
     const res = await send(requestId, environmentId);
     const headersObj = {};
+
     for (const h of res.headers || []) {
       const name = h.name || '';
       headersObj[name.toLowerCase()] = h.value || '';
     }
 
-    const bodyBuffer = await getBodyBuffer(res);
-
+    const bodyBuffer = await getBodyBuffer(res) as Buffer;
     return {
       status: res.statusCode,
       statusMessage: res.statusMessage,
diff --git a/packages/insomnia-app/app/common/sorting.js b/packages/insomnia-app/app/common/sorting.ts
similarity index 92%
rename from packages/insomnia-app/app/common/sorting.js
rename to packages/insomnia-app/app/common/sorting.ts
index a0bf5aee47..903405bda1 100644
--- a/packages/insomnia-app/app/common/sorting.js
+++ b/packages/insomnia-app/app/common/sorting.ts
@@ -1,4 +1,3 @@
-// @flow
 import {
   HTTP_METHODS,
   SortOrder,
@@ -57,13 +56,17 @@ const httpMethodSort: SortFunction = (a, b) => {
   // Sort Requests by HTTP method
   if (isRequest(a)) {
     const aIndex = HTTP_METHODS.indexOf(a.method);
+    // @ts-expect-error -- TSCONVERSION
     const bIndex = HTTP_METHODS.indexOf(b.method);
+
     if (aIndex !== bIndex) {
       return aIndex < bIndex ? -1 : 1;
     }
 
     // Sort by ascending method name if comparing two custom methods
+    // @ts-expect-error -- TSCONVERSION
     if (aIndex === -1 && a.method.localeCompare(b.method) !== 0) {
+      // @ts-expect-error -- TSCONVERSION
       return a.method.localeCompare(b.method);
     }
   }
@@ -105,7 +108,8 @@ export const descendingNumberSort = (a: number, b: number): number => {
   return ascendingNumberSort(b, a);
 };
 
-export const sortMethodMap: { [SortOrder]: SortFunction } = {
+// @ts-expect-error -- TSCONVERSION appears to be a genuine error
+export const sortMethodMap: Record<SortOrder, SortFunction> = {
   [SORT_NAME_ASC]: ascendingNameSort,
   [SORT_NAME_DESC]: descendingNameSort,
   [SORT_CREATED_ASC]: createdFirstSort,
diff --git a/packages/insomnia-app/app/common/strings.js b/packages/insomnia-app/app/common/strings.ts
similarity index 96%
rename from packages/insomnia-app/app/common/strings.js
rename to packages/insomnia-app/app/common/strings.ts
index 31b028268e..2fcae6a7d3 100644
--- a/packages/insomnia-app/app/common/strings.js
+++ b/packages/insomnia-app/app/common/strings.ts
@@ -1,4 +1,3 @@
-// @flow
 import { pluralize } from './misc';
 
 export const strings = {
diff --git a/packages/insomnia-app/app/datasets/access-token-urls.js b/packages/insomnia-app/app/datasets/access-token-urls.ts
similarity index 100%
rename from packages/insomnia-app/app/datasets/access-token-urls.js
rename to packages/insomnia-app/app/datasets/access-token-urls.ts
diff --git a/packages/insomnia-app/app/datasets/authorization-urls.js b/packages/insomnia-app/app/datasets/authorization-urls.ts
similarity index 100%
rename from packages/insomnia-app/app/datasets/authorization-urls.js
rename to packages/insomnia-app/app/datasets/authorization-urls.ts
diff --git a/packages/insomnia-app/app/datasets/charsets.js b/packages/insomnia-app/app/datasets/charsets.ts
similarity index 100%
rename from packages/insomnia-app/app/datasets/charsets.js
rename to packages/insomnia-app/app/datasets/charsets.ts
diff --git a/packages/insomnia-app/app/datasets/content-types.js b/packages/insomnia-app/app/datasets/content-types.ts
similarity index 100%
rename from packages/insomnia-app/app/datasets/content-types.js
rename to packages/insomnia-app/app/datasets/content-types.ts
diff --git a/packages/insomnia-app/app/datasets/encodings.js b/packages/insomnia-app/app/datasets/encodings.ts
similarity index 100%
rename from packages/insomnia-app/app/datasets/encodings.js
rename to packages/insomnia-app/app/datasets/encodings.ts
diff --git a/packages/insomnia-app/app/datasets/header-names.js b/packages/insomnia-app/app/datasets/header-names.ts
similarity index 100%
rename from packages/insomnia-app/app/datasets/header-names.js
rename to packages/insomnia-app/app/datasets/header-names.ts
diff --git a/packages/insomnia-app/app/global.d.ts b/packages/insomnia-app/app/global.d.ts
new file mode 100644
index 0000000000..bb8e584d9f
--- /dev/null
+++ b/packages/insomnia-app/app/global.d.ts
@@ -0,0 +1,26 @@
+declare module '*.svg' {
+  const content: any;
+  export default content;
+}
+
+declare module '*.png' {
+  const content: any;
+  export default content;
+}
+
+declare const __DEV__: boolean;
+
+declare namespace NodeJS {
+  interface Global {
+    __DEV__: boolean;
+  }
+}
+
+interface Window {
+  __REDUX_DEVTOOLS_EXTENSION_COMPOSE__: Function;
+}
+
+// needed for @hot-loader/react-dom in order for TypeScript to build
+declare const __REACT_DEVTOOLS_GLOBAL_HOOK__: undefined | {
+  checkDCE: Function;
+};
diff --git a/packages/insomnia-app/app/main.development.js b/packages/insomnia-app/app/main.development.ts
similarity index 92%
rename from packages/insomnia-app/app/main.development.js
rename to packages/insomnia-app/app/main.development.ts
index e69419516f..ac0f739b21 100644
--- a/packages/insomnia-app/app/main.development.js
+++ b/packages/insomnia-app/app/main.development.ts
@@ -1,6 +1,5 @@
-// @flow
 import { checkIfRestartNeeded } from './main/squirrel-startup';
-import { appConfig } from '../config';
+import appConfig from '../config/config.json';
 import path from 'path';
 import * as electron from 'electron';
 import * as errorHandling from './main/error-handling';
@@ -8,7 +7,7 @@ import * as updates from './main/updates';
 import * as grpcIpcMain from './main/grpc-ipc-main';
 import * as windowUtils from './main/window-utils';
 import * as models from './models/index';
-import * as database from './common/database';
+import { database } from './common/database';
 import { changelogUrl, getAppVersion, isDevelopment, isMac } from './common/constants';
 import type { ToastNotification } from './ui/components/toast';
 import type { Stats } from './models/stats';
@@ -21,10 +20,8 @@ if (checkIfRestartNeeded()) {
 }
 
 initializeLogging();
-
 const { app, ipcMain, session } = electron;
 const commandLineArgs = process.argv.slice(1);
-
 log.info(`Running version ${getAppVersion()}`);
 
 // Explicitly set userData folder from config because it's sketchy to
@@ -32,32 +29,27 @@ log.info(`Running version ${getAppVersion()}`);
 // by accident.
 if (!isDevelopment()) {
   const defaultPath = app.getPath('userData');
-  const newPath = path.join(defaultPath, '../', appConfig().userDataFolder);
+  const newPath = path.join(defaultPath, '../', appConfig.userDataFolder);
   app.setPath('userData', newPath);
 }
 
 // So if (window) checks don't throw
 global.window = global.window || undefined;
-
 // When the app is first launched
 app.on('ready', async () => {
   // Init some important things first
   await database.init(models.types());
   await _createModelInstances();
-
   await errorHandling.init();
   await windowUtils.init();
-
   // Init the app
   const updatedStats = await _trackStats();
   await _updateFlags(updatedStats);
   await _launchApp();
-
   // Init the rest
   await updates.init();
   grpcIpcMain.init();
 });
-
 // Set as default protocol
 app.setAsDefaultProtocolClient(`insomnia${isDevelopment() ? 'dev' : ''}`);
 
@@ -67,19 +59,16 @@ function _addUrlToOpen(e, url) {
 }
 
 app.on('open-url', _addUrlToOpen);
-
 // Enable this for CSS grid layout :)
 app.commandLine.appendSwitch('enable-experimental-web-platform-features');
-
 // Quit when all windows are closed (except on Mac).
 app.on('window-all-closed', () => {
   if (!isMac()) {
     app.quit();
   }
 });
-
 // Mac-only, when the user clicks the doc icon
-app.on('activate', (e, hasVisibleWindows) => {
+app.on('activate', (_error, hasVisibleWindows) => {
   // Create a new window when clicking the doc icon if there isn't one open
   if (!hasVisibleWindows) {
     try {
@@ -95,12 +84,11 @@ app.on('activate', (e, hasVisibleWindows) => {
 function _launchApp() {
   app.removeListener('open-url', _addUrlToOpen);
   const window = windowUtils.createWindow();
-
   // Handle URLs sent via command line args
   ipcMain.once('window-ready', () => {
+    // @ts-expect-error -- TSCONVERSION
     commandLineArgs.length && window.send('run-command', commandLineArgs[0]);
   });
-
   // Called when second instance launched with args (Windows)
   const gotTheLock = app.requestSingleInstanceLock();
 
@@ -109,16 +97,16 @@ function _launchApp() {
     return;
   }
 
-  app.on('second-instance', (event, commandLine, workingDirectory) => {
+  app.on('second-instance', () => {
     // Someone tried to run a second instance, we should focus our window.
     if (window) {
       if (window.isMinimized()) window.restore();
       window.focus();
     }
   });
-
   // Handle URLs when app already open
-  app.addListener('open-url', (e, url) => {
+  app.addListener('open-url', (_error, url) => {
+    // @ts-expect-error -- TSCONVERSION
     window.send('run-command', url);
     // Apparently a timeout is needed because Chrome steals back focus immediately
     // after opening the URL.
@@ -126,7 +114,6 @@ function _launchApp() {
       window.focus();
     }, 100);
   });
-
   // Don't send origin header from Insomnia app because we're not technically using CORS
   session.defaultSession.webRequest.onBeforeSendHeaders((details, fn) => {
     delete details.requestHeaders.Origin;
@@ -149,6 +136,7 @@ async function _createModelInstances() {
 
 async function _updateFlags({ launches }: Stats) {
   const firstLaunch = launches === 1;
+
   if (firstLaunch) {
     await models.settings.patch({
       hasPromptedOnboarding: false,
@@ -158,7 +146,7 @@ async function _updateFlags({ launches }: Stats) {
   }
 }
 
-async function _trackStats(): Promise<Stats> {
+async function _trackStats() {
   // Handle the stats
   const oldStats = await models.stats.get();
   const stats: Stats = await models.stats.update({
@@ -168,7 +156,6 @@ async function _trackStats(): Promise<Stats> {
     lastVersion: oldStats.currentVersion,
     launches: oldStats.launches + 1,
   });
-
   // Update Stats Object
   const firstLaunch = stats.launches === 1;
   const justUpdated = !firstLaunch && stats.currentVersion !== stats.lastVersion;
@@ -183,6 +170,7 @@ async function _trackStats(): Promise<Stats> {
 
   ipcMain.once('window-ready', () => {
     const { currentVersion } = stats;
+
     if (!justUpdated || !currentVersion) {
       return;
     }
@@ -194,14 +182,13 @@ async function _trackStats(): Promise<Stats> {
       cta: "See What's New",
       message: `Updated to ${currentVersion}`,
     };
-
     // Wait a bit before showing the user because the app just launched.
     setTimeout(() => {
       for (const window of BrowserWindow.getAllWindows()) {
+        // @ts-expect-error -- TSCONVERSION
         window.send('show-notification', notification);
       }
     }, 5000);
   });
-
   return stats;
 }
diff --git a/packages/insomnia-app/app/main/__tests__/grpc-ipc-main.test.js b/packages/insomnia-app/app/main/__tests__/grpc-ipc-main.test.ts
similarity index 97%
rename from packages/insomnia-app/app/main/__tests__/grpc-ipc-main.test.js
rename to packages/insomnia-app/app/main/__tests__/grpc-ipc-main.test.ts
index 55fe91c4bc..a51abffc8f 100644
--- a/packages/insomnia-app/app/main/__tests__/grpc-ipc-main.test.js
+++ b/packages/insomnia-app/app/main/__tests__/grpc-ipc-main.test.ts
@@ -7,9 +7,10 @@ import { ResponseCallbacks } from '../../network/grpc/response-callbacks';
 jest.mock('../../network/grpc');
 
 describe('grpcIpcMain', () => {
-  const event = { reply: jest.fn() };
+  const event = {
+    reply: jest.fn(),
+  };
   const id = 'abc';
-
   beforeEach(() => {
     grpcIpcMain.init(); // ipcMain is mocked
   });
@@ -20,11 +21,8 @@ describe('grpcIpcMain', () => {
 
   it('should add expected listener for start', () => {
     const [channel, listener] = ipcMain.on.mock.calls[0];
-
     expect(channel).toBe(GrpcRequestEventEnum.start);
-
     const param = {};
-
     // Execute the callback, and make sure the correct grpc method is called
     listener(event, param);
     expect(grpc.start).toHaveBeenCalledWith(param, expect.any(ResponseCallbacks));
@@ -32,12 +30,9 @@ describe('grpcIpcMain', () => {
 
   it('should add expected listener for sendMessage', () => {
     const [channel, listener] = ipcMain.on.mock.calls[1];
-
     // Expect the sendUnary channel
     expect(channel).toBe(GrpcRequestEventEnum.sendMessage);
-
     const param = {};
-
     // Execute the callback, and make sure the correct grpc method is called
     listener(event, param);
     expect(grpc.sendMessage).toHaveBeenCalledWith(param, expect.any(ResponseCallbacks));
@@ -45,9 +40,7 @@ describe('grpcIpcMain', () => {
 
   it('should add expected listener for commit', () => {
     const [channel, listener] = ipcMain.on.mock.calls[2];
-
     expect(channel).toBe(GrpcRequestEventEnum.commit);
-
     // Execute the callback, and make sure the correct grpc method is called
     listener(event, id);
     expect(grpc.commit).toHaveBeenCalledWith(id);
@@ -55,9 +48,7 @@ describe('grpcIpcMain', () => {
 
   it('should add expected listener for cancel', () => {
     const [channel, listener] = ipcMain.on.mock.calls[3];
-
     expect(channel).toBe(GrpcRequestEventEnum.cancel);
-
     // Execute the callback, and make sure the correct grpc method is called
     listener(event, id);
     expect(grpc.cancel).toHaveBeenCalledWith(id);
@@ -65,9 +56,7 @@ describe('grpcIpcMain', () => {
 
   it('should add expected listener for cancel multiple', () => {
     const [channel, listener] = ipcMain.on.mock.calls[4];
-
     expect(channel).toBe(GrpcRequestEventEnum.cancelMultiple);
-
     // Execute the callback, and make sure the correct grpc method is called
     listener(event, id);
     expect(grpc.cancelMultiple).toHaveBeenCalledWith(id);
diff --git a/packages/insomnia-app/app/main/error-handling.js b/packages/insomnia-app/app/main/error-handling.ts
similarity index 79%
rename from packages/insomnia-app/app/main/error-handling.js
rename to packages/insomnia-app/app/main/error-handling.ts
index e1a3f31ebf..36ce02396a 100644
--- a/packages/insomnia-app/app/main/error-handling.js
+++ b/packages/insomnia-app/app/main/error-handling.ts
@@ -2,8 +2,7 @@ export function init() {
   process.on('uncaughtException', err => {
     console.error('[catcher] Uncaught exception:', err.stack);
   });
-
-  process.on('unhandledRejection', err => {
+  process.on('unhandledRejection', (err: Error) => {
     console.error('[catcher] Unhandled rejection:', err.stack);
   });
 }
diff --git a/packages/insomnia-app/app/main/grpc-ipc-main.js b/packages/insomnia-app/app/main/grpc-ipc-main.ts
similarity index 88%
rename from packages/insomnia-app/app/main/grpc-ipc-main.js
rename to packages/insomnia-app/app/main/grpc-ipc-main.ts
index 50165c8b96..c28e560f56 100644
--- a/packages/insomnia-app/app/main/grpc-ipc-main.js
+++ b/packages/insomnia-app/app/main/grpc-ipc-main.ts
@@ -1,16 +1,15 @@
-// @flow
-
 import * as grpc from '../network/grpc';
 import { ipcMain } from 'electron';
 import { GrpcRequestEventEnum } from '../common/grpc-events';
 import { ResponseCallbacks } from '../network/grpc/response-callbacks';
-import type { GrpcIpcRequestParams } from '../ui/context/grpc/prepare';
+import { GrpcIpcRequestParams } from '../network/grpc/prepare';
 
 export function init() {
   ipcMain.on(GrpcRequestEventEnum.start, (e, params: GrpcIpcRequestParams) =>
     grpc.start(params, new ResponseCallbacks(e)),
   );
   ipcMain.on(GrpcRequestEventEnum.sendMessage, (e, params: GrpcIpcRequestParams) =>
+    // @ts-expect-error -- TSCONVERSION
     grpc.sendMessage(params, new ResponseCallbacks(e)),
   );
   ipcMain.on(GrpcRequestEventEnum.commit, (_, requestId) => grpc.commit(requestId));
diff --git a/packages/insomnia-app/app/main/local-storage.js b/packages/insomnia-app/app/main/local-storage.ts
similarity index 83%
rename from packages/insomnia-app/app/main/local-storage.js
rename to packages/insomnia-app/app/main/local-storage.ts
index adb19aa3c1..cf27be3c92 100644
--- a/packages/insomnia-app/app/main/local-storage.js
+++ b/packages/insomnia-app/app/main/local-storage.ts
@@ -3,13 +3,13 @@ import fs from 'fs';
 import path from 'path';
 
 class LocalStorage {
-  constructor(basePath) {
+  _buffer: Record<string, string> = {};
+  _timeouts: Record<string, NodeJS.Timeout> = {};
+  _basePath: string | null = null;
+
+  constructor(basePath: string) {
     this._basePath = basePath;
-
     // Debounce writes on a per key basis
-    this._timeouts = {};
-    this._buffer = {};
-
     mkdirp.sync(basePath);
     console.log(`[localstorage] Initialized at ${basePath}`);
   }
@@ -27,8 +27,9 @@ class LocalStorage {
     let contents = JSON.stringify(defaultObj);
 
     const path = this._getKeyPath(key);
+
     try {
-      contents = fs.readFileSync(path);
+      contents = String(fs.readFileSync(path));
     } catch (e) {
       if (e.code === 'ENOENT') {
         this.setItem(key, defaultObj);
@@ -52,6 +53,7 @@ class LocalStorage {
 
     for (const key of keys) {
       const contents = this._buffer[key];
+
       const path = this._getKeyPath(key);
 
       delete this._buffer[key];
@@ -65,6 +67,7 @@ class LocalStorage {
   }
 
   _getKeyPath(key) {
+    // @ts-expect-error -- TSCONVERSION this appears to be a genuine error
     return path.join(this._basePath, key);
   }
 }
diff --git a/packages/insomnia-app/app/main/squirrel-startup.js b/packages/insomnia-app/app/main/squirrel-startup.ts
similarity index 91%
rename from packages/insomnia-app/app/main/squirrel-startup.js
rename to packages/insomnia-app/app/main/squirrel-startup.ts
index e1c26b0bef..6a3afb1a26 100644
--- a/packages/insomnia-app/app/main/squirrel-startup.js
+++ b/packages/insomnia-app/app/main/squirrel-startup.ts
@@ -4,7 +4,9 @@ import { app } from 'electron';
 
 function run(args, done) {
   const updateExe = path.resolve(path.dirname(process.execPath), '..', 'Update.exe');
-  spawn(updateExe, args, { detached: true }).on('close', done);
+  spawn(updateExe, args, {
+    detached: true,
+  }).on('close', done);
 }
 
 export function checkIfRestartNeeded() {
@@ -20,9 +22,11 @@ export function checkIfRestartNeeded() {
     case '--squirrel-install':
       run(['--createShortcut=' + target + ''], app.quit);
       return true;
+
     case '--squirrel-uninstall':
       run(['--removeShortcut=' + target + ''], app.quit);
       return true;
+
     case '--squirrel-updated':
     case '--squirrel-obsolete':
       app.quit();
diff --git a/packages/insomnia-app/app/main/updates.js b/packages/insomnia-app/app/main/updates.ts
similarity index 82%
rename from packages/insomnia-app/app/main/updates.js
rename to packages/insomnia-app/app/main/updates.ts
index a7b32e80c7..d6e2c6f1db 100644
--- a/packages/insomnia-app/app/main/updates.js
+++ b/packages/insomnia-app/app/main/updates.ts
@@ -1,4 +1,3 @@
-// @flow
 import electron from 'electron';
 import {
   CHECK_FOR_UPDATES_INTERVAL,
@@ -12,13 +11,12 @@ import {
 import * as models from '../models/index';
 import { buildQueryStringFromParams, joinUrlAndQueryString } from 'insomnia-url';
 import { delay } from '../common/misc';
-
 const { autoUpdater, BrowserWindow, ipcMain } = electron;
 
 async function getUpdateUrl(force: boolean): Promise<string | null> {
   const platform = process.platform;
   const settings = await models.settings.getOrCreate();
-  let updateUrl = null;
+  let updateUrl: string | null = null;
 
   if (!updatesSupported()) {
     return null;
@@ -33,11 +31,19 @@ async function getUpdateUrl(force: boolean): Promise<string | null> {
   }
 
   const params = [
-    { name: 'v', value: getAppVersion() },
-    { name: 'app', value: getAppId() },
-    { name: 'channel', value: settings.updateChannel },
+    {
+      name: 'v',
+      value: getAppVersion(),
+    },
+    {
+      name: 'app',
+      value: getAppId(),
+    },
+    {
+      name: 'channel',
+      value: settings.updateChannel,
+    },
   ];
-
   const qs = buildQueryStringFromParams(params);
   const fullUrl = joinUrlAndQueryString(updateUrl, qs);
   console.log(`[updater] Using url ${fullUrl}`);
@@ -60,50 +66,51 @@ async function getUpdateUrl(force: boolean): Promise<string | null> {
 
 function _sendUpdateStatus(status) {
   const windows = BrowserWindow.getAllWindows();
-  for (const w of windows) {
-    w.send('updater.check.status', status);
+
+  for (const window of windows) {
+    // @ts-expect-error -- TSCONVERSION seems to be a genuine error
+    window.send('updater.check.status', status);
   }
 }
 
 function _sendUpdateComplete(success: boolean, msg: string) {
   const windows = BrowserWindow.getAllWindows();
-  for (const w of windows) {
-    w.send('updater.check.complete', success, msg);
+
+  for (const window of windows) {
+    // @ts-expect-error -- TSCONVERSION seems to be a genuine error
+    window.send('updater.check.complete', success, msg);
   }
 }
 
 let hasPromptedForUpdates = false;
-
 export async function init() {
   autoUpdater.on('error', e => {
     console.warn(`[updater] Error: ${e.message}`);
   });
-
   autoUpdater.on('update-not-available', () => {
     console.log('[updater] Not Available');
+
     _sendUpdateComplete(false, 'Up to Date');
   });
-
   autoUpdater.on('update-available', () => {
     console.log('[updater] Update Available');
+
     _sendUpdateStatus('Downloading...');
   });
-
-  autoUpdater.on('update-downloaded', (e, releaseNotes, releaseName, releaseDate, updateUrl) => {
+  autoUpdater.on('update-downloaded', (_error, _releaseNotes, releaseName) => {
     console.log(`[updater] Downloaded ${releaseName}`);
+
     _sendUpdateComplete(true, 'Updated (Restart Required)');
+
     _showUpdateNotification();
   });
-
-  ipcMain.on('updater.check', async e => {
+  ipcMain.on('updater.check', async () => {
     await _checkForUpdates(true);
   });
-
   // Check for updates on an interval
   setInterval(async () => {
     await _checkForUpdates(false);
   }, CHECK_FOR_UPDATES_INTERVAL);
-
   // Check for updates immediately
   await _checkForUpdates(false);
 }
@@ -114,6 +121,7 @@ function _showUpdateNotification() {
   }
 
   const windows = BrowserWindow.getAllWindows();
+
   if (windows.length && windows[0].webContents) {
     windows[0].webContents.send('update-available');
   }
@@ -123,6 +131,7 @@ function _showUpdateNotification() {
 
 async function _checkForUpdates(force: boolean) {
   _sendUpdateStatus('Checking');
+
   await delay(500);
 
   if (force) {
@@ -140,16 +149,20 @@ async function _checkForUpdates(force: boolean) {
     console.log(
       `[updater] Updater not running platform=${process.platform} dev=${isDevelopment()}`,
     );
+
     _sendUpdateComplete(false, 'Updates Not Supported');
+
     return;
   }
 
   try {
     console.log(`[updater] Checking for updates url=${updateUrl}`);
+    // @ts-expect-error -- TSCONVERSION appears to be a genuine error
     autoUpdater.setFeedURL(updateUrl);
     autoUpdater.checkForUpdates();
   } catch (err) {
     console.warn('[updater] Failed to check for updates:', err.message);
+
     _sendUpdateComplete(false, 'Update Error');
   }
 }
diff --git a/packages/insomnia-app/app/main/window-utils.js b/packages/insomnia-app/app/main/window-utils.ts
similarity index 65%
rename from packages/insomnia-app/app/main/window-utils.js
rename to packages/insomnia-app/app/main/window-utils.ts
index 83a78d4588..010e51b292 100644
--- a/packages/insomnia-app/app/main/window-utils.js
+++ b/packages/insomnia-app/app/main/window-utils.ts
@@ -1,4 +1,4 @@
-import electron from 'electron';
+import electron, { BrowserWindow } from 'electron';
 import path from 'path';
 import { Curl } from 'node-libcurl';
 import fs from 'fs';
@@ -14,25 +14,34 @@ import {
   isMac,
   MNEMONIC_SYM,
 } from '../common/constants';
-import * as misc from '../common/misc';
+import { clickLink, getDataDirectory } from '../common/electron-helpers';
 import * as log from '../common/log';
 import * as os from 'os';
 import { docsBase } from '../common/documentation';
 
-const { app, Menu, BrowserWindow, shell, dialog, clipboard } = electron;
-
+const { app, Menu, shell, dialog, clipboard } = electron;
 // So we can use native modules in renderer
 // NOTE: This will be deprecated in Electron 10 and impossible in 11
 //   https://github.com/electron/electron/issues/18397
 app.allowRendererProcessReuse = false;
 
+// Note: this hack is required because MenuItemConstructorOptions is not exported from the electron types as of 9.3.5
+type MenuItemConstructorOptions = Parameters<typeof Menu.buildFromTemplate>[0][0];
+
 const DEFAULT_WIDTH = 1280;
 const DEFAULT_HEIGHT = 700;
 const MINIMUM_WIDTH = 500;
 const MINIMUM_HEIGHT = 400;
 
-let mainWindow = null;
-let localStorage = null;
+let mainWindow: BrowserWindow | null = null;
+let localStorage: LocalStorage | null = null;
+
+interface Bounds {
+  height?: number;
+  width?: number;
+  x?: number;
+  y?: number;
+}
 
 export function init() {
   initLocalStorage();
@@ -43,14 +52,19 @@ export function createWindow() {
   const zoomFactor = getZoomFactor();
   const { bounds, fullscreen, maximize } = getBounds();
   const { x, y, width, height } = bounds;
-  const appLogo = 'static/insomnia-core-logo_16x.png';
 
+  const appLogo = 'static/insomnia-core-logo_16x.png';
   let isVisibleOnAnyDisplay = true;
+
   for (const d of electron.screen.getAllDisplays()) {
     const isVisibleOnDisplay =
+      // @ts-expect-error -- TSCONVERSION genuine error
       x >= d.bounds.x &&
+      // @ts-expect-error -- TSCONVERSION genuine error
       y >= d.bounds.y &&
+      // @ts-expect-error -- TSCONVERSION genuine error
       x + width <= d.bounds.x + d.bounds.width &&
+      // @ts-expect-error -- TSCONVERSION genuine error
       y + height <= d.bounds.y + d.bounds.height;
 
     if (!isVisibleOnDisplay) {
@@ -62,7 +76,6 @@ export function createWindow() {
     // Make sure we don't initialize the window outside the bounds
     x: isVisibleOnAnyDisplay ? x : undefined,
     y: isVisibleOnAnyDisplay ? y : undefined,
-
     // Other options
     backgroundColor: '#2C2C2C',
     fullscreen: fullscreen,
@@ -84,23 +97,18 @@ export function createWindow() {
 
   // BrowserWindow doesn't have an option for this, so we have to do it manually :(
   if (maximize) {
-    mainWindow.maximize();
+    mainWindow?.maximize();
   }
 
-  mainWindow.on('resize', e => saveBounds());
-
-  mainWindow.on('maximize', e => saveBounds());
-
-  mainWindow.on('unmaximize', e => saveBounds());
-
-  mainWindow.on('move', e => saveBounds());
-
-  mainWindow.on('unresponsive', e => {
+  mainWindow?.on('resize', () => saveBounds());
+  mainWindow?.on('maximize', () => saveBounds());
+  mainWindow?.on('unmaximize', () => saveBounds());
+  mainWindow?.on('move', () => saveBounds());
+  mainWindow?.on('unresponsive', () => {
     showUnresponsiveModal();
   });
-
   // Open generic links (<a .../>) in default browser
-  mainWindow.webContents.on('will-navigate', (e, url) => {
+  mainWindow?.webContents.on('will-navigate', (e, url) => {
     if (url === appUrl) {
       return;
     }
@@ -109,76 +117,121 @@ export function createWindow() {
     e.preventDefault();
     electron.shell.openExternal(url);
   });
-
   // Load the html of the app.
   const url = process.env.APP_RENDER_URL;
   const appUrl = url || `file://${app.getAppPath()}/renderer.html`;
   console.log(`[main] Loading ${appUrl}`);
-  mainWindow.loadURL(appUrl);
-
+  mainWindow?.loadURL(appUrl);
   // Emitted when the window is closed.
-  mainWindow.on('closed', () => {
+  mainWindow?.on('closed', () => {
     // Dereference the window object, usually you would store windows
     // in an array if your app supports multi windows, this is the time
     // when you should delete the corresponding element.
     mainWindow = null;
   });
 
-  const applicationMenu = {
+  const applicationMenu: MenuItemConstructorOptions = {
     label: `${MNEMONIC_SYM}Application`,
     submenu: [
       {
         label: `${MNEMONIC_SYM}Preferences`,
-        click: function(menuItem, window, e) {
+        click: function(_menuItem, window) {
           if (!window || !window.webContents) {
             return;
           }
+
           window.webContents.send('toggle-preferences');
         },
       },
       {
         label: `${MNEMONIC_SYM}Changelog`,
-        click: function(menuItem, window, e) {
+        click: function(_menuItem, window) {
           if (!window || !window.webContents) {
             return;
           }
-          misc.clickLink(changelogUrl());
+
+          clickLink(changelogUrl());
         },
       },
-      { type: 'separator' },
-      { role: 'hide' },
-      { role: 'hideothers' },
-      { type: 'separator' },
-      { label: `${MNEMONIC_SYM}Quit`, accelerator: 'CmdOrCtrl+Q', click: () => app.quit() },
+      {
+        type: 'separator',
+      },
+      {
+        role: 'hide',
+      },
+      {
+        // @ts-expect-error -- TSCONVERSION appears to be a genuine error
+        role: 'hideothers',
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: `${MNEMONIC_SYM}Quit`,
+        accelerator: 'CmdOrCtrl+Q',
+        click: () => app.quit(),
+      },
     ],
   };
 
-  const editMenu = {
+  const editMenu: MenuItemConstructorOptions = {
     label: `${MNEMONIC_SYM}Edit`,
     submenu: [
-      { label: `${MNEMONIC_SYM}Undo`, accelerator: 'CmdOrCtrl+Z', selector: 'undo:' },
-      { label: `${MNEMONIC_SYM}Redo`, accelerator: 'Shift+CmdOrCtrl+Z', selector: 'redo:' },
-      { type: 'separator' },
-      { label: `Cu${MNEMONIC_SYM}t`, accelerator: 'CmdOrCtrl+X', selector: 'cut:' },
-      { label: `${MNEMONIC_SYM}Copy`, accelerator: 'CmdOrCtrl+C', selector: 'copy:' },
-      { label: `${MNEMONIC_SYM}Paste`, accelerator: 'CmdOrCtrl+V', selector: 'paste:' },
+      {
+        label: `${MNEMONIC_SYM}Undo`,
+        accelerator: 'CmdOrCtrl+Z',
+        // @ts-expect-error -- TSCONVERSION missing in official electron types
+        selector: 'undo:',
+      },
+      {
+        label: `${MNEMONIC_SYM}Redo`,
+        accelerator: 'Shift+CmdOrCtrl+Z',
+        // @ts-expect-error -- TSCONVERSION missing in official electron types
+        selector: 'redo:',
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: `Cu${MNEMONIC_SYM}t`,
+        accelerator: 'CmdOrCtrl+X',
+        // @ts-expect-error -- TSCONVERSION missing in official electron types
+        selector: 'cut:',
+      },
+      {
+        label: `${MNEMONIC_SYM}Copy`,
+        accelerator: 'CmdOrCtrl+C',
+        // @ts-expect-error -- TSCONVERSION missing in official electron types
+        selector: 'copy:',
+      },
+      {
+        label: `${MNEMONIC_SYM}Paste`,
+        accelerator: 'CmdOrCtrl+V',
+        // @ts-expect-error -- TSCONVERSION missing in official electron types
+        selector: 'paste:',
+      },
       {
         label: `Select ${MNEMONIC_SYM}All`,
         accelerator: 'CmdOrCtrl+A',
+        // @ts-expect-error -- TSCONVERSION missing in official electron types
         selector: 'selectAll:',
       },
     ],
   };
 
-  const viewMenu = {
+  const viewMenu: MenuItemConstructorOptions = {
     label: `${MNEMONIC_SYM}View`,
     submenu: [
-      { label: `Toggle ${MNEMONIC_SYM}Full Screen`, role: 'togglefullscreen' },
+      {
+        label: `Toggle ${MNEMONIC_SYM}Full Screen`,
+        role: 'togglefullscreen',
+      },
       {
         label: `${MNEMONIC_SYM}Actual Size`,
         accelerator: 'CmdOrCtrl+0',
         click: () => {
           const w = BrowserWindow.getFocusedWindow();
+
           if (!w || !w.webContents) {
             return;
           }
@@ -193,13 +246,13 @@ export function createWindow() {
         accelerator: 'CmdOrCtrl+=',
         click: () => {
           const w = BrowserWindow.getFocusedWindow();
+
           if (!w || !w.webContents) {
             return;
           }
 
           const zoomFactor = Math.min(1.8, getZoomFactor() + 0.05);
           w.webContents.setZoomFactor(zoomFactor);
-
           saveZoomFactor(zoomFactor);
         },
       },
@@ -208,6 +261,7 @@ export function createWindow() {
         accelerator: 'CmdOrCtrl+-',
         click: () => {
           const w = BrowserWindow.getFocusedWindow();
+
           if (!w || !w.webContents) {
             return;
           }
@@ -221,6 +275,7 @@ export function createWindow() {
         label: 'Toggle Sidebar',
         click: () => {
           const w = BrowserWindow.getFocusedWindow();
+
           if (!w || !w.webContents) {
             return;
           }
@@ -231,27 +286,39 @@ export function createWindow() {
       {
         label: `Toggle ${MNEMONIC_SYM}DevTools`,
         accelerator: 'Alt+CmdOrCtrl+I',
-        click: () => mainWindow.toggleDevTools(),
+        // @ts-expect-error -- TSCONVERSION needs global module augmentation
+        click: () => mainWindow?.toggleDevTools(),
       },
     ],
   };
 
-  const windowMenu = {
+  const windowMenu: MenuItemConstructorOptions = {
     label: `${MNEMONIC_SYM}Window`,
     role: 'window',
     submenu: [
-      { label: `${MNEMONIC_SYM}Minimize`, role: 'minimize' },
-      ...(isMac() ? [{ label: `${MNEMONIC_SYM}Close`, role: 'close' }] : []),
+      {
+        label: `${MNEMONIC_SYM}Minimize`,
+        role: 'minimize',
+      },
+      // @ts-expect-error -- TSCONVERSION missing in official electron types
+      ...(isMac() ? [
+            {
+              label: `${MNEMONIC_SYM}Close`,
+              role: 'close',
+            },
+          ]
+        : []),
     ],
   };
 
-  const helpMenu = {
+  const helpMenu: MenuItemConstructorOptions = {
     label: `${MNEMONIC_SYM}Help`,
     role: 'help',
     id: 'help',
     submenu: [
       {
         label: `${MNEMONIC_SYM}Help and Support`,
+        // @ts-expect-error -- TSCONVERSION TSCONVERSION `Accelerator` type from electron is needed here as a cast but is not exported as of the 9.3.5 types
         accelerator: !isMac() ? 'F1' : null,
         click: () => {
           shell.openExternal(docsBase);
@@ -260,30 +327,31 @@ export function createWindow() {
       {
         label: `${MNEMONIC_SYM}Keyboard Shortcuts`,
         accelerator: 'CmdOrCtrl+Shift+?',
-        click: (menuItem, w, e) => {
+        click: (_menuItem, w) => {
           if (!w || !w.webContents) {
             return;
           }
+
           w.webContents.send('toggle-preferences-shortcuts');
         },
       },
       {
         label: `Show App ${MNEMONIC_SYM}Data Folder`,
-        click: (menuItem, w, e) => {
-          const directory = misc.getDataDirectory();
+        click: () => {
+          const directory = getDataDirectory();
           shell.showItemInFolder(directory);
         },
       },
       {
         label: `Show App ${MNEMONIC_SYM}Logs Folder`,
-        click: (menuItem, w, e) => {
+        click: () => {
           const directory = log.getLogDirectory();
           shell.showItemInFolder(directory);
         },
       },
       {
         label: 'Show Open Source Licenses',
-        click: (menuItem, w, e) => {
+        click: () => {
           const licensePath = path.resolve(app.getAppPath(), '../opensource-licenses.txt');
           shell.openPath(licensePath);
         },
@@ -300,9 +368,7 @@ export function createWindow() {
   const aboutMenuClickHandler = async () => {
     const copy = 'Copy';
     const ok = 'OK';
-
     const buttons = isLinux() ? [copy, ok] : [ok, copy];
-
     const detail = [
       `Version: ${getAppLongName()} ${getAppVersion()}`,
       `Release date: ${getAppReleaseDate()}`,
@@ -331,33 +397,38 @@ export function createWindow() {
   };
 
   if (isMac()) {
-    applicationMenu.submenu.unshift(
+    // @ts-expect-error -- TSCONVERSION type splitting
+    applicationMenu.submenu?.unshift(
       {
         label: `A${MNEMONIC_SYM}bout ${getAppName()}`,
         click: aboutMenuClickHandler,
       },
-      { type: 'separator' },
+      {
+        type: 'separator',
+      },
     );
   } else {
-    helpMenu.submenu.push({
+    // @ts-expect-error -- TSCONVERSION type splitting
+    helpMenu.submenu?.push({
       label: `${MNEMONIC_SYM}About`,
       click: aboutMenuClickHandler,
     });
   }
 
-  const developerMenu = {
+  const developerMenu: MenuItemConstructorOptions = {
     label: `${MNEMONIC_SYM}Developer`,
+    // @ts-expect-error -- TSCONVERSION missing in official electron types
     position: 'before=help',
     submenu: [
       {
         label: `${MNEMONIC_SYM}Reload`,
         accelerator: 'Shift+F5',
-        click: () => mainWindow.reload(),
+        click: () => mainWindow?.reload(),
       },
       {
         label: `Resize to Defaul${MNEMONIC_SYM}t`,
         click: () =>
-          mainWindow.setBounds({
+          mainWindow?.setBounds({
             x: 100,
             y: 100,
             width: DEFAULT_WIDTH,
@@ -367,7 +438,8 @@ export function createWindow() {
       {
         label: `Take ${MNEMONIC_SYM}Screenshot`,
         click: function() {
-          mainWindow.capturePage(image => {
+          // @ts-expect-error -- TSCONVERSION not accounted for in the electron types to provide a function
+          mainWindow?.capturePage(image => {
             const buffer = image.toPNG();
             const dir = app.getPath('desktop');
             fs.writeFileSync(path.join(dir, `Screenshot-${new Date()}.png`), buffer);
@@ -384,14 +456,14 @@ export function createWindow() {
       },
     ],
   };
-
-  const toolsMenu = {
+  const toolsMenu: MenuItemConstructorOptions = {
     label: `${MNEMONIC_SYM}Tools`,
     submenu: [
       {
         label: `${MNEMONIC_SYM}Reload Plugins`,
         click: () => {
           const w = BrowserWindow.getFocusedWindow();
+
           if (!w || !w.webContents) {
             return;
           }
@@ -401,9 +473,7 @@ export function createWindow() {
       },
     ],
   };
-
-  const template = [];
-
+  const template: Array<MenuItemConstructorOptions> = [];
   template.push(applicationMenu);
   template.push(editMenu);
   template.push(viewMenu);
@@ -416,7 +486,6 @@ export function createWindow() {
   }
 
   Menu.setApplicationMenu(Menu.buildFromTemplate(template));
-
   return mainWindow;
 }
 
@@ -430,8 +499,9 @@ async function showUnresponsiveModal() {
     message: 'Insomnia has become unresponsive. Do you want to reload?',
   });
 
+  // @ts-expect-error -- TSCONVERSION appears to be a genuine error
   if (id === 1) {
-    mainWindow.destroy();
+    mainWindow?.destroy();
     createWindow();
   }
 }
@@ -441,42 +511,48 @@ function saveBounds() {
     return;
   }
 
-  const fullscreen = mainWindow.isFullScreen();
+  const fullscreen = mainWindow?.isFullScreen();
 
   // Only save the size if we're not in fullscreen
   if (!fullscreen) {
-    localStorage.setItem('bounds', mainWindow.getBounds());
-    localStorage.setItem('maximize', mainWindow.isMaximized());
-    localStorage.setItem('fullscreen', false);
+    localStorage?.setItem('bounds', mainWindow?.getBounds());
+    localStorage?.setItem('maximize', mainWindow?.isMaximized());
+    localStorage?.setItem('fullscreen', false);
   } else {
-    localStorage.setItem('fullscreen', true);
+    localStorage?.setItem('fullscreen', true);
   }
 }
 
 function getBounds() {
-  let bounds = {};
+  let bounds: Bounds = {};
   let fullscreen = false;
   let maximize = false;
+
   try {
-    bounds = localStorage.getItem('bounds', {});
-    fullscreen = localStorage.getItem('fullscreen', false);
-    maximize = localStorage.getItem('maximize', false);
+    bounds = localStorage?.getItem('bounds', {});
+    fullscreen = localStorage?.getItem('fullscreen', false);
+    maximize = localStorage?.getItem('maximize', false);
   } catch (e) {
     // This should never happen, but if it does...!
     console.error('Failed to parse window bounds', e);
   }
 
-  return { bounds, fullscreen, maximize };
+  return {
+    bounds,
+    fullscreen,
+    maximize,
+  };
 }
 
 function saveZoomFactor(zoomFactor) {
-  localStorage.setItem('zoomFactor', zoomFactor);
+  localStorage?.setItem('zoomFactor', zoomFactor);
 }
 
 function getZoomFactor() {
   let zoomFactor = 1;
+
   try {
-    zoomFactor = localStorage.getItem('zoomFactor', 1);
+    zoomFactor = localStorage?.getItem('zoomFactor', 1);
   } catch (e) {
     // This should never happen, but if it does...!
     console.error('Failed to parse zoomFactor', e);
@@ -486,10 +562,11 @@ function getZoomFactor() {
 }
 
 function initLocalStorage() {
-  const localStoragePath = path.join(misc.getDataDirectory(), 'localStorage');
+  const localStoragePath = path.join(getDataDirectory(), 'localStorage');
   localStorage = new LocalStorage(localStoragePath);
 }
 
 function initContextMenus() {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
   require('electron-context-menu')({});
 }
diff --git a/packages/insomnia-app/app/models/__mocks__/uuid.js b/packages/insomnia-app/app/models/__mocks__/uuid.ts
similarity index 98%
rename from packages/insomnia-app/app/models/__mocks__/uuid.js
rename to packages/insomnia-app/app/models/__mocks__/uuid.ts
index 0a00c44f88..beab054650 100644
--- a/packages/insomnia-app/app/models/__mocks__/uuid.js
+++ b/packages/insomnia-app/app/models/__mocks__/uuid.ts
@@ -1,4 +1,5 @@
 let v1Counter = 0;
+
 let v4Counter = 0;
 
 const v1UUIDs = [
@@ -210,6 +211,7 @@ function v4() {
   return uuid;
 }
 
+// WARNING: changing this to `export default` will break the mock and be incredibly hard to debug. Ask me how I know.
 module.exports = () => v4();
 module.exports.v4 = () => v4();
 module.exports.v1 = () => v1();
diff --git a/packages/insomnia-app/app/models/__tests__/grpc-request-meta.test.js b/packages/insomnia-app/app/models/__tests__/grpc-request-meta.test.ts
similarity index 83%
rename from packages/insomnia-app/app/models/__tests__/grpc-request-meta.test.js
rename to packages/insomnia-app/app/models/__tests__/grpc-request-meta.test.ts
index b1edac2b65..a0bc3ac8e5 100644
--- a/packages/insomnia-app/app/models/__tests__/grpc-request-meta.test.js
+++ b/packages/insomnia-app/app/models/__tests__/grpc-request-meta.test.ts
@@ -3,6 +3,7 @@ import { globalBeforeEach } from '../../__jest__/before-each';
 
 describe('init()', () => {
   beforeEach(globalBeforeEach);
+
   it('contains all required fields', async () => {
     expect(models.grpcRequestMeta.init()).toEqual({
       pinned: false,
@@ -13,9 +14,9 @@ describe('init()', () => {
 
 describe('create()', () => {
   beforeEach(globalBeforeEach);
+
   it('creates a valid GrpcRequest', async () => {
     Date.now = jest.fn().mockReturnValue(1478795580200);
-
     const request = await models.grpcRequestMeta.create({
       pinned: true,
       parentId: 'greq_124',
@@ -29,14 +30,12 @@ describe('create()', () => {
       type: 'GrpcRequestMeta',
       lastActive: 0,
     };
-
     expect(request).toEqual(expected);
     expect(await models.grpcRequestMeta.getOrCreateByParentId(expected.parentId)).toEqual(expected);
   });
 
   it('creates a valid GrpcRequestMeta if it does not exist', async () => {
     Date.now = jest.fn().mockReturnValue(1478795580200);
-
     const request = await models.grpcRequestMeta.getOrCreateByParentId('greq_124');
     const expected = {
       _id: 'greqm_dd2ccc1a2745477a881a9e8ef9d42403',
@@ -47,19 +46,22 @@ describe('create()', () => {
       type: 'GrpcRequestMeta',
       lastActive: 0,
     };
-
     expect(request).toEqual(expected);
   });
 
   it('fails when missing parentId', async () => {
-    expect(() => models.grpcRequestMeta.create({ pinned: true })).toThrow(
-      'New GrpcRequestMeta missing `parentId`',
-    );
+    expect(() =>
+      models.grpcRequestMeta.create({
+        pinned: true,
+      }),
+    ).toThrow('New GrpcRequestMeta missing `parentId`');
   });
 
   it('fails when parentId prefix is not that of a GrpcRequest', async () => {
-    expect(() => models.grpcRequestMeta.create({ parentId: 'req_123' })).toThrow(
-      'Expected the parent of GrpcRequestMeta to be a GrpcRequest',
-    );
+    expect(() =>
+      models.grpcRequestMeta.create({
+        parentId: 'req_123',
+      }),
+    ).toThrow('Expected the parent of GrpcRequestMeta to be a GrpcRequest');
   });
 });
diff --git a/packages/insomnia-app/app/models/__tests__/grpc-request.test.js b/packages/insomnia-app/app/models/__tests__/grpc-request.test.ts
similarity index 88%
rename from packages/insomnia-app/app/models/__tests__/grpc-request.test.js
rename to packages/insomnia-app/app/models/__tests__/grpc-request.test.ts
index e890322432..928ba772a3 100644
--- a/packages/insomnia-app/app/models/__tests__/grpc-request.test.js
+++ b/packages/insomnia-app/app/models/__tests__/grpc-request.test.ts
@@ -3,9 +3,9 @@ import { globalBeforeEach } from '../../__jest__/before-each';
 
 describe('init()', () => {
   beforeEach(globalBeforeEach);
+
   it('contains all required fields', async () => {
     Date.now = jest.fn().mockReturnValue(1478795580200);
-
     expect(models.grpcRequest.init()).toEqual({
       url: '',
       name: 'New gRPC Request',
@@ -16,16 +16,16 @@ describe('init()', () => {
         text: '{}',
       },
       metaSortKey: -1478795580200,
-      idPrivate: false,
+      isPrivate: false,
     });
   });
 });
 
 describe('create()', () => {
   beforeEach(globalBeforeEach);
+
   it('creates a valid GrpcRequest', async () => {
     Date.now = jest.fn().mockReturnValue(1478795580200);
-
     const request = await models.grpcRequest.create({
       name: 'My request',
       parentId: 'fld_124',
@@ -44,18 +44,19 @@ describe('create()', () => {
         text: '{}',
       },
       metaSortKey: -1478795580200,
-      idPrivate: false,
+      isPrivate: false,
       type: 'GrpcRequest',
     };
-
     expect(request).toEqual(expected);
     expect(await models.grpcRequest.getById(expected._id)).toEqual(expected);
   });
 
   it('fails when missing parentId', async () => {
     Date.now = jest.fn().mockReturnValue(1478795580200);
-    expect(() => models.grpcRequest.create({ name: 'no parentId' })).toThrow(
-      'New GrpcRequest missing `parentId`',
-    );
+    expect(() =>
+      models.grpcRequest.create({
+        name: 'no parentId',
+      }),
+    ).toThrow('New GrpcRequest missing `parentId`');
   });
 });
diff --git a/packages/insomnia-app/app/models/__tests__/index.test.js b/packages/insomnia-app/app/models/__tests__/index.test.ts
similarity index 98%
rename from packages/insomnia-app/app/models/__tests__/index.test.js
rename to packages/insomnia-app/app/models/__tests__/index.test.ts
index 44a6361890..0c22d51eb9 100644
--- a/packages/insomnia-app/app/models/__tests__/index.test.js
+++ b/packages/insomnia-app/app/models/__tests__/index.test.ts
@@ -1,12 +1,9 @@
-// @flow
-
 import { globalBeforeEach } from '../../__jest__/before-each';
 import { getModel, mustGetModel } from '../index';
 import * as models from '../index';
 
 describe('index', () => {
   beforeEach(globalBeforeEach);
-
   describe('getModel()', () => {
     it('should get model if found', () => {
       expect(getModel(models.workspace.type)).not.toBeNull();
@@ -24,6 +21,7 @@ describe('index', () => {
 
     it('should return null if model not found', () => {
       const func = () => mustGetModel('UNKNOWN');
+
       expect(func).toThrowError('The model type UNKNOWN must exist but could not be found.');
     });
   });
diff --git a/packages/insomnia-app/app/models/__tests__/proto-file.test.js b/packages/insomnia-app/app/models/__tests__/proto-file.test.ts
similarity index 89%
rename from packages/insomnia-app/app/models/__tests__/proto-file.test.js
rename to packages/insomnia-app/app/models/__tests__/proto-file.test.ts
index ed659e91b0..c31be2f54a 100644
--- a/packages/insomnia-app/app/models/__tests__/proto-file.test.js
+++ b/packages/insomnia-app/app/models/__tests__/proto-file.test.ts
@@ -3,6 +3,7 @@ import { globalBeforeEach } from '../../__jest__/before-each';
 
 describe('init()', () => {
   beforeEach(globalBeforeEach);
+
   it('contains all required fields', async () => {
     expect(models.protoFile.init()).toEqual({
       name: 'New Proto File',
@@ -13,9 +14,9 @@ describe('init()', () => {
 
 describe('create()', () => {
   beforeEach(globalBeforeEach);
+
   it('creates a valid protofile', async () => {
     Date.now = jest.fn().mockReturnValue(1478795580200);
-
     const request = await models.protoFile.create({
       name: 'My File',
       parentId: 'fld_124',
@@ -30,15 +31,16 @@ describe('create()', () => {
       name: 'My File',
       protoText: 'some proto text',
     };
-
     expect(request).toEqual(expected);
     expect(await models.protoFile.getById(expected._id)).toEqual(expected);
   });
 
   it('fails when missing parentId', async () => {
     Date.now = jest.fn().mockReturnValue(1478795580200);
-    expect(() => models.protoFile.create({ name: 'no parentId' })).toThrow(
-      'New ProtoFile missing `parentId`',
-    );
+    expect(() =>
+      models.protoFile.create({
+        name: 'no parentId',
+      }),
+    ).toThrow('New ProtoFile missing `parentId`');
   });
 });
diff --git a/packages/insomnia-app/app/models/__tests__/request-meta.test.js b/packages/insomnia-app/app/models/__tests__/request-meta.test.ts
similarity index 63%
rename from packages/insomnia-app/app/models/__tests__/request-meta.test.js
rename to packages/insomnia-app/app/models/__tests__/request-meta.test.ts
index ee70858def..34039a0bf8 100644
--- a/packages/insomnia-app/app/models/__tests__/request-meta.test.js
+++ b/packages/insomnia-app/app/models/__tests__/request-meta.test.ts
@@ -5,12 +5,12 @@ describe('create()', () => {
   beforeEach(globalBeforeEach);
 
   it('fails when missing parentId', async () => {
-    expect(() => models.requestMeta.create({ pinned: true })).toThrow(
-      'New RequestMeta missing `parentId`',
-    );
-  });
-
-  // it('fails when parentId prefix is not that of a Request', async () => {
+    expect(() =>
+      models.requestMeta.create({
+        pinned: true,
+      }),
+    ).toThrow('New RequestMeta missing `parentId`');
+  }); // it('fails when parentId prefix is not that of a Request', async () => {
   //   expect(() => models.requestMeta.create({ parentId: 'greq_123' })).toThrow(
   //     'Expected the parent of RequestMeta to be a Request',
   //   );
diff --git a/packages/insomnia-app/app/models/__tests__/request.test.js b/packages/insomnia-app/app/models/__tests__/request.test.ts
similarity index 73%
rename from packages/insomnia-app/app/models/__tests__/request.test.js
rename to packages/insomnia-app/app/models/__tests__/request.test.ts
index 73f549e31d..3cc2573a0f 100644
--- a/packages/insomnia-app/app/models/__tests__/request.test.js
+++ b/packages/insomnia-app/app/models/__tests__/request.test.ts
@@ -5,6 +5,7 @@ import { CONTENT_TYPE_GRAPHQL } from '../../common/constants';
 
 describe('init()', () => {
   beforeEach(globalBeforeEach);
+
   it('contains all required fields', async () => {
     Date.now = jest.fn().mockReturnValue(1478795580200);
     expect(models.request.init()).toEqual({
@@ -30,9 +31,9 @@ describe('init()', () => {
 
 describe('create()', () => {
   beforeEach(globalBeforeEach);
+
   it('creates a valid request', async () => {
     Date.now = jest.fn().mockReturnValue(1478795580200);
-
     const request = await models.request.create({
       name: 'Test Request',
       parentId: 'fld_124',
@@ -61,30 +62,36 @@ describe('create()', () => {
       settingRebuildPath: true,
       settingFollowRedirects: 'global',
     };
-
     expect(request).toEqual(expected);
     expect(await models.request.getById(expected._id)).toEqual(expected);
   });
 
   it('fails when missing parentId', async () => {
     Date.now = jest.fn().mockReturnValue(1478795580200);
-    expect(() => models.request.create({ name: 'Test Request' })).toThrow(
-      'New Requests missing `parentId`',
-    );
+    expect(() =>
+      models.request.create({
+        name: 'Test Request',
+      }),
+    ).toThrow('New Requests missing `parentId`');
   });
 });
 
 describe('updateMimeType()', () => {
   beforeEach(globalBeforeEach);
+
   it('adds header when does not exist', async () => {
     const request = await models.request.create({
       name: 'My Request',
       parentId: 'fld_1',
     });
     expect(request).not.toBeNull();
-
     const newRequest = await models.request.updateMimeType(request, 'text/html');
-    expect(newRequest.headers).toEqual([{ name: 'Content-Type', value: 'text/html' }]);
+    expect(newRequest.headers).toEqual([
+      {
+        name: 'Content-Type',
+        value: 'text/html',
+      },
+    ]);
   });
 
   it('replaces header when exists', async () => {
@@ -92,19 +99,34 @@ describe('updateMimeType()', () => {
       name: 'My Request',
       parentId: 'fld_1',
       headers: [
-        { name: 'content-tYPE', value: 'application/json' },
-        { name: 'foo', value: 'bar' },
-        { bad: true },
+        {
+          name: 'content-tYPE',
+          value: 'application/json',
+        },
+        {
+          name: 'foo',
+          value: 'bar',
+        },
+        {
+          bad: true,
+        },
         null,
       ],
     });
     expect(request).not.toBeNull();
-
     const newRequest = await models.request.updateMimeType(request, 'text/html');
     expect(newRequest.headers).toEqual([
-      { name: 'content-tYPE', value: 'text/html' },
-      { name: 'foo', value: 'bar' },
-      { bad: true },
+      {
+        name: 'content-tYPE',
+        value: 'text/html',
+      },
+      {
+        name: 'foo',
+        value: 'bar',
+      },
+      {
+        bad: true,
+      },
       null,
     ]);
   });
@@ -113,22 +135,35 @@ describe('updateMimeType()', () => {
     const request = await models.request.create({
       name: 'My Request',
       parentId: 'fld_1',
-      headers: [{ name: 'content-tYPE', value: 'application/json' }],
+      headers: [
+        {
+          name: 'content-tYPE',
+          value: 'application/json',
+        },
+      ],
     });
     expect(request).not.toBeNull();
-
     const newRequest = await models.request.updateMimeType(request, 'text/html');
-    expect(newRequest.headers).toEqual([{ name: 'content-tYPE', value: 'text/html' }]);
+    expect(newRequest.headers).toEqual([
+      {
+        name: 'content-tYPE',
+        value: 'text/html',
+      },
+    ]);
   });
 
   it('removes existing content-type when set to null (i.e. no body)', async () => {
     const request = await models.request.create({
       name: 'My Request',
       parentId: 'fld_1',
-      headers: [{ name: 'content-tYPE', value: 'application/json' }],
+      headers: [
+        {
+          name: 'content-tYPE',
+          value: 'application/json',
+        },
+      ],
     });
     expect(request).not.toBeNull();
-
     const newRequest = await models.request.updateMimeType(request, null);
     expect(newRequest.body).toEqual({});
     expect(newRequest.headers).toEqual([]);
@@ -143,7 +178,6 @@ describe('updateMimeType()', () => {
       },
     });
     expect(request).not.toBeNull();
-
     const newRequest = await models.request.updateMimeType(request, 'application/json', false, {
       text: 'Saved Data',
     });
@@ -159,7 +193,6 @@ describe('updateMimeType()', () => {
       },
     });
     expect(request).not.toBeNull();
-
     const newRequest = await models.request.updateMimeType(request, 'application/json', false, {});
     expect(newRequest.body.text).toEqual('My Data');
   });
@@ -167,39 +200,55 @@ describe('updateMimeType()', () => {
 
 describe('migrate()', () => {
   beforeEach(globalBeforeEach);
+
   it('migrates basic case', () => {
     const original = {
       headers: [],
       body: 'hello world!',
     };
-
     const expected = {
       headers: [],
-      body: { mimeType: '', text: 'hello world!' },
+      body: {
+        mimeType: '',
+        text: 'hello world!',
+      },
       url: '',
     };
-
     expect(models.request.migrate(original)).toEqual(expected);
   });
 
   it('migrates form-urlencoded', () => {
     const original = {
-      headers: [{ name: 'content-type', value: 'application/x-www-form-urlencoded' }],
+      headers: [
+        {
+          name: 'content-type',
+          value: 'application/x-www-form-urlencoded',
+        },
+      ],
       body: 'foo=bar&baz={{ hello }}',
     };
-
     const expected = {
-      headers: [{ name: 'content-type', value: 'application/x-www-form-urlencoded' }],
+      headers: [
+        {
+          name: 'content-type',
+          value: 'application/x-www-form-urlencoded',
+        },
+      ],
       body: {
         mimeType: 'application/x-www-form-urlencoded',
         params: [
-          { name: 'foo', value: 'bar' },
-          { name: 'baz', value: '{{ hello }}' },
+          {
+            name: 'foo',
+            value: 'bar',
+          },
+          {
+            name: 'baz',
+            value: '{{ hello }}',
+          },
         ],
       },
       url: '',
     };
-
     expect(models.request.migrate(original)).toEqual(expected);
   });
 
@@ -213,7 +262,6 @@ describe('migrate()', () => {
       ],
       body: 'foo=bar&baz={{ hello }}',
     };
-
     const expected = {
       headers: [
         {
@@ -224,31 +272,49 @@ describe('migrate()', () => {
       body: {
         mimeType: 'application/x-www-form-urlencoded',
         params: [
-          { name: 'foo', value: 'bar' },
-          { name: 'baz', value: '{{ hello }}' },
+          {
+            name: 'foo',
+            value: 'bar',
+          },
+          {
+            name: 'baz',
+            value: '{{ hello }}',
+          },
         ],
       },
       url: '',
     };
-
     expect(models.request.migrate(original)).toEqual(expected);
   });
 
   it('migrates form-urlencoded malformed', () => {
     const original = {
-      headers: [{ name: 'content-type', value: 'application/x-www-form-urlencoded' }],
+      headers: [
+        {
+          name: 'content-type',
+          value: 'application/x-www-form-urlencoded',
+        },
+      ],
       body: '{"foo": "bar"}',
     };
-
     const expected = {
-      headers: [{ name: 'content-type', value: 'application/x-www-form-urlencoded' }],
+      headers: [
+        {
+          name: 'content-type',
+          value: 'application/x-www-form-urlencoded',
+        },
+      ],
       body: {
         mimeType: 'application/x-www-form-urlencoded',
-        params: [{ name: '{"foo": "bar"}', value: '' }],
+        params: [
+          {
+            name: '{"foo": "bar"}',
+            value: '',
+          },
+        ],
       },
       url: '',
     };
-
     expect(models.request.migrate(original)).toEqual(expected);
   });
 
@@ -261,34 +327,55 @@ describe('migrate()', () => {
 
     for (const contentType of Object.keys(contentToMimeMap)) {
       const original = {
-        headers: [{ name: 'content-type', value: contentType }],
+        headers: [
+          {
+            name: 'content-type',
+            value: contentType,
+          },
+        ],
         body: '',
       };
-
       const expected = {
-        headers: [{ name: 'content-type', value: contentType }],
-        body: { mimeType: contentToMimeMap[contentType], text: '' },
+        headers: [
+          {
+            name: 'content-type',
+            value: contentType,
+          },
+        ],
+        body: {
+          mimeType: contentToMimeMap[contentType],
+          text: '',
+        },
         url: '',
       };
-
       expect(models.request.migrate(original)).toEqual(expected);
     }
   });
 
   it('skips migrate for schema 1', () => {
     const original = {
-      body: { mimeType: 'text/plain', text: 'foo' },
+      body: {
+        mimeType: 'text/plain',
+        text: 'foo',
+      },
     };
-
     expect(models.request.migrate(original)).toBe(original);
   });
 
   it('migrates with weird data', () => {
-    const newBody = { body: { mimeType: '', text: 'foo bar!' } };
-    const stringBody = { body: 'foo bar!' };
-    const nullBody = { body: null };
+    const newBody = {
+      body: {
+        mimeType: '',
+        text: 'foo bar!',
+      },
+    };
+    const stringBody = {
+      body: 'foo bar!',
+    };
+    const nullBody = {
+      body: null,
+    };
     const noBody = {};
-
     const expected = {
       body: {
         mimeType: '',
@@ -296,12 +383,10 @@ describe('migrate()', () => {
       },
       url: '',
     };
-
     const expected2 = {
       body: {},
       url: '',
     };
-
     expect(models.request.migrate(newBody)).toEqual(expected);
     expect(models.request.migrate(stringBody)).toEqual(expected);
     expect(models.request.migrate(nullBody)).toEqual(expected2);
@@ -310,13 +395,11 @@ describe('migrate()', () => {
 
   it('migrates from initModel()', async () => {
     Date.now = jest.fn().mockReturnValue(1478795580200);
-
     const original = {
       _id: 'req_123',
       headers: [],
       body: 'hello world!',
     };
-
     const expected = {
       _id: 'req_123',
       isPrivate: false,
@@ -332,7 +415,10 @@ describe('migrate()', () => {
       authentication: {},
       parameters: [],
       parentId: null,
-      body: { mimeType: '', text: 'hello world!' },
+      body: {
+        mimeType: '',
+        text: 'hello world!',
+      },
       settingStoreCookies: true,
       settingSendCookies: true,
       settingDisableRenderRequestBody: false,
@@ -340,7 +426,6 @@ describe('migrate()', () => {
       settingRebuildPath: true,
       settingFollowRedirects: 'global',
     };
-
     const migrated = await models.initModel(models.request.type, original);
     expect(migrated).toEqual(expected);
   });
@@ -352,21 +437,29 @@ describe('newBodyGraphQL()', () => {
       '{"query": "query getCustomer() {\\\\n id\\\\n name\\\\n email\\\\n __typename\\\\n }\\\\n"}';
     const expectedTextOutput = '{"query": "query getCustomer() { id name email __typename }"}';
     const actualOutput = newBodyGraphQL(input);
-
-    expect(actualOutput).toEqual({ mimeType: CONTENT_TYPE_GRAPHQL, text: expectedTextOutput });
+    expect(actualOutput).toEqual({
+      mimeType: CONTENT_TYPE_GRAPHQL,
+      text: expectedTextOutput,
+    });
   });
 
   it('does nothing to empty string', () => {
     const input = '';
     const expectedTextOutput = '';
     const actualOutput = newBodyGraphQL(input);
-    expect(actualOutput).toEqual({ mimeType: CONTENT_TYPE_GRAPHQL, text: expectedTextOutput });
+    expect(actualOutput).toEqual({
+      mimeType: CONTENT_TYPE_GRAPHQL,
+      text: expectedTextOutput,
+    });
   });
 
   it('does nothing to object that has no \\\\n characters', () => {
     const input = '{ "foo": "bar" }';
     const expectedTextOutput = '{ "foo": "bar" }';
     const actualOutput = newBodyGraphQL(input);
-    expect(actualOutput).toEqual({ mimeType: CONTENT_TYPE_GRAPHQL, text: expectedTextOutput });
+    expect(actualOutput).toEqual({
+      mimeType: CONTENT_TYPE_GRAPHQL,
+      text: expectedTextOutput,
+    });
   });
 });
diff --git a/packages/insomnia-app/app/models/__tests__/response.test.js b/packages/insomnia-app/app/models/__tests__/response.test.ts
similarity index 94%
rename from packages/insomnia-app/app/models/__tests__/response.test.js
rename to packages/insomnia-app/app/models/__tests__/response.test.ts
index f25c436d47..fcdc5c450e 100644
--- a/packages/insomnia-app/app/models/__tests__/response.test.js
+++ b/packages/insomnia-app/app/models/__tests__/response.test.ts
@@ -3,7 +3,7 @@ import zlib from 'zlib';
 import fs from 'fs';
 import * as models from '../../models';
 import { globalBeforeEach } from '../../__jest__/before-each';
-import { getDataDirectory } from '../../common/misc';
+import { getDataDirectory } from '../../common/electron-helpers';
 
 describe('migrate()', () => {
   beforeEach(async () => {
@@ -18,27 +18,29 @@ describe('migrate()', () => {
   });
 
   it('migrates utf8 body correctly', async () => {
-    const initialModel = { body: 'hello world!', encoding: 'utf8' };
-
+    const initialModel = {
+      body: 'hello world!',
+      encoding: 'utf8',
+    };
     const newModel = await models.initModel(models.response.type, initialModel);
     const expectedBodyPath = path.join(
       getDataDirectory(),
       'responses/fc3ff98e8c6a0d3087d515c0473f8677.zip',
     );
     const storedBody = models.response.getBodyBuffer(newModel);
-
     // Should have set bodyPath and stored the body
     expect(newModel.bodyPath).toBe(expectedBodyPath);
     expect(storedBody.toString()).toBe('hello world!');
-
     // Should have stripped these
     expect(newModel.body).toBeUndefined();
     expect(newModel.encoding).toBeUndefined();
   });
 
   it('migrates base64 body correctly', async () => {
-    const initialModel = { body: 'aGVsbG8gd29ybGQh', encoding: 'base64' };
-
+    const initialModel = {
+      body: 'aGVsbG8gd29ybGQh',
+      encoding: 'base64',
+    };
     const newModel = await models.initModel(models.response.type, initialModel);
     jest.runAllTimers();
     const expectedBodyPath = path.join(
@@ -46,47 +48,42 @@ describe('migrate()', () => {
       'responses/fc3ff98e8c6a0d3087d515c0473f8677.zip',
     );
     const storedBody = models.response.getBodyBuffer(newModel);
-
     // Should have stripped these
     expect(newModel.body).toBeUndefined();
     expect(newModel.encoding).toBeUndefined();
-
     // Should have set bodyPath and stored the body
     expect(newModel.bodyPath).toBe(expectedBodyPath);
     expect(storedBody.toString()).toBe('hello world!');
   });
 
   it('migrates empty body', async () => {
-    const initialModel = { body: '' };
-
+    const initialModel = {
+      body: '',
+    };
     const newModel = await models.initModel(models.response.type, initialModel);
     jest.runAllTimers();
     jest.runAllTimers();
-
     const expectedBodyPath = path.join(
       getDataDirectory(),
       'responses/d41d8cd98f00b204e9800998ecf8427e.zip',
     );
     const storedBody = models.response.getBodyBuffer(newModel);
-
     // Should have stripped these
     expect(newModel.body).toBeUndefined();
     expect(newModel.encoding).toBeUndefined();
-
     // Should have set bodyPath and stored the body
     expect(newModel.bodyPath).toBe(expectedBodyPath);
     expect(storedBody.toString()).toBe('');
   });
 
   it('does not migrate body again', async () => {
-    const initialModel = { bodyPath: '/foo/bar' };
-
+    const initialModel = {
+      bodyPath: '/foo/bar',
+    };
     const newModel = await models.initModel(models.response.type, initialModel);
-
     // Should have stripped these
     expect(newModel.body).toBeUndefined();
     expect(newModel.encoding).toBeUndefined();
-
     // Should have set bodyPath and stored the body
     expect(newModel.bodyPath).toBe('/foo/bar');
   });
@@ -94,10 +91,10 @@ describe('migrate()', () => {
   it('does it', async () => {
     const bodyPath = path.join(getDataDirectory(), 'foo.zip');
     fs.writeFileSync(bodyPath, zlib.gzipSync('Hello World!'));
-
-    const response = await models.initModel(models.response.type, { bodyPath });
+    const response = await models.initModel(models.response.type, {
+      bodyPath,
+    });
     const body = await models.response.getBodyBuffer(response).toString();
-
     expect(response.bodyCompression).toBe('zip');
     expect(body).toBe('Hello World!');
   });
@@ -108,7 +105,6 @@ describe('migrate()', () => {
       encoding: 'base64',
     });
     const body = await models.response.getBodyBuffer(response).toString();
-
     expect(response.bodyCompression).toBe(null);
     expect(body).toBe('hello world!');
   });
@@ -157,9 +153,7 @@ describe('cleanDeletedResponses()', function() {
     const mockUnlinkSync = jest.spyOn(fs, 'unlinkSync');
     mockReaddirSync.mockReturnValueOnce([]);
     mockUnlinkSync.mockImplementation();
-
     await models.response.cleanDeletedResponses();
-
     expect(fs.unlinkSync.mock.calls.length).toBe(0);
   });
 
@@ -167,6 +161,7 @@ describe('cleanDeletedResponses()', function() {
     const responsesDir = path.join(getDataDirectory(), 'responses');
     const dbResponseIds = await createModels(responsesDir, 10);
     const notDbResponseIds = [];
+
     for (let index = 100; index < 110; index++) {
       notDbResponseIds.push('res_' + index);
     }
@@ -175,9 +170,7 @@ describe('cleanDeletedResponses()', function() {
     const mockUnlinkSync = jest.spyOn(fs, 'unlinkSync');
     mockReaddirSync.mockReturnValueOnce([...dbResponseIds, ...notDbResponseIds]);
     mockUnlinkSync.mockImplementation();
-
     await models.response.cleanDeletedResponses();
-
     expect(fs.unlinkSync.mock.calls.length).toBe(notDbResponseIds.length);
     Object.keys(notDbResponseIds).map(index => {
       const resId = notDbResponseIds[index];
@@ -204,7 +197,6 @@ async function createModels(responsesDir, count) {
     const workspaceId = 'wrk_' + index;
     const requestId = 'req_' + index;
     const responseId = 'res_' + index;
-
     await models.workspace.create({
       _id: workspaceId,
       created: 111,
@@ -218,7 +210,6 @@ async function createModels(responsesDir, count) {
       metaSortKey: 0,
       url: 'https://insomnia.rest',
     });
-
     await models.response.create({
       _id: responseId,
       parentId: requestId,
diff --git a/packages/insomnia-app/app/models/__tests__/workspace.test.js b/packages/insomnia-app/app/models/__tests__/workspace.test.ts
similarity index 78%
rename from packages/insomnia-app/app/models/__tests__/workspace.test.js
rename to packages/insomnia-app/app/models/__tests__/workspace.test.ts
index fec776bbce..3ed54046c1 100644
--- a/packages/insomnia-app/app/models/__tests__/workspace.test.js
+++ b/packages/insomnia-app/app/models/__tests__/workspace.test.ts
@@ -4,15 +4,21 @@ import { WorkspaceScopeKeys } from '../workspace';
 
 describe('migrate()', () => {
   beforeEach(globalBeforeEach);
+
   it('migrates client certificates properly', async () => {
     const workspace = await models.workspace.create({
       name: 'My Workspace',
       certificates: [
-        { key: 'key', passphrase: 'mypass' },
-        { disabled: true, cert: 'cert' },
+        {
+          key: 'key',
+          passphrase: 'mypass',
+        },
+        {
+          disabled: true,
+          cert: 'cert',
+        },
       ],
     });
-
     const migratedWorkspace = await models.workspace.migrate(workspace);
     const certs = await models.clientCertificate.findByParentId(workspace._id);
 
@@ -51,9 +57,7 @@ describe('migrate()', () => {
         type: 'ClientCertificate',
       },
     ]);
-
     expect(migratedWorkspace.certificates).toBeUndefined();
-
     // Make sure we don't create new certs if we migrate again
     await models.workspace.migrate(migratedWorkspace);
     const certsAgain = await models.clientCertificate.findByParentId(workspace._id);
@@ -61,10 +65,11 @@ describe('migrate()', () => {
   });
 
   it('creates api spec for workspace id', async () => {
-    const workspace = await models.workspace.create({ name: 'My Workspace' });
+    const workspace = await models.workspace.create({
+      name: 'My Workspace',
+    });
     await models.apiSpec.removeWhere(workspace._id);
     expect(await models.apiSpec.getByParentId(workspace._id)).toBe(null);
-
     await models.workspace.migrate(workspace);
     const spec = await models.apiSpec.getByParentId(workspace._id);
     expect(spec).not.toBe(null);
@@ -72,18 +77,28 @@ describe('migrate()', () => {
   });
 
   it('translates the scope correctly', async () => {
-    const specW = await models.workspace.create({ scope: 'spec' });
-    const debugW = await models.workspace.create({ scope: 'debug' });
-    const nullW = await models.workspace.create({ scope: null });
-    const somethingElseW = await models.workspace.create({ scope: 'something' });
-    const designW = await models.workspace.create({ scope: WorkspaceScopeKeys.design });
-    const collectionW = await models.workspace.create({ scope: WorkspaceScopeKeys.collection });
-
+    const specW = await models.workspace.create({
+      scope: 'spec',
+    });
+    const debugW = await models.workspace.create({
+      scope: 'debug',
+    });
+    const nullW = await models.workspace.create({
+      scope: null,
+    });
+    const somethingElseW = await models.workspace.create({
+      scope: 'something',
+    });
+    const designW = await models.workspace.create({
+      scope: WorkspaceScopeKeys.design,
+    });
+    const collectionW = await models.workspace.create({
+      scope: WorkspaceScopeKeys.collection,
+    });
     await models.workspace.migrate(specW);
     await models.workspace.migrate(debugW);
     await models.workspace.migrate(nullW);
     await models.workspace.migrate(somethingElseW);
-
     expect(specW.scope).toBe(WorkspaceScopeKeys.design);
     expect(debugW.scope).toBe(WorkspaceScopeKeys.collection);
     expect(nullW.scope).toBe(WorkspaceScopeKeys.collection);
diff --git a/packages/insomnia-app/app/models/api-spec.js b/packages/insomnia-app/app/models/api-spec.ts
similarity index 50%
rename from packages/insomnia-app/app/models/api-spec.js
rename to packages/insomnia-app/app/models/api-spec.ts
index 6945d24668..ec1c13bb91 100644
--- a/packages/insomnia-app/app/models/api-spec.js
+++ b/packages/insomnia-app/app/models/api-spec.ts
@@ -1,19 +1,22 @@
-// @flow
 import type { BaseModel } from './index';
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import { strings } from '../common/strings';
 
 export const name = 'ApiSpec';
+
 export const type = 'ApiSpec';
+
 export const prefix = 'spc';
+
 export const canDuplicate = true;
+
 export const canSync = false;
 
-type BaseApiSpec = {
-  fileName: string,
-  contentType: 'json' | 'yaml',
-  contents: string,
-};
+interface BaseApiSpec {
+  fileName: string;
+  contentType: 'json' | 'yaml';
+  contents: string;
+}
 
 export type ApiSpec = BaseModel & BaseApiSpec;
 
@@ -25,22 +28,24 @@ export function init(): BaseApiSpec {
   };
 }
 
-export async function migrate(doc: ApiSpec): Promise<ApiSpec> {
+export async function migrate(doc: ApiSpec) {
   return doc;
 }
 
-export function getByParentId(workspaceId: string): Promise<ApiSpec | null> {
-  return db.getWhere(type, { parentId: workspaceId });
+export function getByParentId(workspaceId: string) {
+  return db.getWhere<ApiSpec>(type, { parentId: workspaceId });
 }
 
 export async function getOrCreateForParentId(
   workspaceId: string,
-  patch: $Shape<ApiSpec> = {},
-): Promise<ApiSpec> {
-  const spec = await db.getWhere(type, { parentId: workspaceId });
+  patch: Partial<ApiSpec> = {},
+) {
+  const spec = await db.getWhere<ApiSpec>(type, {
+    parentId: workspaceId,
+  });
 
   if (!spec) {
-    return db.docCreate(type, { ...patch, parentId: workspaceId });
+    return db.docCreate<ApiSpec>(type, { ...patch, parentId: workspaceId });
   }
 
   return spec;
@@ -48,20 +53,20 @@ export async function getOrCreateForParentId(
 
 export async function updateOrCreateForParentId(
   workspaceId: string,
-  patch: $Shape<ApiSpec> = {},
-): Promise<ApiSpec> {
+  patch: Partial<ApiSpec> = {},
+) {
   const spec = await getOrCreateForParentId(workspaceId);
   return db.docUpdate(spec, patch);
 }
 
-export async function all(): Promise<Array<ApiSpec>> {
-  return db.all(type);
+export async function all() {
+  return db.all<ApiSpec>(type);
 }
 
-export function update(apiSpec: ApiSpec, patch: $Shape<ApiSpec> = {}): Promise<ApiSpec> {
+export function update(apiSpec: ApiSpec, patch: Partial<ApiSpec> = {}) {
   return db.docUpdate(apiSpec, patch);
 }
 
-export function removeWhere(parentId: string): Promise<void> {
+export function removeWhere(parentId: string) {
   return db.removeWhere(type, { parentId });
 }
diff --git a/packages/insomnia-app/app/models/client-certificate.js b/packages/insomnia-app/app/models/client-certificate.js
deleted file mode 100644
index b06e32d576..0000000000
--- a/packages/insomnia-app/app/models/client-certificate.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// @flow
-import * as db from '../common/database';
-import type { BaseModel } from './index';
-
-export const name = 'Client Certificate';
-export const type = 'ClientCertificate';
-export const prefix = 'crt';
-export const canDuplicate = true;
-export const canSync = false;
-
-type BaseClientCertificate = {
-  parentId: string,
-  host: string,
-  passphrase: string | null,
-  cert: string | null,
-  key: string | null,
-  pfx: string | null,
-  disabled: boolean,
-
-  // For sync control
-  isPrivate: boolean,
-};
-
-export type ClientCertificate = BaseModel & BaseClientCertificate;
-
-export function init(): BaseClientCertificate {
-  return {
-    parentId: '',
-    host: '',
-    passphrase: null,
-    disabled: false,
-    cert: null,
-    key: null,
-    pfx: null,
-    isPrivate: false,
-  };
-}
-
-export async function migrate(doc: ClientCertificate) {
-  return doc;
-}
-
-export function create(patch: $Shape<ClientCertificate> = {}): Promise<ClientCertificate> {
-  if (!patch.parentId) {
-    throw new Error('New ClientCertificate missing `parentId`: ' + JSON.stringify(patch));
-  }
-
-  return db.docCreate(type, patch);
-}
-
-export function update(
-  cert: ClientCertificate,
-  patch: $Shape<ClientCertificate> = {},
-): Promise<ClientCertificate> {
-  return db.docUpdate(cert, patch);
-}
-
-export function getById(id: string): Promise<ClientCertificate | null> {
-  return db.get(type, id);
-}
-
-export function findByParentId(parentId: string): Promise<Array<ClientCertificate>> {
-  return db.find(type, { parentId });
-}
-
-export function remove(cert: ClientCertificate): Promise<void> {
-  return db.remove(cert);
-}
-
-export function all(): Promise<Array<ClientCertificate>> {
-  return db.all(type);
-}
diff --git a/packages/insomnia-app/app/models/client-certificate.ts b/packages/insomnia-app/app/models/client-certificate.ts
new file mode 100644
index 0000000000..0282fa6a60
--- /dev/null
+++ b/packages/insomnia-app/app/models/client-certificate.ts
@@ -0,0 +1,74 @@
+import { database as db } from '../common/database';
+import type { BaseModel } from './index';
+
+export const name = 'Client Certificate';
+
+export const type = 'ClientCertificate';
+
+export const prefix = 'crt';
+
+export const canDuplicate = true;
+
+export const canSync = false;
+
+interface BaseClientCertificate {
+  parentId: string;
+  host: string;
+  passphrase: string | null;
+  cert: string | null;
+  key: string | null;
+  pfx: string | null;
+  disabled: boolean;
+  // For sync control
+  isPrivate: boolean;
+}
+
+export type ClientCertificate = BaseModel & BaseClientCertificate;
+
+export function init(): BaseClientCertificate {
+  return {
+    parentId: '',
+    host: '',
+    passphrase: null,
+    disabled: false,
+    cert: null,
+    key: null,
+    pfx: null,
+    isPrivate: false,
+  };
+}
+
+export async function migrate(doc: ClientCertificate) {
+  return doc;
+}
+
+export function create(patch: Partial<ClientCertificate> = {}) {
+  if (!patch.parentId) {
+    throw new Error('New ClientCertificate missing `parentId`: ' + JSON.stringify(patch));
+  }
+
+  return db.docCreate<ClientCertificate>(type, patch);
+}
+
+export function update(
+  cert: ClientCertificate,
+  patch: Partial<ClientCertificate> = {},
+) {
+  return db.docUpdate<ClientCertificate>(cert, patch);
+}
+
+export function getById(id: string) {
+  return db.get<ClientCertificate>(type, id);
+}
+
+export function findByParentId(parentId: string) {
+  return db.find<ClientCertificate>(type, { parentId });
+}
+
+export function remove(cert: ClientCertificate) {
+  return db.remove(cert);
+}
+
+export function all() {
+  return db.all<ClientCertificate>(type);
+}
diff --git a/packages/insomnia-app/app/models/cookie-jar.js b/packages/insomnia-app/app/models/cookie-jar.ts
similarity index 53%
rename from packages/insomnia-app/app/models/cookie-jar.js
rename to packages/insomnia-app/app/models/cookie-jar.ts
index d63047f3bf..d45a6618ef 100644
--- a/packages/insomnia-app/app/models/cookie-jar.js
+++ b/packages/insomnia-app/app/models/cookie-jar.ts
@@ -1,36 +1,38 @@
-// @flow
 import crypto from 'crypto';
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import type { BaseModel } from './index';
 
 export const name = 'Cookie Jar';
+
 export const type = 'CookieJar';
+
 export const prefix = 'jar';
+
 export const canDuplicate = true;
+
 export const canSync = false;
 
-export type Cookie = {
-  id: string,
-  key: string,
-  value: string,
-  expires: Date | string | number | null,
-  domain: string,
-  path: string,
-  secure: boolean,
-  httpOnly: boolean,
+export interface Cookie {
+  id: string;
+  key: string;
+  value: string;
+  expires: Date | string | number | null;
+  domain: string;
+  path: string;
+  secure: boolean;
+  httpOnly: boolean;
+  extensions?: Array<any>;
+  creation?: Date;
+  creationIndex?: number;
+  hostOnly?: boolean;
+  pathIsDefault?: boolean;
+  lastAccessed?: Date;
+}
 
-  extensions?: Array<any>,
-  creation?: Date,
-  creationIndex?: number,
-  hostOnly?: boolean,
-  pathIsDefault?: boolean,
-  lastAccessed?: Date,
-};
-
-type BaseCookieJar = {
-  name: string,
-  cookies: Array<Cookie>,
-};
+interface BaseCookieJar {
+  name: string;
+  cookies: Array<Cookie>;
+}
 
 export type CookieJar = BaseModel & BaseCookieJar;
 
@@ -41,46 +43,43 @@ export function init() {
   };
 }
 
-export function migrate(doc: CookieJar): CookieJar {
+export function migrate(doc: CookieJar) {
   doc = migrateCookieId(doc);
   return doc;
 }
 
-export async function create(patch: $Shape<CookieJar>) {
+export async function create(patch: Partial<CookieJar>) {
   if (!patch.parentId) {
     throw new Error(`New CookieJar missing \`parentId\`: ${JSON.stringify(patch)}`);
   }
 
-  return db.docCreate(type, patch);
+  return db.docCreate<CookieJar>(type, patch);
 }
 
 export async function getOrCreateForParentId(parentId: string) {
-  const cookieJars = await db.find(type, { parentId });
+  const cookieJars = await db.find<CookieJar>(type, { parentId });
+
   if (cookieJars.length === 0) {
     return create({
       parentId,
-
       // Deterministic ID. It helps reduce sync complexity since we won't have to
       // de-duplicate environments.
-      _id: `${prefix}_${crypto
-        .createHash('sha1')
-        .update(parentId)
-        .digest('hex')}`,
+      _id: `${prefix}_${crypto.createHash('sha1').update(parentId).digest('hex')}`,
     });
   } else {
     return cookieJars[0];
   }
 }
 
-export async function all(): Promise<Array<BaseModel>> {
-  return db.all(type);
+export async function all() {
+  return db.all<BaseModel>(type);
 }
 
 export async function getById(id: string) {
   return db.get(type, id);
 }
 
-export async function update(cookieJar: CookieJar, patch: $Shape<CookieJar> = {}) {
+export async function update(cookieJar: CookieJar, patch: Partial<CookieJar> = {}) {
   return db.docUpdate(cookieJar, patch);
 }
 
@@ -88,10 +87,9 @@ export async function update(cookieJar: CookieJar, patch: $Shape<CookieJar> = {}
 function migrateCookieId(cookieJar: CookieJar) {
   for (const cookie of cookieJar.cookies) {
     if (!cookie.id) {
-      cookie.id = Math.random()
-        .toString()
-        .replace('0.', '');
+      cookie.id = Math.random().toString().replace('0.', '');
     }
   }
+
   return cookieJar;
 }
diff --git a/packages/insomnia-app/app/models/environment.js b/packages/insomnia-app/app/models/environment.ts
similarity index 55%
rename from packages/insomnia-app/app/models/environment.js
rename to packages/insomnia-app/app/models/environment.ts
index 25f021f861..5f816be489 100644
--- a/packages/insomnia-app/app/models/environment.js
+++ b/packages/insomnia-app/app/models/environment.ts
@@ -1,25 +1,27 @@
-// @flow
 import * as crypto from 'crypto';
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import type { BaseModel } from './index';
 import type { Workspace } from './workspace';
 
 export const name = 'Environment';
+
 export const type = 'Environment';
+
 export const prefix = 'env';
+
 export const canDuplicate = true;
+
 export const canSync = true;
 
-type BaseEnvironment = {
-  name: string,
-  data: Object,
-  dataPropertyOrder: Object | null,
-  color: string | null,
-  metaSortKey: number,
-
+interface BaseEnvironment {
+  name: string;
+  data: Record<string, any>;
+  dataPropertyOrder: Record<string, any> | null;
+  color: string | null;
+  metaSortKey: number;
   // For sync control
-  isPrivate: boolean,
-};
+  isPrivate: boolean;
+}
 
 export type Environment = BaseModel & BaseEnvironment;
 
@@ -34,47 +36,53 @@ export function init() {
   };
 }
 
-export function migrate(doc: Environment): Environment {
+export function migrate(doc: Environment) {
   return doc;
 }
 
-export function create(patch: $Shape<Environment> = {}): Promise<Environment> {
+export function create(patch: Partial<Environment> = {}) {
   if (!patch.parentId) {
     throw new Error(`New Environment missing \`parentId\`: ${JSON.stringify(patch)}`);
   }
 
-  return db.docCreate(type, patch);
+  return db.docCreate<Environment>(type, patch);
 }
 
-export function update(environment: Environment, patch: $Shape<Environment>): Promise<Environment> {
+export function update(environment: Environment, patch: Partial<Environment>) {
   return db.docUpdate(environment, patch);
 }
 
-export function findByParentId(parentId: string): Promise<Array<Environment>> {
-  return db.find(type, { parentId }, { metaSortKey: 1 });
+export function findByParentId(parentId: string) {
+  return db.find<Environment>(
+    type,
+    {
+      parentId,
+    },
+    {
+      metaSortKey: 1,
+    },
+  );
 }
 
-export async function getOrCreateForWorkspaceId(workspaceId: string): Promise<Environment> {
-  const environments = await db.find(type, { parentId: workspaceId });
+export async function getOrCreateForWorkspaceId(workspaceId: string) {
+  const environments = await db.find<Environment>(type, {
+    parentId: workspaceId,
+  });
 
   if (!environments.length) {
     return create({
       parentId: workspaceId,
       name: 'Base Environment',
-
       // Deterministic base env ID. It helps reduce sync complexity since we won't have to
       // de-duplicate environments.
-      _id: `${prefix}_${crypto
-        .createHash('sha1')
-        .update(workspaceId)
-        .digest('hex')}`,
+      _id: `${prefix}_${crypto.createHash('sha1').update(workspaceId).digest('hex')}`,
     });
   }
 
   return environments[environments.length - 1];
 }
 
-export async function getOrCreateForWorkspace(workspace: Workspace): Promise<Environment> {
+export async function getOrCreateForWorkspace(workspace: Workspace) {
   return getOrCreateForWorkspaceId(workspace._id);
 }
 
@@ -82,24 +90,29 @@ export function getById(id: string): Promise<Environment | null> {
   return db.get(type, id);
 }
 
-export async function duplicate(environment: Environment): Promise<Environment> {
+export async function duplicate(environment: Environment) {
   const name = `${environment.name} (Copy)`;
-
   // Get sort key of next environment
-  const q = { metaSortKey: { $gt: environment.metaSortKey } };
-  const [nextEnvironment] = await db.find(type, q, { metaSortKey: 1 });
+  const q = {
+    metaSortKey: {
+      $gt: environment.metaSortKey,
+    },
+  };
+  // @ts-expect-error -- TSCONVERSION appears to be a genuine error
+  const [nextEnvironment] = await db.find<Environment>(type, q, { metaSortKey: 1 });
   const nextSortKey = nextEnvironment ? nextEnvironment.metaSortKey : environment.metaSortKey + 100;
-
   // Calculate new sort key
   const metaSortKey = (environment.metaSortKey + nextSortKey) / 2;
-
-  return db.duplicate(environment, { name, metaSortKey });
+  return db.duplicate(environment, {
+    name,
+    metaSortKey,
+  });
 }
 
-export function remove(environment: Environment): Promise<void> {
+export function remove(environment: Environment) {
   return db.remove(environment);
 }
 
-export function all(): Promise<Array<Environment>> {
-  return db.all(type);
+export function all() {
+  return db.all<Environment>(type);
 }
diff --git a/packages/insomnia-app/app/models/git-repository.js b/packages/insomnia-app/app/models/git-repository.js
deleted file mode 100644
index d5404e2ed0..0000000000
--- a/packages/insomnia-app/app/models/git-repository.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// @flow
-import type { BaseModel } from './index';
-
-import * as db from '../common/database';
-import type { GitCredentials } from '../sync/git/git-vcs';
-
-type BaseGitRepository = {
-  needsFullClone: boolean,
-  uri: string,
-  credentials: GitCredentials | null,
-  author: {
-    name: string,
-    email: string,
-  },
-  uriNeedsMigration: boolean,
-};
-
-export type GitRepository = BaseModel & BaseGitRepository;
-
-export const name = 'Git Repository';
-export const type = 'GitRepository';
-export const prefix = 'git';
-export const canDuplicate = false;
-export const canSync = false;
-
-export function init(): BaseGitRepository {
-  return {
-    needsFullClone: false,
-    uri: '',
-    credentials: null,
-    author: {
-      name: '',
-      email: '',
-    },
-    uriNeedsMigration: true,
-  };
-}
-
-export function migrate(doc: GitRepository): GitRepository {
-  return doc;
-}
-
-export function create(patch: $Shape<GitRepository> = {}): Promise<GitRepository> {
-  return db.docCreate(type, {
-    uriNeedsMigration: false,
-    ...patch,
-  });
-}
-
-export async function getById(id: string): Promise<GitRepository | null> {
-  return db.getWhere(type, { _id: id });
-}
-
-export function update(repo: GitRepository, patch: $Shape<GitRepository>): Promise<GitRepository> {
-  return db.docUpdate(repo, patch);
-}
-
-export function remove(repo: GitRepository): Promise<void> {
-  return db.remove(repo);
-}
-
-export function all(): Promise<Array<GitRepository>> {
-  return db.all(type);
-}
diff --git a/packages/insomnia-app/app/models/git-repository.ts b/packages/insomnia-app/app/models/git-repository.ts
new file mode 100644
index 0000000000..39703300b0
--- /dev/null
+++ b/packages/insomnia-app/app/models/git-repository.ts
@@ -0,0 +1,66 @@
+import type { BaseModel } from './index';
+import { database as db } from '../common/database';
+import type { GitCredentials } from '../sync/git/git-vcs';
+
+export type GitRepository = BaseModel & BaseGitRepository;
+
+export const name = 'Git Repository';
+
+export const type = 'GitRepository';
+
+export const prefix = 'git';
+
+export const canDuplicate = false;
+
+export const canSync = false;
+
+export function init(): BaseGitRepository {
+  return {
+    needsFullClone: false,
+    uri: '',
+    credentials: null,
+    author: {
+      name: '',
+      email: '',
+    },
+    uriNeedsMigration: true,
+  };
+}
+
+interface BaseGitRepository {
+  needsFullClone: boolean;
+  uri: string;
+  credentials: GitCredentials | null;
+  author: {
+    name: string;
+    email: string;
+  };
+  uriNeedsMigration: boolean;
+}
+
+export function migrate(doc: GitRepository) {
+  return doc;
+}
+
+export function create(patch: Partial<GitRepository> = {}) {
+  return db.docCreate<GitRepository>(type, {
+    uriNeedsMigration: false,
+    ...patch,
+  });
+}
+
+export async function getById(id: string) {
+  return db.getWhere<GitRepository>(type, { _id: id });
+}
+
+export function update(repo: GitRepository, patch: Partial<GitRepository>) {
+  return db.docUpdate<GitRepository>(repo, patch);
+}
+
+export function remove(repo: GitRepository) {
+  return db.remove(repo);
+}
+
+export function all() {
+  return db.all<GitRepository>(type);
+}
diff --git a/packages/insomnia-app/app/models/grpc-request-meta.js b/packages/insomnia-app/app/models/grpc-request-meta.ts
similarity index 58%
rename from packages/insomnia-app/app/models/grpc-request-meta.js
rename to packages/insomnia-app/app/models/grpc-request-meta.ts
index 00a230434b..666ce702db 100644
--- a/packages/insomnia-app/app/models/grpc-request-meta.js
+++ b/packages/insomnia-app/app/models/grpc-request-meta.ts
@@ -1,18 +1,21 @@
-// @flow
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import type { BaseModel } from './index';
 import { isGrpcRequestId } from './helpers/is-model';
 
 export const name = 'gRPC Request Meta';
+
 export const type = 'GrpcRequestMeta';
+
 export const prefix = 'greqm';
+
 export const canDuplicate = false;
+
 export const canSync = false;
 
-type BaseGrpcRequestMeta = {
-  pinned: boolean,
-  lastActive: number,
-};
+interface BaseGrpcRequestMeta {
+  pinned: boolean;
+  lastActive: number;
+}
 
 export type GrpcRequestMeta = BaseModel & BaseGrpcRequestMeta;
 
@@ -23,34 +26,30 @@ export function init() {
   };
 }
 
-export function migrate(doc: GrpcRequestMeta): GrpcRequestMeta {
+export function migrate(doc: GrpcRequestMeta) {
   return doc;
 }
 
-export function create(patch: $Shape<GrpcRequestMeta> = {}): Promise<GrpcRequestMeta> {
+export function create(patch: Partial<GrpcRequestMeta> = {}) {
   if (!patch.parentId) {
     throw new Error('New GrpcRequestMeta missing `parentId`');
   }
 
   expectParentToBeGrpcRequest(patch.parentId);
-
-  return db.docCreate(type, patch);
+  return db.docCreate<GrpcRequestMeta>(type, patch);
 }
 
-export function update(
-  requestMeta: GrpcRequestMeta,
-  patch: $Shape<GrpcRequestMeta>,
-): Promise<GrpcRequestMeta> {
+export function update(requestMeta: GrpcRequestMeta, patch: Partial<GrpcRequestMeta>) {
   expectParentToBeGrpcRequest(patch.parentId || requestMeta.parentId);
   return db.docUpdate(requestMeta, patch);
 }
 
-export function getByParentId(parentId: string): Promise<GrpcRequestMeta> {
+export function getByParentId(parentId: string) {
   expectParentToBeGrpcRequest(parentId);
-  return db.getWhere(type, { parentId });
+  return db.getWhere<GrpcRequestMeta>(type, { parentId });
 }
 
-export async function getOrCreateByParentId(parentId: string): Promise<GrpcRequestMeta> {
+export async function getOrCreateByParentId(parentId: string) {
   const requestMeta = await getByParentId(parentId);
 
   if (requestMeta) {
@@ -60,22 +59,27 @@ export async function getOrCreateByParentId(parentId: string): Promise<GrpcReque
   return create({ parentId });
 }
 
-export async function updateOrCreateByParentId(parentId: string, patch: $Shape<GrpcRequestMeta>) {
+export async function updateOrCreateByParentId(parentId: string, patch: Partial<GrpcRequestMeta>) {
   const requestMeta = await getByParentId(parentId);
 
   if (requestMeta) {
     return update(requestMeta, patch);
   } else {
-    const newPatch = Object.assign({ parentId }, patch);
+    const newPatch = Object.assign(
+      {
+        parentId,
+      },
+      patch,
+    );
     return create(newPatch);
   }
 }
 
-export function all(): Promise<Array<GrpcRequestMeta>> {
-  return db.all(type);
+export function all() {
+  return db.all<GrpcRequestMeta>(type);
 }
 
-function expectParentToBeGrpcRequest(parentId: string) {
+function expectParentToBeGrpcRequest(parentId: string | null) {
   if (!isGrpcRequestId(parentId)) {
     throw new Error('Expected the parent of GrpcRequestMeta to be a GrpcRequest');
   }
diff --git a/packages/insomnia-app/app/models/grpc-request.js b/packages/insomnia-app/app/models/grpc-request.js
deleted file mode 100644
index 1082a1aa6b..0000000000
--- a/packages/insomnia-app/app/models/grpc-request.js
+++ /dev/null
@@ -1,102 +0,0 @@
-// @flow
-import * as db from '../common/database';
-import type { BaseModel } from './index';
-
-export const name = 'gRPC Request';
-export const type = 'GrpcRequest';
-export const prefix = 'greq';
-export const canDuplicate = true;
-export const canSync = true;
-
-export type GrpcRequestBody = {
-  text?: string,
-};
-
-type BaseGrpcRequest = {
-  name: string,
-  url: string,
-  description: string,
-  protoFileId?: string,
-  protoMethodName?: string,
-  body: GrpcRequestBody,
-  metaSortKey: number,
-  isPrivate: boolean,
-};
-
-export type GrpcRequest = BaseModel & BaseGrpcRequest;
-
-export function init(): BaseGrpcRequest {
-  return {
-    url: '',
-    name: 'New gRPC Request',
-    description: '',
-    protoFileId: '',
-    protoMethodName: '',
-    body: {
-      text: '{}',
-    },
-    metaSortKey: -1 * Date.now(),
-    idPrivate: false,
-  };
-}
-
-export function migrate(doc: GrpcRequest): GrpcRequest {
-  return doc;
-}
-
-export function create(patch: $Shape<GrpcRequest> = {}): Promise<GrpcRequest> {
-  if (!patch.parentId) {
-    throw new Error('New GrpcRequest missing `parentId`');
-  }
-
-  return db.docCreate(type, patch);
-}
-
-export function remove(obj: GrpcRequest): Promise<void> {
-  return db.remove(obj);
-}
-
-export function update(obj: GrpcRequest, patch: $Shape<GrpcRequest> = {}): Promise<GrpcRequest> {
-  return db.docUpdate(obj, patch);
-}
-
-export function getById(_id: string): Promise<GrpcRequest | null> {
-  return db.getWhere(type, { _id });
-}
-
-export function findByProtoFileId(protoFileId: string): Promise<Array<GrpcRequest>> {
-  return db.find(type, { protoFileId });
-}
-
-export function findByParentId(parentId: string): Promise<Array<GrpcRequest>> {
-  return db.find(type, { parentId });
-}
-
-// This is duplicated (lol) from models/request.js
-export async function duplicate(
-  request: GrpcRequest,
-  patch: $Shape<GrpcRequest> = {},
-): Promise<GrpcRequest> {
-  // Only set name and "(Copy)" if the patch does
-  // not define it and the request itself has a name.
-  // Otherwise leave it blank so the request URL can
-  // fill it in automatically.
-  if (!patch.name && request.name) {
-    patch.name = `${request.name} (Copy)`;
-  }
-
-  // Get sort key of next request
-  const q = { metaSortKey: { $gt: request.metaSortKey } };
-  const [nextRequest] = await db.find(type, q, { metaSortKey: 1 });
-  const nextSortKey = nextRequest ? nextRequest.metaSortKey : request.metaSortKey + 100;
-
-  // Calculate new sort key
-  const sortKeyIncrement = (nextSortKey - request.metaSortKey) / 2;
-  const metaSortKey = request.metaSortKey + sortKeyIncrement;
-
-  return db.duplicate(request, { name, metaSortKey, ...patch });
-}
-
-export function all(): Promise<Array<GrpcRequest>> {
-  return db.all(type);
-}
diff --git a/packages/insomnia-app/app/models/grpc-request.ts b/packages/insomnia-app/app/models/grpc-request.ts
new file mode 100644
index 0000000000..ec6726ae05
--- /dev/null
+++ b/packages/insomnia-app/app/models/grpc-request.ts
@@ -0,0 +1,111 @@
+import { database as db } from '../common/database';
+import type { BaseModel } from './index';
+
+export const name = 'gRPC Request';
+
+export const type = 'GrpcRequest';
+
+export const prefix = 'greq';
+
+export const canDuplicate = true;
+
+export const canSync = true;
+
+export interface GrpcRequestBody {
+  text?: string;
+}
+
+interface BaseGrpcRequest {
+  name: string;
+  url: string;
+  description: string;
+  protoFileId?: string;
+  protoMethodName?: string;
+  body: GrpcRequestBody;
+  metaSortKey: number;
+  isPrivate: boolean;
+}
+
+export type GrpcRequest = BaseModel & BaseGrpcRequest;
+
+export function init(): BaseGrpcRequest {
+  return {
+    url: '',
+    name: 'New gRPC Request',
+    description: '',
+    protoFileId: '',
+    protoMethodName: '',
+    body: {
+      text: '{}',
+    },
+    metaSortKey: -1 * Date.now(),
+    isPrivate: false,
+  };
+}
+
+export function migrate(doc: GrpcRequest) {
+  return doc;
+}
+
+export function create(patch: Partial<GrpcRequest> = {}) {
+  if (!patch.parentId) {
+    throw new Error('New GrpcRequest missing `parentId`');
+  }
+
+  return db.docCreate<GrpcRequest>(type, patch);
+}
+
+export function remove(obj: GrpcRequest) {
+  return db.remove(obj);
+}
+
+export function update(obj: GrpcRequest, patch: Partial<GrpcRequest> = {}) {
+  return db.docUpdate(obj, patch);
+}
+
+export function getById(_id: string) {
+  return db.getWhere<GrpcRequest>(type, { _id });
+}
+
+export function findByProtoFileId(protoFileId: string) {
+  return db.find<GrpcRequest>(type, { protoFileId });
+}
+
+export function findByParentId(parentId: string) {
+  return db.find<GrpcRequest>(type, { parentId });
+}
+
+// This is duplicated (lol) from models/request.js
+export async function duplicate(request: GrpcRequest, patch: Partial<GrpcRequest> = {}) {
+  // Only set name and "(Copy)" if the patch does
+  // not define it and the request itself has a name.
+  // Otherwise leave it blank so the request URL can
+  // fill it in automatically.
+  if (!patch.name && request.name) {
+    patch.name = `${request.name} (Copy)`;
+  }
+
+  // Get sort key of next request
+  const q = {
+    metaSortKey: {
+      $gt: request.metaSortKey,
+    },
+  };
+  // @ts-expect-error -- TSCONVERSION
+  const [nextRequest] = await db.find<GrpcRequest>(type, q, {
+    metaSortKey: 1,
+  });
+  const nextSortKey = nextRequest ? nextRequest.metaSortKey : request.metaSortKey + 100;
+  // Calculate new sort key
+  const sortKeyIncrement = (nextSortKey - request.metaSortKey) / 2;
+  const metaSortKey = request.metaSortKey + sortKeyIncrement;
+  return db.duplicate<GrpcRequest>(request, {
+    name,
+    metaSortKey,
+    ...patch,
+  });
+}
+
+export function all() {
+  return db.all<GrpcRequest>(type);
+}
diff --git a/packages/insomnia-app/app/models/helpers/__tests__/get-workspace-name.test.js b/packages/insomnia-app/app/models/helpers/__tests__/get-workspace-name.test.ts
similarity index 98%
rename from packages/insomnia-app/app/models/helpers/__tests__/get-workspace-name.test.js
rename to packages/insomnia-app/app/models/helpers/__tests__/get-workspace-name.test.ts
index 36a945847b..7a7aac230c 100644
--- a/packages/insomnia-app/app/models/helpers/__tests__/get-workspace-name.test.js
+++ b/packages/insomnia-app/app/models/helpers/__tests__/get-workspace-name.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as models from '../../../models';
 import getWorkspaceName from '../get-workspace-name';
 import { WorkspaceScopeKeys } from '../../workspace';
diff --git a/packages/insomnia-app/app/models/helpers/__tests__/git-repository-operations.test.js b/packages/insomnia-app/app/models/helpers/__tests__/git-repository-operations.test.ts
similarity index 94%
rename from packages/insomnia-app/app/models/helpers/__tests__/git-repository-operations.test.js
rename to packages/insomnia-app/app/models/helpers/__tests__/git-repository-operations.test.ts
index e12a870047..b47ac30a15 100644
--- a/packages/insomnia-app/app/models/helpers/__tests__/git-repository-operations.test.js
+++ b/packages/insomnia-app/app/models/helpers/__tests__/git-repository-operations.test.ts
@@ -1,23 +1,19 @@
-// @flow
-
 import { globalBeforeEach } from '../../../__jest__/before-each';
 import * as models from '../../index';
 import { createGitRepository, deleteGitRepository } from '../git-repository-operations';
 
 describe('gitRepositoryOperations', () => {
   beforeEach(globalBeforeEach);
-
   describe('createGitRepository', () => {
     it('should create and link to workspace meta', async () => {
-      const repoId = `git_1`;
+      const repoId = 'git_1';
       const workspaceId = 'wrk_1';
-
-      await createGitRepository(workspaceId, { _id: repoId });
-
+      await createGitRepository(workspaceId, {
+        _id: repoId,
+      });
       const wMetas = await models.workspaceMeta.all();
       expect(wMetas).toHaveLength(1);
       const wMeta = wMetas[0];
-
       expect(wMeta.parentId).toBe(workspaceId);
       expect(wMeta.gitRepositoryId).toBe(repoId);
     });
@@ -26,11 +22,8 @@ describe('gitRepositoryOperations', () => {
   describe('deleteGitRepository', () => {
     it('should delete', async () => {
       const repo = await models.gitRepository.create();
-
       expect(await models.gitRepository.all()).toHaveLength(1);
-
       await deleteGitRepository(repo);
-
       expect(await models.gitRepository.all()).toHaveLength(0);
     });
 
@@ -44,9 +37,7 @@ describe('gitRepositoryOperations', () => {
         cachedGitLastCommitTime: 123,
         cachedGitLastAuthor: 'abc',
       });
-
       await deleteGitRepository(repo);
-
       expect(await models.gitRepository.all()).toHaveLength(0);
       const meta = await models.workspaceMeta.getByParentId(wrk._id);
       expect(meta).toStrictEqual(
diff --git a/packages/insomnia-app/app/models/helpers/__tests__/is-model.test.js b/packages/insomnia-app/app/models/helpers/__tests__/is-model.test.ts
similarity index 78%
rename from packages/insomnia-app/app/models/helpers/__tests__/is-model.test.js
rename to packages/insomnia-app/app/models/helpers/__tests__/is-model.test.ts
index 073fac0f36..687e00a03f 100644
--- a/packages/insomnia-app/app/models/helpers/__tests__/is-model.test.js
+++ b/packages/insomnia-app/app/models/helpers/__tests__/is-model.test.ts
@@ -12,7 +12,6 @@ import {
 } from '../is-model';
 import { generateId } from '../../../common/misc';
 import { WorkspaceScopeKeys } from '../../workspace';
-
 const allTypes = models.types();
 const allPrefixes = models.all().map(model => model.prefix);
 
@@ -21,11 +20,19 @@ describe('isGrpcRequest', () => {
   const unsupported = difference(allTypes, supported);
 
   it.each(supported)('should return true: "%s"', type => {
-    expect(isGrpcRequest({ type })).toBe(true);
+    expect(
+      isGrpcRequest({
+        type,
+      }),
+    ).toBe(true);
   });
 
   it.each(unsupported)('should return false: "%s"', type => {
-    expect(isGrpcRequest({ type })).toBe(false);
+    expect(
+      isGrpcRequest({
+        type,
+      }),
+    ).toBe(false);
   });
 });
 
@@ -47,14 +54,21 @@ describe('isRequest', () => {
   const unsupported = difference(allTypes, supported);
 
   it.each(supported)('should return true: "%s"', type => {
-    expect(isRequest({ type })).toBe(true);
+    expect(
+      isRequest({
+        type,
+      }),
+    ).toBe(true);
   });
 
   it.each(unsupported)('should return false: "%s"', type => {
-    expect(isRequest({ type })).toBe(false);
+    expect(
+      isRequest({
+        type,
+      }),
+    ).toBe(false);
   });
 });
-
 // describe('isRequestId', () => {
 //   const supported = [models.request.prefix];
 //   const unsupported = difference(allPrefixes, supported);
@@ -73,11 +87,19 @@ describe('isRequestGroup', () => {
   const unsupported = difference(allTypes, supported);
 
   it.each(supported)('should return true: "%s"', type => {
-    expect(isRequestGroup({ type })).toBe(true);
+    expect(
+      isRequestGroup({
+        type,
+      }),
+    ).toBe(true);
   });
 
   it.each(unsupported)('should return false: "%s"', type => {
-    expect(isRequestGroup({ type })).toBe(false);
+    expect(
+      isRequestGroup({
+        type,
+      }),
+    ).toBe(false);
   });
 });
 
@@ -86,11 +108,19 @@ describe('isProtoFile', () => {
   const unsupported = difference(allTypes, supported);
 
   it.each(supported)('should return true: "%s"', type => {
-    expect(isProtoFile({ type })).toBe(true);
+    expect(
+      isProtoFile({
+        type,
+      }),
+    ).toBe(true);
   });
 
   it.each(unsupported)('should return false: "%s"', type => {
-    expect(isProtoFile({ type })).toBe(false);
+    expect(
+      isProtoFile({
+        type,
+      }),
+    ).toBe(false);
   });
 });
 
@@ -99,11 +129,19 @@ describe('isProtoDirectory', () => {
   const unsupported = difference(allTypes, supported);
 
   it.each(supported)('should return true: "%s"', type => {
-    expect(isProtoDirectory({ type })).toBe(true);
+    expect(
+      isProtoDirectory({
+        type,
+      }),
+    ).toBe(true);
   });
 
   it.each(unsupported)('should return false: "%s"', type => {
-    expect(isProtoDirectory({ type })).toBe(false);
+    expect(
+      isProtoDirectory({
+        type,
+      }),
+    ).toBe(false);
   });
 });
 
@@ -112,11 +150,19 @@ describe('isWorkspace', () => {
   const unsupported = difference(allTypes, supported);
 
   it.each(supported)('should return true: "%s"', type => {
-    expect(isWorkspace({ type })).toBe(true);
+    expect(
+      isWorkspace({
+        type,
+      }),
+    ).toBe(true);
   });
 
   it.each(unsupported)('should return false: "%s"', type => {
-    expect(isWorkspace({ type })).toBe(false);
+    expect(
+      isWorkspace({
+        type,
+      }),
+    ).toBe(false);
   });
 });
 
diff --git a/packages/insomnia-app/app/models/helpers/__tests__/query-all-workspace-urls.test.js b/packages/insomnia-app/app/models/helpers/__tests__/query-all-workspace-urls.test.ts
similarity index 91%
rename from packages/insomnia-app/app/models/helpers/__tests__/query-all-workspace-urls.test.js
rename to packages/insomnia-app/app/models/helpers/__tests__/query-all-workspace-urls.test.ts
index 6226be5e40..3f53f751ae 100644
--- a/packages/insomnia-app/app/models/helpers/__tests__/query-all-workspace-urls.test.js
+++ b/packages/insomnia-app/app/models/helpers/__tests__/query-all-workspace-urls.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { globalBeforeEach } from '../../../__jest__/before-each';
 import * as models from '../../index';
 import { queryAllWorkspaceUrls } from '../query-all-workspace-urls';
@@ -8,32 +6,32 @@ describe('queryAllWorkspaceUrls', () => {
   beforeEach(globalBeforeEach);
 
   it('should return empty array when no requests exist', async () => {
-    const w = await models.workspace.create({ name: 'Workspace' });
+    const w = await models.workspace.create({
+      name: 'Workspace',
+    });
     await expect(queryAllWorkspaceUrls(w, models.request.type)).resolves.toHaveLength(0);
     await expect(queryAllWorkspaceUrls(w, models.grpcRequest.type)).resolves.toHaveLength(0);
   });
 
   it('should return urls and exclude that of the selected request', async () => {
-    const w = await models.workspace.create({ name: 'Workspace' });
-
+    const w = await models.workspace.create({
+      name: 'Workspace',
+    });
     const r1 = await models.request.create({
       name: 'Request 1',
       parentId: w._id,
       url: 'r1.url',
     });
-
     const gr1 = await models.grpcRequest.create({
       name: 'Grpc Request 1',
       parentId: w._id,
       url: 'gr1.url',
     });
-
     const gr2 = await models.grpcRequest.create({
       name: 'Grpc Request 2',
       parentId: w._id,
       url: 'gr2.url',
     });
-
     const f2 = await models.requestGroup.create({
       name: 'Folder 2',
       parentId: w._id,
@@ -43,46 +41,40 @@ describe('queryAllWorkspaceUrls', () => {
       parentId: f2._id,
       url: 'r2.url',
     });
-
     // Should ignore all of the following
     await models.grpcRequest.create({
       name: 'Duplicate grpc url',
       parentId: w._id,
       url: gr2.url,
     });
-
     await models.request.create({
       name: 'Duplicate url',
       parentId: f2._id,
       url: r2.url,
     });
-
     await models.request.create({
       name: 'Undefined url',
       parentId: f2._id,
       url: undefined,
     });
-
     await models.grpcRequest.create({
       name: 'Undefined url',
       parentId: w._id,
       url: undefined,
     });
-
-    const w2 = await models.workspace.create({ name: 'Workspace 2' });
-
+    const w2 = await models.workspace.create({
+      name: 'Workspace 2',
+    });
     await models.request.create({
       name: 'Different workspace',
       parentId: w2._id,
       url: 'diff.url',
     });
-
     await models.grpcRequest.create({
       name: 'Different workspace',
       parentId: w2._id,
       url: 'diff.url',
     });
-
     // All items
     await expect(queryAllWorkspaceUrls(w, models.request.type)).resolves.toStrictEqual(
       expect.arrayContaining([r1.url, r2.url]),
@@ -90,7 +82,6 @@ describe('queryAllWorkspaceUrls', () => {
     await expect(queryAllWorkspaceUrls(w, models.grpcRequest.type)).resolves.toStrictEqual(
       expect.arrayContaining([gr1.url, gr2.url]),
     );
-
     // Ignore url of the selected request id
     await expect(queryAllWorkspaceUrls(w, models.request.type, r1._id)).resolves.toStrictEqual(
       expect.arrayContaining([r2.url]),
diff --git a/packages/insomnia-app/app/models/helpers/get-workspace-name.js b/packages/insomnia-app/app/models/helpers/get-workspace-name.ts
similarity index 91%
rename from packages/insomnia-app/app/models/helpers/get-workspace-name.js
rename to packages/insomnia-app/app/models/helpers/get-workspace-name.ts
index b2008a1b45..abb8e21bbc 100644
--- a/packages/insomnia-app/app/models/helpers/get-workspace-name.js
+++ b/packages/insomnia-app/app/models/helpers/get-workspace-name.ts
@@ -1,9 +1,7 @@
-// @flow
-
 import type { ApiSpec } from '../api-spec';
 import type { Workspace } from '../workspace';
 import { isDesign } from './is-model';
 
-export default function getWorkspaceName(w: Workspace, s: ApiSpec): string {
+export default function getWorkspaceName(w: Workspace, s: ApiSpec) {
   return isDesign(w) ? s.fileName : w.name;
 }
diff --git a/packages/insomnia-app/app/models/helpers/git-repository-operations.js b/packages/insomnia-app/app/models/helpers/git-repository-operations.ts
similarity index 86%
rename from packages/insomnia-app/app/models/helpers/git-repository-operations.js
rename to packages/insomnia-app/app/models/helpers/git-repository-operations.ts
index 0a17ee1e79..429cce04de 100644
--- a/packages/insomnia-app/app/models/helpers/git-repository-operations.js
+++ b/packages/insomnia-app/app/models/helpers/git-repository-operations.ts
@@ -1,11 +1,12 @@
-// @flow
 import * as models from '../../models';
 import type { GitRepository } from '../../models/git-repository';
 
-export const createGitRepository = async (workspaceId: string, repo: $Shape<GitRepository>) => {
+export const createGitRepository = async (workspaceId: string, repo: Partial<GitRepository>) => {
   const newRepo = await models.gitRepository.create(repo);
   const meta = await models.workspaceMeta.getOrCreateByParentId(workspaceId);
-  await models.workspaceMeta.update(meta, { gitRepositoryId: newRepo._id });
+  await models.workspaceMeta.update(meta, {
+    gitRepositoryId: newRepo._id,
+  });
 };
 
 export const deleteGitRepository = async (repo: GitRepository) => {
diff --git a/packages/insomnia-app/app/models/helpers/is-model.js b/packages/insomnia-app/app/models/helpers/is-model.js
deleted file mode 100644
index 58fcf28782..0000000000
--- a/packages/insomnia-app/app/models/helpers/is-model.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// @flow
-import type { BaseModel } from '../index';
-import { grpcRequest, request, requestGroup, protoFile, protoDirectory, workspace } from '../index';
-import type { Workspace } from '../workspace';
-import { WorkspaceScopeKeys } from '../../models/workspace';
-
-export function isGrpcRequest(obj: BaseModel): boolean {
-  return obj.type === grpcRequest.type;
-}
-
-export function isGrpcRequestId(id: string): boolean {
-  return id.startsWith(`${grpcRequest.prefix}_`);
-}
-
-export function isRequest(obj: BaseModel): boolean {
-  return obj.type === request.type;
-}
-
-// TODO: Invalid until we can ensure all requests are prefixed by the id correctly INS-341
-// export function isRequestId(id: string): boolean {
-//   return id.startsWith(`${request.prefix}_`);
-// }
-
-export function isRequestGroup(obj: BaseModel): boolean {
-  return obj.type === requestGroup.type;
-}
-
-export function isProtoFile(obj: BaseModel): boolean {
-  return obj.type === protoFile.type;
-}
-
-export function isProtoDirectory(obj: BaseModel): boolean {
-  return obj.type === protoDirectory.type;
-}
-
-export function isWorkspace(obj: BaseModel): boolean {
-  return obj.type === workspace.type;
-}
-
-export function isDesign({ scope }: Workspace): boolean {
-  return scope === WorkspaceScopeKeys.design;
-}
-
-export function isCollection({ scope }: Workspace): boolean {
-  return scope === WorkspaceScopeKeys.collection;
-}
diff --git a/packages/insomnia-app/app/models/helpers/is-model.ts b/packages/insomnia-app/app/models/helpers/is-model.ts
new file mode 100644
index 0000000000..a2e032c270
--- /dev/null
+++ b/packages/insomnia-app/app/models/helpers/is-model.ts
@@ -0,0 +1,55 @@
+import type { BaseModel } from '../index';
+import {
+  grpcRequest,
+  request,
+  requestGroup,
+  protoFile,
+  protoDirectory,
+  workspace,
+} from '../index';
+import type { Workspace } from '../workspace';
+import { WorkspaceScopeKeys } from '../../models/workspace';
+import { ProtoDirectory } from '../proto-directory';
+import { ProtoFile } from '../proto-file';
+import { RequestGroup } from '../request-group';
+import { Request } from '../request';
+import { GrpcRequest } from '../grpc-request';
+
+export const isGrpcRequestId = (id: string | null) => (
+  id?.startsWith(`${grpcRequest.prefix}_`)
+);
+
+// TODO: Invalid until we can ensure all requests are prefixed by the id correctly INS-341
+// export const isRequestId = (id: string) => id.startsWith(`${request.prefix}_`);
+
+export const isGrpcRequest = (obj: Pick<BaseModel, 'type'>): obj is GrpcRequest => (
+  obj.type === grpcRequest.type
+);
+
+export const isRequest = (obj: Pick<BaseModel, 'type'>): obj is Request => (
+  obj.type === request.type
+);
+
+export const isRequestGroup = (obj: Pick<BaseModel, 'type'>): obj is RequestGroup => (
+  obj.type === requestGroup.type
+);
+
+export const isProtoFile = (obj: Pick<BaseModel, 'type'>): obj is ProtoFile => (
+  obj.type === protoFile.type
+);
+
+export const isProtoDirectory = (obj: Pick<BaseModel, 'type'>): obj is ProtoDirectory => (
+  obj.type === protoDirectory.type
+);
+
+export const isWorkspace = (obj: Pick<BaseModel, 'type'>): obj is Workspace => (
+  obj.type === workspace.type
+);
+
+export const isDesign = (obj: Partial<Workspace>) => (
+  obj.scope === WorkspaceScopeKeys.design
+);
+
+export const isCollection = (obj: Workspace) => (
+  obj.scope === WorkspaceScopeKeys.collection
+);
diff --git a/packages/insomnia-app/app/models/helpers/query-all-workspace-urls.js b/packages/insomnia-app/app/models/helpers/query-all-workspace-urls.ts
similarity index 53%
rename from packages/insomnia-app/app/models/helpers/query-all-workspace-urls.js
rename to packages/insomnia-app/app/models/helpers/query-all-workspace-urls.ts
index 77c6b585fd..b05b119492 100644
--- a/packages/insomnia-app/app/models/helpers/query-all-workspace-urls.js
+++ b/packages/insomnia-app/app/models/helpers/query-all-workspace-urls.ts
@@ -1,17 +1,14 @@
-// @flow
-
-import * as db from '../../common/database';
-import * as models from '../index';
-import type { Workspace } from '../workspace';
-import type { GrpcRequest } from '../grpc-request';
+import { database as db } from '../../common/database';
+import { Request, type as RequestType } from '../request';
+import { GrpcRequest, type as GrpcRequestType } from '../grpc-request';
+import { Workspace } from '../workspace';
 
 export const queryAllWorkspaceUrls = async (
-  workspace: Workspace,
-  reqType: models.request.type | models.grpcRequest.type,
-  reqId?: string = 'n/a',
+  workspace: Workspace | null,
+  reqType: typeof RequestType | typeof GrpcRequestType,
+  reqId = 'n/a',
 ): Promise<Array<string>> => {
   const docs = await db.withDescendants(workspace, reqType);
-
   const urls = docs
     .filter(
       (d: any) =>
@@ -19,7 +16,7 @@ export const queryAllWorkspaceUrls = async (
         d._id !== reqId && // Not current request
         (d.url || ''), // Only ones with non-empty URLs
     )
+    // @ts-expect-error -- TSCONVERSION
     .map((r: Request | GrpcRequest) => (r.url || '').trim());
-
   return Array.from(new Set(urls));
 };
diff --git a/packages/insomnia-app/app/models/helpers/request-operations.js b/packages/insomnia-app/app/models/helpers/request-operations.ts
similarity index 58%
rename from packages/insomnia-app/app/models/helpers/request-operations.js
rename to packages/insomnia-app/app/models/helpers/request-operations.ts
index aae94e455b..cdcf914c64 100644
--- a/packages/insomnia-app/app/models/helpers/request-operations.js
+++ b/packages/insomnia-app/app/models/helpers/request-operations.ts
@@ -1,7 +1,7 @@
-// @flow
+import { GrpcRequest } from '../grpc-request';
+import { Request } from '../request';
 import * as models from '../index';
 import { isGrpcRequest, isGrpcRequestId } from './is-model';
-import type { GrpcRequest } from '../grpc-request';
 
 export function getById(requestId: string): Promise<Request | GrpcRequest | null> {
   return isGrpcRequestId(requestId)
@@ -9,20 +9,24 @@ export function getById(requestId: string): Promise<Request | GrpcRequest | null
     : models.request.getById(requestId);
 }
 
-export function remove<T>(request: T): Promise<void> {
+export function remove(request: Request | GrpcRequest) {
   return isGrpcRequest(request)
     ? models.grpcRequest.remove(request)
     : models.request.remove(request);
 }
 
-export function update<T>(request: T, patch: $Shape<T> = {}): Promise<T> {
+export function update<T extends object>(request: T, patch: Partial<T> = {}): Promise<T> {
+  // @ts-expect-error -- TSCONVERSION
   return isGrpcRequest(request)
     ? models.grpcRequest.update(request, patch)
+  // @ts-expect-error -- TSCONVERSION
     : models.request.update(request, patch);
 }
 
-export function duplicate<T>(request: T, patch: $Shape<T> = {}): Promise<T> {
+export function duplicate<T extends object>(request: T, patch: Partial<T> = {}): Promise<T> {
+  // @ts-expect-error -- TSCONVERSION
   return isGrpcRequest(request)
     ? models.grpcRequest.duplicate(request, patch)
+  // @ts-expect-error -- TSCONVERSION
     : models.request.duplicate(request, patch);
 }
diff --git a/packages/insomnia-app/app/models/helpers/workspace-operations.js b/packages/insomnia-app/app/models/helpers/workspace-operations.ts
similarity index 55%
rename from packages/insomnia-app/app/models/helpers/workspace-operations.js
rename to packages/insomnia-app/app/models/helpers/workspace-operations.ts
index c53a176aab..adcfe93558 100644
--- a/packages/insomnia-app/app/models/helpers/workspace-operations.js
+++ b/packages/insomnia-app/app/models/helpers/workspace-operations.ts
@@ -1,23 +1,28 @@
-// @flow
 import * as models from '../index';
-import * as db from '../../common/database';
-
+import { database as db } from '../../common/database';
 import { isDesign } from './is-model';
 import type { Workspace } from '../workspace';
 import type { ApiSpec } from '../api-spec';
 
-export async function rename(w: Workspace, s: ApiSpec, name: string): Promise<void> {
+export async function rename(w: Workspace, s: ApiSpec, name: string) {
   if (isDesign(w)) {
-    await models.apiSpec.update(s, { fileName: name });
+    await models.apiSpec.update(s, {
+      fileName: name,
+    });
   } else {
-    await models.workspace.update(w, { name });
+    await models.workspace.update(w, {
+      name,
+    });
   }
 }
 
-export async function duplicate(w: Workspace, name: string): Promise<Workspace> {
-  const newWorkspace = await db.duplicate(w, { name });
-  await models.apiSpec.updateOrCreateForParentId(newWorkspace._id, { fileName: name });
+export async function duplicate(w: Workspace, name: string) {
+  const newWorkspace = await db.duplicate(w, {
+    name,
+  });
+  await models.apiSpec.updateOrCreateForParentId(newWorkspace._id, {
+    fileName: name,
+  });
   models.stats.incrementCreatedRequestsForDescendents(newWorkspace);
-
   return newWorkspace;
 }
diff --git a/packages/insomnia-app/app/models/index.js b/packages/insomnia-app/app/models/index.ts
similarity index 88%
rename from packages/insomnia-app/app/models/index.js
rename to packages/insomnia-app/app/models/index.ts
index d034c035f5..ca8fc7b653 100644
--- a/packages/insomnia-app/app/models/index.js
+++ b/packages/insomnia-app/app/models/index.ts
@@ -1,4 +1,3 @@
-// @flow
 import * as _apiSpec from './api-spec';
 import * as _clientCertificate from './client-certificate';
 import * as _cookieJar from './cookie-jar';
@@ -25,13 +24,15 @@ import * as _workspace from './workspace';
 import * as _workspaceMeta from './workspace-meta';
 import { generateId, pluralize } from '../common/misc';
 
-export type BaseModel = {
-  _id: string,
-  type: string,
-  parentId: string,
-  modified: number,
-  created: number,
-};
+export interface BaseModel {
+  _id: string;
+  type: string;
+  parentId: string;
+  modified: number;
+  created: number;
+  isPrivate: boolean;
+  name: string;
+}
 
 // Reference to each model
 export const apiSpec = _apiSpec;
@@ -88,19 +89,20 @@ export function all() {
     protoDirectory,
     grpcRequest,
     grpcRequestMeta,
-  ];
+  ] as const;
 }
 
-export function types(): Array<any> {
+export function types() {
   return all().map(model => model.type);
 }
 
-export function canSync(d: BaseModel): boolean {
-  if ((d: any).isPrivate) {
+export function canSync(d: BaseModel) {
+  if (d.isPrivate) {
     return false;
   }
 
   const m = getModel(d.type);
+
   if (!m) {
     return false;
   }
@@ -108,11 +110,11 @@ export function canSync(d: BaseModel): boolean {
   return m.canSync || false;
 }
 
-export function getModel(type: string): Object | null {
+export function getModel(type: string) {
   return all().find(m => m.type === type) || null;
 }
 
-export function mustGetModel(type: string): Object {
+export function mustGetModel(type: string) {
   const model = getModel(type);
 
   if (!model) {
@@ -127,8 +129,9 @@ export function canDuplicate(type: string) {
   return model ? model.canDuplicate : false;
 }
 
-export function getModelName(type: string, count: number = 1) {
+export function getModelName(type: string, count = 1) {
   const model = getModel(type);
+
   if (!model) {
     return 'Unknown';
   } else if (count === 1) {
@@ -138,7 +141,7 @@ export function getModelName(type: string, count: number = 1) {
   }
 }
 
-export async function initModel<T: BaseModel>(type: string, ...sources: Array<Object>): Promise<T> {
+export async function initModel<T extends BaseModel>(type: string, ...sources: Array<Record<string, any>>): Promise<T> {
   const model = getModel(type);
 
   if (!model) {
@@ -160,7 +163,6 @@ export async function initModel<T: BaseModel>(type: string, ...sources: Array<Ob
     },
     model.init(),
   );
-
   const fullObject = Object.assign({}, objectDefaults, ...sources);
 
   // Generate an _id if there isn't one yet
@@ -179,5 +181,6 @@ export async function initModel<T: BaseModel>(type: string, ...sources: Array<Ob
     }
   }
 
+  // @ts-expect-error -- TSCONVERSION not sure why this error is occuring
   return migratedDoc;
 }
diff --git a/packages/insomnia-app/app/models/o-auth-2-token.js b/packages/insomnia-app/app/models/o-auth-2-token.js
deleted file mode 100644
index 7df12e31ef..0000000000
--- a/packages/insomnia-app/app/models/o-auth-2-token.js
+++ /dev/null
@@ -1,84 +0,0 @@
-// @flow
-import type { BaseModel } from './index';
-
-import * as db from '../common/database';
-
-type BaseOAuth2Token = {
-  refreshToken: string,
-  accessToken: string,
-  identityToken: string,
-  expiresAt: number | null, // Should be Date.now() if valid
-
-  // Debug
-  xResponseId: string | null,
-  xError: string | null,
-
-  // Error handling
-  error: string,
-  errorDescription: string,
-  errorUri: string,
-};
-
-export type OAuth2Token = BaseModel & BaseOAuth2Token;
-
-export const name = 'OAuth 2.0 Token';
-export const type = 'OAuth2Token';
-export const prefix = 'oa2';
-export const canDuplicate = false;
-export const canSync = false;
-
-export function init(): BaseOAuth2Token {
-  return {
-    refreshToken: '',
-    accessToken: '',
-    identityToken: '',
-    expiresAt: null, // Should be Date.now() if valid
-
-    // Debug
-    xResponseId: null,
-    xError: null,
-
-    // Error handling
-    error: '',
-    errorDescription: '',
-    errorUri: '',
-  };
-}
-
-export function migrate<T>(doc: T): T {
-  return doc;
-}
-
-export function create(patch: $Shape<OAuth2Token> = {}): Promise<OAuth2Token> {
-  if (!patch.parentId) {
-    throw new Error(`New OAuth2Token missing \`parentId\` ${JSON.stringify(patch)}`);
-  }
-
-  return db.docCreate(type, patch);
-}
-
-export function update(token: OAuth2Token, patch: $Shape<OAuth2Token>): Promise<OAuth2Token> {
-  return db.docUpdate(token, patch);
-}
-
-export function remove(token: OAuth2Token): Promise<void> {
-  return db.remove(token);
-}
-
-export function getByParentId(parentId: string): Promise<OAuth2Token | null> {
-  return db.getWhere(type, { parentId });
-}
-
-export async function getOrCreateByParentId(parentId: string): Promise<OAuth2Token> {
-  let token = await db.getWhere(type, { parentId });
-
-  if (!token) {
-    token = await create({ parentId });
-  }
-
-  return token;
-}
-
-export function all(): Promise<Array<OAuth2Token>> {
-  return db.all(type);
-}
diff --git a/packages/insomnia-app/app/models/o-auth-2-token.ts b/packages/insomnia-app/app/models/o-auth-2-token.ts
new file mode 100644
index 0000000000..042fcb318c
--- /dev/null
+++ b/packages/insomnia-app/app/models/o-auth-2-token.ts
@@ -0,0 +1,88 @@
+import type { BaseModel } from './index';
+import { database as db } from '../common/database';
+
+export type OAuth2Token = BaseModel & BaseOAuth2Token;
+
+export const name = 'OAuth 2.0 Token';
+
+export const type = 'OAuth2Token';
+
+export const prefix = 'oa2';
+
+export const canDuplicate = false;
+
+export const canSync = false;
+
+interface BaseOAuth2Token {
+  refreshToken: string;
+  accessToken: string;
+  identityToken: string;
+  expiresAt: number | null;
+  // Should be Date.now() if valid
+  // Debug
+  xResponseId: string | null;
+  xError: string | null;
+  // Error handling
+  error: string;
+  errorDescription: string;
+  errorUri: string;
+}
+
+export function init(): BaseOAuth2Token {
+  return {
+    refreshToken: '',
+    accessToken: '',
+    identityToken: '',
+    expiresAt: null,
+    // Should be Date.now() if valid
+    // Debug
+    xResponseId: null,
+    xError: null,
+    // Error handling
+    error: '',
+    errorDescription: '',
+    errorUri: '',
+  };
+}
+
+export function migrate(doc: OAuth2Token) {
+  return doc;
+}
+
+export function create(patch: Partial<OAuth2Token> = {}) {
+  if (!patch.parentId) {
+    throw new Error(`New OAuth2Token missing \`parentId\` ${JSON.stringify(patch)}`);
+  }
+
+  return db.docCreate<OAuth2Token>(type, patch);
+}
+
+export function update(token: OAuth2Token, patch: Partial<OAuth2Token>) {
+  return db.docUpdate(token, patch);
+}
+
+export function remove(token: OAuth2Token) {
+  return db.remove(token);
+}
+
+export function getByParentId(parentId: string) {
+  return db.getWhere<OAuth2Token>(type, { parentId });
+}
+
+export async function getOrCreateByParentId(parentId: string) {
+  let token = await db.getWhere<OAuth2Token>(type, {
+    parentId,
+  });
+
+  if (!token) {
+    token = await create({
+      parentId,
+    });
+  }
+
+  return token;
+}
+
+export function all() {
+  return db.all<OAuth2Token>(type);
+}
diff --git a/packages/insomnia-app/app/models/plugin-data.js b/packages/insomnia-app/app/models/plugin-data.js
deleted file mode 100644
index 4df9cfeda1..0000000000
--- a/packages/insomnia-app/app/models/plugin-data.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// @flow
-import * as db from '../common/database';
-import type { BaseModel } from './index';
-
-export const name = 'PluginData';
-export const type = 'PluginData';
-export const prefix = 'plg';
-export const canDuplicate = false;
-export const canSync = false;
-
-type BasePluginData = {
-  plugin: string,
-  key: string,
-  value: string,
-};
-
-export type PluginData = BaseModel & BasePluginData;
-
-export function init(): BasePluginData {
-  return {
-    plugin: '',
-    key: '',
-    value: '',
-  };
-}
-
-export function migrate(doc: PluginData): PluginData {
-  return doc;
-}
-
-export function create(patch: $Shape<PluginData> = {}): Promise<PluginData> {
-  return db.docCreate(type, patch);
-}
-
-export async function update(doc: PluginData, patch: $Shape<PluginData>): Promise<PluginData> {
-  return db.docUpdate(doc, patch);
-}
-
-export async function upsertByKey(plugin: string, key: string, value: string): Promise<PluginData> {
-  const doc = await getByKey(plugin, key);
-  return doc ? update(doc, { value }) : create({ plugin, key, value });
-}
-
-export async function removeByKey(plugin: string, key: string): Promise<void> {
-  return db.removeWhere(type, { plugin, key });
-}
-
-export async function all(plugin: string): Promise<Array<PluginData>> {
-  return db.find(type, { plugin });
-}
-
-export async function removeAll(plugin: string): Promise<void> {
-  return db.removeWhere(type, { plugin });
-}
-
-export async function getByKey(plugin: string, key: string): Promise<PluginData | null> {
-  return db.getWhere(type, { plugin, key });
-}
diff --git a/packages/insomnia-app/app/models/plugin-data.ts b/packages/insomnia-app/app/models/plugin-data.ts
new file mode 100644
index 0000000000..ce83f5a56a
--- /dev/null
+++ b/packages/insomnia-app/app/models/plugin-data.ts
@@ -0,0 +1,69 @@
+import { database as db } from '../common/database';
+import type { BaseModel } from './index';
+
+export const name = 'PluginData';
+
+export const type = 'PluginData';
+
+export const prefix = 'plg';
+
+export const canDuplicate = false;
+
+export const canSync = false;
+
+interface BasePluginData {
+  plugin: string;
+  key: string;
+  value: string;
+}
+
+export type PluginData = BaseModel & BasePluginData;
+
+export function init(): BasePluginData {
+  return {
+    plugin: '',
+    key: '',
+    value: '',
+  };
+}
+
+export function migrate(doc: PluginData) {
+  return doc;
+}
+
+export function create(patch: Partial<PluginData> = {}) {
+  return db.docCreate<PluginData>(type, patch);
+}
+
+export async function update(doc: PluginData, patch: Partial<PluginData>) {
+  return db.docUpdate(doc, patch);
+}
+
+export async function upsertByKey(plugin: string, key: string, value: string) {
+  const doc = await getByKey(plugin, key);
+  return doc
+    ? update(doc, {
+        value,
+      })
+    : create({
+        plugin,
+        key,
+        value,
+      });
+}
+
+export async function removeByKey(plugin: string, key: string) {
+  return db.removeWhere(type, { plugin, key });
+}
+
+export async function all(plugin: string) {
+  return db.find<PluginData>(type, { plugin });
+}
+
+export async function removeAll(plugin: string) {
+  return db.removeWhere(type, { plugin });
+}
+
+export async function getByKey(plugin: string, key: string) {
+  return db.getWhere<PluginData>(type, { plugin, key });
+}
diff --git a/packages/insomnia-app/app/models/proto-directory.js b/packages/insomnia-app/app/models/proto-directory.js
deleted file mode 100644
index 48ebd32891..0000000000
--- a/packages/insomnia-app/app/models/proto-directory.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// @flow
-import * as db from '../common/database';
-import type { BaseModel } from './index';
-import { generateId } from '../common/misc';
-
-export const name = 'Proto Directory';
-export const type = 'ProtoDirectory';
-export const prefix = 'pd';
-export const canDuplicate = true;
-export const canSync = true;
-
-type BaseProtoDirectory = {
-  name: string,
-};
-
-export type ProtoDirectory = BaseModel & BaseProtoDirectory;
-
-export function init(): BaseProtoDirectory {
-  return {
-    name: 'New Proto Directory',
-  };
-}
-
-export function migrate(doc: ProtoDirectory): ProtoDirectory {
-  return doc;
-}
-
-export function createId(): string {
-  return generateId(prefix);
-}
-
-export function create(patch: $Shape<ProtoDirectory> = {}): Promise<ProtoDirectory> {
-  if (!patch.parentId) {
-    throw new Error('New ProtoDirectory missing `parentId`');
-  }
-
-  return db.docCreate(type, patch);
-}
-
-export function getById(_id: string): Promise<ProtoDirectory | null> {
-  return db.getWhere(type, { _id });
-}
-
-export function getByParentId(parentId: string): Promise<ProtoDirectory | null> {
-  return db.getWhere(type, { parentId });
-}
-
-export function remove(obj: ProtoDirectory): Promise<void> {
-  return db.remove(obj);
-}
-
-export async function batchRemoveIds(ids: Array<string>): Promise<void> {
-  const dirs = await db.find(type, { _id: { $in: ids } });
-  await db.batchModifyDocs({ upsert: [], remove: dirs });
-}
-
-export function all(): Promise<Array<ProtoDirectory>> {
-  return db.all(type);
-}
diff --git a/packages/insomnia-app/app/models/proto-directory.ts b/packages/insomnia-app/app/models/proto-directory.ts
new file mode 100644
index 0000000000..be7881a2aa
--- /dev/null
+++ b/packages/insomnia-app/app/models/proto-directory.ts
@@ -0,0 +1,69 @@
+import { database as db } from '../common/database';
+import type { BaseModel } from './index';
+import { generateId } from '../common/misc';
+
+export const name = 'Proto Directory';
+
+export const type = 'ProtoDirectory';
+
+export const prefix = 'pd';
+
+export const canDuplicate = true;
+
+export const canSync = true;
+
+interface BaseProtoDirectory {
+  name: string;
+}
+
+export type ProtoDirectory = BaseModel & BaseProtoDirectory;
+
+export function init(): BaseProtoDirectory {
+  return {
+    name: 'New Proto Directory',
+  };
+}
+
+export function migrate(doc: ProtoDirectory) {
+  return doc;
+}
+
+export function createId() {
+  return generateId(prefix);
+}
+
+export function create(patch: Partial<ProtoDirectory> = {}) {
+  if (!patch.parentId) {
+    throw new Error('New ProtoDirectory missing `parentId`');
+  }
+
+  return db.docCreate<ProtoDirectory>(type, patch);
+}
+
+export function getById(_id: string) {
+  return db.getWhere<ProtoDirectory>(type, { _id });
+}
+
+export function getByParentId(parentId: string) {
+  return db.getWhere<ProtoDirectory>(type, { parentId });
+}
+
+export function remove(obj: ProtoDirectory) {
+  return db.remove(obj);
+}
+
+export async function batchRemoveIds(ids: Array<string>) {
+  const dirs = await db.find(type, {
+    _id: {
+      $in: ids,
+    },
+  });
+  await db.batchModifyDocs({
+    upsert: [],
+    remove: dirs,
+  });
+}
+
+export function all() {
+  return db.all<ProtoDirectory>(type);
+}
diff --git a/packages/insomnia-app/app/models/proto-file.js b/packages/insomnia-app/app/models/proto-file.js
deleted file mode 100644
index 14934a458c..0000000000
--- a/packages/insomnia-app/app/models/proto-file.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// @flow
-import * as db from '../common/database';
-import type { BaseModel } from './index';
-
-export const name = 'Proto File';
-export const type = 'ProtoFile';
-export const prefix = 'pf';
-export const canDuplicate = true;
-export const canSync = true;
-
-type BaseProtoFile = {
-  name: string,
-  protoText: string,
-};
-
-export type ProtoFile = BaseModel & BaseProtoFile;
-
-export function init(): BaseProtoFile {
-  return {
-    name: 'New Proto File',
-    protoText: '',
-  };
-}
-
-export function migrate(doc: ProtoFile): ProtoFile {
-  return doc;
-}
-
-export function create(patch: $Shape<ProtoFile> = {}): Promise<ProtoFile> {
-  if (!patch.parentId) {
-    throw new Error('New ProtoFile missing `parentId`');
-  }
-
-  return db.docCreate(type, patch);
-}
-
-export function remove(protoFile: ProtoFile): Promise<void> {
-  return db.remove(protoFile);
-}
-
-export async function batchRemoveIds(ids: Array<string>): Promise<void> {
-  const files = await db.find(type, { _id: { $in: ids } });
-  await db.batchModifyDocs({ upsert: [], remove: files });
-}
-
-export function update(protoFile: ProtoFile, patch: $Shape<ProtoFile> = {}): Promise<ProtoFile> {
-  return db.docUpdate(protoFile, patch);
-}
-
-export function getById(_id: string): Promise<ProtoFile | null> {
-  return db.getWhere(type, { _id });
-}
-
-export function getByParentId(parentId: string): Promise<ProtoFile | null> {
-  return db.getWhere(type, { parentId });
-}
-
-export function findByParentId(parentId: string): Promise<Array<ProtoFile>> {
-  return db.find(type, { parentId });
-}
-
-export function all(): Promise<Array<ProtoFile>> {
-  return db.all(type);
-}
diff --git a/packages/insomnia-app/app/models/proto-file.ts b/packages/insomnia-app/app/models/proto-file.ts
new file mode 100644
index 0000000000..2f2d5f1b1a
--- /dev/null
+++ b/packages/insomnia-app/app/models/proto-file.ts
@@ -0,0 +1,74 @@
+import { database as db } from '../common/database';
+import type { BaseModel } from './index';
+
+export const name = 'Proto File';
+
+export const type = 'ProtoFile';
+
+export const prefix = 'pf';
+
+export const canDuplicate = true;
+
+export const canSync = true;
+
+interface BaseProtoFile {
+  name: string;
+  protoText: string;
+}
+
+export type ProtoFile = BaseModel & BaseProtoFile;
+
+export function init(): BaseProtoFile {
+  return {
+    name: 'New Proto File',
+    protoText: '',
+  };
+}
+
+export function migrate(doc: ProtoFile) {
+  return doc;
+}
+
+export function create(patch: Partial<ProtoFile> = {}) {
+  if (!patch.parentId) {
+    throw new Error('New ProtoFile missing `parentId`');
+  }
+
+  return db.docCreate<ProtoFile>(type, patch);
+}
+
+export function remove(protoFile: ProtoFile) {
+  return db.remove(protoFile);
+}
+
+export async function batchRemoveIds(ids: Array<string>) {
+  const files = await db.find(type, {
+    _id: {
+      $in: ids,
+    },
+  });
+  await db.batchModifyDocs({
+    upsert: [],
+    remove: files,
+  });
+}
+
+export function update(protoFile: ProtoFile, patch: Partial<ProtoFile> = {}) {
+  return db.docUpdate<ProtoFile>(protoFile, patch);
+}
+
+export function getById(_id: string) {
+  return db.getWhere<ProtoFile>(type, { _id });
+}
+
+export function getByParentId(parentId: string) {
+  return db.getWhere<ProtoFile>(type, { parentId });
+}
+
+export function findByParentId(parentId: string) {
+  return db.find<ProtoFile>(type, { parentId });
+}
+
+export function all() {
+  return db.all<ProtoFile>(type);
+}
diff --git a/packages/insomnia-app/app/models/request-group-meta.js b/packages/insomnia-app/app/models/request-group-meta.js
deleted file mode 100644
index b6bbd643a8..0000000000
--- a/packages/insomnia-app/app/models/request-group-meta.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// @flow
-
-import * as db from '../common/database';
-import type { BaseModel } from './index';
-
-export const name = 'Folder Meta';
-export const type = 'RequestGroupMeta';
-export const prefix = 'fldm';
-export const canDuplicate = false;
-export const canSync = false;
-
-type BaseRequestGroupMeta = {
-  collapsed: boolean,
-};
-
-export type RequestGroupMeta = BaseModel & BaseRequestGroupMeta;
-
-export function init() {
-  return {
-    parentId: null,
-    collapsed: false,
-  };
-}
-
-export function migrate(doc: RequestGroupMeta): RequestGroupMeta {
-  return doc;
-}
-
-export function create(patch: $Shape<RequestGroupMeta> = {}): Promise<RequestGroupMeta> {
-  if (!patch.parentId) {
-    throw new Error('New RequestGroupMeta missing `parentId`: ' + JSON.stringify(patch));
-  }
-
-  return db.docCreate(type, patch);
-}
-
-export function update(
-  requestGroupMeta: RequestGroupMeta,
-  patch: $Shape<RequestGroupMeta>,
-): Promise<RequestGroupMeta> {
-  return db.docUpdate(requestGroupMeta, patch);
-}
-
-export function getByParentId(parentId: string): Promise<RequestGroupMeta | null> {
-  return db.getWhere(type, { parentId });
-}
-
-export function all(): Promise<Array<RequestGroupMeta>> {
-  return db.all(type);
-}
diff --git a/packages/insomnia-app/app/models/request-group-meta.ts b/packages/insomnia-app/app/models/request-group-meta.ts
new file mode 100644
index 0000000000..ba8c234444
--- /dev/null
+++ b/packages/insomnia-app/app/models/request-group-meta.ts
@@ -0,0 +1,49 @@
+import { database as db } from '../common/database';
+import type { BaseModel } from './index';
+
+export const name = 'Folder Meta';
+
+export const type = 'RequestGroupMeta';
+
+export const prefix = 'fldm';
+
+export const canDuplicate = false;
+
+export const canSync = false;
+
+interface BaseRequestGroupMeta {
+  collapsed: boolean;
+}
+
+export type RequestGroupMeta = BaseModel & BaseRequestGroupMeta;
+
+export function init() {
+  return {
+    parentId: null,
+    collapsed: false,
+  };
+}
+
+export function migrate(doc: RequestGroupMeta) {
+  return doc;
+}
+
+export function create(patch: Partial<RequestGroupMeta> = {}) {
+  if (!patch.parentId) {
+    throw new Error('New RequestGroupMeta missing `parentId`: ' + JSON.stringify(patch));
+  }
+
+  return db.docCreate<RequestGroupMeta>(type, patch);
+}
+
+export function update(requestGroupMeta: RequestGroupMeta, patch: Partial<RequestGroupMeta>) {
+  return db.docUpdate<RequestGroupMeta>(requestGroupMeta, patch);
+}
+
+export function getByParentId(parentId: string) {
+  return db.getWhere<RequestGroupMeta>(type, { parentId });
+}
+
+export function all() {
+  return db.all<RequestGroupMeta>(type);
+}
diff --git a/packages/insomnia-app/app/models/request-group.js b/packages/insomnia-app/app/models/request-group.js
deleted file mode 100644
index a1788f866e..0000000000
--- a/packages/insomnia-app/app/models/request-group.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// @flow
-import * as db from '../common/database';
-import type { BaseModel } from './index';
-
-export const name = 'Folder';
-export const type = 'RequestGroup';
-export const prefix = 'fld';
-export const canDuplicate = true;
-export const canSync = true;
-
-type BaseRequestGroup = {
-  name: string,
-  description: string,
-  environment: Object,
-  environmentPropertyOrder: Object | null,
-  metaSortKey: number,
-};
-
-export type RequestGroup = BaseModel & BaseRequestGroup;
-
-export function init(): BaseRequestGroup {
-  return {
-    name: 'New Folder',
-    description: '',
-    environment: {},
-    environmentPropertyOrder: null,
-    metaSortKey: -1 * Date.now(),
-  };
-}
-
-export function migrate(doc: RequestGroup) {
-  return doc;
-}
-
-export function create(patch: $Shape<RequestGroup> = {}): Promise<RequestGroup> {
-  if (!patch.parentId) {
-    throw new Error('New RequestGroup missing `parentId`: ' + JSON.stringify(patch));
-  }
-
-  return db.docCreate(type, patch);
-}
-
-export function update(
-  requestGroup: RequestGroup,
-  patch: $Shape<RequestGroup> = {},
-): Promise<RequestGroup> {
-  return db.docUpdate(requestGroup, patch);
-}
-
-export function getById(id: string): Promise<RequestGroup | null> {
-  return db.get(type, id);
-}
-
-export function findByParentId(parentId: string): Promise<Array<RequestGroup>> {
-  return db.find(type, { parentId });
-}
-
-export function remove(requestGroup: RequestGroup): Promise<void> {
-  return db.remove(requestGroup);
-}
-
-export function all(): Promise<Array<RequestGroup>> {
-  return db.all(type);
-}
-
-export async function duplicate(
-  requestGroup: RequestGroup,
-  patch: $Shape<RequestGroup> = {},
-): Promise<RequestGroup> {
-  if (!patch.name) {
-    patch.name = `${requestGroup.name} (Copy)`;
-  }
-
-  // Get sort key of next request
-  const q = { metaSortKey: { $gt: requestGroup.metaSortKey } };
-  const [nextRequestGroup] = await db.find(type, q, { metaSortKey: 1 });
-  const nextSortKey = nextRequestGroup
-    ? nextRequestGroup.metaSortKey
-    : requestGroup.metaSortKey + 100;
-
-  // Calculate new sort key
-  const sortKeyIncrement = (nextSortKey - requestGroup.metaSortKey) / 2;
-  const metaSortKey = requestGroup.metaSortKey + sortKeyIncrement;
-
-  return db.duplicate(requestGroup, { metaSortKey, ...patch });
-}
diff --git a/packages/insomnia-app/app/models/request-group.ts b/packages/insomnia-app/app/models/request-group.ts
new file mode 100644
index 0000000000..f1240d59d4
--- /dev/null
+++ b/packages/insomnia-app/app/models/request-group.ts
@@ -0,0 +1,93 @@
+import { database as db } from '../common/database';
+import type { BaseModel } from './index';
+
+export const name = 'Folder';
+
+export const type = 'RequestGroup';
+
+export const prefix = 'fld';
+
+export const canDuplicate = true;
+
+export const canSync = true;
+interface BaseRequestGroup {
+  name: string;
+  description: string;
+  environment: Record<string, any>;
+  environmentPropertyOrder: Record<string, any> | null;
+  metaSortKey: number;
+}
+
+export type RequestGroup = BaseModel & BaseRequestGroup;
+
+export function init(): BaseRequestGroup {
+  return {
+    name: 'New Folder',
+    description: '',
+    environment: {},
+    environmentPropertyOrder: null,
+    metaSortKey: -1 * Date.now(),
+  };
+}
+
+export function migrate(doc: RequestGroup) {
+  return doc;
+}
+
+export function create(patch: Partial<RequestGroup> = {}) {
+  if (!patch.parentId) {
+    throw new Error('New RequestGroup missing `parentId`: ' + JSON.stringify(patch));
+  }
+
+  return db.docCreate<RequestGroup>(type, patch);
+}
+
+export function update(requestGroup: RequestGroup, patch: Partial<RequestGroup> = {}) {
+  return db.docUpdate<RequestGroup>(requestGroup, patch);
+}
+
+export function getById(id: string) {
+  return db.get<RequestGroup>(type, id);
+}
+
+export function findByParentId(parentId: string) {
+  return db.find<RequestGroup>(type, { parentId });
+}
+
+export function remove(requestGroup: RequestGroup) {
+  return db.remove(requestGroup);
+}
+
+export function all() {
+  return db.all<RequestGroup>(type);
+}
+
+export async function duplicate(requestGroup: RequestGroup, patch: Partial<RequestGroup> = {}) {
+  if (!patch.name) {
+    patch.name = `${requestGroup.name} (Copy)`;
+  }
+
+  // Get sort key of next request
+  const q = {
+    metaSortKey: {
+      $gt: requestGroup.metaSortKey,
+    },
+  };
+
+  // @ts-expect-error -- TSCONVERSION appears to be a genuine error
+  const [nextRequestGroup] = await db.find<RequestGroup>(type, q, {
+    metaSortKey: 1,
+  });
+
+  const nextSortKey = nextRequestGroup
+    ? nextRequestGroup.metaSortKey
+    : requestGroup.metaSortKey + 100;
+
+  // Calculate new sort key
+  const sortKeyIncrement = (nextSortKey - requestGroup.metaSortKey) / 2;
+  const metaSortKey = requestGroup.metaSortKey + sortKeyIncrement;
+  return db.duplicate<RequestGroup>(requestGroup, {
+    metaSortKey,
+    ...patch,
+  });
+}
diff --git a/packages/insomnia-app/app/models/request-meta.js b/packages/insomnia-app/app/models/request-meta.ts
similarity index 62%
rename from packages/insomnia-app/app/models/request-meta.js
rename to packages/insomnia-app/app/models/request-meta.ts
index f9fdc82590..8f1e3a41dd 100644
--- a/packages/insomnia-app/app/models/request-meta.js
+++ b/packages/insomnia-app/app/models/request-meta.ts
@@ -1,25 +1,28 @@
-// @flow
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import { PREVIEW_MODE_FRIENDLY } from '../common/constants';
 import type { BaseModel } from './index';
 
 export const name = 'Request Meta';
+
 export const type = 'RequestMeta';
+
 export const prefix = 'reqm';
+
 export const canDuplicate = false;
+
 export const canSync = false;
 
-type BaseRequestMeta = {
-  parentId: string,
-  previewMode: string,
-  responseFilter: string,
-  responseFilterHistory: Array<string>,
-  activeResponseId: string | null,
-  savedRequestBody: Object,
-  pinned: boolean,
-  lastActive: number,
-  downloadPath: string | null,
-};
+interface BaseRequestMeta {
+  parentId: string;
+  previewMode: string;
+  responseFilter: string;
+  responseFilterHistory: Array<string>;
+  activeResponseId: string | null;
+  savedRequestBody: Record<string, any>;
+  pinned: boolean;
+  lastActive: number;
+  downloadPath: string | null;
+}
 
 export type RequestMeta = BaseModel & BaseRequestMeta;
 
@@ -37,28 +40,27 @@ export function init() {
   };
 }
 
-export function migrate(doc: RequestMeta): RequestMeta {
+export function migrate(doc: RequestMeta) {
   return doc;
 }
 
-export function create(patch: $Shape<RequestMeta> = {}) {
+export function create(patch: Partial<RequestMeta> = {}) {
   if (!patch.parentId) {
     throw new Error('New RequestMeta missing `parentId` ' + JSON.stringify(patch));
   }
 
   // expectParentToBeRequest(patch.parentId);
-
-  return db.docCreate(type, patch);
+  return db.docCreate<RequestMeta>(type, patch);
 }
 
-export function update(requestMeta: RequestMeta, patch: $Shape<RequestMeta>) {
+export function update(requestMeta: RequestMeta, patch: Partial<RequestMeta>) {
   // expectParentToBeRequest(patch.parentId || requestMeta.parentId);
-  return db.docUpdate(requestMeta, patch);
+  return db.docUpdate<RequestMeta>(requestMeta, patch);
 }
 
-export function getByParentId(parentId: string) {
+export function getByParentId(parentId: string): Promise<RequestMeta | null> {
   // expectParentToBeRequest(parentId);
-  return db.getWhere(type, { parentId });
+  return db.getWhere<RequestMeta>(type, { parentId });
 }
 
 export async function getOrCreateByParentId(parentId: string) {
@@ -71,19 +73,24 @@ export async function getOrCreateByParentId(parentId: string) {
   return create({ parentId });
 }
 
-export async function updateOrCreateByParentId(parentId: string, patch: $Shape<RequestMeta>) {
+export async function updateOrCreateByParentId(parentId: string, patch: Partial<RequestMeta>) {
   const requestMeta = await getByParentId(parentId);
 
   if (requestMeta) {
     return update(requestMeta, patch);
   } else {
-    const newPatch = Object.assign({ parentId }, patch);
+    const newPatch = Object.assign(
+      {
+        parentId,
+      },
+      patch,
+    );
     return create(newPatch);
   }
 }
 
-export function all(): Promise<Array<RequestMeta>> {
-  return db.all(type);
+export function all() {
+  return db.all<RequestMeta>(type);
 }
 
 // TODO: Ensure the parent of RequestMeta can only be a Request - INS-341
diff --git a/packages/insomnia-app/app/models/request-version.js b/packages/insomnia-app/app/models/request-version.ts
similarity index 70%
rename from packages/insomnia-app/app/models/request-version.js
rename to packages/insomnia-app/app/models/request-version.ts
index a213efa8cb..9856edca87 100644
--- a/packages/insomnia-app/app/models/request-version.js
+++ b/packages/insomnia-app/app/models/request-version.ts
@@ -1,20 +1,23 @@
-// @flow
 import deepEqual from 'deep-equal';
 import * as models from './index';
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import { compressObject, decompressObject } from '../common/misc';
 import type { BaseModel } from './index';
 import type { Request } from './request';
 
 export const name = 'Request Version';
+
 export const type = 'RequestVersion';
+
 export const prefix = 'rvr';
+
 export const canDuplicate = false;
+
 export const canSync = false;
 
-type BaseRequestVersion = {
-  compressedRequest: string | null,
-};
+interface BaseRequestVersion {
+  compressedRequest: string | null;
+}
 
 export type RequestVersion = BaseModel & BaseRequestVersion;
 
@@ -35,42 +38,46 @@ export function init() {
   };
 }
 
-export function migrate(doc: RequestVersion): RequestVersion {
+export function migrate(doc: RequestVersion) {
   return doc;
 }
 
-export function getById(id: string): Promise<RequestVersion | null> {
-  return db.get(type, id);
+export function getById(id: string) {
+  return db.get<RequestVersion>(type, id);
 }
 
-export async function create(request: Request): Promise<RequestVersion> {
+export async function create(request: Request) {
+  // @ts-expect-error -- TSCONVERSION
   if (!request.type === models.request.type) {
     throw new Error(`New ${type} was not given a valid ${models.request.type} instance`);
   }
 
   const parentId = request._id;
   const latestRequestVersion: RequestVersion | null = await getLatestByParentId(parentId);
-
   const latestRequest = latestRequestVersion
     ? decompressObject(latestRequestVersion.compressedRequest)
     : null;
 
   const hasChanged = _diffRequests(latestRequest, request);
+
   if (hasChanged || !latestRequestVersion) {
     // Create a new version if the request has been modified
     const compressedRequest = compressObject(request);
-    return db.docCreate(type, { parentId, compressedRequest });
+    return db.docCreate<RequestVersion>(type, {
+      parentId,
+      compressedRequest,
+    });
   } else {
     // Re-use the latest version if not modified since
     return latestRequestVersion;
   }
 }
 
-export function getLatestByParentId(parentId: string): Promise<RequestVersion | null> {
-  return db.getMostRecentlyModified(type, { parentId });
+export function getLatestByParentId(parentId: string) {
+  return db.getMostRecentlyModified<RequestVersion>(type, { parentId });
 }
 
-export async function restore(requestVersionId: string): Promise<Request | null> {
+export async function restore(requestVersionId: string) {
   const requestVersion = await getById(requestVersionId);
 
   // Older responses won't have versions saved with them
@@ -79,7 +86,7 @@ export async function restore(requestVersionId: string): Promise<Request | null>
   }
 
   const requestPatch = decompressObject(requestVersion.compressedRequest);
-  const originalRequest: Request | null = await models.request.getById(requestPatch._id);
+  const originalRequest = await models.request.getById(requestPatch._id);
 
   if (!originalRequest) {
     return null;
@@ -93,7 +100,7 @@ export async function restore(requestVersionId: string): Promise<Request | null>
   return models.request.update(originalRequest, requestPatch);
 }
 
-function _diffRequests(rOld: Request | null, rNew: Request): boolean {
+function _diffRequests(rOld: Request | null, rNew: Request) {
   if (!rOld) {
     return true;
   }
@@ -112,6 +119,6 @@ function _diffRequests(rOld: Request | null, rNew: Request): boolean {
   return false;
 }
 
-export function all(): Promise<Array<RequestVersion>> {
-  return db.all(type);
+export function all() {
+  return db.all<RequestVersion>(type);
 }
diff --git a/packages/insomnia-app/app/models/request.js b/packages/insomnia-app/app/models/request.ts
similarity index 76%
rename from packages/insomnia-app/app/models/request.js
rename to packages/insomnia-app/app/models/request.ts
index 64b3213d6a..aac2b2eeab 100644
--- a/packages/insomnia-app/app/models/request.js
+++ b/packages/insomnia-app/app/models/request.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { BaseModel } from './index';
 import {
   AUTH_ASAP,
@@ -22,73 +21,76 @@ import {
   METHOD_GET,
   METHOD_POST,
 } from '../common/constants';
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import { getContentTypeHeader } from '../common/misc';
 import { deconstructQueryStringToParams } from 'insomnia-url';
 import { GRANT_TYPE_AUTHORIZATION_CODE } from '../network/o-auth-2/constants';
 import { SIGNATURE_METHOD_HMAC_SHA1 } from '../network/o-auth-1/constants';
 
 export const name = 'Request';
+
 export const type = 'Request';
+
 export const prefix = 'req';
+
 export const canDuplicate = true;
+
 export const canSync = true;
 
-export type RequestAuthentication = Object;
+export type RequestAuthentication = Record<string, any>;
 
-export type RequestHeader = {
-  name: string,
-  value: string,
-  description?: string,
-  disabled?: boolean,
-};
+export interface RequestHeader {
+  name: string;
+  value: string;
+  description?: string;
+  disabled?: boolean;
+}
 
-export type RequestParameter = {
-  name: string,
-  value: string,
-  disabled?: boolean,
-  id?: string,
-  fileName?: string,
-};
+export interface RequestParameter {
+  name: string;
+  value: string;
+  disabled?: boolean;
+  id?: string;
+  fileName?: string;
+}
 
-export type RequestBodyParameter = {
-  name: string,
-  value: string,
-  description?: string,
-  disabled?: boolean,
-  multiline?: string,
-  id?: string,
-  fileName?: string,
-  type?: string,
-};
+export interface RequestBodyParameter {
+  name: string;
+  value: string;
+  description?: string;
+  disabled?: boolean;
+  multiline?: string;
+  id?: string;
+  fileName?: string;
+  type?: string;
+}
 
-export type RequestBody = {
-  mimeType?: string | null,
-  text?: string,
-  fileName?: string,
-  params?: Array<RequestBodyParameter>,
-};
-
-type BaseRequest = {
-  url: string,
-  name: string,
-  description: string,
-  method: string,
-  body: RequestBody,
-  parameters: Array<RequestParameter>,
-  headers: Array<RequestHeader>,
-  authentication: RequestAuthentication,
-  metaSortKey: number,
-  isPrivate: boolean,
+export interface RequestBody {
+  mimeType?: string | null;
+  text?: string;
+  fileName?: string;
+  params?: Array<RequestBodyParameter>;
+}
 
+interface BaseRequest {
+  url: string;
+  name: string;
+  description: string;
+  method: string;
+  body: RequestBody;
+  parameters: Array<RequestParameter>;
+  headers: Array<RequestHeader>;
+  authentication: RequestAuthentication;
+  metaSortKey: number;
+  isPrivate: boolean;
   // Settings
-  settingStoreCookies: boolean,
-  settingSendCookies: boolean,
-  settingDisableRenderRequestBody: boolean,
-  settingEncodeUrl: boolean,
-  settingRebuildPath: boolean,
-  settingFollowRedirects: string,
-};
+  settingStoreCookies: boolean;
+  settingSendCookies: boolean;
+  settingDisableRenderRequestBody: boolean;
+  settingEncodeUrl: boolean;
+  settingRebuildPath: boolean;
+  settingFollowRedirects: string;
+}
 
 export type Request = BaseModel & BaseRequest;
 
@@ -104,7 +106,6 @@ export function init(): BaseRequest {
     authentication: {},
     metaSortKey: -1 * Date.now(),
     isPrivate: false,
-
     // Settings
     settingStoreCookies: true,
     settingSendCookies: true,
@@ -195,7 +196,9 @@ export function newAuth(type: string, oldAuth: RequestAuthentication = {}): Requ
     // Types needing no defaults
     case AUTH_NETRC:
     default:
-      return { type };
+      return {
+        type,
+      };
   }
 }
 
@@ -205,21 +208,32 @@ export function newBodyNone(): RequestBody {
 
 export function newBodyRaw(rawBody: string, contentType?: string): RequestBody {
   if (typeof contentType !== 'string') {
-    return { text: rawBody };
+    return {
+      text: rawBody,
+    };
   }
 
   const mimeType = contentType.split(';')[0];
-  return { mimeType, text: rawBody };
+  return {
+    mimeType,
+    text: rawBody,
+  };
 }
 
 export function newBodyGraphQL(rawBody: string): RequestBody {
   try {
     // Only strip the newlines if rawBody is a parsable JSON
     JSON.parse(rawBody);
-    return { mimeType: CONTENT_TYPE_GRAPHQL, text: rawBody.replace(/\\\\n/g, '') };
+    return {
+      mimeType: CONTENT_TYPE_GRAPHQL,
+      text: rawBody.replace(/\\\\n/g, ''),
+    };
   } catch (e) {
     if (e instanceof SyntaxError) {
-      return { mimeType: CONTENT_TYPE_GRAPHQL, text: rawBody };
+      return {
+        mimeType: CONTENT_TYPE_GRAPHQL,
+        text: rawBody,
+      };
     } else {
       throw e;
     }
@@ -254,35 +268,34 @@ export function migrate(doc: Request): Request {
   return doc;
 }
 
-export function create(patch: $Shape<Request> = {}): Promise<Request> {
+export function create(patch: Partial<Request> = {}) {
   if (!patch.parentId) {
     throw new Error(`New Requests missing \`parentId\`: ${JSON.stringify(patch)}`);
   }
 
-  return db.docCreate(type, patch);
+  return db.docCreate<Request>(type, patch);
 }
 
 export function getById(id: string): Promise<Request | null> {
   return db.get(type, id);
 }
 
-export function findByParentId(parentId: string): Promise<Array<Request>> {
-  return db.find(type, { parentId: parentId });
+export function findByParentId(parentId: string) {
+  return db.find<Request>(type, { parentId: parentId });
 }
 
-export function update(request: Request, patch: $Shape<Request>): Promise<Request> {
-  return db.docUpdate(request, patch);
+export function update(request: Request, patch: Partial<Request>) {
+  return db.docUpdate<Request>(request, patch);
 }
 
 export function updateMimeType(
   request: Request,
   mimeType: string,
-  doCreate: boolean = false,
+  doCreate = false,
   savedBody: RequestBody = {},
-): Promise<Request> {
+) {
   let headers = request.headers ? [...request.headers] : [];
   const contentTypeHeader = getContentTypeHeader(headers);
-
   // GraphQL uses JSON content-type
   const contentTypeHeaderValue = mimeType === CONTENT_TYPE_GRAPHQL ? CONTENT_TYPE_JSON : mimeType;
 
@@ -293,8 +306,10 @@ export function updateMimeType(
 
   // Check if we are converting to/from variants of XML or JSON
   let leaveContentTypeAlone = false;
+
   if (contentTypeHeader && mimeType) {
     const current = contentTypeHeader.value;
+
     if (current.includes('xml') && mimeType.includes('xml')) {
       leaveContentTypeAlone = true;
     } else if (current.includes('json') && mimeType.includes('json')) {
@@ -305,8 +320,8 @@ export function updateMimeType(
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
   // 1. Update Content-Type header //
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
-
   const hasBody = typeof mimeType === 'string';
+
   if (!hasBody) {
     headers = headers.filter(h => h !== contentTypeHeader);
   } else if (mimeType === CONTENT_TYPE_OTHER) {
@@ -314,26 +329,29 @@ export function updateMimeType(
   } else if (mimeType && contentTypeHeader && !leaveContentTypeAlone) {
     contentTypeHeader.value = contentTypeHeaderValue;
   } else if (mimeType && !contentTypeHeader) {
-    headers.push({ name: 'Content-Type', value: contentTypeHeaderValue });
+    headers.push({
+      name: 'Content-Type',
+      value: contentTypeHeaderValue,
+    });
   }
 
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~ //
   // 2. Make a new request body //
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~ //
-
   let body;
-
   const oldBody = Object.keys(savedBody).length === 0 ? request.body : savedBody;
 
   if (mimeType === CONTENT_TYPE_FORM_URLENCODED) {
     // Urlencoded
     body = oldBody.params
       ? newBodyFormUrlEncoded(oldBody.params)
+      // @ts-expect-error -- TSCONVERSION
       : newBodyFormUrlEncoded(deconstructQueryStringToParams(oldBody.text));
-  } else if (mimeType === CONTENT_TYPE_FORM_DATA) {
-    // Form Data
-    body = oldBody.params
+    } else if (mimeType === CONTENT_TYPE_FORM_DATA) {
+      // Form Data
+      body = oldBody.params
       ? newBodyForm(oldBody.params)
+      // @ts-expect-error -- TSCONVERSION
       : newBodyForm(deconstructQueryStringToParams(oldBody.text));
   } else if (mimeType === CONTENT_TYPE_FILE) {
     // File
@@ -342,6 +360,7 @@ export function updateMimeType(
     if (contentTypeHeader) {
       contentTypeHeader.value = CONTENT_TYPE_JSON;
     }
+
     body = newBodyGraphQL(oldBody.text || '');
   } else if (typeof mimeType !== 'string') {
     // No body
@@ -354,16 +373,21 @@ export function updateMimeType(
   // ~~~~~~~~~~~~~~~~~~~~~~~~ //
   // 2. create/update request //
   // ~~~~~~~~~~~~~~~~~~~~~~~~ //
-
   if (doCreate) {
-    const newRequest: Request = Object.assign({}, request, { headers, body });
+    const newRequest: Request = Object.assign({}, request, {
+      headers,
+      body,
+    });
     return create(newRequest);
   } else {
-    return update(request, { headers, body });
+    return update(request, {
+      headers,
+      body,
+    });
   }
 }
 
-export async function duplicate(request: Request, patch: $Shape<Request> = {}): Promise<Request> {
+export async function duplicate(request: Request, patch: Partial<Request> = {}) {
   // Only set name and "(Copy)" if the patch does
   // not define it and the request itself has a name.
   // Otherwise leave it blank so the request URL can
@@ -373,23 +397,34 @@ export async function duplicate(request: Request, patch: $Shape<Request> = {}):
   }
 
   // Get sort key of next request
-  const q = { metaSortKey: { $gt: request.metaSortKey } };
-  const [nextRequest] = await db.find(type, q, { metaSortKey: 1 });
-  const nextSortKey = nextRequest ? nextRequest.metaSortKey : request.metaSortKey + 100;
+  const q = {
+    metaSortKey: {
+      $gt: request.metaSortKey,
+    },
+  };
 
+  // @ts-expect-error -- TSCONVERSION appears to be a genuine error
+  const [nextRequest] = await db.find<Request>(type, q, {
+    metaSortKey: 1,
+  });
+
+  const nextSortKey = nextRequest ? nextRequest.metaSortKey : request.metaSortKey + 100;
   // Calculate new sort key
   const sortKeyIncrement = (nextSortKey - request.metaSortKey) / 2;
   const metaSortKey = request.metaSortKey + sortKeyIncrement;
-
-  return db.duplicate(request, { name, metaSortKey, ...patch });
+  return db.duplicate<Request>(request, {
+    name,
+    metaSortKey,
+    ...patch,
+  });
 }
 
-export function remove(request: Request): Promise<void> {
+export function remove(request: Request) {
   return db.remove(request);
 }
 
-export async function all(): Promise<Array<Request>> {
-  return db.all(type);
+export async function all() {
+  return db.all<Request>(type);
 }
 
 // ~~~~~~~~~~ //
@@ -399,9 +434,8 @@ export async function all(): Promise<Array<Request>> {
 /**
  * Migrate old body (string) to new body (object)
  * @param request
- * @returns {*}
  */
-function migrateBody(request: Request): Request {
+function migrateBody(request: Request) {
   if (request.body && typeof request.body === 'object') {
     return request;
   }
@@ -427,12 +461,10 @@ function migrateBody(request: Request): Request {
 /**
  * Fix some weird URLs that were caused by an old bug
  * @param request
- * @returns {*}
  */
-function migrateWeirdUrls(request: Request): Request {
+function migrateWeirdUrls(request: Request) {
   // Some people seem to have requests with URLs that don't have the indexOf
   // function. This should clear that up. This can be removed at a later date.
-
   if (typeof request.url !== 'string') {
     request.url = '';
   }
@@ -443,9 +475,8 @@ function migrateWeirdUrls(request: Request): Request {
 /**
  * Ensure the request.authentication.type property is added
  * @param request
- * @returns {*}
  */
-function migrateAuthType(request: Request): Request {
+function migrateAuthType(request: Request) {
   const isAuthSet = request.authentication && request.authentication.username;
 
   if (isAuthSet && !request.authentication.type) {
diff --git a/packages/insomnia-app/app/models/response.js b/packages/insomnia-app/app/models/response.ts
similarity index 65%
rename from packages/insomnia-app/app/models/response.js
rename to packages/insomnia-app/app/models/response.ts
index bb4dc8d468..1613d7d8c6 100644
--- a/packages/insomnia-app/app/models/response.js
+++ b/packages/insomnia-app/app/models/response.ts
@@ -1,53 +1,59 @@
-// @flow
 import type { BaseModel } from './index';
 import * as models from './index';
 import { Readable } from 'stream';
-
 import fs from 'fs';
 import crypto from 'crypto';
 import path from 'path';
 import zlib from 'zlib';
 import mkdirp from 'mkdirp';
-import * as db from '../common/database';
-import { getDataDirectory } from '../common/misc';
+import { database as db, Query } from '../common/database';
+import { getDataDirectory } from '../common/electron-helpers';
 
 export const name = 'Response';
+
 export const type = 'Response';
+
 export const prefix = 'res';
+
 export const canDuplicate = false;
+
 export const canSync = false;
 
-export type ResponseHeader = {
-  name: string,
-  value: string,
-};
+export interface ResponseHeader {
+  name: string;
+  value: string;
+}
 
-export type ResponseTimelineEntry = {
-  name: string,
-  value: string,
-};
+export interface ResponseTimelineEntry {
+  name: string;
+  timestamp: number;
+  value: string;
+}
 
-type BaseResponse = {
-  environmentId: string | null,
-  statusCode: number,
-  statusMessage: string,
-  httpVersion: string,
-  contentType: string,
-  url: string,
-  bytesRead: number,
-  bytesContent: number,
-  elapsedTime: number,
-  headers: Array<ResponseHeader>,
-  bodyPath: string, // Actual bodies are stored on the filesystem
-  timelinePath: string, // Actual timelines are stored on the filesystem
-  bodyCompression: 'zip' | null | '__NEEDS_MIGRATION__',
-  error: string,
-  requestVersionId: string | null,
+type Compression = 'zip' | null | '__NEEDS_MIGRATION__' | undefined;
 
+interface BaseResponse {
+  environmentId: string | null;
+  statusCode: number;
+  statusMessage: string;
+  httpVersion: string;
+  contentType: string;
+  url: string;
+  bytesRead: number;
+  bytesContent: number;
+  elapsedTime: number;
+  headers: Array<ResponseHeader>;
+  bodyPath: string;
+  // Actual bodies are stored on the filesystem
+  timelinePath: string;
+  // Actual timelines are stored on the filesystem
+  bodyCompression: Compression;
+  error: string;
+  requestVersionId: string | null;
   // Things from the request
-  settingStoreCookies: boolean | null,
-  settingSendCookies: boolean | null,
-};
+  settingStoreCookies: boolean | null;
+  settingSendCookies: boolean | null;
+}
 
 export type Response = BaseModel & BaseResponse;
 
@@ -59,40 +65,42 @@ export function init(): BaseResponse {
     contentType: '',
     url: '',
     bytesRead: 0,
-    bytesContent: -1, // -1 means that it was legacy and this property didn't exist yet
+    bytesContent: -1,
+    // -1 means that it was legacy and this property didn't exist yet
     elapsedTime: 0,
     headers: [],
-    timelinePath: '', // Actual timelines are stored on the filesystem
-    bodyPath: '', // Actual bodies are stored on the filesystem
-    bodyCompression: '__NEEDS_MIGRATION__', // For legacy bodies
+    timelinePath: '',
+    // Actual timelines are stored on the filesystem
+    bodyPath: '',
+    // Actual bodies are stored on the filesystem
+    bodyCompression: '__NEEDS_MIGRATION__',
+    // For legacy bodies
     error: '',
     requestVersionId: null,
-
     // Things from the request
     settingStoreCookies: null,
     settingSendCookies: null,
-
     // Responses sent before environment filtering will have a special value
     // so they don't show up at all when filtering is on.
     environmentId: '__LEGACY__',
   };
 }
 
-export async function migrate(doc: Object) {
+export async function migrate(doc: Response) {
   doc = await migrateBodyToFileSystem(doc);
   doc = await migrateBodyCompression(doc);
   doc = await migrateTimelineToFileSystem(doc);
   return doc;
 }
 
-export function hookDatabaseInit(consoleLog: () => void = console.log) {
+export function hookDatabaseInit(consoleLog: typeof console.log = console.log) {
   consoleLog('[db] Init responses DB');
   process.nextTick(async () => {
     await models.response.cleanDeletedResponses();
   });
 }
 
-export function hookRemove(doc: Response, consoleLog: () => void = console.log) {
+export function hookRemove(doc: Response, consoleLog: typeof console.log = console.log) {
   fs.unlink(doc.bodyPath, () => {
     consoleLog(`[response] Delete body ${doc.bodyPath}`);
   });
@@ -102,16 +110,16 @@ export function hookRemove(doc: Response, consoleLog: () => void = console.log)
 }
 
 export function getById(id: string) {
-  return db.get(type, id);
+  return db.get<Response>(type, id);
 }
 
-export async function all(): Promise<Array<Response>> {
-  return db.all(type);
+export async function all() {
+  return db.all<Response>(type);
 }
 
 export async function removeForRequest(parentId: string, environmentId?: string | null) {
   const settings = await models.settings.getOrCreate();
-  const query: Object = {
+  const query: Record<string, any> = {
     parentId,
   };
 
@@ -135,8 +143,8 @@ async function _findRecentForRequest(
   requestId: string,
   environmentId: string | null,
   limit: number,
-): Promise<Array<Response>> {
-  const query: Object = {
+) {
+  const query: Query = {
     parentId: requestId,
   };
 
@@ -145,32 +153,33 @@ async function _findRecentForRequest(
     query.environmentId = environmentId;
   }
 
-  return db.findMostRecentlyModified(type, query, limit);
+  return db.findMostRecentlyModified<Response>(type, query, limit);
 }
 
 export async function getLatestForRequest(
   requestId: string,
   environmentId: string | null,
-): Promise<Response | null> {
+) {
   const responses = await _findRecentForRequest(requestId, environmentId, 1);
-  const response = (responses[0]: ?Response);
+  const response = responses[0] as Response | null | undefined;
   return response || null;
 }
 
-export async function create(patch: Object = {}, maxResponses: number = 20) {
+export async function create(patch: Record<string, any> = {}, maxResponses = 20) {
   if (!patch.parentId) {
     throw new Error('New Response missing `parentId`');
   }
 
   const { parentId } = patch;
-
   // Create request version snapshot
   const request = await models.request.getById(parentId);
   const requestVersion = request ? await models.requestVersion.create(request) : null;
   patch.requestVersionId = requestVersion ? requestVersion._id : null;
-
   // Filter responses by environment if setting is enabled
-  const query: Object = { parentId };
+  const query: Record<string, any> = {
+    parentId,
+  };
+
   if (
     (await models.settings.getOrCreate()).filterResponsesByEnv &&
     patch.hasOwnProperty('environmentId')
@@ -179,37 +188,50 @@ export async function create(patch: Object = {}, maxResponses: number = 20) {
   }
 
   // Delete all other responses before creating the new one
-  const allResponses = await db.findMostRecentlyModified(type, query, Math.max(1, maxResponses));
+  const allResponses = await db.findMostRecentlyModified<Response>(type, query, Math.max(1, maxResponses));
   const recentIds = allResponses.map(r => r._id);
-
   // Remove all that were in the last query, except the first `maxResponses` IDs
-  await db.removeWhere(type, { ...query, _id: { $nin: recentIds } });
-
+  await db.removeWhere(type, {
+    ...query,
+    _id: {
+      $nin: recentIds,
+    },
+  });
   // Actually create the new response
   return db.docCreate(type, patch);
 }
 
 export function getLatestByParentId(parentId: string) {
-  return db.getMostRecentlyModified(type, { parentId });
+  return db.getMostRecentlyModified<Response>(type, {
+    parentId,
+  });
 }
 
-export function getBodyStream<T>(response: Object, readFailureValue: ?T): Readable | null | T {
+export function getBodyStream<T extends Response, TFail extends Readable>(
+  response: T,
+  readFailureValue?: TFail | null,
+) {
   return getBodyStreamFromPath(response.bodyPath || '', response.bodyCompression, readFailureValue);
 }
 
-export function getBodyBuffer<T>(response: Object, readFailureValue: ?T): Buffer | T | null {
-  return getBodyBufferFromPath(response.bodyPath || '', response.bodyCompression, readFailureValue);
-}
+export const getBodyBuffer = <TFail = null>(
+  response?: { bodyPath?: string, bodyCompression?: Compression },
+  readFailureValue?: TFail | null,
+) => getBodyBufferFromPath(
+  response?.bodyPath || '',
+  response?.bodyCompression || null,
+  readFailureValue,
+);
 
-export function getTimeline(response: Object): Array<ResponseTimelineEntry> {
+export function getTimeline(response: Response) {
   return getTimelineFromPath(response.timelinePath || '');
 }
 
-function getBodyStreamFromPath<T>(
+function getBodyStreamFromPath<TFail extends Readable>(
   bodyPath: string,
-  compression: string | null,
-  readFailureValue: ?T,
-): Readable | null | T {
+  compression: Compression,
+  readFailureValue?: TFail | null,
+): Readable | null | TFail {
   // No body, so return empty Buffer
   if (!bodyPath) {
     return null;
@@ -223,6 +245,7 @@ function getBodyStreamFromPath<T>(
   }
 
   const readStream = fs.createReadStream(bodyPath);
+
   if (compression === 'zip') {
     return readStream.pipe(zlib.createGunzip());
   } else {
@@ -232,9 +255,9 @@ function getBodyStreamFromPath<T>(
 
 function getBodyBufferFromPath<T>(
   bodyPath: string,
-  compression: string | null,
-  readFailureValue: ?T,
-): Buffer | T | null {
+  compression: Compression,
+  readFailureValue?: T | null,
+) {
   // No body, so return empty Buffer
   if (!bodyPath) {
     return Buffer.alloc(0);
@@ -242,6 +265,7 @@ function getBodyBufferFromPath<T>(
 
   try {
     const rawBuffer = fs.readFileSync(bodyPath);
+
     if (compression === 'zip') {
       return zlib.gunzipSync(rawBuffer);
     } else {
@@ -253,7 +277,7 @@ function getBodyBufferFromPath<T>(
   }
 }
 
-function getTimelineFromPath(timelinePath: string): Array<ResponseTimelineEntry> {
+function getTimelineFromPath(timelinePath: string) {
   // No body, so return empty Buffer
   if (!timelinePath) {
     return [];
@@ -261,20 +285,19 @@ function getTimelineFromPath(timelinePath: string): Array<ResponseTimelineEntry>
 
   try {
     const rawBuffer = fs.readFileSync(timelinePath);
-    return JSON.parse(rawBuffer.toString());
+    return JSON.parse(rawBuffer.toString()) as Array<ResponseTimelineEntry>;
   } catch (err) {
     console.warn('Failed to read response body', err.message);
     return [];
   }
 }
 
-async function migrateBodyToFileSystem(doc: Object) {
+async function migrateBodyToFileSystem(doc: Response) {
   if (doc.hasOwnProperty('body') && doc._id && !doc.bodyPath) {
+    // @ts-expect-error -- TSCONVERSION previously doc.body and doc.encoding did exist but are now removed, and if they exist we want to migrate away from them
     const bodyBuffer = Buffer.from(doc.body, doc.encoding || 'utf8');
     const dir = path.join(getDataDirectory(), 'responses');
-
     mkdirp.sync(dir);
-
     const hash = crypto
       .createHash('md5')
       .update(bodyBuffer || '')
@@ -288,13 +311,16 @@ async function migrateBodyToFileSystem(doc: Object) {
       console.warn('Failed to write response body to file', err.message);
     }
 
-    return db.docUpdate(doc, { bodyPath, bodyCompression: null });
+    return db.docUpdate(doc, {
+      bodyPath,
+      bodyCompression: null,
+    });
   } else {
     return doc;
   }
 }
 
-function migrateBodyCompression(doc: Object) {
+function migrateBodyCompression(doc: Response) {
   if (doc.bodyCompression === '__NEEDS_MIGRATION__') {
     doc.bodyCompression = 'zip';
   }
@@ -302,11 +328,11 @@ function migrateBodyCompression(doc: Object) {
   return doc;
 }
 
-async function migrateTimelineToFileSystem(doc: Object) {
+async function migrateTimelineToFileSystem(doc: Response) {
   if (doc.hasOwnProperty('timeline') && doc._id && !doc.timelinePath) {
     const dir = path.join(getDataDirectory(), 'responses');
-
     mkdirp.sync(dir);
+    // @ts-expect-error -- TSCONVERSION previously doc.timeline did exist but is now removed, and if it exists we want to migrate away from it
     const timelineStr = JSON.stringify(doc.timeline, null, '\t');
     const fsPath = doc.bodyPath + '.timeline';
 
@@ -316,7 +342,9 @@ async function migrateTimelineToFileSystem(doc: Object) {
       console.warn('Failed to write response body to file', err.message);
     }
 
-    return db.docUpdate(doc, { timelinePath: fsPath });
+    return db.docUpdate(doc, {
+      timelinePath: fsPath,
+    });
   } else {
     return doc;
   }
@@ -325,14 +353,15 @@ async function migrateTimelineToFileSystem(doc: Object) {
 export async function cleanDeletedResponses() {
   const responsesDir = path.join(getDataDirectory(), 'responses');
   mkdirp.sync(responsesDir);
-
   const files = fs.readdirSync(responsesDir);
+
   if (files.length === 0) {
     return;
   }
 
-  const whitelistFiles = [];
-  for (const r of await db.all(type)) {
+  const whitelistFiles: Array<string> = [];
+
+  for (const r of (await db.all<Response>(type) || [])) {
     whitelistFiles.push(r.bodyPath.slice(responsesDir.length + 1));
     whitelistFiles.push(r.timelinePath.slice(responsesDir.length + 1));
   }
diff --git a/packages/insomnia-app/app/models/settings.js b/packages/insomnia-app/app/models/settings.ts
similarity index 54%
rename from packages/insomnia-app/app/models/settings.js
rename to packages/insomnia-app/app/models/settings.ts
index 14b6895707..337901c129 100644
--- a/packages/insomnia-app/app/models/settings.js
+++ b/packages/insomnia-app/app/models/settings.ts
@@ -1,6 +1,5 @@
-// @flow
 import type { BaseModel } from './index';
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import {
   getAppDefaultTheme,
   getAppDefaultLightTheme,
@@ -11,70 +10,73 @@ import {
 import * as hotkeys from '../common/hotkeys';
 import type { HttpVersion } from '../common/constants';
 
-export type PluginConfig = {
-  disabled: boolean,
-};
+export interface PluginConfig {
+  disabled: boolean;
+}
 
-export type PluginConfigMap = {
-  [string]: PluginConfig,
-};
+export type PluginConfigMap = Record<string, PluginConfig>;
 
-type BaseSettings = {
-  autoHideMenuBar: boolean,
-  autocompleteDelay: number,
-  deviceId: string | null,
-  disableHtmlPreviewJs: boolean,
-  disableResponsePreviewLinks: boolean,
-  disableUpdateNotification: boolean,
-  editorFontSize: number,
-  editorIndentSize: number,
-  editorIndentWithTabs: boolean,
-  editorKeyMap: string,
-  editorLineWrapping: boolean,
-  enableAnalytics: boolean,
-  environmentHighlightColorStyle: string,
-  filterResponsesByEnv: boolean,
-  followRedirects: boolean,
-  clearOAuth2SessionOnRestart: boolean,
-  fontInterface: string | null,
-  fontMonospace: string | null,
-  fontSize: number,
-  fontVariantLigatures: boolean,
-  forceVerticalLayout: boolean,
-  hotKeyRegistry: hotkeys.HotKeyRegistry,
-  httpProxy: string,
-  httpsProxy: string,
-  maxHistoryResponses: number,
-  maxRedirects: number,
-  maxTimelineDataSizeKB: number,
-  noProxy: string,
-  nunjucksPowerUserMode: boolean,
-  pluginConfig: PluginConfigMap,
-  pluginPath: string,
-  preferredHttpVersion: HttpVersion,
-  proxyEnabled: boolean,
-  showPasswords: boolean,
-  theme: string,
-  autoDetectColorScheme: boolean,
-  lightTheme: string,
-  darkTheme: string,
-  timeout: number,
-  updateAutomatically: boolean,
-  updateChannel: string,
-  useBulkHeaderEditor: boolean,
-  useBulkParametersEditor: boolean,
-  validateSSL: boolean,
-  hasPromptedToMigrateFromDesigner: boolean,
-  hasPromptedOnboarding: boolean,
-  hasPromptedAnalytics: boolean,
-};
+interface BaseSettings {
+  autoHideMenuBar: boolean;
+  autocompleteDelay: number;
+  deviceId: string | null;
+  disableHtmlPreviewJs: boolean;
+  disableResponsePreviewLinks: boolean;
+  disableUpdateNotification: boolean;
+  editorFontSize: number;
+  editorIndentSize: number;
+  editorIndentWithTabs: boolean;
+  editorKeyMap: string;
+  editorLineWrapping: boolean;
+  enableAnalytics: boolean;
+  environmentHighlightColorStyle: string;
+  filterResponsesByEnv: boolean;
+  followRedirects: boolean;
+  clearOAuth2SessionOnRestart: boolean;
+  fontInterface: string | null;
+  fontMonospace: string | null;
+  fontSize: number;
+  fontVariantLigatures: boolean;
+  forceVerticalLayout: boolean;
+  hotKeyRegistry: hotkeys.HotKeyRegistry;
+  httpProxy: string;
+  httpsProxy: string;
+  lineWrapping?: boolean;
+  maxHistoryResponses: number;
+  maxRedirects: number;
+  maxTimelineDataSizeKB: number;
+  noProxy: string;
+  nunjucksPowerUserMode: boolean;
+  pluginConfig: PluginConfigMap;
+  pluginPath: string;
+  preferredHttpVersion: HttpVersion;
+  proxyEnabled: boolean;
+  showPasswords: boolean;
+  theme: string;
+  autoDetectColorScheme: boolean;
+  lightTheme: string;
+  darkTheme: string;
+  timeout: number;
+  updateAutomatically: boolean;
+  updateChannel: string;
+  useBulkHeaderEditor: boolean;
+  useBulkParametersEditor: boolean;
+  validateSSL: boolean;
+  hasPromptedToMigrateFromDesigner: boolean;
+  hasPromptedOnboarding: boolean;
+  hasPromptedAnalytics: boolean;
+}
 
 export type Settings = BaseModel & BaseSettings;
 
 export const name = 'Settings';
+
 export const type = 'Settings';
+
 export const prefix = 'set';
+
 export const canDuplicate = false;
+
 export const canSync = false;
 
 export function init(): BaseSettings {
@@ -123,14 +125,11 @@ export function init(): BaseSettings {
     useBulkHeaderEditor: false,
     useBulkParametersEditor: false,
     validateSSL: true,
-
     hasPromptedToMigrateFromDesigner: false,
-
     // Users should only see onboarding during first launch, and anybody updating from an
     // older version should not see it, so by default this flag is set to true, and is toggled
     // to false during initialization
     hasPromptedOnboarding: true,
-
     // Only existing users updating from an older version should see the analytics prompt
     // So by default this flag is set to false, and is toggled to true during initialization
     // for new users
@@ -138,35 +137,37 @@ export function init(): BaseSettings {
   };
 }
 
-export function migrate(doc: Settings): Settings {
+export function migrate(doc: Settings) {
   doc = migrateEnsureHotKeys(doc);
   return doc;
 }
 
-export async function all(patch: $Shape<Settings> = {}): Promise<Array<Settings>> {
-  const settings = await db.all(type);
-  if (settings.length === 0) {
+export async function all() {
+  const settings = await db.all<Settings>(type);
+
+  if (settings?.length === 0) {
     return [await getOrCreate()];
   } else {
     return settings;
   }
 }
 
-export async function create(patch: $Shape<Settings> = {}): Promise<Settings> {
-  return db.docCreate(type, patch);
+export async function create(patch: Partial<Settings> = {}) {
+  return db.docCreate<Settings>(type, patch);
 }
 
-export async function update(settings: Settings, patch: $Shape<Settings>): Promise<Settings> {
-  return db.docUpdate(settings, patch);
+export async function update(settings: Settings, patch: Partial<Settings>) {
+  return db.docUpdate<Settings>(settings, patch);
 }
 
-export async function patch(patch: $Shape<Settings>): Promise<Settings> {
+export async function patch(patch: Partial<Settings>) {
   const settings = await getOrCreate();
-  return db.docUpdate(settings, patch);
+  return db.docUpdate<Settings>(settings, patch);
 }
 
-export async function getOrCreate(): Promise<Settings> {
-  const results = await db.all(type);
+export async function getOrCreate() {
+  const results = await db.all<Settings>(type) || [];
+
   if (results.length === 0) {
     return create();
   } else {
@@ -178,9 +179,6 @@ export async function getOrCreate(): Promise<Settings> {
  * Ensure map is updated when new hotkeys are added
  */
 function migrateEnsureHotKeys(settings: Settings): Settings {
-  settings.hotKeyRegistry = {
-    ...hotkeys.newDefaultRegistry(),
-    ...settings.hotKeyRegistry,
-  };
+  settings.hotKeyRegistry = { ...hotkeys.newDefaultRegistry(), ...settings.hotKeyRegistry };
   return settings;
 }
diff --git a/packages/insomnia-app/app/models/stats.js b/packages/insomnia-app/app/models/stats.ts
similarity index 54%
rename from packages/insomnia-app/app/models/stats.js
rename to packages/insomnia-app/app/models/stats.ts
index f54f699c27..b60b088110 100644
--- a/packages/insomnia-app/app/models/stats.js
+++ b/packages/insomnia-app/app/models/stats.ts
@@ -1,26 +1,29 @@
-// @flow
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import type { BaseModel } from './index';
 import type { Workspace } from './workspace';
 import type { RequestGroup } from './request-group';
 import { isRequest, isGrpcRequest } from './helpers/is-model';
 
 export const name = 'Stats';
+
 export const type = 'Stats';
+
 export const prefix = 'sta';
+
 export const canDuplicate = false;
+
 export const canSync = false;
 
-type BaseStats = {
-  currentLaunch: number | null,
-  lastLaunch: number | null,
-  currentVersion: string | null,
-  lastVersion: string | null,
-  launches: number,
-  createdRequests: number,
-  deletedRequests: number,
-  executedRequests: number,
-};
+interface BaseStats {
+  currentLaunch: number | null;
+  lastLaunch: number | null;
+  currentVersion: string | null;
+  lastVersion: string | null;
+  launches: number;
+  createdRequests: number;
+  deletedRequests: number;
+  executedRequests: number;
+}
 
 export type Stats = BaseModel & BaseStats;
 
@@ -37,21 +40,22 @@ export function init(): BaseStats {
   };
 }
 
-export function migrate(doc: Stats): Stats {
+export function migrate(doc: Stats) {
   return doc;
 }
 
-export function create(patch: $Shape<Stats> = {}): Promise<Stats> {
-  return db.docCreate(type, patch);
+export function create(patch: Partial<Stats> = {}) {
+  return db.docCreate<Stats>(type, patch);
 }
 
-export async function update(patch: $Shape<Stats>): Promise<Stats> {
+export async function update(patch: Partial<Stats>) {
   const stats = await get();
-  return db.docUpdate(stats, patch);
+  return db.docUpdate<Stats>(stats, patch);
 }
 
-export async function get(): Promise<Stats> {
-  const results = await db.all(type);
+export async function get() {
+  const results = await db.all<Stats>(type) || [];
+
   if (results.length === 0) {
     return create();
   } else {
@@ -63,35 +67,51 @@ export async function incrementRequestStats({
   createdRequests,
   deletedRequests,
   executedRequests,
-}: $Shape<Stats>) {
+}: Partial<Stats>) {
   const stats = await get();
   await update({
-    ...(createdRequests && { createdRequests: stats.createdRequests + createdRequests }),
-    ...(deletedRequests && { deletedRequests: stats.deletedRequests + deletedRequests }),
-    ...(executedRequests && { executedRequests: stats.executedRequests + executedRequests }),
+    ...(createdRequests && {
+      createdRequests: stats.createdRequests + createdRequests,
+    }),
+    ...(deletedRequests && {
+      deletedRequests: stats.deletedRequests + deletedRequests,
+    }),
+    ...(executedRequests && {
+      executedRequests: stats.executedRequests + executedRequests,
+    }),
   });
 }
 
 export async function incrementCreatedRequests() {
-  await incrementRequestStats({ createdRequests: 1 });
+  await incrementRequestStats({
+    createdRequests: 1,
+  });
 }
 
 export async function incrementDeletedRequests() {
-  await incrementRequestStats({ deletedRequests: 1 });
+  await incrementRequestStats({
+    deletedRequests: 1,
+  });
 }
 
 export async function incrementExecutedRequests() {
-  await incrementRequestStats({ executedRequests: 1 });
+  await incrementRequestStats({
+    executedRequests: 1,
+  });
 }
 
 export async function incrementCreatedRequestsForDescendents(doc: Workspace | RequestGroup) {
   const docs = await db.withDescendants(doc);
   const requests = docs.filter(doc => isRequest(doc) || isGrpcRequest(doc));
-  await incrementRequestStats({ createdRequests: requests.length });
+  await incrementRequestStats({
+    createdRequests: requests.length,
+  });
 }
 
 export async function incrementDeletedRequestsForDescendents(doc: Workspace | RequestGroup) {
   const docs = await db.withDescendants(doc);
   const requests = docs.filter(doc => isRequest(doc) || isGrpcRequest(doc));
-  await incrementRequestStats({ deletedRequests: requests.length });
+  await incrementRequestStats({
+    deletedRequests: requests.length,
+  });
 }
diff --git a/packages/insomnia-app/app/models/unit-test-result.js b/packages/insomnia-app/app/models/unit-test-result.ts
similarity index 62%
rename from packages/insomnia-app/app/models/unit-test-result.js
rename to packages/insomnia-app/app/models/unit-test-result.ts
index 9cfbd235fe..8f88553888 100644
--- a/packages/insomnia-app/app/models/unit-test-result.js
+++ b/packages/insomnia-app/app/models/unit-test-result.ts
@@ -1,16 +1,19 @@
-// @flow
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import type { BaseModel } from './index';
 
 export const name = 'Unit Test Result';
+
 export const type = 'UnitTestResult';
+
 export const prefix = 'utr';
+
 export const canDuplicate = false;
+
 export const canSync = false;
 
-type BaseUnitTestResult = {
-  results: Object,
-};
+interface BaseUnitTestResult {
+  results: Record<string, any>;
+}
 
 export type UnitTestResult = BaseModel & BaseUnitTestResult;
 
@@ -20,11 +23,11 @@ export function init() {
   };
 }
 
-export function migrate(doc: UnitTestResult): UnitTestResult {
+export function migrate(doc: UnitTestResult) {
   return doc;
 }
 
-export function create(patch: $Shape<UnitTestResult> = {}) {
+export function create(patch: Partial<UnitTestResult> = {}) {
   if (!patch.parentId) {
     throw new Error('New UnitTestResult missing `parentId` ' + JSON.stringify(patch));
   }
@@ -32,7 +35,7 @@ export function create(patch: $Shape<UnitTestResult> = {}) {
   return db.docCreate(type, patch);
 }
 
-export function update(unitTest: UnitTestResult, patch: $Shape<UnitTestResult>) {
+export function update(unitTest: UnitTestResult, patch: Partial<UnitTestResult>) {
   return db.docUpdate(unitTest, patch);
 }
 
@@ -40,6 +43,6 @@ export function getByParentId(parentId: string) {
   return db.getWhere(type, { parentId });
 }
 
-export function all(): Promise<Array<UnitTestResult>> {
-  return db.all(type);
+export function all() {
+  return db.all<UnitTestResult>(type);
 }
diff --git a/packages/insomnia-app/app/models/unit-test-suite.js b/packages/insomnia-app/app/models/unit-test-suite.js
deleted file mode 100644
index c0186c66f9..0000000000
--- a/packages/insomnia-app/app/models/unit-test-suite.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// @flow
-import * as db from '../common/database';
-import type { BaseModel } from './index';
-
-export const name = 'Unit Test Suite';
-export const type = 'UnitTestSuite';
-export const prefix = 'uts';
-export const canDuplicate = true;
-export const canSync = true;
-
-type BaseUnitTestSuite = {
-  name: string,
-};
-
-export type UnitTestSuite = BaseModel & BaseUnitTestSuite;
-
-export function init() {
-  return {
-    name: 'My Test',
-  };
-}
-
-export function migrate(doc: UnitTestSuite): UnitTestSuite {
-  return doc;
-}
-
-export function create(patch: $Shape<UnitTestSuite> = {}) {
-  if (!patch.parentId) {
-    throw new Error('New UnitTestSuite missing `parentId` ' + JSON.stringify(patch));
-  }
-
-  return db.docCreate(type, patch);
-}
-
-export function update(
-  unitTestSuite: UnitTestSuite,
-  patch: $Shape<UnitTestSuite> = {},
-): Promise<UnitTestSuite> {
-  return db.docUpdate(unitTestSuite, patch);
-}
-
-export function remove(unitTestSuite: UnitTestSuite): Promise<void> {
-  return db.remove(unitTestSuite);
-}
-
-export function getByParentId(parentId: string): Promise<UnitTestSuite | null> {
-  return db.getWhere(type, { parentId });
-}
-
-export function all(): Promise<Array<UnitTestSuite>> {
-  return db.all(type);
-}
diff --git a/packages/insomnia-app/app/models/unit-test-suite.ts b/packages/insomnia-app/app/models/unit-test-suite.ts
new file mode 100644
index 0000000000..8670c9c592
--- /dev/null
+++ b/packages/insomnia-app/app/models/unit-test-suite.ts
@@ -0,0 +1,51 @@
+import { database as db } from '../common/database';
+import type { BaseModel } from './index';
+
+export const name = 'Unit Test Suite';
+
+export const type = 'UnitTestSuite';
+
+export const prefix = 'uts';
+
+export const canDuplicate = true;
+
+export const canSync = true;
+interface BaseUnitTestSuite {
+  name: string;
+}
+
+export type UnitTestSuite = BaseModel & BaseUnitTestSuite;
+
+export function init() {
+  return {
+    name: 'My Test',
+  };
+}
+
+export function migrate(doc: UnitTestSuite) {
+  return doc;
+}
+
+export function create(patch: Partial<UnitTestSuite> = {}) {
+  if (!patch.parentId) {
+    throw new Error('New UnitTestSuite missing `parentId` ' + JSON.stringify(patch));
+  }
+
+  return db.docCreate<UnitTestSuite>(type, patch);
+}
+
+export function update(unitTestSuite: UnitTestSuite, patch: Partial<UnitTestSuite> = {}) {
+  return db.docUpdate<UnitTestSuite>(unitTestSuite, patch);
+}
+
+export function remove(unitTestSuite: UnitTestSuite) {
+  return db.remove(unitTestSuite);
+}
+
+export function getByParentId(parentId: string) {
+  return db.getWhere<UnitTestSuite>(type, { parentId });
+}
+
+export function all() {
+  return db.all<UnitTestSuite>(type);
+}
diff --git a/packages/insomnia-app/app/models/unit-test.js b/packages/insomnia-app/app/models/unit-test.js
deleted file mode 100644
index d27bc6c68b..0000000000
--- a/packages/insomnia-app/app/models/unit-test.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// @flow
-import * as db from '../common/database';
-import type { BaseModel } from './index';
-
-export const name = 'Unit Test';
-export const type = 'UnitTest';
-export const prefix = 'ut';
-export const canDuplicate = true;
-export const canSync = true;
-
-type BaseUnitTest = {
-  name: string,
-  code: string,
-  requestId: string | null,
-};
-
-export type UnitTest = BaseModel & BaseUnitTest;
-
-export function init() {
-  return {
-    requestId: null,
-    name: 'My Test',
-    code: '',
-  };
-}
-
-export function migrate(doc: UnitTest): UnitTest {
-  return doc;
-}
-
-export function create(patch: $Shape<UnitTest> = {}): Promise<UnitTest> {
-  if (!patch.parentId) {
-    throw new Error('New UnitTest missing `parentId` ' + JSON.stringify(patch));
-  }
-
-  return db.docCreate(type, patch);
-}
-
-export function remove(unitTest: UnitTest): Promise<void> {
-  return db.remove(unitTest);
-}
-
-export function update(unitTest: UnitTest, patch: $Shape<UnitTest> = {}): Promise<UnitTest> {
-  return db.docUpdate(unitTest, patch);
-}
-
-export function getByParentId(parentId: string): Promise<UnitTest | null> {
-  return db.getWhere(type, { parentId });
-}
-
-export function all(): Promise<Array<UnitTest>> {
-  return db.all(type);
-}
diff --git a/packages/insomnia-app/app/models/unit-test.ts b/packages/insomnia-app/app/models/unit-test.ts
new file mode 100644
index 0000000000..87b01bd6bb
--- /dev/null
+++ b/packages/insomnia-app/app/models/unit-test.ts
@@ -0,0 +1,55 @@
+import { database as db } from '../common/database';
+import type { BaseModel } from './index';
+
+export const name = 'Unit Test';
+
+export const type = 'UnitTest';
+
+export const prefix = 'ut';
+
+export const canDuplicate = true;
+
+export const canSync = true;
+interface BaseUnitTest {
+  name: string;
+  code: string;
+  requestId: string | null;
+}
+
+export type UnitTest = BaseModel & BaseUnitTest;
+
+export function init() {
+  return {
+    requestId: null,
+    name: 'My Test',
+    code: '',
+  };
+}
+
+export function migrate(doc: UnitTest) {
+  return doc;
+}
+
+export function create(patch: Partial<UnitTest> = {}) {
+  if (!patch.parentId) {
+    throw new Error('New UnitTest missing `parentId` ' + JSON.stringify(patch));
+  }
+
+  return db.docCreate<UnitTest>(type, patch);
+}
+
+export function remove(unitTest: UnitTest) {
+  return db.remove(unitTest);
+}
+
+export function update(unitTest: UnitTest, patch: Partial<UnitTest> = {}) {
+  return db.docUpdate<UnitTest>(unitTest, patch);
+}
+
+export function getByParentId(parentId: string) {
+  return db.getWhere<UnitTest>(type, { parentId });
+}
+
+export function all() {
+  return db.all<UnitTest>(type);
+}
diff --git a/packages/insomnia-app/app/models/workspace-meta.js b/packages/insomnia-app/app/models/workspace-meta.js
deleted file mode 100644
index 6def1f754f..0000000000
--- a/packages/insomnia-app/app/models/workspace-meta.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// @flow
-import type { BaseModel } from './index';
-import * as db from '../common/database';
-import {
-  DEFAULT_SIDEBAR_WIDTH,
-  DEFAULT_PANE_WIDTH,
-  DEFAULT_PANE_HEIGHT,
-  ACTIVITY_DEBUG,
-  DEPRECATED_ACTIVITY_INSOMNIA,
-} from '../common/constants';
-
-export const name = 'Workspace Meta';
-export const type = 'WorkspaceMeta';
-export const prefix = 'wrkm';
-export const canDuplicate = false;
-export const canSync = false;
-
-type BaseWorkspaceMeta = {
-  activeActivity: string | null,
-  activeEnvironmentId: string | null,
-  activeRequestId: string | null,
-  activeUnitTestSuiteId: string | null,
-  cachedGitLastAuthor: string | null,
-  cachedGitLastCommitTime: number | null,
-  cachedGitRepositoryBranch: string | null,
-  gitRepositoryId: string | null,
-  hasSeen: boolean,
-  paneHeight: number,
-  paneWidth: number,
-  previewHidden: boolean,
-  sidebarFilter: string,
-  sidebarHidden: boolean,
-  sidebarWidth: number,
-};
-
-export type WorkspaceMeta = BaseWorkspaceMeta & BaseModel;
-
-export function init(): BaseWorkspaceMeta {
-  return {
-    activeActivity: null,
-    activeEnvironmentId: null,
-    activeRequestId: null,
-    activeUnitTestSuiteId: null,
-    cachedGitLastAuthor: null,
-    cachedGitLastCommitTime: null,
-    cachedGitRepositoryBranch: null,
-    gitRepositoryId: null,
-    hasSeen: true,
-    paneHeight: DEFAULT_PANE_HEIGHT,
-    paneWidth: DEFAULT_PANE_WIDTH,
-    parentId: null,
-    previewHidden: false,
-    sidebarFilter: '',
-    sidebarHidden: false,
-    sidebarWidth: DEFAULT_SIDEBAR_WIDTH,
-  };
-}
-
-export function migrate(doc: WorkspaceMeta): WorkspaceMeta {
-  doc = _migrateInsomniaActivity(doc);
-  return doc;
-}
-
-function _migrateInsomniaActivity(doc: WorkspaceMeta): WorkspaceMeta {
-  if (doc.activeActivity === DEPRECATED_ACTIVITY_INSOMNIA) {
-    doc.activeActivity = ACTIVITY_DEBUG;
-  }
-
-  return doc;
-}
-
-export function create(patch: $Shape<WorkspaceMeta> = {}): Promise<WorkspaceMeta> {
-  if (!patch.parentId) {
-    throw new Error(`New WorkspaceMeta missing parentId ${JSON.stringify(patch)}`);
-  }
-
-  return db.docCreate(type, patch);
-}
-
-export function update(
-  workspaceMeta: WorkspaceMeta,
-  patch: $Shape<WorkspaceMeta> = {},
-): Promise<WorkspaceMeta> {
-  return db.docUpdate(workspaceMeta, patch);
-}
-
-export async function updateByParentId(
-  workspaceId: string,
-  patch: $Shape<WorkspaceMeta> = {},
-): Promise<WorkspaceMeta> {
-  const meta = await getByParentId(workspaceId);
-  return db.docUpdate(meta, patch);
-}
-
-export async function getByParentId(parentId: string): Promise<WorkspaceMeta | null> {
-  return db.getWhere(type, { parentId });
-}
-
-export async function getByGitRepositoryId(gitRepositoryId: string): Promise<WorkspaceMeta | null> {
-  return db.getWhere(type, { gitRepositoryId });
-}
-
-export async function getOrCreateByParentId(parentId: string): Promise<WorkspaceMeta> {
-  const doc = await getByParentId(parentId);
-  return doc || this.create({ parentId });
-}
-
-export function all(): Promise<Array<WorkspaceMeta>> {
-  return db.all(type);
-}
diff --git a/packages/insomnia-app/app/models/workspace-meta.ts b/packages/insomnia-app/app/models/workspace-meta.ts
new file mode 100644
index 0000000000..60c8be0cb9
--- /dev/null
+++ b/packages/insomnia-app/app/models/workspace-meta.ts
@@ -0,0 +1,110 @@
+import type { BaseModel } from './index';
+import { database as db } from '../common/database';
+import {
+  DEFAULT_SIDEBAR_WIDTH,
+  DEFAULT_PANE_WIDTH,
+  DEFAULT_PANE_HEIGHT,
+  ACTIVITY_DEBUG,
+  DEPRECATED_ACTIVITY_INSOMNIA,
+} from '../common/constants';
+
+export const name = 'Workspace Meta';
+
+export const type = 'WorkspaceMeta';
+
+export const prefix = 'wrkm';
+
+export const canDuplicate = false;
+
+export const canSync = false;
+
+interface BaseWorkspaceMeta {
+  activeActivity: string | null;
+  activeEnvironmentId: string | null;
+  activeRequestId: string | null;
+  activeUnitTestSuiteId: string | null;
+  cachedGitLastAuthor: string | null;
+  cachedGitLastCommitTime: number | null;
+  cachedGitRepositoryBranch: string | null;
+  gitRepositoryId: string | null;
+  hasSeen: boolean;
+  paneHeight: number;
+  paneWidth: number;
+  parentId: string | null;
+  previewHidden: boolean;
+  sidebarFilter: string;
+  sidebarHidden: boolean;
+  sidebarWidth: number;
+}
+
+export type WorkspaceMeta = BaseWorkspaceMeta & BaseModel;
+
+export function init(): BaseWorkspaceMeta {
+  return {
+    activeActivity: null,
+    activeEnvironmentId: null,
+    activeRequestId: null,
+    activeUnitTestSuiteId: null,
+    cachedGitLastAuthor: null,
+    cachedGitLastCommitTime: null,
+    cachedGitRepositoryBranch: null,
+    gitRepositoryId: null,
+    hasSeen: true,
+    paneHeight: DEFAULT_PANE_HEIGHT,
+    paneWidth: DEFAULT_PANE_WIDTH,
+    parentId: null,
+    previewHidden: false,
+    sidebarFilter: '',
+    sidebarHidden: false,
+    sidebarWidth: DEFAULT_SIDEBAR_WIDTH,
+  };
+}
+
+export function migrate(doc: WorkspaceMeta) {
+  doc = _migrateInsomniaActivity(doc);
+  return doc;
+}
+
+function _migrateInsomniaActivity(doc: WorkspaceMeta) {
+  if (doc.activeActivity === DEPRECATED_ACTIVITY_INSOMNIA) {
+    doc.activeActivity = ACTIVITY_DEBUG;
+  }
+
+  return doc;
+}
+
+export function create(patch: Partial<WorkspaceMeta> = {}) {
+  if (!patch.parentId) {
+    throw new Error(`New WorkspaceMeta missing parentId ${JSON.stringify(patch)}`);
+  }
+
+  return db.docCreate<WorkspaceMeta>(type, patch);
+}
+
+export function update(workspaceMeta: WorkspaceMeta, patch: Partial<WorkspaceMeta> = {}) {
+  return db.docUpdate<WorkspaceMeta>(workspaceMeta, patch);
+}
+
+export async function updateByParentId(workspaceId: string, patch: Partial<WorkspaceMeta> = {}) {
+  const meta = await getByParentId(workspaceId);
+  // @ts-expect-error -- TSCONVERSION appears to be a genuine error not previously caught by Flow
+  return db.docUpdate<WorkspaceMeta>(meta, patch);
+}
+
+export async function getByParentId(parentId: string) {
+  return db.getWhere<WorkspaceMeta>(type, { parentId });
+}
+
+export async function getByGitRepositoryId(gitRepositoryId: string) {
+  // @ts-expect-error -- TSCONVERSION needs generic for query
+  return db.getWhere<WorkspaceMeta>(type, { gitRepositoryId });
+}
+
+export async function getOrCreateByParentId(parentId: string) {
+  const doc = await getByParentId(parentId);
+  return doc || create({ parentId });
+}
+
+export function all() {
+  return db.all<WorkspaceMeta>(type);
+}
diff --git a/packages/insomnia-app/app/models/workspace.js b/packages/insomnia-app/app/models/workspace.ts
similarity index 68%
rename from packages/insomnia-app/app/models/workspace.js
rename to packages/insomnia-app/app/models/workspace.ts
index 35929165c1..60f7752eca 100644
--- a/packages/insomnia-app/app/models/workspace.js
+++ b/packages/insomnia-app/app/models/workspace.ts
@@ -1,28 +1,33 @@
-// @flow
 import type { BaseModel } from './index';
 import * as models from './index';
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import { getAppName } from '../common/constants';
 import { strings } from '../common/strings';
+import { ValueOf } from 'type-fest';
 
 export const name = 'Workspace';
+
 export const type = 'Workspace';
+
 export const prefix = 'wrk';
+
 export const canDuplicate = true;
+
 export const canSync = true;
 
 export const WorkspaceScopeKeys = {
   design: 'design',
   collection: 'collection',
-};
+} as const;
 
-export type WorkspaceScope = $Keys<typeof WorkspaceScopeKeys>;
+export type WorkspaceScope = ValueOf<typeof WorkspaceScopeKeys>;
 
-type BaseWorkspace = {
-  name: string,
-  description: string,
-  scope: WorkspaceScope,
-};
+interface BaseWorkspace {
+  name: string;
+  description: string;
+  scope: WorkspaceScope;
+  certificates?: any;
+}
 
 export type Workspace = BaseModel & BaseWorkspace;
 
@@ -34,28 +39,33 @@ export function init() {
   };
 }
 
-export async function migrate(doc: Workspace): Promise<Workspace> {
+export async function migrate(doc: Workspace) {
   doc = await _migrateExtractClientCertificates(doc);
   doc = await _migrateEnsureName(doc);
-  await models.apiSpec.getOrCreateForParentId(doc._id, { fileName: doc.name });
+  await models.apiSpec.getOrCreateForParentId(doc._id, {
+    fileName: doc.name,
+  });
   doc = _migrateScope(doc);
   return doc;
 }
 
-export function getById(id: string): Promise<Workspace | null> {
-  return db.get(type, id);
+export function getById(id?: string) {
+  return db.get<Workspace>(type, id);
 }
 
-export async function create(patch: $Shape<Workspace> = {}): Promise<Workspace> {
-  return db.docCreate(type, patch);
+export async function create(patch: Partial<Workspace> = {}) {
+  return db.docCreate<Workspace>(type, patch);
 }
 
-export async function all(): Promise<Array<Workspace>> {
-  const workspaces = await db.all(type);
+export async function all() {
+  const workspaces = await db.all<Workspace>(type) || [];
 
   if (workspaces.length === 0) {
     // Create default workspace
-    await create({ name: getAppName(), scope: WorkspaceScopeKeys.collection });
+    await create({
+      name: getAppName(),
+      scope: WorkspaceScopeKeys.collection,
+    });
     return all();
   } else {
     return workspaces;
@@ -66,16 +76,17 @@ export function count() {
   return db.count(type);
 }
 
-export function update(workspace: Workspace, patch: $Shape<Workspace>): Promise<Workspace> {
+export function update(workspace: Workspace, patch: Partial<Workspace>) {
   return db.docUpdate(workspace, patch);
 }
 
-export function remove(workspace: Workspace): Promise<void> {
+export function remove(workspace: Workspace) {
   return db.remove(workspace);
 }
 
-async function _migrateExtractClientCertificates(workspace: Workspace): Promise<Workspace> {
-  const certificates = (workspace: Object).certificates || null;
+async function _migrateExtractClientCertificates(workspace: Workspace) {
+  const certificates = workspace.certificates || null;
+
   if (!Array.isArray(certificates)) {
     // Already migrated
     return workspace;
@@ -93,12 +104,10 @@ async function _migrateExtractClientCertificates(workspace: Workspace): Promise<
     });
   }
 
-  delete (workspace: Object).certificates;
-
+  delete workspace.certificates;
   // This will remove the now-missing `certificates` property
   // NOTE: Using db.update so we don't change things like modified time
   await db.update(workspace);
-
   return workspace;
 }
 
@@ -107,7 +116,7 @@ async function _migrateExtractClientCertificates(workspace: Workspace): Promise<
  * this happens (and it causes problems) so this migration will ensure that it is
  * corrected.
  */
-async function _migrateEnsureName(workspace: Workspace): Promise<Workspace> {
+async function _migrateEnsureName(workspace: Workspace) {
   if (typeof workspace.name !== 'string') {
     workspace.name = 'My Workspace';
   }
@@ -118,7 +127,7 @@ async function _migrateEnsureName(workspace: Workspace): Promise<Workspace> {
 /**
  * Ensure workspace scope is set to a valid entry
  */
-function _migrateScope(workspace: Workspace): Workspace {
+function _migrateScope(workspace: Workspace) {
   if (
     workspace.scope === WorkspaceScopeKeys.design ||
     workspace.scope === WorkspaceScopeKeys.collection
@@ -128,15 +137,18 @@ function _migrateScope(workspace: Workspace): Workspace {
 
   // Translate the old value
   type OldScopeTypes = 'spec' | 'debug' | 'designer' | null;
-  switch ((workspace.scope: OldScopeTypes)) {
+
+  switch (workspace.scope as OldScopeTypes) {
     case 'spec': {
       workspace.scope = WorkspaceScopeKeys.design;
       break;
     }
+
     case 'designer': {
       workspace.scope = WorkspaceScopeKeys.design;
       break;
     }
+
     case 'debug':
     case null:
     default:
diff --git a/packages/insomnia-app/app/network/__tests__/authentication.test.js b/packages/insomnia-app/app/network/__tests__/authentication.test.ts
similarity index 87%
rename from packages/insomnia-app/app/network/__tests__/authentication.test.js
rename to packages/insomnia-app/app/network/__tests__/authentication.test.ts
index 7fd2e6076e..839aaf9771 100644
--- a/packages/insomnia-app/app/network/__tests__/authentication.test.js
+++ b/packages/insomnia-app/app/network/__tests__/authentication.test.ts
@@ -14,9 +14,12 @@ describe('OAuth 1.0', () => {
       nonce: 'nonce',
       timestamp: '1234567890',
     };
-    const request = { url: 'https://insomnia.rest/', method: 'GET', authentication };
+    const request = {
+      url: 'https://insomnia.rest/',
+      method: 'GET',
+      authentication,
+    };
     const header = await getAuthHeader(request, 'https://insomnia.rest/');
-
     expect(header).toEqual({
       name: 'Authorization',
       value: [
@@ -60,9 +63,12 @@ describe('OAuth 1.0', () => {
       nonce: 'nonce',
       timestamp: '1234567890',
     };
-    const request = { url: 'https://insomnia.rest/', method: 'GET', authentication };
+    const request = {
+      url: 'https://insomnia.rest/',
+      method: 'GET',
+      authentication,
+    };
     const header = await getAuthHeader(request, 'https://insomnia.rest/');
-
     expect(header).toEqual({
       name: 'Authorization',
       value: [
@@ -85,9 +91,12 @@ describe('OAuth 1.0', () => {
       consumerSecret: 'consumerSecret',
       signatureMethod: 'HMAC-SHA1',
     };
-    const request = { url: 'https://insomnia.rest/', method: 'GET', authentication };
+    const request = {
+      url: 'https://insomnia.rest/',
+      method: 'GET',
+      authentication,
+    };
     const header = await getAuthHeader(request, 'https://insomnia.rest/');
-
     expect(header.name).toBe('Authorization');
     expect(header.value).toMatch(
       new RegExp(
@@ -107,16 +116,28 @@ describe('OAuth 1.0', () => {
 describe('_buildBearerHeader()', () => {
   it('uses default prefix', () => {
     const result = _buildBearerHeader('token', '');
-    expect(result).toEqual({ name: 'Authorization', value: 'Bearer token' });
+
+    expect(result).toEqual({
+      name: 'Authorization',
+      value: 'Bearer token',
+    });
   });
 
   it('uses specified prefix', () => {
     const result = _buildBearerHeader('token', 'custom');
-    expect(result).toEqual({ name: 'Authorization', value: 'custom token' });
+
+    expect(result).toEqual({
+      name: 'Authorization',
+      value: 'custom token',
+    });
   });
 
   it('uses no prefix', () => {
     const result = _buildBearerHeader('token', 'NO_PREFIX');
-    expect(result).toEqual({ name: 'Authorization', value: 'token' });
+
+    expect(result).toEqual({
+      name: 'Authorization',
+      value: 'token',
+    });
   });
 });
diff --git a/packages/insomnia-app/app/network/__tests__/certificate-url-parse.test.js b/packages/insomnia-app/app/network/__tests__/certificate-url-parse.test.ts
similarity index 99%
rename from packages/insomnia-app/app/network/__tests__/certificate-url-parse.test.js
rename to packages/insomnia-app/app/network/__tests__/certificate-url-parse.test.ts
index b69dfd229e..0bc9ec85e0 100644
--- a/packages/insomnia-app/app/network/__tests__/certificate-url-parse.test.js
+++ b/packages/insomnia-app/app/network/__tests__/certificate-url-parse.test.ts
@@ -4,6 +4,7 @@ import { globalBeforeEach } from '../../__jest__/before-each';
 
 describe('certificateUrlParse', () => {
   beforeEach(globalBeforeEach);
+
   it('should return the result of url.parse if no wildcard paths are supplied', () => {
     const url = 'https://www.example.org:80/some/resources?query=1&other=2#myfragment';
     const expected = urlParse(url);
@@ -17,7 +18,6 @@ describe('certificateUrlParse', () => {
     const path = '/some/resources';
     const query = 'query=1&other=2';
     const fragment = 'myfragment';
-
     const url = `${protocol}://${host}:${port}${path}?${query}#${fragment}`;
     expect(certificateUrlParse(url).hostname).toEqual(host);
   });
@@ -29,7 +29,6 @@ describe('certificateUrlParse', () => {
     const path = '/some/resources';
     const query = 'query=1&other=2';
     const fragment = 'myfragment';
-
     const url = `${protocol}://${host}:${port}${path}?${query}#${fragment}`;
     expect(certificateUrlParse(url).hostname).toEqual(host);
   });
@@ -41,7 +40,6 @@ describe('certificateUrlParse', () => {
     const path = '/some/resources';
     const query = 'query=1&other=2';
     const fragment = 'myfragment';
-
     const url = `${protocol}://${host}:${port}${path}?${query}#${fragment}`;
     expect(certificateUrlParse(url).hostname).toEqual(host);
   });
@@ -53,7 +51,6 @@ describe('certificateUrlParse', () => {
     const path = '/some/resources';
     const query = 'query=1&other=2';
     const fragment = 'myfragment';
-
     const url = `${protocol}://${host}:${port}${path}?${query}#${fragment}`;
     expect(certificateUrlParse(url).hostname).toEqual(host);
   });
@@ -63,7 +60,6 @@ describe('certificateUrlParse', () => {
     const path = '/some/resources';
     const query = 'query=1&other=2';
     const fragment = 'myfragment';
-
     const url = `${host}${path}?${query}#${fragment}`;
     expect(certificateUrlParse(url).hostname).toEqual(null);
   });
@@ -76,7 +72,6 @@ describe('certificateUrlParse', () => {
     const path = '/some/resources';
     const query = 'query=1&other=2';
     const fragment = 'myfragment';
-
     const url = `${protocol}://${user}:${password}@${host}${path}?${query}#${fragment}`;
     expect(certificateUrlParse(url).hostname).toEqual(host);
   });
@@ -87,7 +82,6 @@ describe('certificateUrlParse', () => {
     const path = '/@some/resources';
     const query = 'query=1&other=2';
     const fragment = 'myfragment';
-
     const url = `${protocol}://${host}${path}?${query}#${fragment}`;
     expect(certificateUrlParse(url).hostname).toEqual(host);
   });
@@ -102,7 +96,6 @@ describe('certificateUrlParse', () => {
     const path = '/some/resources';
     const query = 'query=1&other=2';
     const fragment = 'myfragment';
-
     const url = `${protocol}://${user}:${password}@${host}:${port}${path}?${query}#${fragment}`;
     const nonWildcardUrl = `${protocol}://${user}:${password}@${nonWildcardHost}:${port}${path}?${query}#${fragment}`;
     const expected = urlParse(nonWildcardUrl);
@@ -119,7 +112,6 @@ describe('certificateUrlParse', () => {
     const path = '/some/resources';
     const query = 'query=1&other=2';
     const fragment = 'myfragment';
-
     const url = `${protocol}://${host}:${port}${path}?${query}#${fragment}`;
     expect(certificateUrlParse(url).port).toEqual(port);
   });
diff --git a/packages/insomnia-app/app/network/__tests__/multipart.test.js b/packages/insomnia-app/app/network/__tests__/multipart.test.ts
similarity index 78%
rename from packages/insomnia-app/app/network/__tests__/multipart.test.js
rename to packages/insomnia-app/app/network/__tests__/multipart.test.ts
index 6db314a116..2042584a09 100644
--- a/packages/insomnia-app/app/network/__tests__/multipart.test.js
+++ b/packages/insomnia-app/app/network/__tests__/multipart.test.ts
@@ -8,10 +8,15 @@ describe('buildMultipart()', () => {
 
   it('builds a simple request', async () => {
     const { filePath, boundary, contentLength } = await buildMultipart([
-      { name: 'foo', value: 'bar' },
-      { name: 'multi-line', value: 'Hello\nWorld!' },
+      {
+        name: 'foo',
+        value: 'bar',
+      },
+      {
+        name: 'multi-line',
+        value: 'Hello\nWorld!',
+      },
     ]);
-
     expect(boundary).toBe(DEFAULT_BOUNDARY);
     expect(contentLength).toBe(189);
     expect(fs.readFileSync(filePath, 'utf8')).toBe(
@@ -32,11 +37,21 @@ describe('buildMultipart()', () => {
 
   it('builds a multiline request with content-type', async () => {
     const { filePath, boundary, contentLength } = await buildMultipart([
-      { name: 'foo', value: 'bar' },
-      { name: 'json', value: '{"hello": "world"}', multiline: 'application/json' },
-      { name: 'text', value: 'text', multiline: true },
+      {
+        name: 'foo',
+        value: 'bar',
+      },
+      {
+        name: 'json',
+        value: '{"hello": "world"}',
+        multiline: 'application/json',
+      },
+      {
+        name: 'text',
+        value: 'text',
+        multiline: true,
+      },
     ]);
-
     expect(boundary).toBe(DEFAULT_BOUNDARY);
     expect(contentLength).toBe(297);
     expect(fs.readFileSync(filePath, 'utf8')).toBe(
@@ -63,11 +78,20 @@ describe('buildMultipart()', () => {
   it('builds with file', async () => {
     const fileName = path.resolve(path.join(__dirname, './testfile.txt'));
     const { filePath, boundary, contentLength } = await buildMultipart([
-      { name: 'foo', value: 'bar' },
-      { name: 'file', type: 'file', fileName: fileName },
-      { name: 'baz', value: 'qux' },
+      {
+        name: 'foo',
+        value: 'bar',
+      },
+      {
+        name: 'file',
+        type: 'file',
+        fileName: fileName,
+      },
+      {
+        name: 'baz',
+        value: 'qux',
+      },
     ]);
-
     expect(boundary).toBe(DEFAULT_BOUNDARY);
     expect(contentLength).toBe(322);
     expect(fs.readFileSync(filePath, 'utf8')).toBe(
@@ -93,12 +117,22 @@ describe('buildMultipart()', () => {
 
   it('skips entries with no name or value', async () => {
     const { filePath, boundary, contentLength } = await buildMultipart([
-      { value: 'bar' },
-      { name: 'foo' },
-      { name: '', value: '' },
-      { name: '', type: 'file', fileName: '' },
+      {
+        value: 'bar',
+      },
+      {
+        name: 'foo',
+      },
+      {
+        name: '',
+        value: '',
+      },
+      {
+        name: '',
+        type: 'file',
+        fileName: '',
+      },
     ]);
-
     expect(boundary).toBe(DEFAULT_BOUNDARY);
     expect(contentLength).toBe(167);
     expect(fs.readFileSync(filePath, 'utf8')).toBe(
diff --git a/packages/insomnia-app/app/network/__tests__/network.test.js b/packages/insomnia-app/app/network/__tests__/network.test.ts
similarity index 83%
rename from packages/insomnia-app/app/network/__tests__/network.test.js
rename to packages/insomnia-app/app/network/__tests__/network.test.ts
index 5b865b310e..7ac62dbc95 100644
--- a/packages/insomnia-app/app/network/__tests__/network.test.js
+++ b/packages/insomnia-app/app/network/__tests__/network.test.ts
@@ -16,13 +16,13 @@ import {
 import { filterHeaders } from '../../common/misc';
 import { globalBeforeEach } from '../../__jest__/before-each';
 import { DEFAULT_BOUNDARY } from '../multipart';
-
 const CONTEXT = {};
 
 const getRenderedRequest = async (...args) => (await getRenderedRequestAndContext(...args)).request;
 
 describe('actuallySend()', () => {
   beforeEach(globalBeforeEach);
+
   it('sends a generic request', async () => {
     const workspace = await models.workspace.create();
     const settings = await models.settings.create();
@@ -48,25 +48,39 @@ describe('actuallySend()', () => {
         lastAccessed: new Date('2096-10-05T04:40:49.505Z'),
       },
     ];
-
     const cookieJar = await models.cookieJar.getOrCreateForParentId(workspace._id);
     await models.cookieJar.update(cookieJar, {
       parentId: workspace._id,
       cookies,
     });
-
     const request = Object.assign(models.request.init(), {
       _id: 'req_123',
       parentId: workspace._id,
       headers: [
-        { name: 'Content-Type', value: 'application/json' },
-        { name: 'Empty', value: '' },
+        {
+          name: 'Content-Type',
+          value: 'application/json',
+        },
+        {
+          name: 'Empty',
+          value: '',
+        },
+      ],
+      parameters: [
+        {
+          name: 'foo bar',
+          value: 'hello&world',
+        },
       ],
-      parameters: [{ name: 'foo bar', value: 'hello&world' }],
       method: 'POST',
       body: {
         mimeType: CONTENT_TYPE_FORM_URLENCODED,
-        params: [{ name: 'foo', value: 'bar' }],
+        params: [
+          {
+            name: 'foo',
+            value: 'bar',
+          },
+        ],
       },
       url: 'http://localhost',
       authentication: {
@@ -75,7 +89,6 @@ describe('actuallySend()', () => {
         password: 'pass',
       },
     });
-
     const renderedRequest = await getRenderedRequest(request);
     const response = await networkUtils._actuallySend(
       renderedRequest,
@@ -83,7 +96,6 @@ describe('actuallySend()', () => {
       workspace,
       settings,
     );
-
     const bodyBuffer = models.response.getBodyBuffer(response);
     const body = JSON.parse(bodyBuffer);
     expect(body).toEqual({
@@ -126,19 +138,32 @@ describe('actuallySend()', () => {
     const request = Object.assign(models.request.init(), {
       _id: 'req_123',
       parentId: workspace._id,
-      headers: [{ name: 'Content-Type', value: CONTENT_TYPE_FORM_URLENCODED }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: CONTENT_TYPE_FORM_URLENCODED,
+        },
+      ],
       method: 'POST',
       body: {
         mimeType: CONTENT_TYPE_FORM_URLENCODED,
         params: [
-          { name: 'foo', value: 'bar' },
-          { name: 'bar', value: '' },
-          { name: '', value: 'value' },
+          {
+            name: 'foo',
+            value: 'bar',
+          },
+          {
+            name: 'bar',
+            value: '',
+          },
+          {
+            name: '',
+            value: 'value',
+          },
         ],
       },
       url: 'http://localhost',
     });
-
     const renderedRequest = await getRenderedRequest(request);
     const response = await networkUtils._actuallySend(
       renderedRequest,
@@ -146,7 +171,6 @@ describe('actuallySend()', () => {
       workspace,
       settings,
     );
-
     const bodyBuffer = models.response.getBodyBuffer(response);
     const body = JSON.parse(bodyBuffer);
     expect(body).toEqual({
@@ -202,21 +226,34 @@ describe('actuallySend()', () => {
         lastAccessed: new Date('2096-10-05T04:40:49.505Z'),
       },
     ];
-
     await models.cookieJar.create({
       parentId: workspace._id,
       cookies,
     });
-
     const request = Object.assign(models.request.init(), {
       _id: 'req_123',
       parentId: workspace._id,
-      headers: [{ name: 'Content-Type', value: 'application/json' }],
-      parameters: [{ name: 'foo bar', value: 'hello&world' }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: 'application/json',
+        },
+      ],
+      parameters: [
+        {
+          name: 'foo bar',
+          value: 'hello&world',
+        },
+      ],
       method: 'GET',
       body: {
         mimeType: CONTENT_TYPE_FORM_URLENCODED,
-        params: [{ name: 'foo', value: 'bar' }],
+        params: [
+          {
+            name: 'foo',
+            value: 'bar',
+          },
+        ],
       },
       url: 'http://localhost',
       authentication: {
@@ -227,7 +264,6 @@ describe('actuallySend()', () => {
       settingStoreCookies: false,
       settingSendCookies: false,
     });
-
     const renderedRequest = await getRenderedRequest(request);
     const response = await networkUtils._actuallySend(
       renderedRequest,
@@ -235,7 +271,6 @@ describe('actuallySend()', () => {
       workspace,
       settings,
     );
-
     const bodyBuffer = models.response.getBodyBuffer(response);
     const body = JSON.parse(bodyBuffer);
     expect(body).toEqual({
@@ -269,18 +304,26 @@ describe('actuallySend()', () => {
   it('sends a file', async () => {
     const workspace = await models.workspace.create();
     const settings = await models.settings.create();
-    await models.cookieJar.create({ parentId: workspace._id });
+    await models.cookieJar.create({
+      parentId: workspace._id,
+    });
     const fileName = pathResolve(pathJoin(__dirname, './testfile.txt'));
-
     const request = Object.assign(models.request.init(), {
       _id: 'req_123',
       parentId: workspace._id,
-      headers: [{ name: 'Content-Type', value: 'application/octet-stream' }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: 'application/octet-stream',
+        },
+      ],
       url: 'http://localhost',
       method: 'POST',
-      body: { mimeType: CONTENT_TYPE_FILE, fileName },
+      body: {
+        mimeType: CONTENT_TYPE_FILE,
+        fileName,
+      },
     });
-
     const renderedRequest = await getRenderedRequest(request);
     const response = await networkUtils._actuallySend(
       renderedRequest,
@@ -288,10 +331,8 @@ describe('actuallySend()', () => {
       workspace,
       settings,
     );
-
     const bodyBuffer = models.response.getBodyBuffer(response);
     const body = JSON.parse(bodyBuffer);
-
     expect(body).toEqual({
       meta: {},
       features: {
@@ -326,28 +367,43 @@ describe('actuallySend()', () => {
   it('sends multipart form data', async () => {
     const workspace = await models.workspace.create();
     const settings = await models.settings.create();
-    await models.cookieJar.create({ parentId: workspace._id });
+    await models.cookieJar.create({
+      parentId: workspace._id,
+    });
     const fileName = pathResolve(pathJoin(__dirname, './testfile.txt'));
-
     const request = Object.assign(models.request.init(), {
       _id: 'req_123',
       parentId: workspace._id,
-      headers: [{ name: 'Content-Type', value: 'multipart/form-data' }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: 'multipart/form-data',
+        },
+      ],
       url: 'http://localhost',
       method: 'POST',
       body: {
         mimeType: CONTENT_TYPE_FORM_DATA,
         params: [
           // Should ignore value and send the file since type is set to file
-          { name: 'foo', fileName: fileName, value: 'bar', type: 'file' },
-
-          // Some extra params
-          { name: 'a', value: 'AA' },
-          { name: 'baz', value: 'qux', disabled: true },
+          {
+            name: 'foo',
+            fileName: fileName,
+            value: 'bar',
+            type: 'file',
+          }, // Some extra params
+          {
+            name: 'a',
+            value: 'AA',
+          },
+          {
+            name: 'baz',
+            value: 'qux',
+            disabled: true,
+          },
         ],
       },
     });
-
     const renderedRequest = await getRenderedRequest(request);
     const response = await networkUtils._actuallySend(
       renderedRequest,
@@ -403,14 +459,12 @@ describe('actuallySend()', () => {
   it('uses unix socket', async () => {
     const workspace = await models.workspace.create();
     const settings = await models.settings.create();
-
     const request = Object.assign(models.request.init(), {
       _id: 'req_123',
       parentId: workspace._id,
       url: 'http://unix:/my/socket:/my/path',
       method: 'GET',
     });
-
     const renderedRequest = await getRenderedRequest(request);
     const response = await networkUtils._actuallySend(
       renderedRequest,
@@ -418,7 +472,6 @@ describe('actuallySend()', () => {
       workspace,
       settings,
     );
-
     const bodyBuffer = models.response.getBodyBuffer(response);
     const body = JSON.parse(bodyBuffer);
     expect(body).toEqual({
@@ -446,14 +499,12 @@ describe('actuallySend()', () => {
   it('uses works with HEAD', async () => {
     const workspace = await models.workspace.create();
     const settings = await models.settings.create();
-
     const request = Object.assign(models.request.init(), {
       _id: 'req_123',
       parentId: workspace._id,
       url: 'http://localhost:3000/foo/bar',
       method: 'HEAD',
     });
-
     const renderedRequest = await getRenderedRequest(request);
     const response = await networkUtils._actuallySend(
       renderedRequest,
@@ -461,7 +512,6 @@ describe('actuallySend()', () => {
       workspace,
       settings,
     );
-
     const bodyBuffer = models.response.getBodyBuffer(response);
     const body = JSON.parse(bodyBuffer);
     expect(body).toEqual({
@@ -488,14 +538,12 @@ describe('actuallySend()', () => {
   it('uses works with "unix" host', async () => {
     const workspace = await models.workspace.create();
     const settings = await models.settings.create();
-
     const request = Object.assign(models.request.init(), {
       _id: 'req_123',
       parentId: workspace._id,
       url: 'http://unix:3000/my/path',
       method: 'GET',
     });
-
     const renderedRequest = await getRenderedRequest(request);
     const response = await networkUtils._actuallySend(
       renderedRequest,
@@ -503,7 +551,6 @@ describe('actuallySend()', () => {
       workspace,
       settings,
     );
-
     const bodyBuffer = models.response.getBodyBuffer(response);
     const body = JSON.parse(bodyBuffer);
     expect(body).toEqual({
@@ -530,7 +577,6 @@ describe('actuallySend()', () => {
   it('uses netrc', async () => {
     const workspace = await models.workspace.create();
     const settings = await models.settings.create();
-
     const request = Object.assign(models.request.init(), {
       _id: 'req_123',
       parentId: workspace._id,
@@ -538,7 +584,6 @@ describe('actuallySend()', () => {
         type: AUTH_NETRC,
       },
     });
-
     const renderedRequest = await getRenderedRequest(request);
     const response = await networkUtils._actuallySend(
       renderedRequest,
@@ -546,7 +591,6 @@ describe('actuallySend()', () => {
       workspace,
       settings,
     );
-
     const bodyBuffer = models.response.getBodyBuffer(response);
     const body = JSON.parse(bodyBuffer);
     expect(body).toEqual({
@@ -574,12 +618,10 @@ describe('actuallySend()', () => {
   it('sets HTTP version', async () => {
     const workspace = await models.workspace.create();
     const settings = await models.settings.create();
-
     const request = Object.assign(models.request.init(), {
       _id: 'req_123',
       parentId: workspace._id,
     });
-
     const renderedRequest = await getRenderedRequest(request);
     const responseV1 = await networkUtils._actuallySend(renderedRequest, CONTEXT, workspace, {
       ...settings,
@@ -605,7 +647,6 @@ describe('actuallySend()', () => {
       ...settings,
       preferredHttpVersion: 'blah',
     });
-
     const r = models.response;
     expect(JSON.parse(r.getBodyBuffer(responseV1)).options.HTTP_VERSION).toBe('V1_0');
     expect(JSON.parse(r.getBodyBuffer(responseV11)).options.HTTP_VERSION).toBe('V1_1');
@@ -619,21 +660,18 @@ describe('actuallySend()', () => {
     // GIVEN
     const workspace = await models.workspace.create();
     const settings = await models.settings.create();
-
     const request1 = Object.assign(models.request.init(), {
       _id: 'req_15',
       parentId: workspace._id,
       url: 'http://unix:3000/requestA',
       method: 'GET',
     });
-
     const request2 = Object.assign(models.request.init(), {
       _id: 'req_10',
       parentId: workspace._id,
       url: 'http://unix:3000/requestB',
       method: 'GET',
     });
-
     const renderedRequest1 = await getRenderedRequest(request1);
     const renderedRequest2 = await getRenderedRequest(request2);
 
@@ -644,6 +682,7 @@ describe('actuallySend()', () => {
       workspace,
       settings,
     );
+
     const response2Promise = networkUtils._actuallySend(
       renderedRequest2,
       CONTEXT,
@@ -654,11 +693,9 @@ describe('actuallySend()', () => {
     await networkUtils.cancelRequestById(renderedRequest1._id);
     const response1 = await response1Promise;
     const response2 = await response2Promise;
-
     // THEN
     expect(response1.statusMessage).toBe('Cancelled');
     expect(response2.statusMessage).toBe('OK');
-
     expect(networkUtils.hasCancelFunctionForId(request1._id)).toBe(false);
     expect(networkUtils.hasCancelFunctionForId(request2._id)).toBe(false);
   });
@@ -666,6 +703,7 @@ describe('actuallySend()', () => {
 
 describe('_getAwsAuthHeaders', () => {
   beforeEach(globalBeforeEach);
+
   it('should generate expected headers', () => {
     const req = {
       authentication: {
@@ -674,8 +712,15 @@ describe('_getAwsAuthHeaders', () => {
         secretAccessKey: 'SAK9999999999999',
         sessionToken: 'ST9999999999999999',
       },
-      headers: [{ name: 'content-type', value: 'application/json' }],
-      body: { text: '{}' },
+      headers: [
+        {
+          name: 'content-type',
+          value: 'application/json',
+        },
+      ],
+      body: {
+        text: '{}',
+      },
       method: 'POST',
       url: 'https://ec2.us-west-2.amazonaws.com/path?query=q1',
     };
@@ -684,6 +729,7 @@ describe('_getAwsAuthHeaders', () => {
       secretAccessKey: req.authentication.secretAccessKey || '',
       sessionToken: req.authentication.sessionToken || '',
     };
+
     const headers = networkUtils._getAwsAuthHeaders(
       credentials,
       req.headers,
@@ -691,6 +737,7 @@ describe('_getAwsAuthHeaders', () => {
       req.url,
       req.method,
     );
+
     expect(filterHeaders(headers, 'x-amz-date')[0].value).toMatch(/^\d{8}T\d{6}Z$/);
     expect(filterHeaders(headers, 'host')[0].value).toEqual('ec2.us-west-2.amazonaws.com');
     expect(filterHeaders(headers, 'authorization')[0].value).toMatch(
@@ -716,6 +763,7 @@ describe('_getAwsAuthHeaders', () => {
       secretAccessKey: req.authentication.secretAccessKey || '',
       sessionToken: req.authentication.sessionToken || '',
     };
+
     const headers = networkUtils._getAwsAuthHeaders(
       credentials,
       req.headers,
@@ -749,7 +797,6 @@ describe('_parseHeaders', () => {
     'Foo', // Invalid header
     '',
   ];
-
   const minimalHeaders = ['HTTP/1.1 301', ''];
 
   it('Parses single response headers', () => {
@@ -759,15 +806,42 @@ describe('_parseHeaders', () => {
         version: 'HTTP/1.1',
         reason: 'Moved Permanently',
         headers: [
-          { name: 'X-Powered-By', value: 'Express' },
-          { name: 'location', value: 'http://localhost:3000/' },
-          { name: 'Content-Type', value: 'text/plain; charset=utf-8' },
-          { name: 'Content-Length', value: '17' },
-          { name: 'ETag', value: 'W/"11-WKzg6oYof0o8Mliwrz5pkw"' },
-          { name: 'Duplicate', value: 'foo' },
-          { name: 'Duplicate', value: 'bar' },
-          { name: 'Date', value: 'Mon, 13 Nov 2017 22:06:28 GMT' },
-          { name: 'Foo', value: '' },
+          {
+            name: 'X-Powered-By',
+            value: 'Express',
+          },
+          {
+            name: 'location',
+            value: 'http://localhost:3000/',
+          },
+          {
+            name: 'Content-Type',
+            value: 'text/plain; charset=utf-8',
+          },
+          {
+            name: 'Content-Length',
+            value: '17',
+          },
+          {
+            name: 'ETag',
+            value: 'W/"11-WKzg6oYof0o8Mliwrz5pkw"',
+          },
+          {
+            name: 'Duplicate',
+            value: 'foo',
+          },
+          {
+            name: 'Duplicate',
+            value: 'bar',
+          },
+          {
+            name: 'Date',
+            value: 'Mon, 13 Nov 2017 22:06:28 GMT',
+          },
+          {
+            name: 'Foo',
+            value: '',
+          },
         ],
       },
     ]);
@@ -780,15 +854,42 @@ describe('_parseHeaders', () => {
         version: 'HTTP/1.1',
         reason: 'Moved Permanently',
         headers: [
-          { name: 'X-Powered-By', value: 'Express' },
-          { name: 'location', value: 'http://localhost:3000/' },
-          { name: 'Content-Type', value: 'text/plain; charset=utf-8' },
-          { name: 'Content-Length', value: '17' },
-          { name: 'ETag', value: 'W/"11-WKzg6oYof0o8Mliwrz5pkw"' },
-          { name: 'Duplicate', value: 'foo' },
-          { name: 'Duplicate', value: 'bar' },
-          { name: 'Date', value: 'Mon, 13 Nov 2017 22:06:28 GMT' },
-          { name: 'Foo', value: '' },
+          {
+            name: 'X-Powered-By',
+            value: 'Express',
+          },
+          {
+            name: 'location',
+            value: 'http://localhost:3000/',
+          },
+          {
+            name: 'Content-Type',
+            value: 'text/plain; charset=utf-8',
+          },
+          {
+            name: 'Content-Length',
+            value: '17',
+          },
+          {
+            name: 'ETag',
+            value: 'W/"11-WKzg6oYof0o8Mliwrz5pkw"',
+          },
+          {
+            name: 'Duplicate',
+            value: 'foo',
+          },
+          {
+            name: 'Duplicate',
+            value: 'bar',
+          },
+          {
+            name: 'Date',
+            value: 'Mon, 13 Nov 2017 22:06:28 GMT',
+          },
+          {
+            name: 'Foo',
+            value: '',
+          },
         ],
       },
     ]);
@@ -802,15 +903,42 @@ describe('_parseHeaders', () => {
         version: 'HTTP/1.1',
         reason: 'Moved Permanently',
         headers: [
-          { name: 'X-Powered-By', value: 'Express' },
-          { name: 'location', value: 'http://localhost:3000/' },
-          { name: 'Content-Type', value: 'text/plain; charset=utf-8' },
-          { name: 'Content-Length', value: '17' },
-          { name: 'ETag', value: 'W/"11-WKzg6oYof0o8Mliwrz5pkw"' },
-          { name: 'Duplicate', value: 'foo' },
-          { name: 'Duplicate', value: 'bar' },
-          { name: 'Date', value: 'Mon, 13 Nov 2017 22:06:28 GMT' },
-          { name: 'Foo', value: '' },
+          {
+            name: 'X-Powered-By',
+            value: 'Express',
+          },
+          {
+            name: 'location',
+            value: 'http://localhost:3000/',
+          },
+          {
+            name: 'Content-Type',
+            value: 'text/plain; charset=utf-8',
+          },
+          {
+            name: 'Content-Length',
+            value: '17',
+          },
+          {
+            name: 'ETag',
+            value: 'W/"11-WKzg6oYof0o8Mliwrz5pkw"',
+          },
+          {
+            name: 'Duplicate',
+            value: 'foo',
+          },
+          {
+            name: 'Duplicate',
+            value: 'bar',
+          },
+          {
+            name: 'Date',
+            value: 'Mon, 13 Nov 2017 22:06:28 GMT',
+          },
+          {
+            name: 'Foo',
+            value: '',
+          },
         ],
       },
       {
diff --git a/packages/insomnia-app/app/network/__tests__/url-matches-cert-host.test.js b/packages/insomnia-app/app/network/__tests__/url-matches-cert-host.test.ts
similarity index 99%
rename from packages/insomnia-app/app/network/__tests__/url-matches-cert-host.test.js
rename to packages/insomnia-app/app/network/__tests__/url-matches-cert-host.test.ts
index 6a2e43c566..ac9f5b3884 100644
--- a/packages/insomnia-app/app/network/__tests__/url-matches-cert-host.test.js
+++ b/packages/insomnia-app/app/network/__tests__/url-matches-cert-host.test.ts
@@ -5,6 +5,7 @@ describe('urlMatchesCertHost', () => {
   beforeEach(globalBeforeEach);
   describe('when the certificate host has no wildcard', () => {
     beforeEach(globalBeforeEach);
+
     it('should return false if the requested host does not match the certificate host', () => {
       const requestUrl = 'https://www.example.org';
       const certificateHost = 'https://www.example.com';
@@ -56,6 +57,7 @@ describe('urlMatchesCertHost', () => {
 
   describe('when using wildcard certificate hosts', () => {
     beforeEach(globalBeforeEach);
+
     it('should return true if the certificate host is only a wildcard', () => {
       const requestUrl = 'https://www.example.org/some/resources?query=1';
       const certificateHost = '*';
@@ -131,6 +133,7 @@ describe('urlMatchesCertHost', () => {
 
   describe('when an invalid certificate host is supplied', () => {
     beforeEach(globalBeforeEach);
+
     it('should return false if the certificate host contains invalid characters', () => {
       const requestUrl = 'https://www.example.org/some/resources?query=1';
       const certificateHost = 'https://example!.org';
diff --git a/packages/insomnia-app/app/network/authentication.js b/packages/insomnia-app/app/network/authentication.ts
similarity index 88%
rename from packages/insomnia-app/app/network/authentication.js
rename to packages/insomnia-app/app/network/authentication.ts
index 10b0bc39bf..f3c79c1eee 100644
--- a/packages/insomnia-app/app/network/authentication.js
+++ b/packages/insomnia-app/app/network/authentication.ts
@@ -1,4 +1,3 @@
-// @flow
 import {
   AUTH_ASAP,
   AUTH_BASIC,
@@ -15,15 +14,12 @@ import type { RenderedRequest } from '../common/render';
 import { getBasicAuthHeader } from './basic-auth/get-header';
 import { getBearerAuthHeader } from './bearer-auth/get-header';
 
-type Header = {
-  name: string,
-  value: string,
-};
+interface Header {
+  name: string;
+  value: string;
+}
 
-export async function getAuthHeader(
-  renderedRequest: RenderedRequest,
-  url: string,
-): Promise<Header | null> {
+export async function getAuthHeader(renderedRequest: RenderedRequest, url: string) {
   const { method, authentication, body } = renderedRequest;
   const requestId = renderedRequest._id;
 
@@ -48,8 +44,8 @@ export async function getAuthHeader(
     // pretending we are fetching a token for the original request. This makes sure
     // the same tokens are used for schema fetching. See issue #835 on GitHub.
     const tokenId = requestId.match(/\.graphql$/) ? requestId.replace(/\.graphql$/, '') : requestId;
-
     const oAuth2Token = await getOAuth2Token(tokenId, authentication);
+
     if (oAuth2Token) {
       const token = oAuth2Token.accessToken;
       return _buildBearerHeader(token, authentication.tokenPrefix);
@@ -60,6 +56,7 @@ export async function getAuthHeader(
 
   if (authentication.type === AUTH_OAUTH_1) {
     const oAuth1Token = await getOAuth1Token(url, method, authentication, body);
+
     if (oAuth1Token) {
       return {
         name: 'Authorization',
@@ -73,7 +70,11 @@ export async function getAuthHeader(
   if (authentication.type === AUTH_HAWK) {
     const { id, key, algorithm, ext, validatePayload } = authentication;
     let headerOptions = {
-      credentials: { id, key, algorithm },
+      credentials: {
+        id,
+        key,
+        algorithm,
+      },
       ext: ext,
     };
 
@@ -88,16 +89,19 @@ export async function getAuthHeader(
     const header = Hawk.client.header(url, method, headerOptions);
     return {
       name: 'Authorization',
+      // @ts-expect-error -- TSCONVERSION need to update hawk, types only exist for the latest version (v9) and we need those types in order to successfully build
       value: header.field,
     };
   }
 
   if (authentication.type === AUTH_ASAP) {
     const { issuer, subject, audience, keyId, additionalClaims, privateKey } = authentication;
-
     const generator = jwtAuthentication.client.create();
-    let claims = { iss: issuer, sub: subject, aud: audience };
-
+    let claims = {
+      iss: issuer,
+      sub: subject,
+      aud: audience,
+    };
     let parsedAdditionalClaims;
 
     try {
@@ -120,8 +124,7 @@ export async function getAuthHeader(
       privateKey,
       kid: keyId,
     };
-
-    return new Promise((resolve, reject) => {
+    return new Promise<Header>((resolve, reject) => {
       generator.generateAuthorizationHeader(claims, options, (error, headerValue) => {
         if (error) {
           reject(error);
diff --git a/packages/insomnia-app/app/network/axios-request.js b/packages/insomnia-app/app/network/axios-request.ts
similarity index 72%
rename from packages/insomnia-app/app/network/axios-request.js
rename to packages/insomnia-app/app/network/axios-request.ts
index 41823c2f56..2b9d3d8cf7 100644
--- a/packages/insomnia-app/app/network/axios-request.js
+++ b/packages/insomnia-app/app/network/axios-request.ts
@@ -7,28 +7,31 @@ import { isDevelopment } from '../common/constants';
 export async function axiosRequest(config) {
   const settings = await models.settings.getOrCreate();
   const isHttps = config.url.indexOf('https:') === 0;
+  let proxyUrl: string | null = null;
 
-  let proxyUrl = null;
   if (isHttps && settings.httpsProxy) {
     proxyUrl = settings.httpsProxy;
   } else if (settings.httpProxy) {
     proxyUrl = settings.httpProxy;
   }
 
-  const finalConfig = {
-    ...config,
-    adapter: global.require('axios/lib/adapters/http'),
-  };
+  const finalConfig = { ...config, adapter: global.require('axios/lib/adapters/http') };
 
   if (proxyUrl) {
     const { hostname, port } = urlParse(setDefaultProtocol(proxyUrl));
-    finalConfig.proxy = { host: hostname, port };
+    finalConfig.proxy = {
+      host: hostname,
+      port,
+    };
   }
 
   const response = await axios(finalConfig);
 
   if (isDevelopment()) {
-    console.log('[axios] Response', { config, response });
+    console.log('[axios] Response', {
+      config,
+      response,
+    });
   }
 
   return response;
diff --git a/packages/insomnia-app/app/network/basic-auth/__tests__/get-header.test.js b/packages/insomnia-app/app/network/basic-auth/__tests__/get-header.test.ts
similarity index 99%
rename from packages/insomnia-app/app/network/basic-auth/__tests__/get-header.test.js
rename to packages/insomnia-app/app/network/basic-auth/__tests__/get-header.test.ts
index f0f71e2dbe..3cc5678088 100644
--- a/packages/insomnia-app/app/network/basic-auth/__tests__/get-header.test.js
+++ b/packages/insomnia-app/app/network/basic-auth/__tests__/get-header.test.ts
@@ -3,6 +3,7 @@ import { getBasicAuthHeader } from '../get-header';
 
 describe('getBasicAuthHeader()', () => {
   beforeEach(globalBeforeEach);
+
   it('succeed with username and password', () => {
     const header = getBasicAuthHeader('user', 'password');
     expect(header).toEqual({
diff --git a/packages/insomnia-app/app/network/basic-auth/get-header.js b/packages/insomnia-app/app/network/basic-auth/get-header.ts
similarity index 55%
rename from packages/insomnia-app/app/network/basic-auth/get-header.js
rename to packages/insomnia-app/app/network/basic-auth/get-header.ts
index 2165227573..4439aa96f9 100644
--- a/packages/insomnia-app/app/network/basic-auth/get-header.js
+++ b/packages/insomnia-app/app/network/basic-auth/get-header.ts
@@ -1,15 +1,18 @@
-// @flow
-
 import type { RequestHeader } from '../../models/request';
 
 export function getBasicAuthHeader(
-  username: ?string,
-  password: ?string,
-  encoding: ?string = 'utf8',
-): RequestHeader {
+  username?: string | null,
+  password?: string | null,
+  encoding = 'utf8',
+) {
   const name = 'Authorization';
   const header = `${username || ''}:${password || ''}`;
+  // @ts-expect-error -- TSCONVERSION appears to be a genuine error
   const authString = Buffer.from(header, encoding).toString('base64');
   const value = `Basic ${authString}`;
-  return { name, value };
+  const requestHeader: RequestHeader = {
+    name,
+    value,
+  };
+  return requestHeader;
 }
diff --git a/packages/insomnia-app/app/network/bearer-auth/get-header.js b/packages/insomnia-app/app/network/bearer-auth/get-header.ts
similarity index 68%
rename from packages/insomnia-app/app/network/bearer-auth/get-header.js
rename to packages/insomnia-app/app/network/bearer-auth/get-header.ts
index 2f111f5da4..a39cb945ca 100644
--- a/packages/insomnia-app/app/network/bearer-auth/get-header.js
+++ b/packages/insomnia-app/app/network/bearer-auth/get-header.ts
@@ -1,8 +1,11 @@
-// @flow
 import type { RequestHeader } from '../../models/request';
 
-export function getBearerAuthHeader(token: string, prefix: string): RequestHeader {
+export function getBearerAuthHeader(token: string, prefix: string) {
   const name = 'Authorization';
   const value = `${prefix || 'Bearer'} ${token}`;
-  return { name, value };
+  const requestHeader: RequestHeader = {
+    name,
+    value,
+  };
+  return requestHeader;
 }
diff --git a/packages/insomnia-app/app/network/ca-certs.js b/packages/insomnia-app/app/network/ca-certs.js
index 8e74ce2489..d9b6197831 100644
--- a/packages/insomnia-app/app/network/ca-certs.js
+++ b/packages/insomnia-app/app/network/ca-certs.js
@@ -1,6 +1,7 @@
+// NOTE: this file is used by the `val-loader` webpack loader to export the NodeJS trust store during compile time.
+// Do not convert it to TypeScript.  It's a native node module by design.
 const tls = require('tls');
 
-// Used by val-loader to export the NodeJS trust store during compile time
 module.exports = () => {
   return {
     code: 'module.exports = `' + tls.rootCertificates.join('\n') + '`',
diff --git a/packages/insomnia-app/app/network/certificate-url-parse.js b/packages/insomnia-app/app/network/certificate-url-parse.ts
similarity index 90%
rename from packages/insomnia-app/app/network/certificate-url-parse.js
rename to packages/insomnia-app/app/network/certificate-url-parse.ts
index 4da7584ed7..d102bff2db 100644
--- a/packages/insomnia-app/app/network/certificate-url-parse.js
+++ b/packages/insomnia-app/app/network/certificate-url-parse.ts
@@ -1,9 +1,7 @@
 import { parse as urlParse } from 'url';
 
 const WILDCARD_CHARACTER = '*';
-const WILDCARD_SUBSTITUTION = Math.random()
-  .toString()
-  .split('.')[1];
+const WILDCARD_SUBSTITUTION = Math.random().toString().split('.')[1];
 const WILDCARD_SUBSTITUTION_PATTERN = new RegExp(`${WILDCARD_SUBSTITUTION}`, 'g');
 
 export default function certificateUrlParse(url) {
@@ -15,7 +13,6 @@ export default function certificateUrlParse(url) {
     parsed.host = _reinstateWildcards(parsed.host);
     parsed.href = _reinstateWildcards(parsed.href);
     parsed.port = _reinstateWildcards(parsed.port);
-
     return parsed;
   }
 }
diff --git a/packages/insomnia-app/app/network/grpc/__mocks__/index.js b/packages/insomnia-app/app/network/grpc/__mocks__/index.js
deleted file mode 100644
index 789d67e36a..0000000000
--- a/packages/insomnia-app/app/network/grpc/__mocks__/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
-  start: jest.fn(),
-  sendMessage: jest.fn(),
-  commit: jest.fn(),
-  cancel: jest.fn(),
-  cancelMultiple: jest.fn(),
-};
diff --git a/packages/insomnia-app/app/network/grpc/__mocks__/index.ts b/packages/insomnia-app/app/network/grpc/__mocks__/index.ts
new file mode 100644
index 0000000000..2f5f88df4d
--- /dev/null
+++ b/packages/insomnia-app/app/network/grpc/__mocks__/index.ts
@@ -0,0 +1,7 @@
+module.exports = {
+    start: jest.fn(),
+    sendMessage: jest.fn(),
+    commit: jest.fn(),
+    cancel: jest.fn(),
+    cancelMultiple: jest.fn(),
+  };
diff --git a/packages/insomnia-app/app/network/grpc/__schemas__/grpc-ipc-message-params-schema.js b/packages/insomnia-app/app/network/grpc/__schemas__/grpc-ipc-message-params-schema.ts
similarity index 84%
rename from packages/insomnia-app/app/network/grpc/__schemas__/grpc-ipc-message-params-schema.js
rename to packages/insomnia-app/app/network/grpc/__schemas__/grpc-ipc-message-params-schema.ts
index 8e98724e30..d3cecb75e2 100644
--- a/packages/insomnia-app/app/network/grpc/__schemas__/grpc-ipc-message-params-schema.js
+++ b/packages/insomnia-app/app/network/grpc/__schemas__/grpc-ipc-message-params-schema.ts
@@ -1,8 +1,9 @@
-// @flow
 import type { Schema } from '@develohpanda/fluent-builder';
 import type { GrpcIpcMessageParams } from '../prepare';
 
 export const grpcIpcMessageParamsSchema: Schema<GrpcIpcMessageParams> = {
   requestId: () => 'gr',
-  body: () => ({ text: '{}' }),
+  body: () => ({
+    text: '{}',
+  }),
 };
diff --git a/packages/insomnia-app/app/network/grpc/__schemas__/grpc-ipc-request-params-schema.js b/packages/insomnia-app/app/network/grpc/__schemas__/grpc-ipc-request-params-schema.ts
similarity index 85%
rename from packages/insomnia-app/app/network/grpc/__schemas__/grpc-ipc-request-params-schema.js
rename to packages/insomnia-app/app/network/grpc/__schemas__/grpc-ipc-request-params-schema.ts
index 0d507a61d0..13b35e3046 100644
--- a/packages/insomnia-app/app/network/grpc/__schemas__/grpc-ipc-request-params-schema.js
+++ b/packages/insomnia-app/app/network/grpc/__schemas__/grpc-ipc-request-params-schema.ts
@@ -1,7 +1,7 @@
-// @flow
 import type { Schema } from '@develohpanda/fluent-builder';
 import type { GrpcIpcRequestParams } from '../prepare';
 
 export const grpcIpcRequestParamsSchema: Schema<GrpcIpcRequestParams> = {
+  // @ts-expect-error -- TSCONVERSION
   request: () => ({}),
 };
diff --git a/packages/insomnia-app/app/network/grpc/__tests__/call-cache.test.js b/packages/insomnia-app/app/network/grpc/__tests__/call-cache.test.ts
similarity index 76%
rename from packages/insomnia-app/app/network/grpc/__tests__/call-cache.test.js
rename to packages/insomnia-app/app/network/grpc/__tests__/call-cache.test.ts
index 4a93972aa8..5f6e5c6bc8 100644
--- a/packages/insomnia-app/app/network/grpc/__tests__/call-cache.test.js
+++ b/packages/insomnia-app/app/network/grpc/__tests__/call-cache.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import callCache from '../call-cache';
 
 describe('call-cache', () => {
@@ -8,36 +6,38 @@ describe('call-cache', () => {
   it('should set, get and update a call in the cache', () => {
     const id1 = 'abc';
     const id2 = 'def';
-    const val1 = { a: true };
-    const val2 = { b: false };
-
+    const val1 = {
+      a: true,
+    };
+    const val2 = {
+      b: false,
+    };
     callCache.set(id1, val1);
     callCache.set(id2, val2);
-
     expect(callCache.get(id1)).toBe(val1);
     expect(callCache.get(id2)).toBe(val2);
-
-    const updatedVal1 = { b: false };
+    const updatedVal1 = {
+      b: false,
+    };
     callCache.set(id1, updatedVal1);
     expect(callCache.get(id1)).toBe(updatedVal1);
   });
 
   it('should log to console if id not found', () => {
     const consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
-
     const call = callCache.get('abc');
-
-    expect(consoleLogSpy).toHaveBeenCalledWith(`[gRPC] client call for req=abc not found`);
+    expect(consoleLogSpy).toHaveBeenCalledWith('[gRPC] client call for req=abc not found');
     expect(call).toBe(undefined);
   });
 
   it('should reset', () => {
     const id1 = 'abc';
     const id2 = 'abc';
-    const val = { a: true };
+    const val = {
+      a: true,
+    };
     callCache.set(id1, val);
     callCache.set(id2, val);
-
     expect(callCache.get(id1)).toBe(val);
     expect(callCache.get(id2)).toBe(val);
     callCache.reset();
@@ -47,28 +47,31 @@ describe('call-cache', () => {
 
   it('should clear and close channel', () => {
     const id = 'abc';
-    const channel = { close: jest.fn() };
-    const call = { call: { call: { channel } } };
-
+    const channel = {
+      close: jest.fn(),
+    };
+    const call = {
+      call: {
+        call: {
+          channel,
+        },
+      },
+    };
     callCache.set(id, call);
     callCache.clear(id);
-
     expect(callCache.get(id)).toBe(undefined);
     expect(channel.close).toHaveBeenCalledTimes(1);
   });
 
   it('should clear and log to console if channel not found', () => {
     const consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
-
     const id = 'abc';
     const call = {};
-
     callCache.set(id, call);
     callCache.clear(id);
-
     expect(callCache.get(id)).toBe(undefined);
     expect(consoleLogSpy).toHaveBeenCalledWith(
-      `[gRPC] failed to close channel for req=abc because it was not found`,
+      '[gRPC] failed to close channel for req=abc because it was not found',
     );
   });
 });
diff --git a/packages/insomnia-app/app/network/grpc/__tests__/index.test.js b/packages/insomnia-app/app/network/grpc/__tests__/index.test.ts
similarity index 77%
rename from packages/insomnia-app/app/network/grpc/__tests__/index.test.js
rename to packages/insomnia-app/app/network/grpc/__tests__/index.test.ts
index b278c69fa7..19be9918a0 100644
--- a/packages/insomnia-app/app/network/grpc/__tests__/index.test.js
+++ b/packages/insomnia-app/app/network/grpc/__tests__/index.test.ts
@@ -1,20 +1,16 @@
-// @flow
-
 import * as grpc from '../index';
 import * as protoLoader from '../proto-loader';
 import { createBuilder } from '@develohpanda/fluent-builder';
 import { grpcIpcRequestParamsSchema } from '../__schemas__/grpc-ipc-request-params-schema';
 import { grpcIpcMessageParamsSchema } from '../__schemas__/grpc-ipc-message-params-schema';
-
 import { ResponseCallbacks as ResponseCallbacksMock } from '../response-callbacks';
 import { grpcMethodDefinitionSchema } from '../../../ui/context/grpc/__schemas__';
 import { globalBeforeEach } from '../../../__jest__/before-each';
 import { grpcMocks } from '../../../__mocks__/@grpc/grpc-js';
 import callCache from '../call-cache';
-import { GrpcStatusEnum } from '../service-error';
+import * as grpcJs from '@grpc/grpc-js';
 
 jest.mock('../response-callbacks');
-
 jest.mock('../proto-loader');
 jest.mock('@grpc/grpc-js');
 
@@ -40,12 +36,15 @@ describe('grpc', () => {
 
     it('should exit if method not found', async () => {
       // Arrange
-      const params = requestParamsBuilder.request({ _id: 'id', protoMethodName: 'SayHi' }).build();
+      const params = requestParamsBuilder
+        .request({
+          _id: 'id',
+          protoMethodName: 'SayHi',
+        })
+        .build();
       protoLoader.getSelectedMethod.mockResolvedValue(null);
-
       // Act
       await grpc.start(params, respond);
-
       // Assert
       expect(respond.sendStart).not.toHaveBeenCalled();
       expect(respond.sendError).toHaveBeenCalledWith(
@@ -56,38 +55,40 @@ describe('grpc', () => {
 
     it('should exit if no url is specified', async () => {
       // Arrange
-      const params = requestParamsBuilder.request({ _id: 'id', url: '' }).build();
+      const params = requestParamsBuilder
+        .request({
+          _id: 'id',
+          url: '',
+        })
+        .build();
       protoLoader.getSelectedMethod.mockResolvedValue(methodBuilder.build());
-
       // Act
       await grpc.start(params, respond);
-
       // Assert
       expect(respond.sendStart).not.toHaveBeenCalled();
       expect(respond.sendError).toHaveBeenCalledWith(
         params.request._id,
-        new Error(`URL not specified`),
+        new Error('URL not specified'),
       );
     });
 
     it('should make a client', async () => {
       // Arrange
-      const params = requestParamsBuilder.request({ _id: 'id', url: 'grpcb.in:9000' }).build();
-      const bidiMethod = methodBuilder
-        .requestStream(true)
-        .responseStream(true)
+      const params = requestParamsBuilder
+        .request({
+          _id: 'id',
+          url: 'grpcb.in:9000',
+        })
         .build();
+      const bidiMethod = methodBuilder.requestStream(true).responseStream(true).build();
       protoLoader.getSelectedMethod.mockResolvedValue(bidiMethod);
-
       // Act
       await grpc.start(params, respond);
-
       // Assert
       expect(grpcMocks.mockConstructor).toHaveBeenCalledTimes(1);
       expect(grpcMocks.mockConstructor.mock.calls[0][0]).toBe('grpcb.in:9000');
       expect(grpcMocks.mockCreateInsecure).toHaveBeenCalled();
       expect(grpcMocks.mockCreateSsl).not.toHaveBeenCalled();
-
       // Cleanup / End the stream
       grpcMocks.getMockCall().emit('end');
     });
@@ -95,45 +96,44 @@ describe('grpc', () => {
     it('should make a secure client', async () => {
       // Arrange
       const params = requestParamsBuilder
-        .request({ _id: 'id', url: 'grpcs://grpcb.in:9000' })
-        .build();
-      const bidiMethod = methodBuilder
-        .requestStream(true)
-        .responseStream(true)
+        .request({
+          _id: 'id',
+          url: 'grpcs://grpcb.in:9000',
+        })
         .build();
+      const bidiMethod = methodBuilder.requestStream(true).responseStream(true).build();
       protoLoader.getSelectedMethod.mockResolvedValue(bidiMethod);
-
       // Act
       await grpc.start(params, respond);
-
       // Assert
       expect(grpcMocks.mockConstructor).toHaveBeenCalledTimes(1);
       expect(grpcMocks.mockConstructor.mock.calls[0][0]).toBe('grpcb.in:9000');
       expect(grpcMocks.mockCreateInsecure).not.toHaveBeenCalled();
       expect(grpcMocks.mockCreateSsl).toHaveBeenCalled();
-
       // Cleanup / End the stream
       grpcMocks.getMockCall().emit('end');
     });
 
     it('should attach status listener', async () => {
       // Arrange
-      const params = requestParamsBuilder.request({ _id: 'id', url: 'grpcb.in:9000' }).build();
-      const bidiMethod = methodBuilder
-        .requestStream(true)
-        .responseStream(true)
+      const params = requestParamsBuilder
+        .request({
+          _id: 'id',
+          url: 'grpcb.in:9000',
+        })
         .build();
+      const bidiMethod = methodBuilder.requestStream(true).responseStream(true).build();
       protoLoader.getSelectedMethod.mockResolvedValue(bidiMethod);
-
       // Act
       await grpc.start(params, respond);
       // Emit stats
-      const status = { code: GrpcStatusEnum.OK, details: 'OK' };
+      const status = {
+        code: grpcJs.status.OK,
+        details: 'OK',
+      };
       grpcMocks.getMockCall().emit('status', status);
-
       // Assert
       expect(respond.sendStatus).toHaveBeenCalledWith(params.request._id, status);
-
       // Cleanup / End the stream
       grpcMocks.getMockCall().emit('end');
     });
@@ -142,17 +142,18 @@ describe('grpc', () => {
       it('should make no request if invalid body', async () => {
         // Arrange
         const params = requestParamsBuilder
-          .request({ _id: 'id', url: 'grpcb.in:9000', body: { text: undefined } })
-          .build();
-        const unaryMethod = methodBuilder
-          .requestStream(false)
-          .responseStream(false)
+          .request({
+            _id: 'id',
+            url: 'grpcb.in:9000',
+            body: {
+              text: undefined,
+            },
+          })
           .build();
+        const unaryMethod = methodBuilder.requestStream(false).responseStream(false).build();
         protoLoader.getSelectedMethod.mockResolvedValue(unaryMethod);
-
         // Act
         await grpc.start(params, respond);
-
         // Assert
         expect(respond.sendStart).not.toHaveBeenCalled();
         expect(respond.sendError).toHaveBeenCalledWith(
@@ -165,17 +166,18 @@ describe('grpc', () => {
       it('should make unary request with error response', async () => {
         // Arrange
         const params = requestParamsBuilder
-          .request({ _id: 'id', url: 'grpcb.in:9000', body: { text: '{}' } })
-          .build();
-        const unaryMethod = methodBuilder
-          .requestStream(false)
-          .responseStream(false)
+          .request({
+            _id: 'id',
+            url: 'grpcb.in:9000',
+            body: {
+              text: '{}',
+            },
+          })
           .build();
+        const unaryMethod = methodBuilder.requestStream(false).responseStream(false).build();
         protoLoader.getSelectedMethod.mockResolvedValue(unaryMethod);
-
         // Act
         await grpc.start(params, respond);
-
         // Assert
         expect(respond.sendStart).toHaveBeenCalledWith(params.request._id);
         expect(grpcMocks.mockMakeUnaryRequest).toHaveBeenLastCalledWith(
@@ -185,12 +187,12 @@ describe('grpc', () => {
           {},
           expect.anything(),
         );
-
         // Trigger response
-        const err = { code: GrpcStatusEnum.DATA_LOSS };
+        const err = {
+          code: grpcJs.status.DATA_LOSS,
+        };
         const val = undefined;
         grpcMocks.mockMakeUnaryRequest.mock.calls[0][4](err, val);
-
         // Assert
         expect(respond.sendData).not.toHaveBeenCalled();
         expect(respond.sendError).toHaveBeenCalledWith(params.request._id, err);
@@ -200,17 +202,18 @@ describe('grpc', () => {
       it('should make unary request with valid response', async () => {
         // Arrange
         const params = requestParamsBuilder
-          .request({ _id: 'id', url: 'grpcb.in:9000', body: { text: '{}' } })
-          .build();
-        const unaryMethod = methodBuilder
-          .requestStream(false)
-          .responseStream(false)
+          .request({
+            _id: 'id',
+            url: 'grpcb.in:9000',
+            body: {
+              text: '{}',
+            },
+          })
           .build();
+        const unaryMethod = methodBuilder.requestStream(false).responseStream(false).build();
         protoLoader.getSelectedMethod.mockResolvedValue(unaryMethod);
-
         // Act
         await grpc.start(params, respond);
-
         // Assert
         expect(respond.sendStart).toHaveBeenCalledWith(params.request._id);
         expect(grpcMocks.mockMakeUnaryRequest).toHaveBeenLastCalledWith(
@@ -220,12 +223,12 @@ describe('grpc', () => {
           {},
           expect.anything(),
         );
-
         // Trigger response
         const err = undefined;
-        const val = { foo: 'bar' };
+        const val = {
+          foo: 'bar',
+        };
         grpcMocks.mockMakeUnaryRequest.mock.calls[0][4](err, val);
-
         // Assert
         expect(respond.sendError).not.toHaveBeenCalled();
         expect(respond.sendData).toHaveBeenCalledWith(params.request._id, val);
@@ -237,17 +240,18 @@ describe('grpc', () => {
       it('should make no request if invalid body', async () => {
         // Arrange
         const params = requestParamsBuilder
-          .request({ _id: 'id', url: 'grpcb.in:9000', body: { text: undefined } })
-          .build();
-        const serverMethod = methodBuilder
-          .requestStream(false)
-          .responseStream(true)
+          .request({
+            _id: 'id',
+            url: 'grpcb.in:9000',
+            body: {
+              text: undefined,
+            },
+          })
           .build();
+        const serverMethod = methodBuilder.requestStream(false).responseStream(true).build();
         protoLoader.getSelectedMethod.mockResolvedValue(serverMethod);
-
         // Act
         await grpc.start(params, respond);
-
         // Assert
         expect(respond.sendStart).not.toHaveBeenCalled();
         expect(respond.sendError).toHaveBeenCalledWith(
@@ -260,17 +264,18 @@ describe('grpc', () => {
       it('should make server streaming request with valid and error response', async () => {
         // Arrange
         const params = requestParamsBuilder
-          .request({ _id: 'id', url: 'grpcb.in:9000', body: { text: '{}' } })
-          .build();
-        const serverMethod = methodBuilder
-          .requestStream(false)
-          .responseStream(true)
+          .request({
+            _id: 'id',
+            url: 'grpcb.in:9000',
+            body: {
+              text: '{}',
+            },
+          })
           .build();
+        const serverMethod = methodBuilder.requestStream(false).responseStream(true).build();
         protoLoader.getSelectedMethod.mockResolvedValue(serverMethod);
-
         // Act
         await grpc.start(params, respond);
-
         // Assert
         expect(respond.sendStart).toHaveBeenCalledWith(params.request._id);
         expect(grpcMocks.mockMakeServerStreamRequest).toHaveBeenLastCalledWith(
@@ -279,17 +284,18 @@ describe('grpc', () => {
           serverMethod.responseDeserialize,
           {},
         );
-
         // Trigger valid response
-        const val = { foo: 'bar' };
+        const val = {
+          foo: 'bar',
+        };
         grpcMocks.getMockCall().emit('data', val);
         grpcMocks.getMockCall().emit('data', val);
-
         // Trigger error response
-        const err = { code: GrpcStatusEnum.DATA_LOSS };
+        const err = {
+          code: grpcJs.status.DATA_LOSS,
+        };
         grpcMocks.getMockCall().emit('error', err);
         grpcMocks.getMockCall().emit('end');
-
         // Assert
         expect(respond.sendData).toHaveBeenNthCalledWith(1, params.request._id, val);
         expect(respond.sendData).toHaveBeenNthCalledWith(2, params.request._id, val);
@@ -301,16 +307,16 @@ describe('grpc', () => {
     describe('client streaming', () => {
       it('should make client streaming request with error response', async () => {
         // Arrange
-        const params = requestParamsBuilder.request({ _id: 'id', url: 'grpcb.in:9000' }).build();
-        const clientMethod = methodBuilder
-          .requestStream(true)
-          .responseStream(false)
+        const params = requestParamsBuilder
+          .request({
+            _id: 'id',
+            url: 'grpcb.in:9000',
+          })
           .build();
+        const clientMethod = methodBuilder.requestStream(true).responseStream(false).build();
         protoLoader.getSelectedMethod.mockResolvedValue(clientMethod);
-
         // Act
         await grpc.start(params, respond);
-
         // Assert
         expect(respond.sendStart).toHaveBeenCalledWith(params.request._id);
         expect(grpcMocks.mockMakeClientStreamRequest).toHaveBeenLastCalledWith(
@@ -319,12 +325,12 @@ describe('grpc', () => {
           clientMethod.responseDeserialize,
           expect.anything(),
         );
-
         // Trigger response
-        const err = { code: GrpcStatusEnum.DATA_LOSS };
+        const err = {
+          code: grpcJs.status.DATA_LOSS,
+        };
         const val = undefined;
         grpcMocks.mockMakeClientStreamRequest.mock.calls[0][3](err, val);
-
         // Assert
         expect(respond.sendData).not.toHaveBeenCalled();
         expect(respond.sendError).toHaveBeenCalledWith(params.request._id, err);
@@ -333,16 +339,16 @@ describe('grpc', () => {
 
       it('should make client streaming request with valid response', async () => {
         // Arrange
-        const params = requestParamsBuilder.request({ _id: 'id', url: 'grpcb.in:9000' }).build();
-        const clientMethod = methodBuilder
-          .requestStream(true)
-          .responseStream(false)
+        const params = requestParamsBuilder
+          .request({
+            _id: 'id',
+            url: 'grpcb.in:9000',
+          })
           .build();
+        const clientMethod = methodBuilder.requestStream(true).responseStream(false).build();
         protoLoader.getSelectedMethod.mockResolvedValue(clientMethod);
-
         // Act
         await grpc.start(params, respond);
-
         // Assert
         expect(respond.sendStart).toHaveBeenCalledWith(params.request._id);
         expect(grpcMocks.mockMakeClientStreamRequest).toHaveBeenLastCalledWith(
@@ -351,12 +357,12 @@ describe('grpc', () => {
           clientMethod.responseDeserialize,
           expect.anything(),
         );
-
         // Trigger response
         const err = undefined;
-        const val = { foo: 'bar' };
+        const val = {
+          foo: 'bar',
+        };
         grpcMocks.mockMakeClientStreamRequest.mock.calls[0][3](err, val);
-
         // Assert
         expect(respond.sendError).not.toHaveBeenCalled();
         expect(respond.sendData).toHaveBeenCalledWith(params.request._id, val);
@@ -367,16 +373,16 @@ describe('grpc', () => {
     describe('bidi streaming', () => {
       it('should make bidi streaming request with valid and error response', async () => {
         // Arrange
-        const params = requestParamsBuilder.request({ _id: 'id', url: 'grpcb.in:9000' }).build();
-        const bidiMethod = methodBuilder
-          .requestStream(true)
-          .responseStream(true)
+        const params = requestParamsBuilder
+          .request({
+            _id: 'id',
+            url: 'grpcb.in:9000',
+          })
           .build();
+        const bidiMethod = methodBuilder.requestStream(true).responseStream(true).build();
         protoLoader.getSelectedMethod.mockResolvedValue(bidiMethod);
-
         // Act
         await grpc.start(params, respond);
-
         // Assert
         expect(respond.sendStart).toHaveBeenCalledWith(params.request._id);
         expect(grpcMocks.mockMakeBidiStreamRequest).toHaveBeenLastCalledWith(
@@ -384,17 +390,18 @@ describe('grpc', () => {
           bidiMethod.requestSerialize,
           bidiMethod.responseDeserialize,
         );
-
         // Trigger valid response
-        const val = { foo: 'bar' };
+        const val = {
+          foo: 'bar',
+        };
         grpcMocks.getMockCall().emit('data', val);
         grpcMocks.getMockCall().emit('data', val);
-
         // Trigger error response
-        const err = { code: GrpcStatusEnum.DATA_LOSS };
+        const err = {
+          code: grpcJs.status.DATA_LOSS,
+        };
         grpcMocks.getMockCall().emit('error', err);
         grpcMocks.getMockCall().emit('end');
-
         // Assert
         expect(respond.sendData).toHaveBeenNthCalledWith(1, params.request._id, val);
         expect(respond.sendData).toHaveBeenNthCalledWith(2, params.request._id, val);
@@ -406,11 +413,13 @@ describe('grpc', () => {
 
   describe('grpc.sendMessage', () => {
     const _makeClient = async () => {
-      const params = requestParamsBuilder.request({ _id: 'id', url: 'grpcb.in:9000' }).build();
-      const clientMethod = methodBuilder
-        .requestStream(true)
-        .responseStream(false)
+      const params = requestParamsBuilder
+        .request({
+          _id: 'id',
+          url: 'grpcb.in:9000',
+        })
         .build();
+      const clientMethod = methodBuilder.requestStream(true).responseStream(false).build();
       protoLoader.getSelectedMethod.mockResolvedValue(clientMethod);
       await grpc.start(params, respond);
       return params;
@@ -420,13 +429,13 @@ describe('grpc', () => {
       // Arrange
       const reqParams = await _makeClient();
       const msgParams = messageParamsBuilder
-        .body({ text: undefined })
+        .body({
+          text: undefined,
+        })
         .requestId(reqParams.request._id)
         .build();
-
       // Act
       grpc.sendMessage(msgParams, respond);
-
       // Assert
       expect(respond.sendError).toHaveBeenCalledWith(
         msgParams.requestId,
@@ -438,10 +447,8 @@ describe('grpc', () => {
       // Arrange
       const reqParams = await _makeClient();
       const msgParams = messageParamsBuilder.requestId(reqParams.request._id).build();
-
       // Act
       grpc.sendMessage(msgParams, respond);
-
       setTimeout(() => {
         // Assert
         expect(respond.sendError).not.toHaveBeenCalled();
@@ -453,12 +460,9 @@ describe('grpc', () => {
       // Arrange
       const msgParams = messageParamsBuilder.build();
       const mockWrite = jest.fn();
-
       grpcMocks.getMockCall().on('write', mockWrite);
-
       // Act
       grpc.sendMessage(msgParams, respond);
-
       // Assert
       setTimeout(() => {
         // Assert
@@ -470,11 +474,13 @@ describe('grpc', () => {
 
   describe('grpc.commit', () => {
     const _makeClient = async () => {
-      const params = requestParamsBuilder.request({ _id: 'id', url: 'grpcb.in:9000' }).build();
-      const clientMethod = methodBuilder
-        .requestStream(true)
-        .responseStream(false)
+      const params = requestParamsBuilder
+        .request({
+          _id: 'id',
+          url: 'grpcb.in:9000',
+        })
         .build();
+      const clientMethod = methodBuilder.requestStream(true).responseStream(false).build();
       protoLoader.getSelectedMethod.mockResolvedValue(clientMethod);
       await grpc.start(params, respond);
       return params;
@@ -483,10 +489,8 @@ describe('grpc', () => {
     it('should commit', async () => {
       // Arrange
       const reqParams = await _makeClient();
-
       // Act
       grpc.commit(reqParams.request._id);
-
       // Assert
       expect(grpcMocks.mockCallEnd).toHaveBeenCalled();
     });
@@ -494,7 +498,6 @@ describe('grpc', () => {
     it('should not commit if a call is not found', () => {
       // Act
       grpc.commit('another id');
-
       // Assert
       expect(grpcMocks.mockCallEnd).not.toHaveBeenCalled();
     });
@@ -502,11 +505,13 @@ describe('grpc', () => {
 
   describe('grpc.cancel', () => {
     const _makeClient = async () => {
-      const params = requestParamsBuilder.request({ _id: 'id', url: 'grpcb.in:9000' }).build();
-      const clientMethod = methodBuilder
-        .requestStream(true)
-        .responseStream(false)
+      const params = requestParamsBuilder
+        .request({
+          _id: 'id',
+          url: 'grpcb.in:9000',
+        })
         .build();
+      const clientMethod = methodBuilder.requestStream(true).responseStream(false).build();
       protoLoader.getSelectedMethod.mockResolvedValue(clientMethod);
       await grpc.start(params, respond);
       return params;
@@ -515,10 +520,8 @@ describe('grpc', () => {
     it('should commit', async () => {
       // Arrange
       const reqParams = await _makeClient();
-
       // Act
       grpc.cancel(reqParams.request._id);
-
       // Assert
       expect(grpcMocks.mockCallCancel).toHaveBeenCalled();
     });
@@ -526,7 +529,6 @@ describe('grpc', () => {
     it('should not commit if a call is not found', () => {
       // Act
       grpc.cancel('another id');
-
       // Assert
       expect(grpcMocks.mockCallCancel).not.toHaveBeenCalled();
     });
diff --git a/packages/insomnia-app/app/network/grpc/__tests__/method.test.js b/packages/insomnia-app/app/network/grpc/__tests__/method.test.ts
similarity index 68%
rename from packages/insomnia-app/app/network/grpc/__tests__/method.test.js
rename to packages/insomnia-app/app/network/grpc/__tests__/method.test.ts
index c8888f389c..3a242b44e4 100644
--- a/packages/insomnia-app/app/network/grpc/__tests__/method.test.js
+++ b/packages/insomnia-app/app/network/grpc/__tests__/method.test.ts
@@ -1,31 +1,41 @@
-// @flow
-
 import { canClientStream, getMethodType, GrpcMethodTypeEnum, GrpcMethodTypeName } from '../method';
 import type { GrpcMethodType } from '../method';
 
 describe('getMethodType', () => {
   it('should return unary', () => {
-    expect(getMethodType({ requestStream: false, responseStream: false })).toBe(
-      GrpcMethodTypeEnum.unary,
-    );
+    expect(
+      getMethodType({
+        requestStream: false,
+        responseStream: false,
+      }),
+    ).toBe(GrpcMethodTypeEnum.unary);
   });
 
   it('should return server', () => {
-    expect(getMethodType({ requestStream: false, responseStream: true })).toBe(
-      GrpcMethodTypeEnum.server,
-    );
+    expect(
+      getMethodType({
+        requestStream: false,
+        responseStream: true,
+      }),
+    ).toBe(GrpcMethodTypeEnum.server);
   });
 
   it('should return client', () => {
-    expect(getMethodType({ requestStream: true, responseStream: false })).toBe(
-      GrpcMethodTypeEnum.client,
-    );
+    expect(
+      getMethodType({
+        requestStream: true,
+        responseStream: false,
+      }),
+    ).toBe(GrpcMethodTypeEnum.client);
   });
 
   it('should return bidi', () => {
-    expect(getMethodType({ requestStream: true, responseStream: true })).toBe(
-      GrpcMethodTypeEnum.bidi,
-    );
+    expect(
+      getMethodType({
+        requestStream: true,
+        responseStream: true,
+      }),
+    ).toBe(GrpcMethodTypeEnum.bidi);
   });
 });
 
diff --git a/packages/insomnia-app/app/network/grpc/__tests__/parse-grpc-url.test.js b/packages/insomnia-app/app/network/grpc/__tests__/parse-grpc-url.test.ts
similarity index 100%
rename from packages/insomnia-app/app/network/grpc/__tests__/parse-grpc-url.test.js
rename to packages/insomnia-app/app/network/grpc/__tests__/parse-grpc-url.test.ts
diff --git a/packages/insomnia-app/app/network/grpc/__tests__/prepare.test.js b/packages/insomnia-app/app/network/grpc/__tests__/prepare.test.ts
similarity index 72%
rename from packages/insomnia-app/app/network/grpc/__tests__/prepare.test.js
rename to packages/insomnia-app/app/network/grpc/__tests__/prepare.test.ts
index 87fbb4f4cc..cd91c5fd72 100644
--- a/packages/insomnia-app/app/network/grpc/__tests__/prepare.test.js
+++ b/packages/insomnia-app/app/network/grpc/__tests__/prepare.test.ts
@@ -17,12 +17,14 @@ describe('prepareGrpcRequest', () => {
     'should prepare grpc request with all properties: %s',
     async methodType => {
       const w = await models.workspace.create();
-      const env = await models.environment.create({ parentId: w._id });
-      const gr = await models.grpcRequest.create({ parentId: w._id });
+      const env = await models.environment.create({
+        parentId: w._id,
+      });
+      const gr = await models.grpcRequest.create({
+        parentId: w._id,
+      });
       getRenderedGrpcRequest.mockResolvedValue(gr);
-
       const result = await prepareGrpcRequest(gr._id, env._id, methodType);
-
       expect(getRenderedGrpcRequest).toHaveBeenLastCalledWith(
         gr,
         env,
@@ -30,8 +32,9 @@ describe('prepareGrpcRequest', () => {
         {},
         false,
       );
-
-      expect(result).toEqual({ request: gr });
+      expect(result).toEqual({
+        request: gr,
+      });
     },
   );
 
@@ -39,12 +42,14 @@ describe('prepareGrpcRequest', () => {
     'should prepare grpc request and ignore body: %s',
     async methodType => {
       const w = await models.workspace.create();
-      const env = await models.environment.create({ parentId: w._id });
-      const gr = await models.grpcRequest.create({ parentId: w._id });
+      const env = await models.environment.create({
+        parentId: w._id,
+      });
+      const gr = await models.grpcRequest.create({
+        parentId: w._id,
+      });
       getRenderedGrpcRequest.mockResolvedValue(gr);
-
       const result = await prepareGrpcRequest(gr._id, env._id, methodType);
-
       expect(getRenderedGrpcRequest).toHaveBeenLastCalledWith(
         gr,
         env,
@@ -52,8 +57,9 @@ describe('prepareGrpcRequest', () => {
         {},
         true,
       );
-
-      expect(result).toEqual({ request: gr });
+      expect(result).toEqual({
+        request: gr,
+      });
     },
   );
 });
@@ -63,20 +69,23 @@ describe('prepareGrpcMessage', () => {
 
   it('should prepare grpc message with only body', async () => {
     const w = await models.workspace.create();
-    const env = await models.environment.create({ parentId: w._id });
-    const gr = await models.grpcRequest.create({ parentId: w._id });
-
+    const env = await models.environment.create({
+      parentId: w._id,
+    });
+    const gr = await models.grpcRequest.create({
+      parentId: w._id,
+    });
     getRenderedGrpcRequestMessage.mockResolvedValue(gr.body);
-
     const result = await prepareGrpcMessage(gr._id, env._id);
-
     expect(getRenderedGrpcRequestMessage).toHaveBeenLastCalledWith(
       gr,
       env,
       RENDER_PURPOSE_SEND,
       {},
     );
-
-    expect(result).toEqual({ body: gr.body, requestId: gr._id });
+    expect(result).toEqual({
+      body: gr.body,
+      requestId: gr._id,
+    });
   });
 });
diff --git a/packages/insomnia-app/app/network/grpc/__tests__/proto-integration.test.js b/packages/insomnia-app/app/network/grpc/__tests__/proto-integration.test.ts
similarity index 92%
rename from packages/insomnia-app/app/network/grpc/__tests__/proto-integration.test.js
rename to packages/insomnia-app/app/network/grpc/__tests__/proto-integration.test.ts
index a84284a4d1..197845daa0 100644
--- a/packages/insomnia-app/app/network/grpc/__tests__/proto-integration.test.js
+++ b/packages/insomnia-app/app/network/grpc/__tests__/proto-integration.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
@@ -18,76 +17,67 @@ describe('proto management integration test', () => {
 
   it('can ingest proto file and load methods from it', async () => {
     const w = await models.workspace.create();
-
     // Mock folder selection
     const protoFilePath = path.join(__dirname, '../__fixtures__/library/hello.proto');
-    selectFileOrFolder.mockResolvedValue({ filePath: protoFilePath });
-
+    selectFileOrFolder.mockResolvedValue({
+      filePath: protoFilePath,
+    });
     // Ingest into database
     let createdProtoFileId;
     await protoManager.addFile(w._id, id => {
       createdProtoFileId = id;
     });
-
     expect(selectFileOrFolder).toHaveBeenCalledWith({
       itemTypes: ['file'],
       extensions: ['proto'],
     });
-
     // Find proto file entries
     const helloProto = await models.protoFile.getById(createdProtoFileId);
-
     // Load protoMethods
     const helloMethods = await protoLoader.loadMethods(helloProto);
-
     expect(helloMethods.length).toBe(4);
   });
 
   it('can ingest proto directory tree and load methods from any file', async () => {
     const w = await models.workspace.create();
-
     // Mock folder selection
     const libraryDirPath = path.join(__dirname, '../__fixtures__/library');
-    selectFileOrFolder.mockResolvedValue({ filePath: libraryDirPath });
-
+    selectFileOrFolder.mockResolvedValue({
+      filePath: libraryDirPath,
+    });
     // Ingest into database
     await protoManager.addDirectory(w._id);
-
     expect(selectFileOrFolder).toHaveBeenCalledWith({
       itemTypes: ['directory'],
       extensions: ['proto'],
     });
-
     // Find proto file entries
     const protoFiles = await models.protoFile.all();
     const rootProto = protoFiles.find(pf => pf.name === 'root.proto');
     const helloProto = protoFiles.find(pf => pf.name === 'hello.proto');
     const timeProto = protoFiles.find(pf => pf.name === 'time.proto');
-
     // Load protoMethods
     const rootMethods = await protoLoader.loadMethods(rootProto);
     const helloMethods = await protoLoader.loadMethods(helloProto);
     const timeMethods = await protoLoader.loadMethods(timeProto);
-
     expect(rootMethods.length).toBe(helloMethods.length + timeMethods.length);
     expect(helloMethods.length).toBe(4);
     expect(timeMethods.length).toBe(1);
-
     // Create request
     const gr = await models.grpcRequest.create({
       parentId: w._id,
       protoFileId: rootProto._id,
       protoMethodName: rootMethods[0].path,
     });
-
     // Load selected method
     const selectedMethod = await protoLoader.getSelectedMethod(gr);
-
     expect(selectedMethod.originalName).toEqual(rootMethods[0].originalName);
   });
 
   afterEach(async () => {
     const tempDirPath = path.join(os.tmpdir(), 'insomnia-grpc');
-    await fs.promises.rmdir(tempDirPath, { recursive: true });
+    await fs.promises.rmdir(tempDirPath, {
+      recursive: true,
+    });
   });
 });
diff --git a/packages/insomnia-app/app/network/grpc/__tests__/response-callbacks.test.js b/packages/insomnia-app/app/network/grpc/__tests__/response-callbacks.test.ts
similarity index 94%
rename from packages/insomnia-app/app/network/grpc/__tests__/response-callbacks.test.js
rename to packages/insomnia-app/app/network/grpc/__tests__/response-callbacks.test.ts
index 36f4aaabb5..5fb99f8d4a 100644
--- a/packages/insomnia-app/app/network/grpc/__tests__/response-callbacks.test.js
+++ b/packages/insomnia-app/app/network/grpc/__tests__/response-callbacks.test.ts
@@ -1,52 +1,46 @@
-// @flow
 import { ResponseCallbacks } from '../response-callbacks';
 import { GrpcResponseEventEnum } from '../../../common/grpc-events';
 
 describe('response-callbacks', () => {
-  const event = { reply: jest.fn() };
+  const event = {
+    reply: jest.fn(),
+  };
   const id = 'abc';
-
   beforeEach(() => {
     jest.resetAllMocks();
   });
 
   it('should sendData with expected arguments', () => {
-    const val = { a: 'b' };
-
+    const val = {
+      a: 'b',
+    };
     new ResponseCallbacks(event).sendData(id, val);
-
     expect(event.reply).toHaveBeenCalledTimes(1);
     expect(event.reply).toHaveBeenCalledWith(GrpcResponseEventEnum.data, id, val);
   });
 
   it('should sendError with expected arguments', () => {
     const err = new Error('this is an error');
-
     new ResponseCallbacks(event).sendError(id, err);
-
     expect(event.reply).toHaveBeenCalledTimes(1);
     expect(event.reply).toHaveBeenCalledWith(GrpcResponseEventEnum.error, id, err);
   });
 
   it('should sendEnd with expected arguments', () => {
     new ResponseCallbacks(event).sendEnd(id);
-
     expect(event.reply).toHaveBeenCalledTimes(1);
     expect(event.reply).toHaveBeenCalledWith(GrpcResponseEventEnum.end, id);
   });
 
   it('should sendStart with expected arguments', () => {
     new ResponseCallbacks(event).sendStart(id);
-
     expect(event.reply).toHaveBeenCalledTimes(1);
     expect(event.reply).toHaveBeenCalledWith(GrpcResponseEventEnum.start, id);
   });
 
   it('should sendStatus with expected arguments', () => {
     const obj = {};
-
     new ResponseCallbacks(event).sendStatus(id, obj);
-
     expect(event.reply).toHaveBeenCalledTimes(1);
     expect(event.reply).toHaveBeenCalledWith(GrpcResponseEventEnum.status, id, obj);
   });
diff --git a/packages/insomnia-app/app/network/grpc/call-cache.js b/packages/insomnia-app/app/network/grpc/call-cache.ts
similarity index 66%
rename from packages/insomnia-app/app/network/grpc/call-cache.js
rename to packages/insomnia-app/app/network/grpc/call-cache.ts
index 55e5058d6e..742e3b89a7 100644
--- a/packages/insomnia-app/app/network/grpc/call-cache.js
+++ b/packages/insomnia-app/app/network/grpc/call-cache.ts
@@ -1,12 +1,7 @@
-// @flow
+import { Call } from '@grpc/grpc-js';
 
-// The types of a call are defined in packages/insomnia-app/node_modules/@grpc/grpc-js/src/call.ts
-// These are TS types and too complex to translate entirely to flow types
-// A call can be a ClientUnaryCall, ClientReadableStream, ClientWritableStream, or ClientDuplexStream
 // A call can also emit 'metadata' and 'status' events
-export type Call = Object;
-
-let _calls: { [requestId: string]: Call } = {};
+let _calls: Record<string, Call> = {};
 
 const activeCount = () => Object.keys(_calls).length;
 
@@ -25,7 +20,9 @@ const set = (requestId: string, call: Call): void => {
 };
 
 const _tryCloseChannel = (requestId: string) => {
+  // @ts-expect-error -- TSCONVERSION channel not found in call
   const channel = get(requestId)?.call?.call.channel;
+
   if (channel) {
     channel.close();
   } else {
@@ -35,6 +32,7 @@ const _tryCloseChannel = (requestId: string) => {
 
 const clear = (requestId: string): void => {
   _tryCloseChannel(requestId);
+
   delete _calls[requestId];
 };
 
@@ -42,6 +40,11 @@ const reset = (): void => {
   _calls = {};
 };
 
-const callCache = { activeCount, get, set, clear, reset };
-
+const callCache = {
+  activeCount,
+  get,
+  set,
+  clear,
+  reset,
+};
 export default callCache;
diff --git a/packages/insomnia-app/app/network/grpc/index.js b/packages/insomnia-app/app/network/grpc/index.ts
similarity index 86%
rename from packages/insomnia-app/app/network/grpc/index.js
rename to packages/insomnia-app/app/network/grpc/index.ts
index d337da3843..5020373a80 100644
--- a/packages/insomnia-app/app/network/grpc/index.js
+++ b/packages/insomnia-app/app/network/grpc/index.ts
@@ -1,13 +1,7 @@
-// @flow
-
 import * as grpc from '@grpc/grpc-js';
-
 import * as models from '../../models';
 import * as protoLoader from './proto-loader';
 import callCache from './call-cache';
-import type { ServiceError } from './service-error';
-import { GrpcStatusEnum } from './service-error';
-import type { Call } from './call-cache';
 import parseGrpcUrl from './parse-grpc-url';
 import type { GrpcIpcMessageParams, GrpcIpcRequestParams } from './prepare';
 import { ResponseCallbacks } from './response-callbacks';
@@ -15,8 +9,13 @@ import { getMethodType, GrpcMethodTypeEnum } from './method';
 import type { GrpcRequest } from '../../models/grpc-request';
 import type { GrpcMethodDefinition } from './method';
 import { trackSegmentEvent } from '../../common/analytics';
+import { ServiceClient } from '@grpc/grpc-js/build/src/make-client';
+import { Call, ServiceError } from '@grpc/grpc-js';
 
-const _createClient = (req: GrpcRequest, respond: ResponseCallbacks): Object | undefined => {
+const _createClient = (
+  req: GrpcRequest,
+  respond: ResponseCallbacks,
+): ServiceClient | undefined => {
   const { url, enableTls } = parseGrpcUrl(req.url);
 
   if (!url) {
@@ -25,8 +24,8 @@ const _createClient = (req: GrpcRequest, respond: ResponseCallbacks): Object | u
   }
 
   const credentials = enableTls ? grpc.credentials.createSsl() : grpc.credentials.createInsecure();
-
   console.log(`[gRPC] connecting to url=${url} ${enableTls ? 'with' : 'without'} TLS`);
+  // @ts-expect-error -- TSCONVERSION second argument should be provided, send an empty string? Needs testing
   const Client = grpc.makeGenericClientConstructor({});
   return new Client(url, credentials);
 };
@@ -45,6 +44,7 @@ const _makeUnaryRequest = (
 
   // Load initial message
   const messageBody = _parseMessage(bodyText, requestId, respond);
+
   if (!messageBody) {
     return;
   }
@@ -83,6 +83,7 @@ const _makeServerStreamRequest = (
 ): Call | undefined => {
   // Load initial message
   const messageBody = _parseMessage(bodyText, requestId, respond);
+
   if (!messageBody) {
     return;
   }
@@ -114,17 +115,17 @@ const _makeBidiStreamRequest = ({
   return call;
 };
 
-type RequestData = {
-  requestId: string,
-  respond: ResponseCallbacks,
-  client: Object,
-  method: GrpcMethodDefinition,
-};
+interface RequestData {
+  requestId: string;
+  respond: ResponseCallbacks;
+  client: ServiceClient;
+  method: GrpcMethodDefinition;
+}
 
 export const start = async (
   { request }: GrpcIpcRequestParams,
   respond: ResponseCallbacks,
-): Promise<void> => {
+) => {
   const requestId = request._id;
   const method = await protoLoader.getSelectedMethod(request);
 
@@ -140,13 +141,19 @@ export const start = async (
 
   // Create client
   const client = _createClient(request, respond);
+
   if (!client) {
     return;
   }
 
-  const requestParams: RequestData = { requestId, client, method, respond };
-
+  const requestParams: RequestData = {
+    requestId,
+    client,
+    method,
+    respond,
+  };
   let call;
+
   switch (methodType) {
     case GrpcMethodTypeEnum.unary:
       call = _makeUnaryRequest(requestParams, request.body.text || '');
@@ -174,8 +181,8 @@ export const start = async (
   trackSegmentEvent('Request Executed');
 
   _setupStatusListener(call, requestId, respond);
-  respond.sendStart(requestId);
 
+  respond.sendStart(requestId);
   // Save call
   callCache.set(requestId, call);
 };
@@ -185,6 +192,7 @@ export const sendMessage = (
   respond: ResponseCallbacks,
 ) => {
   const messageBody = _parseMessage(body.text || '', requestId, respond);
+
   if (!messageBody) {
     return;
   }
@@ -193,14 +201,14 @@ export const sendMessage = (
   // this must happen in the next tick otherwise the stream does not flush correctly
   // Try removing it and using a bidi RPC and notice messages don't send consistently
   process.nextTick(() => {
+    // @ts-expect-error -- TSCONVERSION only write if the call is ClientWritableStream | ClientDuplexStream
     callCache.get(requestId)?.write(messageBody, _streamWriteCallback);
   });
 };
 
+// @ts-expect-error -- TSCONVERSION only end if the call is ClientWritableStream | ClientDuplexStream
 export const commit = (requestId: string) => callCache.get(requestId)?.end();
-
 export const cancel = (requestId: string) => callCache.get(requestId)?.cancel();
-
 export const cancelMultiple = (requestIds: Array<string>) => requestIds.forEach(cancel);
 
 const _setupStatusListener = (call: Call, requestId: string, respond: ResponseCallbacks) => {
@@ -209,13 +217,12 @@ const _setupStatusListener = (call: Call, requestId: string, respond: ResponseCa
 
 const _setupServerStreamListeners = (call: Call, requestId: string, respond: ResponseCallbacks) => {
   call.on('data', data => respond.sendData(requestId, data));
-
   call.on('error', (error: ServiceError) => {
-    if (error && error.code !== GrpcStatusEnum.CANCELLED) {
+    if (error && error.code !== grpc.status.CANCELLED) {
       respond.sendError(requestId, error);
 
       // Taken through inspiration from other implementation, needs validation
-      if (error.code === GrpcStatusEnum.UNKNOWN || error.code === GrpcStatusEnum.UNAVAILABLE) {
+      if (error.code === grpc.status.UNKNOWN || error.code === grpc.status.UNAVAILABLE) {
         respond.sendEnd(requestId);
         callCache.clear(requestId);
       }
@@ -230,17 +237,18 @@ const _setupServerStreamListeners = (call: Call, requestId: string, respond: Res
 // This function returns a function
 const _createUnaryCallback = (requestId: string, respond: ResponseCallbacks) => (
   err: ServiceError,
-  value: Object,
+  value: Record<string, any>,
 ) => {
   if (err) {
     // Don't do anything if cancelled
     // TODO: test with other errors
-    if (err.code !== GrpcStatusEnum.CANCELLED) {
+    if (err.code !== grpc.status.CANCELLED) {
       respond.sendError(requestId, err);
     }
   } else {
     respond.sendData(requestId, value);
   }
+
   respond.sendEnd(requestId);
   callCache.clear(requestId);
 };
@@ -257,7 +265,7 @@ const _parseMessage = (
   bodyText: string,
   requestId: string,
   respond: ResponseCallbacks,
-): Object | undefined => {
+): Record<string, any> | undefined => {
   try {
     return JSON.parse(bodyText);
   } catch (e) {
diff --git a/packages/insomnia-app/app/network/grpc/method.js b/packages/insomnia-app/app/network/grpc/method.ts
similarity index 67%
rename from packages/insomnia-app/app/network/grpc/method.js
rename to packages/insomnia-app/app/network/grpc/method.ts
index ea0abbad55..9be8bd7ef7 100644
--- a/packages/insomnia-app/app/network/grpc/method.js
+++ b/packages/insomnia-app/app/network/grpc/method.ts
@@ -1,23 +1,17 @@
-// @flow
+import { MethodDefinition } from '@grpc/grpc-js';
+import { ValueOf } from 'type-fest';
 
-// https://grpc.github.io/grpc/node/grpc.html#~MethodDefinition
-export type GrpcMethodDefinition = {
-  path: string,
-  originalName: string,
-  requestStream: boolean,
-  responseStream: boolean,
-  requestSerialize: Function,
-  responseDeserialize: Function,
-};
+// TODO(TSCONVERSION) remove this alias and type MethodDefinition correctly
+export type GrpcMethodDefinition = MethodDefinition<any, any>
 
 export const GrpcMethodTypeEnum = {
   unary: 'unary',
   server: 'server',
   client: 'client',
   bidi: 'bidi',
-};
+} as const;
 
-export type GrpcMethodType = $Values<typeof GrpcMethodTypeEnum>;
+export type GrpcMethodType = ValueOf<typeof GrpcMethodTypeEnum>;
 
 export const getMethodType = ({
   requestStream,
@@ -38,19 +32,19 @@ export const getMethodType = ({
   }
 };
 
-export const GrpcMethodTypeName: { [GrpcMethodType]: string } = {
+export const GrpcMethodTypeName = {
   [GrpcMethodTypeEnum.unary]: 'Unary',
   [GrpcMethodTypeEnum.server]: 'Server Streaming',
   [GrpcMethodTypeEnum.client]: 'Client Streaming',
   [GrpcMethodTypeEnum.bidi]: 'Bi-directional Streaming',
-};
+} as const;
 
-export const GrpcMethodTypeAcronym: { [GrpcMethodType]: string } = {
+export const GrpcMethodTypeAcronym = {
   [GrpcMethodTypeEnum.unary]: 'U',
   [GrpcMethodTypeEnum.server]: 'SS',
   [GrpcMethodTypeEnum.client]: 'CS',
   [GrpcMethodTypeEnum.bidi]: 'BD',
-};
+} as const;
 
 export const canClientStream = (methodType?: GrpcMethodType) =>
   methodType === GrpcMethodTypeEnum.client || methodType === GrpcMethodTypeEnum.bidi;
diff --git a/packages/insomnia-app/app/network/grpc/parse-grpc-url.js b/packages/insomnia-app/app/network/grpc/parse-grpc-url.js
deleted file mode 100644
index 2e363bee25..0000000000
--- a/packages/insomnia-app/app/network/grpc/parse-grpc-url.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// @flow
-import url from 'url';
-
-const parseGrpcUrl = (grpcUrl?: string): { url: string, enableTls: boolean } => {
-  const { protocol, host, href } = url.parse(grpcUrl?.toLowerCase() || '');
-
-  switch (protocol) {
-    case 'grpcs:':
-      return { url: host, enableTls: true };
-    case 'grpc:':
-      return { url: host, enableTls: false };
-    default:
-      return { url: href, enableTls: false };
-  }
-};
-
-export default parseGrpcUrl;
diff --git a/packages/insomnia-app/app/network/grpc/parse-grpc-url.ts b/packages/insomnia-app/app/network/grpc/parse-grpc-url.ts
new file mode 100644
index 0000000000..2017210371
--- /dev/null
+++ b/packages/insomnia-app/app/network/grpc/parse-grpc-url.ts
@@ -0,0 +1,34 @@
+import url from 'url';
+
+const parseGrpcUrl = (
+  grpcUrl?: string,
+): {
+  url: string;
+  enableTls: boolean;
+} => {
+  const { protocol, host, href } = url.parse(grpcUrl?.toLowerCase() || '');
+
+  switch (protocol) {
+    case 'grpcs:':
+      return {
+        // @ts-expect-error -- TSCONVERSION host can be undefined
+        url: host,
+        enableTls: true,
+      };
+
+    case 'grpc:':
+      return {
+        // @ts-expect-error -- TSCONVERSION host can be undefined
+        url: host,
+        enableTls: false,
+      };
+
+    default:
+      return {
+        url: href,
+        enableTls: false,
+      };
+  }
+};
+
+export default parseGrpcUrl;
diff --git a/packages/insomnia-app/app/network/grpc/prepare.js b/packages/insomnia-app/app/network/grpc/prepare.ts
similarity index 69%
rename from packages/insomnia-app/app/network/grpc/prepare.js
rename to packages/insomnia-app/app/network/grpc/prepare.ts
index bfec8877cd..81e3500601 100644
--- a/packages/insomnia-app/app/network/grpc/prepare.js
+++ b/packages/insomnia-app/app/network/grpc/prepare.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { RenderedGrpcRequest, RenderedGrpcRequestBody } from '../../common/render';
 import type { GrpcMethodType } from './method';
 import * as models from '../../models';
@@ -9,14 +8,14 @@ import {
 } from '../../common/render';
 import { canClientStream } from './method';
 
-export type GrpcIpcRequestParams = {
-  request: RenderedGrpcRequest,
-};
+export interface GrpcIpcRequestParams {
+  request: RenderedGrpcRequest;
+}
 
-export type GrpcIpcMessageParams = {
-  requestId: string,
-  body: RenderedGrpcRequestBody,
-};
+export interface GrpcIpcMessageParams {
+  requestId: string;
+  body: RenderedGrpcRequestBody;
+}
 
 export const prepareGrpcRequest = async (
   requestId: string,
@@ -25,16 +24,17 @@ export const prepareGrpcRequest = async (
 ): Promise<GrpcIpcRequestParams> => {
   const req = await models.grpcRequest.getById(requestId);
   const environment = await models.environment.getById(environmentId || 'n/a');
-
   const request = await getRenderedGrpcRequest(
+    // @ts-expect-error -- TSCONVERSION req can be null but should not try to render if it is null
     req,
     environment,
     RENDER_PURPOSE_SEND,
     {},
     canClientStream(methodType),
   );
-
-  return { request };
+  return {
+    request,
+  };
 };
 
 export const prepareGrpcMessage = async (
@@ -43,13 +43,16 @@ export const prepareGrpcMessage = async (
 ): Promise<GrpcIpcMessageParams> => {
   const req = await models.grpcRequest.getById(requestId);
   const environment = await models.environment.getById(environmentId || 'n/a');
-
   const requestBody = await getRenderedGrpcRequestMessage(
+    // @ts-expect-error -- TSCONVERSION req can be null but should not try to render if it is null
     req,
     environment,
     RENDER_PURPOSE_SEND,
     {},
   );
-
-  return { body: requestBody, requestId: req._id };
+  return {
+    body: requestBody,
+    // @ts-expect-error -- TSCONVERSION req can be null
+    requestId: req._id,
+  };
 };
diff --git a/packages/insomnia-app/app/network/grpc/proto-loader/__mocks__/index.js b/packages/insomnia-app/app/network/grpc/proto-loader/__mocks__/index.ts
similarity index 100%
rename from packages/insomnia-app/app/network/grpc/proto-loader/__mocks__/index.js
rename to packages/insomnia-app/app/network/grpc/proto-loader/__mocks__/index.ts
diff --git a/packages/insomnia-app/app/network/grpc/proto-loader/__tests__/index.test.js b/packages/insomnia-app/app/network/grpc/proto-loader/__tests__/index.test.ts
similarity index 79%
rename from packages/insomnia-app/app/network/grpc/proto-loader/__tests__/index.test.js
rename to packages/insomnia-app/app/network/grpc/proto-loader/__tests__/index.test.ts
index c86785a664..2d88f46b07 100644
--- a/packages/insomnia-app/app/network/grpc/proto-loader/__tests__/index.test.js
+++ b/packages/insomnia-app/app/network/grpc/proto-loader/__tests__/index.test.ts
@@ -1,5 +1,4 @@
-// @flow
-import * as protoLoader from '../index';
+import { loadMethods } from '../index';
 import writeProtoFile from '../write-proto-file';
 import path from 'path';
 import { globalBeforeEach } from '../../../../__jest__/before-each';
@@ -12,7 +11,6 @@ jest.mock('../write-proto-file', () => ({
 
 describe('loadMethods', () => {
   const protoFilePath = path.join(__dirname, '../../__fixtures__/library/hello.proto');
-
   beforeEach(() => {
     globalBeforeEach();
     jest.resetAllMocks();
@@ -24,12 +22,12 @@ describe('loadMethods', () => {
       parentId: w._id,
       protoText: 'this is just a placeholder because writing to a file is mocked',
     });
-    writeProtoFile.mockResolvedValue({ filePath: protoFilePath, dirs: [] });
-
-    const methods = await protoLoader.loadMethods(pf);
-
+    writeProtoFile.mockResolvedValue({
+      filePath: protoFilePath,
+      dirs: [],
+    });
+    const methods = await loadMethods(pf);
     expect(writeProtoFile).toHaveBeenCalledWith(pf);
-
     expect(methods).toHaveLength(4);
     expect(methods.map(c => c.path)).toStrictEqual(
       expect.arrayContaining([
@@ -47,8 +45,7 @@ describe('loadMethods', () => {
       parentId: w._id,
       protoText: '',
     });
-
-    await expect(protoLoader.loadMethods(undefined)).resolves.toHaveLength(0);
-    await expect(protoLoader.loadMethods(pf)).resolves.toHaveLength(0);
+    await expect(loadMethods(undefined)).resolves.toHaveLength(0);
+    await expect(loadMethods(pf)).resolves.toHaveLength(0);
   });
 });
diff --git a/packages/insomnia-app/app/network/grpc/proto-loader/__tests__/write-proto-file.test.js b/packages/insomnia-app/app/network/grpc/proto-loader/__tests__/write-proto-file.test.ts
similarity index 97%
rename from packages/insomnia-app/app/network/grpc/proto-loader/__tests__/write-proto-file.test.js
rename to packages/insomnia-app/app/network/grpc/proto-loader/__tests__/write-proto-file.test.ts
index 8137f251ad..ea54378eac 100644
--- a/packages/insomnia-app/app/network/grpc/proto-loader/__tests__/write-proto-file.test.js
+++ b/packages/insomnia-app/app/network/grpc/proto-loader/__tests__/write-proto-file.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import path from 'path';
 import os from 'os';
 import fs from 'fs';
@@ -8,30 +7,30 @@ import writeProtoFile from '../write-proto-file';
 import mkdirp from 'mkdirp';
 
 describe('writeProtoFile', () => {
-  let mkdirpSyncSpy: * | JestMockFn<*, *>;
-  let tmpDirSpy: * | JestMockFn<*, *>;
-  let existsSyncSpy: * | JestMockFn<*, *>;
-  let writeFileSpy: * | JestMockFn<*, Promise<*>>;
+  let existsSyncSpy: jest.SpyInstance<any, any>;
+  let mkdirpSyncSpy: jest.SpyInstance<any, any>;
+  let tmpDirSpy: jest.SpyInstance<any, any>;
+  let writeFileSpy: jest.SpyInstance<any, any>;
 
   const _setupSpies = () => {
-    tmpDirSpy = jest.spyOn(os, 'tmpdir');
     existsSyncSpy = jest.spyOn(fs, 'existsSync');
     mkdirpSyncSpy = jest.spyOn(mkdirp, 'sync');
+    tmpDirSpy = jest.spyOn(os, 'tmpdir');
     writeFileSpy = jest.spyOn(fs.promises, 'writeFile');
   };
 
   const _configureSpies = (tmpDir: string, exists: boolean) => {
-    mkdirpSyncSpy.mockImplementation(() => {});
-    writeFileSpy.mockResolvedValue();
-    tmpDirSpy.mockReturnValue(tmpDir);
     existsSyncSpy.mockReturnValue(exists);
+    mkdirpSyncSpy.mockImplementation(() => {});
+    tmpDirSpy.mockReturnValue(tmpDir);
+    writeFileSpy.mockResolvedValue(undefined);
   };
 
   const _restoreSpies = () => {
-    tmpDirSpy.mockRestore();
     existsSyncSpy.mockRestore();
-    writeFileSpy.mockRestore();
     mkdirpSyncSpy.mockRestore();
+    tmpDirSpy.mockRestore();
+    writeFileSpy.mockRestore();
   };
 
   beforeEach(async () => {
@@ -43,6 +42,7 @@ describe('writeProtoFile', () => {
 
   afterEach(() => {
     _restoreSpies();
+
     jest.resetAllMocks();
   });
 
@@ -54,25 +54,23 @@ describe('writeProtoFile', () => {
         parentId: w._id,
         protoText: 'text',
       });
-
       const tmpDirPath = path.join('.', 'foo', 'bar', 'baz');
+
       _configureSpies(tmpDirPath, false); // file doesn't already exist
 
       // Act
       const result = await writeProtoFile(pf);
-
       // Assert
       const expectedDir = path.join(tmpDirPath, 'insomnia-grpc');
       const expectedFileName = `${pf._id}.${pf.modified}.proto`;
       const expectedFullPath = path.join(expectedDir, expectedFileName);
-
       expect(result.filePath).toEqual(expectedFileName);
       expect(result.dirs).toEqual([expectedDir]);
-
       expect(mkdirpSyncSpy).toHaveBeenCalledWith(expectedDir);
       expect(existsSyncSpy).toHaveBeenCalledWith(expectedFullPath);
       expect(writeFileSpy).toHaveBeenCalledWith(expectedFullPath, pf.protoText);
     });
+
     it('doesnt write individual file if it already exists', async () => {
       // Arrange
       const w = await models.workspace.create();
@@ -80,21 +78,18 @@ describe('writeProtoFile', () => {
         parentId: w._id,
         protoText: 'text',
       });
-
       const tmpDirPath = path.join('.', 'foo', 'bar', 'baz');
+
       _configureSpies(tmpDirPath, true); // file already exists
 
       // Act
       const result = await writeProtoFile(pf);
-
       // Assert
       const expectedDir = path.join(tmpDirPath, 'insomnia-grpc');
       const expectedFileName = `${pf._id}.${pf.modified}.proto`;
       const expectedFullPath = path.join(expectedDir, expectedFileName);
-
       expect(result.filePath).toEqual(expectedFileName);
       expect(result.dirs).toEqual([expectedDir]);
-
       expect(mkdirpSyncSpy).toHaveBeenCalledWith(expectedDir);
       expect(existsSyncSpy).toHaveBeenCalledWith(expectedFullPath);
       expect(writeFileSpy).not.toHaveBeenCalled();
@@ -114,13 +109,12 @@ describe('writeProtoFile', () => {
         name: 'hello.proto',
         protoText: 'text',
       });
-
       const tmpDirPath = path.join('.', 'foo', 'bar', 'baz');
+
       _configureSpies(tmpDirPath, false); // file doesn't already exist
 
       // Act
       const result = await writeProtoFile(pf);
-
       // Assert
       const expectedRootDir = path.join(
         tmpDirPath,
@@ -130,14 +124,13 @@ describe('writeProtoFile', () => {
       );
       const expectedFilePath = pf.name;
       const expectedFullPath = path.join(expectedRootDir, expectedFilePath);
-
       expect(result.filePath).toEqual(expectedFilePath);
       expect(result.dirs).toEqual([expectedRootDir]);
-
       expect(mkdirpSyncSpy).toHaveBeenCalledWith(expectedRootDir);
       expect(existsSyncSpy).toHaveBeenCalledWith(expectedFullPath);
       expect(writeFileSpy).toHaveBeenCalledWith(expectedFullPath, pf.protoText);
     });
+
     it('can write files contained in nested folders', async () => {
       // Arrange
       const w = await models.workspace.create();
@@ -159,13 +152,12 @@ describe('writeProtoFile', () => {
         name: 'nested.proto',
         protoText: 'nested',
       });
-
       const tmpDirPath = path.join('.', 'foo', 'bar', 'baz');
+
       _configureSpies(tmpDirPath, false); // files don't already exist
 
       // Act
       const result = await writeProtoFile(pfNested);
-
       // Assert
       const expectedRootDir = path.join(
         tmpDirPath,
@@ -174,7 +166,6 @@ describe('writeProtoFile', () => {
         pdRoot.name,
       );
       const expectedNestedDir = path.join(expectedRootDir, pdNested.name);
-
       const expectedFilePath = {
         root: pfRoot.name,
         nested: path.join(pdNested.name, pfNested.name),
@@ -183,20 +174,18 @@ describe('writeProtoFile', () => {
         root: path.join(expectedRootDir, expectedFilePath.root),
         nested: path.join(expectedRootDir, expectedFilePath.nested),
       };
-
       expect(result.filePath).toEqual(expectedFilePath.nested);
       expect(result.dirs).toEqual([expectedRootDir, expectedNestedDir]);
-
       // Root folder should be created and written to
       expect(mkdirpSyncSpy).toHaveBeenCalledWith(expectedRootDir);
       expect(existsSyncSpy).toHaveBeenCalledWith(expectedFullPath.root);
       expect(writeFileSpy).toHaveBeenCalledWith(expectedFullPath.root, pfRoot.protoText);
-
       // Nested folder should be created and written to
       expect(mkdirpSyncSpy).toHaveBeenCalledWith(expectedNestedDir);
       expect(existsSyncSpy).toHaveBeenCalledWith(expectedFullPath.nested);
       expect(writeFileSpy).toHaveBeenCalledWith(expectedFullPath.nested, pfNested.protoText);
     });
+
     it('should not write file if it already exists', async () => {
       // Arrange
       const w = await models.workspace.create();
@@ -218,13 +207,12 @@ describe('writeProtoFile', () => {
         name: 'nested.proto',
         protoText: 'nested',
       });
-
       const tmpDirPath = path.join('.', 'foo', 'bar', 'baz');
+
       _configureSpies(tmpDirPath, true); // files already exists
 
       // Act
       const result = await writeProtoFile(pfNested);
-
       // Assert
       const expectedRootDir = path.join(
         tmpDirPath,
@@ -233,7 +221,6 @@ describe('writeProtoFile', () => {
         pdRoot.name,
       );
       const expectedNestedDir = path.join(expectedRootDir, pdNested.name);
-
       const expectedFilePath = {
         root: pfRoot.name,
         nested: path.join(pdNested.name, pfNested.name),
@@ -242,16 +229,12 @@ describe('writeProtoFile', () => {
         root: path.join(expectedRootDir, expectedFilePath.root),
         nested: path.join(expectedRootDir, expectedFilePath.nested),
       };
-
       expect(result.filePath).toEqual(expectedFilePath.nested);
       expect(result.dirs).toEqual([expectedRootDir, expectedNestedDir]);
-
       expect(mkdirpSyncSpy).toHaveBeenCalledWith(expectedRootDir);
       expect(existsSyncSpy).toHaveBeenCalledWith(expectedFullPath.root);
-
       expect(mkdirpSyncSpy).toHaveBeenCalledWith(expectedNestedDir);
       expect(existsSyncSpy).toHaveBeenCalledWith(expectedFullPath.nested);
-
       expect(writeFileSpy).not.toHaveBeenCalled();
     });
   });
diff --git a/packages/insomnia-app/app/network/grpc/proto-loader/index.js b/packages/insomnia-app/app/network/grpc/proto-loader/index.ts
similarity index 65%
rename from packages/insomnia-app/app/network/grpc/proto-loader/index.js
rename to packages/insomnia-app/app/network/grpc/proto-loader/index.ts
index 2cf35ba255..d84eb25640 100644
--- a/packages/insomnia-app/app/network/grpc/proto-loader/index.js
+++ b/packages/insomnia-app/app/network/grpc/proto-loader/index.ts
@@ -1,9 +1,10 @@
-// @flow
-
 import type { GrpcMethodDefinition } from '../method';
 import * as protoLoader from '@grpc/proto-loader';
+import { AnyDefinition, EnumTypeDefinition, ServiceDefinition, MessageTypeDefinition } from '@grpc/proto-loader';
 import * as models from '../../../models';
 import writeProtoFile from './write-proto-file';
+import { ProtoFile } from '../../../models/proto-file';
+import { GrpcRequest } from '../../../models/grpc-request';
 
 const GRPC_LOADER_OPTIONS = {
   keepCase: true,
@@ -13,13 +14,14 @@ const GRPC_LOADER_OPTIONS = {
   oneofs: true,
 };
 
-const isTypeOrEnumDefinition = (obj: Object) => 'format' in obj; // same check exists internally in the grpc library
-const isServiceDefinition = (obj: Object) => !isTypeOrEnumDefinition(obj);
+const isTypeOrEnumDefinition = (obj: AnyDefinition): obj is EnumTypeDefinition | MessageTypeDefinition => 'format' in obj; // same check exists internally in the grpc library
+
+const isServiceDefinition = (obj: AnyDefinition): obj is ServiceDefinition => !isTypeOrEnumDefinition(obj);
 
 // TODO: The file path for protoLoader.load can also be a URL, so we can avoid
 //  writing to a file in those cases, but it becomes more important to cache
 export const loadMethods = async (
-  protoFile: ProtoFile | undefined,
+  protoFile?: ProtoFile | null,
 ): Promise<Array<GrpcMethodDefinition>> => {
   if (!protoFile?.protoText) {
     return [];
@@ -33,14 +35,8 @@ export const loadMethodsFromPath = async (
   filePath: string,
   includeDirs?: Array<string>,
 ): Promise<Array<GrpcMethodDefinition>> => {
-  const definition = await protoLoader.load(filePath, {
-    ...GRPC_LOADER_OPTIONS,
-    includeDirs,
-  });
-
-  return Object.values(definition)
-    .filter(isServiceDefinition)
-    .flatMap(Object.values);
+  const definition = await protoLoader.load(filePath, { ...GRPC_LOADER_OPTIONS, includeDirs });
+  return Object.values(definition).filter(isServiceDefinition).flatMap(Object.values);
 };
 
 // TODO: instead of reloading the methods from the protoFile,
@@ -48,10 +44,10 @@ export const loadMethodsFromPath = async (
 //  or from the cache
 //  We can't send the method over IPC because of the following deprecation in Electron v9
 //  https://www.electronjs.org/docs/breaking-changes#behavior-changed-sending-non-js-objects-over-ipc-now-throws-an-exception
+// @ts-expect-error -- TSCONVERSION
 export const getSelectedMethod = async (request: GrpcRequest): GrpcMethodDefinition | undefined => {
+  // @ts-expect-error -- TSCONVERSION
   const protoFile = await models.protoFile.getById(request.protoFileId);
-
   const methods = await loadMethods(protoFile);
-
   return methods.find(c => c.path === request.protoMethodName);
 };
diff --git a/packages/insomnia-app/app/network/grpc/proto-loader/write-proto-file.js b/packages/insomnia-app/app/network/grpc/proto-loader/write-proto-file.ts
similarity index 87%
rename from packages/insomnia-app/app/network/grpc/proto-loader/write-proto-file.js
rename to packages/insomnia-app/app/network/grpc/proto-loader/write-proto-file.ts
index 7f105d71a3..95129d4185 100644
--- a/packages/insomnia-app/app/network/grpc/proto-loader/write-proto-file.js
+++ b/packages/insomnia-app/app/network/grpc/proto-loader/write-proto-file.ts
@@ -1,35 +1,37 @@
-// @flow
 import path from 'path';
 import os from 'os';
 import mkdirp from 'mkdirp';
 import fs from 'fs';
 import type { ProtoFile } from '../../../models/proto-file';
 import type { ProtoDirectory } from '../../../models/proto-directory';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import * as models from '../../../models';
 import { isProtoDirectory, isProtoFile, isWorkspace } from '../../../models/helpers/is-model';
 import type { BaseModel } from '../../../models';
 import type { Workspace } from '../../../models/workspace';
 
 const getProtoTempFileName = ({ _id, modified }: ProtoFile): string => `${_id}.${modified}.proto`;
+
 const getProtoTempDirectoryName = ({ _id, modified }: ProtoDirectory): string =>
   `${_id}.${modified}`;
 
-type WriteResult = {
-  filePath: string,
-  dirs: Array<string>,
-};
+interface WriteResult {
+  filePath: string;
+  dirs: Array<string>;
+}
 
 const writeIndividualProtoFile = async (protoFile: ProtoFile): Promise<WriteResult> => {
   // Create temp folder
   const rootDir = path.join(os.tmpdir(), 'insomnia-grpc');
   mkdirp.sync(rootDir);
-
   const filePath = getProtoTempFileName(protoFile);
-  const result = { filePath, dirs: [rootDir] };
-
+  const result = {
+    filePath,
+    dirs: [rootDir],
+  };
   // Check if file already exists
   const fullPath = path.join(rootDir, filePath);
+
   if (fs.existsSync(fullPath)) {
     return result;
   }
@@ -39,9 +41,10 @@ const writeIndividualProtoFile = async (protoFile: ProtoFile): Promise<WriteResu
   return result;
 };
 
-const writeNestedProtoFile = async (protoFile: ProtoFile, dirPath: string): Promise<void> => {
+const writeNestedProtoFile = async (protoFile: ProtoFile, dirPath: string) => {
   // Check if file already exists
   const fullPath = path.join(dirPath, protoFile.name);
+
   if (fs.existsSync(fullPath)) {
     return;
   }
@@ -58,9 +61,15 @@ const writeProtoFileTree = async (
 
   // Find the root ancestor directory
   const rootAncestorProtoDirectory = ancestors.find(
+    // @ts-expect-error -- TSCONVERSION ancestor workspace can be undefined
     c => isProtoDirectory(c) && c.parentId === ancestorWorkspace._id,
   );
 
+  if (!ancestorWorkspace || !rootAncestorProtoDirectory) {
+    // should never happen
+    return [];
+  }
+
   // Find all descendants of the root ancestor directory
   const descendants = await db.withDescendants(rootAncestorProtoDirectory);
 
@@ -88,17 +97,14 @@ const recursiveWriteProtoDirectory = async (
   // Increment folder path
   const dirPath = path.join(currentDirPath, dir.name);
   mkdirp.sync(dirPath);
-
   // Get and write proto files
-  const files = descendants.filter(f => isProtoFile(f) && f.parentId === dir._id);
+  const files = descendants.filter(isProtoFile).filter(f => f.parentId === dir._id);
   await Promise.all(files.map(f => writeNestedProtoFile(f, dirPath)));
-
   // Get and write subdirectories
   const subDirs = descendants.filter(f => isProtoDirectory(f) && f.parentId === dir._id);
   const createdDirs = await Promise.all(
     subDirs.map(f => recursiveWriteProtoDirectory(f, descendants, dirPath)),
   );
-
   return [dirPath, ...createdDirs.flat()];
 };
 
@@ -108,7 +114,6 @@ const writeProtoFile = async (protoFile: ProtoFile): Promise<WriteResult> => {
     models.protoDirectory.type,
     models.workspace.type,
   ]);
-
   const ancestorDirectories = ancestors.filter(isProtoDirectory);
 
   // Is this file part of a directory?
@@ -121,7 +126,10 @@ const writeProtoFile = async (protoFile: ProtoFile): Promise<WriteResult> => {
       .reverse()
       .slice(1);
     const filePath = path.join(...subDirs, protoFile.name);
-    return { filePath, dirs: treeRootDirs };
+    return {
+      filePath,
+      dirs: treeRootDirs,
+    };
   } else {
     // Write single file
     return writeIndividualProtoFile(protoFile);
diff --git a/packages/insomnia-app/app/network/grpc/proto-manager/__tests__/index.test.js b/packages/insomnia-app/app/network/grpc/proto-manager/__tests__/index.test.ts
similarity index 80%
rename from packages/insomnia-app/app/network/grpc/proto-manager/__tests__/index.test.js
rename to packages/insomnia-app/app/network/grpc/proto-manager/__tests__/index.test.ts
index d81896835f..845036df2a 100644
--- a/packages/insomnia-app/app/network/grpc/proto-manager/__tests__/index.test.js
+++ b/packages/insomnia-app/app/network/grpc/proto-manager/__tests__/index.test.ts
@@ -1,26 +1,25 @@
-// @flow
-
 import fs from 'fs';
 import path from 'path';
 import { globalBeforeEach } from '../../../../__jest__/before-each';
 import selectFileOrFolder from '../../../../common/select-file-or-folder';
 import * as protoManager from '../index';
-import * as protoLoader from '../../proto-loader';
+import { loadMethods as _loadMethods, loadMethodsFromPath as _loadMethodsFromPath } from '../../proto-loader';
 import * as models from '../../../../models';
 import * as modals from '../../../../ui/components/modals';
-import * as db from '../../../../common/database';
+import { database as db } from '../../../../common/database';
+
+const loadMethods = _loadMethods as jest.Mock;
+const loadMethodsFromPath = _loadMethodsFromPath as jest.Mock;
 
 jest.mock('../../../../common/select-file-or-folder', () => ({
   __esModule: true,
   default: jest.fn(),
 }));
-
 jest.mock('../../../../ui/components/modals');
 jest.mock('../../proto-loader');
 
 describe('protoManager', () => {
-  const selectFileOrFolderMock: JestMockFn<*, *> = selectFileOrFolder;
-
+  const selectFileOrFolderMock = selectFileOrFolder as jest.Mock;
   beforeEach(() => {
     globalBeforeEach();
     jest.resetAllMocks();
@@ -31,7 +30,9 @@ describe('protoManager', () => {
       // Arrange
       const cbMock = jest.fn();
       const w = await models.workspace.create();
-      selectFileOrFolderMock.mockResolvedValue({ canceled: true });
+      selectFileOrFolderMock.mockResolvedValue({
+        canceled: true,
+      });
 
       // Act
       await protoManager.addFile(w._id, cbMock);
@@ -40,7 +41,6 @@ describe('protoManager', () => {
       expect(cbMock).not.toHaveBeenCalled();
       const pf = await models.protoFile.getByParentId(w._id);
       expect(pf).toBeNull();
-
       expect(selectFileOrFolderMock).toHaveBeenCalledWith({
         itemTypes: ['file'],
         extensions: ['proto'],
@@ -61,8 +61,9 @@ describe('protoManager', () => {
       expect(cbMock).not.toHaveBeenCalled();
       const pf = await models.protoFile.getByParentId(w._id);
       expect(pf).toBeNull();
-
-      expect(modals.showError).toHaveBeenCalledWith({ error });
+      expect(modals.showError).toHaveBeenCalledWith({
+        error,
+      });
     });
 
     it('should not create database entry if methods cannot be parsed', async () => {
@@ -71,8 +72,10 @@ describe('protoManager', () => {
       const w = await models.workspace.create();
       const error = new Error();
       const filePath = 'path';
-      selectFileOrFolderMock.mockResolvedValue({ filePath });
-      protoLoader.loadMethodsFromPath.mockRejectedValue(error);
+      selectFileOrFolderMock.mockResolvedValue({
+        filePath,
+      });
+      loadMethodsFromPath.mockRejectedValue(error);
 
       // Act
       await protoManager.addFile(w._id, cbMock);
@@ -81,7 +84,6 @@ describe('protoManager', () => {
       expect(cbMock).not.toHaveBeenCalled();
       const pf = await models.protoFile.getByParentId(w._id);
       expect(pf).toBeNull();
-
       expect(modals.showError).toHaveBeenCalledWith({
         title: 'Invalid Proto File',
         message: `The file ${filePath} and could not be parsed`,
@@ -94,9 +96,10 @@ describe('protoManager', () => {
       const cbMock = jest.fn();
       const w = await models.workspace.create();
       const filePath = 'filename.proto';
-      selectFileOrFolderMock.mockResolvedValue({ filePath });
-      protoLoader.loadMethodsFromPath.mockResolvedValue();
-
+      selectFileOrFolderMock.mockResolvedValue({
+        filePath,
+      });
+      loadMethodsFromPath.mockResolvedValue(undefined);
       const fsReadFileSpy = jest.spyOn(fs.promises, 'readFile');
       const contents = 'contents';
       fsReadFileSpy.mockResolvedValue(contents);
@@ -107,7 +110,6 @@ describe('protoManager', () => {
       // Assert
       const pf = await models.protoFile.getByParentId(w._id);
       expect(cbMock).toHaveBeenCalledWith(pf._id);
-
       expect(pf.name).toBe(filePath);
       expect(pf.protoText).toBe(contents);
     });
@@ -118,12 +120,14 @@ describe('protoManager', () => {
       // Arrange
       const cbMock = jest.fn();
       const w = await models.workspace.create();
-      const pf = await models.protoFile.create({ parentId: w._id });
-
+      const pf = await models.protoFile.create({
+        parentId: w._id,
+      });
       const filePath = 'filename.proto';
-      selectFileOrFolderMock.mockResolvedValue({ filePath });
-      protoLoader.loadMethodsFromPath.mockResolvedValue();
-
+      selectFileOrFolderMock.mockResolvedValue({
+        filePath,
+      });
+      loadMethodsFromPath.mockResolvedValue(undefined);
       const fsReadFileSpy = jest.spyOn(fs.promises, 'readFile');
       const contents = 'contents';
       fsReadFileSpy.mockResolvedValue(contents);
@@ -133,7 +137,6 @@ describe('protoManager', () => {
 
       // Assert
       expect(cbMock).toHaveBeenCalledWith(pf._id);
-
       const updatedPf = await models.protoFile.getById(pf._id);
       expect(updatedPf.name).toBe(filePath);
       expect(updatedPf.protoText).toBe(contents);
@@ -144,7 +147,10 @@ describe('protoManager', () => {
     it('should rename the file', async () => {
       // Arrange
       const w = await models.workspace.create();
-      const pf = await models.protoFile.create({ parentId: w._id, name: 'original' });
+      const pf = await models.protoFile.create({
+        parentId: w._id,
+        name: 'original',
+      });
 
       // Act
       const updatedName = 'updated';
@@ -160,12 +166,15 @@ describe('protoManager', () => {
     it('should alert the user before deleting a file', async () => {
       // Arrange
       const w = await models.workspace.create();
-      const pf = await models.protoFile.create({ parentId: w._id, name: 'pfName.proto' });
+      const pf = await models.protoFile.create({
+        parentId: w._id,
+        name: 'pfName.proto',
+      });
       const cbMock = jest.fn();
 
       // Act
       await protoManager.deleteFile(pf, cbMock);
-      const showAlertCallArg = (modals.showAlert: JestMockFn).mock.calls[0][0];
+      const showAlertCallArg = (modals.showAlert as jest.Mock).mock.calls[0][0];
       expect(showAlertCallArg.title).toBe('Delete pfName.proto');
       await showAlertCallArg.onConfirm();
 
@@ -179,15 +188,23 @@ describe('protoManager', () => {
     it('should alert the user before deleting a directory', async () => {
       // Arrange
       const w = await models.workspace.create();
-      const pd = await models.protoDirectory.create({ parentId: w._id, name: 'pdName' });
-      const pf1 = await models.protoFile.create({ parentId: pd._id, name: 'pfName1.proto' });
-      const pf2 = await models.protoFile.create({ parentId: pd._id, name: 'pfName2.proto' });
-
+      const pd = await models.protoDirectory.create({
+        parentId: w._id,
+        name: 'pdName',
+      });
+      const pf1 = await models.protoFile.create({
+        parentId: pd._id,
+        name: 'pfName1.proto',
+      });
+      const pf2 = await models.protoFile.create({
+        parentId: pd._id,
+        name: 'pfName2.proto',
+      });
       const cbMock = jest.fn();
 
       // Act
       await protoManager.deleteDirectory(pd, cbMock);
-      const showAlertCallArg = (modals.showAlert: JestMockFn).mock.calls[0][0];
+      const showAlertCallArg = (modals.showAlert as jest.Mock).mock.calls[0][0];
       expect(showAlertCallArg.title).toBe('Delete pdName');
       await showAlertCallArg.onConfirm();
 
@@ -200,14 +217,12 @@ describe('protoManager', () => {
   });
 
   describe('addDirectory', () => {
-    let dbBufferChangesIndefinitelySpy: * | JestMockFn<*, *>;
-    let dbFlushChangesSpy: * | JestMockFn<*, *>;
-
+    let dbBufferChangesIndefinitelySpy: any | jest.Mock<any, any>;
+    let dbFlushChangesSpy: any | jest.Mock<any, any>;
     beforeEach(() => {
       dbBufferChangesIndefinitelySpy = jest.spyOn(db, 'bufferChangesIndefinitely');
       dbFlushChangesSpy = jest.spyOn(db, 'flushChanges');
     });
-
     afterEach(() => {
       expect(dbBufferChangesIndefinitelySpy).toHaveBeenCalled();
       expect(dbFlushChangesSpy).toHaveBeenCalled();
@@ -218,7 +233,9 @@ describe('protoManager', () => {
     it('should not create database entries if loading canceled', async () => {
       // Arrange
       const w = await models.workspace.create();
-      selectFileOrFolderMock.mockResolvedValue({ canceled: true });
+      selectFileOrFolderMock.mockResolvedValue({
+        canceled: true,
+      });
 
       // Act
       await protoManager.addDirectory(w._id);
@@ -240,9 +257,9 @@ describe('protoManager', () => {
       // Assert
       await expect(models.protoDirectory.all()).resolves.toHaveLength(0);
       await expect(models.protoFile.all()).resolves.toHaveLength(0);
-
-      expect(modals.showError).toHaveBeenCalledWith({ error });
-
+      expect(modals.showError).toHaveBeenCalledWith({
+        error,
+      });
       expect(dbFlushChangesSpy).toHaveBeenCalledWith(expect.any(Number), true);
     });
 
@@ -250,7 +267,9 @@ describe('protoManager', () => {
       // Arrange
       const w = await models.workspace.create();
       const filePath = path.join(__dirname, '../../__fixtures__/', 'library', 'empty');
-      selectFileOrFolderMock.mockResolvedValue({ filePath });
+      selectFileOrFolderMock.mockResolvedValue({
+        filePath,
+      });
 
       // Act
       await protoManager.addDirectory(w._id);
@@ -258,7 +277,6 @@ describe('protoManager', () => {
       // Assert
       await expect(models.protoDirectory.all()).resolves.toHaveLength(0);
       await expect(models.protoFile.all()).resolves.toHaveLength(0);
-
       expect(modals.showAlert).toHaveBeenCalledWith({
         title: 'No files found',
         message: `No .proto files were found under ${filePath}.`,
@@ -269,7 +287,9 @@ describe('protoManager', () => {
       // Arrange
       const w = await models.workspace.create();
       const filePath = path.join(__dirname, '../../__fixtures__/', 'simulate-error');
-      selectFileOrFolderMock.mockResolvedValue({ filePath });
+      selectFileOrFolderMock.mockResolvedValue({
+        filePath,
+      });
 
       // Should error when loading the 6th file
       const error = new Error('should-error.proto could not be loaded');
@@ -291,13 +311,11 @@ describe('protoManager', () => {
 
       // Expect rollback
       expect(dbFlushChangesSpy).toHaveBeenCalledWith(expect.any(Number), true);
-
       expect(modals.showError).toHaveBeenCalledWith({
         title: 'Failed to import',
         message: `An unexpected error occurred when reading ${filePath}`,
         error,
       });
-
       fsPromisesReadFileSpy.mockRestore();
     });
 
@@ -305,9 +323,11 @@ describe('protoManager', () => {
       // Arrange
       const w = await models.workspace.create();
       const filePath = path.join(__dirname, '../../__fixtures__/', 'library', 'nested', 'time');
-      selectFileOrFolderMock.mockResolvedValue({ filePath });
+      selectFileOrFolderMock.mockResolvedValue({
+        filePath,
+      });
       const error = new Error('error');
-      protoLoader.loadMethods.mockRejectedValue(error);
+      loadMethods.mockRejectedValue(error);
 
       // Act
       await protoManager.addDirectory(w._id);
@@ -315,13 +335,11 @@ describe('protoManager', () => {
       // Assert
       await expect(models.protoDirectory.all()).resolves.toHaveLength(0);
       await expect(models.protoFile.all()).resolves.toHaveLength(0);
-
       expect(modals.showError).toHaveBeenCalledWith({
         title: 'Invalid Proto File',
-        message: `The file time.proto could not be parsed`,
+        message: 'The file time.proto could not be parsed',
         error,
       });
-
       expect(dbFlushChangesSpy).toHaveBeenCalledWith(expect.any(Number), true);
     });
 
@@ -329,16 +347,16 @@ describe('protoManager', () => {
       // Arrange
       const w = await models.workspace.create();
       const filePath = path.join(__dirname, '../../__fixtures__/', 'library');
-      selectFileOrFolderMock.mockResolvedValue({ filePath });
+      selectFileOrFolderMock.mockResolvedValue({
+        filePath,
+      });
 
       // Act
       await protoManager.addDirectory(w._id);
 
       // Assert
       await expect(models.protoDirectory.all()).resolves.toHaveLength(3);
-      await expect(models.protoFile.all()).resolves.toHaveLength(3);
-
-      // Each individual entry is not validated here because it is
+      await expect(models.protoFile.all()).resolves.toHaveLength(3); // Each individual entry is not validated here because it is
       // too involved to mock everything, and an integration test exists
       // which uses this code path. As long as the expected number of
       // entities are loaded from the fixture directory, this test is sufficient.
diff --git a/packages/insomnia-app/app/network/grpc/proto-manager/__tests__/ingest-proto-directory.test.js b/packages/insomnia-app/app/network/grpc/proto-manager/__tests__/ingest-proto-directory.test.ts
similarity index 85%
rename from packages/insomnia-app/app/network/grpc/proto-manager/__tests__/ingest-proto-directory.test.js
rename to packages/insomnia-app/app/network/grpc/proto-manager/__tests__/ingest-proto-directory.test.ts
index f57ce201c5..2616acb184 100644
--- a/packages/insomnia-app/app/network/grpc/proto-manager/__tests__/ingest-proto-directory.test.js
+++ b/packages/insomnia-app/app/network/grpc/proto-manager/__tests__/ingest-proto-directory.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import * as models from '../../../../models';
 import ingestProtoDirectory from '../ingest-proto-directory';
 import path from 'path';
@@ -13,12 +12,14 @@ describe('ingestProtoDirectory', () => {
       // Arrange
       const w = await models.workspace.create();
       const dirToIngest = path.join(__dirname, '../../__fixtures__', 'library', dir);
-
       // Act
       const result = await ingestProtoDirectory(dirToIngest, w._id);
-
       // Assert
-      expect(result).toStrictEqual({ createdDir: null, createdIds: [], error: null });
+      expect(result).toStrictEqual({
+        createdDir: null,
+        createdIds: [],
+        error: null,
+      });
       expect(models.protoDirectory.all()).resolves.toHaveLength(0);
       expect(models.protoFile.all()).resolves.toHaveLength(0);
     },
@@ -28,37 +29,37 @@ describe('ingestProtoDirectory', () => {
     // Arrange
     const w = await models.workspace.create();
     const dirToIngest = path.join(__dirname, '../../__fixtures__', 'library');
-
     // Act
     const result = await ingestProtoDirectory(dirToIngest, w._id);
-
     // Assert
     expect(result.createdDir).toStrictEqual(
-      expect.objectContaining({ name: 'library', parentId: w._id }),
+      expect.objectContaining({
+        name: 'library',
+        parentId: w._id,
+      }),
     );
     expect(result.createdIds).toHaveLength(6);
     expect(result.error).toBeNull();
     expect(models.protoDirectory.all()).resolves.toHaveLength(3);
     expect(models.protoFile.all()).resolves.toHaveLength(3);
-
     // Ensure ingested tree structure is correct
     const libraryFolder = await models.protoDirectory.getByParentId(w._id);
     expect(libraryFolder.name).toBe('library');
-
     const protos = await models.protoFile.findByParentId(libraryFolder._id);
     expect(protos).toStrictEqual(
       expect.arrayContaining([
-        expect.objectContaining({ name: 'hello.proto' }),
-        expect.objectContaining({ name: 'root.proto' }),
+        expect.objectContaining({
+          name: 'hello.proto',
+        }),
+        expect.objectContaining({
+          name: 'root.proto',
+        }),
       ]),
     );
-
     const nestedFolder = await models.protoDirectory.getByParentId(libraryFolder._id);
     expect(nestedFolder.name).toBe('nested');
-
     const timeFolder = await models.protoDirectory.getByParentId(nestedFolder._id);
     expect(timeFolder.name).toBe('time');
-
     const timeProto = await models.protoFile.getByParentId(timeFolder._id);
     expect(timeProto.name).toBe('time.proto');
   });
diff --git a/packages/insomnia-app/app/network/grpc/proto-manager/index.js b/packages/insomnia-app/app/network/grpc/proto-manager/index.tsx
similarity index 86%
rename from packages/insomnia-app/app/network/grpc/proto-manager/index.js
rename to packages/insomnia-app/app/network/grpc/proto-manager/index.tsx
index 6df3ba0402..7895193686 100644
--- a/packages/insomnia-app/app/network/grpc/proto-manager/index.js
+++ b/packages/insomnia-app/app/network/grpc/proto-manager/index.tsx
@@ -1,11 +1,9 @@
-// @flow
-
 import type { ProtoFile } from '../../../models/proto-file';
 import { showAlert, showError } from '../../../ui/components/modals';
 import * as models from '../../../models';
 import React from 'react';
 import type { ProtoDirectory } from '../../../models/proto-directory';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import selectFileOrFolder from '../../../common/select-file-or-folder';
 import ingestProtoDirectory from './ingest-proto-directory';
 import fs from 'fs';
@@ -13,7 +11,7 @@ import path from 'path';
 import * as protoLoader from '../proto-loader';
 import { isProtoFile } from '../../../models/helpers/is-model';
 
-export async function deleteFile(protoFile: ProtoFile, callback: string => void): Promise<void> {
+export async function deleteFile(protoFile: ProtoFile, callback: (arg0: string) => void) {
   showAlert({
     title: `Delete ${protoFile.name}`,
     message: (
@@ -30,10 +28,7 @@ export async function deleteFile(protoFile: ProtoFile, callback: string => void)
   });
 }
 
-export async function deleteDirectory(
-  protoDirectory: ProtoDirectory,
-  callback: (Array<string>) => void,
-): Promise<void> {
+export async function deleteDirectory(protoDirectory: ProtoDirectory, callback: (arg0: Array<string>) => void) {
   showAlert({
     title: `Delete ${protoDirectory.name}`,
     message: (
@@ -46,17 +41,16 @@ export async function deleteDirectory(
     onConfirm: async () => {
       const descendant = await db.withDescendants(protoDirectory);
       await models.protoDirectory.remove(protoDirectory);
-
       callback(descendant.map(c => c._id));
     },
   });
 }
 
-export async function addDirectory(workspaceId: string): Promise<void> {
+export async function addDirectory(workspaceId: string) {
   let rollback = false;
   let createdIds: Array<string>;
-
   const bufferId = await db.bufferChangesIndefinitely();
+
   try {
     // Select file
     const { filePath, canceled } = await selectFileOrFolder({
@@ -105,14 +99,15 @@ export async function addDirectory(workspaceId: string): Promise<void> {
           message: `The file ${file.name} could not be parsed`,
           error: e,
         });
-
         rollback = true;
         return;
       }
     }
   } catch (e) {
     rollback = true;
-    showError({ error: e });
+    showError({
+      error: e,
+    });
   } finally {
     // Fake flushing changes (or, rollback) only prevents change notifs being sent to the UI
     // It does NOT revert changes written to the database, as is typical of a db transaction rollback
@@ -120,13 +115,15 @@ export async function addDirectory(workspaceId: string): Promise<void> {
     await db.flushChanges(bufferId, rollback);
 
     if (rollback) {
+      // @ts-expect-error -- TSCONVERSION
       await models.protoDirectory.batchRemoveIds(createdIds);
+      // @ts-expect-error -- TSCONVERSION
       await models.protoFile.batchRemoveIds(createdIds);
     }
   }
 }
 
-async function _readFile(): Promise<{ fileName: string, fileContents: string } | null> {
+async function _readFile() {
   try {
     // Select file
     const { filePath, canceled } = await selectFileOrFolder({
@@ -148,22 +145,27 @@ async function _readFile(): Promise<{ fileName: string, fileContents: string } |
         message: `The file ${filePath} and could not be parsed`,
         error: e,
       });
-
       return;
     }
 
     // Read contents
     const contents = await fs.promises.readFile(filePath, 'utf-8');
     const name = path.basename(filePath);
-
-    return { fileName: name, fileContents: contents };
+    return {
+      fileName: name,
+      fileContents: contents,
+    };
   } catch (e) {
-    showError({ error: e });
+    showError({
+      error: e,
+    });
   }
+  return undefined;
 }
 
-export async function addFile(workspaceId: string, callback: string => void): Promise<void> {
+export async function addFile(workspaceId: string, callback: (arg0: string) => void) {
   const result = await _readFile();
+
   if (result) {
     const newFile = await models.protoFile.create({
       name: result.fileName,
@@ -174,8 +176,9 @@ export async function addFile(workspaceId: string, callback: string => void): Pr
   }
 }
 
-export async function updateFile(protoFile: ProtoFile, callback: string => void): Promise<void> {
+export async function updateFile(protoFile: ProtoFile, callback: (arg0: string) => void) {
   const result = await _readFile();
+
   if (result) {
     const updatedFile = await models.protoFile.update(protoFile, {
       name: result.fileName,
@@ -185,6 +188,8 @@ export async function updateFile(protoFile: ProtoFile, callback: string => void)
   }
 }
 
-export async function renameFile(protoFile: ProtoFile, name: string): Promise<void> {
-  await models.protoFile.update(protoFile, { name });
+export async function renameFile(protoFile: ProtoFile, name: string) {
+  await models.protoFile.update(protoFile, {
+    name,
+  });
 }
diff --git a/packages/insomnia-app/app/network/grpc/proto-manager/ingest-proto-directory.js b/packages/insomnia-app/app/network/grpc/proto-manager/ingest-proto-directory.ts
similarity index 76%
rename from packages/insomnia-app/app/network/grpc/proto-manager/ingest-proto-directory.js
rename to packages/insomnia-app/app/network/grpc/proto-manager/ingest-proto-directory.ts
index 3d4411455c..e8f58dfcf9 100644
--- a/packages/insomnia-app/app/network/grpc/proto-manager/ingest-proto-directory.js
+++ b/packages/insomnia-app/app/network/grpc/proto-manager/ingest-proto-directory.ts
@@ -1,29 +1,30 @@
-// @flow
-
 import * as models from '../../../models';
 import type { ProtoDirectory } from '../../../models/proto-directory';
 import path from 'path';
 import fs from 'fs';
 
-type IngestResult = {
-  createdDir?: ProtoDirectory | null,
-  createdIds: Array<string>,
-  error?: Error,
-};
+interface IngestResult {
+  createdDir?: ProtoDirectory | null;
+  createdIds: Array<string>;
+  error?: Error | null;
+}
 
 class ProtoDirectoryLoader {
+  createdIds: Array<string> = [];
+  rootDirPath: string;
+  workspaceId: string;
+
   constructor(rootDirPath: string, workspaceId: string) {
     this.rootDirPath = rootDirPath;
     this.workspaceId = workspaceId;
-    this.createdIds = [];
   }
 
-  async _parseDir(entryPath: string, parentId: string): Promise<boolean> {
+  async _parseDir(entryPath: string, parentId: string) {
     const result = await this._ingest(entryPath, parentId);
     return Boolean(result);
   }
 
-  async _parseFile(entryPath: string, parentId: string): Promise<boolean> {
+  async _parseFile(entryPath: string, parentId: string) {
     const extension = path.extname(entryPath);
 
     // Ignore if not a .proto file
@@ -33,15 +34,12 @@ class ProtoDirectoryLoader {
 
     const contents = await fs.promises.readFile(entryPath, 'utf-8');
     const name = path.basename(entryPath);
-
     const { _id } = await models.protoFile.create({
       name,
       parentId,
       protoText: contents,
     });
-
     this.createdIds.push(_id);
-
     return true;
   }
 
@@ -52,18 +50,18 @@ class ProtoDirectoryLoader {
     }
 
     const newDirId = models.protoDirectory.createId();
-
     // Read contents
-    const entries = await fs.promises.readdir(dirPath, { withFileTypes: true });
-
+    const entries = await fs.promises.readdir(dirPath, {
+      withFileTypes: true,
+    });
     // Loop and read all entries
     let filesFound = false;
+
     for (const entry of entries.sort((a, b) => a.name.localeCompare(b.name))) {
       const fullEntryPath = path.resolve(dirPath, entry.name);
       const result = await (entry.isDirectory()
         ? this._parseDir(fullEntryPath, newDirId)
         : this._parseFile(fullEntryPath, newDirId));
-
       filesFound = filesFound || result;
     }
 
@@ -81,12 +79,20 @@ class ProtoDirectoryLoader {
     return null;
   }
 
-  async load(): Promise<IngestResult> {
+  async load() {
     try {
       const createdDir = await this._ingest(this.rootDirPath, this.workspaceId);
-      return { createdDir, createdIds: this.createdIds, error: null };
+      return {
+        createdDir,
+        createdIds: this.createdIds,
+        error: null,
+      } as IngestResult;
     } catch (error) {
-      return { createdDir: null, createdIds: this.createdIds, error };
+      return {
+        createdDir: null,
+        createdIds: this.createdIds,
+        error,
+      } as IngestResult;
     }
   }
 }
diff --git a/packages/insomnia-app/app/network/grpc/response-callbacks.js b/packages/insomnia-app/app/network/grpc/response-callbacks.ts
similarity index 76%
rename from packages/insomnia-app/app/network/grpc/response-callbacks.js
rename to packages/insomnia-app/app/network/grpc/response-callbacks.ts
index b88c2e371d..366e954099 100644
--- a/packages/insomnia-app/app/network/grpc/response-callbacks.js
+++ b/packages/insomnia-app/app/network/grpc/response-callbacks.ts
@@ -1,17 +1,15 @@
-// @flow
-import type { GrpcStatusObject, ServiceError } from './service-error';
 import { GrpcResponseEventEnum } from '../../common/grpc-events';
-
+import { IpcMainEvent } from 'electron';
+import { ServiceError, StatusObject } from '@grpc/grpc-js';
 interface IResponseCallbacks {
-  sendData(requestId: string, val: Object | undefined): void;
+  sendData(requestId: string, val: Record<string, any> | undefined): void;
   sendError(requestId: string, err: ServiceError): void;
   sendStart(requestId: string): void;
   sendEnd(requestId: string): void;
-  sendStatus(requestId: string, status: GrpcStatusObject): void;
+  sendStatus(requestId: string, status: StatusObject): void;
 }
-
 export class ResponseCallbacks implements IResponseCallbacks {
-  _event: IpcMainEvent = null;
+  _event: IpcMainEvent;
 
   constructor(e: IpcMainEvent) {
     this._event = e;
diff --git a/packages/insomnia-app/app/network/grpc/service-error.js b/packages/insomnia-app/app/network/grpc/service-error.ts
similarity index 61%
rename from packages/insomnia-app/app/network/grpc/service-error.js
rename to packages/insomnia-app/app/network/grpc/service-error.ts
index 65af74a242..6b00abff2e 100644
--- a/packages/insomnia-app/app/network/grpc/service-error.js
+++ b/packages/insomnia-app/app/network/grpc/service-error.ts
@@ -1,4 +1,4 @@
-// @flow
+import { ValueOf } from 'type-fest';
 
 export const GrpcStatusEnum = {
   OK: 0,
@@ -18,14 +18,14 @@ export const GrpcStatusEnum = {
   UNAVAILABLE: 14,
   DATA_LOSS: 15,
   UNAUTHENTICATED: 16,
-};
+} as const;
 
-type GrpcStatus = $Values<typeof GrpcStatusEnum>;
+type GrpcStatus = ValueOf<typeof GrpcStatusEnum>;
 
-export type GrpcStatusObject = {
-  code: GrpcStatus,
-  details: string,
-  metadata: Object, // https://grpc.github.io/grpc/node/grpc.Metadata.html
-};
+export interface GrpcStatusObject {
+  code: GrpcStatus;
+  details: string;
+  metadata: Record<string, any>; // https://grpc.github.io/grpc/node/grpc.Metadata.html
+}
 
 export type ServiceError = GrpcStatusObject & Error;
diff --git a/packages/insomnia-app/app/network/multipart.js b/packages/insomnia-app/app/network/multipart.ts
similarity index 89%
rename from packages/insomnia-app/app/network/multipart.js
rename to packages/insomnia-app/app/network/multipart.ts
index 5822855a82..66dfef7ac0 100644
--- a/packages/insomnia-app/app/network/multipart.js
+++ b/packages/insomnia-app/app/network/multipart.ts
@@ -1,4 +1,3 @@
-// @flow
 import * as electron from 'electron';
 import mimes from 'mime-types';
 import fs from 'fs';
@@ -7,16 +6,23 @@ import type { RequestBodyParameter } from '../models/request';
 
 export const DEFAULT_BOUNDARY = 'X-INSOMNIA-BOUNDARY';
 
+interface Multipart {
+  boundary: typeof DEFAULT_BOUNDARY,
+  filePath: string;
+  contentLength: number;
+}
+
 export async function buildMultipart(params: Array<RequestBodyParameter>) {
-  return new Promise(async (resolve: Function, reject: Function) => {
+  return new Promise<Multipart>(async (resolve, reject) => {
     const filePath = path.join(electron.remote.app.getPath('temp'), Math.random() + '.body');
     const writeStream = fs.createWriteStream(filePath);
     const lineBreak = '\r\n';
     let totalSize = 0;
 
-    function addFile(path: string): Promise<void> {
-      return new Promise((resolve, reject) => {
+    function addFile(path: string) {
+      return new Promise<void>((resolve, reject) => {
         let size;
+
         try {
           size = fs.statSync(path).size;
         } catch (err) {
@@ -27,12 +33,12 @@ export async function buildMultipart(params: Array<RequestBodyParameter>) {
         stream.once('end', () => {
           resolve();
         });
-
         stream.once('error', err => {
           reject(err);
         });
-
-        stream.pipe(writeStream, { end: false });
+        stream.pipe(writeStream, {
+          end: false,
+        });
         totalSize += size;
       });
     }
@@ -67,6 +73,7 @@ export async function buildMultipart(params: Array<RequestBodyParameter>) {
         addString(`Content-Type: ${contentType}`);
         addString(lineBreak);
         addString(lineBreak);
+
         try {
           await addFile(fileName);
         } catch (err) {
@@ -78,10 +85,12 @@ export async function buildMultipart(params: Array<RequestBodyParameter>) {
         const contentType = param.multiline;
         addString(`Content-Disposition: form-data; name="${name}"`);
         addString(lineBreak);
+
         if (typeof contentType === 'string') {
           addString(`Content-Type: ${contentType}`);
           addString(lineBreak);
         }
+
         addString(lineBreak);
         addString(value);
       }
@@ -91,11 +100,9 @@ export async function buildMultipart(params: Array<RequestBodyParameter>) {
 
     addString(`--${DEFAULT_BOUNDARY}--`);
     addString(lineBreak);
-
     writeStream.once('error', err => {
       reject(err);
     });
-
     writeStream.once('close', () => {
       resolve({
         boundary: DEFAULT_BOUNDARY,
@@ -103,7 +110,6 @@ export async function buildMultipart(params: Array<RequestBodyParameter>) {
         contentLength: totalSize,
       });
     });
-
     // We're done here. End the stream and tell FS to save/close the file.
     writeStream.end();
   });
diff --git a/packages/insomnia-app/app/network/network.js b/packages/insomnia-app/app/network/network.ts
similarity index 88%
rename from packages/insomnia-app/app/network/network.js
rename to packages/insomnia-app/app/network/network.ts
index cba4121c2b..144466a80d 100644
--- a/packages/insomnia-app/app/network/network.js
+++ b/packages/insomnia-app/app/network/network.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { ResponseHeader, ResponseTimelineEntry } from '../models/response';
 import type { Request, RequestHeader } from '../models/request';
 import type { Workspace } from '../models/workspace';
@@ -33,7 +32,6 @@ import {
   CONTENT_TYPE_FORM_DATA,
   CONTENT_TYPE_FORM_URLENCODED,
   getAppVersion,
-  getTempDir,
   HttpVersions,
   STATUS_CODE_PLUGIN_ERROR,
 } from '../common/constants';
@@ -41,7 +39,6 @@ import {
   delay,
   describeByteSize,
   getContentTypeHeader,
-  getDataDirectory,
   getHostHeader,
   getLocationHeader,
   getSetCookieHeaders,
@@ -52,6 +49,7 @@ import {
   hasUserAgentHeader,
   waitForStreamToFinish,
 } from '../common/misc';
+import { getDataDirectory, getTempDir } from '../common/electron-helpers';
 import {
   buildQueryStringFromParams,
   joinUrlAndQueryString,
@@ -59,8 +57,8 @@ import {
   smartEncodeUrl,
 } from 'insomnia-url';
 import fs from 'fs';
-import * as db from '../common/database';
-import CACerts from './ca-certs';
+import { database as db } from '../common/database';
+import * as caCerts from './ca-certs';
 import * as plugins from '../plugins/index';
 import * as pluginContexts from '../plugins/context/index';
 import { getAuthHeader } from './authentication';
@@ -69,27 +67,28 @@ import { urlMatchesCertHost } from './url-matches-cert-host';
 import aws4 from 'aws4';
 import { buildMultipart } from './multipart';
 import type { Environment } from '../models/environment';
+import { CurlOptionName } from 'node-libcurl/dist/generated/CurlOption';
 
-export type ResponsePatch = {|
-  bodyCompression?: 'zip' | null,
-  bodyPath?: string,
-  bytesContent?: number,
-  bytesRead?: number,
-  contentType?: string,
-  elapsedTime?: number,
-  environmentId?: string | null,
-  error?: string,
-  headers?: Array<ResponseHeader>,
-  httpVersion?: string,
-  message?: string,
-  parentId?: string,
-  settingSendCookies?: boolean,
-  settingStoreCookies?: boolean,
-  statusCode?: number,
-  statusMessage?: string,
-  timelinePath?: string,
-  url?: string,
-|};
+export interface ResponsePatch {
+  bodyCompression?: 'zip' | null;
+  bodyPath?: string;
+  bytesContent?: number;
+  bytesRead?: number;
+  contentType?: string;
+  elapsedTime?: number;
+  environmentId?: string | null;
+  error?: string;
+  headers?: Array<ResponseHeader>;
+  httpVersion?: string;
+  message?: string;
+  parentId?: string;
+  settingSendCookies?: boolean;
+  settingStoreCookies?: boolean;
+  statusCode?: number;
+  statusMessage?: string;
+  timelinePath?: string;
+  url?: string;
+}
 
 // Time since user's last keypress to wait before making the request
 const MAX_DELAY_TIME = 1000;
@@ -110,15 +109,18 @@ const LIBCURL_DEBUG_MIGRATION_MAP = {
 };
 
 const cancelRequestFunctionMap = {};
+
 let lastUserInteraction = Date.now();
 
 export async function cancelRequestById(requestId) {
   if (hasCancelFunctionForId(requestId)) {
     const cancelRequestFunction = cancelRequestFunctionMap[requestId];
+
     if (typeof cancelRequestFunction === 'function') {
       return cancelRequestFunction();
     }
   }
+
   console.log(`[network] Failed to cancel req=${requestId} because cancel function not found`);
 }
 
@@ -134,12 +136,12 @@ export function hasCancelFunctionForId(requestId) {
 
 export async function _actuallySend(
   renderedRequest: RenderedRequest,
-  renderContext: Object,
+  renderContext: Record<string, any>,
   workspace: Workspace,
   settings: Settings,
   environment: Environment | null,
-): Promise<ResponsePatch> {
-  return new Promise(async resolve => {
+) {
+  return new Promise<ResponsePatch>(async resolve => {
     const timeline: Array<ResponseTimelineEntry> = [];
 
     function addTimeline(name, value) {
@@ -161,24 +163,23 @@ export async function _actuallySend(
     async function respond(
       patch: ResponsePatch,
       bodyPath: string | null,
-      noPlugins: boolean = false,
-    ): Promise<void> {
+      noPlugins = false,
+    ) {
       const timelinePath = await storeTimeline(timeline);
-
       // Tear Down the cancellation logic
       clearCancelFunctionForId(renderedRequest._id);
-
       const environmentId = environment ? environment._id : null;
       const responsePatchBeforeHooks = Object.assign(
-        ({
+        {
           timelinePath,
           environmentId,
           parentId: renderedRequest._id,
-          bodyCompression: null, // Will default to .zip otherwise
+          bodyCompression: null,
+          // Will default to .zip otherwise
           bodyPath: bodyPath || '',
           settingSendCookies: renderedRequest.settingSendCookies,
           settingStoreCookies: renderedRequest.settingStoreCookies,
-        }: ResponsePatch),
+        } as ResponsePatch,
         patch,
       );
 
@@ -187,7 +188,8 @@ export async function _actuallySend(
         return;
       }
 
-      let responsePatch: ?ResponsePatch;
+      let responsePatch: ResponsePatch | null = null;
+
       try {
         responsePatch = await _applyResponsePluginHooks(
           responsePatchBeforeHooks,
@@ -205,7 +207,7 @@ export async function _actuallySend(
     }
 
     /** Helper function to respond with an error */
-    async function handleError(err: Error): Promise<void> {
+    async function handleError(err: Error) {
       await respond(
         {
           url: renderedRequest.url,
@@ -222,11 +224,12 @@ export async function _actuallySend(
     }
 
     /** Helper function to set Curl options */
-    function setOpt(opt: number, val: any, optional: boolean = false) {
-      const name = Object.keys(Curl.option).find(name => Curl.option[name] === opt);
+    function setOpt(opt: Parameters<typeof curl.setOpt>[0] | CurlOptionName, val: Parameters<typeof curl.setOpt>[1], optional = false) {
       try {
+        // @ts-expect-error -- TSCONVERSION
         curl.setOpt(opt, val);
       } catch (err) {
+        const name = Object.keys(Curl.option).find(name => Curl.option[name] === opt);
         if (!optional) {
           throw new Error(`${err.message} (${opt} ${name || 'n/a'})`);
         } else {
@@ -244,8 +247,10 @@ export async function _actuallySend(
       cancelRequestFunctionMap[renderedRequest._id] = async () => {
         await respond(
           {
-            elapsedTime: curl.getInfo(Curl.info.TOTAL_TIME) * 1000,
+            elapsedTime: (curl.getInfo(Curl.info.TOTAL_TIME) as number || 0) * 1000,
+            // @ts-expect-error -- needs generic
             bytesRead: curl.getInfo(Curl.info.SIZE_DOWNLOAD),
+            // @ts-expect-error -- needs generic
             url: curl.getInfo(Curl.info.EFFECTIVE_URL),
             statusMessage: 'Cancelled',
             error: 'Request was cancelled',
@@ -253,15 +258,20 @@ export async function _actuallySend(
           null,
           true,
         );
-
         // Kill it!
         curl.close();
       };
 
       // Set all the basic options
-      setOpt(Curl.option.VERBOSE, true); // True so debug function works
-      setOpt(Curl.option.NOPROGRESS, true); // True so curl doesn't print progress
-      setOpt(Curl.option.ACCEPT_ENCODING, ''); // Auto decode everything
+      setOpt(Curl.option.VERBOSE, true);
+
+      // True so debug function works\
+      setOpt(Curl.option.NOPROGRESS, true);
+
+      // True so curl doesn't print progress
+      setOpt(Curl.option.ACCEPT_ENCODING, '');
+
+      // Auto decode everything
       enable(CurlFeature.Raw);
 
       // Set follow redirects setting
@@ -269,9 +279,11 @@ export async function _actuallySend(
         case 'off':
           setOpt(Curl.option.FOLLOWLOCATION, false);
           break;
+
         case 'on':
           setOpt(Curl.option.FOLLOWLOCATION, true);
           break;
+
         default:
           // Set to global setting
           setOpt(Curl.option.FOLLOWLOCATION, settings.followRedirects);
@@ -296,26 +308,31 @@ export async function _actuallySend(
           // This is how you tell Curl to send a HEAD request
           setOpt(Curl.option.NOBODY, 1);
           break;
+
         case 'POST':
           // This is how you tell Curl to send a POST request
           setOpt(Curl.option.POST, 1);
           break;
+
         default:
           // IMPORTANT: Only use CUSTOMREQUEST for all but HEAD and POST
           setOpt(Curl.option.CUSTOMREQUEST, renderedRequest.method);
           break;
       }
 
+      // @ts-expect-error -- TSCONVERSION appears to be a genuine error
       // Setup debug handler
       setOpt(Curl.option.DEBUGFUNCTION, (infoType: string, contentBuffer: Buffer) => {
         const content = contentBuffer.toString('utf8');
         const rawName = Object.keys(CurlInfoDebug).find(k => CurlInfoDebug[k] === infoType) || '';
         const name = LIBCURL_DEBUG_MIGRATION_MAP[rawName] || rawName;
 
+        // @ts-expect-error -- TSCONVERSION appears to be a genuine error
         if (infoType === CurlInfoDebug.SslDataIn || infoType === CurlInfoDebug.SslDataOut) {
           return 0;
         }
 
+        // @ts-expect-error -- TSCONVERSION appears to be a genuine error
         // Ignore the possibly large data messages
         if (infoType === CurlInfoDebug.DataOut) {
           if (contentBuffer.length === 0) {
@@ -325,32 +342,33 @@ export async function _actuallySend(
           } else {
             addTimeline(name, `(${describeByteSize(contentBuffer.length)} hidden)`);
           }
+
           return 0;
         }
 
+        // @ts-expect-error -- TSCONVERSION appears to be a genuine error
         if (infoType === CurlInfoDebug.DataIn) {
           addTimelineText(`Received ${describeByteSize(contentBuffer.length)} chunk`);
           return 0;
         }
 
+        // @ts-expect-error -- TSCONVERSION appears to be a genuine error
         // Don't show cookie setting because this will display every domain in the jar
         if (infoType === CurlInfoDebug.Text && content.indexOf('Added cookie') === 0) {
           return 0;
         }
 
         addTimeline(name, content);
-
         return 0; // Must be here
       });
-
       // Set the headers (to be modified as we go)
       const headers = clone(renderedRequest.headers);
-
       // Set the URL, including the query parameters
       const qs = buildQueryStringFromParams(renderedRequest.parameters);
       const url = joinUrlAndQueryString(renderedRequest.url, qs);
       const isUnixSocket = url.match(/https?:\/\/unix:\//);
       const finalUrl = smartEncodeUrl(url, renderedRequest.settingEncodeUrl);
+
       if (isUnixSocket) {
         // URL prep will convert "unix:/path" hostname to "unix/path"
         const match = finalUrl.match(/(https?:)\/\/unix:?(\/[^:]+):\/(.+)/);
@@ -362,6 +380,7 @@ export async function _actuallySend(
       } else {
         setOpt(Curl.option.URL, finalUrl);
       }
+
       addTimelineText('Preparing request to ' + finalUrl);
       addTimelineText('Current time is ' + new Date().toISOString());
       addTimelineText(`Using ${Curl.getVersion()}`);
@@ -372,21 +391,26 @@ export async function _actuallySend(
           addTimelineText('Using HTTP 1.0');
           setOpt(Curl.option.HTTP_VERSION, CurlHttpVersion.V1_0);
           break;
+
         case HttpVersions.V1_1:
           addTimelineText('Using HTTP 1.1');
           setOpt(Curl.option.HTTP_VERSION, CurlHttpVersion.V1_1);
           break;
+
         case HttpVersions.V2_0:
           addTimelineText('Using HTTP/2');
           setOpt(Curl.option.HTTP_VERSION, CurlHttpVersion.V2_0);
           break;
+
         case HttpVersions.v3:
           addTimelineText('Using HTTP/3');
           setOpt(Curl.option.HTTP_VERSION, CurlHttpVersion.v3);
           break;
+
         case HttpVersions.default:
           addTimelineText('Using default HTTP version');
           break;
+
         default:
           addTimelineText(`Unknown HTTP version specified ${settings.preferredHttpVersion}`);
           break;
@@ -426,7 +450,8 @@ export async function _actuallySend(
       } catch (err) {
         // Doesn't exist yet, so write it
         mkdirp.sync(baseCAPath);
-        fs.writeFileSync(fullCAPath, CACerts);
+        // @ts-expect-error -- TSCONVERSION
+        fs.writeFileSync(fullCAPath, caCerts);
         console.log('[net] Set CA to', fullCAPath);
       }
 
@@ -437,10 +462,11 @@ export async function _actuallySend(
         // Tell Curl to store cookies that it receives. This is only important if we receive
         // a cookie on a redirect that needs to be sent on the next request in the chain.
         curl.setOpt(Curl.option.COOKIEFILE, '');
-
         const cookies = renderedRequest.cookieJar.cookies || [];
+
         for (const cookie of cookies) {
           let expiresTimestamp = 0;
+
           if (cookie.expires) {
             const expiresDate = new Date(cookie.expires);
             expiresTimestamp = Math.round(expiresDate.getTime() / 1000);
@@ -480,10 +506,12 @@ export async function _actuallySend(
         const proxyHost = protocol === 'https:' ? httpsProxy : httpProxy;
         const proxy = proxyHost ? setDefaultProtocol(proxyHost) : null;
         addTimelineText(`Enable network proxy for ${protocol || ''}`);
+
         if (proxy) {
           setOpt(Curl.option.PROXY, proxy);
           setOpt(Curl.option.PROXYAUTH, CurlAuth.Any);
         }
+
         if (noProxy) {
           setOpt(Curl.option.NOPROXY, noProxy);
         }
@@ -493,7 +521,8 @@ export async function _actuallySend(
 
       // Set client certs if needed
       const clientCertificates = await models.clientCertificate.findByParentId(workspace._id);
-      for (const certificate of clientCertificates) {
+
+      for (const certificate of (clientCertificates || [])) {
         if (certificate.disabled) {
           continue;
         }
@@ -512,7 +541,6 @@ export async function _actuallySend(
               const name = `${renderedRequest._id}_${renderedRequest.modified}`;
               const fullPath = pathJoin(fullBase, name);
               fs.writeFileSync(fullPath, Buffer.from(blobOrFilename, 'base64'));
-
               // Set filename to the one we just saved
               blobOrFilename = fullPath;
             }
@@ -547,8 +575,9 @@ export async function _actuallySend(
 
       // Build the body
       let noBody = false;
-      let requestBody = null;
+      let requestBody: string | null = null;
       const expectsBody = ['POST', 'PUT', 'PATCH'].includes(renderedRequest.method.toUpperCase());
+
       if (renderedRequest.body.mimeType === CONTENT_TYPE_FORM_URLENCODED) {
         requestBody = buildQueryStringFromParams(renderedRequest.body.params || [], false);
       } else if (renderedRequest.body.mimeType === CONTENT_TYPE_FORM_DATA) {
@@ -556,9 +585,9 @@ export async function _actuallySend(
         const { filePath: multipartBodyPath, boundary, contentLength } = await buildMultipart(
           params,
         );
-
         // Extend the Content-Type header
         const contentTypeHeader = getContentTypeHeader(headers);
+
         if (contentTypeHeader) {
           contentTypeHeader.value = `multipart/form-data; boundary=${boundary}`;
         } else {
@@ -569,11 +598,9 @@ export async function _actuallySend(
         }
 
         const fd = fs.openSync(multipartBodyPath, 'r');
-
         setOpt(Curl.option.INFILESIZE_LARGE, contentLength);
         setOpt(Curl.option.UPLOAD, 1);
         setOpt(Curl.option.READDATA, fd);
-
         // We need this, otherwise curl will send it as a PUT
         setOpt(Curl.option.CUSTOMREQUEST, renderedRequest.method);
 
@@ -590,15 +617,14 @@ export async function _actuallySend(
         const { size } = fs.statSync(renderedRequest.body.fileName);
         const fileName = renderedRequest.body.fileName || '';
         const fd = fs.openSync(fileName, 'r');
-
         setOpt(Curl.option.INFILESIZE_LARGE, size);
         setOpt(Curl.option.UPLOAD, 1);
         setOpt(Curl.option.READDATA, fd);
-
         // We need this, otherwise curl will send it as a POST
         setOpt(Curl.option.CUSTOMREQUEST, renderedRequest.method);
 
         const fn = () => fs.closeSync(fd);
+
         curl.on('end', fn);
         curl.on('error', fn);
       } else if (typeof renderedRequest.body.mimeType === 'string' || expectsBody) {
@@ -643,6 +669,7 @@ export async function _actuallySend(
               new Error('AWS authentication not supported for provided body type'),
             );
           }
+
           const { authentication } = renderedRequest;
           const credentials = {
             accessKeyId: authentication.accessKeyId || '',
@@ -711,6 +738,7 @@ export async function _actuallySend(
         .filter(h => h.name)
         .map(h => {
           const value = h.value || '';
+
           if (value === '') {
             // Curl needs a semicolon suffix to send empty header values
             return `${h.name};`;
@@ -722,8 +750,8 @@ export async function _actuallySend(
             return `${h.name}: ${value}`;
           }
         });
+      // @ts-expect-error -- TSCONVERSION appears to be a genuine error
       setOpt(Curl.option.HTTPHEADER, headerStrings);
-
       let responseBodyBytes = 0;
       const responsesDir = pathJoin(getDataDirectory(), 'responses');
       mkdirp.sync(responsesDir);
@@ -731,30 +759,27 @@ export async function _actuallySend(
       const responseBodyWriteStream = fs.createWriteStream(responseBodyPath);
       curl.on('end', () => responseBodyWriteStream.end());
       curl.on('error', () => responseBodyWriteStream.end());
+      // @ts-expect-error -- TSCONVERSION appears to be a genuine error
       setOpt(Curl.option.WRITEFUNCTION, (buff: Buffer) => {
         responseBodyBytes += buff.length;
         responseBodyWriteStream.write(buff);
         return buff.length;
       });
-
       // Handle the response ending
-      curl.on('end', async (_1, _2, rawHeaders) => {
+      curl.on('end', async (_1, _2, rawHeaders: Buffer) => {
         const allCurlHeadersObjects = _parseHeaders(rawHeaders);
+
         // Headers are an array (one for each redirect)
         const lastCurlHeadersObject = allCurlHeadersObjects[allCurlHeadersObjects.length - 1];
-
         // Collect various things
         const httpVersion = lastCurlHeadersObject.version || '';
         const statusCode = lastCurlHeadersObject.code || -1;
         const statusMessage = lastCurlHeadersObject.reason || '';
-
         // Collect the headers
         const headers = lastCurlHeadersObject.headers;
-
         // Calculate the content type
         const contentTypeHeader = getContentTypeHeader(headers);
         const contentType = contentTypeHeader ? contentTypeHeader.value : '';
-
         // Update Cookie Jar
         let currentUrl = finalUrl;
         let setCookieStrings: Array<string> = [];
@@ -764,9 +789,9 @@ export async function _actuallySend(
           // Collect Set-Cookie headers
           const setCookieHeaders = getSetCookieHeaders(headers);
           setCookieStrings = [...setCookieStrings, ...setCookieHeaders.map(h => h.value)];
-
           // Pull out new URL if there is a redirect
           const newLocation = getLocationHeader(headers);
+
           if (newLocation !== null) {
             currentUrl = urlResolve(currentUrl, newLocation.value);
           }
@@ -784,12 +809,15 @@ export async function _actuallySend(
         // Update cookie jar if we need to and if we found any cookies
         if (renderedRequest.settingStoreCookies && setCookieStrings.length) {
           const cookies = await cookiesFromJar(jar);
-          await models.cookieJar.update(renderedRequest.cookieJar, { cookies });
+          await models.cookieJar.update(renderedRequest.cookieJar, {
+            cookies,
+          });
         }
 
         // Print informational message
         if (setCookieStrings.length > 0) {
           const n = setCookieStrings.length;
+
           if (renderedRequest.settingStoreCookies) {
             addTimelineText(`Saved ${n} cookie${n === 1 ? '' : 's'}`);
           } else {
@@ -798,28 +826,27 @@ export async function _actuallySend(
         }
 
         // Return the response data
-        const responsePatch = {
+        const responsePatch: ResponsePatch = {
           contentType,
           headers,
           httpVersion,
           statusCode,
           statusMessage,
           bytesContent: responseBodyBytes,
+          // @ts-expect-error -- TSCONVERSION appears to be a genuine error
           bytesRead: curl.getInfo(Curl.info.SIZE_DOWNLOAD),
+          // @ts-expect-error -- TSCONVERSION appears to be a genuine error
           elapsedTime: curl.getInfo(Curl.info.TOTAL_TIME) * 1000,
+          // @ts-expect-error -- TSCONVERSION appears to be a genuine error
           url: curl.getInfo(Curl.info.EFFECTIVE_URL),
         };
-
         // Close the request
         curl.close();
-
         // Make sure the response body has been fully written first
         await waitForStreamToFinish(responseBodyWriteStream);
-
         // Send response
         await respond(responsePatch, responseBodyPath);
       });
-
       curl.on('error', async function(err, code) {
         let error = err + '';
         let statusMessage = 'Error';
@@ -838,7 +865,6 @@ export async function _actuallySend(
           true,
         );
       });
-
       curl.perform();
     } catch (err) {
       console.log('[network] Error', err);
@@ -849,9 +875,10 @@ export async function _actuallySend(
 
 export async function sendWithSettings(
   requestId: string,
-  requestPatch: Object,
-): Promise<ResponsePatch> {
+  requestPatch: Record<string, any>,
+) {
   const request = await models.request.getById(requestId);
+
   if (!request) {
     throw new Error(`Failed to find request: ${requestId}`);
   }
@@ -862,25 +889,26 @@ export async function sendWithSettings(
     models.requestGroup.type,
     models.workspace.type,
   ]);
-
   const workspaceDoc = ancestors.find(doc => doc.type === models.workspace.type);
   const workspaceId = workspaceDoc ? workspaceDoc._id : 'n/a';
   const workspace = await models.workspace.getById(workspaceId);
+
   if (!workspace) {
     throw new Error(`Failed to find workspace for: ${requestId}`);
   }
 
   const workspaceMeta = await models.workspaceMeta.getOrCreateByParentId(workspace._id);
   const environmentId: string = workspaceMeta.activeEnvironmentId || 'n/a';
-
   const newRequest: Request = await models.initModel(models.request.type, requestPatch, {
     _id: request._id + '.other',
     parentId: request._id,
   });
-
   const environment: Environment | null = await models.environment.getById(environmentId || 'n/a');
+  let renderResult: {
+    request: RenderedRequest;
+    context: Record<string, any>;
+  };
 
-  let renderResult: { request: RenderedRequest, context: Object };
   try {
     renderResult = await getRenderedRequestAndContext(newRequest, environmentId);
   } catch (err) {
@@ -900,10 +928,10 @@ export async function send(
   requestId: string,
   environmentId?: string,
   extraInfo?: ExtraRenderInfo,
-): Promise<ResponsePatch> {
+) {
   console.log(`[network] Sending req=${requestId} env=${environmentId || 'null'}`);
-
   // HACK: wait for all debounces to finish
+
   /*
    * TODO: Do this in a more robust way
    * The following block adds a "long" delay to let potential debounces and
@@ -913,6 +941,7 @@ export async function send(
    */
   const timeSinceLastInteraction = Date.now() - lastUserInteraction;
   const delayMillis = Math.max(0, MAX_DELAY_TIME - timeSinceLastInteraction);
+
   if (delayMillis > 0) {
     await delay(delayMillis);
   }
@@ -931,24 +960,23 @@ export async function send(
   }
 
   const environment: Environment | null = await models.environment.getById(environmentId || 'n/a');
-
   const renderResult = await getRenderedRequestAndContext(
     request,
     environmentId || null,
     RENDER_PURPOSE_SEND,
     extraInfo,
   );
-
   const renderedRequestBeforePlugins = renderResult.request;
   const renderedContextBeforePlugins = renderResult.context;
-
   const workspaceDoc = ancestors.find(doc => doc.type === models.workspace.type);
   const workspace = await models.workspace.getById(workspaceDoc ? workspaceDoc._id : 'n/a');
+
   if (!workspace) {
     throw new Error(`Failed to find workspace for request: ${requestId}`);
   }
 
   let renderedRequest: RenderedRequest;
+
   try {
     renderedRequest = await _applyRequestPluginHooks(
       renderedRequestBeforePlugins,
@@ -964,7 +992,7 @@ export async function send(
       statusCode: STATUS_CODE_PLUGIN_ERROR,
       statusMessage: err.plugin ? `Plugin ${err.plugin.name}` : 'Plugin',
       url: renderedRequestBeforePlugins.url,
-    };
+    } as ResponsePatch;
   }
 
   const response = await _actuallySend(
@@ -974,28 +1002,27 @@ export async function send(
     settings,
     environment,
   );
-
   console.log(
     response.error
       ? `[network] Response failed req=${requestId} err=${response.error || 'n/a'}`
       : `[network] Response succeeded req=${requestId} status=${response.statusCode || '?'}`,
   );
-
   return response;
 }
 
 async function _applyRequestPluginHooks(
   renderedRequest: RenderedRequest,
-  renderedContext: Object,
-): Promise<RenderedRequest> {
+  renderedContext: Record<string, any>,
+) {
   const newRenderedRequest = clone(renderedRequest);
+
   for (const { plugin, hook } of await plugins.getRequestHooks()) {
     const context = {
-      ...(pluginContexts.app.init(RENDER_PURPOSE_NO_RENDER): Object),
-      ...(pluginContexts.data.init(): Object),
-      ...(pluginContexts.store.init(plugin): Object),
-      ...(pluginContexts.request.init(newRenderedRequest, renderedContext): Object),
-      ...(pluginContexts.network.init(renderedContext.getEnvironmentId()): Object),
+      ...(pluginContexts.app.init(RENDER_PURPOSE_NO_RENDER) as Record<string, any>),
+      ...(pluginContexts.data.init() as Record<string, any>),
+      ...(pluginContexts.store.init(plugin) as Record<string, any>),
+      ...(pluginContexts.request.init(newRenderedRequest, renderedContext) as Record<string, any>),
+      ...(pluginContexts.network.init(renderedContext.getEnvironmentId()) as Record<string, any>),
     };
 
     try {
@@ -1012,19 +1039,19 @@ async function _applyRequestPluginHooks(
 async function _applyResponsePluginHooks(
   response: ResponsePatch,
   renderedRequest: RenderedRequest,
-  renderedContext: Object,
-): Promise<ResponsePatch> {
+  renderedContext: Record<string, any>,
+) {
   const newResponse = clone(response);
   const newRequest = clone(renderedRequest);
 
   for (const { plugin, hook } of await plugins.getResponseHooks()) {
     const context = {
-      ...(pluginContexts.app.init(RENDER_PURPOSE_NO_RENDER): Object),
-      ...(pluginContexts.data.init(): Object),
-      ...(pluginContexts.store.init(plugin): Object),
-      ...(pluginContexts.response.init(newResponse): Object),
-      ...(pluginContexts.request.init(newRequest, renderedContext, true): Object),
-      ...(pluginContexts.network.init(renderedContext.getEnvironmentId()): Object),
+      ...(pluginContexts.app.init(RENDER_PURPOSE_NO_RENDER) as Record<string, any>),
+      ...(pluginContexts.data.init() as Record<string, any>),
+      ...(pluginContexts.store.init(plugin) as Record<string, any>),
+      ...(pluginContexts.response.init(newResponse) as Record<string, any>),
+      ...(pluginContexts.request.init(newRequest, renderedContext, true) as Record<string, any>),
+      ...(pluginContexts.network.init(renderedContext.getEnvironmentId()) as Record<string, any>),
     };
 
     try {
@@ -1038,19 +1065,20 @@ async function _applyResponsePluginHooks(
   return newResponse;
 }
 
+interface HeaderResult {
+  headers: Array<ResponseHeader>;
+  version: string;
+  code: number;
+  reason: string;
+}
+
 export function _parseHeaders(
   buffer: Buffer,
-): Array<{
-  headers: Array<ResponseHeader>,
-  version: string,
-  code: number,
-  reason: string,
-}> {
-  const results = [];
-
+) {
+  const results: Array<HeaderResult> = [];
   const lines = buffer.toString('utf8').split(/\r?\n|\r/g);
 
-  for (let i = 0, currentResult = null; i < lines.length; i++) {
+  for (let i = 0, currentResult: HeaderResult | null = null; i < lines.length; i++) {
     const line = lines[i];
     const isEmptyLine = line.trim() === '';
 
@@ -1085,9 +1113,9 @@ export function _parseHeaders(
 // exported for unit tests only
 export function _getAwsAuthHeaders(
   credentials: {
-    accessKeyId: string,
-    secretAccessKey: string,
-    sessionToken: string,
+    accessKeyId: string;
+    secretAccessKey: string;
+    sessionToken: string;
   },
   headers: Array<RequestHeader>,
   body: string,
@@ -1095,14 +1123,17 @@ export function _getAwsAuthHeaders(
   method: string,
   region?: string,
   service?: string,
-): Array<{ name: string, value: string, description?: string, disabled?: boolean }> {
+): Array<{
+  name: string;
+  value: string;
+  description?: string;
+  disabled?: boolean;
+}> {
   const parsedUrl = urlParse(url);
   const contentTypeHeader = getContentTypeHeader(headers);
-
   // AWS uses host header for signing so prioritize that if the user set it manually
   const hostHeader = getHostHeader(headers);
   const host = hostHeader ? hostHeader.value : parsedUrl.host;
-
   const awsSignOptions = {
     service,
     region,
@@ -1110,11 +1141,13 @@ export function _getAwsAuthHeaders(
     body,
     method,
     path: parsedUrl.path,
-    headers: contentTypeHeader ? { 'content-type': contentTypeHeader.value } : {},
+    headers: contentTypeHeader
+      ? {
+          'content-type': contentTypeHeader.value,
+        }
+      : {},
   };
-
   const signature = aws4.sign(awsSignOptions, credentials);
-
   return Object.keys(signature.headers)
     .filter(name => name !== 'content-type') // Don't add this because we already have it
     .map(name => ({
@@ -1123,13 +1156,10 @@ export function _getAwsAuthHeaders(
     }));
 }
 
-function storeTimeline(timeline: Array<ResponseTimelineEntry>): Promise<string> {
-  return new Promise((resolve, reject) => {
+function storeTimeline(timeline: Array<ResponseTimelineEntry>) {
+  return new Promise<string>((resolve, reject) => {
     const timelineStr = JSON.stringify(timeline, null, '\t');
-    const timelineHash = crypto
-      .createHash('sha1')
-      .update(timelineStr)
-      .digest('hex');
+    const timelineHash = crypto.createHash('sha1').update(timelineStr).digest('hex');
     const responsesDir = pathJoin(getDataDirectory(), 'responses');
     mkdirp.sync(responsesDir);
     const timelinePath = pathJoin(responsesDir, timelineHash + '.timeline');
@@ -1151,8 +1181,7 @@ if (global.document) {
 
     lastUserInteraction = Date.now();
   });
-
-  document.addEventListener('paste', (e: Event) => {
+  document.addEventListener('paste', () => {
     lastUserInteraction = Date.now();
   });
 }
diff --git a/packages/insomnia-app/app/network/o-auth-1/constants.js b/packages/insomnia-app/app/network/o-auth-1/constants.ts
similarity index 97%
rename from packages/insomnia-app/app/network/o-auth-1/constants.js
rename to packages/insomnia-app/app/network/o-auth-1/constants.ts
index 7741afe1d1..f12ebe619f 100644
--- a/packages/insomnia-app/app/network/o-auth-1/constants.js
+++ b/packages/insomnia-app/app/network/o-auth-1/constants.ts
@@ -1,4 +1,3 @@
-// @flow
 export type OAuth1SignatureMethod = 'HMAC-SHA1' | 'RSA-SHA1' | 'HMAC-SHA256' | 'PLAINTEXT';
 export const SIGNATURE_METHOD_HMAC_SHA1: OAuth1SignatureMethod = 'HMAC-SHA1';
 export const SIGNATURE_METHOD_HMAC_SHA256: OAuth1SignatureMethod = 'HMAC-SHA256';
diff --git a/packages/insomnia-app/app/network/o-auth-1/get-token.js b/packages/insomnia-app/app/network/o-auth-1/get-token.ts
similarity index 73%
rename from packages/insomnia-app/app/network/o-auth-1/get-token.js
rename to packages/insomnia-app/app/network/o-auth-1/get-token.ts
index d0615bf867..52ee3ed34b 100644
--- a/packages/insomnia-app/app/network/o-auth-1/get-token.js
+++ b/packages/insomnia-app/app/network/o-auth-1/get-token.ts
@@ -1,4 +1,3 @@
-// @flow
 /**
  * Get an OAuth1Token object and also handle storing/saving/refreshing
  * @returns {Promise.<void>}
@@ -17,34 +16,25 @@ import { CONTENT_TYPE_FORM_URLENCODED } from '../../common/constants';
 
 function hashFunction(signatureMethod: OAuth1SignatureMethod) {
   if (signatureMethod === SIGNATURE_METHOD_HMAC_SHA1) {
-    return function(baseString: string, key: string): string {
-      return crypto
-        .createHmac('sha1', key)
-        .update(baseString)
-        .digest('base64');
+    return function(baseString: string, key: string) {
+      return crypto.createHmac('sha1', key).update(baseString).digest('base64');
     };
   }
 
   if (signatureMethod === SIGNATURE_METHOD_HMAC_SHA256) {
-    return function(baseString: string, key: string): string {
-      return crypto
-        .createHmac('sha256', key)
-        .update(baseString)
-        .digest('base64');
+    return function(baseString: string, key: string) {
+      return crypto.createHmac('sha256', key).update(baseString).digest('base64');
     };
   }
 
   if (signatureMethod === SIGNATURE_METHOD_RSA_SHA1) {
-    return function(baseString: string, privatekey: string): string {
-      return crypto
-        .createSign('RSA-SHA1')
-        .update(baseString)
-        .sign(privatekey, 'base64');
+    return function(baseString: string, privatekey: string) {
+      return crypto.createSign('RSA-SHA1').update(baseString).sign(privatekey, 'base64');
     };
   }
 
   if (signatureMethod === SIGNATURE_METHOD_PLAINTEXT) {
-    return function(baseString: string): string {
+    return function(baseString: string) {
       return baseString;
     };
   }
@@ -57,7 +47,7 @@ export default async function(
   method: string,
   authentication: RequestAuthentication,
   body: RequestBody | null = null,
-): { [string]: string } {
+) {
   const oauth = new OAuth1({
     consumer: {
       key: authentication.consumerKey,
@@ -68,7 +58,6 @@ export default async function(
     hash_function: hashFunction(authentication.signatureMethod),
     realm: authentication.realm || null,
   });
-
   const requestData = {
     url: url,
     method: method,
@@ -79,40 +68,53 @@ export default async function(
   };
 
   if (authentication.callback) {
+    // @ts-expect-error -- TSCONVERSION needs type widening
     requestData.data.oauth_callback = authentication.callback;
   }
 
   if (authentication.nonce) {
+    // @ts-expect-error -- TSCONVERSION needs type widening
     requestData.data.oauth_nonce = authentication.nonce;
   }
 
   if (authentication.timestamp) {
+    // @ts-expect-error -- TSCONVERSION needs type widening
     requestData.data.oauth_timestamp = authentication.timestamp;
   }
 
   if (authentication.verifier) {
+    // @ts-expect-error -- TSCONVERSION needs type widening
     requestData.data.oauth_verifier = authentication.verifier;
   }
 
   if (authentication.includeBodyHash && body && body.mimeType === CONTENT_TYPE_FORM_URLENCODED) {
     requestData.includeBodyHash = true;
+
     for (const p of body.params || []) {
       requestData.data[p.name] = p.value;
     }
   }
 
-  let token = null;
+  let token: OAuth1.Token | undefined;
+
   if (authentication.tokenKey && authentication.tokenSecret) {
     token = {
       key: authentication.tokenKey,
       secret: authentication.tokenSecret,
     };
   } else if (authentication.tokenKey) {
-    token = { key: authentication.tokenKey };
+    // @ts-expect-error -- TSCONVERSION likely needs a `secret: undefined` or the type is not actually correct.
+    token = {
+      key: authentication.tokenKey,
+    };
   }
 
   if (authentication.signatureMethod === SIGNATURE_METHOD_RSA_SHA1) {
-    token = { key: authentication.tokenKey, secret: authentication.privateKey };
+    token = {
+      key: authentication.tokenKey,
+      secret: authentication.privateKey,
+    };
+
     // We override getSigningKey for RSA-SHA1 because we don't want ddo/oauth-1.0a to percentEncode the token
     oauth.getSigningKey = function(tokenSecret) {
       return tokenSecret || '';
diff --git a/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-authorization-code.test.js b/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-authorization-code.test.ts
similarity index 74%
rename from packages/insomnia-app/app/network/o-auth-2/__tests__/grant-authorization-code.test.js
rename to packages/insomnia-app/app/network/o-auth-2/__tests__/grant-authorization-code.test.ts
index fe7c8700d8..b19c9d0665 100644
--- a/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-authorization-code.test.js
+++ b/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-authorization-code.test.ts
@@ -4,7 +4,7 @@ import { globalBeforeEach } from '../../../__jest__/before-each';
 import * as network from '../../network';
 import fs from 'fs';
 import path from 'path';
-import { getTempDir } from '../../../common/constants';
+import { getTempDir } from '../../../common/electron-helpers';
 
 // Mock some test things
 const AUTHORIZE_URL = 'https://foo.com/authorizeAuthCode';
@@ -19,10 +19,10 @@ const RESOURCE = 'foo.com';
 
 describe('authorization_code', () => {
   beforeEach(globalBeforeEach);
+
   it('gets token with JSON and basic auth', async () => {
     createBWRedirectMock(`${REDIRECT_URI}?code=code_123&state=${STATE}`);
     const bodyPath = path.join(getTempDir(), 'foo.response');
-
     fs.writeFileSync(
       bodyPath,
       JSON.stringify({
@@ -33,15 +33,18 @@ describe('authorization_code', () => {
         resource: RESOURCE,
       }),
     );
-
     network.sendWithSettings = jest.fn(() => ({
       bodyPath,
       bodyCompression: '',
       parentId: 'req_1',
       statusCode: 200,
-      headers: [{ name: 'Content-Type', value: 'application/json' }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: 'application/json',
+        },
+      ],
     }));
-
     const result = await getToken(
       'req_1',
       AUTHORIZE_URL,
@@ -55,7 +58,6 @@ describe('authorization_code', () => {
       AUDIENCE,
       RESOURCE,
     );
-
     // Check the request to fetch the token
     expect(network.sendWithSettings.mock.calls).toEqual([
       [
@@ -66,12 +68,30 @@ describe('authorization_code', () => {
           body: {
             mimeType: 'application/x-www-form-urlencoded',
             params: [
-              { name: 'grant_type', value: 'authorization_code' },
-              { name: 'code', value: 'code_123' },
-              { name: 'redirect_uri', value: REDIRECT_URI },
-              { name: 'state', value: STATE },
-              { name: 'audience', value: AUDIENCE },
-              { name: 'resource', value: RESOURCE },
+              {
+                name: 'grant_type',
+                value: 'authorization_code',
+              },
+              {
+                name: 'code',
+                value: 'code_123',
+              },
+              {
+                name: 'redirect_uri',
+                value: REDIRECT_URI,
+              },
+              {
+                name: 'state',
+                value: STATE,
+              },
+              {
+                name: 'audience',
+                value: AUDIENCE,
+              },
+              {
+                name: 'resource',
+                value: RESOURCE,
+              },
             ],
           },
           headers: [
@@ -91,7 +111,6 @@ describe('authorization_code', () => {
         },
       ],
     ]);
-
     // Check the expected value
     expect(result).toEqual({
       access_token: 'token_123',
@@ -112,7 +131,6 @@ describe('authorization_code', () => {
   it('gets token with urlencoded and body auth', async () => {
     createBWRedirectMock(`${REDIRECT_URI}?code=code_123&state=${STATE}`);
     const bodyPath = path.join(getTempDir(), 'foo.response');
-
     fs.writeFileSync(
       bodyPath,
       JSON.stringify({
@@ -123,15 +141,18 @@ describe('authorization_code', () => {
         resource: RESOURCE,
       }),
     );
-
     network.sendWithSettings = jest.fn(() => ({
       bodyPath,
       bodyCompression: '',
       parentId: 'req_1',
       statusCode: 200,
-      headers: [{ name: 'Content-Type', value: 'application/x-www-form-urlencoded' }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: 'application/x-www-form-urlencoded',
+        },
+      ],
     }));
-
     const result = await getToken(
       'req_1',
       AUTHORIZE_URL,
@@ -145,7 +166,6 @@ describe('authorization_code', () => {
       AUDIENCE,
       RESOURCE,
     );
-
     // Check the request to fetch the token
     expect(network.sendWithSettings.mock.calls).toEqual([
       [
@@ -156,14 +176,38 @@ describe('authorization_code', () => {
           body: {
             mimeType: 'application/x-www-form-urlencoded',
             params: [
-              { name: 'grant_type', value: 'authorization_code' },
-              { name: 'code', value: 'code_123' },
-              { name: 'redirect_uri', value: REDIRECT_URI },
-              { name: 'state', value: STATE },
-              { name: 'audience', value: AUDIENCE },
-              { name: 'resource', value: RESOURCE },
-              { name: 'client_id', value: CLIENT_ID },
-              { name: 'client_secret', value: CLIENT_SECRET },
+              {
+                name: 'grant_type',
+                value: 'authorization_code',
+              },
+              {
+                name: 'code',
+                value: 'code_123',
+              },
+              {
+                name: 'redirect_uri',
+                value: REDIRECT_URI,
+              },
+              {
+                name: 'state',
+                value: STATE,
+              },
+              {
+                name: 'audience',
+                value: AUDIENCE,
+              },
+              {
+                name: 'resource',
+                value: RESOURCE,
+              },
+              {
+                name: 'client_id',
+                value: CLIENT_ID,
+              },
+              {
+                name: 'client_secret',
+                value: CLIENT_SECRET,
+              },
             ],
           },
           headers: [
@@ -179,7 +223,6 @@ describe('authorization_code', () => {
         },
       ],
     ]);
-
     // Check the expected value
     expect(result).toEqual({
       access_token: 'token_123',
@@ -200,7 +243,6 @@ describe('authorization_code', () => {
   it('uses PKCE', async () => {
     createBWRedirectMock(`${REDIRECT_URI}?code=code_123&state=${STATE}`);
     const bodyPath = path.join(getTempDir(), 'foo.response');
-
     fs.writeFileSync(
       bodyPath,
       JSON.stringify({
@@ -211,15 +253,18 @@ describe('authorization_code', () => {
         resource: RESOURCE,
       }),
     );
-
     network.sendWithSettings = jest.fn(() => ({
       bodyPath,
       bodyCompression: '',
       parentId: 'req_1',
       statusCode: 200,
-      headers: [{ name: 'Content-Type', value: 'application/json' }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: 'application/json',
+        },
+      ],
     }));
-
     const result = await getToken(
       'req_1',
       AUTHORIZE_URL,
@@ -234,12 +279,14 @@ describe('authorization_code', () => {
       RESOURCE,
       true,
     );
-
     // Check the request to fetch the token
     expect(network.sendWithSettings.mock.calls[0][1].body.params).toEqual(
-      expect.arrayContaining([expect.objectContaining({ name: 'code_verifier' })]),
+      expect.arrayContaining([
+        expect.objectContaining({
+          name: 'code_verifier',
+        }),
+      ]),
     );
-
     // Check the expected value
     expect(result).toEqual({
       access_token: 'token_123',
diff --git a/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-client-credentials.test.js b/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-client-credentials.test.ts
similarity index 75%
rename from packages/insomnia-app/app/network/o-auth-2/__tests__/grant-client-credentials.test.js
rename to packages/insomnia-app/app/network/o-auth-2/__tests__/grant-client-credentials.test.ts
index cea7fd23ed..73b6cf880b 100644
--- a/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-client-credentials.test.js
+++ b/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-client-credentials.test.ts
@@ -3,7 +3,7 @@ import { globalBeforeEach } from '../../../__jest__/before-each';
 import path from 'path';
 import fs from 'fs';
 import * as network from '../../network';
-import { getTempDir } from '../../../common/constants';
+import { getTempDir } from '../../../common/electron-helpers';
 
 // Mock some test things
 const ACCESS_TOKEN_URL = 'https://foo.com/access_token';
@@ -15,9 +15,9 @@ const RESOURCE = 'https://foo.com/resource';
 
 describe('client_credentials', () => {
   beforeEach(globalBeforeEach);
+
   it('gets token with JSON and basic auth', async () => {
     const bodyPath = path.join(getTempDir(), 'foo.response');
-
     fs.writeFileSync(
       bodyPath,
       JSON.stringify({
@@ -28,15 +28,18 @@ describe('client_credentials', () => {
         resource: RESOURCE,
       }),
     );
-
     network.sendWithSettings = jest.fn(() => ({
       bodyPath,
       bodyCompression: '',
       parentId: 'req_1',
       statusCode: 200,
-      headers: [{ name: 'Content-Type', value: 'application/json' }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: 'application/json',
+        },
+      ],
     }));
-
     const result = await getToken(
       'req_1',
       ACCESS_TOKEN_URL,
@@ -47,7 +50,6 @@ describe('client_credentials', () => {
       AUDIENCE,
       RESOURCE,
     );
-
     // Check the request to fetch the token
     expect(network.sendWithSettings.mock.calls).toEqual([
       [
@@ -58,10 +60,22 @@ describe('client_credentials', () => {
           body: {
             mimeType: 'application/x-www-form-urlencoded',
             params: [
-              { name: 'grant_type', value: 'client_credentials' },
-              { name: 'scope', value: SCOPE },
-              { name: 'audience', value: AUDIENCE },
-              { name: 'resource', value: RESOURCE },
+              {
+                name: 'grant_type',
+                value: 'client_credentials',
+              },
+              {
+                name: 'scope',
+                value: SCOPE,
+              },
+              {
+                name: 'audience',
+                value: AUDIENCE,
+              },
+              {
+                name: 'resource',
+                value: RESOURCE,
+              },
             ],
           },
           headers: [
@@ -81,7 +95,6 @@ describe('client_credentials', () => {
         },
       ],
     ]);
-
     // Check the expected value
     expect(result).toEqual({
       access_token: 'token_123',
@@ -100,7 +113,6 @@ describe('client_credentials', () => {
 
   it('gets token with urlencoded and body auth', async () => {
     const bodyPath = path.join(getTempDir(), 'req_1.response');
-
     fs.writeFileSync(
       bodyPath,
       JSON.stringify({
@@ -111,15 +123,18 @@ describe('client_credentials', () => {
         resource: RESOURCE,
       }),
     );
-
     network.sendWithSettings = jest.fn(() => ({
       bodyPath,
       bodyCompression: '',
       parentId: 'req_1',
       statusCode: 200,
-      headers: [{ name: 'Content-Type', value: 'application/x-www-form-urlencoded' }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: 'application/x-www-form-urlencoded',
+        },
+      ],
     }));
-
     const result = await getToken(
       'req_1',
       ACCESS_TOKEN_URL,
@@ -130,7 +145,6 @@ describe('client_credentials', () => {
       AUDIENCE,
       RESOURCE,
     );
-
     // Check the request to fetch the token
     expect(network.sendWithSettings.mock.calls).toEqual([
       [
@@ -141,12 +155,30 @@ describe('client_credentials', () => {
           body: {
             mimeType: 'application/x-www-form-urlencoded',
             params: [
-              { name: 'grant_type', value: 'client_credentials' },
-              { name: 'scope', value: SCOPE },
-              { name: 'audience', value: AUDIENCE },
-              { name: 'resource', value: RESOURCE },
-              { name: 'client_id', value: CLIENT_ID },
-              { name: 'client_secret', value: CLIENT_SECRET },
+              {
+                name: 'grant_type',
+                value: 'client_credentials',
+              },
+              {
+                name: 'scope',
+                value: SCOPE,
+              },
+              {
+                name: 'audience',
+                value: AUDIENCE,
+              },
+              {
+                name: 'resource',
+                value: RESOURCE,
+              },
+              {
+                name: 'client_id',
+                value: CLIENT_ID,
+              },
+              {
+                name: 'client_secret',
+                value: CLIENT_SECRET,
+              },
             ],
           },
           headers: [
@@ -162,7 +194,6 @@ describe('client_credentials', () => {
         },
       ],
     ]);
-
     // Check the expected value
     expect(result).toEqual({
       access_token: 'token_123',
diff --git a/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-implicit.test.js b/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-implicit.test.ts
similarity index 99%
rename from packages/insomnia-app/app/network/o-auth-2/__tests__/grant-implicit.test.js
rename to packages/insomnia-app/app/network/o-auth-2/__tests__/grant-implicit.test.ts
index 8fc6e7b7d7..dc7f47abaf 100644
--- a/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-implicit.test.js
+++ b/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-implicit.test.ts
@@ -1,7 +1,6 @@
 import getToken from '../grant-implicit';
 import { createBWRedirectMock } from './helpers';
 import { globalBeforeEach } from '../../../__jest__/before-each';
-
 // Mock some test things
 const AUTHORIZE_URL = 'https://foo.com/authorizeAuthCode';
 const CLIENT_ID = 'client_123';
@@ -12,11 +11,10 @@ const STATE = 'state_123';
 
 describe('implicit', () => {
   beforeEach(globalBeforeEach);
+
   it('works in default case', async () => {
     createBWRedirectMock(`${REDIRECT_URI}#access_token=token_123&state=${STATE}&foo=bar`);
-
     const result = await getToken(AUTHORIZE_URL, CLIENT_ID, REDIRECT_URI, SCOPE, STATE, AUDIENCE);
-
     expect(result).toEqual({
       access_token: 'token_123',
       id_token: null,
diff --git a/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-password.test.js b/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-password.test.ts
similarity index 72%
rename from packages/insomnia-app/app/network/o-auth-2/__tests__/grant-password.test.js
rename to packages/insomnia-app/app/network/o-auth-2/__tests__/grant-password.test.ts
index 7860d43226..ff5b8c789f 100644
--- a/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-password.test.js
+++ b/packages/insomnia-app/app/network/o-auth-2/__tests__/grant-password.test.ts
@@ -1,7 +1,7 @@
 import getToken from '../grant-password';
 import { globalBeforeEach } from '../../../__jest__/before-each';
 import * as network from '../../network';
-import { getTempDir } from '../../../common/constants';
+import { getTempDir } from '../../../common/electron-helpers';
 import path from 'path';
 import fs from 'fs';
 
@@ -16,9 +16,9 @@ const AUDIENCE = 'https://foo.com/userinfo';
 
 describe('password', () => {
   beforeEach(globalBeforeEach);
+
   it('gets token with JSON and basic auth', async () => {
     const bodyPath = path.join(getTempDir(), 'foo.response');
-
     fs.writeFileSync(
       bodyPath,
       JSON.stringify({
@@ -28,15 +28,18 @@ describe('password', () => {
         audience: AUDIENCE,
       }),
     );
-
     network.sendWithSettings = jest.fn(() => ({
       bodyPath,
       bodyCompression: '',
       parentId: 'req_1',
       statusCode: 200,
-      headers: [{ name: 'Content-Type', value: 'application/json' }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: 'application/json',
+        },
+      ],
     }));
-
     const result = await getToken(
       'req_1',
       ACCESS_TOKEN_URL,
@@ -48,7 +51,6 @@ describe('password', () => {
       SCOPE,
       AUDIENCE,
     );
-
     // Check the request to fetch the token
     expect(network.sendWithSettings.mock.calls).toEqual([
       [
@@ -59,11 +61,26 @@ describe('password', () => {
           body: {
             mimeType: 'application/x-www-form-urlencoded',
             params: [
-              { name: 'grant_type', value: 'password' },
-              { name: 'username', value: USERNAME },
-              { name: 'password', value: PASSWORD },
-              { name: 'scope', value: SCOPE },
-              { name: 'audience', value: AUDIENCE },
+              {
+                name: 'grant_type',
+                value: 'password',
+              },
+              {
+                name: 'username',
+                value: USERNAME,
+              },
+              {
+                name: 'password',
+                value: PASSWORD,
+              },
+              {
+                name: 'scope',
+                value: SCOPE,
+              },
+              {
+                name: 'audience',
+                value: AUDIENCE,
+              },
             ],
           },
           headers: [
@@ -83,7 +100,6 @@ describe('password', () => {
         },
       ],
     ]);
-
     // Check the expected value
     expect(result).toEqual({
       access_token: 'token_123',
@@ -102,7 +118,6 @@ describe('password', () => {
 
   it('gets token with urlencoded and body auth', async () => {
     const bodyPath = path.join(getTempDir(), 'foo.response');
-
     fs.writeFileSync(
       bodyPath,
       JSON.stringify({
@@ -112,15 +127,18 @@ describe('password', () => {
         audience: AUDIENCE,
       }),
     );
-
     network.sendWithSettings = jest.fn(() => ({
       bodyPath,
       bodyCompression: '',
       parentId: 'req_1',
       statusCode: 200,
-      headers: [{ name: 'Content-Type', value: 'application/x-www-form-urlencoded' }],
+      headers: [
+        {
+          name: 'Content-Type',
+          value: 'application/x-www-form-urlencoded',
+        },
+      ],
     }));
-
     const result = await getToken(
       'req_1',
       ACCESS_TOKEN_URL,
@@ -132,7 +150,6 @@ describe('password', () => {
       SCOPE,
       AUDIENCE,
     );
-
     // Check the request to fetch the token
     expect(network.sendWithSettings.mock.calls).toEqual([
       [
@@ -143,13 +160,34 @@ describe('password', () => {
           body: {
             mimeType: 'application/x-www-form-urlencoded',
             params: [
-              { name: 'grant_type', value: 'password' },
-              { name: 'username', value: USERNAME },
-              { name: 'password', value: PASSWORD },
-              { name: 'scope', value: SCOPE },
-              { name: 'audience', value: AUDIENCE },
-              { name: 'client_id', value: CLIENT_ID },
-              { name: 'client_secret', value: CLIENT_SECRET },
+              {
+                name: 'grant_type',
+                value: 'password',
+              },
+              {
+                name: 'username',
+                value: USERNAME,
+              },
+              {
+                name: 'password',
+                value: PASSWORD,
+              },
+              {
+                name: 'scope',
+                value: SCOPE,
+              },
+              {
+                name: 'audience',
+                value: AUDIENCE,
+              },
+              {
+                name: 'client_id',
+                value: CLIENT_ID,
+              },
+              {
+                name: 'client_secret',
+                value: CLIENT_SECRET,
+              },
             ],
           },
           headers: [
@@ -165,7 +203,6 @@ describe('password', () => {
         },
       ],
     ]);
-
     // Check the expected value
     expect(result).toEqual({
       access_token: 'token_123',
diff --git a/packages/insomnia-app/app/network/o-auth-2/__tests__/helpers.js b/packages/insomnia-app/app/network/o-auth-2/__tests__/helpers.ts
similarity index 99%
rename from packages/insomnia-app/app/network/o-auth-2/__tests__/helpers.js
rename to packages/insomnia-app/app/network/o-auth-2/__tests__/helpers.ts
index b09ab91a17..5a5cb7c7f4 100644
--- a/packages/insomnia-app/app/network/o-auth-2/__tests__/helpers.js
+++ b/packages/insomnia-app/app/network/o-auth-2/__tests__/helpers.ts
@@ -4,12 +4,17 @@ import EventEmitter from 'events';
 export function createBWRedirectMock(redirectTo) {
   electron.remote.BrowserWindow = jest.fn(function() {
     this._emitter = new EventEmitter();
+
     this.loadURL = () => this.webContents.emit('did-navigate');
+
     this.on = (event, cb) => this._emitter.on(event, cb);
+
     this.show = () => this._emitter.emit('show');
+
     this.close = () => this._emitter.emit('close');
 
     this.webContents = new EventEmitter();
+
     this.webContents.getURL = () => redirectTo;
 
     this._emitter.emit('ready-to-show');
diff --git a/packages/insomnia-app/app/network/o-auth-2/__tests__/misc.test.js b/packages/insomnia-app/app/network/o-auth-2/__tests__/misc.test.ts
similarity index 99%
rename from packages/insomnia-app/app/network/o-auth-2/__tests__/misc.test.js
rename to packages/insomnia-app/app/network/o-auth-2/__tests__/misc.test.ts
index b6651d4838..e0716231bd 100644
--- a/packages/insomnia-app/app/network/o-auth-2/__tests__/misc.test.js
+++ b/packages/insomnia-app/app/network/o-auth-2/__tests__/misc.test.ts
@@ -9,9 +9,7 @@ describe('responseToObject()', () => {
       str: 'hi',
       num: 10,
     });
-
     const keys = ['str', 'num'];
-
     expect(responseToObject(body, keys)).toEqual({
       str: 'hi',
       num: 10,
@@ -24,9 +22,7 @@ describe('responseToObject()', () => {
       num: 10,
       other: 'thing',
     });
-
     const keys = ['str'];
-
     expect(responseToObject(body, keys)).toEqual({
       str: 'hi',
     });
@@ -34,9 +30,7 @@ describe('responseToObject()', () => {
 
   it('works with things not found', () => {
     const body = JSON.stringify({});
-
     const keys = ['str'];
-
     expect(responseToObject(body, keys)).toEqual({
       str: null,
     });
@@ -47,14 +41,11 @@ describe('responseToObject()', () => {
       str: 'hi',
       num: 10,
     });
-
     const keys = ['str', 'missing'];
-
     const defaults = {
       missing: 'found it!',
       str: 'should not see this',
     };
-
     expect(responseToObject(body, keys, defaults)).toEqual({
       str: 'hi',
       missing: 'found it!',
diff --git a/packages/insomnia-app/app/network/o-auth-2/constants.js b/packages/insomnia-app/app/network/o-auth-2/constants.ts
similarity index 99%
rename from packages/insomnia-app/app/network/o-auth-2/constants.js
rename to packages/insomnia-app/app/network/o-auth-2/constants.ts
index cb134fcb5b..807ce914c5 100644
--- a/packages/insomnia-app/app/network/o-auth-2/constants.js
+++ b/packages/insomnia-app/app/network/o-auth-2/constants.ts
@@ -3,12 +3,10 @@ export const GRANT_TYPE_IMPLICIT = 'implicit';
 export const GRANT_TYPE_PASSWORD = 'password';
 export const GRANT_TYPE_CLIENT_CREDENTIALS = 'client_credentials';
 export const GRANT_TYPE_REFRESH = 'refresh_token';
-
 export const RESPONSE_TYPE_CODE = 'code';
 export const RESPONSE_TYPE_ID_TOKEN = 'id_token';
 export const RESPONSE_TYPE_TOKEN = 'token';
 export const RESPONSE_TYPE_ID_TOKEN_TOKEN = 'id_token token';
-
 export const P_ACCESS_TOKEN = 'access_token';
 export const P_ID_TOKEN = 'id_token';
 export const P_CLIENT_ID = 'client_id';
@@ -33,6 +31,5 @@ export const P_SCOPE = 'scope';
 export const P_STATE = 'state';
 export const P_TOKEN_TYPE = 'token_type';
 export const P_USERNAME = 'username';
-
 export const X_RESPONSE_ID = 'xResponseId';
 export const X_ERROR = 'xError';
diff --git a/packages/insomnia-app/app/network/o-auth-2/get-token.js b/packages/insomnia-app/app/network/o-auth-2/get-token.ts
similarity index 97%
rename from packages/insomnia-app/app/network/o-auth-2/get-token.js
rename to packages/insomnia-app/app/network/o-auth-2/get-token.ts
index 8ff98f19d2..a5d945317a 100644
--- a/packages/insomnia-app/app/network/o-auth-2/get-token.js
+++ b/packages/insomnia-app/app/network/o-auth-2/get-token.ts
@@ -1,4 +1,3 @@
-// @flow
 import getAccessTokenAuthorizationCode from './grant-authorization-code';
 import getAccessTokenClientCredentials from './grant-client-credentials';
 import getAccessTokenPassword from './grant-password';
@@ -22,20 +21,23 @@ import {
 import * as models from '../../models';
 import type { RequestAuthentication } from '../../models/request';
 import type { OAuth2Token } from '../../models/o-auth-2-token';
-
 /** Get an OAuth2Token object and also handle storing/saving/refreshing */
+
 export default async function(
   requestId: string,
   authentication: RequestAuthentication,
-  forceRefresh: boolean = false,
+  forceRefresh = false,
 ): Promise<OAuth2Token | null> {
   switch (authentication.grantType) {
     case GRANT_TYPE_AUTHORIZATION_CODE:
       return _getOAuth2AuthorizationCodeHeader(requestId, authentication, forceRefresh);
+
     case GRANT_TYPE_CLIENT_CREDENTIALS:
       return _getOAuth2ClientCredentialsHeader(requestId, authentication, forceRefresh);
+
     case GRANT_TYPE_IMPLICIT:
       return _getOAuth2ImplicitHeader(requestId, authentication, forceRefresh);
+
     case GRANT_TYPE_PASSWORD:
       return _getOAuth2PasswordHeader(requestId, authentication, forceRefresh);
   }
@@ -68,7 +70,6 @@ async function _getOAuth2AuthorizationCodeHeader(
     authentication.resource,
     authentication.usePkce,
   );
-
   return _updateOAuth2Token(requestId, results);
 }
 
@@ -117,7 +118,6 @@ async function _getOAuth2ImplicitHeader(
     authentication.state,
     authentication.audience,
   );
-
   return _updateOAuth2Token(requestId, results);
 }
 
@@ -143,7 +143,6 @@ async function _getOAuth2PasswordHeader(
     authentication.scope,
     authentication.audience,
   );
-
   return _updateOAuth2Token(requestId, results);
 }
 
@@ -155,7 +154,6 @@ async function _getAccessToken(
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
   // See if we have a token already //
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
-
   const token: OAuth2Token | null = await models.oAuth2Token.getByParentId(requestId);
 
   if (!token) {
@@ -165,7 +163,6 @@ async function _getAccessToken(
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
   // Check if the token needs refreshing //
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
-
   // Refresh tokens are part of Auth Code, Password
   const expiresAt = token.expiresAt || Infinity;
   const isExpired = Date.now() > expiresAt;
@@ -177,7 +174,6 @@ async function _getAccessToken(
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
   // Refresh the token if necessary //
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
-
   // We've expired, but don't have a refresh token, so tell caller to fetch new
   // access token
   if (!token.refreshToken) {
@@ -203,17 +199,17 @@ async function _getAccessToken(
   // ~~~~~~~~~~~~~ //
   // Update the DB //
   // ~~~~~~~~~~~~~ //
-
   return _updateOAuth2Token(requestId, refreshResults);
 }
 
-async function _updateOAuth2Token(requestId: string, authResults: Object): Promise<OAuth2Token> {
+async function _updateOAuth2Token(
+  requestId: string,
+  authResults: Record<string, any>,
+): Promise<OAuth2Token> {
   const oAuth2Token = await models.oAuth2Token.getOrCreateByParentId(requestId);
-
   // Calculate expiry date
   const expiresIn = authResults[P_EXPIRES_IN];
   const expiresAt = expiresIn ? Date.now() + expiresIn * 1000 : null;
-
   return models.oAuth2Token.update(oAuth2Token, {
     expiresAt,
     refreshToken: authResults[P_REFRESH_TOKEN] || null,
@@ -222,7 +218,6 @@ async function _updateOAuth2Token(requestId: string, authResults: Object): Promi
     error: authResults[P_ERROR] || null,
     errorDescription: authResults[P_ERROR_DESCRIPTION] || null,
     errorUri: authResults[P_ERROR_URI] || null,
-
     // Special Cases
     xResponseId: authResults[X_RESPONSE_ID] || null,
     xError: authResults[X_ERROR] || null,
diff --git a/packages/insomnia-app/app/network/o-auth-2/grant-authorization-code.js b/packages/insomnia-app/app/network/o-auth-2/grant-authorization-code.ts
similarity index 62%
rename from packages/insomnia-app/app/network/o-auth-2/grant-authorization-code.js
rename to packages/insomnia-app/app/network/o-auth-2/grant-authorization-code.ts
index 8af812041c..ed7f4571ff 100644
--- a/packages/insomnia-app/app/network/o-auth-2/grant-authorization-code.js
+++ b/packages/insomnia-app/app/network/o-auth-2/grant-authorization-code.ts
@@ -1,4 +1,3 @@
-// @flow
 import crypto from 'crypto';
 import { parse as urlParse } from 'url';
 import * as c from './constants';
@@ -16,13 +15,13 @@ export default async function(
   credentialsInBody: boolean,
   clientId: string,
   clientSecret: string,
-  redirectUri: string = '',
-  scope: string = '',
-  state: string = '',
-  audience: string = '',
-  resource: string = '',
-  usePkce: boolean = false,
-): Promise<Object> {
+  redirectUri = '',
+  scope = '',
+  state = '',
+  audience = '',
+  resource = '',
+  usePkce = false,
+): Promise<Record<string, any>> {
   if (!authorizeUrl) {
     throw new Error('Invalid authorization URL');
   }
@@ -35,13 +34,10 @@ export default async function(
   let codeChallenge = '';
 
   if (usePkce) {
+    // @ts-expect-error -- TSCONVERSION
     codeVerifier = _base64UrlEncode(crypto.randomBytes(32));
-    codeChallenge = _base64UrlEncode(
-      crypto
-        .createHash('sha256')
-        .update(codeVerifier)
-        .digest(),
-    );
+    // @ts-expect-error -- TSCONVERSION
+    codeChallenge = _base64UrlEncode(crypto.createHash('sha256').update(codeVerifier).digest());
   }
 
   const authorizeResults = await _authorize(
@@ -89,20 +85,51 @@ async function _authorize(
   codeChallenge = '',
 ) {
   const params = [
-    { name: c.P_RESPONSE_TYPE, value: c.RESPONSE_TYPE_CODE },
-    { name: c.P_CLIENT_ID, value: clientId },
+    {
+      name: c.P_RESPONSE_TYPE,
+      value: c.RESPONSE_TYPE_CODE,
+    },
+    {
+      name: c.P_CLIENT_ID,
+      value: clientId,
+    },
   ];
-
   // Add optional params
-  redirectUri && params.push({ name: c.P_REDIRECT_URI, value: redirectUri });
-  scope && params.push({ name: c.P_SCOPE, value: scope });
-  state && params.push({ name: c.P_STATE, value: state });
-  audience && params.push({ name: c.P_AUDIENCE, value: audience });
-  resource && params.push({ name: c.P_RESOURCE, value: resource });
+  redirectUri &&
+    params.push({
+      name: c.P_REDIRECT_URI,
+      value: redirectUri,
+    });
+  scope &&
+    params.push({
+      name: c.P_SCOPE,
+      value: scope,
+    });
+  state &&
+    params.push({
+      name: c.P_STATE,
+      value: state,
+    });
+  audience &&
+    params.push({
+      name: c.P_AUDIENCE,
+      value: audience,
+    });
+  resource &&
+    params.push({
+      name: c.P_RESOURCE,
+      value: resource,
+    });
 
   if (codeChallenge) {
-    params.push({ name: c.P_CODE_CHALLENGE, value: codeChallenge });
-    params.push({ name: c.P_CODE_CHALLENGE_METHOD, value: 'S256' });
+    params.push({
+      name: c.P_CODE_CHALLENGE,
+      value: codeChallenge,
+    });
+    params.push({
+      name: c.P_CODE_CHALLENGE_METHOD,
+      value: 'S256',
+    });
   }
 
   // Add query params to URL
@@ -110,11 +137,8 @@ async function _authorize(
   const finalUrl = joinUrlAndQueryString(url, qs);
   const successRegex = new RegExp(`${escapeRegex(redirectUri)}.*(code=)`, 'i');
   const failureRegex = new RegExp(`${escapeRegex(redirectUri)}.*(error=)`, 'i');
-
   const redirectedTo = await authorizeUserInWindow(finalUrl, successRegex, failureRegex);
-
   console.log('[oauth2] Detected redirect ' + redirectedTo);
-
   const { query } = urlParse(redirectedTo);
   return responseToObject(query, [
     c.P_CODE,
@@ -132,26 +156,53 @@ async function _getToken(
   clientId: string,
   clientSecret: string,
   code: string,
-  redirectUri: string = '',
-  state: string = '',
-  audience: string = '',
-  resource: string = '',
-  codeVerifier: string = '',
-): Promise<Object> {
+  redirectUri = '',
+  state = '',
+  audience = '',
+  resource = '',
+  codeVerifier = '',
+): Promise<Record<string, any>> {
   const params = [
-    { name: c.P_GRANT_TYPE, value: c.GRANT_TYPE_AUTHORIZATION_CODE },
-    { name: c.P_CODE, value: code },
+    {
+      name: c.P_GRANT_TYPE,
+      value: c.GRANT_TYPE_AUTHORIZATION_CODE,
+    },
+    {
+      name: c.P_CODE,
+      value: code,
+    },
   ];
-
   // Add optional params
-  redirectUri && params.push({ name: c.P_REDIRECT_URI, value: redirectUri });
-  state && params.push({ name: c.P_STATE, value: state });
-  audience && params.push({ name: c.P_AUDIENCE, value: audience });
-  resource && params.push({ name: c.P_RESOURCE, value: resource });
-  codeVerifier && params.push({ name: c.P_CODE_VERIFIER, value: codeVerifier });
-
+  redirectUri &&
+    params.push({
+      name: c.P_REDIRECT_URI,
+      value: redirectUri,
+    });
+  state &&
+    params.push({
+      name: c.P_STATE,
+      value: state,
+    });
+  audience &&
+    params.push({
+      name: c.P_AUDIENCE,
+      value: audience,
+    });
+  resource &&
+    params.push({
+      name: c.P_RESOURCE,
+      value: resource,
+    });
+  codeVerifier &&
+    params.push({
+      name: c.P_CODE_VERIFIER,
+      value: codeVerifier,
+    });
   const headers = [
-    { name: 'Content-Type', value: 'application/x-www-form-urlencoded' },
+    {
+      name: 'Content-Type',
+      value: 'application/x-www-form-urlencoded',
+    },
     {
       name: 'Accept',
       value: 'application/x-www-form-urlencoded, application/json',
@@ -159,8 +210,14 @@ async function _getToken(
   ];
 
   if (credentialsInBody) {
-    params.push({ name: c.P_CLIENT_ID, value: clientId });
-    params.push({ name: c.P_CLIENT_SECRET, value: clientSecret });
+    params.push({
+      name: c.P_CLIENT_ID,
+      value: clientId,
+    });
+    params.push({
+      name: c.P_CLIENT_SECRET,
+      value: clientSecret,
+    });
   } else {
     headers.push(getBasicAuthHeader(clientId, clientSecret));
   }
@@ -171,10 +228,10 @@ async function _getToken(
     method: 'POST',
     body: models.request.newBodyFormUrlEncoded(params),
   });
-
   const response = await models.response.create(responsePatch);
-
+  // @ts-expect-error -- TSCONVERSION
   const bodyBuffer = models.response.getBodyBuffer(response);
+
   if (!bodyBuffer) {
     return {
       [c.X_ERROR]: `No body returned from ${url}`,
@@ -182,7 +239,9 @@ async function _getToken(
     };
   }
 
+  // @ts-expect-error -- TSCONVERSION
   const statusCode = response.statusCode || 0;
+
   if (statusCode < 200 || statusCode >= 300) {
     return {
       [c.X_ERROR]: `Failed to fetch token url=${url} status=${statusCode}`,
@@ -203,20 +262,17 @@ async function _getToken(
     c.P_ERROR_URI,
     c.P_ERROR_DESCRIPTION,
   ]);
-
   results[c.X_RESPONSE_ID] = response._id;
-
   return results;
 }
 
-function _base64UrlEncode(str: string): string {
-  return str
-    .toString('base64')
+function _base64UrlEncode(str: string) {
+  // @ts-expect-error -- TSCONVERSION appears to be genuine
+  return str.toString('base64')
+    // The characters + / = are reserved for PKCE as per the RFC,
+    // so we replace them with unreserved characters
+    // Docs: https://tools.ietf.org/html/rfc7636#section-4.2
     .replace(/\+/g, '-')
     .replace(/\//g, '_')
     .replace(/=/g, '');
-
-  // The characters + / = are reserved for PKCE as per the RFC,
-  // so we replace them with unreserved characters
-  // Docs: https://tools.ietf.org/html/rfc7636#section-4.2
 }
diff --git a/packages/insomnia-app/app/network/o-auth-2/grant-client-credentials.js b/packages/insomnia-app/app/network/o-auth-2/grant-client-credentials.ts
similarity index 69%
rename from packages/insomnia-app/app/network/o-auth-2/grant-client-credentials.js
rename to packages/insomnia-app/app/network/o-auth-2/grant-client-credentials.ts
index c4e68ca691..550ac96452 100644
--- a/packages/insomnia-app/app/network/o-auth-2/grant-client-credentials.js
+++ b/packages/insomnia-app/app/network/o-auth-2/grant-client-credentials.ts
@@ -1,4 +1,3 @@
-// @flow
 import { setDefaultProtocol } from 'insomnia-url';
 import * as c from './constants';
 import { responseToObject } from './misc';
@@ -12,19 +11,37 @@ export default async function(
   credentialsInBody: boolean,
   clientId: string,
   clientSecret: string,
-  scope: string = '',
-  audience: string = '',
-  resource: string = '',
-): Promise<Object> {
-  const params = [{ name: c.P_GRANT_TYPE, value: c.GRANT_TYPE_CLIENT_CREDENTIALS }];
-
+  scope = '',
+  audience = '',
+  resource = '',
+): Promise<Record<string, any>> {
+  const params = [
+    {
+      name: c.P_GRANT_TYPE,
+      value: c.GRANT_TYPE_CLIENT_CREDENTIALS,
+    },
+  ];
   // Add optional params
-  scope && params.push({ name: c.P_SCOPE, value: scope });
-  audience && params.push({ name: c.P_AUDIENCE, value: audience });
-  resource && params.push({ name: c.P_RESOURCE, value: resource });
-
+  scope &&
+    params.push({
+      name: c.P_SCOPE,
+      value: scope,
+    });
+  audience &&
+    params.push({
+      name: c.P_AUDIENCE,
+      value: audience,
+    });
+  resource &&
+    params.push({
+      name: c.P_RESOURCE,
+      value: resource,
+    });
   const headers = [
-    { name: 'Content-Type', value: 'application/x-www-form-urlencoded' },
+    {
+      name: 'Content-Type',
+      value: 'application/x-www-form-urlencoded',
+    },
     {
       name: 'Accept',
       value: 'application/x-www-form-urlencoded, application/json',
@@ -32,24 +49,29 @@ export default async function(
   ];
 
   if (credentialsInBody) {
-    params.push({ name: c.P_CLIENT_ID, value: clientId });
-    params.push({ name: c.P_CLIENT_SECRET, value: clientSecret });
+    params.push({
+      name: c.P_CLIENT_ID,
+      value: clientId,
+    });
+    params.push({
+      name: c.P_CLIENT_SECRET,
+      value: clientSecret,
+    });
   } else {
     headers.push(getBasicAuthHeader(clientId, clientSecret));
   }
 
   const url = setDefaultProtocol(accessTokenUrl);
-
   const responsePatch = await sendWithSettings(requestId, {
     headers,
     url,
     method: 'POST',
     body: models.request.newBodyFormUrlEncoded(params),
   });
-
   const response = await models.response.create(responsePatch);
-
+  // @ts-expect-error -- TSCONVERSION
   const bodyBuffer = models.response.getBodyBuffer(response);
+
   if (!bodyBuffer) {
     return {
       [c.X_ERROR]: `No body returned from ${url}`,
@@ -57,7 +79,9 @@ export default async function(
     };
   }
 
+  // @ts-expect-error -- TSCONVERSION
   const statusCode = response.statusCode || 0;
+
   if (statusCode < 200 || statusCode >= 300) {
     return {
       [c.X_ERROR]: `Failed to fetch token url=${url} status=${statusCode}`,
@@ -77,8 +101,6 @@ export default async function(
     c.P_ERROR_URI,
     c.P_ERROR_DESCRIPTION,
   ]);
-
   results[c.X_RESPONSE_ID] = response._id;
-
   return results;
 }
diff --git a/packages/insomnia-app/app/network/o-auth-2/grant-implicit.js b/packages/insomnia-app/app/network/o-auth-2/grant-implicit.ts
similarity index 64%
rename from packages/insomnia-app/app/network/o-auth-2/grant-implicit.js
rename to packages/insomnia-app/app/network/o-auth-2/grant-implicit.ts
index adbd4eba25..e596fc91df 100644
--- a/packages/insomnia-app/app/network/o-auth-2/grant-implicit.js
+++ b/packages/insomnia-app/app/network/o-auth-2/grant-implicit.ts
@@ -1,21 +1,26 @@
-// @flow
 import * as c from './constants';
 import { buildQueryStringFromParams, joinUrlAndQueryString } from 'insomnia-url';
 import { responseToObject, authorizeUserInWindow } from './misc';
 
 export default async function(
-  requestId: string,
+  _requestId: string,
   authorizationUrl: string,
   clientId: string,
   responseType: string = c.RESPONSE_TYPE_TOKEN,
-  redirectUri: string = '',
-  scope: string = '',
-  state: string = '',
-  audience: string = '',
-): Promise<Object> {
+  redirectUri = '',
+  scope = '',
+  state = '',
+  audience = '',
+): Promise<Record<string, any>> {
   const params = [
-    { name: c.P_RESPONSE_TYPE, value: responseType },
-    { name: c.P_CLIENT_ID, value: clientId },
+    {
+      name: c.P_RESPONSE_TYPE,
+      value: responseType,
+    },
+    {
+      name: c.P_CLIENT_ID,
+      value: clientId,
+    },
   ];
 
   // Add optional params
@@ -24,18 +29,36 @@ export default async function(
     responseType === c.RESPONSE_TYPE_ID_TOKEN
   ) {
     const nonce = Math.floor(Math.random() * 9999999999999) + 1;
-    params.push({ name: c.P_NONCE, value: nonce });
+    params.push({
+      name: c.P_NONCE,
+      // @ts-expect-error -- TSCONVERSION
+      value: nonce,
+    });
   }
 
-  redirectUri && params.push({ name: c.P_REDIRECT_URI, value: redirectUri });
-  scope && params.push({ name: c.P_SCOPE, value: scope });
-  state && params.push({ name: c.P_STATE, value: state });
-  audience && params.push({ name: c.P_AUDIENCE, value: audience });
-
+  redirectUri &&
+    params.push({
+      name: c.P_REDIRECT_URI,
+      value: redirectUri,
+    });
+  scope &&
+    params.push({
+      name: c.P_SCOPE,
+      value: scope,
+    });
+  state &&
+    params.push({
+      name: c.P_STATE,
+      value: state,
+    });
+  audience &&
+    params.push({
+      name: c.P_AUDIENCE,
+      value: audience,
+    });
   // Add query params to URL
   const qs = buildQueryStringFromParams(params);
   const finalUrl = joinUrlAndQueryString(authorizationUrl, qs);
-
   const redirectedTo = await authorizeUserInWindow(
     finalUrl,
     /(access_token=|id_token=)/,
diff --git a/packages/insomnia-app/app/network/o-auth-2/grant-password.js b/packages/insomnia-app/app/network/o-auth-2/grant-password.ts
similarity index 70%
rename from packages/insomnia-app/app/network/o-auth-2/grant-password.js
rename to packages/insomnia-app/app/network/o-auth-2/grant-password.ts
index dfd4635ffb..45aa562fb5 100644
--- a/packages/insomnia-app/app/network/o-auth-2/grant-password.js
+++ b/packages/insomnia-app/app/network/o-auth-2/grant-password.ts
@@ -1,4 +1,3 @@
-// @flow
 import { setDefaultProtocol } from 'insomnia-url';
 import * as c from './constants';
 import { responseToObject } from './misc';
@@ -14,21 +13,39 @@ export default async function(
   clientSecret: string,
   username: string,
   password: string,
-  scope: string = '',
-  audience: string = '',
-): Promise<Object> {
+  scope = '',
+  audience = '',
+): Promise<Record<string, any>> {
   const params = [
-    { name: c.P_GRANT_TYPE, value: c.GRANT_TYPE_PASSWORD },
-    { name: c.P_USERNAME, value: username },
-    { name: c.P_PASSWORD, value: password },
+    {
+      name: c.P_GRANT_TYPE,
+      value: c.GRANT_TYPE_PASSWORD,
+    },
+    {
+      name: c.P_USERNAME,
+      value: username,
+    },
+    {
+      name: c.P_PASSWORD,
+      value: password,
+    },
   ];
-
   // Add optional params
-  scope && params.push({ name: c.P_SCOPE, value: scope });
-  audience && params.push({ name: c.P_AUDIENCE, value: audience });
-
+  scope &&
+    params.push({
+      name: c.P_SCOPE,
+      value: scope,
+    });
+  audience &&
+    params.push({
+      name: c.P_AUDIENCE,
+      value: audience,
+    });
   const headers = [
-    { name: 'Content-Type', value: 'application/x-www-form-urlencoded' },
+    {
+      name: 'Content-Type',
+      value: 'application/x-www-form-urlencoded',
+    },
     {
       name: 'Accept',
       value: 'application/x-www-form-urlencoded, application/json',
@@ -36,24 +53,29 @@ export default async function(
   ];
 
   if (credentialsInBody) {
-    params.push({ name: c.P_CLIENT_ID, value: clientId });
-    params.push({ name: c.P_CLIENT_SECRET, value: clientSecret });
+    params.push({
+      name: c.P_CLIENT_ID,
+      value: clientId,
+    });
+    params.push({
+      name: c.P_CLIENT_SECRET,
+      value: clientSecret,
+    });
   } else {
     headers.push(getBasicAuthHeader(clientId, clientSecret));
   }
 
   const url = setDefaultProtocol(accessTokenUrl);
-
   const responsePatch = await network.sendWithSettings(requestId, {
     url,
     headers,
     method: 'POST',
     body: models.request.newBodyFormUrlEncoded(params),
   });
-
   const response = await models.response.create(responsePatch);
-
+  // @ts-expect-error -- TSCONVERSION
   const bodyBuffer = models.response.getBodyBuffer(response);
+
   if (!bodyBuffer) {
     return {
       [c.X_ERROR]: `No body returned from ${url}`,
@@ -61,7 +83,9 @@ export default async function(
     };
   }
 
+  // @ts-expect-error -- TSCONVERSION
   const statusCode = response.statusCode || 0;
+
   if (statusCode < 200 || statusCode >= 300) {
     return {
       [c.X_ERROR]: `Failed to fetch token url=${url} status=${statusCode}`,
@@ -81,8 +105,6 @@ export default async function(
     c.P_ERROR_URI,
     c.P_ERROR_DESCRIPTION,
   ]);
-
   results[c.X_RESPONSE_ID] = response._id;
-
   return results;
 }
diff --git a/packages/insomnia-app/app/network/o-auth-2/misc.js b/packages/insomnia-app/app/network/o-auth-2/misc.ts
similarity index 91%
rename from packages/insomnia-app/app/network/o-auth-2/misc.js
rename to packages/insomnia-app/app/network/o-auth-2/misc.ts
index 87d87b299d..61d6d93d52 100644
--- a/packages/insomnia-app/app/network/o-auth-2/misc.js
+++ b/packages/insomnia-app/app/network/o-auth-2/misc.ts
@@ -4,6 +4,7 @@ import querystring from 'querystring';
 
 const LOCALSTORAGE_KEY_SESSION_ID = 'insomnia::current-oauth-session-id';
 let authWindowSessionId;
+
 if (window.localStorage.getItem(LOCALSTORAGE_KEY_SESSION_ID)) {
   authWindowSessionId = window.localStorage.getItem(LOCALSTORAGE_KEY_SESSION_ID);
 } else {
@@ -18,7 +19,8 @@ export function initNewOAuthSession() {
 }
 
 export function responseToObject(body, keys, defaults = {}) {
-  let data = null;
+  let data: querystring.ParsedUrlQuery | null = null;
+
   try {
     data = JSON.parse(body);
   } catch (err) {}
@@ -37,6 +39,7 @@ export function responseToObject(body, keys, defaults = {}) {
   }
 
   const results = {};
+
   for (const key of keys) {
     if (data[key] !== undefined) {
       results[key] = data[key];
@@ -55,10 +58,10 @@ export function authorizeUserInWindow(
   urlSuccessRegex = /(code=).*/,
   urlFailureRegex = /(error=).*/,
 ) {
-  return new Promise((resolve, reject) => {
-    let finalUrl = null;
+  return new Promise<string>((resolve, reject) => {
+    let finalUrl: string | null = null;
 
-    function _parseUrl(currentUrl, source) {
+    function _parseUrl(currentUrl: string, source: string) {
       if (currentUrl.match(urlSuccessRegex)) {
         console.log(
           `[oauth2] ${source}: Matched success redirect to "${currentUrl}" with ${urlSuccessRegex.toString()}`,
@@ -89,7 +92,6 @@ export function authorizeUserInWindow(
       },
       show: false,
     });
-
     // Finish on close
     child.on('close', () => {
       if (finalUrl) {
@@ -99,26 +101,23 @@ export function authorizeUserInWindow(
         reject(new Error(errorDescription));
       }
     });
-
     // Catch the redirect after login
     child.webContents.on('did-navigate', () => {
       // Be sure to resolve URL so that we can handle redirects with no host like /foo/bar
       const currentUrl = child.webContents.getURL();
+
       _parseUrl(currentUrl, 'did-navigate');
     });
-
-    child.webContents.on('will-redirect', (e, url) => {
+    child.webContents.on('will-redirect', (_error, url) => {
       // Also listen for will-redirect, as some redirections do not trigger 'did-navigate'
       // 'will-redirect' does not cover all cases that 'did-navigate' does, so both events are required
       // GitHub's flow triggers only 'did-navigate', while Microsoft's only 'will-redirect'
       _parseUrl(url, 'will-redirect');
     });
-
-    child.webContents.on('did-fail-load', (e, errorCode, errorDescription, url) => {
+    child.webContents.on('did-fail-load', (_error, _errorCode, _errorDescription, url) => {
       // Listen for did-fail-load to be able to parse the URL even when the callback server is unreachable
       _parseUrl(url, 'did-fail-load');
     });
-
     // Show the window to the user after it loads
     child.on('ready-to-show', child.show.bind(child));
     child.loadURL(url);
diff --git a/packages/insomnia-app/app/network/o-auth-2/refresh-token.js b/packages/insomnia-app/app/network/o-auth-2/refresh-token.ts
similarity index 82%
rename from packages/insomnia-app/app/network/o-auth-2/refresh-token.js
rename to packages/insomnia-app/app/network/o-auth-2/refresh-token.ts
index 989fd245de..812c0d4005 100644
--- a/packages/insomnia-app/app/network/o-auth-2/refresh-token.js
+++ b/packages/insomnia-app/app/network/o-auth-2/refresh-token.ts
@@ -1,4 +1,3 @@
-// @flow
 import * as c from './constants';
 import { responseToObject } from './misc';
 import { setDefaultProtocol } from 'insomnia-url';
@@ -14,17 +13,28 @@ export default async function(
   clientSecret: string,
   refreshToken: string,
   scope: string,
-): Promise<Object> {
+): Promise<Record<string, any>> {
   const params = [
-    { name: c.P_GRANT_TYPE, value: c.GRANT_TYPE_REFRESH },
-    { name: c.P_REFRESH_TOKEN, value: refreshToken },
+    {
+      name: c.P_GRANT_TYPE,
+      value: c.GRANT_TYPE_REFRESH,
+    },
+    {
+      name: c.P_REFRESH_TOKEN,
+      value: refreshToken,
+    },
   ];
-
   // Add optional params
-  scope && params.push({ name: c.P_SCOPE, value: scope });
-
+  scope &&
+    params.push({
+      name: c.P_SCOPE,
+      value: scope,
+    });
   const headers = [
-    { name: 'Content-Type', value: 'application/x-www-form-urlencoded' },
+    {
+      name: 'Content-Type',
+      value: 'application/x-www-form-urlencoded',
+    },
     {
       name: 'Accept',
       value: 'application/x-www-form-urlencoded, application/json',
@@ -32,21 +42,25 @@ export default async function(
   ];
 
   if (credentialsInBody) {
-    params.push({ name: c.P_CLIENT_ID, value: clientId });
-    params.push({ name: c.P_CLIENT_SECRET, value: clientSecret });
+    params.push({
+      name: c.P_CLIENT_ID,
+      value: clientId,
+    });
+    params.push({
+      name: c.P_CLIENT_SECRET,
+      value: clientSecret,
+    });
   } else {
     headers.push(getBasicAuthHeader(clientId, clientSecret));
   }
 
   const url = setDefaultProtocol(accessTokenUrl);
-
   const response = await sendWithSettings(requestId, {
     headers,
     url,
     method: 'POST',
     body: models.request.newBodyFormUrlEncoded(params),
   });
-
   const statusCode = response.statusCode || 0;
   const bodyBuffer = models.response.getBodyBuffer(response);
 
@@ -54,7 +68,6 @@ export default async function(
     // If the refresh token was rejected due an unauthorized request, we will
     // return a null access_token to trigger an authentication request to fetch
     // brand new refresh and access tokens.
-
     return responseToObject(null, [c.P_ACCESS_TOKEN]);
   } else if (statusCode < 200 || statusCode >= 300) {
     if (bodyBuffer && statusCode === 400) {
@@ -63,7 +76,6 @@ export default async function(
       // If the refresh token was rejected due an oauth2 invalid_grant error, we will
       // return a null access_token to trigger an authentication request to fetch
       // brand new refresh and access tokens.
-
       if (response[c.P_ERROR] === 'invalid_grant') {
         return responseToObject(null, [c.P_ACCESS_TOKEN]);
       }
diff --git a/packages/insomnia-app/app/network/url-matches-cert-host.js b/packages/insomnia-app/app/network/url-matches-cert-host.ts
similarity index 88%
rename from packages/insomnia-app/app/network/url-matches-cert-host.js
rename to packages/insomnia-app/app/network/url-matches-cert-host.ts
index 74f1b30780..d413abf611 100644
--- a/packages/insomnia-app/app/network/url-matches-cert-host.js
+++ b/packages/insomnia-app/app/network/url-matches-cert-host.ts
@@ -9,10 +9,10 @@ export function urlMatchesCertHost(certificateHost, requestUrl) {
   const cHostWithProtocol = setDefaultProtocol(certificateHost, 'https:');
   const { hostname, port } = urlParse(requestUrl);
   const { hostname: cHostname, port: cPort } = certificateUrlParse(cHostWithProtocol);
-
+  // @ts-expect-error -- TSCONVERSION `parseInt(null)` returns `NaN`
   const assumedPort = parseInt(port) || DEFAULT_PORT;
+  // @ts-expect-error -- TSCONVERSION `parseInt(null)` returns `NaN`
   const assumedCPort = parseInt(cPort) || DEFAULT_PORT;
-
   const cHostnameRegex = escapeRegex(cHostname || '').replace(/\\\*/g, '.*');
   const cPortRegex = escapeRegex(cPort || '').replace(/\\\*/g, '.*');
 
diff --git a/packages/insomnia-app/app/plugins/context/__tests__/app.test.js b/packages/insomnia-app/app/plugins/context/__tests__/app.test.ts
similarity index 91%
rename from packages/insomnia-app/app/plugins/context/__tests__/app.test.js
rename to packages/insomnia-app/app/plugins/context/__tests__/app.test.ts
index cc51a26b56..ef3e463c2a 100644
--- a/packages/insomnia-app/app/plugins/context/__tests__/app.test.js
+++ b/packages/insomnia-app/app/plugins/context/__tests__/app.test.ts
@@ -5,6 +5,7 @@ import { RENDER_PURPOSE_SEND } from '../../../common/render';
 
 describe('init()', () => {
   beforeEach(globalBeforeEach);
+
   it('initializes correctly', async () => {
     const result = plugin.init();
     expect(Object.keys(result)).toEqual(['app', '__private']);
@@ -21,12 +22,11 @@ describe('init()', () => {
 
 describe('app.alert()', () => {
   beforeEach(globalBeforeEach);
+
   it('does not show alert when not sending', async () => {
     modals.showAlert = jest.fn();
     const result = plugin.init();
-
     result.app.alert();
-
     // Make sure it passes correct arguments
     expect(modals.showAlert.mock.calls).toEqual([]);
   });
@@ -34,27 +34,33 @@ describe('app.alert()', () => {
   it('shows alert with message when sending', async () => {
     modals.showAlert = jest.fn().mockReturnValue('dummy-return-value');
     const result = plugin.init(RENDER_PURPOSE_SEND);
-
     // Make sure it returns result of showAlert()
     expect(result.app.alert('Title')).toBe('dummy-return-value');
     expect(result.app.alert('Title', 'Message')).toBe('dummy-return-value');
-
     // Make sure it passes correct arguments
     expect(modals.showAlert.mock.calls).toEqual([
-      [{ title: 'Title' }],
-      [{ title: 'Title', message: 'Message' }],
+      [
+        {
+          title: 'Title',
+        },
+      ],
+      [
+        {
+          title: 'Title',
+          message: 'Message',
+        },
+      ],
     ]);
   });
 });
 
 describe('app.prompt()', () => {
   beforeEach(globalBeforeEach);
+
   it('does not show prompt when not sending', async () => {
     modals.showPrompt = jest.fn();
     const result = plugin.init();
-
     result.app.prompt();
-
     // Make sure it passes correct arguments
     expect(modals.showPrompt.mock.calls).toEqual([]);
   });
@@ -62,11 +68,11 @@ describe('app.prompt()', () => {
   it('shows alert with message when sending', async () => {
     modals.showPrompt = jest.fn();
     const result = plugin.init(RENDER_PURPOSE_SEND);
-
     // Make sure it returns result of showAlert()
     result.app.prompt('Title');
-    result.app.prompt('Title', { label: 'Label' });
-
+    result.app.prompt('Title', {
+      label: 'Label',
+    });
     // Make sure it passes correct arguments
     expect(modals.showPrompt.mock.calls).toEqual([
       [
diff --git a/packages/insomnia-app/app/plugins/context/__tests__/data.test.js b/packages/insomnia-app/app/plugins/context/__tests__/data.test.ts
similarity index 90%
rename from packages/insomnia-app/app/plugins/context/__tests__/data.test.js
rename to packages/insomnia-app/app/plugins/context/__tests__/data.test.ts
index ac1e1b72b8..da264a37a1 100644
--- a/packages/insomnia-app/app/plugins/context/__tests__/data.test.js
+++ b/packages/insomnia-app/app/plugins/context/__tests__/data.test.ts
@@ -3,7 +3,7 @@ import * as modals from '../../../ui/components/modals';
 import path from 'path';
 import { globalBeforeEach } from '../../../__jest__/before-each';
 import * as models from '../../../models/index';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import fs from 'fs';
 import { getAppVersion } from '../../../common/constants';
 import { WorkspaceScopeKeys } from '../../../models/workspace';
@@ -17,8 +17,12 @@ const PLUGIN = {
 
 describe('init()', () => {
   beforeEach(globalBeforeEach);
+
   it('initializes correctly', async () => {
-    const { data } = plugin.init({ name: PLUGIN });
+    // @ts-expect-error -- TSCONVERSION genuine, plugin.init doesn't take any arguments
+    const { data } = plugin.init({
+      name: PLUGIN,
+    });
     expect(Object.keys(data)).toEqual(['import', 'export']);
     expect(Object.keys(data.export).sort()).toEqual(['har', 'insomnia']);
     expect(Object.keys(data.import).sort()).toEqual(['raw', 'uri']);
@@ -34,16 +38,17 @@ describe('app.import.*', () => {
       modified: 222,
     });
   });
+
   it('uri', async () => {
+    // @ts-expect-error -- TSCONVERSION mocking with jest function
     modals.showModal = jest.fn();
     const workspace = await models.workspace.getById('wrk_1');
     expect(await db.all(models.workspace.type)).toEqual([workspace]);
     expect(await db.count(models.request.type)).toBe(0);
-
+    // @ts-expect-error -- TSCONVERSION genuine, plugin.init doesn't take any arguments
     const { data } = plugin.init(PLUGIN);
     const filename = path.resolve(__dirname, '../__fixtures__/basic-import.json');
     await data.import.uri(`file://${filename}`);
-
     const allWorkspaces = await db.all(models.workspace.type);
     expect(allWorkspaces).toEqual([
       workspace,
@@ -86,15 +91,15 @@ describe('app.import.*', () => {
   });
 
   it('importRaw', async () => {
+    // @ts-expect-error -- TSCONVERSION mocking with jest function
     modals.showModal = jest.fn();
     const workspace = await models.workspace.getById('wrk_1');
     expect(await db.all(models.workspace.type)).toEqual([workspace]);
     expect(await db.count(models.request.type)).toBe(0);
-
+    // @ts-expect-error -- TSCONVERSION genuine, plugin.init doesn't take any arguments
     const { data } = plugin.init(PLUGIN);
     const filename = path.resolve(__dirname, '../__fixtures__/basic-import.json');
     await data.import.raw(fs.readFileSync(filename, 'utf8'));
-
     const allWorkspaces = await db.all(models.workspace.type);
     expect(allWorkspaces).toEqual([
       workspace,
@@ -162,8 +167,9 @@ describe('app.export.*', () => {
   });
 
   it('insomnia', async () => {
+    // @ts-expect-error -- TSCONVERSION mocking with jest function
     modals.showModal = jest.fn();
-
+    // @ts-expect-error -- TSCONVERSION genuine, plugin.init doesn't take any arguments
     const { data } = plugin.init(PLUGIN);
     const exported = await data.export.insomnia();
     const exportedData = JSON.parse(exported);
@@ -213,8 +219,9 @@ describe('app.export.*', () => {
   });
 
   it('har', async () => {
+    // @ts-expect-error -- TSCONVERSION mocking with jest function
     modals.showModal = jest.fn();
-
+    // @ts-expect-error -- TSCONVERSION genuine, plugin.init doesn't take any arguments
     const { data } = plugin.init(PLUGIN);
     const exported = await data.export.har();
     const exportedData = JSON.parse(exported);
diff --git a/packages/insomnia-app/app/plugins/context/__tests__/request.test.js b/packages/insomnia-app/app/plugins/context/__tests__/request.test.ts
similarity index 84%
rename from packages/insomnia-app/app/plugins/context/__tests__/request.test.js
rename to packages/insomnia-app/app/plugins/context/__tests__/request.test.ts
index 9849d70c53..c984cee2e8 100644
--- a/packages/insomnia-app/app/plugins/context/__tests__/request.test.js
+++ b/packages/insomnia-app/app/plugins/context/__tests__/request.test.ts
@@ -7,14 +7,20 @@ const CONTEXT = {
   user_key: 'my_user_key',
   hello: 'world',
   array_test: ['a', 'b'],
-  object_test: { a: 'A', b: 'B' },
+  object_test: {
+    a: 'A',
+    b: 'B',
+  },
   null_test: null,
 };
 
 describe('init()', () => {
   beforeEach(async () => {
     await globalBeforeEach();
-    await models.workspace.create({ _id: 'wrk_1', name: 'My Workspace' });
+    await models.workspace.create({
+      _id: 'wrk_1',
+      name: 'My Workspace',
+    });
     await models.request.create({
       _id: 'req_1',
       parentId: 'wrk_1',
@@ -91,27 +97,45 @@ describe('init()', () => {
 describe('request.*', () => {
   beforeEach(async () => {
     await globalBeforeEach();
-    await models.workspace.create({ _id: 'wrk_1', name: 'My Workspace' });
+    await models.workspace.create({
+      _id: 'wrk_1',
+      name: 'My Workspace',
+    });
     await models.request.create({
       _id: 'req_1',
       parentId: 'wrk_1',
       name: 'My Request',
-      body: { text: 'body' },
-      authentication: { type: 'oauth2' },
+      body: {
+        text: 'body',
+      },
+      authentication: {
+        type: 'oauth2',
+      },
       headers: [
-        { name: 'hello', value: 'world' },
-        { name: 'Content-Type', value: 'application/json' },
+        {
+          name: 'hello',
+          value: 'world',
+        },
+        {
+          name: 'Content-Type',
+          value: 'application/json',
+        },
       ],
       parameters: [
-        { name: 'foo', value: 'bar' },
-        { name: 'message', value: 'Hello World!' },
+        {
+          name: 'foo',
+          value: 'bar',
+        },
+        {
+          name: 'message',
+          value: 'Hello World!',
+        },
       ],
     });
   });
 
   it('works for basic getters', async () => {
     const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
-
     const result = plugin.init(await models.request.getById('req_1'), CONTEXT);
     expect(result.request.getId()).toBe('req_1');
     expect(result.request.getName()).toBe('My Request');
@@ -121,34 +145,37 @@ describe('request.*', () => {
     expect(consoleWarnSpy).toHaveBeenCalledWith(
       'request.getBodyText() is deprecated. Use request.getBody() instead.',
     );
-    expect(result.request.getAuthentication()).toEqual({ type: 'oauth2' });
+    expect(result.request.getAuthentication()).toEqual({
+      type: 'oauth2',
+    });
   });
 
   it('works for parameters', async () => {
     const result = plugin.init(await models.request.getById('req_1'), CONTEXT);
-
     // getParameters()
     expect(result.request.getParameters()).toEqual([
-      { name: 'foo', value: 'bar' },
-      { name: 'message', value: 'Hello World!' },
+      {
+        name: 'foo',
+        value: 'bar',
+      },
+      {
+        name: 'message',
+        value: 'Hello World!',
+      },
     ]);
-
     // getParameter()
     expect(result.request.getParameter('foo')).toBe('bar');
     expect(result.request.getParameter('FOO')).toBe(null);
     expect(result.request.getParameter('does-not-exist')).toBe(null);
     expect(result.request.hasParameter('foo')).toBe(true);
-
     // setHeader()
     result.request.setParameter('foo', 'baz');
     expect(result.request.getParameter('foo')).toBe('baz');
-
     // addHeader()
     result.request.addParameter('foo', 'another');
     result.request.addParameter('something-else', 'yet another');
     expect(result.request.getParameter('foo')).toBe('baz');
     expect(result.request.getParameter('something-else')).toBe('yet another');
-
     // removeHeader()
     result.request.removeParameter('foo');
     expect(result.request.getParameter('foo')).toBe(null);
@@ -157,29 +184,30 @@ describe('request.*', () => {
 
   it('works for headers', async () => {
     const result = plugin.init(await models.request.getById('req_1'), CONTEXT);
-
     // getHeaders()
     expect(result.request.getHeaders()).toEqual([
-      { name: 'hello', value: 'world' },
-      { name: 'Content-Type', value: 'application/json' },
+      {
+        name: 'hello',
+        value: 'world',
+      },
+      {
+        name: 'Content-Type',
+        value: 'application/json',
+      },
     ]);
-
     // getHeader()
     expect(result.request.getHeader('content-type')).toBe('application/json');
     expect(result.request.getHeader('CONTENT-TYPE')).toBe('application/json');
     expect(result.request.getHeader('does-not-exist')).toBe(null);
     expect(result.request.hasHeader('Content-Type')).toBe(true);
-
     // setHeader()
     result.request.setHeader('content-type', 'text/plain');
     expect(result.request.getHeader('Content-Type')).toBe('text/plain');
-
     // addHeader()
     result.request.addHeader('content-type', 'new/type');
     result.request.addHeader('something-else', 'foo');
     expect(result.request.getHeader('Content-Type')).toBe('text/plain');
     expect(result.request.getHeader('something-else')).toBe('foo');
-
     // removeHeader()
     result.request.removeHeader('content-type');
     expect(result.request.getHeader('Content-Type')).toBe(null);
@@ -191,10 +219,14 @@ describe('request.*', () => {
     request.cookies = []; // Because the plugin technically needs a RenderedRequest
 
     const result = plugin.init(request, CONTEXT);
-
     result.request.setCookie('foo', 'bar');
     result.request.setCookie('foo', 'baz');
-    expect(request.cookies).toEqual([{ name: 'foo', value: 'baz' }]);
+    expect(request.cookies).toEqual([
+      {
+        name: 'foo',
+        value: 'baz',
+      },
+    ]);
   });
 
   it('works for environment', async () => {
@@ -202,16 +234,17 @@ describe('request.*', () => {
     request.cookies = []; // Because the plugin technically needs a RenderedRequest
 
     const result = plugin.init(request, CONTEXT);
-
     // getEnvironment
     expect(result.request.getEnvironment()).toEqual({
       user_key: 'my_user_key',
       hello: 'world',
       array_test: ['a', 'b'],
-      object_test: { a: 'A', b: 'B' },
+      object_test: {
+        a: 'A',
+        b: 'B',
+      },
       null_test: null,
     });
-
     // getEnvironmentVariable
     expect(result.request.getEnvironmentVariable('user_key')).toBe('my_user_key');
     expect(result.request.getEnvironmentVariable('hello')).toBe('world');
@@ -229,16 +262,21 @@ describe('request.*', () => {
     request.authentication = {}; // Because the plugin technically needs a RenderedRequest
 
     const result = plugin.init(request, CONTEXT);
-
     result.request.setAuthenticationParameter('foo', 'bar');
     result.request.setAuthenticationParameter('foo', 'baz');
-    expect(result.request.getAuthentication()).toEqual({ foo: 'baz' });
-    expect(request.authentication).toEqual({ foo: 'baz' });
+    expect(result.request.getAuthentication()).toEqual({
+      foo: 'baz',
+    });
+    expect(request.authentication).toEqual({
+      foo: 'baz',
+    });
   });
 
   it('works for request body', async () => {
     const result = plugin.init(await models.request.getById('req_1'), CONTEXT);
-    expect(result.request.getBody()).toEqual({ text: 'body' });
+    expect(result.request.getBody()).toEqual({
+      text: 'body',
+    });
     const newBody = {
       mimeType: CONTENT_TYPE_FORM_URLENCODED,
       params: [
diff --git a/packages/insomnia-app/app/plugins/context/__tests__/response.test.js b/packages/insomnia-app/app/plugins/context/__tests__/response.test.ts
similarity index 83%
rename from packages/insomnia-app/app/plugins/context/__tests__/response.test.js
rename to packages/insomnia-app/app/plugins/context/__tests__/response.test.ts
index 745f163fe6..a4261c8359 100644
--- a/packages/insomnia-app/app/plugins/context/__tests__/response.test.js
+++ b/packages/insomnia-app/app/plugins/context/__tests__/response.test.ts
@@ -1,12 +1,13 @@
 import * as plugin from '../response';
 import { globalBeforeEach } from '../../../__jest__/before-each';
-import { getTempDir } from '../../../common/constants';
+import { getTempDir } from '../../../common/electron-helpers';
 import fs from 'fs';
 import path from 'path';
 import * as models from '../../../models/index';
 
 describe('init()', () => {
   beforeEach(globalBeforeEach);
+
   it('initializes correctly', async () => {
     const result = plugin.init({});
     expect(Object.keys(result)).toEqual(['response']);
@@ -32,6 +33,7 @@ describe('init()', () => {
 
 describe('response.*', () => {
   beforeEach(globalBeforeEach);
+
   it('works for basic and full response', async () => {
     const bodyPath = path.join(getTempDir(), 'response.zip');
     fs.writeFileSync(bodyPath, Buffer.from('Hello World!'));
@@ -65,16 +67,34 @@ describe('response.*', () => {
   it('works for getting headers', () => {
     const response = {
       headers: [
-        { name: 'content-type', value: 'application/json' },
-        { name: 'set-cookie', value: 'foo=bar' },
-        { name: 'set-cookie', value: 'baz=qux' },
+        {
+          name: 'content-type',
+          value: 'application/json',
+        },
+        {
+          name: 'set-cookie',
+          value: 'foo=bar',
+        },
+        {
+          name: 'set-cookie',
+          value: 'baz=qux',
+        },
       ],
     };
     const result = plugin.init(response);
     expect(result.response.getHeaders()).toEqual([
-      { name: 'content-type', value: 'application/json' },
-      { name: 'set-cookie', value: 'foo=bar' },
-      { name: 'set-cookie', value: 'baz=qux' },
+      {
+        name: 'content-type',
+        value: 'application/json',
+      },
+      {
+        name: 'set-cookie',
+        value: 'foo=bar',
+      },
+      {
+        name: 'set-cookie',
+        value: 'baz=qux',
+      },
     ]);
     expect(result.response.getHeader('Does-Not-Exist')).toBeNull();
     expect(result.response.getHeader('CONTENT-TYPE')).toBe('application/json');
diff --git a/packages/insomnia-app/app/plugins/context/__tests__/store.test.js b/packages/insomnia-app/app/plugins/context/__tests__/store.test.ts
similarity index 86%
rename from packages/insomnia-app/app/plugins/context/__tests__/store.test.js
rename to packages/insomnia-app/app/plugins/context/__tests__/store.test.ts
index 718cc1ccbf..b38b5d5918 100644
--- a/packages/insomnia-app/app/plugins/context/__tests__/store.test.js
+++ b/packages/insomnia-app/app/plugins/context/__tests__/store.test.ts
@@ -1,6 +1,5 @@
 import * as plugin from '../store';
 import { globalBeforeEach } from '../../../__jest__/before-each';
-
 const PLUGIN = {
   name: 'my-plugin',
   version: '1.0.0',
@@ -10,8 +9,11 @@ const PLUGIN = {
 
 describe('init()', () => {
   beforeEach(globalBeforeEach);
+
   it('initializes correctly', async () => {
-    const result = plugin.init({ name: PLUGIN });
+    const result = plugin.init({
+      name: PLUGIN,
+    });
     expect(Object.keys(result.store).sort()).toEqual([
       'all',
       'clear',
@@ -25,33 +27,38 @@ describe('init()', () => {
 
 describe('store.*', () => {
   beforeEach(globalBeforeEach);
+
   it('all methods work', async () => {
     const p = plugin.init(PLUGIN);
-
     // Null item for no result
     expect(await p.store.getItem('unset-key')).toBeNull();
-
     // Add something
     await p.store.setItem('color', 'blue');
     expect(await p.store.getItem('color')).toBe('blue');
     expect(await p.store.hasItem('color')).toBe(true);
-
     // Remove something
     await p.store.removeItem('color');
     expect(await p.store.hasItem('color')).toBe(false);
     expect(await p.store.getItem('color')).toBeNull();
-
     // Add some more
     await p.store.setItem('a', 'aaa');
     await p.store.setItem('b', 'bbb');
     await p.store.setItem('c', 'ccc');
     const all = await p.store.all();
     expect(all.sort((a, b) => (a.key < b.key ? -1 : 1))).toEqual([
-      { key: 'a', value: 'aaa' },
-      { key: 'b', value: 'bbb' },
-      { key: 'c', value: 'ccc' },
+      {
+        key: 'a',
+        value: 'aaa',
+      },
+      {
+        key: 'b',
+        value: 'bbb',
+      },
+      {
+        key: 'c',
+        value: 'ccc',
+      },
     ]);
-
     // Clear it
     await p.store.clear();
     expect(await p.store.getItem('a')).toBeNull();
diff --git a/packages/insomnia-app/app/plugins/context/app.js b/packages/insomnia-app/app/plugins/context/app.tsx
similarity index 76%
rename from packages/insomnia-app/app/plugins/context/app.js
rename to packages/insomnia-app/app/plugins/context/app.tsx
index 4fd97bc4e5..70391e40b5 100644
--- a/packages/insomnia-app/app/plugins/context/app.js
+++ b/packages/insomnia-app/app/plugins/context/app.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React from 'react';
 import * as electron from 'electron';
 import { showAlert, showModal, showPrompt } from '../../ui/components/modals';
 import type { RenderPurpose } from '../../common/render';
@@ -13,29 +12,34 @@ import HtmlElementWrapper from '../../ui/components/html-element-wrapper';
 import { axiosRequest as axios } from '../../../app/network/axios-request';
 import * as analytics from '../../../app/common/analytics';
 
-export function init(renderPurpose: RenderPurpose = RENDER_PURPOSE_GENERAL): { app: Object } {
+export function init(renderPurpose: RenderPurpose = RENDER_PURPOSE_GENERAL): {
+  app: Record<string, any>;
+} {
   const canShowDialogs =
     renderPurpose === RENDER_PURPOSE_SEND || renderPurpose === RENDER_PURPOSE_NO_RENDER;
-
   return {
     app: {
-      alert(title: string, message?: string): Promise<void> {
+      alert(title: string, message?: string) {
         if (!canShowDialogs) {
           return Promise.resolve();
         }
 
-        return showAlert({ title, message });
+        return showAlert({
+          title,
+          message,
+        });
       },
+
       dialog(
         title,
         body: HTMLElement,
-        options?: {
-          onHide?: () => void,
-          tall?: boolean,
-          skinny?: boolean,
-          wide?: boolean,
+        options: {
+          onHide?: () => void;
+          tall?: boolean;
+          skinny?: boolean;
+          wide?: boolean;
         } = {},
-      ): void {
+      ) {
         if (renderPurpose !== RENDER_PURPOSE_SEND && renderPurpose !== RENDER_PURPOSE_NO_RENDER) {
           return;
         }
@@ -48,15 +52,16 @@ export function init(renderPurpose: RenderPurpose = RENDER_PURPOSE_GENERAL): { a
           wide: options.wide,
         });
       },
+
       prompt(
         title: string,
         options?: {
-          label?: string,
-          defaultValue?: string,
-          submitName?: string,
-          cancelable?: boolean,
+          label?: string;
+          defaultValue?: string;
+          submitName?: string;
+          cancelable?: boolean;
         },
-      ): Promise<string> {
+      ) {
         options = options || {};
 
         if (!canShowDialogs) {
@@ -66,25 +71,34 @@ export function init(renderPurpose: RenderPurpose = RENDER_PURPOSE_GENERAL): { a
         return new Promise((resolve, reject) => {
           showPrompt({
             title,
-            ...(options || {}: Object),
+            ...(options || ({} as Record<string, any>)),
+
             onCancel() {
               reject(new Error(`Prompt ${title} cancelled`));
             },
+
             onComplete(value: string) {
               resolve(value);
             },
           });
         });
       },
-      getPath(name: string): string {
+
+      getPath(name: string) {
         switch (name.toLowerCase()) {
           case 'desktop':
             return electron.remote.app.getPath('desktop');
+
           default:
             throw new Error(`Unknown path name ${name}`);
         }
       },
-      async showSaveDialog(options: { defaultPath?: string } = {}): Promise<string | null> {
+
+      async showSaveDialog(
+        options: {
+          defaultPath?: string;
+        } = {},
+      ): Promise<string | null> {
         if (!canShowDialogs) {
           return Promise.resolve(null);
         }
@@ -94,7 +108,6 @@ export function init(renderPurpose: RenderPurpose = RENDER_PURPOSE_GENERAL): { a
           buttonLabel: 'Save',
           defaultPath: options.defaultPath,
         };
-
         const { filePath } = await electron.remote.dialog.showSaveDialog(saveOptions);
         return filePath || null;
       },
@@ -104,16 +117,21 @@ export function init(renderPurpose: RenderPurpose = RENDER_PURPOSE_GENERAL): { a
       // ~~~~~~~~~~~~~~~~~~ //
 
       /** @deprecated as it was never officially supported */
-      showGenericModalDialog(title: string, options?: { html: string } = {}): void {
+      showGenericModalDialog(
+        title: string,
+        options: {
+          html?: string;
+        } = {},
+      ) {
         console.warn('app.showGenericModalDialog() is deprecated. Use app.dialog() instead.');
-
         // Create DOM node so we can adapt to the new dialog() method
         const body = document.createElement('div');
+        // @ts-expect-error -- TSCONVERSION
         body.innerHTML = options.html;
-
         return this.dialog(title, body);
       },
     },
+    // @ts-expect-error -- TSCONVERSION
     __private: {
       axios,
       analytics,
diff --git a/packages/insomnia-app/app/plugins/context/data.js b/packages/insomnia-app/app/plugins/context/data.ts
similarity index 66%
rename from packages/insomnia-app/app/plugins/context/data.js
rename to packages/insomnia-app/app/plugins/context/data.ts
index 6900f5ebb3..4839b455a7 100644
--- a/packages/insomnia-app/app/plugins/context/data.js
+++ b/packages/insomnia-app/app/plugins/context/data.ts
@@ -1,4 +1,3 @@
-// @flow
 import {
   exportWorkspacesHAR,
   exportWorkspacesData,
@@ -8,27 +7,30 @@ import {
 import type { Workspace, WorkspaceScope } from '../../models/workspace';
 import type { ImportRawConfig } from '../../common/import';
 
-type PluginImportOptions = { workspaceId?: string, scope?: WorkspaceScope };
+interface PluginImportOptions {
+  workspaceId?: string;
+  scope?: WorkspaceScope;
+}
 
-export function init(): { data: { import: Object, export: Object } } {
+export function init() {
   return {
     data: {
       import: {
-        async uri(uri: string, options: PluginImportOptions = {}): Promise<void> {
+        async uri(uri: string, options: PluginImportOptions = {}) {
           await importUri(uri, buildImportRawConfig(options));
         },
-        async raw(text: string, options: PluginImportOptions = {}): Promise<void> {
+        async raw(text: string, options: PluginImportOptions = {}) {
           await importRaw(text, buildImportRawConfig(options));
         },
       },
       export: {
         async insomnia(
           options: {
-            includePrivate?: boolean,
-            format?: 'json' | 'yaml',
-            workspace?: Workspace,
+            includePrivate?: boolean;
+            format?: 'json' | 'yaml';
+            workspace?: Workspace;
           } = {},
-        ): Promise<string> {
+        ) {
           options = options || {};
           return exportWorkspacesData(
             options.workspace || null,
@@ -36,9 +38,13 @@ export function init(): { data: { import: Object, export: Object } } {
             options.format || 'json',
           );
         },
+
         async har(
-          options: { includePrivate?: boolean, workspace?: Workspace } = {},
-        ): Promise<string> {
+          options: {
+            includePrivate?: boolean;
+            workspace?: Workspace;
+          } = {},
+        ) {
           return exportWorkspacesHAR(options.workspace || null, !!options.includePrivate);
         },
       },
@@ -48,6 +54,13 @@ export function init(): { data: { import: Object, export: Object } } {
 
 function buildImportRawConfig(options: PluginImportOptions): ImportRawConfig {
   const getWorkspaceId = () => Promise.resolve(options.workspaceId || null);
-  const getWorkspaceScope = options.scope && (() => Promise.resolve(options.scope));
-  return { getWorkspaceId, getWorkspaceScope };
+
+  const getWorkspaceScope = options.scope && (() => (
+    Promise.resolve<WorkspaceScope>(options.scope as WorkspaceScope))
+  );
+
+  return {
+    getWorkspaceId,
+    getWorkspaceScope,
+  };
 }
diff --git a/packages/insomnia-app/app/plugins/context/index.js b/packages/insomnia-app/app/plugins/context/index.ts
similarity index 98%
rename from packages/insomnia-app/app/plugins/context/index.js
rename to packages/insomnia-app/app/plugins/context/index.ts
index 36fa98f3c0..95c5592ba0 100644
--- a/packages/insomnia-app/app/plugins/context/index.js
+++ b/packages/insomnia-app/app/plugins/context/index.ts
@@ -1,4 +1,3 @@
-// @flow
 import * as _app from './app';
 import * as _data from './data';
 import * as _network from './network';
diff --git a/packages/insomnia-app/app/plugins/context/network.js b/packages/insomnia-app/app/plugins/context/network.js
deleted file mode 100644
index c4b90c626f..0000000000
--- a/packages/insomnia-app/app/plugins/context/network.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// @flow
-
-import { send } from '../../network/network';
-import type { Request } from '../../models/request';
-import * as models from '../../models';
-import type { ExtraRenderInfo } from '../../common/render';
-
-export function init(activeEnvironmentId: string | null): { network: Object } {
-  const network = {
-    async sendRequest(request: Request, extraInfo?: ExtraRenderInfo): Promise<Response> {
-      const responsePatch = await send(request._id, activeEnvironmentId || undefined, extraInfo);
-      const settings = await models.settings.getOrCreate();
-      return models.response.create(responsePatch, settings.maxHistoryResponses);
-    },
-  };
-
-  return { network };
-}
diff --git a/packages/insomnia-app/app/plugins/context/network.ts b/packages/insomnia-app/app/plugins/context/network.ts
new file mode 100644
index 0000000000..57a1c6fb52
--- /dev/null
+++ b/packages/insomnia-app/app/plugins/context/network.ts
@@ -0,0 +1,16 @@
+import { send } from '../../network/network';
+import type { Request } from '../../models/request';
+import * as models from '../../models';
+import type { ExtraRenderInfo } from '../../common/render';
+
+export function init(activeEnvironmentId: string | null) {
+  return {
+    network: {
+      async sendRequest(request: Request, extraInfo?: ExtraRenderInfo) {
+        const responsePatch = await send(request._id, activeEnvironmentId || undefined, extraInfo);
+        const settings = await models.settings.getOrCreate();
+        return models.response.create(responsePatch, settings.maxHistoryResponses);
+      },
+    },
+  };
+}
diff --git a/packages/insomnia-app/app/plugins/context/request.js b/packages/insomnia-app/app/plugins/context/request.ts
similarity index 58%
rename from packages/insomnia-app/app/plugins/context/request.js
rename to packages/insomnia-app/app/plugins/context/request.ts
index f0a641541a..a8e724fde4 100644
--- a/packages/insomnia-app/app/plugins/context/request.js
+++ b/packages/insomnia-app/app/plugins/context/request.ts
@@ -1,67 +1,87 @@
-// @flow
 import type { RenderedRequest } from '../../common/render';
 import type { RequestBody } from '../../models/request';
 import * as misc from '../../common/misc';
 
 export function init(
-  renderedRequest: RenderedRequest,
-  renderedContext: Object,
-  readOnly: boolean = false,
-): { request: Object } {
+  renderedRequest: RenderedRequest | null,
+  renderedContext: Record<string, any>,
+  readOnly = false,
+) {
   if (!renderedRequest) {
     throw new Error('contexts.request initialized without request');
   }
 
-  const request = ({
-    getId(): string {
+  const request = {
+    getId() {
       return renderedRequest._id;
     },
-    getName(): string {
+
+    getName() {
       return renderedRequest.name;
     },
-    getUrl(): string {
+
+    getUrl() {
       return renderedRequest.url;
     },
-    getMethod(): string {
+
+    getMethod() {
       return renderedRequest.method;
     },
-    setMethod(method: string): void {
+
+    setMethod(method: string) {
       renderedRequest.method = method;
     },
-    setUrl(url: string): void {
+
+    setUrl(url: string) {
       renderedRequest.url = url;
     },
-    setCookie(name: string, value: string): void {
+
+    setCookie(name: string, value: string) {
       const cookie = renderedRequest.cookies.find(c => c.name === name);
+
       if (cookie) {
         cookie.value = value;
       } else {
-        renderedRequest.cookies.push({ name, value });
+        renderedRequest.cookies.push({
+          name,
+          value,
+        });
       }
     },
-    getEnvironmentVariable(name: string): string | number | boolean | Object | Array<any> | null {
+
+    getEnvironmentVariable(
+      name: string,
+    ): string | number | boolean | Record<string, any> | Array<any> | null {
       return renderedContext[name];
     },
-    getEnvironment(): Object {
+
+    getEnvironment() {
       return renderedContext;
     },
+
     settingSendCookies(enabled: boolean) {
       renderedRequest.settingSendCookies = enabled;
     },
+
     settingStoreCookies(enabled: boolean) {
       renderedRequest.settingStoreCookies = enabled;
     },
+
     settingEncodeUrl(enabled: boolean) {
       renderedRequest.settingEncodeUrl = enabled;
     },
+
     settingDisableRenderRequestBody(enabled: boolean) {
       renderedRequest.settingDisableRenderRequestBody = enabled;
     },
+
     settingFollowRedirects(enabled: string) {
       renderedRequest.settingFollowRedirects = enabled;
     },
-    getHeader(name: string): string | null {
+
+    getHeader(name: string) {
       const headers = misc.filterHeaders(renderedRequest.headers, name);
+
       if (headers.length) {
         // Use the last header if there are multiple of the same
         const header = headers[headers.length - 1];
@@ -70,35 +90,47 @@ export function init(
         return null;
       }
     },
-    getHeaders(): Array<{ name: string, value: string }> {
+
+    getHeaders() {
       return renderedRequest.headers.map(h => ({
         name: h.name,
         value: h.value,
       }));
     },
-    hasHeader(name: string): boolean {
+
+    hasHeader(name: string) {
       return this.getHeader(name) !== null;
     },
-    removeHeader(name: string): void {
+
+    removeHeader(name: string) {
       const headers = misc.filterHeaders(renderedRequest.headers, name);
       renderedRequest.headers = renderedRequest.headers.filter(h => !headers.includes(h));
     },
-    setHeader(name: string, value: string): void {
+
+    setHeader(name: string, value: string) {
       const header = misc.filterHeaders(renderedRequest.headers, name)[0];
+
       if (header) {
         header.value = value;
       } else {
         this.addHeader(name, value);
       }
     },
-    addHeader(name: string, value: string): void {
+
+    addHeader(name: string, value: string) {
       const header = misc.filterHeaders(renderedRequest.headers, name)[0];
+
       if (!header) {
-        renderedRequest.headers.push({ name, value });
+        renderedRequest.headers.push({
+          name,
+          value,
+        });
       }
     },
-    getParameter(name: string): string | null {
+
+    getParameter(name: string) {
       const parameters = misc.filterParameters(renderedRequest.parameters, name);
+
       if (parameters.length) {
         // Use the last parameter if there are multiple of the same
         const parameter = parameters[parameters.length - 1];
@@ -107,45 +139,59 @@ export function init(
         return null;
       }
     },
-    getParameters(): Array<{ name: string, value: string }> {
+
+    getParameters() {
       return renderedRequest.parameters.map(p => ({
         name: p.name,
         value: p.value,
       }));
     },
-    hasParameter(name: string): boolean {
+
+    hasParameter(name: string) {
       return this.getParameter(name) !== null;
     },
-    removeParameter(name: string): void {
+
+    removeParameter(name: string) {
       const parameters = misc.filterParameters(renderedRequest.parameters, name);
       renderedRequest.parameters = renderedRequest.parameters.filter(p => !parameters.includes(p));
     },
-    setParameter(name: string, value: string): void {
+
+    setParameter(name: string, value: string) {
       const parameter = misc.filterParameters(renderedRequest.parameters, name)[0];
+
       if (parameter) {
         parameter.value = value;
       } else {
         this.addParameter(name, value);
       }
     },
-    addParameter(name: string, value: string): void {
+
+    addParameter(name: string, value: string) {
       const parameter = misc.filterParameters(renderedRequest.parameters, name)[0];
+
       if (!parameter) {
-        renderedRequest.parameters.push({ name, value });
+        renderedRequest.parameters.push({
+          name,
+          value,
+        });
       }
     },
-    setAuthenticationParameter(name: string, value: string): void {
+
+    setAuthenticationParameter(name: string, value: string) {
       Object.assign(renderedRequest.authentication, {
         [name]: value,
       });
     },
-    getAuthentication(): Object {
+
+    getAuthentication() {
       return renderedRequest.authentication;
     },
-    getBody(): RequestBody {
+
+    getBody() {
       return renderedRequest.body;
     },
-    setBody(body: RequestBody): void {
+
+    setBody(body: RequestBody) {
       renderedRequest.body = body;
     },
 
@@ -154,43 +200,65 @@ export function init(
     // ~~~~~~~~~~~~~~~~~~ //
 
     /** @deprecated in favor of getting the whole body by getBody */
-    getBodyText(): string {
+    getBodyText() {
       console.warn('request.getBodyText() is deprecated. Use request.getBody() instead.');
       return renderedRequest.body.text || '';
     },
 
     /** @deprecated in favor of setting the whole body by setBody */
-    setBodyText(text: string): void {
+    setBodyText(text: string) {
       console.warn('request.setBodyText() is deprecated. Use request.setBody() instead.');
       renderedRequest.body.text = text;
     },
 
     // NOTE: For these to make sense, we'd need to account for cookies in the jar as well
-    // addCookie (name: string, value: string): void {}
+    // addCookie (name: string, value: string) {}
     // getCookie (name: string): string | null {}
-    // removeCookie (name: string): void {}
-  }: Object);
+    // removeCookie (name: string) {}
+  };
 
+  /* eslint-disable @typescript-eslint/ban-ts-comment */
   if (readOnly) {
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.setUrl;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.setMethod;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.setBodyText;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.setCookie;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.settingSendCookies;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.settingStoreCookies;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.settingEncodeUrl;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.settingDisableRenderRequestBody;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.settingFollowRedirects;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.removeHeader;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.setHeader;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.addHeader;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.removeParameter;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.setParameter;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.addParameter;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.addParameter;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.setAuthenticationParameter;
+    // @ts-ignore -- TSCONVERSION something is wrong here, the build doesn't error here but vscode does
     delete request.setBody;
   }
+  /* eslint-enable @typescript-eslint/ban-ts-comment */
 
-  return { request };
+  return {
+    request,
+  };
 }
diff --git a/packages/insomnia-app/app/plugins/context/response.js b/packages/insomnia-app/app/plugins/context/response.ts
similarity index 70%
rename from packages/insomnia-app/app/plugins/context/response.js
rename to packages/insomnia-app/app/plugins/context/response.ts
index bb9a537b94..566aa01009 100644
--- a/packages/insomnia-app/app/plugins/context/response.js
+++ b/packages/insomnia-app/app/plugins/context/response.ts
@@ -1,21 +1,19 @@
-// @flow
 import type { ResponseHeader } from '../../models/response';
 import * as models from '../../models/index';
 import fs from 'fs';
-import { Readable } from 'stream';
 
-type MaybeResponse = {
-  parentId?: string,
-  statusCode?: number,
-  statusMessage?: string,
-  bytesRead?: number,
-  bytesContent?: number,
-  bodyPath?: string,
-  elapsedTime?: number,
-  headers?: Array<ResponseHeader>,
-};
+interface MaybeResponse {
+  parentId?: string;
+  statusCode?: number;
+  statusMessage?: string;
+  bytesRead?: number;
+  bytesContent?: number;
+  bodyPath?: string;
+  elapsedTime?: number;
+  headers?: Array<ResponseHeader>;
+}
 
-export function init(response: MaybeResponse): { response: Object } {
+export function init(response?: MaybeResponse) {
   if (!response) {
     throw new Error('contexts.response initialized without response');
   }
@@ -27,27 +25,36 @@ export function init(response: MaybeResponse): { response: Object } {
       // getId () {
       //   return response.parentId;
       // },
-      getRequestId(): string {
+
+      getRequestId() {
         return response.parentId || '';
       },
-      getStatusCode(): number {
+
+      getStatusCode() {
         return response.statusCode || 0;
       },
-      getStatusMessage(): string {
+
+      getStatusMessage() {
         return response.statusMessage || '';
       },
-      getBytesRead(): number {
+
+      getBytesRead() {
         return response.bytesRead || 0;
       },
-      getTime(): number {
+
+      getTime() {
         return response.elapsedTime || 0;
       },
-      getBody(): Buffer | null {
+
+      getBody() {
         return models.response.getBodyBuffer(response);
       },
-      getBodyStream(): Readable | null {
+
+      getBodyStream() {
+        // @ts-expect-error -- TSCONVERSION
         return models.response.getBodyStream(response);
       },
+
       setBody(body: Buffer) {
         // Should never happen but just in case it does...
         if (!response.bodyPath) {
@@ -57,9 +64,11 @@ export function init(response: MaybeResponse): { response: Object } {
         fs.writeFileSync(response.bodyPath, body);
         response.bytesContent = body.length;
       },
+
       getHeader(name: string): string | Array<string> | null {
         const headers = response.headers || [];
         const matchedHeaders = headers.filter(h => h.name.toLowerCase() === name.toLowerCase());
+
         if (matchedHeaders.length > 1) {
           return matchedHeaders.map(h => h.value);
         } else if (matchedHeaders.length === 1) {
@@ -68,13 +77,15 @@ export function init(response: MaybeResponse): { response: Object } {
           return null;
         }
       },
-      getHeaders(): Array<{ name: string, value: string }> {
-        return response.headers.map(h => ({
+
+      getHeaders() {
+        return response.headers?.map(h => ({
           name: h.name,
           value: h.value,
         }));
       },
-      hasHeader(name: string): boolean {
+
+      hasHeader(name: string) {
         return this.getHeader(name) !== null;
       },
     },
diff --git a/packages/insomnia-app/app/plugins/context/store.js b/packages/insomnia-app/app/plugins/context/store.js
deleted file mode 100644
index 19b106d6df..0000000000
--- a/packages/insomnia-app/app/plugins/context/store.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// @flow
-import type { Plugin } from '../index';
-import * as models from '../../models';
-
-export type PluginStore = {
-  hasItem(string): Promise<boolean>,
-  setItem(string, string): Promise<void>,
-  getItem(string): Promise<string | null>,
-  removeItem(string): Promise<void>,
-  clear(): Promise<void>,
-  all(): Promise<Array<{ key: string, value: string }>>,
-};
-
-export function init(plugin: Plugin): { store: PluginStore } {
-  return {
-    store: {
-      async hasItem(key: string): Promise<boolean> {
-        const doc = await models.pluginData.getByKey(plugin.name, key);
-        return doc !== null;
-      },
-      async setItem(key: string, value: string): Promise<void> {
-        await models.pluginData.upsertByKey(plugin.name, key, String(value));
-      },
-      async getItem(key: string): Promise<string | null> {
-        const doc = await models.pluginData.getByKey(plugin.name, key);
-        return doc ? doc.value : null;
-      },
-      async removeItem(key: string): Promise<void> {
-        await models.pluginData.removeByKey(plugin.name, key);
-      },
-      async clear(): Promise<void> {
-        await models.pluginData.removeAll(plugin.name);
-      },
-      async all(): Promise<Array<{ key: string, value: string }>> {
-        const docs = await models.pluginData.all(plugin.name);
-        return docs.map(d => ({
-          value: d.value,
-          key: d.key,
-        }));
-      },
-    },
-  };
-}
diff --git a/packages/insomnia-app/app/plugins/context/store.ts b/packages/insomnia-app/app/plugins/context/store.ts
new file mode 100644
index 0000000000..13f1e018ec
--- /dev/null
+++ b/packages/insomnia-app/app/plugins/context/store.ts
@@ -0,0 +1,57 @@
+import type { Plugin } from '../index';
+import * as models from '../../models';
+
+export interface PluginStore {
+  hasItem(arg0: string): Promise<boolean>;
+  setItem(arg0: string, arg1: string): Promise<void>;
+  getItem(arg0: string): Promise<string | null>;
+  removeItem(arg0: string): Promise<void>;
+  clear(): Promise<void>;
+  all(): Promise<
+    Array<{
+      key: string;
+      value: string;
+    }>
+  >;
+}
+
+export function init(plugin: Plugin) {
+  return {
+    store: {
+      async hasItem(key: string) {
+        const doc = await models.pluginData.getByKey(plugin.name, key);
+        return doc !== null;
+      },
+
+      async setItem(key: string, value: string) {
+        await models.pluginData.upsertByKey(plugin.name, key, String(value));
+      },
+
+      async getItem(key: string) {
+        const doc = await models.pluginData.getByKey(plugin.name, key);
+        return doc ? doc.value : null;
+      },
+
+      async removeItem(key: string) {
+        await models.pluginData.removeByKey(plugin.name, key);
+      },
+
+      async clear() {
+        await models.pluginData.removeAll(plugin.name);
+      },
+
+      async all(): Promise<
+        Array<{
+          key: string;
+          value: string;
+        }>
+      > {
+        const docs = await models.pluginData.all(plugin.name) || [];
+        return docs.map(d => ({
+          value: d.value,
+          key: d.key,
+        }));
+      },
+    },
+  };
+}
diff --git a/packages/insomnia-app/app/plugins/create.js b/packages/insomnia-app/app/plugins/create.ts
similarity index 96%
rename from packages/insomnia-app/app/plugins/create.js
rename to packages/insomnia-app/app/plugins/create.ts
index 0f4b57e392..0eed50f21f 100644
--- a/packages/insomnia-app/app/plugins/create.js
+++ b/packages/insomnia-app/app/plugins/create.ts
@@ -1,4 +1,3 @@
-// @flow
 import fs from 'fs';
 import path from 'path';
 import mkdirp from 'mkdirp';
@@ -9,7 +8,7 @@ export async function createPlugin(
   moduleName: string,
   version: string,
   mainJs: string,
-): Promise<void> {
+) {
   const pluginDir = path.join(PLUGIN_PATH, moduleName);
 
   if (fs.existsSync(pluginDir)) {
@@ -18,7 +17,6 @@ export async function createPlugin(
 
   rimraf.sync(pluginDir);
   mkdirp.sync(pluginDir);
-
   // Write package.json
   fs.writeFileSync(
     path.join(pluginDir, 'package.json'),
@@ -37,7 +35,6 @@ export async function createPlugin(
       2,
     ),
   );
-
   // Write main JS file
   fs.writeFileSync(path.join(pluginDir, 'main.js'), mainJs);
 }
diff --git a/packages/insomnia-app/app/plugins/index.js b/packages/insomnia-app/app/plugins/index.ts
similarity index 60%
rename from packages/insomnia-app/app/plugins/index.js
rename to packages/insomnia-app/app/plugins/index.ts
index fbe1923df6..0f751a111c 100644
--- a/packages/insomnia-app/app/plugins/index.js
+++ b/packages/insomnia-app/app/plugins/index.ts
@@ -1,6 +1,5 @@
-// @flow
 import mkdirp from 'mkdirp';
-import { appConfig } from '../../config';
+import appConfig from '../../config/config.json';
 import * as models from '../models';
 import fs from 'fs';
 import path from 'path';
@@ -13,103 +12,119 @@ import type { RequestGroup } from '../models/request-group';
 import type { Request } from '../models/request';
 import type { PluginConfig, PluginConfigMap } from '../models/settings';
 import type { Workspace } from '../models/workspace';
+import { GrpcRequest } from '../models/grpc-request';
 
-export type Plugin = {
-  name: string,
-  description: string,
-  version: string,
-  directory: string,
-  config: PluginConfig,
-  module: *,
-};
+export interface Module {
+  templateTags?: Array<PluginTemplateTag>,
+  requestHooks?: Array<(requstContext: any) => void>,
+  responseHooks?: Array<(responseContext: any) => void>,
+  themes?: Array<PluginTheme>,
+  requestGroupActions?: Array<OmitInternal<RequestGroupAction>>,
+  requestActions?: Array<OmitInternal<RequestAction>>,
+  workspaceActions?: Array<OmitInternal<WorkspaceAction>>,
+  documentActions?: Array<OmitInternal<DocumentAction>>,
+  configGenerators?: Array<OmitInternal<ConfigGenerator>>,
+}
 
-export type TemplateTag = {
-  plugin: Plugin,
-  templateTag: PluginTemplateTag,
-};
+export interface Plugin {
+  name: string;
+  description: string;
+  version: string;
+  directory: string;
+  config: PluginConfig;
+  module: Module;
+}
+interface InternalProperties {
+  plugin: Plugin;
+}
 
-export type RequestGroupAction = {
-  plugin: Plugin,
+type OmitInternal<T> = Omit<T, keyof InternalProperties>;
+export interface TemplateTag extends InternalProperties {
+  templateTag: PluginTemplateTag;
+}
+
+export interface RequestGroupAction extends InternalProperties {
   action: (
-    context: Object,
+    context: Record<string, any>,
     models: {
-      requestGroup: RequestGroup,
-      requests: Array<Request>,
+      requestGroup: RequestGroup;
+      requests: Array<Request | GrpcRequest>;
     },
-  ) => void | Promise<void>,
-  label: string,
-  icon?: string,
-};
+  ) => void | Promise<void>;
+  label: string;
+  icon?: string;
+}
 
-export type RequestAction = {
-  plugin: Plugin,
+export interface RequestAction extends InternalProperties {
   action: (
-    context: Object,
+    context: Record<string, any>,
     models: {
-      requestGroup: RequestGroup,
-      request: Array<Request>,
+      requestGroup?: RequestGroup;
+      request: Request | GrpcRequest;
     },
-  ) => void | Promise<void>,
-  label: string,
-  icon?: string,
-};
+  ) => void | Promise<void>;
+  label: string;
+  icon?: string;
+}
 
-export type WorkspaceAction = {
-  plugin: Plugin,
+export interface WorkspaceAction extends InternalProperties {
   action: (
-    context: Object,
+    context: Record<string, any>,
     models: {
-      workspace: Workspace,
-      requestGroups: Array<RequestGroup>,
-      requests: Array<Request>,
+      workspace: Workspace;
+      requestGroups: Array<RequestGroup>;
+      requests: Array<Request>;
     },
-  ) => void | Promise<void>,
-  label: string,
-  icon?: string,
-};
+  ) => void | Promise<void>;
+  label: string;
+  icon?: string;
+}
 
-export type SpecInfo = {
-  contents: Object,
-  rawContents: string,
-  format: string,
-  formatVersion: string,
-};
+export interface SpecInfo {
+  contents: Record<string, any>;
+  rawContents: string;
+  format: string;
+  formatVersion: string;
+}
 
-export type ConfigGenerator = {
-  plugin: Plugin,
-  label: string,
-  generate: (info: SpecInfo) => Promise<{ document?: string, error?: string }>,
-};
+export interface ConfigGenerator extends InternalProperties {
+  label: string;
+  generate: (
+    info: SpecInfo,
+  ) => Promise<{
+    document?: string;
+    error?: string;
+  }>;
+}
 
-export type DocumentAction = {
-  plugin: Plugin,
-  action: (context: Object, documents: SpecInfo) => void | Promise<void>,
-  label: string,
-  hideAfterClick?: boolean,
-};
+export interface DocumentAction extends InternalProperties {
+  action: (context: Record<string, any>, documents: SpecInfo) => void | Promise<void>;
+  label: string;
+  hideAfterClick?: boolean;
+}
 
-export type RequestHook = {
-  plugin: Plugin,
-  hook: Function,
-};
+type RequestHookCallback = (context: any) => void;
 
-export type ResponseHook = {
-  plugin: Plugin,
-  hook: Function,
-};
+export interface RequestHook extends InternalProperties {
+  hook: RequestHookCallback;
+}
 
-export type Theme = {
-  plugin: Plugin,
-  theme: PluginTheme,
-};
+type ResponseHookCallback = (context: any) => void;
+export interface ResponseHook extends InternalProperties {
+  hook: ResponseHookCallback;
+}
+
+export interface Theme extends InternalProperties {
+  theme: PluginTheme;
+}
 
 export type ColorScheme = 'default' | 'light' | 'dark';
 
-let plugins: ?Array<Plugin> = null;
+let plugins: Array<Plugin> | null | undefined = null;
 
 let ignorePlugins: Array<string> = [];
 
-export async function init(): Promise<void> {
+export async function init() {
   clearIgnores();
   await reloadPlugins();
 }
@@ -125,7 +140,7 @@ export function clearIgnores() {
 }
 
 async function _traversePluginPath(
-  pluginMap: Object,
+  pluginMap: Record<string, any>,
   allPaths: Array<string>,
   allConfigs: PluginConfigMap,
 ) {
@@ -173,7 +188,6 @@ async function _traversePluginPath(
         const module = global.require(modulePath);
 
         const pluginName = pluginJson.name;
-
         pluginMap[pluginName] = _initPlugin(pluginJson || {}, module, allConfigs, modulePath);
         console.log(`[plugin] Loaded ${modulePath}`);
       } catch (err) {
@@ -187,7 +201,7 @@ async function _traversePluginPath(
   }
 }
 
-export async function getPlugins(force: boolean = false): Promise<Array<Plugin>> {
+export async function getPlugins(force = false): Promise<Array<Plugin>> {
   if (force) {
     plugins = null;
   }
@@ -199,43 +213,43 @@ export async function getPlugins(force: boolean = false): Promise<Array<Plugin>>
       .split(':')
       .filter(p => p)
       .map(resolveHomePath);
-
     // Make sure the default directories exist
     mkdirp.sync(PLUGIN_PATH);
-
     // Also look in node_modules folder in each directory
     const basePaths = [PLUGIN_PATH, ...extraPaths];
     const extendedPaths = basePaths.map(p => path.join(p, 'node_modules'));
     const allPaths = [...basePaths, ...extendedPaths];
-
     // Store plugins in a map so that plugins with the same
     // name only get added once
     // TODO: Make this more complex and have the latest version always win
-    const pluginMap: { [string]: Plugin } = {
+    const pluginMap: Record<string, Plugin> = {
       // "name": "module"
     };
 
-    for (const p of appConfig().plugins) {
+    for (const p of appConfig.plugins) {
       if (ignorePlugins.includes(p)) {
         continue;
       }
+
       const pluginJson = global.require(`${p}/package.json`);
+
       if (ignorePlugins.includes(pluginJson.name)) {
         continue;
       }
+
       const pluginModule = global.require(p);
+
       pluginMap[pluginJson.name] = _initPlugin(pluginJson, pluginModule, allConfigs);
     }
 
     await _traversePluginPath(pluginMap, allPaths, allConfigs);
-
     plugins = Object.keys(pluginMap).map(name => pluginMap[name]);
   }
 
   return plugins;
 }
 
-export async function reloadPlugins(): Promise<void> {
+export async function reloadPlugins() {
   await getPlugins(true);
 }
 
@@ -244,113 +258,173 @@ async function getActivePlugins(): Promise<Array<Plugin>> {
 }
 
 export async function getRequestGroupActions(): Promise<Array<RequestGroupAction>> {
-  let extensions = [];
+  let extensions: Array<RequestGroupAction> = [];
+
   for (const plugin of await getActivePlugins()) {
     const actions = plugin.module.requestGroupActions || [];
-    extensions = [...extensions, ...actions.map(p => ({ plugin, ...p }))];
+    extensions = [
+      ...extensions,
+      ...actions.map(p => ({
+        plugin,
+        ...p,
+      })),
+    ];
   }
 
   return extensions;
 }
 
 export async function getRequestActions(): Promise<Array<RequestAction>> {
-  let extensions = [];
+  let extensions: Array<RequestAction> = [];
+
   for (const plugin of await getActivePlugins()) {
     const actions = plugin.module.requestActions || [];
-    extensions = [...extensions, ...actions.map(p => ({ plugin, ...p }))];
+    extensions = [
+      ...extensions,
+      ...actions.map(p => ({
+        plugin,
+        ...p,
+      })),
+    ];
   }
 
   return extensions;
 }
 
 export async function getWorkspaceActions(): Promise<Array<WorkspaceAction>> {
-  let extensions = [];
+  let extensions: Array<WorkspaceAction> = [];
+
   for (const plugin of await getActivePlugins()) {
     const actions = plugin.module.workspaceActions || [];
-    extensions = [...extensions, ...actions.map(p => ({ plugin, ...p }))];
+    extensions = [
+      ...extensions,
+      ...actions.map(p => ({
+        plugin,
+        ...p,
+      })),
+    ];
   }
 
   return extensions;
 }
 
 export async function getDocumentActions(): Promise<Array<DocumentAction>> {
-  let extensions = [];
+  let extensions: Array<DocumentAction> = [];
+
   for (const plugin of await getActivePlugins()) {
     const actions = plugin.module.documentActions || [];
-    extensions = [...extensions, ...actions.map(p => ({ plugin, ...p }))];
+    extensions = [
+      ...extensions,
+      ...actions.map(p => ({
+        plugin,
+        ...p,
+      })),
+    ];
   }
 
   return extensions;
 }
 
 export async function getTemplateTags(): Promise<Array<TemplateTag>> {
-  let extensions = [];
+  let extensions: Array<TemplateTag> = [];
+
   for (const plugin of await getActivePlugins()) {
     const templateTags = plugin.module.templateTags || [];
-    extensions = [...extensions, ...templateTags.map(tt => ({ plugin, templateTag: tt }))];
+    extensions = [
+      ...extensions,
+      ...templateTags.map(tt => ({
+        plugin,
+        templateTag: tt,
+      })),
+    ];
   }
 
   return extensions;
 }
 
 export async function getRequestHooks(): Promise<Array<RequestHook>> {
-  let functions = [];
+  let functions: Array<RequestHook> = [];
+
   for (const plugin of await getActivePlugins()) {
     const moreFunctions = plugin.module.requestHooks || [];
-    functions = [...functions, ...moreFunctions.map(hook => ({ plugin, hook }))];
+    functions = [
+      ...functions,
+      ...moreFunctions.map(hook => ({
+        plugin,
+        hook,
+      })),
+    ];
   }
 
   return functions;
 }
 
 export async function getResponseHooks(): Promise<Array<ResponseHook>> {
-  let functions = [];
+  let functions: Array<ResponseHook> = [];
+
   for (const plugin of await getActivePlugins()) {
     const moreFunctions = plugin.module.responseHooks || [];
-    functions = [...functions, ...moreFunctions.map(hook => ({ plugin, hook }))];
+    functions = [
+      ...functions,
+      ...moreFunctions.map(hook => ({
+        plugin,
+        hook,
+      })),
+    ];
   }
 
   return functions;
 }
 
 export async function getThemes(): Promise<Array<Theme>> {
-  let extensions = [];
+  let extensions: Array<Theme> = [];
+
   for (const plugin of await getActivePlugins()) {
     const themes = plugin.module.themes || [];
-    extensions = [...extensions, ...themes.map(theme => ({ plugin, theme }))];
+    extensions = [
+      ...extensions,
+      ...themes.map(theme => ({
+        plugin,
+        theme,
+      })),
+    ];
   }
 
   return extensions;
 }
 
 export async function getConfigGenerators(): Promise<Array<ConfigGenerator>> {
-  let functions = [];
+  let functions: Array<ConfigGenerator> = [];
+
   for (const plugin of await getActivePlugins()) {
     const moreFunctions = plugin.module.configGenerators || [];
-    functions = [...functions, ...moreFunctions.map(p => ({ plugin, ...p }))];
+    functions = [
+      ...functions,
+      ...moreFunctions.map(p => ({
+        plugin,
+        ...p,
+      })),
+    ];
   }
 
   return functions;
 }
-
 const _defaultPluginConfig: PluginConfig = {
   disabled: false,
 };
 
 function _initPlugin(
-  packageJSON: Object,
+  packageJSON: Record<string, any>,
   module: any,
   allConfigs: PluginConfigMap,
-  path: ?string,
+  path?: string | null,
 ): Plugin {
   const meta = packageJSON.insomnia || {};
   const name = packageJSON.name || meta.name;
-
   // Find config
   const config: PluginConfig = allConfigs.hasOwnProperty(name)
     ? allConfigs[name]
     : _defaultPluginConfig;
-
   return {
     name,
     description: packageJSON.description || meta.description || '',
diff --git a/packages/insomnia-app/app/plugins/install.js b/packages/insomnia-app/app/plugins/install.ts
similarity index 84%
rename from packages/insomnia-app/app/plugins/install.js
rename to packages/insomnia-app/app/plugins/install.ts
index ebdb0d14ee..6234cb680e 100644
--- a/packages/insomnia-app/app/plugins/install.js
+++ b/packages/insomnia-app/app/plugins/install.ts
@@ -1,23 +1,32 @@
-// @flow
 import * as electron from 'electron';
 import fs from 'fs';
 import fsx from 'fs-extra';
 import childProcess from 'child_process';
-import { getTempDir, isDevelopment, isWindows, PLUGIN_PATH } from '../common/constants';
+import { isDevelopment, isWindows, PLUGIN_PATH } from '../common/constants';
 import mkdirp from 'mkdirp';
 import path from 'path';
+import { getTempDir } from '../common/electron-helpers';
 
 const YARN_DEPRECATED_WARN = /(?<keyword>warning)(?<dependencies>[^>:].+[>:])(?<issue>.+)/;
 
-export default async function(lookupName: string): Promise<void> {
-  return new Promise(async (resolve, reject) => {
-    let info: Object = {};
+interface InsomniaPlugin {
+  insomnia: any;
+  name: string;
+  version: string;
+  dist: {
+    shasum: string;
+    tarball: string;
+  }
+}
+
+export default async function(lookupName: string) {
+  return new Promise<void>(async (resolve, reject) => {
+    let info: InsomniaPlugin | null = null;
+
     try {
       info = await _isInsomniaPlugin(lookupName);
-
       // Get actual module name without version suffixes and things
       const moduleName = info.name;
-
       const pluginDir = path.join(PLUGIN_PATH, moduleName);
 
       // Make plugin directory
@@ -26,28 +35,33 @@ export default async function(lookupName: string): Promise<void> {
       // Download the module
       const request = electron.remote.net.request(info.dist.tarball);
       request.on('error', err => {
-        reject(new Error(`Failed to make plugin request ${info.dist.tarball}: ${err.message}`));
+        reject(new Error(`Failed to make plugin request ${info?.dist.tarball}: ${err.message}`));
       });
-
       const { tmpDir } = await _installPluginToTmpDir(lookupName);
       console.log(`[plugins] Moving plugin from ${tmpDir} to ${pluginDir}`);
 
       // Move entire module to plugins folder
-      fsx.moveSync(path.join(tmpDir, moduleName), pluginDir, {
-        overwrite: true,
-      });
+      fsx.moveSync(
+        path.join(tmpDir, moduleName),
+        pluginDir,
+        { overwrite: true },
+      );
 
       // Move each dependency into node_modules folder
       const pluginModulesDir = path.join(pluginDir, 'node_modules');
       mkdirp.sync(pluginModulesDir);
+
       for (const name of fs.readdirSync(tmpDir)) {
         const src = path.join(tmpDir, name);
+
         if (name === moduleName || !fs.statSync(src).isDirectory()) {
           continue;
         }
 
         const dest = path.join(pluginModulesDir, name);
-        fsx.moveSync(src, dest, { overwrite: true });
+        fsx.moveSync(src, dest, {
+          overwrite: true,
+        });
       }
     } catch (err) {
       reject(err);
@@ -58,8 +72,8 @@ export default async function(lookupName: string): Promise<void> {
   });
 }
 
-async function _isInsomniaPlugin(lookupName: string): Promise<Object> {
-  return new Promise((resolve, reject) => {
+async function _isInsomniaPlugin(lookupName: string) {
+  return new Promise<InsomniaPlugin>((resolve, reject) => {
     console.log('[plugins] Fetching module info from npm');
     childProcess.execFile(
       escape(process.execPath),
@@ -86,6 +100,7 @@ async function _isInsomniaPlugin(lookupName: string): Promise<Object> {
         }
 
         let yarnOutput;
+
         try {
           yarnOutput = JSON.parse(stdout.toString());
         } catch (ex) {
@@ -97,18 +112,19 @@ async function _isInsomniaPlugin(lookupName: string): Promise<Object> {
           } else {
             reject(new Error(`Yarn response not JSON: ${ex.message}`));
           }
+
           return;
         }
 
         const data = yarnOutput.data;
+
         if (!data.hasOwnProperty('insomnia')) {
           reject(new Error(`"${lookupName}" not a plugin! Package missing "insomnia" attribute`));
           return;
         }
 
         console.log(`[plugins] Detected Insomnia plugin ${data.name}`);
-
-        resolve({
+        const insomniaPlugin: InsomniaPlugin = {
           insomnia: data.insomnia,
           name: data.name,
           version: data.version,
@@ -116,14 +132,15 @@ async function _isInsomniaPlugin(lookupName: string): Promise<Object> {
             shasum: data.dist.shasum,
             tarball: data.dist.tarball,
           },
-        });
+        };
+        resolve(insomniaPlugin);
       },
     );
   });
 }
 
-async function _installPluginToTmpDir(lookupName: string): Promise<{ tmpDir: string }> {
-  return new Promise((resolve, reject) => {
+async function _installPluginToTmpDir(lookupName: string) {
+  return new Promise<{ tmpDir: string }>((resolve, reject) => {
     const tmpDir = path.join(getTempDir(), `${lookupName}-${Date.now()}`);
     mkdirp.sync(tmpDir);
     console.log(`[plugins] Installing plugin to ${tmpDir}`);
@@ -146,7 +163,8 @@ async function _installPluginToTmpDir(lookupName: string): Promise<{ tmpDir: str
         timeout: 5 * 60 * 1000,
         maxBuffer: 1024 * 1024,
         cwd: tmpDir,
-        shell: true, // Some package installs require a shell
+        shell: true,
+        // Some package installs require a shell
         env: {
           NODE_ENV: 'production',
           ELECTRON_RUN_AS_NODE: 'true',
@@ -166,7 +184,9 @@ async function _installPluginToTmpDir(lookupName: string): Promise<{ tmpDir: str
           return;
         }
 
-        resolve({ tmpDir });
+        resolve({
+          tmpDir,
+        });
       },
     );
   });
@@ -190,9 +210,9 @@ export function containsOnlyDeprecationWarnings(stderr) {
  * @param str The error message
  * @returns {boolean} Returns true if it's a deprecated warning
  */
-export function isDeprecatedDependencies(str: string): boolean {
+export function isDeprecatedDependencies(str: string) {
   // The issue contains the message as it is without the dependency list
-  const message = YARN_DEPRECATED_WARN.exec(str)?.groups.issue;
+  const message = YARN_DEPRECATED_WARN.exec(str)?.groups?.issue;
   // Strict check, everything must be matched to be a false positive
   // !! is not a mistake, makes it returns boolean instead of undefined on error
   return !!(
diff --git a/packages/insomnia-app/app/plugins/misc.js b/packages/insomnia-app/app/plugins/misc.ts
similarity index 82%
rename from packages/insomnia-app/app/plugins/misc.js
rename to packages/insomnia-app/app/plugins/misc.ts
index 18c0274811..6d76828a29 100644
--- a/packages/insomnia-app/app/plugins/misc.js
+++ b/packages/insomnia-app/app/plugins/misc.ts
@@ -1,68 +1,69 @@
-// @flow
 import Color from 'color';
 import { render, THROW_ON_ERROR } from '../common/render';
 import { getThemes } from './index';
 import type { Theme } from './index';
 import { getAppDefaultTheme } from '../common/constants';
+import { Settings } from '../models/settings';
 
-type ThemeBlock = {
+interface ThemeBlock {
   background?: {
-    default: string,
-    success?: string,
-    notice?: string,
-    warning?: string,
-    danger?: string,
-    surprise?: string,
-    info?: string,
-  },
+    default: string;
+    success?: string;
+    notice?: string;
+    warning?: string;
+    danger?: string;
+    surprise?: string;
+    info?: string;
+  };
   foreground?: {
-    default: string,
-    success?: string,
-    notice?: string,
-    warning?: string,
-    danger?: string,
-    surprise?: string,
-    info?: string,
-  },
+    default: string;
+    success?: string;
+    notice?: string;
+    warning?: string;
+    danger?: string;
+    surprise?: string;
+    info?: string;
+  };
   highlight?: {
-    default: string,
-    xxs?: string,
-    xs?: string,
-    sm?: string,
-    md?: string,
-    lg?: string,
-    xl?: string,
-  },
+    default: string;
+    xxs?: string;
+    xs?: string;
+    sm?: string;
+    md?: string;
+    lg?: string;
+    xl?: string;
+  };
+}
+
+type ThemeInner = ThemeBlock & {
+  rawCss?: string;
+  styles?:
+    | {
+        dialog?: ThemeBlock;
+        dialogFooter?: ThemeBlock;
+        dialogHeader?: ThemeBlock;
+        dropdown?: ThemeBlock;
+        editor?: ThemeBlock;
+        link?: ThemeBlock;
+        overlay?: ThemeBlock;
+        pane?: ThemeBlock;
+        paneHeader?: ThemeBlock;
+        sidebar?: ThemeBlock;
+        sidebarHeader?: ThemeBlock;
+        sidebarList?: ThemeBlock;
+        tooltip?: ThemeBlock;
+        transparentOverlay?: ThemeBlock;
+      }
+    | null;
 };
 
-type ThemeInner = {
-  ...ThemeBlock,
-  rawCss?: string,
-  styles: ?{
-    dialog?: ThemeBlock,
-    dialogFooter?: ThemeBlock,
-    dialogHeader?: ThemeBlock,
-    dropdown?: ThemeBlock,
-    editor?: ThemeBlock,
-    link?: ThemeBlock,
-    overlay?: ThemeBlock,
-    pane?: ThemeBlock,
-    paneHeader?: ThemeBlock,
-    sidebar?: ThemeBlock,
-    sidebarHeader?: ThemeBlock,
-    sidebarList?: ThemeBlock,
-    tooltip?: ThemeBlock,
-    transparentOverlay?: ThemeBlock,
-  },
-};
+export interface PluginTheme {
+  name: string;
+  displayName: string;
+  theme: ThemeInner;
+}
 
-export type PluginTheme = {
-  name: string,
-  displayName: string,
-  theme: ThemeInner,
-};
-
-export async function generateThemeCSS(theme: PluginTheme): Promise<string> {
+export async function generateThemeCSS(theme: PluginTheme) {
   const renderedTheme: ThemeInner = await render(
     theme.theme,
     theme.theme,
@@ -71,9 +72,7 @@ export async function generateThemeCSS(theme: PluginTheme): Promise<string> {
     theme.name,
   );
   const n = theme.name;
-
   let css = '';
-
   // For the top-level variables, merge with the base theme to ensure that
   // we have everything we need.
   css += wrapStyles(
@@ -89,46 +88,37 @@ export async function generateThemeCSS(theme: PluginTheme): Promise<string> {
 
   if (renderedTheme.styles) {
     const styles = renderedTheme.styles;
-
     // Dropdown Menus
     css += wrapStyles(
       n,
       '.theme--dropdown__menu',
       getThemeBlockCSS(styles.dropdown || styles.dialog),
     );
-
     // Tooltips
     css += wrapStyles(n, '.theme--tooltip', getThemeBlockCSS(styles.tooltip || styles.dialog));
-
     // Overlay
     css += wrapStyles(
       n,
       '.theme--transparent-overlay',
       getThemeBlockCSS(styles.transparentOverlay),
     );
-
     // Dialogs
     css += wrapStyles(n, '.theme--dialog', getThemeBlockCSS(styles.dialog));
     css += wrapStyles(n, '.theme--dialog__header', getThemeBlockCSS(styles.dialogHeader));
     css += wrapStyles(n, '.theme--dialog__footer', getThemeBlockCSS(styles.dialogFooter));
-
     // Panes
     css += wrapStyles(n, '.theme--pane', getThemeBlockCSS(styles.pane));
     css += wrapStyles(n, '.theme--pane__header', getThemeBlockCSS(styles.paneHeader));
-
+    // @ts-expect-error -- TSCONVERSION
     css += wrapStyles(n, '.theme--app-header', getThemeBlockCSS(styles.appHeader));
-
     // Sidebar Styles
     css += wrapStyles(n, '.theme--sidebar', getThemeBlockCSS(styles.sidebar));
     css += wrapStyles(n, '.theme--sidebar__list', getThemeBlockCSS(styles.sidebarList));
     css += wrapStyles(n, '.theme--sidebar__header', getThemeBlockCSS(styles.sidebarHeader));
-
     // Link
     css += wrapStyles(n, '.theme--link', getThemeBlockCSS(styles.link));
-
     // Code Editors
     css += wrapStyles(n, '.theme--editor', getThemeBlockCSS(styles.editor));
-
     // HACK: Dialog styles for CodeMirror dialogs too
     css += wrapStyles(n, '.CodeMirror-info', getThemeBlockCSS(styles.dialog));
   }
@@ -136,13 +126,12 @@ export async function generateThemeCSS(theme: PluginTheme): Promise<string> {
   return css;
 }
 
-function getThemeBlockCSS(block?: ThemeBlock): string {
+function getThemeBlockCSS(block?: ThemeBlock) {
   if (!block) {
     return '';
   }
 
   const indent = '\t';
-
   let css = '';
 
   const addColorVar = (variable: string, value?: string) => {
@@ -164,6 +153,7 @@ function getThemeBlockCSS(block?: ThemeBlock): string {
     if (!value) {
       return;
     }
+
     css += `${indent}--${variable}: ${value};\n`;
   };
 
@@ -232,24 +222,25 @@ function wrapStyles(theme: string, selector: string, styles: string) {
   ].join('\n');
 }
 
-export function getColorScheme(settings: Settings): ColorScheme {
+export function getColorScheme(settings: Settings) {
   if (!settings.autoDetectColorScheme) {
     return 'default';
   }
 
-  if (window.matchMedia(`(prefers-color-scheme: light)`).matches) {
+  if (window.matchMedia('(prefers-color-scheme: light)').matches) {
     return 'light';
   }
 
-  if (window.matchMedia(`(prefers-color-scheme: dark)`).matches) {
+  if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
     return 'dark';
   }
 
   return 'default';
 }
 
-export async function applyColorScheme(settings: Settings): Promise<void> {
+export async function applyColorScheme(settings: Settings) {
   const scheme = getColorScheme(settings);
+
   if (scheme === 'light') {
     await setTheme(settings.lightTheme);
   } else if (scheme === 'dark') {
@@ -285,7 +276,6 @@ export async function setTheme(themeName: string) {
     let themeCSS = (await generateThemeCSS(theme.theme)) + '\n';
     const { name } = theme.theme;
     const { rawCss } = theme.theme.theme;
-
     let s = document.querySelector(`style[data-theme-name="${name}"]`);
 
     if (!s) {
@@ -302,7 +292,7 @@ export async function setTheme(themeName: string) {
   }
 }
 
-export async function setFont(settings: Object) {
+export async function setFont(settings: Record<string, any>) {
   if (!document) {
     return;
   }
diff --git a/packages/insomnia-app/app/renderer.html b/packages/insomnia-app/app/renderer.html
index 53de80bc9e..6ac4ca1cf1 100644
--- a/packages/insomnia-app/app/renderer.html
+++ b/packages/insomnia-app/app/renderer.html
@@ -11,7 +11,14 @@
     <div id="root"></div>
     <div
       id="dropdowns-container"
-      style="z-index:99999;position:fixed;right:-90000px;top:-90000px;width:100vw;height:100vh;"
+      style="
+        z-index: 99999;
+        position: fixed;
+        right: -90000px;
+        top: -90000px;
+        width: 100vw;
+        height: 100vh;
+      "
     ></div>
     <div id="graphql-explorer-container"></div>
     <script src="bundle.js" type="application/javascript"></script>
diff --git a/packages/insomnia-app/app/renderer.js b/packages/insomnia-app/app/renderer.ts
similarity index 100%
rename from packages/insomnia-app/app/renderer.js
rename to packages/insomnia-app/app/renderer.ts
diff --git a/packages/insomnia-app/app/sync/delta/__tests__/diff.test.js b/packages/insomnia-app/app/sync/delta/__tests__/diff.test.ts
similarity index 70%
rename from packages/insomnia-app/app/sync/delta/__tests__/diff.test.js
rename to packages/insomnia-app/app/sync/delta/__tests__/diff.test.ts
index 8e2398c9cc..60221162b1 100644
--- a/packages/insomnia-app/app/sync/delta/__tests__/diff.test.js
+++ b/packages/insomnia-app/app/sync/delta/__tests__/diff.test.ts
@@ -3,6 +3,7 @@ import { diff, __internal } from '../diff';
 describe('diff()', () => {
   it('creates block map', () => {
     const result = __internal.getBlockMap('Hello World!!', 3);
+
     expect(result).toEqual({
       dbc2d1fed0dc37a70aea0f376958c802eddc0559: [
         {
@@ -46,9 +47,20 @@ describe('diff()', () => {
     // hel|lo |Wor|ld!|!
     const result = diff('Hello World!!', 'Hello there World!!', 3);
     expect(result).toEqual([
-      { type: 'COPY', start: 0, len: 6 },
-      { type: 'INSERT', content: 'there ' },
-      { type: 'COPY', start: 6, len: 7 },
+      {
+        type: 'COPY',
+        start: 0,
+        len: 6,
+      },
+      {
+        type: 'INSERT',
+        content: 'there ',
+      },
+      {
+        type: 'COPY',
+        start: 6,
+        len: 7,
+      },
     ]);
   });
 
@@ -59,12 +71,33 @@ describe('diff()', () => {
       2,
     );
     expect(result2).toEqual([
-      { len: 24, start: 0, type: 'COPY' },
-      { content: 'shor', type: 'INSERT' },
-      { len: 2, start: 42, type: 'COPY' },
-      { content: 's', type: 'INSERT' },
-      { len: 7, start: 30, type: 'COPY' },
-      { content: '.', type: 'INSERT' },
+      {
+        len: 24,
+        start: 0,
+        type: 'COPY',
+      },
+      {
+        content: 'shor',
+        type: 'INSERT',
+      },
+      {
+        len: 2,
+        start: 42,
+        type: 'COPY',
+      },
+      {
+        content: 's',
+        type: 'INSERT',
+      },
+      {
+        len: 7,
+        start: 30,
+        type: 'COPY',
+      },
+      {
+        content: '.',
+        type: 'INSERT',
+      },
     ]);
   });
 });
diff --git a/packages/insomnia-app/app/sync/delta/__tests__/patch.test.js b/packages/insomnia-app/app/sync/delta/__tests__/patch.test.ts
similarity index 100%
rename from packages/insomnia-app/app/sync/delta/__tests__/patch.test.js
rename to packages/insomnia-app/app/sync/delta/__tests__/patch.test.ts
index 0a2624ed06..122119381b 100644
--- a/packages/insomnia-app/app/sync/delta/__tests__/patch.test.js
+++ b/packages/insomnia-app/app/sync/delta/__tests__/patch.test.ts
@@ -18,6 +18,7 @@ describe('patch()', () => {
         // Test both directions
         for (let j = 0; j < 2; j++) {
           let a, b;
+
           if (j === 0) {
             a = thing[0];
             b = thing[1];
@@ -28,7 +29,6 @@ describe('patch()', () => {
 
           // Diff the result
           const diffResult = diff(a, b, i * 5);
-
           // Use the diff to patch it and make sure it equals the same
           expect(patch(a, diffResult)).toBe(b);
         }
diff --git a/packages/insomnia-app/app/sync/delta/diff.js b/packages/insomnia-app/app/sync/delta/diff.ts
similarity index 85%
rename from packages/insomnia-app/app/sync/delta/diff.js
rename to packages/insomnia-app/app/sync/delta/diff.ts
index 60533ff793..0a5f0ff20c 100644
--- a/packages/insomnia-app/app/sync/delta/diff.js
+++ b/packages/insomnia-app/app/sync/delta/diff.ts
@@ -1,36 +1,35 @@
-// @flow
 import crypto from 'crypto';
 
-type InsertOperation = {|
-  type: 'INSERT',
-  content: string,
-|};
+interface InsertOperation {
+  type: 'INSERT';
+  content: string;
+}
 
-type CopyOperation = {|
-  type: 'COPY',
-  start: number,
-  len: number,
-|};
+interface CopyOperation {
+  type: 'COPY';
+  start: number;
+  len: number;
+}
 
 export type Operation = InsertOperation | CopyOperation;
 
-type Block = {|
-  start: number,
-  len: number,
-  hash: string,
-|};
+interface Block {
+  start: number;
+  len: number;
+  hash: string;
+}
 
 export function diff(source: string, target: string, blockSize: number): Array<Operation> {
   const operations: Array<Operation> = [];
-
   const sourceBlockMap = getBlockMap(source, blockSize);
-
   // Iterate over source blocks in order and match them to target
   let lastTargetMatch = 0;
+
   for (let targetPosition = 0; targetPosition < target.length; ) {
     const targetBlock = getBlock(target, targetPosition, blockSize);
     const sourceBlocks = sourceBlockMap[targetBlock.hash] || [];
 
+    // @ts-expect-error -- TSCONVERSION appears to be a genuine error
     if (sourceBlocks.length === 0) {
       targetPosition++;
       continue;
@@ -38,7 +37,6 @@ export function diff(source: string, target: string, blockSize: number): Array<O
 
     // TODO: Try all blocks
     const sourceBlock = sourceBlocks[0];
-
     // Try to match as far as possible
     let sourceIndex = sourceBlock.start + sourceBlock.len;
     let targetIndex = targetBlock.start + targetBlock.len;
@@ -76,7 +74,6 @@ export function diff(source: string, target: string, blockSize: number): Array<O
       start: sourceBlock.start,
       len: sourceIndex - sourceBlock.start,
     });
-
     targetPosition = lastTargetMatch = targetIndex;
   }
 
@@ -100,14 +97,11 @@ function getBlock(value: string, start: number, blockSize: number): Block {
   return {
     start,
     len: blockSlice.length,
-    hash: crypto
-      .createHash('sha1')
-      .update(blockSlice)
-      .digest('hex'),
+    hash: crypto.createHash('sha1').update(blockSlice).digest('hex'),
   };
 }
 
-function getBlockMap(value: string, blockSize: number): { [string]: Block } {
+function getBlockMap(value: string, blockSize: number): Record<string, Block> {
   const map = {};
 
   for (let i = 0; i < value.length; ) {
diff --git a/packages/insomnia-app/app/sync/delta/patch.js b/packages/insomnia-app/app/sync/delta/patch.ts
similarity index 77%
rename from packages/insomnia-app/app/sync/delta/patch.js
rename to packages/insomnia-app/app/sync/delta/patch.ts
index c5356182c8..7337ec3685 100644
--- a/packages/insomnia-app/app/sync/delta/patch.js
+++ b/packages/insomnia-app/app/sync/delta/patch.ts
@@ -1,7 +1,6 @@
-// @flow
 import type { Operation } from './diff';
 
-export function patch(a: string, operations: Array<Operation>): string {
+export function patch(a: string, operations: Array<Operation>) {
   let result = '';
 
   for (const op of operations) {
diff --git a/packages/insomnia-app/app/sync/git/__mocks__/path.js b/packages/insomnia-app/app/sync/git/__mocks__/path.ts
similarity index 57%
rename from packages/insomnia-app/app/sync/git/__mocks__/path.js
rename to packages/insomnia-app/app/sync/git/__mocks__/path.ts
index ab0248c410..fa737c9969 100644
--- a/packages/insomnia-app/app/sync/git/__mocks__/path.js
+++ b/packages/insomnia-app/app/sync/git/__mocks__/path.ts
@@ -6,7 +6,10 @@ const exportObj = { __mockPath, ...path };
 function __mockPath(type) {
   const mock = type === 'win32' ? path.win32 : path.posix;
 
-  Object.keys(mock).forEach(k => (exportObj[k] = mock[k]));
+  Object.keys(mock).forEach(k => {
+    exportObj[k] = mock[k];
+  });
 }
 
+// WARNING: changing this to `export default` will break the mock and be incredibly hard to debug. Ask me how I know.
 module.exports = exportObj;
diff --git a/packages/insomnia-app/app/sync/git/__mocks__/shallow-clone.js b/packages/insomnia-app/app/sync/git/__mocks__/shallow-clone.js
deleted file mode 100644
index 8cd8240056..0000000000
--- a/packages/insomnia-app/app/sync/git/__mocks__/shallow-clone.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-  shallowClone: jest.fn(),
-};
diff --git a/packages/insomnia-app/app/sync/git/__mocks__/shallow-clone.ts b/packages/insomnia-app/app/sync/git/__mocks__/shallow-clone.ts
new file mode 100644
index 0000000000..3feba033c9
--- /dev/null
+++ b/packages/insomnia-app/app/sync/git/__mocks__/shallow-clone.ts
@@ -0,0 +1,4 @@
+// WARNING: changing this to `export default` will break the mock and be incredibly hard to debug. Ask me how I know.
+module.exports = {
+  shallowClone: jest.fn(),
+};
diff --git a/packages/insomnia-app/app/sync/git/__tests__/git-rollback.test.js b/packages/insomnia-app/app/sync/git/__tests__/git-rollback.test.ts
similarity index 79%
rename from packages/insomnia-app/app/sync/git/__tests__/git-rollback.test.js
rename to packages/insomnia-app/app/sync/git/__tests__/git-rollback.test.ts
index 4291c1cea6..0996e5c91b 100644
--- a/packages/insomnia-app/app/sync/git/__tests__/git-rollback.test.js
+++ b/packages/insomnia-app/app/sync/git/__tests__/git-rollback.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import path from 'path';
 import { GitVCS, GIT_CLONE_DIR, GIT_INSOMNIA_DIR } from '../git-vcs';
 import { setupDateMocks } from './util';
@@ -8,14 +7,19 @@ import { gitRollback } from '../git-rollback';
 
 describe('git rollback', () => {
   describe('mocked', () => {
-    const removeMock = jest.fn().mockResolvedValue();
-    const unlinkMock = jest.fn().mockResolvedValue();
-    const undoPendingChangesMock = jest.fn().mockResolvedValue();
-    let vcs: $Shape<GitVCS> = {};
+    const removeMock = jest.fn().mockResolvedValue(undefined);
+    const unlinkMock = jest.fn().mockResolvedValue(undefined);
+    const undoPendingChangesMock = jest.fn().mockResolvedValue(undefined);
+
+    let vcs: Partial<GitVCS> = {};
 
     beforeEach(() => {
       jest.resetAllMocks();
-      const fsMock = { promises: { unlink: unlinkMock } };
+      const fsMock = {
+        promises: {
+          unlink: unlinkMock,
+        },
+      };
       vcs = {
         getFs: jest.fn().mockReturnValue(fsMock),
         remove: removeMock,
@@ -26,39 +30,42 @@ describe('git rollback', () => {
     it('should remove and delete added and *added files', async () => {
       const aTxt = 'a.txt';
       const bTxt = 'b.txt';
-
       const files: Array<FileWithStatus> = [
-        { filePath: aTxt, status: 'added' },
-        { filePath: bTxt, status: '*added' },
+        {
+          filePath: aTxt,
+          status: 'added',
+        },
+        {
+          filePath: bTxt,
+          status: '*added',
+        },
       ];
-
       await gitRollback(vcs, files);
-
       expect(unlinkMock).toHaveBeenCalledTimes(2);
       expect(unlinkMock).toHaveBeenNthCalledWith(1, aTxt);
       expect(unlinkMock).toHaveBeenNthCalledWith(2, bTxt);
-
       expect(removeMock).toHaveBeenCalledTimes(2);
       expect(removeMock).toHaveBeenNthCalledWith(1, aTxt);
       expect(removeMock).toHaveBeenNthCalledWith(2, bTxt);
-
       expect(undoPendingChangesMock).not.toHaveBeenCalled();
     });
 
     it('should undo pending changes for non-added files', async () => {
       const aTxt = 'a.txt';
       const bTxt = 'b.txt';
-
       const files: Array<FileWithStatus> = [
-        { filePath: aTxt, status: 'modified' },
-        { filePath: bTxt, status: 'deleted' },
+        {
+          filePath: aTxt,
+          status: 'modified',
+        },
+        {
+          filePath: bTxt,
+          status: 'deleted',
+        },
       ];
-
       await gitRollback(vcs, files);
-
       expect(unlinkMock).toHaveBeenCalledTimes(0);
       expect(removeMock).toHaveBeenCalledTimes(0);
-
       expect(undoPendingChangesMock).toHaveBeenCalledTimes(1);
       expect(undoPendingChangesMock).toHaveBeenCalledWith(expect.arrayContaining([aTxt, bTxt]));
     });
@@ -68,24 +75,31 @@ describe('git rollback', () => {
       const bTxt = 'b.txt';
       const cTxt = 'c.txt';
       const dTxt = 'd.txt';
-
       const files: Array<FileWithStatus> = [
-        { filePath: aTxt, status: 'added' },
-        { filePath: bTxt, status: '*added' },
-        { filePath: cTxt, status: 'modified' },
-        { filePath: dTxt, status: 'deleted' },
+        {
+          filePath: aTxt,
+          status: 'added',
+        },
+        {
+          filePath: bTxt,
+          status: '*added',
+        },
+        {
+          filePath: cTxt,
+          status: 'modified',
+        },
+        {
+          filePath: dTxt,
+          status: 'deleted',
+        },
       ];
-
       await gitRollback(vcs, files);
-
       expect(unlinkMock).toHaveBeenCalledTimes(2);
       expect(unlinkMock).toHaveBeenNthCalledWith(1, aTxt);
       expect(unlinkMock).toHaveBeenNthCalledWith(2, bTxt);
-
       expect(removeMock).toHaveBeenCalledTimes(2);
       expect(removeMock).toHaveBeenNthCalledWith(1, aTxt);
       expect(removeMock).toHaveBeenNthCalledWith(2, bTxt);
-
       expect(undoPendingChangesMock).toHaveBeenCalledTimes(1);
       expect(undoPendingChangesMock).toHaveBeenCalledWith(expect.arrayContaining([cTxt, dTxt]));
     });
@@ -100,54 +114,55 @@ describe('git rollback', () => {
       barTxt = path.join(GIT_INSOMNIA_DIR, 'bar.txt');
       bazTxt = path.join(GIT_INSOMNIA_DIR, 'baz.txt');
     });
-
     afterAll(() => jest.restoreAllMocks());
     beforeEach(setupDateMocks);
 
     it('should rollback files as expected', async () => {
       const originalContent = 'original';
-
       const fsClient = MemClient.createClient();
       await fsClient.promises.mkdir(GIT_INSOMNIA_DIR);
       await fsClient.promises.writeFile(fooTxt, 'foo');
       await fsClient.promises.writeFile(barTxt, 'bar');
       await fsClient.promises.writeFile(bazTxt, originalContent);
-
       const vcs = new GitVCS();
-      await vcs.init({ directory: GIT_CLONE_DIR, fs: fsClient });
-
+      await vcs.init({
+        directory: GIT_CLONE_DIR,
+        fs: fsClient,
+      });
       // Commit
       await vcs.setAuthor('Karen Brown', 'karen@example.com');
       await vcs.add(bazTxt);
       await vcs.commit('First commit!');
-
       // Edit file
       await fsClient.promises.writeFile(bazTxt, 'changedContent');
-
       // foo is staged, bar is unstaged, but both are untracked (thus, new to git)
       await vcs.add(`${GIT_INSOMNIA_DIR}/bar.txt`);
       const fooStatus = await vcs.status(fooTxt);
       const barStatus = await vcs.status(barTxt);
       const bazStatus = await vcs.status(bazTxt);
-
       expect(fooStatus).toBe('*added');
       expect(barStatus).toBe('added');
       expect(bazStatus).toBe('*modified');
-
       const files: Array<FileWithStatus> = [
-        { filePath: fooTxt, status: fooStatus },
-        { filePath: barTxt, status: barStatus },
-        { filePath: bazTxt, status: bazStatus },
+        {
+          filePath: fooTxt,
+          status: fooStatus,
+        },
+        {
+          filePath: barTxt,
+          status: barStatus,
+        },
+        {
+          filePath: bazTxt,
+          status: bazStatus,
+        },
       ];
-
       // Remove both
       await gitRollback(vcs, files);
-
       // Ensure git doesn't know about the two files anymore
       expect(await vcs.status(fooTxt)).toBe('absent');
       expect(await vcs.status(barTxt)).toBe('absent');
       expect(await vcs.status(bazTxt)).toBe('unmodified');
-
       // Ensure the two files have been removed from the fs (memClient)
       await expect(fsClient.promises.readFile(fooTxt)).rejects.toThrowError(
         `ENOENT: no such file or directory, scandir '${fooTxt}'`,
@@ -155,7 +170,6 @@ describe('git rollback', () => {
       await expect(fsClient.promises.readFile(barTxt)).rejects.toThrowError(
         `ENOENT: no such file or directory, scandir '${barTxt}'`,
       );
-
       expect((await fsClient.promises.readFile(bazTxt)).toString()).toBe(originalContent);
     });
   });
diff --git a/packages/insomnia-app/app/sync/git/__tests__/git-vcs.test.js b/packages/insomnia-app/app/sync/git/__tests__/git-vcs.test.ts
similarity index 92%
rename from packages/insomnia-app/app/sync/git/__tests__/git-vcs.test.js
rename to packages/insomnia-app/app/sync/git/__tests__/git-vcs.test.ts
index b503ca028d..8756edb157 100644
--- a/packages/insomnia-app/app/sync/git/__tests__/git-vcs.test.js
+++ b/packages/insomnia-app/app/sync/git/__tests__/git-vcs.test.ts
@@ -11,22 +11,20 @@ describe('Git-VCS', () => {
     fooTxt = path.join(GIT_INSOMNIA_DIR, 'foo.txt');
     barTxt = path.join(GIT_INSOMNIA_DIR, 'bar.txt');
   });
-
   afterAll(() => jest.restoreAllMocks());
   beforeEach(setupDateMocks);
-
   describe('common operations', () => {
     it('listFiles()', async () => {
       const fsClient = MemClient.createClient();
-
       const vcs = new GitVCS();
-      await vcs.init({ directory: GIT_CLONE_DIR, fs: fsClient });
+      await vcs.init({
+        directory: GIT_CLONE_DIR,
+        fs: fsClient,
+      });
       await vcs.setAuthor('Karen Brown', 'karen@example.com');
-
       // No files exist yet
       const files1 = await vcs.listFiles();
       expect(files1).toEqual([]);
-
       // File does not exist in git index
       await fsClient.promises.writeFile('foo.txt', 'bar');
       const files2 = await vcs.listFiles();
@@ -38,21 +36,19 @@ describe('Git-VCS', () => {
       await fsClient.promises.mkdir(GIT_INSOMNIA_DIR);
       await fsClient.promises.writeFile(fooTxt, 'foo');
       await fsClient.promises.writeFile(barTxt, 'bar');
-
       // Files outside namespace should be ignored
       await fsClient.promises.writeFile('/other.txt', 'other');
-
       const vcs = new GitVCS();
-      await vcs.init({ directory: GIT_CLONE_DIR, fs: fsClient });
+      await vcs.init({
+        directory: GIT_CLONE_DIR,
+        fs: fsClient,
+      });
       await vcs.setAuthor('Karen Brown', 'karen@example.com');
-
       expect(await vcs.status(barTxt)).toBe('*added');
       expect(await vcs.status(fooTxt)).toBe('*added');
-
       await vcs.add(fooTxt);
       expect(await vcs.status(barTxt)).toBe('*added');
       expect(await vcs.status(fooTxt)).toBe('added');
-
       await vcs.remove(fooTxt);
       expect(await vcs.status(barTxt)).toBe('*added');
       expect(await vcs.status(fooTxt)).toBe('*added');
@@ -61,7 +57,10 @@ describe('Git-VCS', () => {
     it('Returns empty log without first commit', async () => {
       const fsClient = MemClient.createClient();
       const vcs = new GitVCS();
-      await vcs.init({ directory: GIT_CLONE_DIR, fs: fsClient });
+      await vcs.init({
+        directory: GIT_CLONE_DIR,
+        fs: fsClient,
+      });
       await vcs.setAuthor('Karen Brown', 'karen@example.com');
       expect(await vcs.log()).toEqual([]);
     });
@@ -71,18 +70,17 @@ describe('Git-VCS', () => {
       await fsClient.promises.mkdir(GIT_INSOMNIA_DIR);
       await fsClient.promises.writeFile(fooTxt, 'foo');
       await fsClient.promises.writeFile(barTxt, 'bar');
-
       await fsClient.promises.writeFile('other.txt', 'should be ignored');
-
       const vcs = new GitVCS();
-      await vcs.init({ directory: GIT_CLONE_DIR, fs: fsClient });
+      await vcs.init({
+        directory: GIT_CLONE_DIR,
+        fs: fsClient,
+      });
       await vcs.setAuthor('Karen Brown', 'karen@example.com');
       await vcs.add(fooTxt);
       await vcs.commit('First commit!');
-
       expect(await vcs.status(barTxt)).toBe('*added');
       expect(await vcs.status(fooTxt)).toBe('unmodified');
-
       expect(await vcs.log()).toEqual([
         {
           commit: {
@@ -111,15 +109,12 @@ First commit!
 `,
         },
       ]);
-
       await fsClient.promises.unlink(fooTxt);
       expect(await vcs.status(barTxt)).toBe('*added');
       expect(await vcs.status(fooTxt)).toBe('*deleted');
-
       await vcs.remove(fooTxt);
       expect(await vcs.status(barTxt)).toBe('*added');
       expect(await vcs.status(fooTxt)).toBe('deleted');
-
       await vcs.remove(fooTxt);
       expect(await vcs.status(barTxt)).toBe('*added');
       expect(await vcs.status(fooTxt)).toBe('deleted');
@@ -130,21 +125,20 @@ First commit!
       await fsClient.promises.mkdir(GIT_INSOMNIA_DIR);
       await fsClient.promises.writeFile(fooTxt, 'foo');
       await fsClient.promises.writeFile(barTxt, 'bar');
-
       const vcs = new GitVCS();
-      await vcs.init({ directory: GIT_CLONE_DIR, fs: fsClient });
+      await vcs.init({
+        directory: GIT_CLONE_DIR,
+        fs: fsClient,
+      });
       await vcs.setAuthor('Karen Brown', 'karen@example.com');
       await vcs.add(fooTxt);
       await vcs.commit('First commit!');
-
       expect((await vcs.log()).length).toBe(1);
-
       await vcs.checkout('new-branch');
       expect((await vcs.log()).length).toBe(1);
       await vcs.add(barTxt);
       await vcs.commit('Second commit!');
       expect((await vcs.log()).length).toBe(2);
-
       await vcs.checkout('master');
       expect((await vcs.log()).length).toBe(1);
     });
@@ -156,7 +150,6 @@ First commit!
         ok: ['unpack'],
         errors: ['refs/heads/master pre-receive hook declined'],
       });
-
       const vcs = new GitVCS();
       await expect(vcs.push()).rejects.toThrowError(
         'Push rejected with errors: ["refs/heads/master pre-receive hook declined"].\n\nGo to View > Toggle DevTools > Console for more information.',
@@ -169,36 +162,31 @@ First commit!
       const folder = path.join(GIT_INSOMNIA_DIR, 'folder');
       const folderBarTxt = path.join(folder, 'bar.txt');
       const originalContent = 'content';
-
       const fsClient = MemClient.createClient();
       await fsClient.promises.mkdir(GIT_INSOMNIA_DIR);
       await fsClient.promises.writeFile(fooTxt, originalContent);
-
       await fsClient.promises.mkdir(folder);
       await fsClient.promises.writeFile(folderBarTxt, originalContent);
-
       const vcs = new GitVCS();
-      await vcs.init({ directory: GIT_CLONE_DIR, fs: fsClient });
-
+      await vcs.init({
+        directory: GIT_CLONE_DIR,
+        fs: fsClient,
+      });
       // Commit
       await vcs.setAuthor('Karen Brown', 'karen@example.com');
       await vcs.add(fooTxt);
       await vcs.add(folderBarTxt);
       await vcs.commit('First commit!');
-
       // Change the file
       await fsClient.promises.writeFile(fooTxt, 'changedContent');
       await fsClient.promises.writeFile(folderBarTxt, 'changedContent');
       expect(await vcs.status(fooTxt)).toBe('*modified');
       expect(await vcs.status(folderBarTxt)).toBe('*modified');
-
       // Undo
       await vcs.undoPendingChanges();
-
       // Ensure git doesn't recognize a change anymore
       expect(await vcs.status(fooTxt)).toBe('unmodified');
       expect(await vcs.status(folderBarTxt)).toBe('unmodified');
-
       // Expect original doc to have reverted
       expect((await fsClient.promises.readFile(fooTxt)).toString()).toBe(originalContent);
       expect((await fsClient.promises.readFile(folderBarTxt)).toString()).toBe(originalContent);
@@ -211,34 +199,29 @@ First commit!
       const files = [foo1Txt, foo2Txt, foo3Txt];
       const originalContent = 'content';
       const changedContent = 'changedContent';
-
       const fsClient = MemClient.createClient();
       await fsClient.promises.mkdir(GIT_INSOMNIA_DIR);
       const vcs = new GitVCS();
-      await vcs.init({ directory: GIT_CLONE_DIR, fs: fsClient });
-
+      await vcs.init({
+        directory: GIT_CLONE_DIR,
+        fs: fsClient,
+      });
       // Write to all files
       await Promise.all(files.map(f => fsClient.promises.writeFile(f, originalContent)));
-
       // Commit all files
       await vcs.setAuthor('Karen Brown', 'karen@example.com');
       await Promise.all(files.map(f => vcs.add(f, originalContent)));
       await vcs.commit('First commit!');
-
       // Change all files
       await Promise.all(files.map(f => fsClient.promises.writeFile(f, changedContent)));
-      await Promise.all(files.map(f => expect(vcs.status(foo1Txt)).resolves.toBe('*modified')));
-
+      await Promise.all(files.map(() => expect(vcs.status(foo1Txt)).resolves.toBe('*modified')));
       // Undo foo1 and foo2, but not foo3
       await vcs.undoPendingChanges([foo1Txt, foo2Txt]);
-
       expect(await vcs.status(foo1Txt)).toBe('unmodified');
       expect(await vcs.status(foo2Txt)).toBe('unmodified');
-
       // Expect original doc to have reverted for foo1 and foo2
       expect((await fsClient.promises.readFile(foo1Txt)).toString()).toBe(originalContent);
       expect((await fsClient.promises.readFile(foo2Txt)).toString()).toBe(originalContent);
-
       // Expect changed content for foo3
       expect(await vcs.status(foo3Txt)).toBe('*modified');
       expect((await fsClient.promises.readFile(foo3Txt)).toString()).toBe(changedContent);
@@ -250,26 +233,23 @@ First commit!
       const fsClient = MemClient.createClient();
       const dir = path.join(GIT_INSOMNIA_DIR, 'dir');
       const dirFooTxt = path.join(dir, 'foo.txt');
-
       await fsClient.promises.mkdir(GIT_INSOMNIA_DIR);
       await fsClient.promises.mkdir(dir);
       await fsClient.promises.writeFile(dirFooTxt, 'foo');
-
       const vcs = new GitVCS();
-      await vcs.init({ directory: GIT_CLONE_DIR, fs: fsClient });
+      await vcs.init({
+        directory: GIT_CLONE_DIR,
+        fs: fsClient,
+      });
       await vcs.setAuthor('Karen Brown', 'karen@example.com');
-
       await vcs.add(dirFooTxt);
       await vcs.commit('First');
-
       await fsClient.promises.writeFile(dirFooTxt, 'foo bar');
       await vcs.add(dirFooTxt);
       await vcs.commit('Second');
-
       const log = await vcs.log();
       expect(await vcs.readObjFromTree(log[0].commit.tree, dirFooTxt)).toBe('foo bar');
       expect(await vcs.readObjFromTree(log[1].commit.tree, dirFooTxt)).toBe('foo');
-
       // Some extra checks
       expect(await vcs.readObjFromTree(log[1].commit.tree, 'missing')).toBe(null);
       expect(await vcs.readObjFromTree('missing', 'missing')).toBe(null);
diff --git a/packages/insomnia-app/app/sync/git/__tests__/mem-client.test.js b/packages/insomnia-app/app/sync/git/__tests__/mem-client.test.ts
similarity index 85%
rename from packages/insomnia-app/app/sync/git/__tests__/mem-client.test.js
rename to packages/insomnia-app/app/sync/git/__tests__/mem-client.test.ts
index c28151441d..e82a929666 100644
--- a/packages/insomnia-app/app/sync/git/__tests__/mem-client.test.js
+++ b/packages/insomnia-app/app/sync/git/__tests__/mem-client.test.ts
@@ -6,10 +6,8 @@ import { GIT_CLONE_DIR } from '../git-vcs';
 describe('MemClient', () => {
   afterAll(() => jest.restoreAllMocks());
   beforeEach(setupDateMocks);
-
   const fooTxt = 'foo.txt';
   const barTxt = 'bar.txt';
-
   describe('readfile()', () => {
     it('fails to read', async () => {
       const fsClient = new MemClient();
@@ -27,14 +25,12 @@ describe('MemClient', () => {
     it('fails to write over directory', async () => {
       const fsClient = new MemClient();
       const dirName = 'foo';
-
       await fsClient.mkdir(dirName);
       await assertAsyncError(fsClient.writeFile(dirName, 'Hello World 2!'), 'EISDIR');
     });
 
     it('overwrites file', async () => {
       const fsClient = new MemClient();
-
       await fsClient.writeFile(fooTxt, 'Hello World!');
       await fsClient.writeFile(fooTxt, 'Hello World 2!');
       expect((await fsClient.readFile(fooTxt)).toString()).toBe('Hello World 2!');
@@ -42,36 +38,60 @@ describe('MemClient', () => {
 
     it('flag "a" file', async () => {
       const fsClient = new MemClient();
-
-      await fsClient.writeFile(fooTxt, 'Hello World!', { flag: 'a' });
-      await fsClient.writeFile(fooTxt, 'xxx', { flag: 'a' });
+      await fsClient.writeFile(fooTxt, 'Hello World!', {
+        flag: 'a',
+      });
+      await fsClient.writeFile(fooTxt, 'xxx', {
+        flag: 'a',
+      });
       expect((await fsClient.readFile(fooTxt)).toString()).toBe('Hello World!xxx');
     });
 
     it('flags "ax" and "wx" fail if path exists', async () => {
       const fsClient = new MemClient();
-
       await fsClient.writeFile(fooTxt, 'Hello World!');
-      await assertAsyncError(fsClient.writeFile(fooTxt, 'aaa', { flag: 'ax' }), 'EEXIST');
-      await assertAsyncError(fsClient.writeFile(fooTxt, 'aaa', { flag: 'wx' }), 'EEXIST');
+      await assertAsyncError(
+        fsClient.writeFile(fooTxt, 'aaa', {
+          flag: 'ax',
+        }),
+        'EEXIST',
+      );
+      await assertAsyncError(
+        fsClient.writeFile(fooTxt, 'aaa', {
+          flag: 'wx',
+        }),
+        'EEXIST',
+      );
     });
 
     it('fails if flag "r"', async () => {
       const fsClient = new MemClient();
-      await assertAsyncError(fsClient.writeFile(fooTxt, 'aaa', { flag: 'r' }), 'EBADF');
+      await assertAsyncError(
+        fsClient.writeFile(fooTxt, 'aaa', {
+          flag: 'r',
+        }),
+        'EBADF',
+      );
     });
 
     it('fails if dir missing', async () => {
       const fsClient = new MemClient();
-
-      await assertAsyncError(fsClient.writeFile(fooTxt, 'aaa', { flag: 'r' }), 'EBADF');
+      await assertAsyncError(
+        fsClient.writeFile(fooTxt, 'aaa', {
+          flag: 'r',
+        }),
+        'EBADF',
+      );
     });
 
     it('works with flags', async () => {
       const fsClient = new MemClient();
-
-      await fsClient.writeFile(fooTxt, 'Hello World!', { flag: 'a' });
-      await fsClient.writeFile(fooTxt, 'xxx', { flag: 'a' });
+      await fsClient.writeFile(fooTxt, 'Hello World!', {
+        flag: 'a',
+      });
+      await fsClient.writeFile(fooTxt, 'xxx', {
+        flag: 'a',
+      });
       expect((await fsClient.readFile(fooTxt)).toString()).toBe('Hello World!xxx');
     });
   });
@@ -79,7 +99,6 @@ describe('MemClient', () => {
   describe('unlink()', () => {
     it('unlinks file', async () => {
       const fsClient = new MemClient();
-
       await fsClient.writeFile(fooTxt, 'xxx');
       await fsClient.unlink(fooTxt);
       await assertAsyncError(fsClient.readFile(fooTxt), 'ENOENT');
@@ -87,7 +106,6 @@ describe('MemClient', () => {
 
     it('fails to unlinks missing file', async () => {
       const fsClient = new MemClient();
-
       await assertAsyncError(fsClient.unlink(path.join('not', 'exist.txt')), 'ENOENT');
     });
   });
@@ -95,10 +113,8 @@ describe('MemClient', () => {
   describe('readdir()', () => {
     it('lists dir', async () => {
       const fsClient = new MemClient();
-
       // Root dir should always exist
       expect(await fsClient.readdir(GIT_CLONE_DIR)).toEqual([]);
-
       // Write a file and list it again
       await fsClient.writeFile(fooTxt, 'Hello World!');
       await fsClient.writeFile(barTxt, 'Bar!');
@@ -126,32 +142,31 @@ describe('MemClient', () => {
 
     it('creates directory', async () => {
       const fsClient = new MemClient();
-
       await fsClient.mkdir(fooDir);
       await fsClient.mkdir(fooBarDir);
-
       expect(await fsClient.readdir(GIT_CLONE_DIR)).toEqual(['foo']);
       expect(await fsClient.readdir(cloneFooDir)).toEqual(['bar']);
     });
 
     it('creates directory non-recursively', async () => {
       const fsClient = new MemClient();
-
-      await fsClient.mkdir(cloneFooDir, { recursive: true });
+      await fsClient.mkdir(cloneFooDir, {
+        recursive: true,
+      });
       await fsClient.mkdir(cloneFooBarDir);
       expect(await fsClient.readdir(cloneFooBarDir)).toEqual([]);
     });
 
     it('creates directory recursively', async () => {
       const fsClient = new MemClient();
-
-      await fsClient.mkdir(cloneFooBarBazDir, { recursive: true });
+      await fsClient.mkdir(cloneFooBarBazDir, {
+        recursive: true,
+      });
       expect(await fsClient.readdir(cloneFooBarBazDir)).toEqual([]);
     });
 
     it('fails to create if no parent', async () => {
       const fsClient = new MemClient();
-
       await assertAsyncError(fsClient.mkdir(cloneFooBarBazDir), 'ENOENT');
     });
   });
@@ -162,8 +177,9 @@ describe('MemClient', () => {
 
     it('removes a dir', async () => {
       const fsClient = new MemClient();
-
-      await fsClient.mkdir(abcDir, { recursive: true });
+      await fsClient.mkdir(abcDir, {
+        recursive: true,
+      });
       expect(await fsClient.readdir(abDir)).toEqual(['c']);
       await fsClient.rmdir(abcDir);
       expect(await fsClient.readdir(abDir)).toEqual([]);
@@ -171,17 +187,16 @@ describe('MemClient', () => {
 
     it('fails on non-empty dir', async () => {
       const fsClient = new MemClient();
-
-      await fsClient.mkdir(abcDir, { recursive: true });
+      await fsClient.mkdir(abcDir, {
+        recursive: true,
+      });
       await fsClient.writeFile(path.join(abcDir, 'foo.txt'), 'xxx');
-
       await assertAsyncError(fsClient.rmdir(abDir), 'ENOTEMPTY');
       await assertAsyncError(fsClient.rmdir(abcDir), 'ENOTEMPTY');
     });
 
     it('fails on file', async () => {
       const fsClient = new MemClient();
-
       await fsClient.writeFile(fooTxt, 'xxx');
       await assertAsyncError(fsClient.rmdir(fooTxt), 'ENOTDIR');
     });
@@ -190,9 +205,7 @@ describe('MemClient', () => {
   describe('stat()', () => {
     it('stats root dir', async () => {
       const fsClient = new MemClient();
-
       const stat = await fsClient.stat(GIT_CLONE_DIR);
-
       expect(stat).toEqual({
         ctimeMs: 1000000000000,
         mtimeMs: 1000000000000,
@@ -204,7 +217,6 @@ describe('MemClient', () => {
         type: 'dir',
         uid: 1,
       });
-
       expect(stat.isDirectory()).toBe(true);
       expect(stat.isFile()).toBe(false);
       expect(stat.isSymbolicLink()).toBe(false);
@@ -212,10 +224,8 @@ describe('MemClient', () => {
 
     it('stats file', async () => {
       const fsClient = new MemClient();
-
       await fsClient.writeFile(fooTxt, 'xxx');
       const stat = await fsClient.stat(fooTxt);
-
       expect(stat).toEqual({
         ctimeMs: 1000000000001,
         mtimeMs: 1000000000001,
@@ -227,7 +237,6 @@ describe('MemClient', () => {
         type: 'file',
         uid: 1,
       });
-
       expect(stat.isDirectory()).toBe(false);
       expect(stat.isFile()).toBe(true);
       expect(stat.isSymbolicLink()).toBe(false);
diff --git a/packages/insomnia-app/app/sync/git/__tests__/ne-db-client.test.js b/packages/insomnia-app/app/sync/git/__tests__/ne-db-client.test.ts
similarity index 77%
rename from packages/insomnia-app/app/sync/git/__tests__/ne-db-client.test.js
rename to packages/insomnia-app/app/sync/git/__tests__/ne-db-client.test.ts
index 8634ce5b08..9ee0efcb34 100644
--- a/packages/insomnia-app/app/sync/git/__tests__/ne-db-client.test.js
+++ b/packages/insomnia-app/app/sync/git/__tests__/ne-db-client.test.ts
@@ -1,8 +1,7 @@
-// @flow
 import YAML from 'yaml';
 import { globalBeforeEach } from '../../../__jest__/before-each';
 import * as models from '../../../models';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import { assertAsyncError, setupDateMocks } from './util';
 import { NeDBClient } from '../ne-db-client';
 import path from 'path';
@@ -10,19 +9,27 @@ import { GIT_CLONE_DIR, GIT_INSOMNIA_DIR, GIT_INSOMNIA_DIR_NAME } from '../git-v
 
 describe('NeDBClient', () => {
   afterAll(() => jest.restoreAllMocks());
-
   beforeEach(async () => {
     await globalBeforeEach();
-
     setupDateMocks();
-
     // Create some sample models
-    await models.workspace.create({ _id: 'wrk_1' });
-    await models.request.create({ _id: 'req_1', parentId: 'wrk_1' });
-    await models.request.create({ _id: 'req_2', parentId: 'wrk_1' });
-
+    await models.workspace.create({
+      _id: 'wrk_1',
+    });
+    await models.request.create({
+      _id: 'req_1',
+      parentId: 'wrk_1',
+    });
+    await models.request.create({
+      _id: 'req_2',
+      parentId: 'wrk_1',
+    });
     // Shouldn't list private docs
-    await models.request.create({ id: 'req_x', isPrivate: true, parentId: 'wrk_1' });
+    await models.request.create({
+      id: 'req_x',
+      isPrivate: true,
+      parentId: 'wrk_1',
+    });
   });
 
   describe('readdir()', () => {
@@ -30,7 +37,6 @@ describe('NeDBClient', () => {
       const neDbClient = new NeDBClient('wrk_1');
       const reqDir = path.join(GIT_INSOMNIA_DIR, models.request.type);
       const wrkDir = path.join(GIT_INSOMNIA_DIR, models.workspace.type);
-
       expect(await neDbClient.readdir(GIT_CLONE_DIR)).toEqual([GIT_INSOMNIA_DIR_NAME]);
       expect(await neDbClient.readdir(GIT_INSOMNIA_DIR)).toEqual([
         models.apiSpec.type,
@@ -44,7 +50,6 @@ describe('NeDBClient', () => {
         models.unitTestSuite.type,
         models.workspace.type,
       ]);
-
       expect(await neDbClient.readdir(reqDir)).toEqual(['req_1.yml', 'req_2.yml']);
       expect(await neDbClient.readdir(wrkDir)).toEqual(['wrk_1.yml']);
     });
@@ -55,17 +60,19 @@ describe('NeDBClient', () => {
       const wrk1Yml = path.join(GIT_INSOMNIA_DIR, models.workspace.type, 'wrk_1.yml');
       const req1Yml = path.join(GIT_INSOMNIA_DIR, models.request.type, 'req_1.yml');
       const reqXYml = path.join(GIT_INSOMNIA_DIR, models.request.type, 'req_x.yml');
-
       const pNeDB = new NeDBClient('wrk_1');
-
       expect(YAML.parse(await pNeDB.readFile(wrk1Yml, 'utf8'))).toEqual(
-        expect.objectContaining({ _id: 'wrk_1', parentId: null }),
+        expect.objectContaining({
+          _id: 'wrk_1',
+          parentId: null,
+        }),
       );
-
       expect(YAML.parse(await pNeDB.readFile(req1Yml, 'utf8'))).toEqual(
-        expect.objectContaining({ _id: 'req_1', parentId: 'wrk_1' }),
+        expect.objectContaining({
+          _id: 'req_1',
+          parentId: 'wrk_1',
+        }),
       );
-
       await assertAsyncError(pNeDB.readFile(reqXYml));
     });
   });
@@ -75,18 +82,18 @@ describe('NeDBClient', () => {
       // Assemble
       const reqDir = path.join(GIT_INSOMNIA_DIR, models.request.type);
       const wrkDir = path.join(GIT_INSOMNIA_DIR, models.workspace.type);
-
-      const dirType = expect.objectContaining({ type: 'dir' });
-      const fileType = expect.objectContaining({ type: 'file' });
-
+      const dirType = expect.objectContaining({
+        type: 'dir',
+      });
+      const fileType = expect.objectContaining({
+        type: 'file',
+      });
       // Act
       const neDbClient = new NeDBClient('wrk_1');
-
       // Assert
       expect(await neDbClient.stat(GIT_CLONE_DIR)).toEqual(dirType);
       expect(await neDbClient.stat(GIT_INSOMNIA_DIR)).toEqual(dirType);
       expect(await neDbClient.stat(reqDir)).toEqual(dirType);
-
       expect(await neDbClient.stat(path.join(wrkDir, 'wrk_1.yml'))).toEqual(fileType);
       expect(await neDbClient.stat(path.join(reqDir, 'req_2.yml'))).toEqual(fileType);
     });
@@ -98,16 +105,16 @@ describe('NeDBClient', () => {
       const upsertSpy = jest.spyOn(db, 'upsert');
       const workspaceId = 'wrk_1';
       const neDbClient = new NeDBClient(workspaceId);
-
-      const env = { _id: 'env_1', type: models.environment.type, parentId: workspaceId };
+      const env = {
+        _id: 'env_1',
+        type: models.environment.type,
+        parentId: workspaceId,
+      };
       const filePath = path.join('anotherDir', env.type, `${env._id}.yml`);
-
       // Act
       await neDbClient.writeFile(filePath, YAML.stringify(env));
-
       // Assert
       expect(upsertSpy).not.toBeCalled();
-
       // Cleanup
       upsertSpy.mockRestore();
     });
@@ -117,17 +124,17 @@ describe('NeDBClient', () => {
       const workspaceId = 'wrk_1';
       const neDbClient = new NeDBClient(workspaceId);
       const upsertSpy = jest.spyOn(db, 'upsert');
-
-      const env = { _id: 'env_1', type: models.environment.type, parentId: workspaceId };
+      const env = {
+        _id: 'env_1',
+        type: models.environment.type,
+        parentId: workspaceId,
+      };
       const filePath = path.join(GIT_INSOMNIA_DIR, env.type, `${env._id}.yml`);
-
       // Act
       await neDbClient.writeFile(filePath, YAML.stringify(env));
-
       // Assert
       expect(upsertSpy).toHaveBeenCalledTimes(1);
       expect(upsertSpy).toHaveBeenCalledWith(env, true);
-
       // Cleanup
       upsertSpy.mockRestore();
     });
@@ -136,16 +143,17 @@ describe('NeDBClient', () => {
       // Assemble
       const workspaceId = 'wrk_1';
       const neDbClient = new NeDBClient(workspaceId);
-
-      const env = { _id: 'env_1', type: models.environment.type, parentId: workspaceId };
-      const filePath = path.join(GIT_INSOMNIA_DIR, env.type, `env_2.yml`);
-
+      const env = {
+        _id: 'env_1',
+        type: models.environment.type,
+        parentId: workspaceId,
+      };
+      const filePath = path.join(GIT_INSOMNIA_DIR, env.type, 'env_2.yml');
       // Act
       const promiseResult = neDbClient.writeFile(filePath, YAML.stringify(env));
-
       // Assert
       await expect(promiseResult).rejects.toThrowError(
-        `Doc _id does not match file path [env_1 != env_2]`,
+        'Doc _id does not match file path [env_1 != env_2]',
       );
     });
 
@@ -153,16 +161,17 @@ describe('NeDBClient', () => {
       // Assemble
       const workspaceId = 'wrk_1';
       const neDbClient = new NeDBClient(workspaceId);
-
-      const env = { _id: 'env_1', type: models.environment.type, parentId: workspaceId };
+      const env = {
+        _id: 'env_1',
+        type: models.environment.type,
+        parentId: workspaceId,
+      };
       const filePath = path.join(GIT_INSOMNIA_DIR, models.request.type, `${env._id}.yml`);
-
       // Act
       const promiseResult = neDbClient.writeFile(filePath, YAML.stringify(env));
-
       // Assert
       await expect(promiseResult).rejects.toThrowError(
-        `Doc type does not match file path [Environment != Request]`,
+        'Doc type does not match file path [Environment != Request]',
       );
     });
   });
@@ -171,9 +180,7 @@ describe('NeDBClient', () => {
     it('should throw error', async () => {
       const workspaceId = 'wrk_1';
       const neDbClient = new NeDBClient(workspaceId);
-
       const promiseResult = neDbClient.mkdir('', '');
-
       await expect(promiseResult).rejects.toThrowError('NeDBClient is not writable');
     });
   });
diff --git a/packages/insomnia-app/app/sync/git/__tests__/parse-git-path.test.js b/packages/insomnia-app/app/sync/git/__tests__/parse-git-path.test.ts
similarity index 98%
rename from packages/insomnia-app/app/sync/git/__tests__/parse-git-path.test.js
rename to packages/insomnia-app/app/sync/git/__tests__/parse-git-path.test.ts
index 99725503c3..5f6b53d535 100644
--- a/packages/insomnia-app/app/sync/git/__tests__/parse-git-path.test.js
+++ b/packages/insomnia-app/app/sync/git/__tests__/parse-git-path.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import parseGitPath from '../parse-git-path';
 import { GIT_INSOMNIA_DIR } from '../git-vcs';
 import * as models from '../../../models';
@@ -8,7 +6,6 @@ describe('parseGitPath', () => {
   it('should parse a git path into its root, type and id', () => {
     const gitPath = `${GIT_INSOMNIA_DIR}/${models.workspace.type}/wrk_1.yml`;
     const result = parseGitPath(gitPath);
-
     expect(result.root).toBe(GIT_INSOMNIA_DIR);
     expect(result.type).toBe(models.workspace.type);
     expect(result.id).toBe('wrk_1');
@@ -16,9 +13,7 @@ describe('parseGitPath', () => {
 
   it('should ignore multiple slashes', () => {
     const gitPath = `${GIT_INSOMNIA_DIR}////${models.workspace.type}/wrk_1.yml`;
-
     const result = parseGitPath(gitPath);
-
     expect(result.root).toBe(GIT_INSOMNIA_DIR);
     expect(result.type).toBe(models.workspace.type);
     expect(result.id).toBe('wrk_1');
@@ -26,9 +21,7 @@ describe('parseGitPath', () => {
 
   it('should ignore current directory . segments', () => {
     const gitPath = `${GIT_INSOMNIA_DIR}/./././${models.workspace.type}/wrk_1.yml`;
-
     const result = parseGitPath(gitPath);
-
     expect(result.root).toBe(GIT_INSOMNIA_DIR);
     expect(result.type).toBe(models.workspace.type);
     expect(result.id).toBe('wrk_1');
@@ -36,9 +29,7 @@ describe('parseGitPath', () => {
 
   it.each(['json', 'yml'])('should omit the %s extension', ext => {
     const gitPath = `${GIT_INSOMNIA_DIR}/${models.workspace.type}/wrk_1.${ext}`;
-
     const result = parseGitPath(gitPath);
-
     expect(result.root).toBe(GIT_INSOMNIA_DIR);
     expect(result.type).toBe(models.workspace.type);
     expect(result.id).toBe('wrk_1');
@@ -46,9 +37,7 @@ describe('parseGitPath', () => {
 
   it('should keep the extension', () => {
     const gitPath = `${GIT_INSOMNIA_DIR}/${models.workspace.type}/wrk_1.somethingelse`;
-
     const result = parseGitPath(gitPath);
-
     expect(result.root).toBe(GIT_INSOMNIA_DIR);
     expect(result.type).toBe(models.workspace.type);
     expect(result.id).toBe('wrk_1.somethingelse');
diff --git a/packages/insomnia-app/app/sync/git/__tests__/path-sep.test.js b/packages/insomnia-app/app/sync/git/__tests__/path-sep.test.ts
similarity index 98%
rename from packages/insomnia-app/app/sync/git/__tests__/path-sep.test.js
rename to packages/insomnia-app/app/sync/git/__tests__/path-sep.test.ts
index 5619c13562..f6cba2f613 100644
--- a/packages/insomnia-app/app/sync/git/__tests__/path-sep.test.js
+++ b/packages/insomnia-app/app/sync/git/__tests__/path-sep.test.ts
@@ -1,6 +1,6 @@
-// @flow
 import path from 'path';
 import { convertToOsSep, convertToPosixSep } from '../path-sep';
+
 jest.mock('path');
 
 describe('convertToPosixSep()', () => {
@@ -11,7 +11,6 @@ describe('convertToPosixSep()', () => {
   it.each(['win32', 'posix'])('should convert separator from %s to posix', type => {
     const input = path[type].join('a', 'b', 'c');
     const posix = path.posix.join('a', 'b', 'c');
-
     expect(convertToPosixSep(input)).toBe(posix);
   });
 });
@@ -23,7 +22,6 @@ describe.each(['win32', 'posix'])('convertToOsSep() where os is %s', osType => {
   it.each(['win32', 'posix'])(`should convert separators from %s to ${osType}`, inputType => {
     const input = path[inputType].join('a', 'b', 'c');
     const output = path[osType].join('a', 'b', 'c');
-
     expect(convertToOsSep(input)).toBe(output);
   });
 });
diff --git a/packages/insomnia-app/app/sync/git/__tests__/routable-fs-client.test.js b/packages/insomnia-app/app/sync/git/__tests__/routable-fs-client.test.ts
similarity index 92%
rename from packages/insomnia-app/app/sync/git/__tests__/routable-fs-client.test.js
rename to packages/insomnia-app/app/sync/git/__tests__/routable-fs-client.test.ts
index dfcaacb588..1b02c3bddc 100644
--- a/packages/insomnia-app/app/sync/git/__tests__/routable-fs-client.test.js
+++ b/packages/insomnia-app/app/sync/git/__tests__/routable-fs-client.test.ts
@@ -4,24 +4,21 @@ import { GIT_CLONE_DIR } from '../git-vcs';
 
 describe('routableFSClient', () => {
   afterAll(() => jest.restoreAllMocks());
+
   it('routes .git and other files to separate places', async () => {
     const pGit = MemClient.createClient();
     const pDir = MemClient.createClient();
-
-    const fsClient = routableFSClient(pDir, { '/.git': pGit }).promises;
-
+    const fsClient = routableFSClient(pDir, {
+      '/.git': pGit,
+    }).promises;
     await fsClient.mkdir('/.git');
     await fsClient.mkdir('/other');
-
     await fsClient.writeFile('/other/a.txt', 'a');
     await fsClient.writeFile('/.git/b.txt', 'b');
-
     expect(await pGit.promises.readdir('/.git')).toEqual(['b.txt']);
     expect(await pDir.promises.readdir('/other')).toEqual(['a.txt']);
-
     // Kind of an edge case, but reading the root dir will not list the .git folder
     expect(await pDir.promises.readdir(GIT_CLONE_DIR)).toEqual(['other']);
-
     expect((await fsClient.readFile('/other/a.txt')).toString()).toBe('a');
     expect((await fsClient.readFile('/.git/b.txt')).toString()).toBe('b');
   });
diff --git a/packages/insomnia-app/app/sync/git/__tests__/util.js b/packages/insomnia-app/app/sync/git/__tests__/util.ts
similarity index 100%
rename from packages/insomnia-app/app/sync/git/__tests__/util.js
rename to packages/insomnia-app/app/sync/git/__tests__/util.ts
index 0ab6889887..7296911dcf 100644
--- a/packages/insomnia-app/app/sync/git/__tests__/util.js
+++ b/packages/insomnia-app/app/sync/git/__tests__/util.ts
@@ -21,7 +21,6 @@ export function setupDateMocks() {
 
   global.Date = fakeDate;
 }
-
 export async function assertAsyncError(promise, code) {
   try {
     await promise;
@@ -30,6 +29,7 @@ export async function assertAsyncError(promise, code) {
       expect(err.message).toMatch(new RegExp(`^${code}.+`));
       expect(err.code).toBe(code);
     }
+
     return;
   }
 
diff --git a/packages/insomnia-app/app/sync/git/__tests__/utils.test.js b/packages/insomnia-app/app/sync/git/__tests__/utils.test.ts
similarity index 99%
rename from packages/insomnia-app/app/sync/git/__tests__/utils.test.js
rename to packages/insomnia-app/app/sync/git/__tests__/utils.test.ts
index fe70bf5f4a..cb8af4ab08 100644
--- a/packages/insomnia-app/app/sync/git/__tests__/utils.test.js
+++ b/packages/insomnia-app/app/sync/git/__tests__/utils.test.ts
@@ -1,5 +1,4 @@
 import { translateSSHtoHTTP, addDotGit } from '../utils';
-
 const links = {
   scp: {
     bare: 'git@github.com:a/b',
diff --git a/packages/insomnia-app/app/sync/git/fs-client.js b/packages/insomnia-app/app/sync/git/fs-client.ts
similarity index 72%
rename from packages/insomnia-app/app/sync/git/fs-client.js
rename to packages/insomnia-app/app/sync/git/fs-client.ts
index da5bf9675f..31e86e87e5 100644
--- a/packages/insomnia-app/app/sync/git/fs-client.js
+++ b/packages/insomnia-app/app/sync/git/fs-client.ts
@@ -1,27 +1,27 @@
-// @flow
 import fs from 'fs';
 import path from 'path';
 import mkdirp from 'mkdirp';
 
 type FSWraps =
-  | fs.FSPromise.readFile
-  | fs.FSPromise.writeFile
-  | fs.FSPromise.unlink
-  | fs.FSPromise.readdir
-  | fs.FSPromise.mkdir
-  | fs.FSPromise.rmdir
-  | fs.FSPromise.stat
-  | fs.FSPromise.lstat
-  | fs.FSPromise.readlink
-  | fs.FSPromise.symlink;
+  | typeof fs.promises.readFile
+  | typeof fs.promises.writeFile
+  | typeof fs.promises.unlink
+  | typeof fs.promises.readdir
+  | typeof fs.promises.mkdir
+  | typeof fs.promises.rmdir
+  | typeof fs.promises.stat
+  | typeof fs.promises.lstat
+  | typeof fs.promises.readlink
+  | typeof fs.promises.symlink;
 
 /** This is a client for isomorphic-git. {@link https://isomorphic-git.org/docs/en/fs} */
 export const fsClient = (basePath: string) => {
   console.log(`[fsClient] Created in ${basePath}`);
   mkdirp.sync(basePath);
 
-  const wrap = (fn: FSWraps) => async (filePath: string, ...args: Array<any>): Promise<T> => {
+  const wrap = (fn: FSWraps) => async (filePath: string, ...args: Array<any>) => {
     const modifiedPath = path.join(basePath, path.normalize(filePath));
+    // @ts-expect-error -- TSCONVERSION
     return fn(modifiedPath, ...args);
   };
 
diff --git a/packages/insomnia-app/app/sync/git/git-rollback.js b/packages/insomnia-app/app/sync/git/git-rollback.ts
similarity index 79%
rename from packages/insomnia-app/app/sync/git/git-rollback.js
rename to packages/insomnia-app/app/sync/git/git-rollback.ts
index 08ab43b1d7..d9a2effdc1 100644
--- a/packages/insomnia-app/app/sync/git/git-rollback.js
+++ b/packages/insomnia-app/app/sync/git/git-rollback.ts
@@ -1,23 +1,26 @@
-// @flow
 import { GitVCS } from './git-vcs';
 
-export type FileWithStatus = { filePath: string, status: string };
+export interface FileWithStatus {
+  filePath: string;
+  status: string;
+}
 
 const isAdded = ({ status }: FileWithStatus) => status.includes('added');
+
 const isNotAdded = ({ status }: FileWithStatus) => !status.includes('added');
 
-export const gitRollback = async (vcs: GitVCS, files: Array<FileWithStatus>): Promise<void> => {
+export const gitRollback = async (vcs: GitVCS, files: Array<FileWithStatus>) => {
   const addedFiles = files.filter(isAdded);
-
   // Remove and delete added (unversioned) files
-  const promises: Array<Promise<void>> = addedFiles.map(async ({ filePath }) => {
+  const promises = addedFiles.map(async ({ filePath }) => {
     await vcs.remove(filePath);
     console.log(`[git-rollback] Delete relPath=${filePath}`);
+    // @ts-expect-error -- TSCONVERSION
     await vcs.getFs().promises.unlink(filePath);
   });
-
   // Rollback existing (versioned) files
   const existingFiles = files.filter(isNotAdded).map(f => f.filePath);
+
   if (existingFiles.length) {
     promises.push(vcs.undoPendingChanges(existingFiles));
   }
diff --git a/packages/insomnia-app/app/sync/git/git-vcs.js b/packages/insomnia-app/app/sync/git/git-vcs.ts
similarity index 74%
rename from packages/insomnia-app/app/sync/git/git-vcs.js
rename to packages/insomnia-app/app/sync/git/git-vcs.ts
index 97cbfa05ae..972d3a5c03 100644
--- a/packages/insomnia-app/app/sync/git/git-vcs.js
+++ b/packages/insomnia-app/app/sync/git/git-vcs.ts
@@ -1,4 +1,3 @@
-// @flow
 import * as git from 'isomorphic-git';
 import { trackEvent } from '../../common/analytics';
 import { httpClient } from './http-client';
@@ -6,67 +5,62 @@ import { convertToOsSep, convertToPosixSep } from './path-sep';
 import path from 'path';
 import { gitCallbacks } from './utils';
 
-export type GitAuthor = {|
-  name: string,
-  email: string,
-|};
+export interface GitAuthor {
+  name: string;
+  email: string;
+}
 
-export type GitRemoteConfig = {|
-  remote: string,
-  url: string,
-|};
+export interface GitRemoteConfig {
+  remote: string;
+  url: string;
+}
 
-type GitCredentialsPassword = {
-  username: string,
-  password: string,
-};
+interface GitCredentialsPassword {
+  username: string;
+  password: string;
+}
 
-type GitCredentialsToken = {
-  username: string,
-  token: string,
-};
+interface GitCredentialsToken {
+  username: string;
+  token: string;
+}
 
 export type GitCredentials = GitCredentialsPassword | GitCredentialsToken;
 
 export type GitHash = string;
+
 export type GitRef = GitHash | string;
 
-export type GitTimestamp = {
-  timezoneOffset: number,
-  timestamp: number,
-};
+export interface GitTimestamp {
+  timezoneOffset: number;
+  timestamp: number;
+}
 
-export type GitLogEntry = {|
-  oid: string,
+export interface GitLogEntry {
+  oid: string;
   commit: {
-    message: string,
-    tree: GitRef,
-    author: GitAuthor & GitTimestamp,
-    committer: GitAuthor & GitTimestamp,
-    parent: Array<GitRef>,
-  },
-  payload: string,
-|};
+    message: string;
+    tree: GitRef;
+    author: GitAuthor & GitTimestamp;
+    committer: GitAuthor & GitTimestamp;
+    parent: Array<GitRef>;
+  };
+  payload: string;
+}
 
-export type PushResponse = {
-  ok?: Array<string>,
-  errors?: Array<string>,
-  headers?: object,
-};
+interface InitOptions {
+  directory: string;
+  fs: git.FsClient;
+  gitDirectory?: string;
+}
 
-type InitOptions = {
-  directory?: string,
-  fs?: Object,
-  gitDirectory?: string,
-};
-
-type InitFromCloneOptions = {
-  url: string,
-  gitCredentials: GitCredentials,
-  directory: string,
-  fs: Object,
-  gitDirectory: string,
-};
+interface InitFromCloneOptions {
+  url: string;
+  gitCredentials?: GitCredentials | null;
+  directory: string;
+  fs: git.FsClient;
+  gitDirectory: string;
+}
 
 /**
  * isomorphic-git internally will default an empty ('') clone directory to '.'
@@ -78,21 +72,23 @@ type InitFromCloneOptions = {
 export const GIT_CLONE_DIR = '.';
 const gitInternalDirName = 'git';
 export const GIT_INSOMNIA_DIR_NAME = '.insomnia';
-
 export const GIT_INTERNAL_DIR = path.join(GIT_CLONE_DIR, gitInternalDirName);
 export const GIT_INSOMNIA_DIR = path.join(GIT_CLONE_DIR, GIT_INSOMNIA_DIR_NAME);
 
+interface BaseOpts {
+  dir: string;
+  gitdir?: string;
+  fs: git.CallbackFsClient | git.PromiseFsClient;
+  http: git.HttpClient;
+  onMessage: (message: string) => void;
+  onAuthFailure: (message: string) => void;
+  onAuthSuccess: (message: string) => void;
+  onAuth: () => void;
+}
+
 export class GitVCS {
-  _baseOpts: {
-    dir: string,
-    gitdir?: string,
-    fs: Object,
-    http: Object,
-    onMessage: (message: string) => void,
-    onAuthFailure: (message: string) => void,
-    onAuthSuccess: (message: string) => void,
-    onAuth: () => void,
-  } = gitCallbacks();
+  // @ts-expect-error -- TSCONVERSION not initialized with required properties
+  _baseOpts: BaseOpts = gitCallbacks();
 
   initialized: boolean;
 
@@ -128,31 +124,25 @@ export class GitVCS {
       fs,
       http: httpClient,
     };
-
-    const cloneParams = {
-      ...this._baseOpts,
-      url,
-      singleBranch: true,
-    };
+    const cloneParams = { ...this._baseOpts, url, singleBranch: true };
     await git.clone(cloneParams);
-
     console.log(`[git] Clones repo to ${gitDirectory} from ${url}`);
-
     this.initialized = true;
   }
 
-  isInitialized(): boolean {
+  isInitialized() {
     return this.initialized;
   }
 
-  async listFiles(): Promise<Array<string>> {
+  async listFiles() {
     console.log('[git] List files');
     const files = await git.listFiles({ ...this._baseOpts });
     return files.map(convertToOsSep);
   }
 
-  async getBranch(): Promise<string> {
+  async getBranch() {
     const branch = await git.currentBranch({ ...this._baseOpts });
+
     if (typeof branch !== 'string') {
       throw new Error('No active branch');
     }
@@ -160,7 +150,7 @@ export class GitVCS {
     return branch;
   }
 
-  async listBranches(): Promise<Array<string>> {
+  async listBranches() {
     const branch = await this.getBranch();
     const branches = await git.listBranches({ ...this._baseOpts });
 
@@ -172,36 +162,29 @@ export class GitVCS {
     return GitVCS.sortBranches(branches);
   }
 
-  async listRemoteBranches(): Promise<Array<string>> {
+  async listRemoteBranches() {
     const branches = await git.listBranches({ ...this._baseOpts, remote: 'origin' });
-
     // Don't care about returning remote HEAD
     return GitVCS.sortBranches(branches.filter(b => b !== 'HEAD'));
   }
 
   async status(filepath: string) {
-    return git.status({
-      ...this._baseOpts,
-      filepath: convertToPosixSep(filepath),
-    });
+    return git.status({ ...this._baseOpts, filepath: convertToPosixSep(filepath) });
   }
 
-  async add(relPath: string): Promise<void> {
+  async add(relPath: string) {
     relPath = convertToPosixSep(relPath);
     console.log(`[git] Add ${relPath}`);
-    return git.add({
-      ...this._baseOpts,
-      filepath: relPath,
-    });
+    return git.add({ ...this._baseOpts, filepath: relPath });
   }
 
-  async remove(relPath: string): Promise<void> {
+  async remove(relPath: string) {
     relPath = convertToPosixSep(relPath);
     console.log(`[git] Remove relPath=${relPath}`);
     return git.remove({ ...this._baseOpts, filepath: relPath });
   }
 
-  async addRemote(url: string): Promise<GitRemoteConfig> {
+  async addRemote(url: string) {
     console.log(`[git] Add Remote url=${url}`);
     await git.addRemote({ ...this._baseOpts, remote: 'origin', url, force: true });
     const config = await this.getRemote('origin');
@@ -218,16 +201,16 @@ export class GitVCS {
     return git.listRemotes({ ...this._baseOpts });
   }
 
-  async getAuthor(): Promise<GitAuthor> {
+  async getAuthor() {
     const name = await git.getConfig({ ...this._baseOpts, path: 'user.name' });
     const email = await git.getConfig({ ...this._baseOpts, path: 'user.email' });
     return {
       name: name || '',
       email: email || '',
-    };
+    } as GitAuthor;
   }
 
-  async setAuthor(name: string, email: string): Promise<void> {
+  async setAuthor(name: string, email: string) {
     await git.setConfig({ ...this._baseOpts, path: 'user.name', value: name });
     await git.setConfig({ ...this._baseOpts, path: 'user.email', value: email });
   }
@@ -237,7 +220,7 @@ export class GitVCS {
     return remotes.find(r => r.remote === name) || null;
   }
 
-  async commit(message: string): Promise<string> {
+  async commit(message: string) {
     console.log(`[git] Commit "${message}"`);
     trackEvent('Git', 'Commit');
     return git.commit({ ...this._baseOpts, message });
@@ -253,8 +236,8 @@ export class GitVCS {
    */
   async canPush(gitCredentials?: GitCredentials | null) {
     const branch = await this.getBranch();
-
     const remote = await this.getRemote('origin');
+
     if (!remote) {
       throw new Error('Remote not configured');
     }
@@ -265,12 +248,12 @@ export class GitVCS {
       forPush: true,
       url: remote.url,
     });
-
     const logs = (await this.log(1)) || [];
     const localHead = logs[0].oid;
     const remoteRefs = remoteInfo.refs || {};
     const remoteHeads = remoteRefs.heads || {};
     const remoteHead = remoteHeads[branch];
+
     if (localHead === remoteHead) {
       return false;
     }
@@ -278,20 +261,21 @@ export class GitVCS {
     return true;
   }
 
-  async push(gitCredentials?: GitCredentials | null, force: boolean = false): Promise<void> {
+  async push(gitCredentials?: GitCredentials | null, force = false) {
     console.log(`[git] Push remote=origin force=${force ? 'true' : 'false'}`);
     trackEvent('Git', 'Push');
-
     // eslint-disable-next-line no-unreachable
-    const response: PushResponse = await git.push({
+    const response: git.PushResult = await git.push({
       ...this._baseOpts,
       ...gitCallbacks(gitCredentials),
       remote: 'origin',
       force,
     });
 
+    // @ts-expect-error -- TSCONVERSION git errors are not handled correctly
     if (response.errors?.length) {
-      console.log(`[git] Push rejected`, response);
+      console.log('[git] Push rejected', response);
+      // @ts-expect-error -- TSCONVERSION git errors are not handled correctly
       const errorsString = JSON.stringify(response.errors);
       throw new Error(
         `Push rejected with errors: ${errorsString}.\n\nGo to View > Toggle DevTools > Console for more information.`,
@@ -299,33 +283,34 @@ export class GitVCS {
     }
   }
 
-  async pull(gitCredentials?: GitCredentials | null): Promise<void> {
+  async pull(gitCredentials?: GitCredentials | null) {
     console.log('[git] Pull remote=origin', await this.getBranch());
     trackEvent('Git', 'Pull');
-
     return git.pull({
       ...this._baseOpts,
       ...gitCallbacks(gitCredentials),
       remote: 'origin',
       singleBranch: true,
-      fast: true,
     });
   }
 
-  async merge(theirBranch: string): Promise<void> {
+  async merge(theirBranch: string) {
     const ours = await this.getBranch();
     console.log(`[git] Merge ${ours} <-- ${theirBranch}`);
     trackEvent('Git', 'Merge');
-    return git.merge({ ...this._baseOpts, ours, theirs: theirBranch });
+    return git.merge({
+      ...this._baseOpts,
+      ours,
+      theirs: theirBranch,
+    });
   }
 
   async fetch(
     singleBranch: boolean,
-    depth: number | null,
+    depth: number,
     gitCredentials?: GitCredentials | null,
-  ): Promise<void> {
+  ) {
     console.log('[git] Fetch remote=origin');
-
     return git.fetch({
       ...this._baseOpts,
       ...gitCallbacks(gitCredentials),
@@ -337,29 +322,33 @@ export class GitVCS {
     });
   }
 
-  async log(depth?: number): Promise<Array<GitLogEntry>> {
+  async log(depth?: number) {
     try {
       return await git.log({ ...this._baseOpts, depth });
     } catch (error) {
       if (error.code === 'NotFoundError') {
         return [];
       }
+
       throw error;
     }
   }
 
-  async branch(branch: string, checkout: boolean = false): Promise<void> {
+  async branch(branch: string, checkout = false) {
     trackEvent('Git', 'Create Branch');
+    // @ts-expect-error -- TSCONVERSION remote doesn't exist as an option
     await git.branch({ ...this._baseOpts, ref: branch, checkout, remote: 'origin' });
   }
 
-  async deleteBranch(branch: string): Promise<void> {
+  async deleteBranch(branch: string) {
     trackEvent('Git', 'Delete Branch');
     await git.deleteBranch({ ...this._baseOpts, ref: branch });
   }
 
-  async checkout(branch: string): Promise<void> {
-    console.log('[git] Checkout', { branch });
+  async checkout(branch: string) {
+    console.log('[git] Checkout', {
+      branch,
+    });
     const branches = await this.listBranches();
 
     if (branches.includes(branch)) {
@@ -370,9 +359,8 @@ export class GitVCS {
     }
   }
 
-  async undoPendingChanges(fileFilter?: Array<String>): Promise<void> {
+  async undoPendingChanges(fileFilter?: Array<String>) {
     console.log('[git] Undo pending changes');
-
     await git.checkout({
       ...this._baseOpts,
       ref: await this.getBranch(),
@@ -382,7 +370,7 @@ export class GitVCS {
     });
   }
 
-  async readObjFromTree(treeOid: string, objPath: string): Object | null {
+  async readObjFromTree(treeOid: string, objPath: string) {
     try {
       const obj = await git.readObject({
         ...this._baseOpts,
@@ -390,7 +378,6 @@ export class GitVCS {
         filepath: convertToPosixSep(objPath),
         encoding: 'utf8',
       });
-
       return obj.object;
     } catch (err) {
       return null;
diff --git a/packages/insomnia-app/app/sync/git/http-client.js b/packages/insomnia-app/app/sync/git/http-client.ts
similarity index 95%
rename from packages/insomnia-app/app/sync/git/http-client.js
rename to packages/insomnia-app/app/sync/git/http-client.ts
index 5772ce894d..eccf20a7f7 100644
--- a/packages/insomnia-app/app/sync/git/http-client.js
+++ b/packages/insomnia-app/app/sync/git/http-client.ts
@@ -4,8 +4,8 @@ import { axiosRequest } from '../../network/axios-request';
 export const httpClient = {
   request: async config => {
     let response;
+    let body: Buffer | null = null;
 
-    let body = null;
     if (Array.isArray(config.body)) {
       body = Buffer.concat(config.body);
     }
diff --git a/packages/insomnia-app/app/sync/git/mem-client.js b/packages/insomnia-app/app/sync/git/mem-client.ts
similarity index 69%
rename from packages/insomnia-app/app/sync/git/mem-client.js
rename to packages/insomnia-app/app/sync/git/mem-client.ts
index ea7db03fd1..0aa6766315 100644
--- a/packages/insomnia-app/app/sync/git/mem-client.js
+++ b/packages/insomnia-app/app/sync/git/mem-client.ts
@@ -1,33 +1,34 @@
-// @flow
 import path from 'path';
 import Stat from './stat';
+import { SystemError } from './system-error';
+import { BufferEncoding } from './utils';
 
-type FSFile = {|
-  +type: 'file',
-  +ino: number,
-  +mtimeMs: number,
-  +name: string,
-  +path: string,
-  contents: string,
-|};
+interface FSFile {
+  readonly type: 'file';
+  readonly ino: number;
+  readonly mtimeMs: number;
+  readonly name: string;
+  readonly path: string;
+  contents: string;
+}
 
-type FSLink = {|
-  +type: 'symlink',
-  +ino: number,
-  +mtimeMs: number,
-  +name: string,
-  +path: string,
-  +linkTo: string,
-|};
+interface FSLink {
+  readonly type: 'symlink';
+  readonly ino: number;
+  readonly mtimeMs: number;
+  readonly name: string;
+  readonly path: string;
+  readonly linkTo: string;
+}
 
-type FSDir = {|
-  +type: 'dir',
-  +ino: number,
-  +mtimeMs: number,
-  +name: string,
-  +path: string,
-  +children: Array<FSFile | FSDir | FSLink>,
-|};
+interface FSDir {
+  readonly type: 'dir';
+  readonly ino: number;
+  readonly mtimeMs: number;
+  readonly name: string;
+  readonly path: string;
+  readonly children: Array<FSFile | FSDir | FSLink>;
+}
 
 type FSEntry = FSDir | FSFile | FSLink;
 
@@ -53,10 +54,10 @@ export class MemClient {
     };
   }
 
-  async tree(baseDir: string = '/') {
+  async tree(baseDir = '/') {
     baseDir = path.normalize(baseDir);
 
-    const next = async (dir: string, toPrint: string): Promise<string> => {
+    const next = async (dir: string, toPrint: string) => {
       const entry = this._find(dir);
 
       if (!entry) {
@@ -64,6 +65,7 @@ export class MemClient {
       }
 
       const indent = new Array((dir.match(/\//g) || []).length).join('|   ');
+
       if (entry.type === 'dir') {
         if (entry.path !== baseDir) {
           toPrint += `${indent}${entry.name}/\n`;
@@ -84,18 +86,22 @@ export class MemClient {
 
   async readFile(
     filePath: string,
-    options?: buffer$Encoding | { encoding?: buffer$Encoding } = {},
-  ): Promise<Buffer | string> {
+    options: BufferEncoding | { encoding?: BufferEncoding } = {},
+  ) {
     filePath = path.normalize(filePath);
 
     if (typeof options === 'string') {
-      options = { encoding: options };
+      options = {
+        encoding: options,
+      };
     }
 
     const encoding = options ? options.encoding : null;
 
     const entry = this._assertFile(filePath);
+
     const raw = Buffer.from(entry.contents, 'base64');
+
     if (encoding) {
       return raw.toString(encoding);
     } else {
@@ -106,12 +112,14 @@ export class MemClient {
   async writeFile(
     filePath: string,
     data: Buffer | string,
-    options: buffer$Encoding | { encoding?: buffer$Encoding, flag?: string },
-  ): Promise<void> {
+    options: BufferEncoding | { encoding?: BufferEncoding, flag?: string; } = {},
+  ) {
     filePath = path.normalize(filePath);
 
     if (typeof options === 'string') {
-      options = { encoding: options };
+      options = {
+        encoding: options,
+      };
     }
 
     const flag = options && options.flag ? options.flag : 'w';
@@ -143,32 +151,35 @@ export class MemClient {
 
     const dataBuff: Buffer = data instanceof Buffer ? data : Buffer.from(data, encoding);
     let newContents = Buffer.alloc(0);
+
     if (flag[0] === 'w') {
       newContents = dataBuff;
     } else if (flag[0] === 'a') {
       const contentsBuff: Buffer = Buffer.from(file.contents, 'base64');
       newContents = Buffer.concat([contentsBuff, dataBuff]);
     } else {
-      const e: ErrnoError = new Error('EBADF: bad file descriptor, write');
-      e.errno = -9;
-      e.code = 'EBADF';
-      e.syscall = 'write';
-      e.path = filePath;
-      throw e;
+      throw new SystemError({
+        code: 'EBADF',
+        errno: -9,
+        message: 'EBADF: bad file descriptor, write',
+        path: filePath,
+        syscall: 'write',
+      });
     }
 
     file.contents = newContents.toString('base64');
-
     return Promise.resolve();
   }
 
-  async unlink(filePath: string, ...x: Array<any>): Promise<void> {
+  async unlink(filePath: string) {
     filePath = path.normalize(filePath);
+
     this._remove(this._assertFile(filePath));
   }
 
-  async readdir(basePath: string, ...x: Array<any>): Promise<Array<string>> {
+  async readdir(basePath: string) {
     basePath = path.normalize(basePath);
+
     const entry = this._assertDir(basePath);
 
     const names = entry.children.map(c => c.name);
@@ -176,9 +187,8 @@ export class MemClient {
     return names;
   }
 
-  async mkdir(dirPath: string, options?: { recursive?: boolean }): Promise<void> {
+  async mkdir(dirPath: string, options?: { recursive?: boolean }) {
     dirPath = path.normalize(dirPath);
-
     const doRecursive = (options || {}).recursive || false;
 
     // If not recursive, ensure parent exists
@@ -187,12 +197,13 @@ export class MemClient {
     }
 
     const pathSegments = dirPath.split(path.sep).filter(s => s !== '');
-
     // Recurse over all sub paths, ensure they are all directories,
     // create them if they don't exist
     let currentPath = '/';
+
     for (const pathSegment of pathSegments) {
       const dirEntry = this._assertDir(currentPath);
+
       const nextPath = path.join(currentPath, pathSegment);
 
       // Create dir if it doesn't exist yet
@@ -211,47 +222,54 @@ export class MemClient {
     }
   }
 
-  async rmdir(dirPath: string, ...x: Array<any>) {
+  async rmdir(dirPath: string) {
     dirPath = path.normalize(dirPath);
 
     const dirEntry = this._assertDir(dirPath);
 
     if (dirEntry.children.length > 0) {
-      const e: ErrnoError = new Error(`ENOTEMPTY: directory not empty, rmdir '${dirPath}'`);
-      e.errno = -66;
-      e.syscall = 'rmdir';
-      e.code = 'ENOTEMPTY';
-      e.path = dirPath;
-      throw e;
+      throw new SystemError({
+        code: 'ENOTEMPTY',
+        errno: -66,
+        message: `ENOTEMPTY: directory not empty, rmdir '${dirPath}'`,
+        path: dirPath,
+        syscall: 'rmdir',
+      });
     }
 
     this._remove(dirEntry);
   }
 
-  async stat(filePath: string, ...x: Array<any>): Promise<Stat> {
+  async stat(filePath: string) {
     filePath = path.normalize(filePath);
     return this._statEntry(this._assertExists(filePath));
   }
 
-  async lstat(filePath: string, ...x: Array<any>) {
+  async lstat(filePath: string) {
     filePath = path.normalize(filePath);
+
     const linkEntry = this._assertExists(filePath);
+
     return this._statEntry(this._resolveLinks(linkEntry));
   }
 
-  async readlink(filePath: string, ...x: Array<any>) {
+  async readlink(filePath: string) {
     filePath = path.normalize(filePath);
+
     const linkEntry = this._assertSymlink(filePath);
+
     return linkEntry.linkTo;
   }
 
-  async symlink(target: string, filePath: string, ...x: Array<any>) {
+  async symlink(target: string, filePath: string) {
     filePath = path.normalize(filePath);
+
     // Make sure we don't already have one there
     // TODO: Check what to do in this case (might be wrong)
     this._assertDoesNotExist(filePath);
 
     this._assertExists(target);
+
     const parentEntry = this._assertDir(path.dirname(filePath));
 
     parentEntry.children.push({
@@ -264,24 +282,25 @@ export class MemClient {
     });
   }
 
-  _statEntry(entry: FSEntry): Stat {
+  _statEntry(entry: FSEntry) {
     return new Stat({
       type: entry.type,
       mode: 0o777,
+      // @ts-expect-error -- TSCONVERSION
       size: entry.contents ? entry.contents.length : 0,
       ino: entry.ino,
       mtimeMs: entry.mtimeMs,
     });
   }
 
-  _find(filePath: string): FSEntry | null {
+  _find(filePath: string) {
     filePath = path.normalize(filePath);
-
     let current = this.__fs;
-
     // Ignore empty and current directory '.' segments
     const pathSegments = filePath.split(path.sep).filter(s => s !== '' && s !== '.');
+
     for (const expectedName of pathSegments) {
+      // @ts-expect-error -- TSCONVERSION
       const e = (current.children || []).find(c => c.name === expectedName);
 
       if (!e) {
@@ -295,73 +314,80 @@ export class MemClient {
     return current;
   }
 
-  _assertDoesNotExist(filePath: string): void {
+  _assertDoesNotExist(filePath: string) {
     const entry = this._find(filePath);
 
     if (entry) {
-      const e: ErrnoError = new Error(`EEXIST: file already exists, open '${filePath}'`);
-      e.errno = -17;
-      e.code = 'EEXIST';
-      e.syscall = 'open';
-      e.path = filePath;
-      throw e;
+      throw new SystemError({
+        code: 'EEXIST',
+        errno: -17,
+        message: `EEXIST: file already exists, open '${filePath}'`,
+        path: filePath,
+        syscall: 'open',
+      });
     }
   }
 
-  _assertExists(filePath: string): FSEntry {
+  _assertExists(filePath: string) {
     const entry = this._find(filePath);
 
     if (!entry) {
-      const e: ErrnoError = new Error(`ENOENT: no such file or directory, scandir '${filePath}'`);
-      e.errno = -2;
-      e.code = 'ENOENT';
-      e.syscall = 'scandir';
-      e.path = filePath;
-      throw e;
+      throw new SystemError({
+        code: 'ENOENT',
+        errno: -2,
+        message: `ENOENT: no such file or directory, scandir '${filePath}'`,
+        path: filePath,
+        syscall: 'scandir',
+      });
     }
 
     return entry;
   }
 
-  _assertDirEntry(entry: FSEntry): FSDir {
+  _assertDirEntry(entry: FSEntry) {
     if (entry.type !== 'dir') {
-      const e: ErrnoError = new Error(`ENOTDIR: not a directory, scandir '${entry.path}'`);
-      e.errno = -20;
-      e.code = 'ENOTDIR';
-      e.syscall = 'scandir';
-      e.path = entry.path;
-      throw e;
+      throw new SystemError({
+        code: 'ENOTDIR',
+        errno: -20,
+        message: `ENOTDIR: not a directory, scandir '${entry.path}'`,
+        path: entry.path,
+        syscall: 'scandir',
+      });
     }
 
     return entry;
   }
 
-  _assertDir(filePath: string): FSDir {
+  _assertDir(filePath: string) {
     const entry = this._assertExists(filePath);
+
     return this._assertDirEntry(entry);
   }
 
-  _assertSymlinkEntry(entry: FSEntry): FSLink {
+  _assertSymlinkEntry(entry: FSEntry) {
     if (entry.type !== 'symlink') {
-      const e: ErrnoError = new Error(`ENOTDIR: not a simlink, scandir '${entry.path}'`);
-      e.errno = -20;
-      e.code = 'ENOTDIR';
-      e.syscall = 'scandir';
-      e.path = entry.path;
-      throw e;
+      throw new SystemError({
+        code: 'ENOTDIR',
+        errno: -20,
+        message: `ENOTDIR: not a simlink, scandir '${entry.path}'`,
+        path: entry.path,
+        syscall: 'scandir',
+      });
     }
 
     return entry;
   }
 
-  _assertSymlink(filePath: string): FSLink {
+  _assertSymlink(filePath: string) {
     const entry = this._assertExists(filePath);
+
     return this._assertSymlinkEntry(entry);
   }
 
   _resolveLinks(entry: FSEntry): FSFile | FSDir {
     if (entry.type === 'symlink') {
       const other = this._find(entry.linkTo);
+
       if (!other) {
         // Should never happen
         throw new Error('Failed to resolve link');
@@ -373,29 +399,33 @@ export class MemClient {
     return entry;
   }
 
-  _assertFileEntry(entry: FSEntry): FSFile {
+  _assertFileEntry(entry: FSEntry) {
     entry = this._resolveLinks(entry);
 
     if (entry.type === 'dir') {
-      const e: ErrnoError = new Error(`EISDIR: illegal operation on a directory '${entry.path}'`);
-      e.errno = -21;
-      e.code = 'EISDIR';
-      e.syscall = 'open';
-      e.path = entry.path;
-      throw e;
+      throw new SystemError({
+        code: 'EISDIR',
+        errno: -21,
+        message: `EISDIR: illegal operation on a directory '${entry.path}'`,
+        path: entry.path,
+        syscall: 'open',
+      });
     }
 
     return entry;
   }
 
-  _assertFile(filePath: string): FSFile {
+  _assertFile(filePath: string) {
     const entry = this._assertExists(filePath);
+
     return this._assertFileEntry(entry);
   }
 
   _remove(entry: FSEntry) {
     const parentEntry = this._assertDir(path.dirname(entry.path));
+
     const index = parentEntry.children.findIndex(c => c === entry);
+
     if (index < 0) {
       // Should never happen so w/e
       return;
diff --git a/packages/insomnia-app/app/sync/git/ne-db-client.js b/packages/insomnia-app/app/sync/git/ne-db-client.ts
similarity index 73%
rename from packages/insomnia-app/app/sync/git/ne-db-client.js
rename to packages/insomnia-app/app/sync/git/ne-db-client.ts
index d7332c6859..097f37bbd0 100644
--- a/packages/insomnia-app/app/sync/git/ne-db-client.js
+++ b/packages/insomnia-app/app/sync/git/ne-db-client.ts
@@ -1,11 +1,12 @@
-// @flow
 import path from 'path';
-import * as db from '../../common/database';
+import { database as db } from '../../common/database';
 import * as models from '../../models';
 import YAML from 'yaml';
 import Stat from './stat';
 import { GIT_INSOMNIA_DIR_NAME } from './git-vcs';
 import parseGitPath from './parse-git-path';
+import { BufferEncoding } from './utils';
+import { SystemError } from './system-error';
 
 export class NeDBClient {
   _workspaceId: string;
@@ -14,6 +15,7 @@ export class NeDBClient {
     if (!workspaceId) {
       throw new Error('Cannot use NeDBClient without workspace ID');
     }
+
     this._workspaceId = workspaceId;
   }
 
@@ -25,13 +27,15 @@ export class NeDBClient {
 
   async readFile(
     filePath: string,
-    options?: buffer$Encoding | { encoding?: buffer$Encoding },
-  ): Promise<Buffer | string> {
+    options?: BufferEncoding | { encoding?: BufferEncoding },
+  ) {
     filePath = path.normalize(filePath);
-
     options = options || {};
+
     if (typeof options === 'string') {
-      options = { encoding: options };
+      options = {
+        encoding: options,
+      };
     }
 
     const { root, type, id } = parseGitPath(filePath);
@@ -42,7 +46,7 @@ export class NeDBClient {
 
     const doc = await db.get(type, id);
 
-    if (!doc || (doc: any).isPrivate) {
+    if (!doc || doc.isPrivate) {
       throw this._errMissing(filePath);
     }
 
@@ -56,7 +60,6 @@ export class NeDBClient {
     //     throw new Error(`Not found under workspace ${filePath}`);
     //   }
     // }
-
     const raw = Buffer.from(YAML.stringify(doc), 'utf8');
 
     if (options.encoding) {
@@ -66,7 +69,7 @@ export class NeDBClient {
     }
   }
 
-  async writeFile(filePath: string, data: Buffer | string, ...x: Array<any>): Promise<void> {
+  async writeFile(filePath: string, data: Buffer | string) {
     filePath = path.normalize(filePath);
     const { root, id, type } = parseGitPath(filePath);
 
@@ -88,7 +91,7 @@ export class NeDBClient {
     await db.upsert(doc, true);
   }
 
-  async unlink(filePath: string, ...x: Array<any>): Promise<void> {
+  async unlink(filePath: string) {
     filePath = path.normalize(filePath);
     const { id, type } = parseGitPath(filePath);
 
@@ -105,50 +108,61 @@ export class NeDBClient {
     await db.unsafeRemove(doc, true);
   }
 
-  async readdir(filePath: string, ...x: Array<any>): Promise<Array<string>> {
+  async readdir(filePath: string) {
     filePath = path.normalize(filePath);
-
     const { root, type, id } = parseGitPath(filePath);
-
     let docs = [];
     let otherFolders = [];
+
     if (root === null && id === null && type === null) {
+      // @ts-expect-error -- TSCONVERSION
       otherFolders = [GIT_INSOMNIA_DIR_NAME];
     } else if (id === null && type === null) {
       otherFolders = [
+        // @ts-expect-error -- TSCONVERSION
         models.workspace.type,
+        // @ts-expect-error -- TSCONVERSION
         models.environment.type,
+        // @ts-expect-error -- TSCONVERSION
         models.requestGroup.type,
+        // @ts-expect-error -- TSCONVERSION
         models.request.type,
+        // @ts-expect-error -- TSCONVERSION
         models.apiSpec.type,
+        // @ts-expect-error -- TSCONVERSION
         models.unitTestSuite.type,
+        // @ts-expect-error -- TSCONVERSION
         models.unitTest.type,
+        // @ts-expect-error -- TSCONVERSION
         models.grpcRequest.type,
+        // @ts-expect-error -- TSCONVERSION
         models.protoFile.type,
+        // @ts-expect-error -- TSCONVERSION
         models.protoDirectory.type,
       ];
     } else if (type !== null && id === null) {
       const workspace = await db.get(models.workspace.type, this._workspaceId);
       const children = await db.withDescendants(workspace);
-      docs = children.filter(d => d.type === type && !(d: any).isPrivate);
+      // @ts-expect-error -- TSCONVERSION
+      docs = children.filter(d => d.type === type && !d.isPrivate);
     } else {
       throw this._errMissing(filePath);
     }
 
+    // @ts-expect-error -- TSCONVERSION
     const ids = docs.map(d => `${d._id}.yml`);
-
     return [...ids, ...otherFolders].sort();
   }
 
-  async mkdir(filePath: string, ...x: Array<any>) {
+  async mkdir() {
     throw new Error('NeDBClient is not writable');
   }
 
-  async stat(filePath: string, ...x: Array<any>): Promise<Stat> {
+  async stat(filePath: string) {
     filePath = path.normalize(filePath);
-
     let fileBuff: Buffer | string | null = null;
     let dir: Array<string> | null = null;
+
     try {
       fileBuff = await this.readFile(filePath);
     } catch (err) {
@@ -173,7 +187,8 @@ export class NeDBClient {
         type: 'file',
         mode: 0o777,
         size: fileBuff.length,
-        ino: doc._id, // should be number instead of string https://nodejs.org/api/fs.html#fs_stats_ino I think flow should have detected this
+        ino: doc._id,
+        // should be number instead of string https://nodejs.org/api/fs.html#fs_stats_ino I think flow should have detected this
         mtimeMs: doc.modified,
       });
     } else {
@@ -187,29 +202,30 @@ export class NeDBClient {
     }
   }
 
-  async readlink(filePath: string, ...x: Array<any>): Promise<Buffer | string> {
+  async readlink(filePath: string, ...x: Array<any>) {
     return this.readFile(filePath, ...x);
   }
 
-  async lstat(filePath: string, ...x: Array<any>): Promise<Stat> {
-    return this.stat(filePath, ...x);
+  async lstat(filePath: string) {
+    return this.stat(filePath);
   }
 
-  async rmdir(dir: string, ...x: Array<any>): Promise<void> {
+  async rmdir() {
     // Dirs in NeDB can't be removed, so we'll just pretend like it succeeded
     return Promise.resolve();
   }
 
-  async symlink(targetPath: string, filePath: string, ...x: Array<any>): Promise<void> {
+  async symlink() {
     throw new Error('NeDBClient symlink not supported');
   }
 
-  _errMissing(filePath: string): Error {
-    const e: ErrnoError = new Error(`ENOENT: no such file or directory, scandir '${filePath}'`);
-    e.errno = -2;
-    e.code = 'ENOENT';
-    e.syscall = 'scandir';
-    e.path = filePath;
-    return e;
+  _errMissing(filePath: string) {
+    return new SystemError({
+      message: `ENOENT: no such file or directory, scandir '${filePath}'`,
+      errno: -2,
+      code: 'ENOENT',
+      syscall: 'scandir',
+      path: filePath,
+    });
   }
 }
diff --git a/packages/insomnia-app/app/sync/git/parse-git-path.js b/packages/insomnia-app/app/sync/git/parse-git-path.ts
similarity index 89%
rename from packages/insomnia-app/app/sync/git/parse-git-path.js
rename to packages/insomnia-app/app/sync/git/parse-git-path.ts
index 822f24e84a..c255bd2ad9 100644
--- a/packages/insomnia-app/app/sync/git/parse-git-path.js
+++ b/packages/insomnia-app/app/sync/git/parse-git-path.ts
@@ -1,30 +1,25 @@
-// @flow
-
 import path from 'path';
 import { GIT_CLONE_DIR } from './git-vcs';
 
 // The win32 separator is a single backslash (\), but we have to escape both the JS string and RegExp.
 const pathSep = path.sep === path.win32.sep ? '\\\\' : '/';
+
 const _cloneDirRegExp = new RegExp(`^${GIT_CLONE_DIR}${pathSep}`);
 
-type GitPathSegments = {
-  root: string | null,
-  type: string | null,
-  id: string | null,
-};
+interface GitPathSegments {
+  root: string | null;
+  type: string | null;
+  id: string | null;
+}
 
 const parseGitPath = (filePath: string): GitPathSegments => {
   filePath = path.normalize(filePath);
-
   // FilePath will start with the clone directory. We want to remove the clone dir, so that the
   // segments can be extracted correctly.
   filePath = filePath.replace(_cloneDirRegExp, '');
-
   // Ignore empty and current directory '.' segments
   const [root, type, idRaw] = filePath.split(path.sep).filter(s => s !== '' && s !== '.');
-
   const id = typeof idRaw === 'string' ? idRaw.replace(/\.(json|yml)$/, '') : idRaw;
-
   return {
     root: root || null,
     type: type || null,
diff --git a/packages/insomnia-app/app/sync/git/path-sep.js b/packages/insomnia-app/app/sync/git/path-sep.ts
similarity index 98%
rename from packages/insomnia-app/app/sync/git/path-sep.js
rename to packages/insomnia-app/app/sync/git/path-sep.ts
index 9b962ccca3..42c822cb84 100644
--- a/packages/insomnia-app/app/sync/git/path-sep.js
+++ b/packages/insomnia-app/app/sync/git/path-sep.ts
@@ -1,4 +1,3 @@
-// @flow
 import path from 'path';
 
 const win32SepRegex = /\\/g;
diff --git a/packages/insomnia-app/app/sync/git/routable-fs-client.js b/packages/insomnia-app/app/sync/git/routable-fs-client.ts
similarity index 84%
rename from packages/insomnia-app/app/sync/git/routable-fs-client.js
rename to packages/insomnia-app/app/sync/git/routable-fs-client.ts
index 0e241c21b2..af70e8c4db 100644
--- a/packages/insomnia-app/app/sync/git/routable-fs-client.js
+++ b/packages/insomnia-app/app/sync/git/routable-fs-client.ts
@@ -1,5 +1,5 @@
-// @flow
 import path from 'path';
+import * as git from 'isomorphic-git';
 
 /**
  * An isometric-git FS client that can route to various client depending on what the filePath is.
@@ -8,7 +8,10 @@ import path from 'path';
  * @param otherFS – map of path prefixes to clients
  * @returns {{promises: *}}
  */
-export function routableFSClient(defaultFS: Object, otherFS: { [string]: Object }) {
+export function routableFSClient(
+  defaultFS: git.PromiseFsClient,
+  otherFS: Record<string, git.PromiseFsClient>,
+) {
   const execMethod = async (method: string, filePath: string, ...args: Array<any>) => {
     filePath = path.normalize(filePath);
 
@@ -20,18 +23,15 @@ export function routableFSClient(defaultFS: Object, otherFS: { [string]: Object
 
     // Uncomment this to debug operations
     // console.log('[routablefs] Executing', method, filePath, { args });
-
     // Fallback to default if no prefix matched
     const result = await defaultFS.promises[method](filePath, ...args);
-
     // Uncomment this to debug operations
     // console.log('[routablefs] Executing', method, filePath, { args }, { result });
-
     return result;
   };
 
-  const methods = {};
-
+  // @ts-expect-error -- TSCONVERSION declare and initialize together to avoid an error
+  const methods: git.CallbackFsClient = {};
   methods.readFile = execMethod.bind(methods, 'readFile');
   methods.writeFile = execMethod.bind(methods, 'writeFile');
   methods.unlink = execMethod.bind(methods, 'unlink');
@@ -42,7 +42,6 @@ export function routableFSClient(defaultFS: Object, otherFS: { [string]: Object
   methods.lstat = execMethod.bind(methods, 'lstat');
   methods.readlink = execMethod.bind(methods, 'readlink');
   methods.symlink = execMethod.bind(methods, 'symlink');
-
   return {
     promises: methods,
   };
diff --git a/packages/insomnia-app/app/sync/git/shallow-clone.js b/packages/insomnia-app/app/sync/git/shallow-clone.ts
similarity index 80%
rename from packages/insomnia-app/app/sync/git/shallow-clone.js
rename to packages/insomnia-app/app/sync/git/shallow-clone.ts
index 25d2232e58..ad10332c77 100644
--- a/packages/insomnia-app/app/sync/git/shallow-clone.js
+++ b/packages/insomnia-app/app/sync/git/shallow-clone.ts
@@ -1,21 +1,19 @@
-// @flow
-
 import * as git from 'isomorphic-git';
 import { GIT_CLONE_DIR, GIT_INTERNAL_DIR } from './git-vcs';
 import type { GitRepository } from '../../models/git-repository';
 import { gitCallbacks } from './utils';
 import { httpClient } from './http-client';
 
-type Options = {
-  fsClient: Object,
-  gitRepository: GitRepository,
-};
+interface Options {
+  fsClient: git.FsClient;
+  gitRepository: GitRepository;
+}
 
 /**
  * Create a shallow clone into the provided FS plugin.
  * */
 export const shallowClone = async ({ fsClient, gitRepository }: Options) => {
-  const cloneParams = {
+  await git.clone({
     ...gitCallbacks(gitRepository.credentials),
     fs: fsClient,
     http: httpClient,
@@ -24,7 +22,5 @@ export const shallowClone = async ({ fsClient, gitRepository }: Options) => {
     singleBranch: true,
     url: gitRepository.uri,
     depth: 1,
-  };
-
-  await git.clone(cloneParams);
+  });
 };
diff --git a/packages/insomnia-app/app/sync/git/stat.js b/packages/insomnia-app/app/sync/git/stat.ts
similarity index 80%
rename from packages/insomnia-app/app/sync/git/stat.js
rename to packages/insomnia-app/app/sync/git/stat.ts
index 6785e702b5..c45f866026 100644
--- a/packages/insomnia-app/app/sync/git/stat.js
+++ b/packages/insomnia-app/app/sync/git/stat.ts
@@ -1,13 +1,11 @@
-// @flow
-
-type StatObj = {
-  type: 'file' | 'dir' | 'symlink',
-  mode: number,
-  size: number,
-  ino: number,
-  mtimeMs: number,
-  ctimeMs?: number,
-};
+interface StatObj {
+  type: 'file' | 'dir' | 'symlink';
+  mode: number;
+  size: number;
+  ino: number;
+  mtimeMs: number;
+  ctimeMs?: number;
+}
 
 export default class Stat {
   type: 'file' | 'dir' | 'symlink';
diff --git a/packages/insomnia-app/app/sync/git/system-error.ts b/packages/insomnia-app/app/sync/git/system-error.ts
new file mode 100644
index 0000000000..0237563c22
--- /dev/null
+++ b/packages/insomnia-app/app/sync/git/system-error.ts
@@ -0,0 +1,46 @@
+interface SystemErrorConstructor {
+  /** The string error code */
+  code: 'EBADF' | 'ENOTEMPTY' | 'EEXIST' | 'ENOENT' | 'ENOTDIR' | 'EISDIR';
+
+  /** The system-provided error number */
+  errno: -9 | -66 | -17 | -2 | -20 | -21;
+
+  message: string;
+
+  /** If present, the file path when reporting a file system error */
+  path: string;
+
+  /** The name of the system call that triggered the error */
+  syscall: 'write' | 'rmdir' | 'open' | 'scandir';
+}
+
+/**
+ * This is basically Node's SystemError, which Node (intentionally) does not expose to prevent people from doing... exactly what we're doing with it (which is throw a SystemError even though we're not System).
+ * see https://nodejs.org/api/errors.html#errors_class_systemerror
+ */
+export class SystemError extends Error {
+  code: SystemErrorConstructor['code'];
+  errno: SystemErrorConstructor['errno'];
+  path: SystemErrorConstructor['path'];
+  syscall: SystemErrorConstructor['syscall'];
+
+  constructor({
+    code,
+    errno,
+    message,
+    path,
+    syscall,
+  }: SystemErrorConstructor) {
+    super(message);
+
+    const error = new Error(message);
+    this.message = error.message;
+    this.name = error.name;
+    this.stack = error.stack;
+
+    this.code = code;
+    this.errno = errno;
+    this.path = path;
+    this.syscall = syscall;
+  }
+}
diff --git a/packages/insomnia-app/app/sync/git/utils.js b/packages/insomnia-app/app/sync/git/utils.ts
similarity index 57%
rename from packages/insomnia-app/app/sync/git/utils.js
rename to packages/insomnia-app/app/sync/git/utils.ts
index 2518d8d81b..3ebdaa382a 100644
--- a/packages/insomnia-app/app/sync/git/utils.js
+++ b/packages/insomnia-app/app/sync/git/utils.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { GitCredentials } from './git-vcs';
 
 export const translateSSHtoHTTP = (url: string) => {
@@ -23,14 +22,19 @@ const onAuthSuccess = (message: string) => {
   console.log(`[git-event] Auth Success: ${message}`);
 };
 
-const onAuth = (credentials: GitCredentials = {}) => () => ({
+// @ts-expect-error -- TSCONVERSION this needs to be handled better if credentials is undefined or which union type
+const onAuth = (credentials?: GitCredentials = {}) => () => ({
   username: credentials.username,
+// @ts-expect-error -- TSCONVERSION this needs to be handled better if credentials is undefined or which union type
   password: credentials.password || credentials.token,
 });
 
-export const gitCallbacks = (credentials?: GitCredentials) => ({
+export const gitCallbacks = (credentials?: GitCredentials | null) => ({
   onMessage,
   onAuthFailure,
   onAuthSuccess,
-  onAuth: onAuth(credentials),
+  onAuth: onAuth(credentials || undefined),
 });
+
+// unfortunately, as of @types/node:v14.14.32 this type is not exported so we have to hackily grab it from here.
+export type BufferEncoding = NonNullable<Parameters<typeof Buffer.from>[1]>;
diff --git a/packages/insomnia-app/app/sync/lib/__tests__/deterministicStringify.test.js b/packages/insomnia-app/app/sync/lib/__tests__/deterministicStringify.test.ts
similarity index 86%
rename from packages/insomnia-app/app/sync/lib/__tests__/deterministicStringify.test.js
rename to packages/insomnia-app/app/sync/lib/__tests__/deterministicStringify.test.ts
index 2cced0085e..5a74a72c71 100644
--- a/packages/insomnia-app/app/sync/lib/__tests__/deterministicStringify.test.js
+++ b/packages/insomnia-app/app/sync/lib/__tests__/deterministicStringify.test.ts
@@ -7,25 +7,30 @@ describe('deterministicStringify()', () => {
       a: 'a',
       b: 'b',
     });
-
     expect(result).toBe('{"a":"a","b":"b","c":"c"}');
   });
 
   it('works recursively', () => {
     const result = deterministicStringify({
-      arr: [{ b: 'b', a: 'a' }],
+      arr: [
+        {
+          b: 'b',
+          a: 'a',
+        },
+      ],
       obj: {
-        obj2: { b: 'b', a: 'a' },
+        obj2: {
+          b: 'b',
+          a: 'a',
+        },
       },
     });
-
     expect(result).toBe('{"arr":[{"a":"a","b":"b"}],"obj":{"obj2":{"a":"a","b":"b"}}}');
   });
 
   it('works with strange types', () => {
     const sDate = deterministicStringify(new Date(1541178019555));
     expect(sDate).toBe('"2018-11-02T17:00:19.555Z"');
-
     const sNull = deterministicStringify(null);
     expect(sNull).toBe('null');
   });
diff --git a/packages/insomnia-app/app/sync/lib/deterministicStringify.js b/packages/insomnia-app/app/sync/lib/deterministicStringify.ts
similarity index 83%
rename from packages/insomnia-app/app/sync/lib/deterministicStringify.js
rename to packages/insomnia-app/app/sync/lib/deterministicStringify.ts
index 661d29ea3d..27f906b9a2 100644
--- a/packages/insomnia-app/app/sync/lib/deterministicStringify.js
+++ b/packages/insomnia-app/app/sync/lib/deterministicStringify.ts
@@ -1,30 +1,34 @@
-// @flow
-
-export function deterministicStringify(value: any): string {
+export function deterministicStringify(value: any) {
   const t = Object.prototype.toString.call(value);
+
   if (t === '[object Object]') {
-    const pairs = [];
+    const pairs: Array<string> = [];
+
     for (const key of Object.keys(value).sort()) {
       const k = deterministicStringify(key);
       const v = deterministicStringify(value[key]);
+
       if (v !== '' && k !== '') {
         pairs.push(`${k}:${v}`);
       }
     }
+
     return `{${pairs.join(',')}}`;
   } else if (t === '[object Array]') {
-    const items = [];
+    const items: Array<string> = [];
+
     for (const v of value) {
       const vStr = deterministicStringify(v);
+
       if (vStr !== '') {
         items.push(vStr);
       }
     }
+
     return `[${items.join(',')}]`;
   }
 
   const str = JSON.stringify(value);
-
   // Only return valid stringifyable things
   return str === undefined ? '' : str;
 }
diff --git a/packages/insomnia-app/app/sync/store/__tests__/index.test.js b/packages/insomnia-app/app/sync/store/__tests__/index.test.ts
similarity index 69%
rename from packages/insomnia-app/app/sync/store/__tests__/index.test.js
rename to packages/insomnia-app/app/sync/store/__tests__/index.test.ts
index 7660bf7645..dfcec7b42d 100644
--- a/packages/insomnia-app/app/sync/store/__tests__/index.test.js
+++ b/packages/insomnia-app/app/sync/store/__tests__/index.test.ts
@@ -6,19 +6,20 @@ describe('store', () => {
     describe(Driver.name, () => {
       it('supports CRUD operations', async () => {
         const s = new Store(new Driver());
-
         expect(await s.hasItem('404')).toBe(false);
         expect(await s.getItem('404')).toBe(null);
-
         expect(await s.setItem('foo', 'bar')).toBe(undefined);
         expect(await s.getItem('foo')).toBe('bar');
-
         expect(await s.setItem('null', null)).toBe(undefined);
         expect(await s.getItem('null')).toBe(null);
-
-        expect(await s.setItem('obj', { foo: 'bar' })).toBe(undefined);
-        expect(await s.getItem('obj')).toEqual({ foo: 'bar' });
-
+        expect(
+          await s.setItem('obj', {
+            foo: 'bar',
+          }),
+        ).toBe(undefined);
+        expect(await s.getItem('obj')).toEqual({
+          foo: 'bar',
+        });
         expect(await s.removeItem('foo')).toBe(undefined);
         expect(await s.hasItem('foo')).toBe(false);
         expect(await s.getItem('foo')).toBe(null);
@@ -26,24 +27,25 @@ describe('store', () => {
 
       it('clears all values', async () => {
         const s = new Store(new Driver());
-
         await s.setItem('a', 'aaa');
         await s.setItem('b', 'bbb');
         await s.clear();
-
         expect(await s.hasItem('a')).toBe(false);
         expect(await s.hasItem('b')).toBe(false);
       });
 
       it('stores buffers directly', async () => {
         const s = new Store(new Driver());
-
         await s.setItem('buff', Buffer.from('{"hi": "there"}', 'utf8'));
-        await s.setItem('json', { hi: 'there' });
-
-        expect(await s.getItem('buff')).toEqual({ hi: 'there' });
-        expect(await s.getItem('json')).toEqual({ hi: 'there' });
-
+        await s.setItem('json', {
+          hi: 'there',
+        });
+        expect(await s.getItem('buff')).toEqual({
+          hi: 'there',
+        });
+        expect(await s.getItem('json')).toEqual({
+          hi: 'there',
+        });
         expect((await s._driver.getItem('buff')).toString('utf8')).toEqual('{"hi": "there"}');
         expect((await s._driver.getItem('json')).toString('utf8')).toEqual('{\n  "hi": "there"\n}');
       });
@@ -54,13 +56,16 @@ describe('store', () => {
     const s = new Store(new MemoryDriver(), [
       {
         // Just some dumb hooks to test with
-        read: (ext, buff) => Buffer.from(buff.toString('utf8').replace('WORLD', 'World')),
-        write: (ext, buff) => Buffer.from(buff.toString('utf8').replace('World', 'WORLD')),
+        read: (_ext, buff) => Buffer.from(buff.toString('utf8').replace('WORLD', 'World')),
+        write: (_ext, buff) => Buffer.from(buff.toString('utf8').replace('World', 'WORLD')),
       },
     ]);
-
-    await s.setItem('foo', { Hello: 'World!' });
+    await s.setItem('foo', {
+      Hello: 'World!',
+    });
     expect((await s._driver.getItem('foo')).toString('utf8')).toBe('{\n  "Hello": "WORLD!"\n}');
-    expect(await s.getItem('foo')).toEqual({ Hello: 'World!' });
+    expect(await s.getItem('foo')).toEqual({
+      Hello: 'World!',
+    });
   });
 });
diff --git a/packages/insomnia-app/app/sync/store/drivers/base.js b/packages/insomnia-app/app/sync/store/drivers/base.ts
similarity index 82%
rename from packages/insomnia-app/app/sync/store/drivers/base.js
rename to packages/insomnia-app/app/sync/store/drivers/base.ts
index 92586768b7..9eb41adfe1 100644
--- a/packages/insomnia-app/app/sync/store/drivers/base.js
+++ b/packages/insomnia-app/app/sync/store/drivers/base.ts
@@ -1,17 +1,9 @@
-// @flow
-
 export interface BaseDriver {
-  constructor(config: { [string]: any }): void;
-
+  new (config: Record<string, any>): void;
   hasItem(key: string): Promise<boolean>;
-
   setItem(key: string, value: Buffer): Promise<void>;
-
   getItem(key: string): Promise<Buffer | null>;
-
   removeItem(key: string): Promise<void>;
-
   keys(prefix: string, recursive: boolean): Promise<Array<string>>;
-
   clear(): Promise<void>;
 }
diff --git a/packages/insomnia-app/app/sync/store/drivers/file-system-driver.js b/packages/insomnia-app/app/sync/store/drivers/file-system-driver.ts
similarity index 80%
rename from packages/insomnia-app/app/sync/store/drivers/file-system-driver.js
rename to packages/insomnia-app/app/sync/store/drivers/file-system-driver.ts
index d5a79382e3..6b06541898 100644
--- a/packages/insomnia-app/app/sync/store/drivers/file-system-driver.js
+++ b/packages/insomnia-app/app/sync/store/drivers/file-system-driver.ts
@@ -1,9 +1,9 @@
-// @flow
 import fs from 'fs';
 import path from 'path';
 import mkdirp from 'mkdirp';
 import type { BaseDriver } from './base';
 
+// @ts-expect-error -- TSCONVERSION
 export default class FileSystemDriver implements BaseDriver {
   _directory: string;
 
@@ -12,9 +12,9 @@ export default class FileSystemDriver implements BaseDriver {
     console.log(`[FileSystemDriver] Initialized in "${this._directory}"`);
   }
 
-  async hasItem(key: string): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      fs.stat(this._getKeyPath(key), (err, result) => {
+  async hasItem(key: string) {
+    return new Promise<boolean>((resolve, reject) => {
+      fs.stat(this._getKeyPath(key), err => {
         if (err && err.code === 'ENOENT') {
           resolve(false);
         } else if (err) {
@@ -26,32 +26,33 @@ export default class FileSystemDriver implements BaseDriver {
     });
   }
 
-  setItem(key: string, value: Buffer): Promise<void> {
-    return new Promise((resolve, reject) => {
+  setItem(key: string, value: Buffer) {
+    return new Promise<void>((resolve, reject) => {
       const finalPath = this._getKeyPath(key);
 
       // Temp path contains randomness to avoid race-condition collisions. This
       // doesn't actually avoid race conditions but at least it won't fail.
       const tmpPath = `${finalPath}.${Math.random()}.tmp`;
-
       // This method implements atomic writes by first writing to a temporary
       // file (non-atomic) then renaming the file to the final value (atomic)
       fs.writeFile(tmpPath, value, 'utf8', err => {
         if (err) {
           return reject(err);
         }
+
         fs.rename(tmpPath, finalPath, err => {
           if (err) {
             return reject(err);
           }
+
           resolve();
         });
       });
     });
   }
 
-  getItem(key: string): Promise<Buffer | null> {
-    return new Promise((resolve, reject) => {
+  getItem(key: string) {
+    return new Promise<Buffer | null>((resolve, reject) => {
       fs.readFile(this._getKeyPath(key), (err, data) => {
         if (err && err.code === 'ENOENT') {
           resolve(null);
@@ -64,8 +65,8 @@ export default class FileSystemDriver implements BaseDriver {
     });
   }
 
-  removeItem(key: string): Promise<void> {
-    return new Promise((resolve, reject) => {
+  removeItem(key: string) {
+    return new Promise<void>((resolve, reject) => {
       fs.unlink(this._getKeyPath(key), err => {
         if (err && err.code === 'ENOENT') {
           resolve();
@@ -78,8 +79,8 @@ export default class FileSystemDriver implements BaseDriver {
     });
   }
 
-  clear(): Promise<void> {
-    return new Promise((resolve, reject) => {
+  clear() {
+    return new Promise<void>((resolve, reject) => {
       fs.readdir(this._directory, (err, names) => {
         if (err) {
           return reject(err);
@@ -94,11 +95,12 @@ export default class FileSystemDriver implements BaseDriver {
     });
   }
 
-  async keys(prefix: string, recursive: boolean): Promise<Array<string>> {
+  async keys(prefix: string, recursive: boolean) {
     const next = dir => {
-      return new Promise(async (resolve, reject) => {
+      return new Promise<Array<string>>(async (resolve, reject) => {
         let keys: Array<string> = [];
-        let names = [];
+        let names: Array<string> = [];
+
         try {
           names = fs.readdirSync(dir);
         } catch (err) {
@@ -115,6 +117,7 @@ export default class FileSystemDriver implements BaseDriver {
 
           const p = path.join(dir, name);
           const isDir = fs.statSync(p).isDirectory();
+
           if (isDir && recursive) {
             const more = await next(p);
             keys = [...keys, ...more];
@@ -130,8 +133,8 @@ export default class FileSystemDriver implements BaseDriver {
     };
 
     const rawKeys = await next(this._getKeyPath(prefix));
+    const keys: Array<string> = [];
 
-    const keys = [];
     for (const rawKey of rawKeys) {
       keys.push(rawKey.substring(this._directory.length));
     }
@@ -139,12 +142,10 @@ export default class FileSystemDriver implements BaseDriver {
     return keys;
   }
 
-  _getKeyPath(key: string): string {
+  _getKeyPath(key: string) {
     const p = path.join(this._directory, key);
-
     // Create base directory
     mkdirp.sync(path.dirname(p));
-
     return p;
   }
 }
diff --git a/packages/insomnia-app/app/sync/store/drivers/memory-driver.js b/packages/insomnia-app/app/sync/store/drivers/memory-driver.ts
similarity index 66%
rename from packages/insomnia-app/app/sync/store/drivers/memory-driver.js
rename to packages/insomnia-app/app/sync/store/drivers/memory-driver.ts
index b083c6d631..817905ee8a 100644
--- a/packages/insomnia-app/app/sync/store/drivers/memory-driver.js
+++ b/packages/insomnia-app/app/sync/store/drivers/memory-driver.ts
@@ -1,24 +1,23 @@
-// @flow
-
 import type { BaseDriver } from './base';
 
+// @ts-expect-error -- TSCONVERSION
 export default class MemoryDriver implements BaseDriver {
-  _db: { [string]: Buffer };
+  _db: Record<string, Buffer>;
 
   constructor() {
     this._init();
   }
 
-  async hasItem(key: string): Promise<boolean> {
+  async hasItem(key: string) {
     return this._db[String(key)] instanceof Buffer;
   }
 
-  async setItem(key: string, value: Buffer): Promise<void> {
+  async setItem(key: string, value: Buffer) {
     this._db[String(key)] = value;
   }
 
-  async getItem(key: string): Promise<Buffer | null> {
-    let value = null;
+  async getItem(key: string) {
+    let value: Buffer | null = null;
 
     if (await this.hasItem(key)) {
       value = this._db[key];
@@ -27,16 +26,16 @@ export default class MemoryDriver implements BaseDriver {
     return value;
   }
 
-  async removeItem(key: string): Promise<void> {
+  async removeItem(key: string) {
     delete this._db[String(key)];
   }
 
-  async clear(): Promise<void> {
+  async clear() {
     this._init();
   }
 
-  async keys(prefix: string, recursive: boolean): Promise<Array<string>> {
-    const keys = [];
+  async keys(prefix: string, recursive: boolean) {
+    const keys: Array<string> = [];
     const baseLevels = prefix.split('/').length;
 
     for (const key of Object.keys(this._db)) {
diff --git a/packages/insomnia-app/app/sync/store/hooks/__tests__/compress.test.js b/packages/insomnia-app/app/sync/store/hooks/__tests__/compress.test.ts
similarity index 100%
rename from packages/insomnia-app/app/sync/store/hooks/__tests__/compress.test.js
rename to packages/insomnia-app/app/sync/store/hooks/__tests__/compress.test.ts
diff --git a/packages/insomnia-app/app/sync/store/hooks/compress.js b/packages/insomnia-app/app/sync/store/hooks/compress.ts
similarity index 90%
rename from packages/insomnia-app/app/sync/store/hooks/compress.js
rename to packages/insomnia-app/app/sync/store/hooks/compress.ts
index 1d70d92c4e..8cde360fd4 100644
--- a/packages/insomnia-app/app/sync/store/hooks/compress.js
+++ b/packages/insomnia-app/app/sync/store/hooks/compress.ts
@@ -1,8 +1,7 @@
-// @flow
 import type { HookFn } from '../index';
 import zlib from 'zlib';
 
-const read: HookFn = async function read(extension: string, value: Buffer): Promise<Buffer> {
+const read: HookFn = async function read(extension: string, value: Buffer) {
   if (extension) {
     return value;
   }
@@ -18,7 +17,7 @@ const read: HookFn = async function read(extension: string, value: Buffer): Prom
   });
 };
 
-const write: HookFn = async function read(extension: string, value: Buffer): Promise<Buffer> {
+const write: HookFn = async function read(extension: string, value: Buffer) {
   if (extension) {
     return value;
   }
diff --git a/packages/insomnia-app/app/sync/store/index.js b/packages/insomnia-app/app/sync/store/index.ts
similarity index 81%
rename from packages/insomnia-app/app/sync/store/index.js
rename to packages/insomnia-app/app/sync/store/index.ts
index a7cecadb50..4339c015f8 100644
--- a/packages/insomnia-app/app/sync/store/index.js
+++ b/packages/insomnia-app/app/sync/store/index.ts
@@ -1,12 +1,15 @@
-// @flow
-
 import path from 'path';
 import type { BaseDriver } from './drivers/base';
 
 // Can't really make this any more specific unfortunately
 type JSONValue = any;
+
 export type HookFn = (extension: string, value: Buffer) => Promise<Buffer>;
-export type Hook = { read: HookFn, write: HookFn };
+
+export interface Hook {
+  read: HookFn;
+  write: HookFn;
+}
 
 export default class Store {
   _driver: BaseDriver;
@@ -17,13 +20,14 @@ export default class Store {
     this._hooks = hooks || [];
   }
 
-  async hasItem(key: string): Promise<boolean> {
+  async hasItem(key: string) {
     return this._driver.hasItem(key);
   }
 
-  async setItem(key: string, value: JSONValue | Buffer): Promise<void> {
+  async setItem(key: string, value: JSONValue | Buffer) {
     const ext = path.extname(key);
     let serializedValue;
+
     try {
       serializedValue = await this._serialize(ext, value);
     } catch (err) {
@@ -33,19 +37,20 @@ export default class Store {
     return this._driver.setItem(key, serializedValue);
   }
 
-  async setItemRaw(key: string, value: Buffer): Promise<void> {
+  async setItemRaw(key: string, value: Buffer) {
     return this._driver.setItem(key, value);
   }
 
   async getItem(key: string): Promise<JSONValue | null> {
     const rawValue = await this.getItemRaw(key);
+
     if (rawValue === null) {
       return null;
     }
 
     const ext = path.extname(key);
-
     let value;
+
     try {
       // Without the `await` here, the catch won't get called
       value = await this._deserialize(ext, rawValue);
@@ -61,19 +66,19 @@ export default class Store {
     return this._driver.getItem(key);
   }
 
-  async removeItem(key: string): Promise<void> {
+  async removeItem(key: string) {
     return this._driver.removeItem(key);
   }
 
-  async keys(prefix: string, recursive: boolean = true): Promise<Array<string>> {
+  async keys(prefix: string, recursive = true) {
     return this._driver.keys(prefix, recursive);
   }
 
-  async clear(): Promise<void> {
+  async clear() {
     return this._driver.clear();
   }
 
-  async _serialize(ext: string, raw: JSONValue | Buffer): Promise<Buffer> {
+  async _serialize(ext: string, raw: JSONValue | Buffer) {
     let buff = raw instanceof Buffer ? raw : Buffer.from(JSON.stringify(raw, null, 2), 'utf8');
 
     for (const hook of this._hooks) {
diff --git a/packages/insomnia-app/app/sync/types.js b/packages/insomnia-app/app/sync/types.js
deleted file mode 100644
index 6beb6f7c6f..0000000000
--- a/packages/insomnia-app/app/sync/types.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// @flow
-
-export type Team = {
-  id: string,
-  name: string,
-};
-
-export type Project = {
-  id: string,
-  name: string,
-  rootDocumentId: string,
-};
-
-export type DocumentKey = string;
-export type BlobId = string;
-
-export type Head = {|
-  branch: string,
-|};
-
-export type SnapshotStateEntry = {|
-  key: DocumentKey,
-  blob: BlobId,
-  name: string,
-|};
-
-export type SnapshotState = Array<SnapshotStateEntry>;
-export type SnapshotStateMap = { [DocumentKey]: SnapshotStateEntry };
-export type SnapshotId = string;
-
-export type Snapshot = {|
-  id: SnapshotId,
-  created: Date,
-  parent: string,
-  author: string,
-  name: string,
-  description: string,
-  state: Array<SnapshotStateEntry>,
-
-  // Only exists in Snapshots that are pulled from the server
-  authorAccount?: {
-    firstName: string,
-    lastName: string,
-    email: string,
-  },
-|};
-
-export type Branch = {|
-  name: string,
-  created: Date,
-  modified: Date,
-  snapshots: Array<string>,
-|};
-
-export type StageEntryDelete = {|
-  deleted: true,
-  key: string,
-  name: string,
-  blobId: string,
-|};
-
-export type StageEntryAdd = {|
-  added: true,
-  key: string,
-  name: string,
-  blobId: string,
-  blobContent: string,
-|};
-
-export type StageEntryModify = {|
-  modified: true,
-  key: string,
-  name: string,
-  blobId: string,
-  blobContent: string,
-|};
-
-export type StageEntry = StageEntryDelete | StageEntryAdd | StageEntryModify;
-
-export type MergeConflict = {|
-  name: string,
-  key: DocumentKey,
-  message: string,
-  mineBlob: BlobId | null,
-  theirsBlob: BlobId | null,
-  choose: BlobId | null,
-|};
-
-export type Stage = {
-  [DocumentKey]: StageEntry,
-};
-
-export type StatusCandidate = {|
-  key: DocumentKey,
-  name: string,
-  document: Object,
-|};
-
-export type StatusCandidateMap = { [DocumentKey]: StatusCandidate };
-
-export type Status = {|
-  key: string,
-  stage: Stage,
-  unstaged: {
-    [DocumentKey]: StageEntry,
-  },
-|};
diff --git a/packages/insomnia-app/app/sync/types.ts b/packages/insomnia-app/app/sync/types.ts
new file mode 100644
index 0000000000..ee7d58bbfd
--- /dev/null
+++ b/packages/insomnia-app/app/sync/types.ts
@@ -0,0 +1,104 @@
+
+export interface Team {
+  id: string;
+  name: string;
+}
+
+export interface Project {
+  id: string;
+  name: string;
+  rootDocumentId: string;
+}
+
+export type DocumentKey = string;
+
+export type BlobId = string;
+
+export interface Head {
+  branch: string;
+}
+
+export interface SnapshotStateEntry {
+  key: DocumentKey;
+  blob: BlobId;
+  name: string;
+}
+
+export type SnapshotState = Array<SnapshotStateEntry>;
+
+export type SnapshotStateMap = Record<DocumentKey, SnapshotStateEntry>;
+
+export type SnapshotId = string;
+
+export interface Snapshot {
+  id: SnapshotId;
+  created: Date;
+  parent: string;
+  author: string;
+  name: string;
+  description: string;
+  state: Array<SnapshotStateEntry>;
+  // Only exists in Snapshots that are pulled from the server
+  authorAccount?: {
+    firstName: string;
+    lastName: string;
+    email: string;
+  };
+}
+
+export interface Branch {
+  name: string;
+  created: Date;
+  modified: Date;
+  snapshots: Array<string>;
+}
+
+export interface StageEntryDelete {
+  deleted: true;
+  key: string;
+  name: string;
+  blobId: string;
+}
+
+export interface StageEntryAdd {
+  added: true;
+  key: string;
+  name: string;
+  blobId: string;
+  blobContent: string;
+}
+
+export interface StageEntryModify {
+  modified: true;
+  key: string;
+  name: string;
+  blobId: string;
+  blobContent: string;
+}
+
+export type StageEntry = StageEntryDelete | StageEntryAdd | StageEntryModify;
+
+export interface MergeConflict {
+  name: string;
+  key: DocumentKey;
+  message: string;
+  mineBlob: BlobId | null;
+  theirsBlob: BlobId | null;
+  choose: BlobId | null;
+}
+
+export type Stage = Record<DocumentKey, StageEntry>;
+
+export interface StatusCandidate {
+  key: DocumentKey;
+  name: string;
+  document: Record<string, any>;
+}
+
+export type StatusCandidateMap = Record<DocumentKey, StatusCandidate>;
+
+export interface Status {
+  key: string;
+  stage: Stage;
+  unstaged: Record<DocumentKey, StageEntry>;
+}
diff --git a/packages/insomnia-app/app/sync/vcs/__tests__/index.test.js b/packages/insomnia-app/app/sync/vcs/__tests__/index.test.ts
similarity index 77%
rename from packages/insomnia-app/app/sync/vcs/__tests__/index.test.js
rename to packages/insomnia-app/app/sync/vcs/__tests__/index.test.ts
index 32eda93802..ac881e06b8 100644
--- a/packages/insomnia-app/app/sync/vcs/__tests__/index.test.js
+++ b/packages/insomnia-app/app/sync/vcs/__tests__/index.test.ts
@@ -4,7 +4,9 @@ import { describeChanges } from '../util';
 import { globalBeforeEach } from '../../../__jest__/before-each';
 
 function newDoc(id) {
-  return { id };
+  return {
+    id,
+  };
 }
 
 async function vcs(branch) {
@@ -39,7 +41,6 @@ describe('VCS', () => {
         ],
         {},
       );
-
       expect(status).toEqual({
         key: '0cffac636df909fb4f8e9a25570e5012846b46fd',
         stage: {},
@@ -64,19 +65,28 @@ describe('VCS', () => {
 
     it('returns add/modify/delete operations', async () => {
       const v = await vcs('master');
-
       const status1 = await v.status(
         [
-          { key: 'a', name: 'A', document: newDoc('aaa') },
-          { key: 'b', name: 'B', document: newDoc('bbb') },
-          { key: 'c', name: 'C', document: newDoc('ccc') },
+          {
+            key: 'a',
+            name: 'A',
+            document: newDoc('aaa'),
+          },
+          {
+            key: 'b',
+            name: 'B',
+            document: newDoc('bbb'),
+          },
+          {
+            key: 'c',
+            name: 'C',
+            document: newDoc('ccc'),
+          },
         ],
         {},
       );
       expect(Object.keys(status1.unstaged)).toEqual(['a', 'b', 'c']);
-
       await v.stage(status1.stage, [status1.unstaged.a, status1.unstaged.b, status1.unstaged.c]);
-
       await v.takeSnapshot(status1.stage, 'Add a/b/c');
       const history = await v.getHistory();
       expect(history.length).toBe(1);
@@ -107,18 +117,32 @@ describe('VCS', () => {
           ],
         },
       ]);
-
       // Should get every operation type
       const status = await v.status(
         [
-          { key: 'notA', name: 'Not A', document: newDoc('aaa') },
-          { key: 'b', name: 'B', document: newDoc('bbb') },
-          { key: 'c', name: 'C', document: newDoc('modified') },
-          { key: 'd', name: 'D', document: newDoc('ddd') },
+          {
+            key: 'notA',
+            name: 'Not A',
+            document: newDoc('aaa'),
+          },
+          {
+            key: 'b',
+            name: 'B',
+            document: newDoc('bbb'),
+          },
+          {
+            key: 'c',
+            name: 'C',
+            document: newDoc('modified'),
+          },
+          {
+            key: 'd',
+            name: 'D',
+            document: newDoc('ddd'),
+          },
         ],
         {},
       );
-
       expect(status).toEqual({
         key: '80834d815272c73192291477f70dce8a7c8bc424',
         stage: {},
@@ -152,24 +176,37 @@ describe('VCS', () => {
           },
         },
       });
-
       const newStage = await v.stage(status.stage, [
         status.unstaged.a,
         status.unstaged.notA,
         status.unstaged.c,
         status.unstaged.d,
       ]);
-
       const status2 = await v.status(
         [
-          { key: 'notA', name: 'Not A', document: newDoc('aaa') },
-          { key: 'b', name: 'B', document: newDoc('bbb') },
-          { key: 'c', name: 'C', document: newDoc('modified') },
-          { key: 'd', name: 'D', document: newDoc('ddd') },
+          {
+            key: 'notA',
+            name: 'Not A',
+            document: newDoc('aaa'),
+          },
+          {
+            key: 'b',
+            name: 'B',
+            document: newDoc('bbb'),
+          },
+          {
+            key: 'c',
+            name: 'C',
+            document: newDoc('modified'),
+          },
+          {
+            key: 'd',
+            name: 'D',
+            document: newDoc('ddd'),
+          },
         ],
         newStage,
       );
-
       expect(status2).toEqual({
         key: '4a0e8fd9ee30acb9c8ff4eb2f73e413ff7175a8c',
         stage: {
@@ -207,24 +244,37 @@ describe('VCS', () => {
 
     it('can appear both staged and unstaged', async () => {
       const v = await vcs('master');
-
       const status = await v.status(
         [
-          { key: 'a', name: 'A', document: newDoc('aaa') },
-          { key: 'b', name: 'B', document: newDoc('bbb') },
+          {
+            key: 'a',
+            name: 'A',
+            document: newDoc('aaa'),
+          },
+          {
+            key: 'b',
+            name: 'B',
+            document: newDoc('bbb'),
+          },
         ],
         {},
       );
       const stage = await v.stage(status.stage, [status.unstaged.a]);
-
       const status2 = await v.status(
         [
-          { key: 'a', name: 'A', document: newDoc('modified') },
-          { key: 'b', name: 'B', document: newDoc('bbb') },
+          {
+            key: 'a',
+            name: 'A',
+            document: newDoc('modified'),
+          },
+          {
+            key: 'b',
+            name: 'B',
+            document: newDoc('bbb'),
+          },
         ],
         stage,
       );
-
       expect(status2).toEqual({
         key: '886337817e3c1ff7df3fcfa7c30192eb854b45cf',
         stage: {
@@ -257,12 +307,28 @@ describe('VCS', () => {
 
     it('should not show committed entities', async () => {
       const v = await vcs('master');
-
-      const status = await v.status([{ key: 'foo', name: 'Foo', document: newDoc('bar') }], {});
+      const status = await v.status(
+        [
+          {
+            key: 'foo',
+            name: 'Foo',
+            document: newDoc('bar'),
+          },
+        ],
+        {},
+      );
       const stage2 = await v.stage(status.stage, [status.unstaged.foo]);
       await v.takeSnapshot(stage2, 'Add foo');
-
-      const status2 = await v.status([{ key: 'foo', name: 'Foo', document: newDoc('bar') }], {});
+      const status2 = await v.status(
+        [
+          {
+            key: 'foo',
+            name: 'Foo',
+            document: newDoc('bar'),
+          },
+        ],
+        {},
+      );
       expect(status2).toEqual({
         key: 'ca455b43c1e992812d81032e79e037a8db85fa8b',
         stage: {},
@@ -274,15 +340,21 @@ describe('VCS', () => {
   describe('stage()', () => {
     it('stages entity', async () => {
       const v = await vcs('master');
-
       const status = await v.status(
         [
-          { key: 'foo', name: 'Foo', document: newDoc('bar') },
-          { key: 'baz', name: 'Baz', document: newDoc('qux') },
+          {
+            key: 'foo',
+            name: 'Foo',
+            document: newDoc('bar'),
+          },
+          {
+            key: 'baz',
+            name: 'Baz',
+            document: newDoc('qux'),
+          },
         ],
         {},
       );
-
       const stage = await v.stage(status.stage, [status.unstaged.foo]);
       expect(stage).toEqual({
         foo: {
@@ -293,11 +365,18 @@ describe('VCS', () => {
           added: true,
         },
       });
-
       const status2 = await v.status(
         [
-          { key: 'foo', name: 'Foo', document: newDoc('bar') },
-          { key: 'baz', name: 'Baz', document: newDoc('qux') },
+          {
+            key: 'foo',
+            name: 'Foo',
+            document: newDoc('bar'),
+          },
+          {
+            key: 'baz',
+            name: 'Baz',
+            document: newDoc('qux'),
+          },
         ],
         stage,
       );
@@ -328,11 +407,18 @@ describe('VCS', () => {
   describe('takeSnapshot()', () => {
     it('commits basic entity', async () => {
       const v = await vcs('master');
-
-      const status = await v.status([{ key: 'foo', name: 'Foo', document: newDoc('bar') }], {});
+      const status = await v.status(
+        [
+          {
+            key: 'foo',
+            name: 'Foo',
+            document: newDoc('bar'),
+          },
+        ],
+        {},
+      );
       const stage = await v.stage(status.stage, [status.unstaged.foo]);
       await v.takeSnapshot(stage, 'Add foo');
-
       const history = await v.getHistory();
       expect(history).toEqual([
         {
@@ -355,11 +441,18 @@ describe('VCS', () => {
 
     it('commits deleted entity', async () => {
       const v = await vcs('master');
-
-      const status = await v.status([{ key: 'foo', name: 'Foo', document: newDoc('bar') }], {});
+      const status = await v.status(
+        [
+          {
+            key: 'foo',
+            name: 'Foo',
+            document: newDoc('bar'),
+          },
+        ],
+        {},
+      );
       const stage = await v.stage(status.stage, [status.unstaged.foo]);
       await v.takeSnapshot(stage, 'Add foo');
-
       const history = await v.getHistory();
       expect(history).toEqual([
         {
@@ -378,12 +471,10 @@ describe('VCS', () => {
           ],
         },
       ]);
-
       const status2 = await v.status([], {});
       const stage2 = await v.stage(status2.stage, [status2.unstaged.foo]);
       await v.takeSnapshot(stage2, 'Delete foo');
       const history2 = await v.getHistory();
-
       expect(history2).toEqual([
         {
           id: '365c4341f6d57e18994df2429387b78f2c9a31cb',
@@ -416,10 +507,8 @@ describe('VCS', () => {
   describe('getBranches()', () => {
     it('lists branches', async () => {
       const v = await vcs('master');
-
       await v.checkout([], 'branch-1');
       await v.checkout([], 'branch-2');
-
       const branches = await v.getBranches();
       expect(branches).toEqual(['master', 'branch-1', 'branch-2']);
     });
@@ -428,8 +517,8 @@ describe('VCS', () => {
   describe('removeBranch()', () => {
     it('cannot remove empty branch', async () => {
       const v = await vcs('master');
-
       let didError = false;
+
       try {
         await v.removeBranch();
       } catch (err) {
@@ -441,8 +530,8 @@ describe('VCS', () => {
 
     it('cannot remove current branch', async () => {
       const v = await vcs('master');
-
       let didError = false;
+
       try {
         await v.removeBranch('master');
       } catch (err) {
@@ -454,16 +543,22 @@ describe('VCS', () => {
 
     it('remove branch', async () => {
       const v = await vcs('master');
-
       // Add something to master
-      const status1 = await v.status([{ key: 'foo', name: 'Foo', document: newDoc('bar') }], {});
+      const status1 = await v.status(
+        [
+          {
+            key: 'foo',
+            name: 'Foo',
+            document: newDoc('bar'),
+          },
+        ],
+        {},
+      );
       const stage1 = await v.stage(status1.stage, [status1.unstaged.foo]);
       await v.takeSnapshot(stage1, 'Add foo');
-
       // Checkout branch
       await v.checkout([], 'new-branch');
       expect(await v.getBranches()).toEqual(['master', 'new-branch']);
-
       // Back to master and delete other branch
       await v.checkout([], 'master');
       await v.removeBranch('new-branch');
@@ -474,12 +569,19 @@ describe('VCS', () => {
   describe('fork()', () => {
     it('forks to a new branch', async () => {
       const v = await vcs('master');
-
       // Add something to master
-      const status1 = await v.status([{ key: 'foo', name: 'Foo', document: newDoc('bar') }], {});
+      const status1 = await v.status(
+        [
+          {
+            key: 'foo',
+            name: 'Foo',
+            document: newDoc('bar'),
+          },
+        ],
+        {},
+      );
       const stage1 = await v.stage(status1.stage, [status1.unstaged.foo]);
       await v.takeSnapshot(stage1, 'Add foo');
-
       // Checkout branch
       await v.fork('new-branch');
       await v.checkout([], 'new-branch');
@@ -508,28 +610,50 @@ describe('VCS', () => {
   describe('merge()', () => {
     it('performs fast-forward merge', async () => {
       const v = await vcs('master');
-
       const status1 = await v.status(
         [
-          { key: 'a', name: 'A', document: newDoc('aaa') },
-          { key: 'b', name: 'B', document: newDoc('bbb') },
+          {
+            key: 'a',
+            name: 'A',
+            document: newDoc('aaa'),
+          },
+          {
+            key: 'b',
+            name: 'B',
+            document: newDoc('bbb'),
+          },
         ],
         {},
       );
       const stage1 = await v.stage(status1.stage, [status1.unstaged.a, status1.unstaged.b]);
       await v.takeSnapshot(stage1, 'Add A and B');
       expect((await v.getHistory())[0].state).toEqual([
-        expect.objectContaining({ key: 'a' }),
-        expect.objectContaining({ key: 'b' }),
+        expect.objectContaining({
+          key: 'a',
+        }),
+        expect.objectContaining({
+          key: 'b',
+        }),
       ]);
-
       await v.fork('feature-a');
       await v.checkout([], 'feature-a');
       const status2 = await v.status(
         [
-          { key: 'a', name: 'A', document: newDoc('aaa') },
-          { key: 'b', name: 'B', document: newDoc('bbbbbbb') },
-          { key: 'c', name: 'C', document: newDoc('ccc') },
+          {
+            key: 'a',
+            name: 'A',
+            document: newDoc('aaa'),
+          },
+          {
+            key: 'b',
+            name: 'B',
+            document: newDoc('bbbbbbb'),
+          },
+          {
+            key: 'c',
+            name: 'C',
+            document: newDoc('ccc'),
+          },
         ],
         status1.stage,
       );
@@ -537,20 +661,33 @@ describe('VCS', () => {
       await v.takeSnapshot(stage2, 'Add C, modify B');
       expect((await v.getHistory())[1].state).toEqual(
         expect.arrayContaining([
-          expect.objectContaining({ key: 'a' }),
-          expect.objectContaining({ key: 'b' }),
-          expect.objectContaining({ key: 'c' }),
+          expect.objectContaining({
+            key: 'a',
+          }),
+          expect.objectContaining({
+            key: 'b',
+          }),
+          expect.objectContaining({
+            key: 'c',
+          }),
         ]),
       );
     });
 
     it('merges even if no common root', async () => {
       const v = await vcs('master');
-
       const status1 = await v.status(
         [
-          { key: 'a', name: 'A', document: newDoc('aaa') },
-          { key: 'b', name: 'B', document: newDoc('bbb') },
+          {
+            key: 'a',
+            name: 'A',
+            document: newDoc('aaa'),
+          },
+          {
+            key: 'b',
+            name: 'B',
+            document: newDoc('bbb'),
+          },
         ],
         {},
       );
@@ -560,10 +697,18 @@ describe('VCS', () => {
 
     it('does something', async () => {
       const v = await vcs('master');
-
       // Add a file to master
       expect(await v.getBranch()).toBe('master');
-      const status1 = await v.status([{ key: 'a', name: 'A', document: newDoc('aaa') }], {});
+      const status1 = await v.status(
+        [
+          {
+            key: 'a',
+            name: 'A',
+            document: newDoc('aaa'),
+          },
+        ],
+        {},
+      );
       const stage = await v.stage(status1.stage, [status1.unstaged.a]);
       await v.takeSnapshot(stage, 'Add A');
       expect(await v.getHistory()).toEqual([
@@ -583,13 +728,20 @@ describe('VCS', () => {
           ],
         },
       ]);
-
       // Checkout new branch and add file
       await v.fork('new-branch');
       await v.checkout([], 'new-branch');
       expect(await v.getBranch()).toBe('new-branch');
-
-      const status2 = await v.status([{ key: 'b', name: 'B', document: newDoc('bbb') }], {});
+      const status2 = await v.status(
+        [
+          {
+            key: 'b',
+            name: 'B',
+            document: newDoc('bbb'),
+          },
+        ],
+        {},
+      );
       const stage2 = await v.stage(status2.stage, [status2.unstaged.b]);
       await v.takeSnapshot(stage2, 'Add B');
       expect(await v.getHistory()).toEqual([
@@ -629,7 +781,6 @@ describe('VCS', () => {
           ],
         },
       ]);
-
       // Merge new branch back into master
       await v.checkout([], 'master');
       expect(await v.getBranch()).toBe('master');
@@ -676,20 +827,48 @@ describe('VCS', () => {
 
   describe('describeChanges()', () => {
     it('works with same object structure', async () => {
-      const a = { foo: 'bar', nested: { baz: 10 } };
-      const b = { foo: 'baz', nested: { baz: 11 } };
+      const a = {
+        foo: 'bar',
+        nested: {
+          baz: 10,
+        },
+      };
+      const b = {
+        foo: 'baz',
+        nested: {
+          baz: 11,
+        },
+      };
       expect(describeChanges(a, b)).toEqual(['foo', 'nested']);
     });
 
     it('ignores modified key', () => {
-      const a = { foo: 'bar', nested: { baz: 10 }, modified: 10 };
-      const b = { foo: 'baz', nested: { baz: 11 }, modified: 12 };
+      const a = {
+        foo: 'bar',
+        nested: {
+          baz: 10,
+        },
+        modified: 10,
+      };
+      const b = {
+        foo: 'baz',
+        nested: {
+          baz: 11,
+        },
+        modified: 12,
+      };
       expect(describeChanges(a, b)).toEqual(['foo', 'nested']);
     });
 
     it('skips invalid values', () => {
       const a = null;
-      const b = { foo: 'baz', nested: { baz: 11 }, modified: 12 };
+      const b = {
+        foo: 'baz',
+        nested: {
+          baz: 11,
+        },
+        modified: 12,
+      };
       expect(describeChanges(a, b)).toEqual([]);
     });
   });
@@ -698,16 +877,26 @@ describe('VCS', () => {
     let v;
     beforeEach(async () => {
       v = await vcs('master');
-
       const status1 = await v.status(
-        [{ key: 'foo', name: 'Foo', document: newDoc('foobar1') }],
+        [
+          {
+            key: 'foo',
+            name: 'Foo',
+            document: newDoc('foobar1'),
+          },
+        ],
         {},
       );
       const stage1 = await v.stage(status1.stage, [status1.unstaged.foo]);
       await v.takeSnapshot(stage1, 'Add foo');
-
       const status2 = await v.status(
-        [{ key: 'bar', name: 'Bar', document: newDoc('foobar2') }],
+        [
+          {
+            key: 'bar',
+            name: 'Bar',
+            document: newDoc('foobar2'),
+          },
+        ],
         {},
       );
       const stage2 = await v.stage(status2.stage, [status2.unstaged.bar]);
@@ -757,16 +946,12 @@ describe('VCS', () => {
 
     it('returns recent history', async () => {
       const [s1, s2, ...others] = await v.getHistory();
-
       // There should only be two items
       expect(others).toHaveLength(0);
-
       // Get the latest item
       expect(await v.getHistory(1)).toStrictEqual([s2]);
-
       // Get the last 2 items
       expect(await v.getHistory(2)).toStrictEqual([s1, s2]);
-
       // Get the last 3 items (only 2 exist)
       expect(await v.getHistory(3)).toStrictEqual([s1, s2]);
     });
diff --git a/packages/insomnia-app/app/sync/vcs/__tests__/paths.test.js b/packages/insomnia-app/app/sync/vcs/__tests__/paths.test.ts
similarity index 100%
rename from packages/insomnia-app/app/sync/vcs/__tests__/paths.test.js
rename to packages/insomnia-app/app/sync/vcs/__tests__/paths.test.ts
diff --git a/packages/insomnia-app/app/sync/vcs/__tests__/util.test.js b/packages/insomnia-app/app/sync/vcs/__tests__/util.test.ts
similarity index 82%
rename from packages/insomnia-app/app/sync/vcs/__tests__/util.test.js
rename to packages/insomnia-app/app/sync/vcs/__tests__/util.test.ts
index 6a1bb2be44..3e7056f925 100644
--- a/packages/insomnia-app/app/sync/vcs/__tests__/util.test.js
+++ b/packages/insomnia-app/app/sync/vcs/__tests__/util.test.ts
@@ -19,7 +19,6 @@ describe('util', () => {
         newStateEntry('doc_1', 'blob_1'),
         newStateEntry('doc_2', 'blob_2'),
       ]);
-
       const map = generateSnapshotStateMap(snapshot);
       expect(Object.keys(map).sort()).toEqual(['doc_1', 'doc_2']);
     });
@@ -31,7 +30,6 @@ describe('util', () => {
         newStateEntry('doc_2', 'blob_2'),
         newStateEntry('doc_2', 'blob_2'),
       ]);
-
       const map = generateSnapshotStateMap(snapshot);
       expect(Object.keys(map).sort()).toEqual(['doc_1', 'doc_2']);
     });
@@ -49,7 +47,6 @@ describe('util', () => {
         newCandidate('doc_1', 1),
         newCandidate('doc_2', 2),
       ];
-
       const map = generateCandidateMap(candidates);
       expect(Object.keys(map).sort()).toEqual(['doc_1', 'doc_2']);
     });
@@ -64,19 +61,42 @@ describe('util', () => {
         newSnapshot(1, [newStateEntry('doc_4', 'blob_4'), newStateEntry('doc_1', 'blob_1')]),
       );
       const map3 = generateSnapshotStateMap(newSnapshot(1, []));
-
       const keys = combinedMapKeys(map1, map2, map3);
       expect(keys.sort()).toEqual(['doc_1', 'doc_2', 'doc_4']);
     });
   });
 
   describe('threeWayMerge()', () => {
-    const A1 = { key: 'a', blob: 'a.1', name: '' };
-    const A2 = { key: 'a', blob: 'a.2', name: '' };
-    const A3 = { key: 'a', blob: 'a.3', name: '' };
-    const B1 = { key: 'b', blob: 'b.1', name: '' };
-    const B2 = { key: 'b', blob: 'b.2', name: '' };
-    const C1 = { key: 'c', blob: 'c.1', name: '' };
+    const A1 = {
+      key: 'a',
+      blob: 'a.1',
+      name: '',
+    };
+    const A2 = {
+      key: 'a',
+      blob: 'a.2',
+      name: '',
+    };
+    const A3 = {
+      key: 'a',
+      blob: 'a.3',
+      name: '',
+    };
+    const B1 = {
+      key: 'b',
+      blob: 'b.1',
+      name: '',
+    };
+    const B2 = {
+      key: 'b',
+      blob: 'b.2',
+      name: '',
+    };
+    const C1 = {
+      key: 'c',
+      blob: 'c.1',
+      name: '',
+    };
 
     it('does nothing with empty states', () => {
       const newState = threeWayMerge([], [], []);
@@ -140,7 +160,6 @@ describe('util', () => {
       const root = [A1];
       const trunk = [A2];
       const other = [A3];
-
       expect(threeWayMerge(root, trunk, other)).toEqual({
         conflicts: [
           {
@@ -160,7 +179,6 @@ describe('util', () => {
       const root = [A1];
       const trunk = [A1, B1];
       const other = [A1, B1];
-
       expect(threeWayMerge(root, trunk, other)).toEqual({
         conflicts: [],
         state: [A1, B1],
@@ -171,7 +189,6 @@ describe('util', () => {
       const root = [A1];
       const trunk = [A1, B1];
       const other = [A1, B2];
-
       expect(threeWayMerge(root, trunk, other)).toEqual({
         conflicts: [
           {
@@ -191,7 +208,6 @@ describe('util', () => {
       const root = [A1, B1];
       const trunk = [A1, B2];
       const other = [A1];
-
       expect(threeWayMerge(root, trunk, other)).toEqual({
         conflicts: [
           {
@@ -211,7 +227,6 @@ describe('util', () => {
       const root = [A1, B1];
       const trunk = [A1];
       const other = [A1, B2];
-
       expect(threeWayMerge(root, trunk, other)).toEqual({
         conflicts: [
           {
@@ -231,7 +246,6 @@ describe('util', () => {
       const root = [];
       const trunk = [A1, C1];
       const other = [A1, B2];
-
       expect(threeWayMerge(root, trunk, other)).toEqual({
         conflicts: [],
         state: expect.arrayContaining([A1, B2, C1]),
@@ -242,7 +256,6 @@ describe('util', () => {
       const root = [];
       const trunk = [A1];
       const other = [A2];
-
       expect(threeWayMerge(root, trunk, other)).toEqual({
         conflicts: [
           {
@@ -260,16 +273,35 @@ describe('util', () => {
   });
 
   describe('stateDelta()', () => {
-    const A1 = { key: 'a', blob: 'a.1', name: '' };
-    const A2 = { key: 'a', blob: 'a.2', name: '' };
-    const B1 = { key: 'b', blob: 'b.1', name: '' };
-    const B2 = { key: 'b', blob: 'b.2', name: '' };
-    const C1 = { key: 'c', blob: 'c.1', name: '' };
+    const A1 = {
+      key: 'a',
+      blob: 'a.1',
+      name: '',
+    };
+    const A2 = {
+      key: 'a',
+      blob: 'a.2',
+      name: '',
+    };
+    const B1 = {
+      key: 'b',
+      blob: 'b.1',
+      name: '',
+    };
+    const B2 = {
+      key: 'b',
+      blob: 'b.2',
+      name: '',
+    };
+    const C1 = {
+      key: 'c',
+      blob: 'c.1',
+      name: '',
+    };
 
     it('modifies an entry', () => {
       const base = [A1];
       const dsrd = [A2];
-
       expect(stateDelta(base, dsrd)).toEqual({
         add: [],
         update: [A2],
@@ -280,7 +312,6 @@ describe('util', () => {
     it('adds an entry', () => {
       const base = [];
       const dsrd = [B1];
-
       expect(stateDelta(base, dsrd)).toEqual({
         add: [B1],
         update: [],
@@ -291,7 +322,6 @@ describe('util', () => {
     it('deletes an entry', () => {
       const base = [A1];
       const dsrd = [];
-
       expect(stateDelta(base, dsrd)).toEqual({
         add: [],
         update: [],
@@ -302,7 +332,6 @@ describe('util', () => {
     it('complex combo', () => {
       const base = [A1, B1, C1];
       const dsrd = [B2, C1];
-
       expect(stateDelta(base, dsrd)).toEqual({
         add: [],
         update: [B2],
@@ -313,7 +342,6 @@ describe('util', () => {
     it('invalid duplicate key state', () => {
       const base = [A1, A2];
       const dsrd = [A2];
-
       expect(stateDelta(base, dsrd)).toEqual({
         add: [],
         update: [],
@@ -323,21 +351,75 @@ describe('util', () => {
   });
 
   describe('getStagable()', () => {
-    const A1 = { key: 'a', blob: '1932cc749f57a77ba4a231d62559c47ee931ee2c', name: '' };
-    const A2 = { key: 'a', blob: 'cf2ec18c2e686b4c966725f30050120d42d4b2e5', name: '' };
-    const B1 = { key: 'b', blob: '05ab2ec03c7e32eff27305b4a11c573a3843fa01', name: '' };
-    const B2 = { key: 'b', blob: 'eb157a78ebd367a004c5a32a18d6d8c18e60ce00', name: '' };
-    const C1 = { key: 'c', blob: 'db7d35b96291b823e674bf23ac59e6e116b1890e', name: '' };
-    const DA1 = { key: 'a', document: { id: 'a', v: 1 }, name: '' };
-    const DA2 = { key: 'a', document: { id: 'a', v: 2 }, name: '' };
-    const DB1 = { key: 'b', document: { id: 'b', v: 1 }, name: '' };
-    const DB2 = { key: 'b', document: { id: 'b', v: 2 }, name: '' };
-    const DC1 = { key: 'c', document: { id: 'c', v: 1 }, name: '' };
+    const A1 = {
+      key: 'a',
+      blob: '1932cc749f57a77ba4a231d62559c47ee931ee2c',
+      name: '',
+    };
+    const A2 = {
+      key: 'a',
+      blob: 'cf2ec18c2e686b4c966725f30050120d42d4b2e5',
+      name: '',
+    };
+    const B1 = {
+      key: 'b',
+      blob: '05ab2ec03c7e32eff27305b4a11c573a3843fa01',
+      name: '',
+    };
+    const B2 = {
+      key: 'b',
+      blob: 'eb157a78ebd367a004c5a32a18d6d8c18e60ce00',
+      name: '',
+    };
+    const C1 = {
+      key: 'c',
+      blob: 'db7d35b96291b823e674bf23ac59e6e116b1890e',
+      name: '',
+    };
+    const DA1 = {
+      key: 'a',
+      document: {
+        id: 'a',
+        v: 1,
+      },
+      name: '',
+    };
+    const DA2 = {
+      key: 'a',
+      document: {
+        id: 'a',
+        v: 2,
+      },
+      name: '',
+    };
+    const DB1 = {
+      key: 'b',
+      document: {
+        id: 'b',
+        v: 1,
+      },
+      name: '',
+    };
+    const DB2 = {
+      key: 'b',
+      document: {
+        id: 'b',
+        v: 2,
+      },
+      name: '',
+    };
+    const DC1 = {
+      key: 'c',
+      document: {
+        id: 'c',
+        v: 1,
+      },
+      name: '',
+    };
 
     it('works with empty state', () => {
       const state = [];
       const dsrd = [DA1];
-
       expect(getStagable(state, dsrd)).toEqual([
         {
           blobContent: '{"id":"a","v":1}',
@@ -352,14 +434,12 @@ describe('util', () => {
     it('stays the same', () => {
       const state = [A1, B1, C1];
       const dsrd = [DA1, DB1, DC1];
-
       expect(getStagable(state, dsrd)).toEqual([]);
     });
 
     it('adds a document', () => {
       const state = [A1];
       const dsrd = [DA1, DB1];
-
       expect(getStagable(state, dsrd)).toEqual([
         {
           key: 'b',
@@ -374,7 +454,6 @@ describe('util', () => {
     it('modifies a document', () => {
       const state = [B1];
       const dsrd = [DB2];
-
       expect(getStagable(state, dsrd)).toEqual([
         {
           key: 'b',
@@ -389,7 +468,6 @@ describe('util', () => {
     it('deletes a document', () => {
       const state = [B1];
       const dsrd = [];
-
       expect(getStagable(state, dsrd)).toEqual([
         {
           key: 'b',
@@ -403,7 +481,6 @@ describe('util', () => {
     it('does a lot of things', () => {
       const state = [A1, C1];
       const dsrd = [DA2, DB1];
-
       expect(getStagable(state, dsrd)).toEqual([
         {
           blobContent: '{"id":"a","v":2}',
@@ -433,28 +510,24 @@ describe('util', () => {
     it('works with empty states', () => {
       const a = newBranch([]);
       const b = newBranch([]);
-
       expect(getRootSnapshot(a, b)).toBeNull();
     });
 
     it('works with different states', () => {
       const a = newBranch(['s1', 's2']);
       const b = newBranch(['s3', 's5']);
-
       expect(getRootSnapshot(a, b)).toBeNull();
     });
 
     it('works with same states', () => {
       const a = newBranch(['s1', 's2', 's3']);
       const b = newBranch(['s1', 's2', 's3']);
-
       expect(getRootSnapshot(a, b)).toBe('s3');
     });
 
     it('works with subset', () => {
       const a = newBranch(['s1']);
       const b = newBranch(['s1', 's2', 's3']);
-
       expect(getRootSnapshot(a, b)).toBe('s1');
       expect(getRootSnapshot(b, a)).toBe('s1');
     });
@@ -462,7 +535,6 @@ describe('util', () => {
     it('works with missing middle', () => {
       const a = newBranch(['s1', 's3', 's4']);
       const b = newBranch(['s1', 's2', 's3', 's6']);
-
       expect(getRootSnapshot(a, b)).toBe('s3');
       expect(getRootSnapshot(b, a)).toBe('s3');
     });
@@ -470,20 +542,47 @@ describe('util', () => {
     it('works with missing middle', () => {
       const a = newBranch(['s1', 's3']);
       const b = newBranch(['s1', 's2', 's3']);
-
       expect(getRootSnapshot(a, b)).toBe('s3');
       expect(getRootSnapshot(b, a)).toBe('s3');
     });
   });
 
   describe('updateStateWithConflictResolutions()', () => {
-    const A1 = { key: 'a', blob: '1932cc749f57a77ba4a231d62559c47ee931ee2c', name: '' };
-    const A2 = { key: 'a', blob: 'cf2ec18c2e686b4c966725f30050120d42d4b2e5', name: '' };
-    const B1 = { key: 'b', blob: '05ab2ec03c7e32eff27305b4a11c573a3843fa01', name: '' };
-    const C1 = { key: 'c', blob: 'db7d35b96291b823e674bf23ac59e6e116b1890e', name: '' };
-    const D1 = { key: 'd', blob: 'f23ac59e6e11db7d35b96291b823e674b6b1890e', name: '' };
-    const E1 = { key: 'e', blob: '1db7d35b96291f23ac59e6e1b823e674b6b1890e', name: '' };
-    const F1 = { key: 'f', blob: '6291b823e674b6b137172d35b9f23ac59e6e190e', name: '' };
+    const A1 = {
+      key: 'a',
+      blob: '1932cc749f57a77ba4a231d62559c47ee931ee2c',
+      name: '',
+    };
+    const A2 = {
+      key: 'a',
+      blob: 'cf2ec18c2e686b4c966725f30050120d42d4b2e5',
+      name: '',
+    };
+    const B1 = {
+      key: 'b',
+      blob: '05ab2ec03c7e32eff27305b4a11c573a3843fa01',
+      name: '',
+    };
+    const C1 = {
+      key: 'c',
+      blob: 'db7d35b96291b823e674bf23ac59e6e116b1890e',
+      name: '',
+    };
+    const D1 = {
+      key: 'd',
+      blob: 'f23ac59e6e11db7d35b96291b823e674b6b1890e',
+      name: '',
+    };
+    const E1 = {
+      key: 'e',
+      blob: '1db7d35b96291f23ac59e6e1b823e674b6b1890e',
+      name: '',
+    };
+    const F1 = {
+      key: 'f',
+      blob: '6291b823e674b6b137172d35b9f23ac59e6e190e',
+      name: '',
+    };
 
     it('does it', () => {
       const state = [A1, B1, E1, F1];
@@ -517,26 +616,68 @@ describe('util', () => {
           choose: null,
         },
       ];
-
       expect(updateStateWithConflictResolutions(state, conflicts)).toEqual([A1, E1, F1, C1]);
     });
   });
 
   describe('preMergeCheck()', () => {
-    const A1 = { key: 'a', blob: '1932cc749f57a77ba4a231d62559c47ee931ee2c', name: '' };
-    const A2 = { key: 'a', blob: 'cf2ec18c2e686b4c966725f30050120d42d4b2e5', name: '' };
-    const B1 = { key: 'b', blob: '05ab2ec03c7e32eff27305b4a11c573a3843fa01', name: '' };
-    const B2 = { key: 'b', blob: 'eb157a78ebd367a004c5a32a18d6d8c18e60ce00', name: '' };
-    const DA1 = { key: 'a', document: { id: 'a', v: 1 }, name: '' };
-    const DA2 = { key: 'a', document: { id: 'a', v: 2 }, name: '' };
-    const DB1 = { key: 'b', document: { id: 'b', v: 1 }, name: '' };
-    const DC1 = { key: 'c', document: { id: 'c', v: 1 }, name: '' };
+    const A1 = {
+      key: 'a',
+      blob: '1932cc749f57a77ba4a231d62559c47ee931ee2c',
+      name: '',
+    };
+    const A2 = {
+      key: 'a',
+      blob: 'cf2ec18c2e686b4c966725f30050120d42d4b2e5',
+      name: '',
+    };
+    const B1 = {
+      key: 'b',
+      blob: '05ab2ec03c7e32eff27305b4a11c573a3843fa01',
+      name: '',
+    };
+    const B2 = {
+      key: 'b',
+      blob: 'eb157a78ebd367a004c5a32a18d6d8c18e60ce00',
+      name: '',
+    };
+    const DA1 = {
+      key: 'a',
+      document: {
+        id: 'a',
+        v: 1,
+      },
+      name: '',
+    };
+    const DA2 = {
+      key: 'a',
+      document: {
+        id: 'a',
+        v: 2,
+      },
+      name: '',
+    };
+    const DB1 = {
+      key: 'b',
+      document: {
+        id: 'b',
+        v: 1,
+      },
+      name: '',
+    };
+    const DC1 = {
+      key: 'c',
+      document: {
+        id: 'c',
+        v: 1,
+      },
+      name: '',
+    };
 
     it('no changes', () => {
       const trunk = [A1];
       const other = [A1];
       const cands = [DA1];
-
       expect(preMergeCheck(trunk, other, cands)).toEqual({
         conflicts: [],
         dirty: [],
@@ -547,7 +688,6 @@ describe('util', () => {
       const trunk = [A1, B1];
       const other = [A2, B2];
       const cands = [DA1, DB1];
-
       expect(preMergeCheck(trunk, other, cands)).toEqual({
         conflicts: [],
         dirty: [],
@@ -558,7 +698,6 @@ describe('util', () => {
       const trunk = [A1];
       const other = [A1];
       const cands = [];
-
       expect(preMergeCheck(trunk, other, cands)).toEqual({
         conflicts: [],
         dirty: [],
@@ -569,7 +708,6 @@ describe('util', () => {
       const trunk = [A1];
       const other = [];
       const cands = [DA2];
-
       expect(preMergeCheck(trunk, other, cands)).toEqual({
         conflicts: [DA2],
         dirty: [],
@@ -580,7 +718,6 @@ describe('util', () => {
       const trunk = [];
       const other = [A1];
       const cands = [DA2];
-
       expect(preMergeCheck(trunk, other, cands)).toEqual({
         conflicts: [DA2],
         dirty: [],
@@ -591,7 +728,6 @@ describe('util', () => {
       const trunk = [A1];
       const other = [A1];
       const cands = [DA2];
-
       expect(preMergeCheck(trunk, other, cands)).toEqual({
         conflicts: [],
         dirty: [DA2],
@@ -602,7 +738,6 @@ describe('util', () => {
       const trunk = [A1];
       const other = [A2];
       const cands = [DA2];
-
       expect(preMergeCheck(trunk, other, cands)).toEqual({
         conflicts: [],
         dirty: [],
@@ -613,7 +748,6 @@ describe('util', () => {
       const trunk = [A1];
       const other = [A2];
       const cands = [DA1];
-
       expect(preMergeCheck(trunk, other, cands)).toEqual({
         conflicts: [],
         dirty: [],
@@ -624,7 +758,6 @@ describe('util', () => {
       const trunk = [A1];
       const other = [];
       const cands = [DA2];
-
       expect(preMergeCheck(trunk, other, cands)).toEqual({
         conflicts: [DA2],
         dirty: [],
@@ -635,7 +768,6 @@ describe('util', () => {
       const trunk = [A1];
       const other = [A2];
       const cands = [DC1];
-
       expect(preMergeCheck(trunk, other, cands)).toEqual({
         conflicts: [],
         dirty: [DC1],
@@ -755,9 +887,16 @@ describe('util', () => {
 
   describe('hashDocument()', () => {
     it('ignore object key order', () => {
-      const result1 = hashDocument({ c: 'c', a: 'a', b: 'b' });
-      const result2 = hashDocument({ a: 'a', b: 'b', c: 'c' });
-
+      const result1 = hashDocument({
+        c: 'c',
+        a: 'a',
+        b: 'b',
+      });
+      const result2 = hashDocument({
+        a: 'a',
+        b: 'b',
+        c: 'c',
+      });
       expect(result1.hash).toBe(result2.hash);
       expect(result1.hash).toBe('fed03259e8027e1fab2e2e57b402671bef7f3eb9');
       expect(result2.hash).toBe('fed03259e8027e1fab2e2e57b402671bef7f3eb9');
@@ -767,19 +906,33 @@ describe('util', () => {
 
     it('works on recursive things', () => {
       const result1 = hashDocument({
-        arr: [{ b: 'b', a: 'a' }],
+        arr: [
+          {
+            b: 'b',
+            a: 'a',
+          },
+        ],
         obj: {
-          obj2: { b: 'b', a: 'a' },
+          obj2: {
+            b: 'b',
+            a: 'a',
+          },
         },
       });
-
       const result2 = hashDocument({
-        arr: [{ b: 'b', a: 'a' }],
+        arr: [
+          {
+            b: 'b',
+            a: 'a',
+          },
+        ],
         obj: {
-          obj2: { a: 'a', b: 'b' },
+          obj2: {
+            a: 'a',
+            b: 'b',
+          },
         },
       });
-
       expect(result1.hash).toBe(result2.hash);
       expect(result1.hash).toBe('7eaaa8a03bada54b403aeada681aad6892a28ab3');
       expect(result2.hash).toBe('7eaaa8a03bada54b403aeada681aad6892a28ab3');
@@ -794,7 +947,6 @@ describe('util', () => {
     it('array order matters', () => {
       const result1 = hashDocument(['c', 'a', 'b']);
       const result2 = hashDocument(['a', 'b', 'c']);
-
       expect(result1.hash).not.toBe(result2.hash);
       expect(result1.hash).toBe('edf94aad27c26bdcfe7477e0ed68991cbaedf8d8');
       expect(result2.hash).toBe('e13460afb1e68af030bb9bee8344c274494661fa');
@@ -805,13 +957,11 @@ describe('util', () => {
     it('works with strange types', () => {
       const sDate1 = hashDocument(new Date(1541178019555));
       const sDate2 = hashDocument('2018-11-02T17:00:19.555Z');
-
       expect(sDate1.hash).toBe(sDate2.hash);
       expect(sDate1.hash).toBe('ec0a18c47fb39de00204c57b5b492fd408394a01');
       expect(sDate2.hash).toBe('ec0a18c47fb39de00204c57b5b492fd408394a01');
       expect(sDate1.content.toString('utf8')).toBe('"2018-11-02T17:00:19.555Z"');
       expect(sDate2.content.toString('utf8')).toBe('"2018-11-02T17:00:19.555Z"');
-
       const sNull2 = hashDocument('null');
       expect(sNull2.hash).toBe('8c1030365643f1f4b7f00e3d88c0a3c555522b60');
       expect(sNull2.content.toString('utf8')).toBe('"null"');
@@ -822,11 +972,9 @@ describe('util', () => {
         a: [0, () => null],
         fn: () => null,
       });
-
       const sFunc2 = hashDocument({
         a: [0],
       });
-
       expect(sFunc1.hash).toBe(sFunc2.hash);
       expect(sFunc1.hash).toBe('38b742facb1034438d82cf1e294d9e71051bf120');
       expect(sFunc2.hash).toBe('38b742facb1034438d82cf1e294d9e71051bf120');
@@ -841,14 +989,23 @@ describe('util', () => {
       } catch (err) {
         return;
       }
+
       throw new Error('Expected hashDocument(undefined) to fail');
     });
 
     it('ignores object keys that do not matter', () => {
-      const result1 = hashDocument({ a: 'a', modified: 456 });
-      const result2 = hashDocument({ a: 'a', modified: 123 });
-      const result3 = hashDocument({ a: 'b', modified: 123 });
-
+      const result1 = hashDocument({
+        a: 'a',
+        modified: 456,
+      });
+      const result2 = hashDocument({
+        a: 'a',
+        modified: 123,
+      });
+      const result3 = hashDocument({
+        a: 'b',
+        modified: 123,
+      });
       expect(result1.hash).toBe(result2.hash);
       expect(result1.hash).not.toBe(result3.hash);
     });
diff --git a/packages/insomnia-app/app/sync/vcs/index.js b/packages/insomnia-app/app/sync/vcs/index.ts
similarity index 84%
rename from packages/insomnia-app/app/sync/vcs/index.js
rename to packages/insomnia-app/app/sync/vcs/index.ts
index 5865ee2a3e..b4eb499aaa 100644
--- a/packages/insomnia-app/app/sync/vcs/index.js
+++ b/packages/insomnia-app/app/sync/vcs/index.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type { BaseDriver } from '../store/drivers/base';
 import path from 'path';
 import clone from 'clone';
@@ -17,7 +15,6 @@ import type {
   SnapshotState,
   Stage,
   StageEntry,
-  Status,
   StatusCandidate,
   Team,
 } from '../types';
@@ -38,10 +35,7 @@ import * as session from '../../account/session';
 import * as fetch from '../../account/fetch';
 import { strings } from '../../common/strings';
 
-const EMPTY_HASH = crypto
-  .createHash('sha1')
-  .digest('hex')
-  .replace(/./g, '0');
+const EMPTY_HASH = crypto.createHash('sha1').digest('hex').replace(/./g, '0');
 
 type ConflictHandler = (conflicts: Array<MergeConflict>) => Promise<Array<MergeConflict>>;
 
@@ -49,52 +43,53 @@ export default class VCS {
   _store: Store;
   _driver: BaseDriver;
   _project: Project | null;
-  _conflictHandler: ?ConflictHandler;
+  _conflictHandler?: ConflictHandler | null;
 
   constructor(driver: BaseDriver, conflictHandler?: ConflictHandler) {
     this._store = new Store(driver, [compress]);
     this._conflictHandler = conflictHandler;
     this._driver = driver;
-
     // To be set later
     this._project = null;
   }
 
   newInstance(): VCS {
-    const newVCS: VCS = (Object.assign({}, this): any);
+    const newVCS: VCS = Object.assign({}, this) as any;
     Object.setPrototypeOf(newVCS, VCS.prototype);
     return newVCS;
   }
 
-  async setProject(project: Project): Promise<void> {
+  async setProject(project: Project) {
     this._project = project;
     console.log(`[sync] Activated project ${project.id}`);
-
     // Store it because it might not be yet
     await this._storeProject(project);
   }
 
-  hasProject(): boolean {
+  hasProject() {
     return this._project !== null;
   }
 
-  async removeProjectsForRoot(rootDocumentId: string): Promise<void> {
+  async removeProjectsForRoot(rootDocumentId: string) {
     const all = await this._allProjects();
     const toRemove = all.filter(p => p.rootDocumentId === rootDocumentId);
+
     for (const project of toRemove) {
       await this._removeProject(project);
     }
   }
 
-  async archiveProject(): Promise<void> {
+  async archiveProject() {
     const projectId = this._projectId();
+
     await this._queryProjectArchive(projectId);
     await this._store.removeItem(paths.project(projectId));
     this._project = null;
   }
 
-  async switchProject(rootDocumentId: string): Promise<void> {
+  async switchProject(rootDocumentId: string) {
     const project = await this._getProjectByRootDocument(rootDocumentId);
+
     if (project !== null) {
       await this.setProject(project);
     } else {
@@ -102,35 +97,37 @@ export default class VCS {
     }
   }
 
-  async switchAndCreateProjectIfNotExist(rootDocumentId: string, name: string): Promise<void> {
+  async switchAndCreateProjectIfNotExist(rootDocumentId: string, name: string) {
     const project = await this._getOrCreateProjectByRootDocument(rootDocumentId, name);
     await this.setProject(project);
   }
 
-  async teams(): Promise<Array<Team>> {
+  async teams() {
     return this._queryTeams();
   }
 
-  async projectTeams(): Promise<Array<Team>> {
+  async projectTeams() {
     return this._queryProjectTeams();
   }
 
-  async localProjects(): Promise<Array<Project>> {
+  async localProjects() {
     return this._allProjects();
   }
 
-  async remoteProjects(): Promise<Array<Project>> {
+  async remoteProjects() {
     return this._queryProjects();
   }
 
-  async blobFromLastSnapshot(key: string): Promise<Object | null> {
+  async blobFromLastSnapshot(key: string) {
     const branch = await this._getCurrentBranch();
     const snapshot = await this._getLatestSnapshot(branch.name);
+
     if (!snapshot) {
       return null;
     }
 
     const entry = snapshot.state.find(e => e.key === key);
+
     if (!entry) {
       return null;
     }
@@ -138,13 +135,13 @@ export default class VCS {
     return this._getBlob(entry.blob);
   }
 
-  async status(candidates: Array<StatusCandidate>, baseStage: Stage): Promise<Status> {
+  async status(candidates: Array<StatusCandidate>, baseStage: Stage) {
     const stage = clone(baseStage);
     const branch = await this._getCurrentBranch();
     const snapshot: Snapshot | null = await this._getLatestSnapshot(branch.name);
     const state = snapshot ? snapshot.state : [];
+    const unstaged: Record<DocumentKey, StageEntry> = {};
 
-    const unstaged: { [DocumentKey]: StageEntry } = {};
     for (const entry of getStagable(state, candidates)) {
       const { key } = entry;
       const stageEntry = stage[key];
@@ -157,28 +154,33 @@ export default class VCS {
     return {
       stage,
       unstaged,
-      key: hashDocument({ stage, unstaged }).hash,
+      key: hashDocument({
+        stage,
+        unstaged,
+      }).hash,
     };
   }
 
-  async stage(stage: Stage, stageEntries: Array<StageEntry>): Promise<Stage> {
-    const blobsToStore: { [string]: string } = {};
+  async stage(stage: Stage, stageEntries: Array<StageEntry>) {
+    const blobsToStore: Record<string, string> = {};
+
     for (const entry of stageEntries) {
       stage[entry.key] = entry;
 
       // Only store blobs if we're not deleting it
+      // @ts-expect-error -- TSCONVERSION type narrowing
       if (entry.added || entry.modified) {
+        // @ts-expect-error -- TSCONVERSION type narrowing
         blobsToStore[entry.blobId] = entry.blobContent;
       }
     }
 
     await this._storeBlobs(blobsToStore);
     console.log(`[sync] Staged ${stageEntries.map(e => e.name).join(', ')}`);
-
     return stage;
   }
 
-  async unstage(stage: Stage, stageEntries: Array<StageEntry>): Promise<Stage> {
+  async unstage(stage: Stage, stageEntries: Array<StageEntry>) {
     for (const entry of stageEntries) {
       delete stage[entry.key];
     }
@@ -187,7 +189,7 @@ export default class VCS {
     return stage;
   }
 
-  static validateBranchName(branchName: string): string {
+  static validateBranchName(branchName: string) {
     if (!branchName.match(/^[a-zA-Z0-9][a-zA-Z0-9-_.]{2,}$/)) {
       return (
         'Branch names must be at least 3 characters long and can only contain ' +
@@ -198,15 +200,16 @@ export default class VCS {
     return '';
   }
 
-  async compareRemoteBranch(): Promise<{ ahead: number, behind: number }> {
+  async compareRemoteBranch() {
     const localBranch = await this._getCurrentBranch();
     const remoteBranch = await this._queryBranch(localBranch.name);
     return compareBranches(localBranch, remoteBranch);
   }
 
-  async fork(newBranchName: string): Promise<void> {
+  async fork(newBranchName: string) {
     const branch = await this._getCurrentBranch();
     const errMsg = VCS.validateBranchName(newBranchName);
+
     if (errMsg) {
       throw new Error(errMsg);
     }
@@ -221,13 +224,11 @@ export default class VCS {
       modified: new Date(),
       snapshots: (await this._getCurrentBranch()).snapshots,
     };
-
     await this._storeBranch(newBranch);
-
     console.log(`[sync] Forked ${branch.name} to ${newBranchName}`);
   }
 
-  async removeRemoteBranch(branchName: string): Promise<void> {
+  async removeRemoteBranch(branchName: string) {
     if (branchName === 'master') {
       throw new Error('Cannot delete master branch');
     }
@@ -236,7 +237,7 @@ export default class VCS {
     console.log(`[sync] Deleted remote branch ${branchName}`);
   }
 
-  async removeBranch(branchName: string): Promise<void> {
+  async removeBranch(branchName: string) {
     const branchToDelete = await this._assertBranch(branchName);
     const currentBranch = await this._getCurrentBranch();
 
@@ -252,41 +253,33 @@ export default class VCS {
     console.log(`[sync] Deleted local branch ${branchName}`);
   }
 
-  async checkout(
-    candidates: Array<StatusCandidate>,
-    branchName: string,
-  ): Promise<{
-    upsert: Array<Object>,
-    remove: Array<Object>,
-  }> {
+  async checkout(candidates: Array<StatusCandidate>, branchName: string) {
     const branchCurrent = await this._getCurrentBranch();
     const latestSnapshotCurrent: Snapshot | null = await this._getLatestSnapshot(
       branchCurrent.name,
     );
     const latestStateCurrent = latestSnapshotCurrent ? latestSnapshotCurrent.state : [];
-
     const branchNext = await this._getOrCreateBranch(branchName);
     const latestSnapshotNext: Snapshot | null = await this._getLatestSnapshot(branchNext.name);
     const latestStateNext = latestSnapshotNext ? latestSnapshotNext.state : [];
-
     // Perform pre-checkout checks
     const { conflicts, dirty } = preMergeCheck(latestStateCurrent, latestStateNext, candidates);
+
     if (conflicts.length) {
       throw new Error('Please snapshot current changes before switching branches');
     }
 
-    await this._storeHead({ branch: branchNext.name });
-
+    await this._storeHead({
+      branch: branchNext.name,
+    });
     const dirtyMap = generateCandidateMap(dirty);
     const delta = stateDelta(latestStateCurrent, latestStateNext);
-
     // Filter out things that should stay dirty
     const add = delta.add.filter(e => !dirtyMap[e.key]);
     const update = delta.update.filter(e => !dirtyMap[e.key]);
     const remove = delta.remove.filter(e => !dirtyMap[e.key]);
     const upsert = [...add, ...update];
     console.log(`[sync] Switched to branch ${branchName}`);
-
     // Remove all dirty items from the delta so we keep them around
     return {
       upsert: await this._getBlobs(upsert.map(e => e.blob)),
@@ -309,9 +302,10 @@ export default class VCS {
     return this._conflictHandler(conflicts);
   }
 
-  async allDocuments(): Promise<Object> {
+  async allDocuments(): Promise<Record<string, any>> {
     const branch = await this._getCurrentBranch();
     const snapshot: Snapshot | null = await this._getLatestSnapshot(branch.name);
+
     if (!snapshot) {
       throw new Error('Failed to get latest snapshot for all documents');
     }
@@ -319,14 +313,10 @@ export default class VCS {
     return this._getBlobs(snapshot.state.map(s => s.blob));
   }
 
-  async rollbackToLatest(
-    candidates: Array<StatusCandidate>,
-  ): Promise<{
-    upsert: Array<Object>,
-    remove: Array<Object>,
-  }> {
+  async rollbackToLatest(candidates: Array<StatusCandidate>) {
     const branch = await this._getCurrentBranch();
     const latestSnapshot = await this._getLatestSnapshot(branch.name);
+
     if (!latestSnapshot) {
       throw new Error('No snapshots to rollback to');
     }
@@ -334,40 +324,36 @@ export default class VCS {
     return this.rollback(latestSnapshot.id, candidates);
   }
 
-  async rollback(
-    snapshotId: string,
-    candidates: Array<StatusCandidate>,
-  ): Promise<{
-    upsert: Array<Object>,
-    remove: Array<Object>,
-  }> {
+  async rollback(snapshotId: string, candidates: Array<StatusCandidate>) {
     const rollbackSnapshot: Snapshot | null = await this._getSnapshot(snapshotId);
+
     if (rollbackSnapshot === null) {
       throw new Error(`Failed to find snapshot by id ${snapshotId}`);
     }
 
-    const potentialNewState: SnapshotState = candidates.map(c => ({
-      key: c.key,
-      blob: hashDocument(c.document).hash,
-      name: c.name,
+    const potentialNewState: SnapshotState = candidates.map(candidate => ({
+      key: candidate.key,
+      blob: hashDocument(candidate.document).hash,
+      name: candidate.name,
     }));
 
     const delta = stateDelta(potentialNewState, rollbackSnapshot.state);
+    // We need to treat removals of candidates differently because they may not yet have been stored as blobs.
+    const remove: Array<StatusCandidate> = [];
 
-    // We need to treat removals of candidates differently because they may not
-    // yet have been stored as blobs.
-    const remove = [];
-    for (const e of delta.remove) {
-      const c = candidates.find(c => c.key === e.key);
-      if (!c) {
+    for (const entry of delta.remove) {
+      const candidate = candidates.find(candidate => candidate.key === entry.key);
+
+      if (!candidate) {
         // Should never happen
         throw new Error('Failed to find removal in candidates');
       }
-      remove.push(c.document);
+
+      // @ts-expect-error -- TSCONVERSION not sure what this is actually supposed to be
+      remove.push(candidate.document);
     }
 
     console.log(`[sync] Rolled back to ${snapshotId}`);
-
     const upsert = [...delta.update, ...delta.add];
     return {
       upsert: await this._getBlobs(upsert.map(e => e.blob)),
@@ -375,20 +361,20 @@ export default class VCS {
     };
   }
 
-  async getHistoryCount(branchName?: string): Promise<number> {
+  async getHistoryCount(branchName?: string) {
     const branch = branchName ? await this._getBranch(branchName) : await this._getCurrentBranch();
-    return branch.snapshots.length;
+    return branch?.snapshots.length;
   }
 
-  async getHistory(count: number = 0): Promise<Array<Snapshot>> {
+  async getHistory(count = 0) {
     const branch = await this._getCurrentBranch();
-    const snapshots = [];
-
+    const snapshots: Array<Snapshot> = [];
     const total = branch.snapshots.length;
     const slice = count <= 0 || count > total ? 0 : total - count;
 
     for (const id of branch.snapshots.slice(slice)) {
       const snapshot = await this._getSnapshot(id);
+
       if (snapshot === null) {
         throw new Error(`Failed to get snapshot id=${id}`);
       }
@@ -399,7 +385,7 @@ export default class VCS {
     return snapshots;
   }
 
-  async getBranch(): Promise<string> {
+  async getBranch() {
     const branch = await this._getCurrentBranch();
     return branch.name;
   }
@@ -418,16 +404,13 @@ export default class VCS {
     candidates: Array<StatusCandidate>,
     otherBranchName: string,
     snapshotMessage?: string,
-  ): Promise<{
-    upsert: Array<Object>,
-    remove: Array<Object>,
-  }> {
+  ) {
     const branch = await this._getCurrentBranch();
     console.log(`[sync] Merged branch ${otherBranchName} into ${branch.name}`);
     return this._merge(candidates, branch.name, otherBranchName, snapshotMessage);
   }
 
-  async takeSnapshot(stage: Stage, name: string): Promise<void> {
+  async takeSnapshot(stage: Stage, name: string) {
     const branch: Branch = await this._getCurrentBranch();
     const parent: Snapshot | null = await this._getLatestSnapshot(branch.name);
 
@@ -455,29 +438,28 @@ export default class VCS {
     // Add the rest of the staged items
     for (const key of Object.keys(stage)) {
       const entry = stage[key];
+
+      // @ts-expect-error -- TSCONVERSION find out where this is coming from from the Stage union
       if (entry.deleted) {
         continue;
       }
 
       const { name, blobId: blob } = entry;
-      newState.push({ key, name, blob });
+      newState.push({
+        key,
+        name,
+        blob,
+      });
     }
 
     const snapshot = await this._createSnapshotFromState(branch, newState, name);
     console.log(`[sync] Created snapshot ${snapshot.id} (${name})`);
   }
 
-  async pull(
-    candidates: Array<StatusCandidate>,
-  ): Promise<{
-    upsert: Array<Object>,
-    remove: Array<Object>,
-  }> {
+  async pull(candidates: Array<StatusCandidate>) {
     await this._getOrCreateRemoteProject();
-
     const localBranch = await this._getCurrentBranch();
     const tmpBranchForRemote = await this._fetch(localBranch.name + '.hidden', localBranch.name);
-
     // Merge branch and ensure that we use the remote's history when merging
     const message = `Synced latest changes from ${localBranch.name}`;
     const delta = await this._merge(
@@ -487,37 +469,41 @@ export default class VCS {
       message,
       true,
     );
-
     // Remove tmp branch
     await this._removeBranch(tmpBranchForRemote);
     console.log(`[sync] Pulled branch ${localBranch.name}`);
-
     return delta;
   }
 
-  async shareWithTeam(teamId: string): Promise<void> {
+  async shareWithTeam(teamId: string) {
     const { memberKeys, projectKey } = await this._queryProjectShareInstructions(teamId);
-    const { privateKey } = this._assertSession();
-    const symmetricKey = crypt.decryptRSAWithJWK(privateKey, projectKey.encSymmetricKey);
 
-    const keys = [];
+    const { privateKey } = this._assertSession();
+
+    const symmetricKey = crypt.decryptRSAWithJWK(privateKey, projectKey.encSymmetricKey);
+    const keys: Array<any> = [];
+
     for (const { accountId, publicKey } of memberKeys) {
       const encSymmetricKey = crypt.encryptRSAWithJWK(JSON.parse(publicKey), symmetricKey);
-      keys.push({ accountId, encSymmetricKey });
+      keys.push({
+        accountId,
+        encSymmetricKey,
+      });
     }
 
     await this._queryProjectShare(teamId, keys);
     console.log(`[sync] Shared project ${this._projectId()} with ${teamId}`);
   }
 
-  async unShareWithTeam(): Promise<void> {
+  async unShareWithTeam() {
     await this._queryProjectUnShare();
     console.log(`[sync] Unshared project ${this._projectId()}`);
   }
 
-  async _getOrCreateRemoteProject(): Promise<Project> {
+  async _getOrCreateRemoteProject() {
     const localProject = await this._assertProject();
     let project = await this._queryProject();
+
     if (!project) {
       project = await this._queryCreateProject(localProject.rootDocumentId, localProject.name);
     }
@@ -526,14 +512,14 @@ export default class VCS {
     return project;
   }
 
-  async push(): Promise<void> {
+  async push() {
     await this._getOrCreateRemoteProject();
     const branch = await this._getCurrentBranch();
-
     // Check branch history to make sure there are no conflicts
     let lastMatchingIndex = 0;
     const remoteBranch: Branch | null = await this._queryBranch(branch.name);
     const remoteBranchSnapshots = remoteBranch ? remoteBranch.snapshots : [];
+
     for (; lastMatchingIndex < remoteBranchSnapshots.length; lastMatchingIndex++) {
       if (remoteBranchSnapshots[lastMatchingIndex] !== branch.snapshots[lastMatchingIndex]) {
         throw new Error('Remote history conflict. Please pull latest changes and try again');
@@ -542,13 +528,15 @@ export default class VCS {
 
     // Get the remaining snapshots to push
     const snapshotIdsToPush = branch.snapshots.slice(lastMatchingIndex);
+
     if (snapshotIdsToPush.length === 0) {
       throw new Error('Already up to date');
     }
 
     // Gather a list of snapshot state entries to push
-    const allBlobIds = new Set();
-    const snapshots = [];
+    const allBlobIds = new Set<string>();
+    const snapshots: Array<Snapshot> = [];
+
     for (const id of snapshotIdsToPush) {
       const snapshot = await this._assertSnapshot(id);
       snapshots.push(snapshot);
@@ -564,27 +552,32 @@ export default class VCS {
     await this._queryPushSnapshots(snapshots);
   }
 
-  async _fetch(localBranchName: string, remoteBranchName: string): Promise<Branch> {
+  async _fetch(localBranchName: string, remoteBranchName: string) {
     const remoteBranch: Branch | null = await this._queryBranch(remoteBranchName);
+
     if (!remoteBranch) {
       throw new Error(`The remote branch "${remoteBranchName}" does not exist`);
     }
 
     // Fetch snapshots and blobs from remote branch
     const snapshotsToFetch: Array<string> = [];
+
     for (const snapshotId of remoteBranch.snapshots) {
       const localSnapshot = await this._getSnapshot(snapshotId);
+
       if (!localSnapshot) {
         snapshotsToFetch.push(snapshotId);
       }
     }
 
     // Find blobs to fetch
-    const blobsToFetch = new Set();
+    const blobsToFetch = new Set<string>();
     const snapshots = await this._querySnapshots(snapshotsToFetch);
+
     for (const snapshot of snapshots) {
       for (const { blob } of snapshot.state) {
         const hasBlob = await this._hasBlob(blob);
+
         if (hasBlob) {
           continue;
         }
@@ -597,16 +590,13 @@ export default class VCS {
     const ids = Array.from(blobsToFetch);
     const blobs = await this._queryBlobs(ids);
     await this._storeBlobsBuffer(blobs);
-
     // Store the snapshots
     await this._storeSnapshots(snapshots);
-
     // Create the new branch and save it
     const branch = clone(remoteBranch);
     branch.created = branch.modified = new Date();
     branch.name = localBranchName;
     await this._storeBranch(branch);
-
     return branch;
   }
 
@@ -616,20 +606,15 @@ export default class VCS {
     otherBranchName: string,
     snapshotMessage?: string,
     useOtherBranchHistory?: boolean,
-  ): Promise<{
-    upsert: Array<Object>,
-    remove: Array<Object>,
-  }> {
+  ) {
     const branchOther = await this._assertBranch(otherBranchName);
     const latestSnapshotOther: Snapshot | null = await this._getLatestSnapshot(branchOther.name);
-
     const branchTrunk = await this._assertBranch(trunkBranchName);
     const rootSnapshotId = getRootSnapshot(branchTrunk, branchOther);
     const rootSnapshot: Snapshot | null = await this._getSnapshot(rootSnapshotId || 'n/a');
     const latestSnapshotTrunk: Snapshot | null = await this._getLatestSnapshot(branchTrunk.name);
     const latestStateTrunk = latestSnapshotTrunk ? latestSnapshotTrunk.state : [];
     const latestStateOther = latestSnapshotOther ? latestSnapshotOther.state : [];
-
     // Perform pre-merge checks
     const { conflicts: preConflicts, dirty } = preMergeCheck(
       latestStateTrunk,
@@ -656,14 +641,12 @@ export default class VCS {
       await this._storeBranch(branchTrunk);
     } else {
       const rootState = rootSnapshot ? rootSnapshot.state : [];
-
       console.log('[sync] Performing 3-way merge');
       const { state: stateBeforeConflicts, conflicts: mergeConflicts } = threeWayMerge(
         rootState,
         latestStateTrunk,
         latestStateOther,
       );
-
       // Update state with conflict resolutions applied
       const conflictResolutions = await this.handleAnyConflicts(mergeConflicts, '');
       const state = updateStateWithConflictResolutions(stateBeforeConflicts, conflictResolutions);
@@ -679,10 +662,8 @@ export default class VCS {
 
     const newLatestSnapshot = await this._getLatestSnapshot(branchTrunk.name);
     const newLatestSnapshotState = newLatestSnapshot ? newLatestSnapshot.state : [];
-
     const { add, update, remove } = stateDelta(latestStateTrunk, newLatestSnapshotState);
     const upsert = [...add, ...update];
-
     // Remove all dirty items from the delta so we keep them around
     const dirtyMap = generateCandidateMap(dirty);
     return {
@@ -695,37 +676,48 @@ export default class VCS {
     branch: Branch,
     state: SnapshotState,
     name: string,
-  ): Promise<Snapshot> {
+  ) {
     const parentId = branch.snapshots.length
       ? branch.snapshots[branch.snapshots.length - 1]
       : EMPTY_HASH;
 
     // Create the snapshot
     const id = _generateSnapshotID(parentId, this._projectId(), state);
+
     const snapshot: Snapshot = {
       id,
       name,
       state,
-      author: '', // Will be set when pushed
+      author: '',
+      // Will be set when pushed
       parent: parentId,
       created: new Date(),
       description: '',
     };
-
     // Update the branch history
     branch.modified = new Date();
     branch.snapshots.push(snapshot.id);
-
     await this._storeBranch(branch);
     await this._storeSnapshot(snapshot);
     console.log(`[sync] Created snapshot '${name}' on ${branch.name}`);
-
     return snapshot;
   }
 
-  async _runGraphQL(query: string, variables: { [string]: any }, name: string): Promise<Object> {
+  async _runGraphQL(
+    query: string,
+    variables: Record<string, any>,
+    name: string,
+  ): Promise<Record<string, any>> {
     const { sessionId } = this._assertSession();
-    const { data, errors } = await fetch.post('/graphql?' + name, { query, variables }, sessionId);
+
+    const { data, errors } = await fetch.post(
+      '/graphql?' + name,
+      {
+        query,
+        variables,
+      },
+      sessionId,
+    );
 
     if (errors && errors.length) {
       console.log(`[sync] Failed to query ${name}`, errors);
@@ -750,7 +742,6 @@ export default class VCS {
       },
       'missingBlobs',
     );
-
     return blobsMissing.missing;
   }
 
@@ -770,12 +761,11 @@ export default class VCS {
       },
       'branches',
     );
-
     // TODO: Fix server returning null instead of empty list
     return branches || [];
   }
 
-  async _queryRemoveBranch(branchName: string): Promise<void> {
+  async _queryRemoveBranch(branchName: string) {
     await this._runGraphQL(
       `
       mutation ($projectId: ID!, $branch: String!) {
@@ -806,12 +796,12 @@ export default class VCS {
       },
       'branch',
     );
-
     return branch;
   }
 
-  async _querySnapshots(allIds: Array<string>): Promise<Array<Snapshot>> {
-    let allSnapshots = [];
+  async _querySnapshots(allIds: Array<string>) {
+    let allSnapshots: Array<Snapshot> = [];
+
     for (const ids of chunkArray(allIds, 20)) {
       const { snapshots } = await this._runGraphQL(
         `
@@ -847,7 +837,7 @@ export default class VCS {
     return allSnapshots;
   }
 
-  async _queryPushSnapshots(allSnapshots: Array<Snapshot>): Promise<void> {
+  async _queryPushSnapshots(allSnapshots: Array<Snapshot>) {
     const { accountId } = this._assertSession();
 
     for (const snapshots of chunkArray(allSnapshots, 20)) {
@@ -898,17 +888,15 @@ export default class VCS {
         },
         'snapshotsPush',
       );
-
       // Store them in case something has changed
       await this._storeSnapshots(snapshotsCreate);
-
       console.log('[sync] Pushed snapshots', snapshotsCreate.map(s => s.id).join(', '));
     }
   }
 
-  async _queryBlobs(allIds: Array<string>): Promise<{ [string]: Buffer }> {
+  async _queryBlobs(allIds: Array<string>) {
     const symmetricKey = await this._getProjectSymmetricKey();
-    const result = {};
+    const result: Record<string, Buffer> = {};
 
     for (const ids of chunkArray(allIds, 50)) {
       const { blobs } = await this._runGraphQL(
@@ -935,15 +923,19 @@ export default class VCS {
     return result;
   }
 
-  async _queryPushBlobs(allIds: Array<string>): Promise<void> {
+  async _queryPushBlobs(allIds: Array<string>) {
     const symmetricKey = await this._getProjectSymmetricKey();
 
-    const next = async (items: Array<{ id: string, content: string }>) => {
+    const next = async (
+      items: Array<{
+        id: string;
+        content: string;
+      }>,
+    ) => {
       const encodedBlobs = items.map(i => ({
         id: i.id,
         content: i.content,
       }));
-
       const { blobsCreate } = await this._runGraphQL(
         `
           mutation ($projectId: ID!, $blobs: [BlobInput!]!) {
@@ -958,28 +950,33 @@ export default class VCS {
         },
         'blobsCreate',
       );
-
       return blobsCreate.count;
     };
 
     // Push each missing blob in batches of 2MB max
     let count = 0;
-    let batch = [];
+    let batch: Array<{ id: string; content: string }> = [];
     let batchSizeBytes = 0;
     const maxBatchSize = 1024 * 1024 * 2; // 2 MB
+
     const maxBatchCount = 200;
+
     for (let i = 0; i < allIds.length; i++) {
       const id = allIds[i];
       const content = await this._getBlobRaw(id);
+
       if (content === null) {
         throw new Error(`Failed to get blob id=${id}`);
       }
 
       const encryptedResult = crypt.encryptAESBuffer(symmetricKey, content);
-      batch.push({ id, content: JSON.stringify(encryptedResult, null, 2) });
-
+      batch.push({
+        id,
+        content: JSON.stringify(encryptedResult, null, 2),
+      });
       batchSizeBytes += content.length;
       const isLastId = i === allIds.length - 1;
+
       if (batchSizeBytes > maxBatchSize || isLastId || batch.length >= maxBatchCount) {
         count += await next(batch);
         const batchSizeMB = Math.round((batchSizeBytes / 1024) * 100) / 100;
@@ -992,7 +989,7 @@ export default class VCS {
     console.log(`[sync] Finished uploading ${count}/${allIds.length} blobs`);
   }
 
-  async _queryProjectKey(): Promise<string> {
+  async _queryProjectKey() {
     const { projectKey } = await this._runGraphQL(
       `
         query ($projectId: ID!) {
@@ -1006,11 +1003,10 @@ export default class VCS {
       },
       'projectKey',
     );
-
-    return projectKey.encSymmetricKey;
+    return projectKey.encSymmetricKey as string;
   }
 
-  async _queryTeams(): Promise<Array<Team>> {
+  async _queryTeams() {
     const { teams } = await this._runGraphQL(
       `
         query {
@@ -1023,11 +1019,10 @@ export default class VCS {
       {},
       'teams',
     );
-
-    return teams;
+    return teams as Array<Team>;
   }
 
-  async _queryProjectUnShare(): Promise<void> {
+  async _queryProjectUnShare() {
     await this._runGraphQL(
       `
         mutation ($id: ID!) {
@@ -1045,8 +1040,11 @@ export default class VCS {
 
   async _queryProjectShare(
     teamId: string,
-    keys: Array<{ accountId: string, encSymmetricKey: string }>,
-  ): Promise<void> {
+    keys: Array<{
+      accountId: string;
+      encSymmetricKey: string;
+    }>,
+  ) {
     await this._runGraphQL(
       `
         mutation ($id: ID!, $teamId: ID!, $keys: [ProjectShareKeyInput!]!) {
@@ -1067,14 +1065,14 @@ export default class VCS {
   async _queryProjectShareInstructions(
     teamId: string,
   ): Promise<{
-    teamId: string,
+    teamId: string;
     projectKey: {
-      encSymmetricKey: string,
-    },
+      encSymmetricKey: string;
+    };
     memberKeys: Array<{
-      accountId: string,
-      publicKey: string,
-    }>,
+      accountId: string;
+      publicKey: string;
+    }>;
   }> {
     const { projectShareInstructions } = await this._runGraphQL(
       `
@@ -1097,7 +1095,6 @@ export default class VCS {
       },
       'projectShareInstructions',
     );
-
     return projectShareInstructions;
   }
 
@@ -1115,7 +1112,6 @@ export default class VCS {
       {},
       'projects',
     );
-
     return projects;
   }
 
@@ -1135,7 +1131,6 @@ export default class VCS {
       },
       'project',
     );
-
     return project;
   }
 
@@ -1164,16 +1159,14 @@ export default class VCS {
     return project.teams;
   }
 
-  async _queryCreateProject(workspaceId: string, workspaceName: string): Promise<Project> {
+  async _queryCreateProject(workspaceId: string, workspaceName: string) {
     const { publicKey } = this._assertSession();
 
     // Generate symmetric key for ResourceGroup
     const symmetricKey = await crypt.generateAES256Key();
     const symmetricKeyStr = JSON.stringify(symmetricKey);
-
     // Encrypt the symmetric key with Account public key
     const encSymmetricKey = crypt.encryptRSAWithJWK(publicKey, symmetricKeyStr);
-
     const { projectCreate } = await this._runGraphQL(
       `
         mutation ($rootDocumentId: ID!, $name: String!, $id: ID!, $key: String!) {
@@ -1192,10 +1185,8 @@ export default class VCS {
       },
       'switchAndCreateProjectIfNotExist',
     );
-
     console.log(`[sync] Created remote project ${projectCreate.id} (${projectCreate.name})`);
-
-    return projectCreate;
+    return projectCreate as Project;
   }
 
   async _getProject(): Promise<Project | null> {
@@ -1207,15 +1198,17 @@ export default class VCS {
     return this._store.getItem(paths.project(id));
   }
 
-  async _getProjectSymmetricKey(): Promise<Object> {
+  async _getProjectSymmetricKey() {
     const { privateKey } = this._assertSession();
+
     const encSymmetricKey = await this._queryProjectKey();
     const symmetricKeyStr = crypt.decryptRSAWithJWK(privateKey, encSymmetricKey);
     return JSON.parse(symmetricKeyStr);
   }
 
-  async _assertProject(): Promise<Project> {
+  async _assertProject() {
     const project = await this._getProject();
+
     if (project === null) {
       throw new Error('Failed to find local project id=' + this._projectId());
     }
@@ -1223,12 +1216,13 @@ export default class VCS {
     return project;
   }
 
-  async _storeProject(project: Project): Promise<void> {
+  async _storeProject(project: Project) {
     return this._store.setItem(paths.project(project.id), project);
   }
 
   async _getHead(): Promise<Head> {
     const head = await this._store.getItem(paths.head(this._projectId()));
+
     if (head === null) {
       await this._storeHead({ branch: 'master' });
       return this._getHead();
@@ -1237,17 +1231,12 @@ export default class VCS {
     return head;
   }
 
-  async _getCurrentBranch(): Promise<Branch> {
+  async _getCurrentBranch() {
     const head = await this._getHead();
     return this._getOrCreateBranch(head.branch);
   }
 
-  _assertSession(): {|
-    accountId: string,
-    sessionId: string,
-    privateKey: Object,
-    publicKey: Object,
-  |} {
+  _assertSession() {
     if (!session.isLoggedIn()) {
       throw new Error('Not logged in');
     }
@@ -1260,8 +1249,9 @@ export default class VCS {
     };
   }
 
-  async _assertBranch(branchName: string): Promise<Branch> {
+  async _assertBranch(branchName: string) {
     const branch = await this._getBranch(branchName);
+
     if (branch === null) {
       throw new Error(`Branch does not exist with name ${branchName}`);
     }
@@ -1269,7 +1259,7 @@ export default class VCS {
     return branch;
   }
 
-  _projectId(): string {
+  _projectId() {
     if (this._project === null) {
       throw new Error('No active project');
     }
@@ -1279,15 +1269,19 @@ export default class VCS {
 
   async _getBranch(name: string, projectId?: string): Promise<Branch | null> {
     const pId = projectId || this._projectId();
+
     const p = paths.branch(pId, name);
     return this._store.getItem(p);
   }
 
-  async _getBranches(projectId?: string): Promise<Array<Branch>> {
-    const branches = [];
+  async _getBranches(projectId?: string) {
+    const branches: Array<Branch> = [];
+
     const pId = projectId || this._projectId();
+
     for (const p of await this._store.keys(paths.branches(pId))) {
       const b = await this._store.getItem(p);
+
       if (b === null) {
         // Should never happen
         throw new Error(`Failed to get branch path=${p}`);
@@ -1313,14 +1307,13 @@ export default class VCS {
         modified: new Date(),
         snapshots: [],
       });
-
       return this._getOrCreateBranch(name);
     }
 
     return branch;
   }
 
-  async _getProjectByRootDocument(rootDocumentId: string): Promise<Project | null> {
+  async _getProjectByRootDocument(rootDocumentId: string) {
     if (!rootDocumentId) {
       throw new Error('No root document ID supplied for project');
     }
@@ -1333,6 +1326,7 @@ export default class VCS {
     if (matchedProjects.length > 1) {
       for (const p of matchedProjects) {
         const branches = await this._getBranches(p.id);
+
         if (!branches.find(b => b.snapshots.length > 0)) {
           await this._removeProject(p);
           matchedProjects = matchedProjects.filter(({ id }) => id !== p.id);
@@ -1354,13 +1348,17 @@ export default class VCS {
     return matchedProjects[0] || null;
   }
 
-  async _getOrCreateProjectByRootDocument(rootDocumentId: string, name: string): Promise<Project> {
+  async _getOrCreateProjectByRootDocument(rootDocumentId: string, name: string) {
     let project: Project | null = await this._getProjectByRootDocument(rootDocumentId);
 
     // If we still don't have a project, create one
     if (!project) {
       const id = generateId('prj');
-      project = { id, name, rootDocumentId };
+      project = {
+        id,
+        name,
+        rootDocumentId,
+      };
       await this._storeProject(project);
       console.log(`[sync] Created project ${project.id}`);
     }
@@ -1368,13 +1366,15 @@ export default class VCS {
     return project;
   }
 
-  async _allProjects(): Promise<Array<Project>> {
-    const projects = [];
+  async _allProjects() {
+    const projects: Array<Project> = [];
     const basePath = paths.projects();
     const keys = await this._store.keys(basePath, false);
+
     for (const key of keys) {
       const id = path.basename(key);
       const p: Project | null = await this._getProjectById(id);
+
       if (p === null) {
         // Folder exists but project meta file is gone
         continue;
@@ -1386,8 +1386,9 @@ export default class VCS {
     return projects;
   }
 
-  async _assertSnapshot(id: string): Promise<Snapshot> {
-    const snapshot = await this._store.getItem(paths.snapshot(this._projectId(), id));
+  async _assertSnapshot(id: string) {
+    const snapshot: Snapshot = await this._store.getItem(paths.snapshot(this._projectId(), id));
+
     if (snapshot && typeof snapshot.created === 'string') {
       snapshot.created = new Date(snapshot.created);
     }
@@ -1399,8 +1400,9 @@ export default class VCS {
     return snapshot;
   }
 
-  async _getSnapshot(id: string): Promise<Snapshot | null> {
-    const snapshot = await this._store.getItem(paths.snapshot(this._projectId(), id));
+  async _getSnapshot(id: string) {
+    const snapshot: Snapshot = await this._store.getItem(paths.snapshot(this._projectId(), id));
+
     if (snapshot && typeof snapshot.created === 'string') {
       snapshot.created = new Date(snapshot.created);
     }
@@ -1408,29 +1410,33 @@ export default class VCS {
     return snapshot;
   }
 
-  async _getLatestSnapshot(branchName: string): Promise<Snapshot | null> {
+  async _getLatestSnapshot(branchName: string) {
     const branch = await this._getOrCreateBranch(branchName);
     const snapshots = branch ? branch.snapshots : [];
     const parentId = snapshots.length ? snapshots[snapshots.length - 1] : EMPTY_HASH;
     return this._getSnapshot(parentId);
   }
 
-  async _storeSnapshot(snapshot: Snapshot): Promise<void> {
+  async _storeSnapshot(snapshot: Snapshot) {
     return this._store.setItem(paths.snapshot(this._projectId(), snapshot.id), snapshot);
   }
 
-  async _storeSnapshots(snapshots: Array<Snapshot>): Promise<void> {
-    const promises = [];
+  async _storeSnapshots(snapshots: Array<Snapshot>) {
+    const promises: Array<Promise<Snapshot>> = [];
+
     for (const snapshot of snapshots) {
       const p = paths.snapshot(this._projectId(), snapshot.id);
-      promises.push(this._store.setItem(p, snapshot));
+      const promise = this._store.setItem(p, snapshot);
+      // @ts-expect-error -- TSCONVERSION appears to be a genuine error
+      promises.push(promise);
     }
 
     await Promise.all(promises);
   }
 
-  async _storeBranch(branch: Branch): Promise<void> {
+  async _storeBranch(branch: Branch) {
     const errMsg = VCS.validateBranchName(branch.name);
+
     if (errMsg) {
       throw new Error(errMsg);
     }
@@ -1439,26 +1445,27 @@ export default class VCS {
     return this._store.setItem(paths.branch(this._projectId(), branch.name.toLowerCase()), branch);
   }
 
-  async _removeBranch(branch: Branch): Promise<void> {
+  async _removeBranch(branch: Branch) {
     return this._store.removeItem(paths.branch(this._projectId(), branch.name));
   }
 
-  async _removeProject(project: Project): Promise<void> {
+  async _removeProject(project: Project) {
     console.log(`[sync] Remove local project ${project.id}`);
     return this._store.removeItem(paths.project(project.id));
   }
 
-  async _storeHead(head: Head): Promise<void> {
+  async _storeHead(head: Head) {
     await this._store.setItem(paths.head(this._projectId()), head);
   }
 
-  async _getBlob(id: string): Promise<Object | null> {
+  async _getBlob(id: string) {
     const p = paths.blob(this._projectId(), id);
-    return this._store.getItem(p);
+    return this._store.getItem(p) as Record<string, any> | null;
   }
 
-  async _getBlobs(ids: Array<string>): Promise<Array<Object>> {
-    const promises = [];
+  async _getBlobs(ids: Array<string>) {
+    const promises: Array<Promise<Record<string, any> | null>> = [];
+
     for (const id of ids) {
       promises.push(this._getBlob(id));
     }
@@ -1466,12 +1473,13 @@ export default class VCS {
     return Promise.all(promises);
   }
 
-  async _storeBlob(id: string, content: Object | null): Promise<void> {
+  async _storeBlob(id: string, content: Record<string, any> | null) {
     return this._store.setItem(paths.blob(this._projectId(), id), content);
   }
 
-  async _storeBlobs(map: { [string]: string }): Promise<void> {
-    const promises = [];
+  async _storeBlobs(map: Record<string, string>) {
+    const promises: Array<Promise<any>> = [];
+
     for (const id of Object.keys(map)) {
       const buff = Buffer.from(map[id], 'utf8');
       promises.push(this._storeBlob(id, buff));
@@ -1480,8 +1488,9 @@ export default class VCS {
     await Promise.all(promises);
   }
 
-  async _storeBlobsBuffer(map: { [string]: Buffer }): Promise<void> {
-    const promises = [];
+  async _storeBlobsBuffer(map: Record<string, Buffer>) {
+    const promises: Array<Promise<any>> = [];
+
     for (const id of Object.keys(map)) {
       const p = paths.blob(this._projectId(), id);
       promises.push(this._store.setItemRaw(p, map[id]));
@@ -1490,15 +1499,15 @@ export default class VCS {
     await Promise.all(promises);
   }
 
-  async _getBlobRaw(id: string): Promise<Buffer | null> {
+  async _getBlobRaw(id: string) {
     return this._store.getItemRaw(paths.blob(this._projectId(), id));
   }
 
-  async _hasBlob(id: string): Promise<boolean> {
+  async _hasBlob(id: string) {
     return this._store.hasItem(paths.blob(this._projectId(), id));
   }
 
-  async _queryProjectArchive(projectId: string): Promise<void> {
+  async _queryProjectArchive(projectId: string) {
     await this._runGraphQL(
       `
         mutation ($id: ID!) {
@@ -1510,18 +1519,13 @@ export default class VCS {
       },
       'projectArchive',
     );
-
     console.log(`[sync] Archived remote project ${projectId}`);
   }
 }
-
 /** Generate snapshot ID from hashing parent, project, and state together */
-function _generateSnapshotID(parentId: string, projectId: string, state: SnapshotState): string {
-  const hash = crypto
-    .createHash('sha1')
-    .update(projectId)
-    .update(parentId);
 
+function _generateSnapshotID(parentId: string, projectId: string, state: SnapshotState) {
+  const hash = crypto.createHash('sha1').update(projectId).update(parentId);
   const newState = [...state].sort((a, b) => (a.blob > b.blob ? 1 : -1));
 
   for (const entry of newState) {
diff --git a/packages/insomnia-app/app/sync/vcs/paths.js b/packages/insomnia-app/app/sync/vcs/paths.js
deleted file mode 100644
index e191c0558e..0000000000
--- a/packages/insomnia-app/app/sync/vcs/paths.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// @flow
-
-export function projects(): string {
-  return '/projects/';
-}
-
-export function projectBase(projectId: string): string {
-  return `${projects()}${projectId}/`;
-}
-
-export function head(projectId: string): string {
-  return `${projectBase(projectId)}head.json`;
-}
-
-export function project(projectId: string): string {
-  return `${projectBase(projectId)}meta.json`;
-}
-
-export function blobs(projectId: string): string {
-  return `${projectBase(projectId)}blobs/`;
-}
-
-export function blob(projectId: string, blobId: string): string {
-  const subPath = `${blobId.slice(0, 2)}/${blobId.slice(2)}`;
-  return `${blobs(projectId)}${subPath}`;
-}
-
-export function snapshots(projectId: string): string {
-  return `${projectBase(projectId)}snapshots/`;
-}
-
-export function snapshot(projectId: string, snapshotId: string): string {
-  return `${snapshots(projectId)}${snapshotId}.json`;
-}
-
-export function branches(projectId: string): string {
-  return `${projectBase(projectId)}branches/`;
-}
-
-export function branch(projectId: string, branchName: string): string {
-  return `${branches(projectId)}${branchName}.json`;
-}
diff --git a/packages/insomnia-app/app/sync/vcs/paths.ts b/packages/insomnia-app/app/sync/vcs/paths.ts
new file mode 100644
index 0000000000..0a1324eafe
--- /dev/null
+++ b/packages/insomnia-app/app/sync/vcs/paths.ts
@@ -0,0 +1,41 @@
+
+export function projects() {
+  return '/projects/';
+}
+
+export function projectBase(projectId: string) {
+  return `${projects()}${projectId}/`;
+}
+
+export function head(projectId: string) {
+  return `${projectBase(projectId)}head.json`;
+}
+
+export function project(projectId: string) {
+  return `${projectBase(projectId)}meta.json`;
+}
+
+export function blobs(projectId: string) {
+  return `${projectBase(projectId)}blobs/`;
+}
+
+export function blob(projectId: string, blobId: string) {
+  const subPath = `${blobId.slice(0, 2)}/${blobId.slice(2)}`;
+  return `${blobs(projectId)}${subPath}`;
+}
+
+export function snapshots(projectId: string) {
+  return `${projectBase(projectId)}snapshots/`;
+}
+
+export function snapshot(projectId: string, snapshotId: string) {
+  return `${snapshots(projectId)}${snapshotId}.json`;
+}
+
+export function branches(projectId: string) {
+  return `${projectBase(projectId)}branches/`;
+}
+
+export function branch(projectId: string, branchName: string) {
+  return `${branches(projectId)}${branchName}.json`;
+}
diff --git a/packages/insomnia-app/app/sync/vcs/util.js b/packages/insomnia-app/app/sync/vcs/util.ts
similarity index 86%
rename from packages/insomnia-app/app/sync/vcs/util.js
rename to packages/insomnia-app/app/sync/vcs/util.ts
index 6ba968a2d1..8c74cb0f54 100644
--- a/packages/insomnia-app/app/sync/vcs/util.js
+++ b/packages/insomnia-app/app/sync/vcs/util.ts
@@ -1,4 +1,3 @@
-// @flow
 import clone from 'clone';
 import crypto from 'crypto';
 import { deterministicStringify } from '../lib/deterministicStringify';
@@ -14,7 +13,6 @@ import type {
   StatusCandidate,
   StatusCandidateMap,
 } from '../types';
-
 // Keys for VCS to ignore when computing changes
 const IGNORED_KEYS = ['modified'];
 
@@ -32,24 +30,29 @@ export function generateStateMap(state: SnapshotState | null): SnapshotStateMap
   }
 
   const map = {};
+
   for (const entry of state) {
     map[entry.key] = entry;
   }
+
   return map;
 }
 
 export function generateCandidateMap(candidates: Array<StatusCandidate>): StatusCandidateMap {
   const map = {};
+
   for (const candidate of candidates) {
     map[candidate.key] = candidate;
   }
+
   return map;
 }
 
-export function combinedMapKeys<T: SnapshotStateMap | StatusCandidateMap>(
+export function combinedMapKeys<T extends SnapshotStateMap | StatusCandidateMap>(
   ...maps: Array<T>
 ): Array<DocumentKey> {
   const keyMap = {};
+
   for (const map of maps) {
     for (const key of Object.keys(map)) {
       keyMap[key] = true;
@@ -63,12 +66,14 @@ export function threeWayMerge(
   root: SnapshotState,
   trunk: SnapshotState,
   other: SnapshotState,
-): { state: SnapshotState, conflicts: Array<MergeConflict> } {
+): {
+  state: SnapshotState;
+  conflicts: Array<MergeConflict>;
+} {
   const stateRoot = generateStateMap(root);
   const stateTrunk = generateStateMap(trunk);
   const stateOther = generateStateMap(other);
   const allKeys = combinedMapKeys(stateRoot, stateTrunk, stateOther);
-
   const newState: SnapshotState = [];
   const conflicts: Array<MergeConflict> = [];
 
@@ -87,11 +92,9 @@ export function threeWayMerge(
     //   other => [ exists, missing, modified ]
     //
     // Therefore, the total number of cases is equal to 2 * 3! = 12
-
     // ~~~~~~~~~~ //
     // Unmodified //
     // ~~~~~~~~~~ //
-
     // (1/12)
     // Unmodified
     if (root && trunk && other && root.blob === trunk.blob && root.blob === other.blob) {
@@ -102,7 +105,6 @@ export function threeWayMerge(
     // ~~~~~~~~~ //
     // Deletions //
     // ~~~~~~~~~ //
-
     // (2/12)
     // Deleted in both
     if (root && trunk === null && other === null) {
@@ -124,7 +126,6 @@ export function threeWayMerge(
     // ~~~~~~~~~ //
     // Additions //
     // ~~~~~~~~~ //
-
     // (5/12)
     // Added in both
     if (root === null && trunk && other) {
@@ -160,7 +161,6 @@ export function threeWayMerge(
     // ~~~~~~~~~~~~~ //
     // Modifications //
     // ~~~~~~~~~~~~~ //
-
     // (8/12)
     // Modified in both
     if (root && trunk && other && root.blob !== trunk.blob && root.blob !== other.blob) {
@@ -196,7 +196,6 @@ export function threeWayMerge(
     // ~~~~~~ //
     // Combos //
     // ~~~~~~ //
-
     // (11/12)
     // Deleted in trunk and modified in other
     if (root && trunk === null && other && other.blob !== root.blob) {
@@ -240,12 +239,14 @@ export function threeWayMerge(
 export function compareBranches(
   a: Branch | null,
   b: Branch | null,
-): { ahead: number, behind: number } {
+): {
+  ahead: number;
+  behind: number;
+} {
   const snapshotsA = a ? a.snapshots : [];
   const snapshotsB = b ? b.snapshots : [];
   const latestA = snapshotsA[snapshotsA.length - 1] || null;
   const latestB = snapshotsB[snapshotsB.length - 1] || null;
-
   const result = {
     ahead: 0,
     behind: 0,
@@ -266,33 +267,33 @@ export function compareBranches(
   }
 
   const root = getRootSnapshot(a, b);
+
   if (root === null) {
     return result;
   }
 
   const indexOfRootInA = snapshotsA.indexOf(root);
   const indexOfRootInB = snapshotsB.indexOf(root);
-
   result.ahead = snapshotsA.length - indexOfRootInA - 1;
   result.behind = snapshotsB.length - indexOfRootInB - 1;
-
   return result;
 }
 
+export interface StateDelta {
+  add: Array<SnapshotStateEntry>;
+  update: Array<SnapshotStateEntry>;
+  remove: Array<SnapshotStateEntry>;
+}
+
 export function stateDelta(
   base: SnapshotState,
   desired: SnapshotState,
-): {
-  add: Array<SnapshotStateEntry>,
-  update: Array<SnapshotStateEntry>,
-  remove: Array<SnapshotStateEntry>,
-} {
-  const result = {
+) {
+  const result: StateDelta = {
     add: [],
     update: [],
     remove: [],
   };
-
   const stateMapStart = generateStateMap(base);
   const stateMapFinish = generateStateMap(desired);
 
@@ -319,14 +320,12 @@ export function stateDelta(
   return result;
 }
 
-export function getStagable(
-  state: SnapshotState,
-  candidates: Array<StatusCandidate>,
-): Array<StageEntry> {
+export function getStagable(state: SnapshotState, candidates: Array<StatusCandidate>) {
   const stagable: Array<StageEntry> = [];
-
   const stateMap = generateStateMap(state);
   const candidateMap = generateCandidateMap(candidates);
+
+  // @ts-expect-error -- TSCONVERSION need to fix the index signatures
   for (const key of combinedMapKeys(stateMap, candidateMap)) {
     const entry = stateMap[key];
     const candidate = candidateMap[key];
@@ -334,22 +333,41 @@ export function getStagable(
     if (!entry && candidate) {
       const { name, document } = candidate;
       const { hash: blobId, content: blobContent } = hashDocument(document);
-      stagable.push({ key, name, blobId, blobContent, added: true });
+      stagable.push({
+        key,
+        name,
+        blobId,
+        blobContent,
+        added: true,
+      });
       continue;
     }
 
     if (entry && !candidate) {
       const { name, blob: blobId } = entry;
-      stagable.push({ key, name, blobId, deleted: true });
+      stagable.push({
+        key,
+        name,
+        blobId,
+        deleted: true,
+      });
       continue;
     }
 
     if (entry && candidate) {
       const { document, name } = candidate;
       const { hash: blobId, content: blobContent } = hashDocument(document);
+
       if (entry.blob !== blobId) {
-        stagable.push({ key, name, blobId, blobContent, modified: true });
+        stagable.push({
+          key,
+          name,
+          blobId,
+          blobContent,
+          modified: true,
+        });
       }
+
       continue;
     }
   }
@@ -360,8 +378,8 @@ export function getStagable(
 export function getRootSnapshot(a: Branch | null, b: Branch | null): string | null {
   const snapshotsA = a ? a.snapshots : [];
   const snapshotsB = b ? b.snapshots : [];
-
   const rootSnapshotId = '';
+
   for (let ai = snapshotsA.length - 1; ai >= 0; ai--) {
     for (let bi = snapshotsB.length - 1; bi >= 0; bi--) {
       if (snapshotsA[ai] === snapshotsB[bi]) {
@@ -369,6 +387,7 @@ export function getRootSnapshot(a: Branch | null, b: Branch | null): string | nu
       }
     }
   }
+
   return rootSnapshotId || null;
 }
 
@@ -376,15 +395,9 @@ export function preMergeCheck(
   trunkState: SnapshotState,
   otherState: SnapshotState,
   candidates: Array<StatusCandidate>,
-): {
-  conflicts: Array<StatusCandidate>,
-  dirty: Array<StatusCandidate>,
-} {
-  const result = {
-    conflicts: [],
-    dirty: [],
-  };
-
+) {
+  const conflicts: Array<StatusCandidate> = [];
+  const dirty: Array<StatusCandidate> = [];
   const trunkMap = generateStateMap(trunkState);
   const otherMap = generateStateMap(otherState);
 
@@ -395,7 +408,7 @@ export function preMergeCheck(
 
     // Candidate is not in trunk or other (not yet in version control)
     if (!trunk && !other) {
-      result.dirty.push(candidate);
+      dirty.push(candidate);
       continue;
     }
 
@@ -424,54 +437,68 @@ export function preMergeCheck(
       blobId !== other.blob &&
       blobId !== trunk.blob
     ) {
-      result.dirty.push(candidate);
+      dirty.push(candidate);
       continue;
     }
 
     // All other cases result in conflict
-    result.conflicts.push(candidate);
+    conflicts.push(candidate);
   }
 
-  return result;
+  return {
+    conflicts,
+    dirty,
+  };
 }
 
-export function hashDocument(doc: Object): { content: string, hash: string } {
+export function hashDocument(
+  doc: Record<string, any>,
+): {
+  content: string;
+  hash: string;
+} {
   if (!doc) {
     throw new Error('Cannot hash undefined value');
   }
 
   // Remove fields we don't care about for sync purposes
   const newDoc = clone(doc);
+
   for (const key of IGNORED_KEYS) {
     delete newDoc[key];
   }
 
   const content = deterministicStringify(newDoc);
-  const hash = crypto
-    .createHash('sha1')
-    .update(content)
-    .digest('hex');
-
-  return { hash, content };
+  const hash = crypto.createHash('sha1').update(content).digest('hex');
+  return {
+    hash,
+    content,
+  };
 }
 
-export function updateStateWithConflictResolutions(
-  state: SnapshotState,
-  conflicts: Array<MergeConflict>,
-): SnapshotState {
+export function updateStateWithConflictResolutions(state: SnapshotState, conflicts: Array<MergeConflict>) {
   const newStateMap = generateStateMap(state);
+
   for (const { choose, key, name } of conflicts) {
     const stateEntry = state.find(e => e.key === key);
 
     // Not in the state, but we choose the conflict
     if (!stateEntry && choose !== null) {
-      newStateMap[key] = { key, name, blob: choose };
+      newStateMap[key] = {
+        key,
+        name,
+        blob: choose,
+      };
       continue;
     }
 
     // Add the conflict
     if (choose !== null) {
-      newStateMap[key] = { ...(stateEntry: Object), blob: choose };
+      // @ts-expect-error -- TSCONVERSION need to decided how to reorder this
+      newStateMap[key] = {
+        ...stateEntry,
+        blob: choose,
+      };
       continue;
     }
 
@@ -490,8 +517,9 @@ export function describeChanges(a: any, b: any): Array<string> {
     return [];
   }
 
-  const changes = [];
+  const changes: Array<string> = [];
   const allKeys = [...Object.keys({ ...a, ...b })];
+
   for (const key of allKeys) {
     if (IGNORED_KEYS.includes(key)) {
       continue;
@@ -499,7 +527,6 @@ export function describeChanges(a: any, b: any): Array<string> {
 
     const aValue = a[key];
     const bValue = b[key];
-
     const aStr = deterministicStringify(aValue);
     const bStr = deterministicStringify(bValue);
 
diff --git a/packages/insomnia-app/app/templating/__tests__/utils.test.js b/packages/insomnia-app/app/templating/__tests__/utils.test.ts
similarity index 58%
rename from packages/insomnia-app/app/templating/__tests__/utils.test.js
rename to packages/insomnia-app/app/templating/__tests__/utils.test.ts
index a079951b4b..b11d664e1c 100644
--- a/packages/insomnia-app/app/templating/__tests__/utils.test.js
+++ b/packages/insomnia-app/app/templating/__tests__/utils.test.ts
@@ -3,29 +3,69 @@ import { globalBeforeEach } from '../../__jest__/before-each';
 
 describe('getKeys()', () => {
   beforeEach(globalBeforeEach);
+
   it('flattens complex object', () => {
     const obj = {
       foo: 'bar',
-      nested: { a: { b: {} } },
+      nested: {
+        a: {
+          b: {},
+        },
+      },
       null: null,
       undefined: undefined,
       false: false,
-      array: ['hello', { hi: 'there' }, true, ['x', 'y', 'z']],
+      array: [
+        'hello',
+        {
+          hi: 'there',
+        },
+        true,
+        ['x', 'y', 'z'],
+      ],
     };
-
     const keys = utils.getKeys(obj).sort((a, b) => (a.name > b.name ? 1 : -1));
-
     expect(keys).toEqual([
-      { name: 'array[0]', value: obj.array[0] },
-      { name: 'array[1].hi', value: obj.array[1].hi },
-      { name: 'array[2]', value: obj.array[2] },
-      { name: 'array[3][0]', value: obj.array[3][0] },
-      { name: 'array[3][1]', value: obj.array[3][1] },
-      { name: 'array[3][2]', value: obj.array[3][2] },
-      { name: 'false', value: obj.false },
-      { name: 'foo', value: obj.foo },
-      { name: 'null', value: obj.null },
-      { name: 'undefined', value: obj.undefined },
+      {
+        name: 'array[0]',
+        value: obj.array[0],
+      },
+      {
+        name: 'array[1].hi',
+        value: obj.array[1].hi,
+      },
+      {
+        name: 'array[2]',
+        value: obj.array[2],
+      },
+      {
+        name: 'array[3][0]',
+        value: obj.array[3][0],
+      },
+      {
+        name: 'array[3][1]',
+        value: obj.array[3][1],
+      },
+      {
+        name: 'array[3][2]',
+        value: obj.array[3][2],
+      },
+      {
+        name: 'false',
+        value: obj.false,
+      },
+      {
+        name: 'foo',
+        value: obj.foo,
+      },
+      {
+        name: 'null',
+        value: obj.null,
+      },
+      {
+        name: 'undefined',
+        value: obj.undefined,
+      },
     ]);
   });
 
@@ -36,93 +76,129 @@ describe('getKeys()', () => {
         // Nothing
       },
     };
-
     const keys = utils.getKeys(obj);
-    expect(keys).toEqual([{ name: 'foo', value: 'bar' }]);
+    expect(keys).toEqual([
+      {
+        name: 'foo',
+        value: 'bar',
+      },
+    ]);
   });
 });
 
 describe('tokenizeTag()', () => {
   beforeEach(globalBeforeEach);
+
   it('tokenizes complex tag', () => {
     const actual = utils.tokenizeTag('{% name bar, "baz \\"qux\\""   , 1 + 5 | default("foo") %}');
-
     const expected = {
       name: 'name',
       args: [
-        { type: 'variable', value: 'bar' },
-        { type: 'string', value: 'baz "qux"', quotedBy: '"' },
-        { type: 'expression', value: '1 + 5 | default("foo")' },
+        {
+          type: 'variable',
+          value: 'bar',
+        },
+        {
+          type: 'string',
+          value: 'baz "qux"',
+          quotedBy: '"',
+        },
+        {
+          type: 'expression',
+          value: '1 + 5 | default("foo")',
+        },
       ],
     };
-
     expect(actual).toEqual(expected);
   });
 
   it('handles whitespace', () => {
     const minimal = utils.tokenizeTag("{%name'foo',bar%}");
     const generous = utils.tokenizeTag("{%name  \t'foo'  ,  bar\t\n%}");
-
     const expected = {
       name: 'name',
       args: [
-        { type: 'string', value: 'foo', quotedBy: "'" },
-        { type: 'variable', value: 'bar' },
+        {
+          type: 'string',
+          value: 'foo',
+          quotedBy: "'",
+        },
+        {
+          type: 'variable',
+          value: 'bar',
+        },
       ],
     };
-
     expect(minimal).toEqual(expected);
     expect(generous).toEqual(expected);
   });
 
   it('handles type string', () => {
     const actual = utils.tokenizeTag("{% name 'foo' %}");
-
     const expected = {
       name: 'name',
-      args: [{ type: 'string', value: 'foo', quotedBy: "'" }],
+      args: [
+        {
+          type: 'string',
+          value: 'foo',
+          quotedBy: "'",
+        },
+      ],
     };
-
     expect(actual).toEqual(expected);
   });
 
   it('handles type number', () => {
     const actual = utils.tokenizeTag('{% name 9.324, 8, 7 %}');
-
     const expected = {
       name: 'name',
       args: [
-        { type: 'number', value: '9.324' },
-        { type: 'number', value: '8' },
-        { type: 'number', value: '7' },
+        {
+          type: 'number',
+          value: '9.324',
+        },
+        {
+          type: 'number',
+          value: '8',
+        },
+        {
+          type: 'number',
+          value: '7',
+        },
       ],
     };
-
     expect(actual).toEqual(expected);
   });
 
   it('handles type boolean', () => {
     const actual = utils.tokenizeTag('{% name true, false %}');
-
     const expected = {
       name: 'name',
       args: [
-        { type: 'boolean', value: true },
-        { type: 'boolean', value: false },
+        {
+          type: 'boolean',
+          value: true,
+        },
+        {
+          type: 'boolean',
+          value: false,
+        },
       ],
     };
-
     expect(actual).toEqual(expected);
   });
 
   it('handles type expression', () => {
     const actual = utils.tokenizeTag("{% name 5 * 10 + 'hello' | default(2 - 3) %}");
-
     const expected = {
       name: 'name',
-      args: [{ type: 'expression', value: "5 * 10 + 'hello' | default(2 - 3)" }],
+      args: [
+        {
+          type: 'expression',
+          value: "5 * 10 + 'hello' | default(2 - 3)",
+        },
+      ],
     };
-
     expect(actual).toEqual(expected);
   });
 
@@ -132,24 +208,26 @@ describe('tokenizeTag()', () => {
    */
   it('handles no commas', () => {
     const actual = utils.tokenizeTag('{% name foo bar baz %}');
-
     const expected = {
       name: 'name',
-      args: [{ type: 'expression', value: 'foo bar baz' }],
+      args: [
+        {
+          type: 'expression',
+          value: 'foo bar baz',
+        },
+      ],
     };
-
     expect(actual).toEqual(expected);
   });
 });
 
 describe('unTokenizeTag()', () => {
   beforeEach(globalBeforeEach);
+
   it('handles the default case', () => {
     const tagStr = '{% name bar, "baz \\"qux\\""   , 1 + 5, \'hi\' %}';
-
     const tagData = utils.tokenizeTag(tagStr);
     const result = utils.unTokenizeTag(tagData);
-
     expect(result).toEqual('{% name bar, "baz \\"qux\\"", 1 + 5, \'hi\' %}');
   });
 
@@ -157,19 +235,41 @@ describe('unTokenizeTag()', () => {
     const tagData = {
       name: 'name',
       args: [
-        { type: 'boolean', value: 'true' },
-        { type: 'enum', value: 'foo' },
-        { type: 'expression', value: 'foo.length' },
-        { type: 'file', value: 'foo/bar/baz' },
-        { type: 'model', value: 'id_123' },
-        { type: 'number', value: '10' },
-        { type: 'string', value: 'foo' },
-        { type: 'variable', value: 'var' },
+        {
+          type: 'boolean',
+          value: 'true',
+        },
+        {
+          type: 'enum',
+          value: 'foo',
+        },
+        {
+          type: 'expression',
+          value: 'foo.length',
+        },
+        {
+          type: 'file',
+          value: 'foo/bar/baz',
+        },
+        {
+          type: 'model',
+          value: 'id_123',
+        },
+        {
+          type: 'number',
+          value: '10',
+        },
+        {
+          type: 'string',
+          value: 'foo',
+        },
+        {
+          type: 'variable',
+          value: 'var',
+        },
       ],
     };
-
     const result = utils.unTokenizeTag(tagData);
-
     expect(result).toEqual(
       "{% name true, 'foo', foo.length, 'foo/bar/baz', 'id_123', 10, 'foo', var %}",
     );
@@ -179,19 +279,24 @@ describe('unTokenizeTag()', () => {
     const tagData = {
       name: 'name',
       args: [
-        { type: 'file', value: 'foo/bar/baz' },
-        { type: 'model', value: 'foo' },
+        {
+          type: 'file',
+          value: 'foo/bar/baz',
+        },
+        {
+          type: 'model',
+          value: 'foo',
+        },
       ],
     };
-
     const result = utils.unTokenizeTag(tagData);
-
     expect(result).toEqual("{% name 'foo/bar/baz', 'foo' %}");
   });
 });
 
 describe('encodeEncoding()', () => {
   beforeEach(globalBeforeEach);
+
   it('encodes things', () => {
     expect(utils.encodeEncoding('hello', 'base64')).toBe('b64::aGVsbG8=::46b');
     expect(utils.encodeEncoding(null, 'base64')).toBe(null);
@@ -203,6 +308,7 @@ describe('encodeEncoding()', () => {
 
 describe('decodeEncoding()', () => {
   beforeEach(globalBeforeEach);
+
   it('encodes things', () => {
     expect(utils.decodeEncoding('b64::aGVsbG8=::46b')).toBe('hello');
     expect(utils.decodeEncoding('aGVsbG8=')).toBe('aGVsbG8=');
diff --git a/packages/insomnia-app/app/templating/base-extension.js b/packages/insomnia-app/app/templating/base-extension.ts
similarity index 72%
rename from packages/insomnia-app/app/templating/base-extension.js
rename to packages/insomnia-app/app/templating/base-extension.ts
index 3fa163b166..fb9f8b076b 100644
--- a/packages/insomnia-app/app/templating/base-extension.js
+++ b/packages/insomnia-app/app/templating/base-extension.ts
@@ -1,67 +1,77 @@
 import * as models from '../models/index';
 import * as templating from './index';
 import * as pluginContexts from '../plugins/context';
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import { decodeEncoding } from './utils';
+import { PluginTemplateTag } from './extensions';
 
 const EMPTY_ARG = '__EMPTY_NUNJUCKS_ARG__';
 
 export default class BaseExtension {
-  constructor(ext, plugin) {
+  _ext: PluginTemplateTag | null = null;
+  _plugin: Plugin | null = null;
+  tags: Array<PluginTemplateTag['name']> | null = null;
+
+  constructor(ext: PluginTemplateTag, plugin: Plugin) {
     this._ext = ext;
     this._plugin = plugin;
-    this.tags = [this.getTag()];
+    const tag = this.getTag();
+    this.tags = [
+      ...(tag === null ? [] : [tag]),
+    ];
   }
 
   getTag() {
-    return this._ext.name;
+    return this._ext?.name || null;
   }
 
   getPriority() {
-    return this._ext.priority || -1;
+    return this._ext?.priority || -1;
   }
 
   getName() {
-    return this._ext.displayName || this.getTag();
+    return this._ext?.displayName || this.getTag();
   }
 
   getDescription() {
-    return this._ext.description || 'no description';
+    return this._ext?.description || 'no description';
   }
 
   getLiveDisplayName() {
     return (
-      this._ext.liveDisplayName ||
-      function(args) {
+      // @ts-expect-error -- TSCONVERSION
+      this._ext?.liveDisplayName ||
+      function() {
         return '';
       }
     );
   }
 
   getDisablePreview() {
-    return this._ext.disablePreview || (() => false);
+    return this._ext?.disablePreview || (() => false);
   }
 
   getArgs() {
-    return this._ext.args || [];
+    return this._ext?.args || [];
   }
 
   getActions() {
-    return this._ext.actions || [];
+    return this._ext?.actions || [];
   }
 
   isDeprecated() {
-    return this._ext.deprecated || false;
+    return this._ext?.deprecated || false;
   }
 
   run(...args) {
-    return this._ext.run(...args);
+    // @ts-expect-error -- TSCONVERSION
+    return this._ext?.run(...args);
   }
 
   parse(parser, nodes, lexer) {
     const tok = parser.nextToken();
-
     let args;
+
     if (parser.peekToken().type !== lexer.TOKEN_BLOCK_END) {
       args = parser.parseSignature(null, true);
     } else {
@@ -77,32 +87,31 @@ export default class BaseExtension {
   asyncRun({ ctx: renderContext }, ...runArgs) {
     // Pull the callback off the end
     const callback = runArgs[runArgs.length - 1];
-
     // Pull out the meta helper
     const renderMeta = renderContext.getMeta ? renderContext.getMeta() : {};
-
     // Pull out the purpose
     const renderPurpose = renderContext.getPurpose ? renderContext.getPurpose() : null;
-
     // Pull out the environment ID
     const environmentId = renderContext.getEnvironmentId ? renderContext.getEnvironmentId() : 'n/a';
-
     // Extract the rest of the args
     const args = runArgs
       .slice(0, runArgs.length - 1)
       .filter(a => a !== EMPTY_ARG)
       .map(decodeEncoding);
-
     // Define a helper context with utils
     const helperContext = {
       ...pluginContexts.app.init(renderPurpose),
+      // @ts-expect-error -- TSCONVERSION
       ...pluginContexts.store.init(this._plugin),
       ...pluginContexts.network.init(environmentId),
       context: renderContext,
       meta: renderMeta,
       renderPurpose,
       util: {
-        render: str => templating.render(str, { context: renderContext }),
+        render: str =>
+          templating.render(str, {
+            context: renderContext,
+          }),
         models: {
           request: {
             getById: models.request.getById,
@@ -114,8 +123,12 @@ export default class BaseExtension {
               return ancestors.filter(doc => doc._id !== request._id);
             },
           },
-          workspace: { getById: models.workspace.getById },
-          oAuth2Token: { getByRequestId: models.oAuth2Token.getByParentId },
+          workspace: {
+            getById: models.workspace.getById,
+          },
+          oAuth2Token: {
+            getByRequestId: models.oAuth2Token.getByParentId,
+          },
           cookieJar: {
             getOrCreateForWorkspace: workspace => {
               return models.cookieJar.getOrCreateForParentId(workspace._id);
@@ -128,8 +141,8 @@ export default class BaseExtension {
         },
       },
     };
-
     let result;
+
     try {
       result = this.run(helperContext, ...args);
     } catch (err) {
diff --git a/packages/insomnia-app/app/templating/extensions/index.js b/packages/insomnia-app/app/templating/extensions/index.js
deleted file mode 100644
index dc1d93a21d..0000000000
--- a/packages/insomnia-app/app/templating/extensions/index.js
+++ /dev/null
@@ -1,100 +0,0 @@
-// @flow
-import type { NunjucksParsedTagArg } from '../utils';
-import type { Request } from '../../models/request';
-import type { Response } from '../../models/response';
-import type { PluginStore } from '../../plugins/context';
-
-export type PluginArgumentValue = string | number | boolean;
-type DisplayName = string | ((args: Array<NunjucksParsedTagArg>) => string);
-
-type PluginArgumentBase = {
-  displayName: DisplayName,
-  description?: string,
-  help?: string,
-  hide?: (args: Array<NunjucksParsedTagArg>) => boolean,
-};
-
-export type PluginArgumentEnumOption = {
-  displayName: DisplayName,
-  value: PluginArgumentValue,
-  description?: string,
-  placeholder?: string,
-};
-
-export type PluginArgumentEnum = PluginArgumentBase & {
-  type: 'enum',
-  options: Array<PluginArgumentEnumOption>,
-  defaultValue?: PluginArgumentValue,
-};
-
-export type PluginArgumentModel = PluginArgumentBase & {
-  type: 'model',
-  model: string,
-  defaultValue?: string,
-};
-
-export type PluginArgumentString = PluginArgumentBase & {
-  type: 'string',
-  placeholder?: string,
-  defaultValue?: string,
-};
-
-export type PluginArgumentBoolean = PluginArgumentBase & {
-  type: 'boolean',
-  defaultValue?: boolean,
-};
-
-export type PluginArgumentFile = PluginArgumentBase & {
-  type: 'file',
-};
-
-export type PluginArgumentNumber = PluginArgumentBase & {
-  type: 'number',
-  placeholder?: string,
-  defaultValue?: number,
-};
-
-export type PluginArgument =
-  | PluginArgumentEnum
-  | PluginArgumentModel
-  | PluginArgumentString
-  | PluginArgumentBoolean
-  | PluginArgumentFile
-  | PluginArgumentNumber;
-
-export type PluginTemplateTagContext = {
-  util: {
-    models: {
-      request: {
-        getById: (id: string) => Promise<Request | null>,
-      },
-      response: {
-        getLatestForRequestId: (id: string) => Promise<Response | null>,
-        getBodyBuffer: (response: Response, fallback?: any) => Promise<Buffer | null>,
-      },
-    },
-  },
-};
-
-export type PluginTemplateTagActionContext = {
-  store: PluginStore,
-};
-
-export type PluginTemplateTagAction = {
-  name: string,
-  icon?: string,
-  run: (context: PluginTemplateTagActionContext) => Promise<void>,
-};
-
-export type PluginTemplateTag = {
-  args: Array<PluginArgument>,
-  name: string,
-  displayName: DisplayName,
-  disablePreview: () => boolean,
-  description: string,
-  actions: Array<PluginTemplateTagAction>,
-  run: (context: PluginTemplateTagContext, ...arg: Array<any>) => Promise<any> | any,
-  deprecated?: boolean,
-  validate?: (value: any) => ?string,
-  priority?: number,
-};
diff --git a/packages/insomnia-app/app/templating/extensions/index.ts b/packages/insomnia-app/app/templating/extensions/index.ts
new file mode 100644
index 0000000000..12e5d81484
--- /dev/null
+++ b/packages/insomnia-app/app/templating/extensions/index.ts
@@ -0,0 +1,100 @@
+import type { NunjucksParsedTagArg } from '../utils';
+import type { Request } from '../../models/request';
+import type { Response } from '../../models/response';
+import type { PluginStore } from '../../plugins/context';
+
+export type PluginArgumentValue = string | number | boolean;
+
+type DisplayName = string | ((args: Array<NunjucksParsedTagArg>) => string);
+
+interface PluginArgumentBase {
+  displayName: DisplayName;
+  description?: string;
+  help?: string;
+  hide?: (args: Array<NunjucksParsedTagArg>) => boolean;
+}
+
+export interface PluginArgumentEnumOption {
+  displayName: DisplayName;
+  value: PluginArgumentValue;
+  description?: string;
+  placeholder?: string;
+}
+
+export type PluginArgumentEnum = PluginArgumentBase & {
+  type: 'enum';
+  options: Array<PluginArgumentEnumOption>;
+  defaultValue?: PluginArgumentValue;
+};
+
+export type PluginArgumentModel = PluginArgumentBase & {
+  type: 'model';
+  model: string;
+  defaultValue?: string;
+};
+
+export type PluginArgumentString = PluginArgumentBase & {
+  type: 'string';
+  placeholder?: string;
+  defaultValue?: string;
+};
+
+export type PluginArgumentBoolean = PluginArgumentBase & {
+  type: 'boolean';
+  defaultValue?: boolean;
+};
+
+export type PluginArgumentFile = PluginArgumentBase & {
+  type: 'file';
+};
+
+export type PluginArgumentNumber = PluginArgumentBase & {
+  type: 'number';
+  placeholder?: string;
+  defaultValue?: number;
+};
+
+export type PluginArgument =
+  | PluginArgumentEnum
+  | PluginArgumentModel
+  | PluginArgumentString
+  | PluginArgumentBoolean
+  | PluginArgumentFile
+  | PluginArgumentNumber;
+
+  export interface PluginTemplateTagContext {
+  util: {
+    models: {
+      request: {
+        getById: (id: string) => Promise<Request | null>;
+      };
+      response: {
+        getLatestForRequestId: (id: string) => Promise<Response | null>;
+        getBodyBuffer: (response: Response, fallback?: any) => Promise<Buffer | null>;
+      };
+    };
+  };
+}
+
+export interface PluginTemplateTagActionContext {
+  store: PluginStore;
+}
+
+export interface PluginTemplateTagAction {
+  name: string;
+  icon?: string;
+  run: (context: PluginTemplateTagActionContext) => Promise<void>;
+}
+
+export interface PluginTemplateTag {
+  args: Array<PluginArgument>;
+  name: string;
+  displayName: DisplayName;
+  disablePreview: () => boolean;
+  description: string;
+  actions: Array<PluginTemplateTagAction>;
+  run: (context: PluginTemplateTagContext, ...arg: Array<any>) => Promise<any> | any;
+  deprecated?: boolean;
+  validate?: (value: any) => string | null;
+  priority?: number;
+}
diff --git a/packages/insomnia-app/app/templating/index.js b/packages/insomnia-app/app/templating/index.ts
similarity index 83%
rename from packages/insomnia-app/app/templating/index.js
rename to packages/insomnia-app/app/templating/index.ts
index 97f3a0277f..8bed91cd9e 100644
--- a/packages/insomnia-app/app/templating/index.js
+++ b/packages/insomnia-app/app/templating/index.ts
@@ -1,4 +1,3 @@
-// @flow
 import nunjucks from 'nunjucks';
 import BaseExtension from './base-extension';
 import type { NunjucksParsedTag } from './utils';
@@ -8,7 +7,11 @@ import type { TemplateTag } from '../plugins/index';
 export class RenderError extends Error {
   message: string;
   path: string | null;
-  location: { line: number, column: number };
+  location: {
+    line: number;
+    column: number;
+  };
+
   type: string;
   reason: string;
 }
@@ -20,9 +23,9 @@ export const RENDER_TAGS = 'tags';
 export const NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME = '_';
 
 // Cached globals
-let nunjucksVariablesOnly = null;
-let nunjucksTagsOnly = null;
-let nunjucksAll = null;
+let nunjucksVariablesOnly: nunjucks.Environment | null = null;
+let nunjucksTagsOnly: nunjucks.Environment | null = null;
+let nunjucksAll: nunjucks.Environment | null = null;
 
 /**
  * Render text based on stuff
@@ -34,8 +37,12 @@ let nunjucksAll = null;
  */
 export function render(
   text: string,
-  config: { context?: Object, path?: string, renderMode?: string } = {},
-): Promise<string> {
+  config: {
+    context?: Record<string, any>;
+    path?: string;
+    renderMode?: string;
+  } = {},
+) {
   const context = config.context || {};
   // context needs to exist on the root for the old templating syntax, and in _ for the new templating syntax
   // old: {{ arr[0].prop }}
@@ -43,28 +50,28 @@ export function render(
   const templatingContext = { ...context, [NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME]: context };
   const path = config.path || null;
   const renderMode = config.renderMode || RENDER_ALL;
-
-  return new Promise(async (resolve, reject) => {
+  return new Promise<string | null>(async (resolve, reject) => {
     const nj = await getNunjucks(renderMode);
-    nj.renderString(text, templatingContext, (err, result) => {
+    nj?.renderString(text, templatingContext, (err, result) => {
       if (err) {
         const sanitizedMsg = err.message
           .replace(/\(unknown path\)\s/, '')
           .replace(/\[Line \d+, Column \d*]/, '')
           .replace(/^\s*Error:\s*/, '')
           .trim();
-
         const location = err.message.match(/\[Line (\d)+, Column (\d)*]/);
         const line = location ? parseInt(location[1]) : 1;
         const column = location ? parseInt(location[2]) : 1;
         const reason = err.message.includes('attempted to output null or undefined value')
           ? 'undefined'
           : 'error';
-
         const newError = new RenderError(sanitizedMsg);
         newError.path = path || '';
         newError.message = sanitizedMsg;
-        newError.location = { line, column };
+        newError.location = {
+          line,
+          column,
+        };
         newError.type = 'render';
         newError.reason = reason;
         reject(newError);
@@ -78,7 +85,7 @@ export function render(
 /**
  * Reload Nunjucks environments. Useful for if plugins change.
  */
-export function reload(): void {
+export function reload() {
   nunjucksAll = null;
   nunjucksVariablesOnly = null;
   nunjucksTagsOnly = null;
@@ -87,14 +94,15 @@ export function reload(): void {
 /**
  * Get definitions of template tags
  */
-export async function getTagDefinitions(): Promise<Array<NunjucksParsedTag>> {
+export async function getTagDefinitions() {
   const env = await getNunjucks(RENDER_ALL);
-
+  // @ts-expect-error -- TSCONVERSION investigate why `extensions` isn't on Environment
   return Object.keys(env.extensions)
+    // @ts-expect-error -- TSCONVERSION investigate why `extensions` isn't on Environment
     .map(k => env.extensions[k])
     .filter(ext => !ext.isDeprecated())
     .sort((a, b) => (a.getPriority() > b.getPriority() ? 1 : -1))
-    .map(ext => ({
+    .map<NunjucksParsedTag>(ext => ({
       name: ext.getTag(),
       displayName: ext.getName(),
       liveDisplayName: ext.getLiveDisplayName(),
@@ -121,10 +129,11 @@ async function getNunjucks(renderMode: string) {
   // ~~~~~~~~~~~~ //
   // Setup Config //
   // ~~~~~~~~~~~~ //
-
   const config = {
-    autoescape: false, // Don't escape HTML
-    throwOnUndefined: true, // Strict mode
+    autoescape: false,
+    // Don't escape HTML
+    throwOnUndefined: true,
+    // Strict mode
     tags: {
       blockStart: '{%',
       blockEnd: '%}',
@@ -150,10 +159,9 @@ async function getNunjucks(renderMode: string) {
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~ //
   // Create Env with Extensions //
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~ //
-
   const nj = nunjucks.configure(config);
-
   let allTemplateTagPlugins: Array<TemplateTag>;
+
   try {
     plugins.ignorePlugin('insomnia-plugin-kong-bundle');
     allTemplateTagPlugins = await plugins.getTemplateTags();
@@ -162,12 +170,14 @@ async function getNunjucks(renderMode: string) {
   }
 
   const allExtensions = allTemplateTagPlugins;
+
   for (let i = 0; i < allExtensions.length; i++) {
     const { templateTag, plugin } = allExtensions[i];
     templateTag.priority = templateTag.priority || i * 100;
+    // @ts-expect-error -- TSCONVERSION
     const instance = new BaseExtension(templateTag, plugin);
+    // @ts-expect-error -- TSCONVERSION
     nj.addExtension(instance.getTag(), instance);
-
     // Hidden helper filter to debug complicated things
     // eg. `{{ foo | urlencode | debug | upper }}`
     nj.addFilter('debug', o => o);
@@ -176,7 +186,6 @@ async function getNunjucks(renderMode: string) {
   // ~~~~~~~~~~~~~~~~~~~~ //
   // Cache Env and Return //
   // ~~~~~~~~~~~~~~~~~~~~ //
-
   if (renderMode === RENDER_VARS) {
     nunjucksVariablesOnly = nj;
   } else if (renderMode === RENDER_TAGS) {
diff --git a/packages/insomnia-app/app/templating/utils.js b/packages/insomnia-app/app/templating/utils.ts
similarity index 69%
rename from packages/insomnia-app/app/templating/utils.js
rename to packages/insomnia-app/app/templating/utils.ts
index 1559d17535..0bf1315d32 100644
--- a/packages/insomnia-app/app/templating/utils.js
+++ b/packages/insomnia-app/app/templating/utils.ts
@@ -1,42 +1,45 @@
-// @flow
-
 import type { PluginArgumentEnumOption } from './extensions';
 import objectPath from 'objectpath';
 import type { PluginStore } from '../plugins/context';
 
-export type NunjucksParsedTagArg = {
-  type: 'string' | 'number' | 'boolean' | 'variable' | 'expression' | 'enum' | 'file' | 'model',
-  encoding?: 'base64',
-  value: string | number | boolean,
-  defaultValue?: string | number | boolean,
-  forceVariable?: boolean,
-  placeholder?: string,
-  help?: string,
-  displayName?: string,
-  quotedBy?: '"' | "'",
-  validate?: (value: any) => string,
-  hide?: (Array<NunjucksParsedTagArg>) => boolean,
-  model?: string,
-  options?: Array<PluginArgumentEnumOption>,
-  itemTypes?: Array<string>,
-  extensions?: Array<string>,
-};
+export interface NunjucksParsedTagArg {
+  type: 'string' | 'number' | 'boolean' | 'variable' | 'expression' | 'enum' | 'file' | 'model';
+  encoding?: 'base64';
+  value: string | number | boolean;
+  defaultValue?: string | number | boolean;
+  forceVariable?: boolean;
+  placeholder?: string;
+  help?: string;
+  displayName?: string;
+  quotedBy?: '"' | "'";
+  validate?: (value: any) => string;
+  hide?: (arg0: Array<NunjucksParsedTagArg>) => boolean;
+  model?: string;
+  options?: Array<PluginArgumentEnumOption>;
+  itemTypes?: Array<'file' | 'directory'>;
+  extensions?: Array<string>;
+}
 
-export type NunjucksActionTag = {
-  name: string,
-  icon?: string,
-  run: (context: PluginStore) => Promise<void>,
-};
+export interface NunjucksActionTag {
+  name: string;
+  icon?: string;
+  run: (context: PluginStore) => Promise<void>;
+}
 
-export type NunjucksParsedTag = {
-  name: string,
-  args: Array<NunjucksParsedTagArg>,
-  actions: Array<NunjucksActionTag>,
-  rawValue?: string,
-  displayName?: string,
-  description?: string,
-  disablePreview?: (Array<NunjucksParsedTagArg>) => boolean,
-};
+export interface NunjucksParsedTag {
+  name: string;
+  args: Array<NunjucksParsedTagArg>;
+  actions?: Array<NunjucksActionTag>;
+  rawValue?: string;
+  displayName?: string;
+  description?: string;
+  disablePreview?: (arg0: Array<NunjucksParsedTagArg>) => boolean;
+}
+
+interface Key {
+  name: string;
+  value: any;
+}
 
 /**
  * Get list of paths to all primitive types in nested object
@@ -44,9 +47,11 @@ export type NunjucksParsedTag = {
  * @param {String} [prefix] - base path to prefix to all paths
  * @returns {Array} - list of paths
  */
-export function getKeys(obj: any, prefix: string = ''): Array<{ name: string, value: any }> {
-  let allKeys = [];
-
+export function getKeys(
+  obj: any,
+  prefix = '',
+): Array<Key> {
+  let allKeys: Array<Key> = [];
   const typeOfObj = Object.prototype.toString.call(obj);
 
   if (typeOfObj === '[object Array]') {
@@ -55,54 +60,50 @@ export function getKeys(obj: any, prefix: string = ''): Array<{ name: string, va
     }
   } else if (typeOfObj === '[object Object]') {
     const keys = Object.keys(obj);
+
     for (const key of keys) {
       allKeys = [...allKeys, ...getKeys(obj[key], forceBracketNotation(prefix, key))];
     }
   } else if (typeOfObj === '[object Function]') {
     // Ignore functions
   } else if (prefix) {
-    allKeys.push({ name: normalizeToDotAndBracketNotation(prefix), value: obj });
+    allKeys.push({
+      name: normalizeToDotAndBracketNotation(prefix),
+      value: obj,
+    });
   }
 
   return allKeys;
 }
 
-export function forceBracketNotation(prefix: string, key: string | number): string {
+export function forceBracketNotation(prefix: string, key: string | number) {
   // Prefix is already in bracket notation because getKeys is recursive
   return `${prefix}${objectPath.stringify([key], "'", true)}`;
 }
 
-export function normalizeToDotAndBracketNotation(prefix: string): string {
+export function normalizeToDotAndBracketNotation(prefix: string) {
   return objectPath.normalize(prefix);
 }
 
 /**
  * Parse a Nunjucks tag string into a usable abject
  * @param {string} tagStr - the template string for the tag
- * @return {object} parsed tag data
  */
-export function tokenizeTag(tagStr: string): NunjucksParsedTag {
+export function tokenizeTag(tagStr: string) {
   // ~~~~~~~~ //
   // Sanitize //
   // ~~~~~~~~ //
-
-  const withoutEnds = tagStr
-    .trim()
-    .replace(/^{%/, '')
-    .replace(/%}$/, '')
-    .trim();
-
+  const withoutEnds = tagStr.trim().replace(/^{%/, '').replace(/%}$/, '').trim();
   const nameMatch = withoutEnds.match(/^[a-zA-Z_$][0-9a-zA-Z_$]*/);
   const name = nameMatch ? nameMatch[0] : withoutEnds;
   const argsStr = withoutEnds.slice(name.length);
-
   // ~~~~~~~~~~~~~ //
   // Tokenize Args //
   // ~~~~~~~~~~~~~ //
+  const args: Array<NunjucksParsedTagArg> = [];
+  let quotedBy: string | null = null;
+  let currentArg: string | null = null;
 
-  const args = [];
-  let quotedBy = null;
-  let currentArg = null;
   for (let i = 0; i < argsStr.length + 1; i++) {
     // Adding an "invisible" at the end helps us terminate the last arg
     const c = argsStr.charAt(i) || ',';
@@ -151,31 +152,52 @@ export function tokenizeTag(tagStr: string): NunjucksParsedTag {
     // End current argument
     if (currentArg !== null && argCompleted) {
       let arg;
+
       if (quotedBy) {
-        arg = { type: 'string', value: currentArg, quotedBy };
+        arg = {
+          type: 'string',
+          value: currentArg,
+          quotedBy,
+        };
       } else if (['true', 'false'].includes(currentArg)) {
-        arg = { type: 'boolean', value: currentArg.toLowerCase() === 'true' };
+        arg = {
+          type: 'boolean',
+          value: currentArg.toLowerCase() === 'true',
+        };
       } else if (currentArg.match(/^\d*\.?\d*$/)) {
-        arg = { type: 'number', value: currentArg };
+        arg = {
+          type: 'number',
+          value: currentArg,
+        };
       } else if (currentArg.match(/^[a-zA-Z_$][0-9a-zA-Z_$]*$/)) {
-        arg = { type: 'variable', value: currentArg };
+        arg = {
+          type: 'variable',
+          value: currentArg,
+        };
       } else {
-        arg = { type: 'expression', value: currentArg };
+        arg = {
+          type: 'expression',
+          value: currentArg,
+        };
       }
 
       args.push(arg);
-
       currentArg = null;
       quotedBy = null;
     }
   }
 
-  return { name, args };
+  const parsedTag: NunjucksParsedTag = {
+    name,
+    args,
+  };
+  return parsedTag;
 }
 
 /** Convert a tokenized tag back into a Nunjucks string */
-export function unTokenizeTag(tagData: NunjucksParsedTag): string {
-  const args = [];
+export function unTokenizeTag(tagData: NunjucksParsedTag) {
+  const args: Array<string> = [];
+
   for (const arg of tagData.args) {
     if (['string', 'model', 'file', 'enum'].includes(arg.type)) {
       const q = arg.quotedBy || "'";
@@ -185,6 +207,7 @@ export function unTokenizeTag(tagData: NunjucksParsedTag): string {
     } else if (arg.type === 'boolean') {
       args.push(arg.value ? 'true' : 'false');
     } else {
+      // @ts-expect-error -- TSCONVERSION
       args.push(arg.value);
     }
   }
@@ -194,7 +217,7 @@ export function unTokenizeTag(tagData: NunjucksParsedTag): string {
 }
 
 /** Get the default Nunjucks string for an extension */
-export function getDefaultFill(name: string, args: Array<NunjucksParsedTagArg>): string {
+export function getDefaultFill(name: string, args: Array<NunjucksParsedTagArg>) {
   const stringArgs: Array<string> = (args || []).map(argDefinition => {
     switch (argDefinition.type) {
       case 'enum':
@@ -202,23 +225,27 @@ export function getDefaultFill(name: string, args: Array<NunjucksParsedTagArg>):
         const fallback = options && options.length ? options[0].value : '';
         const value = defaultValue !== undefined ? String(defaultValue) : String(fallback);
         return `'${value}'`;
+
       case 'number':
+        // @ts-expect-error -- TSCONVERSION
         return `${parseFloat(argDefinition.defaultValue) || 0}`;
+
       case 'boolean':
         return argDefinition.defaultValue ? 'true' : 'false';
+
       case 'string':
       case 'file':
       case 'model':
-        return `'${(argDefinition.defaultValue: any) || ''}'`;
+        return `'${(argDefinition.defaultValue as any) || ''}'`;
+
       default:
         return "''";
     }
   });
-
   return `${name} ${stringArgs.join(', ')}`;
 }
 
-export function encodeEncoding(value: string, encoding: 'base64'): string {
+export function encodeEncoding(value: string, encoding: 'base64') {
   if (typeof value !== 'string') {
     return value;
   }
@@ -231,12 +258,13 @@ export function encodeEncoding(value: string, encoding: 'base64'): string {
   return value;
 }
 
-export function decodeEncoding(value: string): string {
+export function decodeEncoding(value: string) {
   if (typeof value !== 'string') {
     return value;
   }
 
   const results = value.match(/^b64::(.+)::46b$/);
+
   if (results) {
     return Buffer.from(results[1], 'base64').toString('utf8');
   }
diff --git a/packages/insomnia-app/app/test-utils.js b/packages/insomnia-app/app/test-utils.ts
similarity index 68%
rename from packages/insomnia-app/app/test-utils.js
rename to packages/insomnia-app/app/test-utils.ts
index 6797ec3fb1..112546c56d 100644
--- a/packages/insomnia-app/app/test-utils.js
+++ b/packages/insomnia-app/app/test-utils.ts
@@ -1,36 +1,41 @@
-// @flow
-
 import * as modals from './ui/components/modals';
 import type { ErrorModalOptions } from './ui/components/modals/error-modal';
 
 export const getAndClearShowPromptMockArgs = () => {
-  const mockFn = (modals.showPrompt: JestMockFn);
+  const mockFn = modals.showPrompt as jest.Mock;
   const { title, submitName, defaultValue, onComplete } = mockFn.mock.calls[0][0];
   mockFn.mockClear();
-
-  return { title, submitName, defaultValue, onComplete };
+  return {
+    title,
+    submitName,
+    defaultValue,
+    onComplete,
+  };
 };
 
 export const getAndClearShowAlertMockArgs = () => {
-  const mockFn = (modals.showAlert: JestMockFn);
+  const mockFn = modals.showAlert as jest.Mock;
   const { title, okLabel, addCancel, message, onConfirm } = mockFn.mock.calls[0][0];
   mockFn.mockClear();
-
-  return { title, okLabel, addCancel, message, onConfirm };
+  return {
+    title,
+    okLabel,
+    addCancel,
+    message,
+    onConfirm,
+  };
 };
 
 export const getAndClearShowErrorMockArgs = (): ErrorModalOptions => {
-  const mockFn = (modals.showError: JestMockFn);
+  const mockFn = modals.showError as jest.Mock;
   const options: ErrorModalOptions = mockFn.mock.calls[0][0];
   mockFn.mockClear();
-
   return options;
 };
 
 export const getAndClearShowModalMockArgs = () => {
-  const mockFn = (modals.showModal: JestMockFn);
+  const mockFn = modals.showModal as jest.Mock;
   const args = mockFn.mock.calls[0][1];
   mockFn.mockClear();
-
   return args;
 };
diff --git a/packages/insomnia-app/app/ui/components/activity-toggle.js b/packages/insomnia-app/app/ui/components/activity-toggle.tsx
similarity index 51%
rename from packages/insomnia-app/app/ui/components/activity-toggle.js
rename to packages/insomnia-app/app/ui/components/activity-toggle.tsx
index 2c7531e4dd..10118b1115 100644
--- a/packages/insomnia-app/app/ui/components/activity-toggle.js
+++ b/packages/insomnia-app/app/ui/components/activity-toggle.tsx
@@ -1,30 +1,39 @@
-// @flow
-
-import React from 'react';
+import React, { FunctionComponent } from 'react';
 import { MultiSwitch } from 'insomnia-components';
 import type { GlobalActivity } from '../../common/constants';
 import { ACTIVITY_DEBUG, ACTIVITY_SPEC, ACTIVITY_UNIT_TEST } from '../../common/constants';
 import type { Workspace } from '../../models/workspace';
 
-type Props = {
-  activity: GlobalActivity,
-  handleActivityChange: (workspaceId: string, activity: GlobalActivity) => Promise<void>,
-  workspace: Workspace,
-};
+interface Props {
+  activity: GlobalActivity;
+  handleActivityChange: (workspaceId: string, activity: GlobalActivity) => Promise<void>;
+  workspace: Workspace;
+}
 
-export default function ActivityToggle({ activity, handleActivityChange, workspace }: Props) {
+const ActivityToggle: FunctionComponent<Props> = ({ activity, handleActivityChange, workspace }) => {
   const choices = [
-    { label: 'Design', value: ACTIVITY_SPEC },
-    { label: 'Debug', value: ACTIVITY_DEBUG },
-    { label: 'Test', value: ACTIVITY_UNIT_TEST },
+    {
+      label: 'Design',
+      value: ACTIVITY_SPEC,
+    },
+    {
+      label: 'Debug',
+      value: ACTIVITY_DEBUG,
+    },
+    {
+      label: 'Test',
+      value: ACTIVITY_UNIT_TEST,
+    },
   ];
-
   return (
     <MultiSwitch
       name="activity-toggle"
+      // @ts-expect-error -- TSCONVERSION
       onChange={a => handleActivityChange(workspace._id, a)}
       choices={choices}
       selectedValue={activity}
     />
   );
-}
+};
+
+export default ActivityToggle;
diff --git a/packages/insomnia-app/app/ui/components/analytics.js b/packages/insomnia-app/app/ui/components/analytics.tsx
similarity index 76%
rename from packages/insomnia-app/app/ui/components/analytics.js
rename to packages/insomnia-app/app/ui/components/analytics.tsx
index 5b74850105..9b534653aa 100644
--- a/packages/insomnia-app/app/ui/components/analytics.js
+++ b/packages/insomnia-app/app/ui/components/analytics.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { Button } from 'insomnia-components';
 import * as models from '../../models';
@@ -7,33 +6,33 @@ import { AUTOBIND_CFG, getAppLongName } from '../../common/constants';
 import type { WrapperProps } from './wrapper';
 import chartSrc from '../images/chart.svg';
 
-type Props = {
-  wrapperProps: WrapperProps,
-  handleDone: Function,
-};
+interface Props {
+  wrapperProps: WrapperProps;
+  handleDone: (...args: Array<any>) => any;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Analytics extends React.PureComponent<Props, State> {
+class Analytics extends PureComponent<Props> {
   async _handleAnalyticsSetting(enableAnalytics: boolean) {
     const { settings } = this.props.wrapperProps;
-
     // Update settings with analytics preferences
-    await models.settings.update(settings, { enableAnalytics });
-
+    await models.settings.update(settings, {
+      enableAnalytics,
+    });
     this.props.handleDone();
   }
 
-  async _handleClickEnableAnalytics(e: SyntheticEvent<HTMLButtonElement>) {
+  async _handleClickEnableAnalytics() {
     this._handleAnalyticsSetting(true);
   }
 
-  async _handleClickDisableAnalytics(e: SyntheticEvent<HTMLButtonElement>) {
+  async _handleClickDisableAnalytics() {
     this._handleAnalyticsSetting(false);
   }
 
   render() {
     return (
-      <React.Fragment>
+      <Fragment>
         <p>
           <strong>Share Usage Analytics with Kong Inc</strong>
         </p>
@@ -57,7 +56,7 @@ class Analytics extends React.PureComponent<Props, State> {
           onClick={this._handleClickDisableAnalytics}>
           Don't share usage analytics
         </button>
-      </React.Fragment>
+      </Fragment>
     );
   }
 }
diff --git a/packages/insomnia-app/app/ui/components/base/__tests__/editable.test.js b/packages/insomnia-app/app/ui/components/base/__tests__/editable.test.ts
similarity index 100%
rename from packages/insomnia-app/app/ui/components/base/__tests__/editable.test.js
rename to packages/insomnia-app/app/ui/components/base/__tests__/editable.test.ts
diff --git a/packages/insomnia-app/app/ui/components/base/button.js b/packages/insomnia-app/app/ui/components/base/button.tsx
similarity index 51%
rename from packages/insomnia-app/app/ui/components/base/button.js
rename to packages/insomnia-app/app/ui/components/base/button.tsx
index b276352781..4dafe81aa6 100644
--- a/packages/insomnia-app/app/ui/components/base/button.js
+++ b/packages/insomnia-app/app/ui/components/base/button.tsx
@@ -1,11 +1,24 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { ButtonHTMLAttributes, PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 
+interface Props {
+  children: ReactNode,
+  value?: any,
+  className?: string,
+  onDisabledClick?: Function,
+  onClick?: React.MouseEventHandler<HTMLButtonElement> | ((value: any, e: React.MouseEvent<HTMLButtonElement>) => void),
+  disabled?: boolean,
+  tabIndex?: number,
+  type?: ButtonHTMLAttributes<HTMLButtonElement>['type'],
+  id?: string,
+  // TODO(TSCONVERSION) figure out why so many components pass this yet it isn't used
+  title?: string;
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Button extends PureComponent {
-  _handleClick(e) {
+class Button extends PureComponent<Props> {
+  _handleClick(e: React.MouseEvent<HTMLButtonElement>) {
     const { onClick, onDisabledClick, disabled } = this.props;
     const fn = disabled ? onDisabledClick : onClick;
 
@@ -18,7 +31,6 @@ class Button extends PureComponent {
 
   render() {
     const { children, disabled, tabIndex, className, type, id } = this.props;
-
     return (
       <button
         disabled={disabled}
@@ -26,26 +38,12 @@ class Button extends PureComponent {
         type={type}
         tabIndex={tabIndex}
         className={className}
-        onClick={this._handleClick}>
+        onClick={this._handleClick}
+      >
         {children}
       </button>
     );
   }
 }
 
-Button.propTypes = {
-  // Required
-  children: PropTypes.node.isRequired,
-
-  // Optional
-  value: PropTypes.any,
-  className: PropTypes.string,
-  onDisabledClick: PropTypes.func,
-  onClick: PropTypes.func,
-  disabled: PropTypes.bool,
-  tabIndex: PropTypes.number,
-  type: PropTypes.string,
-  id: PropTypes.string,
-};
-
 export default Button;
diff --git a/packages/insomnia-app/app/ui/components/base/copy-button.js b/packages/insomnia-app/app/ui/components/base/copy-button.tsx
similarity index 63%
rename from packages/insomnia-app/app/ui/components/base/copy-button.js
rename to packages/insomnia-app/app/ui/components/base/copy-button.tsx
index ad2ae348ac..f5c58e3b94 100644
--- a/packages/insomnia-app/app/ui/components/base/copy-button.js
+++ b/packages/insomnia-app/app/ui/components/base/copy-button.tsx
@@ -1,23 +1,31 @@
-import React, { PureComponent } from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { clipboard } from 'electron';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
-import { Button } from 'insomnia-components';
+import { Button, ButtonProps } from 'insomnia-components';
+
+interface Props extends ButtonProps {
+  content: string | Function,
+  children?: ReactNode,
+  title?: string,
+  confirmMessage?: string,
+}
+
+interface State {
+  showConfirmation: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class CopyButton extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      showConfirmation: false,
-    };
+class CopyButton extends PureComponent<Props, State> {
+  state: State = {
+    showConfirmation: false,
   }
 
+  _triggerTimeout: NodeJS.Timeout | null = null;
+
   async _handleClick(e) {
     e.preventDefault();
     e.stopPropagation();
-
     const content =
       typeof this.props.content === 'string' ? this.props.content : await this.props.content();
 
@@ -25,29 +33,33 @@ class CopyButton extends PureComponent {
       clipboard.writeText(content);
     }
 
-    this.setState({ showConfirmation: true });
-
+    this.setState({
+      showConfirmation: true,
+    });
     this._triggerTimeout = setTimeout(() => {
-      this.setState({ showConfirmation: false });
+      this.setState({
+        showConfirmation: false,
+      });
     }, 2000);
   }
 
   componentWillUnmount() {
+    if (this._triggerTimeout === null) {
+      return;
+    }
     clearTimeout(this._triggerTimeout);
   }
 
   render() {
     const {
-      content, // eslint-disable-line no-unused-vars
+      content,
       children,
       title,
       confirmMessage,
       ...other
     } = this.props;
     const { showConfirmation } = this.state;
-
     const confirm = typeof confirmMessage === 'string' ? confirmMessage : 'Copied';
-
     return (
       <Button {...other} title={title} onClick={this._handleClick}>
         {showConfirmation ? (
@@ -62,14 +74,4 @@ class CopyButton extends PureComponent {
   }
 }
 
-CopyButton.propTypes = {
-  // Required
-  content: PropTypes.oneOfType([PropTypes.string.isRequired, PropTypes.func.isRequired]).isRequired,
-
-  // Optional
-  children: PropTypes.node,
-  title: PropTypes.string,
-  confirmMessage: PropTypes.string,
-};
-
 export default CopyButton;
diff --git a/packages/insomnia-app/app/ui/components/base/debounced-input.js b/packages/insomnia-app/app/ui/components/base/debounced-input.tsx
similarity index 60%
rename from packages/insomnia-app/app/ui/components/base/debounced-input.js
rename to packages/insomnia-app/app/ui/components/base/debounced-input.tsx
index 1acc3a4efc..947ebed1e8 100644
--- a/packages/insomnia-app/app/ui/components/base/debounced-input.js
+++ b/packages/insomnia-app/app/ui/components/base/debounced-input.tsx
@@ -1,12 +1,23 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import { debounce } from '../../../common/misc';
 
+interface Props {
+  onChange: (value: string) => void;
+  onFocus?: Function;
+  onBlur?: Function;
+  textarea?: boolean;
+  delay?: number;
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class DebouncedInput extends PureComponent {
-  constructor(props) {
+class DebouncedInput extends PureComponent<Props> {
+  _hasFocus = false;
+  _input: HTMLTextAreaElement | HTMLInputElement | null = null;
+  _handleValueChange: Props['onChange'] | null = null;
+
+  constructor(props: Props) {
     super(props);
 
     if (!props.delay) {
@@ -14,38 +25,36 @@ class DebouncedInput extends PureComponent {
     } else {
       this._handleValueChange = debounce(props.onChange, props.delay || 500);
     }
-
-    this._hasFocus = false;
   }
 
-  _handleChange(e) {
-    this._handleValueChange(e.target.value);
+  _handleChange(e: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>) {
+    this._handleValueChange?.(e.target.value);
   }
 
-  _handleFocus(e) {
+  _handleFocus(e: React.FocusEvent<HTMLTextAreaElement | HTMLInputElement>) {
     this._hasFocus = true;
     this.props.onFocus && this.props.onFocus(e);
   }
 
-  _handleBlur(e) {
+  _handleBlur(e: React.FocusEvent<HTMLTextAreaElement | HTMLInputElement>) {
     this._hasFocus = false;
     this.props.onBlur && this.props.onBlur(e);
   }
 
-  _setRef(n) {
+  _setRef(n: HTMLTextAreaElement | HTMLInputElement) {
     this._input = n;
   }
 
-  setAttribute(name, value) {
-    this._input.setAttribute(name, value);
+  setAttribute(name: string, value: string) {
+    this._input?.setAttribute(name, value);
   }
 
-  removeAttribute(name) {
-    this._input.removeAttribute(name);
+  removeAttribute(name: string) {
+    this._input?.removeAttribute(name);
   }
 
-  getAttribute(name) {
-    this._input.getAttribute(name);
+  getAttribute(name: string) {
+    this._input?.getAttribute(name);
   }
 
   hasFocus() {
@@ -78,6 +87,7 @@ class DebouncedInput extends PureComponent {
     if (this._input) {
       // Hack to focus the end (set value to current value);
       this._input.value = this.getValue();
+
       this._input.focus();
     }
   }
@@ -104,17 +114,22 @@ class DebouncedInput extends PureComponent {
 
   render() {
     const {
-      onChange, // eslint-disable-line no-unused-vars
-      onFocus, // eslint-disable-line no-unused-vars
-      onBlur, // eslint-disable-line no-unused-vars
-      delay, // eslint-disable-line no-unused-vars
+      onChange,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
+      onFocus,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
+      onBlur,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
+      delay,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
       textarea,
       ...props
     } = this.props;
+
     if (textarea) {
       return (
         <textarea
-          ref={this._setRef}
+          ref={ref => { this._input = ref; }}
           {...props}
           onChange={this._handleChange}
           onFocus={this._handleFocus}
@@ -124,7 +139,7 @@ class DebouncedInput extends PureComponent {
     } else {
       return (
         <input
-          ref={this._setRef}
+          ref={ref => { this._input = ref; }}
           {...props}
           onChange={this._handleChange}
           onFocus={this._handleFocus}
@@ -135,15 +150,4 @@ class DebouncedInput extends PureComponent {
   }
 }
 
-DebouncedInput.propTypes = {
-  // Required
-  onChange: PropTypes.func.isRequired,
-
-  // Optional
-  onFocus: PropTypes.func,
-  onBlur: PropTypes.func,
-  textarea: PropTypes.bool,
-  delay: PropTypes.number,
-};
-
 export default DebouncedInput;
diff --git a/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-button.js b/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-button.tsx
similarity index 50%
rename from packages/insomnia-app/app/ui/components/base/dropdown/dropdown-button.js
rename to packages/insomnia-app/app/ui/components/base/dropdown/dropdown-button.tsx
index e38ce385f8..d4eb9d4da6 100644
--- a/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-button.js
+++ b/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-button.tsx
@@ -1,12 +1,19 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { HTMLAttributes, PureComponent, ReactNode } from 'react';
 
-class DropdownButton extends PureComponent {
+interface Props extends HTMLAttributes<HTMLButtonElement> {
+  children: ReactNode,
+  noWrap?: boolean,
+  className?: string,
+}
+
+class DropdownButton extends PureComponent<Props> {
   render() {
     const { children, noWrap, ...props } = this.props;
+
     if (noWrap) {
       return <>{children}</>;
     }
+
     return (
       <button type="button" {...props}>
         {children}
@@ -15,9 +22,4 @@ class DropdownButton extends PureComponent {
   }
 }
 
-DropdownButton.propTypes = {
-  children: PropTypes.node,
-  noWrap: PropTypes.bool,
-};
-
 export default DropdownButton;
diff --git a/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-divider.js b/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-divider.tsx
similarity index 66%
rename from packages/insomnia-app/app/ui/components/base/dropdown/dropdown-divider.js
rename to packages/insomnia-app/app/ui/components/base/dropdown/dropdown-divider.tsx
index 6d26b66fd7..1292a39626 100644
--- a/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-divider.js
+++ b/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-divider.tsx
@@ -1,15 +1,16 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { PureComponent, ReactNode } from 'react';
 import classnames from 'classnames';
 
-class DropdownDivider extends PureComponent {
+interface Props {
+  children?: ReactNode,
+}
+
+class DropdownDivider extends PureComponent<Props> {
   render() {
     const { children } = this.props;
-
     const classes = classnames('dropdown__divider', {
       'dropdown__divider--no-name': !children,
     });
-
     return (
       <div className={classes}>
         <span className="dropdown__divider__label">{children}</span>
@@ -18,8 +19,4 @@ class DropdownDivider extends PureComponent {
   }
 }
 
-DropdownDivider.propTypes = {
-  children: PropTypes.node,
-};
-
 export default DropdownDivider;
diff --git a/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-hint.js b/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-hint.tsx
similarity index 64%
rename from packages/insomnia-app/app/ui/components/base/dropdown/dropdown-hint.js
rename to packages/insomnia-app/app/ui/components/base/dropdown/dropdown-hint.tsx
index d2123ee431..5b338934f4 100644
--- a/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-hint.js
+++ b/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-hint.tsx
@@ -1,13 +1,12 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import Hotkey from '../../hotkey';
 import type { KeyBindings } from '../../../../common/hotkeys';
 
-type Props = {
-  keyBindings: KeyBindings,
-};
+interface Props {
+  keyBindings: KeyBindings;
+}
 
-class DropdownHint extends React.PureComponent<Props> {
+class DropdownHint extends PureComponent<Props> {
   render() {
     const { keyBindings } = this.props;
     return <Hotkey className="dropdown__hint" keyBindings={keyBindings} />;
diff --git a/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-item.js b/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-item.tsx
similarity index 55%
rename from packages/insomnia-app/app/ui/components/base/dropdown/dropdown-item.js
rename to packages/insomnia-app/app/ui/components/base/dropdown/dropdown-item.tsx
index 3c8429e896..7479738998 100644
--- a/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-item.js
+++ b/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-item.tsx
@@ -1,11 +1,23 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { createElement, PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import classnames from 'classnames';
 import { AUTOBIND_CFG } from '../../../../common/constants';
 
+interface Props {
+  addIcon?: boolean; // TODO(TSCONVERSION) some consumers are passing this prop but it appears to be unused
+  title?: string,
+  buttonClass?: React.ComponentType,
+  stayOpenAfterClick?: boolean,
+  value?: any,
+  disabled?: boolean,
+  onClick: Function,
+  children: ReactNode,
+  className?: string,
+  color?: string,
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class DropdownItem extends PureComponent {
+class DropdownItem extends PureComponent<Props> {
   _handleClick(e) {
     const { stayOpenAfterClick, onClick, disabled } = this.props;
 
@@ -30,13 +42,17 @@ class DropdownItem extends PureComponent {
       children,
       className,
       color,
-      onClick, // eslint-disable-line no-unused-vars
-      stayOpenAfterClick, // eslint-disable-line no-unused-vars
+      onClick,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
+      stayOpenAfterClick,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
       ...props
     } = this.props;
-
-    const styles = color ? { color } : {};
-
+    const styles = color
+      ? {
+        color,
+      }
+      : {};
     const inner = (
       <div className={classnames('dropdown__inner', className)}>
         <div className="dropdown__text" style={styles}>
@@ -44,26 +60,14 @@ class DropdownItem extends PureComponent {
         </div>
       </div>
     );
-
     const buttonProps = {
       type: 'button',
       onClick: this._handleClick,
       ...props,
     };
-
-    return React.createElement(buttonClass || 'button', buttonProps, inner);
+    // @ts-expect-error -- TSCONVERSION
+    return createElement(buttonClass || 'button', buttonProps, inner);
   }
 }
 
-DropdownItem.propTypes = {
-  buttonClass: PropTypes.any,
-  stayOpenAfterClick: PropTypes.bool,
-  value: PropTypes.any,
-  disabled: PropTypes.bool,
-  onClick: PropTypes.func,
-  children: PropTypes.node,
-  className: PropTypes.string,
-  color: PropTypes.string,
-};
-
 export default DropdownItem;
diff --git a/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-right.js b/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-right.tsx
similarity index 57%
rename from packages/insomnia-app/app/ui/components/base/dropdown/dropdown-right.js
rename to packages/insomnia-app/app/ui/components/base/dropdown/dropdown-right.tsx
index 273f736c44..e608f9e72d 100644
--- a/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-right.js
+++ b/packages/insomnia-app/app/ui/components/base/dropdown/dropdown-right.tsx
@@ -1,8 +1,12 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { PureComponent, ReactNode } from 'react';
 import classnames from 'classnames';
 
-class DropdownRight extends PureComponent {
+interface Props {
+  children: ReactNode,
+  className?: string,
+}
+
+class DropdownRight extends PureComponent<Props> {
   render() {
     const { className, children, ...extraProps } = this.props;
     return (
@@ -13,9 +17,4 @@ class DropdownRight extends PureComponent {
   }
 }
 
-DropdownRight.propTypes = {
-  children: PropTypes.node,
-  className: PropTypes.string,
-};
-
 export default DropdownRight;
diff --git a/packages/insomnia-app/app/ui/components/base/dropdown/dropdown.js b/packages/insomnia-app/app/ui/components/base/dropdown/dropdown.tsx
similarity index 77%
rename from packages/insomnia-app/app/ui/components/base/dropdown/dropdown.js
rename to packages/insomnia-app/app/ui/components/base/dropdown/dropdown.tsx
index aa21092e59..f398e433f1 100644
--- a/packages/insomnia-app/app/ui/components/base/dropdown/dropdown.js
+++ b/packages/insomnia-app/app/ui/components/base/dropdown/dropdown.tsx
@@ -1,5 +1,4 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { CSSProperties, Fragment, PureComponent, ReactNode } from 'react';
 import ReactDOM from 'react-dom';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../../common/constants';
@@ -11,33 +10,52 @@ import { fuzzyMatch } from '../../../../common/misc';
 import KeydownBinder from '../../keydown-binder';
 import { executeHotKey } from '../../../../common/hotkeys-listener';
 import { hotKeyRefs } from '../../../../common/hotkeys';
-
 const dropdownsContainer = document.querySelector('#dropdowns-container');
 
+export interface DropdownProps {
+  children: ReactNode,
+  right?: boolean,
+  outline?: boolean,
+  wide?: boolean,
+  onOpen?: Function,
+  onHide?: Function,
+  className?: string,
+  style?: CSSProperties,
+  beside?: boolean,
+}
+
+interface State {
+  open: boolean,
+  dropUp: boolean,
+  filter: string,
+  filterVisible: boolean,
+  filterItems?: Array<number> | null,
+  filterActiveIndex: number,
+  forcedPosition?: {x: number, y: number} | null,
+  uniquenessKey: number,
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Dropdown extends PureComponent {
-  constructor(props) {
-    super(props);
+class Dropdown extends PureComponent<DropdownProps, State> {
+  private _node: HTMLDivElement | null = null;
+  private _dropdownList: HTMLDivElement | null = null;
+  private _filter: HTMLInputElement | null = null;
 
-    this.state = {
-      open: false,
-      dropUp: false,
-
-      // Filter Stuff
-      filter: '',
-      filterVisible: false,
-      filterItems: null,
-      filterActiveIndex: 0,
-
-      // Position
-      forcedPosition: null,
-
-      // Use this to force new menu every time dropdown opens
-      uniquenessKey: 0,
-    };
+  state: State = {
+    open: false,
+    dropUp: false,
+    // Filter Stuff
+    filter: '',
+    filterVisible: false,
+    filterItems: null,
+    filterActiveIndex: 0,
+    // Position
+    forcedPosition: null,
+    // Use this to force new menu every time dropdown opens
+    uniquenessKey: 0,
   }
 
-  _setRef(n) {
+  _setRef(n: HTMLDivElement) {
     this._node = n;
   }
 
@@ -45,7 +63,10 @@ class Dropdown extends PureComponent {
     if (e.key === 'Enter') {
       // Listen for the Enter key and "click" on the active list item
       const selector = `li[data-filter-index="${this.state.filterActiveIndex}"] button`;
-      const button = this._dropdownList.querySelector(selector);
+
+      const button = this._dropdownList?.querySelector(selector);
+
+      // @ts-expect-error -- TSCONVERSION
       button && button.click();
     }
   }
@@ -59,7 +80,9 @@ class Dropdown extends PureComponent {
     }
 
     // Filter the list items that are filterable (have data-filter-index property)
-    const filterItems = [];
+    const filterItems: Array<number> = [];
+
+    // @ts-expect-error -- TSCONVERSION convert to array or use querySelectorAll().forEach
     for (const listItem of this._dropdownList.querySelectorAll('li')) {
       if (!listItem.hasAttribute('data-filter-index')) {
         continue;
@@ -83,13 +106,15 @@ class Dropdown extends PureComponent {
 
   _handleDropdownNavigation(e) {
     const { key, shiftKey } = e;
-
     // Handle tab and arrows to move up and down dropdown entries
     const { filterItems, filterActiveIndex } = this.state;
+
     if (['Tab', 'ArrowDown', 'ArrowUp'].includes(key)) {
       e.preventDefault();
       const items = filterItems || [];
+
       if (!filterItems) {
+        // @ts-expect-error -- TSCONVERSION convert to array or use querySelectorAll().forEach
         for (const li of this._dropdownList.querySelectorAll('li')) {
           if (li.hasAttribute('data-filter-index')) {
             const filterIndex = li.getAttribute('data-filter-index');
@@ -99,15 +124,20 @@ class Dropdown extends PureComponent {
       }
 
       const i = items.indexOf(filterActiveIndex);
+
       if (key === 'ArrowUp' || (key === 'Tab' && shiftKey)) {
         const nextI = i > 0 ? items[i - 1] : items[items.length - 1];
-        this.setState({ filterActiveIndex: nextI });
+        this.setState({
+          filterActiveIndex: nextI,
+        });
       } else {
-        this.setState({ filterActiveIndex: items[i + 1] || items[0] });
+        this.setState({
+          filterActiveIndex: items[i + 1] || items[0],
+        });
       }
     }
 
-    this._filter.focus();
+    this._filter?.focus();
   }
 
   _handleBodyKeyDown(e) {
@@ -134,12 +164,15 @@ class Dropdown extends PureComponent {
     const dropdownList = this._dropdownList;
 
     // Compute the size of all the menus
+    // @ts-expect-error -- TSCONVERSION should exit if node is not defined
     let dropdownBtnRect = this._node.getBoundingClientRect();
+
     const bodyRect = document.body.getBoundingClientRect();
     const dropdownListRect = dropdownList.getBoundingClientRect();
-
     const { forcedPosition } = this.state;
+
     if (forcedPosition) {
+      // @ts-expect-error -- TSCONVERSION missing properties
       dropdownBtnRect = {
         left: forcedPosition.x,
         right: bodyRect.width - forcedPosition.x,
@@ -154,7 +187,6 @@ class Dropdown extends PureComponent {
     const bodyHeight = bodyRect.height;
     const dropdownTop = dropdownBtnRect.top;
     const dropUp = dropdownTop > bodyHeight - 200;
-
     // Reset all the things so we can start fresh
     this._dropdownList.style.left = 'initial';
     this._dropdownList.style.right = 'initial';
@@ -162,16 +194,13 @@ class Dropdown extends PureComponent {
     this._dropdownList.style.bottom = 'initial';
     this._dropdownList.style.minWidth = 'initial';
     this._dropdownList.style.maxWidth = 'initial';
-
     const screenMargin = 6;
-
     const { right, wide } = this.props;
+
     if (right || wide) {
       const { right: originalRight } = dropdownBtnRect;
-
       // Prevent dropdown from squishing against left side of screen
       const right = Math.max(dropdownListRect.width + screenMargin, originalRight);
-
       const { beside } = this.props;
       const offset = beside ? dropdownBtnRect.width - 40 : 0;
       this._dropdownList.style.right = `${bodyRect.width - right + offset}px`;
@@ -180,13 +209,10 @@ class Dropdown extends PureComponent {
 
     if (!right || wide) {
       const { left: originalLeft } = dropdownBtnRect;
-
       const { beside } = this.props;
       const offset = beside ? dropdownBtnRect.width - 40 : 0;
-
       // Prevent dropdown from squishing against right side of screen
       const left = Math.min(bodyRect.width - dropdownListRect.width - screenMargin, originalLeft);
-
       this._dropdownList.style.left = `${left + offset}px`;
       this._dropdownList.style.maxWidth = `${Math.min(
         dropdownListRect.width,
@@ -216,11 +242,11 @@ class Dropdown extends PureComponent {
     e.preventDefault();
   }
 
-  _addDropdownListRef(n) {
+  _addDropdownListRef(n: HTMLDivElement) {
     this._dropdownList = n;
   }
 
-  _addFilterRef(n) {
+  _addFilterRef(n: HTMLInputElement) {
     this._filter = n;
 
     // Automatically focus the filter element when mounted so we can start typing
@@ -229,13 +255,8 @@ class Dropdown extends PureComponent {
     }
   }
 
-  _addDropdownMenuRef(n) {
-    this._dropdownMenu = n;
-  }
-
   _getFlattenedChildren(children) {
-    let newChildren = [];
-
+    let newChildren: Array<ReactNode> = [];
     // Ensure children is an array
     children = Array.isArray(children) ? children : [children];
 
@@ -245,7 +266,7 @@ class Dropdown extends PureComponent {
         continue;
       }
 
-      if (child.type === React.Fragment) {
+      if (child.type === Fragment) {
         newChildren = [...newChildren, ...this._getFlattenedChildren(child.props.children)];
       } else if (Array.isArray(child)) {
         newChildren = [...newChildren, ...this._getFlattenedChildren(child)];
@@ -265,18 +286,23 @@ class Dropdown extends PureComponent {
     // Focus the dropdown button after hiding
     if (this._node) {
       const button = this._node.querySelector('button');
+
       button && button.focus();
     }
 
-    this.setState({ open: false });
+    this.setState({
+      open: false,
+    });
     this.props.onHide && this.props.onHide();
   }
 
-  show(filterVisible = false, forcedPosition = null) {
+  show(filterVisible = false, forcedPosition: { x: number; y: number } | null = null) {
     const bodyHeight = document.body.getBoundingClientRect().height;
-    const dropdownTop = this._node.getBoundingClientRect().top;
-    const dropUp = dropdownTop > bodyHeight - 200;
 
+    // @ts-expect-error -- TSCONVERSION _node can be undefined
+    const dropdownTop = this._node.getBoundingClientRect().top;
+
+    const dropUp = dropdownTop > bodyHeight - 200;
     this.setState({
       open: true,
       dropUp,
@@ -287,7 +313,6 @@ class Dropdown extends PureComponent {
       filterActiveIndex: -1,
       uniquenessKey: this.state.uniquenessKey + 1,
     });
-
     this.props.onOpen && this.props.onOpen();
   }
 
@@ -301,7 +326,6 @@ class Dropdown extends PureComponent {
 
   render() {
     const { right, outline, wide, className, style, children } = this.props;
-
     const {
       dropUp,
       open,
@@ -311,13 +335,12 @@ class Dropdown extends PureComponent {
       filterItems,
       filter,
     } = this.state;
-
     const classes = classnames('dropdown', className, {
       'dropdown--wide': wide,
       'dropdown--open': open,
     });
-
     const menuClasses = classnames({
+      // eslint-disable-next-line camelcase
       dropdown__menu: true,
       'theme--dropdown__menu': true,
       'dropdown__menu--open': open,
@@ -325,13 +348,13 @@ class Dropdown extends PureComponent {
       'dropdown__menu--up': dropUp,
       'dropdown__menu--right': right,
     });
-
-    const dropdownButtons = [];
-    const dropdownItems = [];
+    const dropdownButtons: Array<ReactNode> = [];
+    const dropdownItems: Array<ReactNode> = [];
 
     const allChildren = this._getFlattenedChildren(children);
 
     const visibleChildren = allChildren.filter((child, i) => {
+      // @ts-expect-error -- TSCONVERSION this should cater for all types that ReactNode can be
       if (child.type.name !== DropdownItem.name) {
         return true;
       }
@@ -342,28 +365,40 @@ class Dropdown extends PureComponent {
 
     for (let i = 0; i < allChildren.length; i++) {
       const child = allChildren[i];
+
+      // @ts-expect-error -- TSCONVERSION this should cater for all types that ReactNode can be
       if (child.type.name === DropdownButton.name) {
         dropdownButtons.push(child);
+      // @ts-expect-error -- TSCONVERSION this should cater for all types that ReactNode can be
       } else if (child.type.name === DropdownItem.name) {
         const active = i === filterActiveIndex;
         const hide = !visibleChildren.includes(child);
         dropdownItems.push(
-          <li key={i} data-filter-index={i} className={classnames({ active, hide })}>
+          <li
+            key={i}
+            data-filter-index={i}
+            className={classnames({
+              active,
+              hide,
+            })}>
             {child}
           </li>,
         );
+      // @ts-expect-error -- TSCONVERSION this should cater for all types that ReactNode can be
       } else if (child.type.name === DropdownDivider.name) {
         const currentIndex = visibleChildren.indexOf(child);
         const nextChild = visibleChildren[currentIndex + 1];
 
         // Only show the divider if the next child is a DropdownItem
+        // @ts-expect-error -- TSCONVERSION this should cater for all types that ReactNode can be
         if (nextChild && nextChild.type.name === DropdownItem.name) {
           dropdownItems.push(<li key={i}>{child}</li>);
         }
       }
     }
 
-    let finalChildren = [];
+    let finalChildren: React.ReactNode = [];
+
     if (dropdownButtons.length !== 1) {
       console.error(`Dropdown needs exactly one DropdownButton! Got ${dropdownButtons.length}`, {
         allChildren,
@@ -376,13 +411,12 @@ class Dropdown extends PureComponent {
           <div
             key="item"
             className={menuClasses}
-            ref={this._addDropdownMenuRef}
             aria-hidden={!open}>
             <div className="dropdown__backdrop theme--transparent-overlay" />
             <div
               key={uniquenessKey}
               ref={this._addDropdownListRef}
-              tabIndex="-1"
+              tabIndex={-1}
               className={classnames('dropdown__list', {
                 'dropdown__list--filtering': filterVisible,
               })}>
@@ -396,9 +430,15 @@ class Dropdown extends PureComponent {
                 />
               </div>
               {noResults && <div className="text-center pad warning">No match :(</div>}
-              <ul className={classnames({ hide: noResults })}>{dropdownItems}</ul>
+              <ul
+                className={classnames({
+                  hide: noResults,
+                })}>
+                {dropdownItems}
+              </ul>
             </div>
           </div>,
+          // @ts-expect-error -- TSCONVERSION
           dropdownsContainer,
         ),
       ];
@@ -411,7 +451,7 @@ class Dropdown extends PureComponent {
           className={classes}
           ref={this._setRef}
           onClick={this._handleClick}
-          tabIndex="-1"
+          tabIndex={-1}
           onMouseDown={Dropdown._handleMouseDown}>
           {finalChildren}
         </div>
@@ -420,19 +460,4 @@ class Dropdown extends PureComponent {
   }
 }
 
-Dropdown.propTypes = {
-  // Required
-  children: PropTypes.node.isRequired,
-
-  // Optional
-  right: PropTypes.bool,
-  outline: PropTypes.bool,
-  wide: PropTypes.bool,
-  onOpen: PropTypes.func,
-  onHide: PropTypes.func,
-  className: PropTypes.string,
-  style: PropTypes.string,
-  beside: PropTypes.bool,
-};
-
 export default Dropdown;
diff --git a/packages/insomnia-app/app/ui/components/base/dropdown/index.js b/packages/insomnia-app/app/ui/components/base/dropdown/index.ts
similarity index 100%
rename from packages/insomnia-app/app/ui/components/base/dropdown/index.js
rename to packages/insomnia-app/app/ui/components/base/dropdown/index.ts
diff --git a/packages/insomnia-app/app/ui/components/base/editable.stories.js b/packages/insomnia-app/app/ui/components/base/editable.stories.tsx
similarity index 84%
rename from packages/insomnia-app/app/ui/components/base/editable.stories.js
rename to packages/insomnia-app/app/ui/components/base/editable.stories.tsx
index 510a87d497..87015f3eec 100644
--- a/packages/insomnia-app/app/ui/components/base/editable.stories.js
+++ b/packages/insomnia-app/app/ui/components/base/editable.stories.tsx
@@ -2,7 +2,9 @@ import React from 'react';
 import '../../../../.storybook/index.less';
 import Editable from './editable';
 
-export default { title: 'Editable' };
+export default {
+  title: 'Editable',
+};
 
 export const input = () => (
   <Editable value="Double-click to edit me" onSubmit={v => console.log('New value', v)} />
diff --git a/packages/insomnia-app/app/ui/components/base/editable.js b/packages/insomnia-app/app/ui/components/base/editable.tsx
similarity index 77%
rename from packages/insomnia-app/app/ui/components/base/editable.js
rename to packages/insomnia-app/app/ui/components/base/editable.tsx
index 6144c0c28f..9d7b705746 100644
--- a/packages/insomnia-app/app/ui/components/base/editable.js
+++ b/packages/insomnia-app/app/ui/components/base/editable.tsx
@@ -1,10 +1,9 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import KeydownBinder from '../keydown-binder';
 
-export const shouldSave = (oldValue, newValue, preventBlank) => {
+export const shouldSave = (oldValue, newValue, preventBlank = false) => {
   // Should not save if length = 0 and we want to prevent blank
   if (preventBlank && !newValue.length) {
     return false;
@@ -19,16 +18,31 @@ export const shouldSave = (oldValue, newValue, preventBlank) => {
   return true;
 };
 
+interface Props {
+  onSubmit: (value?: string) => void,
+  value: string,
+  fallbackValue?: string,
+  blankValue?: string,
+  renderReadView?: Function,
+  singleClick?: boolean,
+  onEditStart?: Function,
+  className?: string,
+  preventBlank?: boolean,
+}
+
+interface State {
+  editing: boolean;
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Editable extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      editing: false,
-    };
+class Editable extends PureComponent<Props, State> {
+  state: State = {
+    editing: false,
   }
 
-  _handleSetInputRef(n) {
+  _input: HTMLInputElement | null = null;
+
+  _handleSetInputRef(n: HTMLInputElement) {
     this._input = n;
   }
 
@@ -39,8 +53,9 @@ class Editable extends PureComponent {
   }
 
   _handleEditStart() {
-    this.setState({ editing: true });
-
+    this.setState({
+      editing: true,
+    });
     setTimeout(() => {
       this._input && this._input.focus();
       this._input && this._input.select();
@@ -53,7 +68,8 @@ class Editable extends PureComponent {
 
   _handleEditEnd() {
     const originalValue = this.props.value;
-    const newValue = this._input.value.trim();
+
+    const newValue = this._input?.value.trim();
 
     if (shouldSave(originalValue, newValue, this.props.preventBlank)) {
       // Don't run onSubmit for values that haven't been changed
@@ -62,7 +78,13 @@ class Editable extends PureComponent {
 
     // This timeout prevents the UI from showing the old value after submit.
     // It should give the UI enough time to redraw the new value.
-    setTimeout(async () => this.setState({ editing: false }), 100);
+    setTimeout(
+      async () =>
+        this.setState({
+          editing: false,
+        }),
+      100,
+    );
   }
 
   _handleEditKeyDown(e) {
@@ -71,13 +93,13 @@ class Editable extends PureComponent {
       this._handleEditEnd();
     } else if (e.keyCode === 27) {
       // Pressed Escape
-
       // Prevent bubbling to modals and other escape listeners.
       e.stopPropagation();
 
       if (this._input) {
         // Set the input to the original value
         this._input.value = this.props.value;
+
         this._handleEditEnd();
       }
     }
@@ -89,9 +111,10 @@ class Editable extends PureComponent {
       fallbackValue,
       blankValue,
       singleClick,
-      onEditStart, // eslint-disable-line no-unused-vars
-      preventBlank, // eslint-disable-line no-unused-vars
+      onEditStart,
+      preventBlank,
       className,
+      onSubmit,
       renderReadView,
       ...extra
     } = this.props;
@@ -131,18 +154,4 @@ class Editable extends PureComponent {
   }
 }
 
-Editable.propTypes = {
-  onSubmit: PropTypes.func.isRequired,
-  value: PropTypes.string.isRequired,
-
-  // Optional
-  fallbackValue: PropTypes.string,
-  blankValue: PropTypes.string,
-  renderReadView: PropTypes.func,
-  singleClick: PropTypes.bool,
-  onEditStart: PropTypes.func,
-  className: PropTypes.string,
-  preventBlank: PropTypes.bool,
-};
-
 export default Editable;
diff --git a/packages/insomnia-app/app/ui/components/base/file-input-button.js b/packages/insomnia-app/app/ui/components/base/file-input-button.tsx
similarity index 68%
rename from packages/insomnia-app/app/ui/components/base/file-input-button.js
rename to packages/insomnia-app/app/ui/components/base/file-input-button.tsx
index 183d3270cc..7c9010153c 100644
--- a/packages/insomnia-app/app/ui/components/base/file-input-button.js
+++ b/packages/insomnia-app/app/ui/components/base/file-input-button.tsx
@@ -1,26 +1,22 @@
-// @flow
-import * as React from 'react';
+import React, { HTMLAttributes, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import { basename as pathBasename } from 'path';
 import selectFileOrFolder from '../../../common/select-file-or-folder';
 
-type Props = {
-  // Required
-  onChange: (path: string) => void,
-
-  // Optional
-  path?: string,
-  itemtypes?: Array<'file' | 'directory'>,
-  extensions?: Array<string>,
-  showFileName?: boolean,
-  showFileIcon?: boolean,
-  name?: string,
-};
+interface Props extends Omit<HTMLAttributes<HTMLButtonElement>, 'onChange'> {
+  onChange: (path: string) => void;
+  path?: string;
+  itemtypes?: Array<'file' | 'directory'>;
+  extensions?: Array<string>;
+  showFileName?: boolean;
+  showFileIcon?: boolean;
+  name?: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class FileInputButton extends React.PureComponent<Props> {
-  _button: ?HTMLButtonElement;
+class FileInputButton extends PureComponent<Props> {
+  _button: HTMLButtonElement | null = null;
 
   focus() {
     this._button && this._button.focus();
@@ -30,7 +26,7 @@ class FileInputButton extends React.PureComponent<Props> {
     this._button && this._button.focus();
   }
 
-  _setRef(n: ?HTMLButtonElement) {
+  _setRef(n: HTMLButtonElement) {
     this._button = n;
   }
 
@@ -49,18 +45,17 @@ class FileInputButton extends React.PureComponent<Props> {
   }
 
   render() {
-    const { showFileName, showFileIcon, path, name, ...extraProps } = this.props;
-
+    const { showFileName, showFileIcon, path, name, onChange, ...extraProps } = this.props;
     // NOTE: Basename fails if path is not a string, so let's make sure it is
     const fileName = typeof path === 'string' ? pathBasename(path) : null;
-
     return (
       <button
         type="button"
         ref={this._setRef}
         onClick={this._handleChooseFile}
         title={path}
-        {...(extraProps: Object)}>
+        {...extraProps}
+      >
         {showFileIcon && <i className="fa fa-file-o space-right" />}
         {showFileName && fileName ? `${fileName}` : `Choose ${name || 'File'}`}
       </button>
diff --git a/packages/insomnia-app/app/ui/components/base/highlight.js b/packages/insomnia-app/app/ui/components/base/highlight.tsx
similarity index 69%
rename from packages/insomnia-app/app/ui/components/base/highlight.js
rename to packages/insomnia-app/app/ui/components/base/highlight.tsx
index ac407698ff..e27aa8f001 100644
--- a/packages/insomnia-app/app/ui/components/base/highlight.js
+++ b/packages/insomnia-app/app/ui/components/base/highlight.tsx
@@ -1,23 +1,24 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import fuzzySort from 'fuzzysort';
 import { fuzzyMatch } from '../../../common/misc';
 
-type Props = {|
-  search: string,
-  text: string,
-  blankValue?: String,
-|};
+interface Props {
+  search: string;
+  text: string;
+  blankValue?: String;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Highlight extends React.PureComponent<Props> {
+class Highlight extends PureComponent<Props> {
   render() {
     const { search, text, blankValue, ...otherProps } = this.props;
-
     // Match loose here to make sure our highlighting always works
-    const result = fuzzyMatch(search, text, { splitSpace: true, loose: true });
+    const result = fuzzyMatch(search, text, {
+      splitSpace: true,
+      loose: true,
+    });
 
     if (!result) {
       return <span {...otherProps}>{text || blankValue || ''}</span>;
@@ -27,7 +28,9 @@ class Highlight extends React.PureComponent<Props> {
       <span
         {...otherProps}
         dangerouslySetInnerHTML={{
+          // @ts-expect-error -- TSCONVERSION
           __html: fuzzySort.highlight(
+            // @ts-expect-error -- TSCONVERSION
             result,
             '<strong style="font-style: italic; text-decoration: underline;">',
             '</strong>',
diff --git a/packages/insomnia-app/app/ui/components/base/indeterminate-checkbox.js b/packages/insomnia-app/app/ui/components/base/indeterminate-checkbox.tsx
similarity index 56%
rename from packages/insomnia-app/app/ui/components/base/indeterminate-checkbox.js
rename to packages/insomnia-app/app/ui/components/base/indeterminate-checkbox.tsx
index f3c6b9536a..8ba41e1832 100644
--- a/packages/insomnia-app/app/ui/components/base/indeterminate-checkbox.js
+++ b/packages/insomnia-app/app/ui/components/base/indeterminate-checkbox.tsx
@@ -1,18 +1,17 @@
-// @flow
-import * as React from 'react';
+import React, { HTMLAttributes, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 
-type Props = {
-  indeterminate: boolean,
-  checked: boolean,
-};
+interface Props extends HTMLAttributes<HTMLInputElement> {
+  indeterminate: boolean;
+  checked: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class IndeterminateCheckbox extends React.PureComponent<Props> {
-  input: ?HTMLInputElement;
+class IndeterminateCheckbox extends PureComponent<Props> {
+  input: HTMLInputElement | null = null;
 
-  _setRef(n: ?HTMLInputElement) {
+  _setRef(n: HTMLInputElement) {
     this.input = n;
   }
 
@@ -32,11 +31,10 @@ class IndeterminateCheckbox extends React.PureComponent<Props> {
 
   render() {
     const {
-      indeterminate, // eslint-disable-line no-unused-vars
+      indeterminate,
       ...otherProps
     } = this.props;
-
-    return <input ref={this._setRef} type="checkbox" {...(otherProps: Object)} />;
+    return <input ref={this._setRef} type="checkbox" {...otherProps} />;
   }
 }
 
diff --git a/packages/insomnia-app/app/ui/components/base/lazy.js b/packages/insomnia-app/app/ui/components/base/lazy.ts
similarity index 65%
rename from packages/insomnia-app/app/ui/components/base/lazy.js
rename to packages/insomnia-app/app/ui/components/base/lazy.ts
index d2dd494c7f..5db6efebea 100644
--- a/packages/insomnia-app/app/ui/components/base/lazy.js
+++ b/packages/insomnia-app/app/ui/components/base/lazy.ts
@@ -1,22 +1,31 @@
 import { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 
+interface Props {
+  delay?: number;
+}
+
+interface State {
+  show: boolean;
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Lazy extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = { show: false };
+class Lazy extends PureComponent<Props> {
+  state: State = {
+    show: false,
   }
 
   show() {
-    this.setState({ show: true });
+    this.setState({
+      show: true,
+    });
   }
 
   // eslint-disable-next-line camelcase
   UNSAFE_componentWillMount() {
-    if (this.props.delay < 0) {
+    const { delay } = this.props;
+    if (typeof delay === 'number' && delay < 0) {
       // Show right away if negative delay passed
       this.show();
     } else {
@@ -29,9 +38,4 @@ class Lazy extends PureComponent {
   }
 }
 
-Lazy.propTypes = {
-  delay: PropTypes.number,
-  children: PropTypes.node,
-};
-
 export default Lazy;
diff --git a/packages/insomnia-app/app/ui/components/base/link.js b/packages/insomnia-app/app/ui/components/base/link.tsx
similarity index 53%
rename from packages/insomnia-app/app/ui/components/base/link.js
rename to packages/insomnia-app/app/ui/components/base/link.tsx
index 6dcb6cbf97..b01e2c63e8 100644
--- a/packages/insomnia-app/app/ui/components/base/link.js
+++ b/packages/insomnia-app/app/ui/components/base/link.tsx
@@ -1,36 +1,34 @@
-// @flow
 import classnames from 'classnames';
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
-import * as misc from '../../../common/misc';
+import { clickLink } from '../../../common/electron-helpers';
 
-type Props = {|
-  href: string,
-  title?: string,
-  button?: boolean,
-  onClick?: Function,
-  className?: string,
-  children?: React.Node,
-  disabled?: boolean,
-  noTheme?: boolean,
-|};
+interface Props {
+  href: string;
+  title?: string;
+  button?: boolean;
+  onClick?: (...args: Array<any>) => any;
+  className?: string;
+  children?: ReactNode;
+  disabled?: boolean;
+  noTheme?: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Link extends React.PureComponent<Props> {
-  _handleClick(e: SyntheticEvent<HTMLAnchorElement>) {
+class Link extends PureComponent<Props> {
+  _handleClick(e: React.MouseEvent<HTMLButtonElement | HTMLAnchorElement>) {
     e && e.preventDefault();
     const { href, onClick } = this.props;
-
     // Also call onClick that was passed to us if there was one
     onClick && onClick(e);
-
-    misc.clickLink(href);
+    clickLink(href);
   }
 
   render() {
     const {
-      onClick, // eslint-disable-line no-unused-vars
+      onClick,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
       button,
       href,
       children,
@@ -47,9 +45,13 @@ class Link extends React.PureComponent<Props> {
       <a
         href={href}
         onClick={this._handleClick}
-        className={classnames(className, { 'theme--link': !noTheme })}
+        className={classnames(className, {
+          'theme--link': !noTheme,
+        })}
+        // @ts-expect-error -- TSCONVERSION
         disabled={disabled}
-        {...other}>
+        {...other}
+      >
         {children}
       </a>
     );
diff --git a/packages/insomnia-app/app/ui/components/base/mailto.js b/packages/insomnia-app/app/ui/components/base/mailto.tsx
similarity index 59%
rename from packages/insomnia-app/app/ui/components/base/mailto.js
rename to packages/insomnia-app/app/ui/components/base/mailto.tsx
index a144ac57b6..1be6b10c56 100644
--- a/packages/insomnia-app/app/ui/components/base/mailto.js
+++ b/packages/insomnia-app/app/ui/components/base/mailto.tsx
@@ -1,33 +1,38 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import { buildQueryStringFromParams, joinUrlAndQueryString } from 'insomnia-url';
 import Link from './link';
 
-type Props = {|
-  email: string,
-  children?: React.Node,
-  subject?: string,
-  body?: string,
-|};
+interface Props {
+  email: string;
+  children?: ReactNode;
+  subject?: string;
+  body?: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Mailto extends React.PureComponent<Props> {
+class Mailto extends PureComponent<Props> {
   render() {
     const { email, body, subject, children } = this.props;
+    const params: Array<{name: string; value: string}> = [];
 
-    const params = [];
     if (subject) {
-      params.push({ name: 'subject', value: subject });
+      params.push({
+        name: 'subject',
+        value: subject,
+      });
     }
+
     if (body) {
-      params.push({ name: 'body', value: body });
+      params.push({
+        name: 'body',
+        value: body,
+      });
     }
 
     const qs = buildQueryStringFromParams(params);
     const href = joinUrlAndQueryString(`mailto:${email}`, qs);
-
     return <Link href={href}>{children || email}</Link>;
   }
 }
diff --git a/packages/insomnia-app/app/ui/components/base/modal-body.js b/packages/insomnia-app/app/ui/components/base/modal-body.tsx
similarity index 60%
rename from packages/insomnia-app/app/ui/components/base/modal-body.js
rename to packages/insomnia-app/app/ui/components/base/modal-body.tsx
index 97646a01cc..709a42575d 100644
--- a/packages/insomnia-app/app/ui/components/base/modal-body.js
+++ b/packages/insomnia-app/app/ui/components/base/modal-body.tsx
@@ -1,14 +1,18 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { HTMLAttributes, PureComponent, ReactNode } from 'react';
 import classnames from 'classnames';
 
-class ModalBody extends PureComponent {
+interface Props extends HTMLAttributes<HTMLDivElement> {
+  noScroll?: boolean;
+  className?: string;
+  children?: ReactNode;
+}
+
+class ModalBody extends PureComponent<Props> {
   render() {
     const { className, children, noScroll, ...props } = this.props;
     const classes = classnames(className, 'modal__body theme--dialog__body', {
       'modal__body--no-scroll': noScroll,
     });
-
     return (
       <div className={classes} {...props}>
         {children}
@@ -17,10 +21,4 @@ class ModalBody extends PureComponent {
   }
 }
 
-ModalBody.propTypes = {
-  noScroll: PropTypes.bool,
-  className: PropTypes.string,
-  children: PropTypes.node,
-};
-
 export default ModalBody;
diff --git a/packages/insomnia-app/app/ui/components/base/modal-footer.js b/packages/insomnia-app/app/ui/components/base/modal-footer.tsx
similarity index 50%
rename from packages/insomnia-app/app/ui/components/base/modal-footer.js
rename to packages/insomnia-app/app/ui/components/base/modal-footer.tsx
index b0330dfc27..bc7047fbd3 100644
--- a/packages/insomnia-app/app/ui/components/base/modal-footer.js
+++ b/packages/insomnia-app/app/ui/components/base/modal-footer.tsx
@@ -1,8 +1,12 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { PureComponent, ReactNode } from 'react';
 import classnames from 'classnames';
 
-class ModalFooter extends PureComponent {
+interface Props {
+  className?: string;
+  children: ReactNode;
+}
+
+class ModalFooter extends PureComponent<Props> {
   render() {
     const { children, className } = this.props;
     return (
@@ -11,12 +15,4 @@ class ModalFooter extends PureComponent {
   }
 }
 
-ModalFooter.propTypes = {
-  // Required
-  children: PropTypes.node.isRequired,
-
-  // Optional
-  className: PropTypes.string,
-};
-
 export default ModalFooter;
diff --git a/packages/insomnia-app/app/ui/components/base/modal-header.js b/packages/insomnia-app/app/ui/components/base/modal-header.tsx
similarity index 64%
rename from packages/insomnia-app/app/ui/components/base/modal-header.js
rename to packages/insomnia-app/app/ui/components/base/modal-header.tsx
index b0d78ac5e3..96296b258c 100644
--- a/packages/insomnia-app/app/ui/components/base/modal-header.js
+++ b/packages/insomnia-app/app/ui/components/base/modal-header.tsx
@@ -1,11 +1,16 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { PureComponent, ReactNode } from 'react';
 import classnames from 'classnames';
 
-class ModalHeader extends PureComponent {
+interface Props {
+  children: ReactNode;
+  hideCloseButton?: boolean;
+  className?: string;
+}
+
+class ModalHeader extends PureComponent<Props> {
   render() {
     const { hideCloseButton, className, children } = this.props;
-    let closeButton = null;
+    let closeButton: null | JSX.Element = null;
 
     if (!hideCloseButton) {
       closeButton = (
@@ -24,13 +29,4 @@ class ModalHeader extends PureComponent {
   }
 }
 
-ModalHeader.propTypes = {
-  // Required
-  children: PropTypes.node.isRequired,
-
-  // Optional
-  hideCloseButton: PropTypes.bool,
-  className: PropTypes.string,
-};
-
 export default ModalHeader;
diff --git a/packages/insomnia-app/app/ui/components/base/modal.js b/packages/insomnia-app/app/ui/components/base/modal.tsx
similarity index 76%
rename from packages/insomnia-app/app/ui/components/base/modal.js
rename to packages/insomnia-app/app/ui/components/base/modal.tsx
index dd54e78e2b..573385932c 100644
--- a/packages/insomnia-app/app/ui/components/base/modal.js
+++ b/packages/insomnia-app/app/ui/components/base/modal.tsx
@@ -1,27 +1,45 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { CSSProperties, PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import classnames from 'classnames';
 import KeydownBinder from '../keydown-binder';
 import { hotKeyRefs } from '../../../common/hotkeys';
 import { pressedHotKey } from '../../../common/hotkeys-listener';
-
 // Keep global z-index reference so that every modal will
 // appear over top of an existing one.
 let globalZIndex = 1000;
 
-@autoBindMethodsForReact(AUTOBIND_CFG)
-class Modal extends PureComponent {
-  constructor(props) {
-    super(props);
+export interface ModalProps {
+  tall?: boolean,
+  wide?: boolean,
+  skinny?: boolean,
+  noEscape?: boolean,
+  dontFocus?: boolean,
+  closeOnKeyCodes?: Array<any>,
+  onHide?: Function,
+  onCancel?: Function,
+  onKeyDown?: Function,
+  freshState?: boolean,
+  children?: ReactNode,
+  className?: string,
+}
 
-    this.state = {
-      open: false,
-      forceRefreshCounter: 0,
-      zIndex: globalZIndex,
-    };
-  }
+interface State {
+  open: boolean;
+  forceRefreshCounter: number;
+  zIndex: number;
+}
+
+@autoBindMethodsForReact(AUTOBIND_CFG)
+class Modal extends PureComponent<ModalProps, State> {
+  onHide: Function | null = null;
+  _node: HTMLDivElement | null = null;
+
+  state: State = {
+    open: false,
+    forceRefreshCounter: 0,
+    zIndex: globalZIndex,
+  };
 
   async _handleKeyDown(e) {
     if (!this.state.open) {
@@ -74,11 +92,11 @@ class Modal extends PureComponent {
     }
   }
 
-  _setModalRef(n) {
+  _setModalRef(n: HTMLDivElement) {
     this._node = n;
   }
 
-  show(options) {
+  show(options?: ModalProps) {
     const { freshState } = this.props;
     const { forceRefreshCounter } = this.state;
 
@@ -93,8 +111,7 @@ class Modal extends PureComponent {
     }
 
     // Allow instance-based onHide method
-    this.onHide = options ? options.onHide : null;
-
+    this.onHide = options?.onHide ?? null;
     setTimeout(() => this._node && this._node.focus());
   }
 
@@ -111,7 +128,9 @@ class Modal extends PureComponent {
   }
 
   hide() {
-    this.setState({ open: false });
+    this.setState({
+      open: false,
+    });
     this.props.onHide && this.props.onHide();
     this.onHide && this.onHide();
   }
@@ -128,13 +147,21 @@ class Modal extends PureComponent {
       'modal',
       'theme--dialog',
       className,
-      { 'modal--fixed-height': tall },
-      { 'modal--noescape': noEscape },
-      { 'modal--wide': wide },
-      { 'modal--skinny': skinny },
+      {
+        'modal--fixed-height': tall,
+      },
+      {
+        'modal--noescape': noEscape,
+      },
+      {
+        'modal--wide': wide,
+      },
+      {
+        'modal--skinny': skinny,
+      },
     );
+    const styles: CSSProperties = {};
 
-    const styles = {};
     if (open) {
       styles.zIndex = zIndex;
     }
@@ -143,7 +170,7 @@ class Modal extends PureComponent {
       <KeydownBinder stopMetaPropagation scoped onKeydown={this._handleKeyDown}>
         <div
           ref={this._setModalRef}
-          tabIndex="-1"
+          tabIndex={-1}
           className={classes}
           style={styles}
           aria-hidden={!open}
@@ -160,19 +187,4 @@ class Modal extends PureComponent {
   }
 }
 
-Modal.propTypes = {
-  tall: PropTypes.bool,
-  wide: PropTypes.bool,
-  skinny: PropTypes.bool,
-  noEscape: PropTypes.bool,
-  dontFocus: PropTypes.bool,
-  closeOnKeyCodes: PropTypes.array,
-  onHide: PropTypes.func,
-  onCancel: PropTypes.func,
-  onKeyDown: PropTypes.func,
-  freshState: PropTypes.bool,
-  children: PropTypes.node,
-  className: PropTypes.string,
-};
-
 export default Modal;
diff --git a/packages/insomnia-app/app/ui/components/base/prompt-button.stories.js b/packages/insomnia-app/app/ui/components/base/prompt-button.stories.tsx
similarity index 82%
rename from packages/insomnia-app/app/ui/components/base/prompt-button.stories.js
rename to packages/insomnia-app/app/ui/components/base/prompt-button.stories.tsx
index 65f980862c..61bab6f3ee 100644
--- a/packages/insomnia-app/app/ui/components/base/prompt-button.stories.js
+++ b/packages/insomnia-app/app/ui/components/base/prompt-button.stories.tsx
@@ -2,6 +2,8 @@ import React from 'react';
 import '../../../../.storybook/index.less';
 import PromptButton from './prompt-button';
 
-export default { title: 'Prompt Button' };
+export default {
+  title: 'Prompt Button',
+};
 
 export const _default = () => <PromptButton className="btn btn--clicky">Do Something</PromptButton>;
diff --git a/packages/insomnia-app/app/ui/components/base/prompt-button.js b/packages/insomnia-app/app/ui/components/base/prompt-button.tsx
similarity index 53%
rename from packages/insomnia-app/app/ui/components/base/prompt-button.js
rename to packages/insomnia-app/app/ui/components/base/prompt-button.tsx
index acdd95c3b2..46d36024a3 100644
--- a/packages/insomnia-app/app/ui/components/base/prompt-button.js
+++ b/packages/insomnia-app/app/ui/components/base/prompt-button.tsx
@@ -1,59 +1,89 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Button from './button';
 
+type States =
+  | typeof STATE_DEFAULT
+  | typeof STATE_ASK
+  | typeof STATE_DONE
+  ;
+
 const STATE_DEFAULT = 'default';
 const STATE_ASK = 'ask';
 const STATE_DONE = 'done';
+interface Props {
+  onClick?: React.MouseEventHandler<HTMLButtonElement> | ((value: any, event: React.MouseEvent<HTMLButtonElement>) => void);
+  addIcon?: boolean;
+  children?: ReactNode;
+  disabled?: boolean;
+  confirmMessage?: string;
+  doneMessage?: string;
+  value?: any;
+  tabIndex?: number;
+  className?: string;
+  // TODO(TSCONVERSION) this is linked to Button not using title
+  title?: string;
+}
+
+interface State {
+  state: States
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class PromptButton extends PureComponent {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      state: STATE_DEFAULT,
-    };
+class PromptButton extends PureComponent<Props> {
+  _doneTimeout: NodeJS.Timeout | null = null;
+  _triggerTimeout: NodeJS.Timeout | null = null;
+  state: State = {
+    state: STATE_DEFAULT,
   }
 
   _confirm(...args) {
-    // Clear existing timeouts
-    clearTimeout(this._triggerTimeout);
+    if (this._triggerTimeout !== null) {
+      // Clear existing timeouts
+      clearTimeout(this._triggerTimeout);
+    }
 
     // Fire the click handler
-    this.props.onClick(...args);
-
+    // @ts-expect-error -- TSCONVERSION
+    this.props.onClick?.(...args);
     // Set the state to done (but delay a bit to not alarm user)
-    this._doneTimeout = setTimeout(() => {
-      this.setState({ state: STATE_DONE });
+    // using global.setTimeout to force use of the Node timeout rather than DOM timeout
+    this._doneTimeout = global.setTimeout(() => {
+      this.setState({
+        state: STATE_DONE,
+      });
     }, 100);
-
     // Set a timeout to hide the confirmation
-    this._triggerTimeout = setTimeout(() => {
-      this.setState({ state: STATE_DEFAULT });
+    // using global.setTimeout to force use of the Node timeout rather than DOM timeout
+    this._triggerTimeout = global.setTimeout(() => {
+      this.setState({
+        state: STATE_DEFAULT,
+      });
     }, 2000);
   }
 
   _ask(...args) {
     const e = args[args.length - 1];
-
     // Prevent events (ex. won't close dropdown if it's in one)
     e.preventDefault();
     e.stopPropagation();
-
     // Toggle the confirmation notice
-    this.setState({ state: STATE_ASK });
-
+    this.setState({
+      state: STATE_ASK,
+    });
     // Set a timeout to hide the confirmation
-    this._triggerTimeout = setTimeout(() => {
-      this.setState({ state: STATE_DEFAULT });
+    // using global.setTimeout to force use of the Node timeout rather than DOM timeout
+    this._triggerTimeout = global.setTimeout(() => {
+      this.setState({
+        state: STATE_DEFAULT,
+      });
     }, 2000);
   }
 
   _handleClick(...args) {
     const { state } = this.state;
+
     if (state === STATE_ASK) {
       this._confirm(...args);
     } else if (state === STATE_DEFAULT) {
@@ -64,13 +94,18 @@ class PromptButton extends PureComponent {
   }
 
   componentWillUnmount() {
-    clearTimeout(this._triggerTimeout);
-    clearTimeout(this._doneTimeout);
+    if (this._triggerTimeout) {
+      clearTimeout(this._triggerTimeout);
+    }
+    if (this._doneTimeout) {
+      clearTimeout(this._doneTimeout);
+    }
   }
 
   render() {
     const {
-      onClick, // eslint-disable-line no-unused-vars
+      onClick,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
       children,
       addIcon,
       disabled,
@@ -79,16 +114,14 @@ class PromptButton extends PureComponent {
       tabIndex,
       ...other
     } = this.props;
-
     const { state } = this.state;
-
     const finalConfirmMessage = (typeof confirmMessage === 'string'
       ? confirmMessage
       : 'Click to confirm'
     ).trim();
     const finalDoneMessage = doneMessage || 'Done';
-
     let innerMsg;
+
     if (state === STATE_ASK && addIcon) {
       innerMsg = (
         <span className="warning" title="Click again to confirm">
@@ -109,6 +142,7 @@ class PromptButton extends PureComponent {
     }
 
     return (
+      // TODO(TSCONVERSION) - don't spread into Button because any additional buttons props are not used
       <Button onClick={this._handleClick} disabled={disabled} tabIndex={tabIndex} {...other}>
         {innerMsg}
       </Button>
@@ -116,15 +150,4 @@ class PromptButton extends PureComponent {
   }
 }
 
-PromptButton.propTypes = {
-  onClick: PropTypes.func,
-  addIcon: PropTypes.bool,
-  children: PropTypes.node,
-  disabled: PropTypes.bool,
-  confirmMessage: PropTypes.string,
-  doneMessage: PropTypes.string,
-  value: PropTypes.any,
-  tabIndex: PropTypes.number,
-};
-
 export default PromptButton;
diff --git a/packages/insomnia-app/app/ui/components/buttons/__tests__/grpc-send-button.test.js b/packages/insomnia-app/app/ui/components/buttons/__tests__/grpc-send-button.test.tsx
similarity index 99%
rename from packages/insomnia-app/app/ui/components/buttons/__tests__/grpc-send-button.test.js
rename to packages/insomnia-app/app/ui/components/buttons/__tests__/grpc-send-button.test.tsx
index b89f7f6a4a..2e76f902bb 100644
--- a/packages/insomnia-app/app/ui/components/buttons/__tests__/grpc-send-button.test.js
+++ b/packages/insomnia-app/app/ui/components/buttons/__tests__/grpc-send-button.test.tsx
@@ -13,9 +13,7 @@ describe('<GrpcSendButton />', () => {
         methodType={undefined}
       />,
     );
-
     const button = getByRole('button');
-
     expect(button).toBeDisabled();
     expect(button).toHaveTextContent('Send');
   });
@@ -30,14 +28,10 @@ describe('<GrpcSendButton />', () => {
         methodType={GrpcMethodTypeEnum.unary}
       />,
     );
-
     const button = getByRole('button');
-
     expect(button).not.toBeDisabled();
     expect(button).toHaveTextContent('Cancel');
-
     fireEvent.click(button);
-
     expect(handleCancel).toHaveBeenCalled();
   });
 
@@ -51,14 +45,10 @@ describe('<GrpcSendButton />', () => {
         methodType={GrpcMethodTypeEnum.unary}
       />,
     );
-
     const button = getByRole('button');
-
     expect(button).not.toBeDisabled();
     expect(button).toHaveTextContent('Send');
-
     fireEvent.click(button);
-
     expect(handleSend).toHaveBeenCalled();
   });
 
@@ -74,14 +64,10 @@ describe('<GrpcSendButton />', () => {
           methodType={type}
         />,
       );
-
       const button = getByRole('button');
-
       expect(button).not.toBeDisabled();
       expect(button).toHaveTextContent('Start');
-
       fireEvent.click(button);
-
       expect(handleSend).toHaveBeenCalled();
     },
   );
diff --git a/packages/insomnia-app/app/ui/components/buttons/grpc-send-button.js b/packages/insomnia-app/app/ui/components/buttons/grpc-send-button.tsx
similarity index 62%
rename from packages/insomnia-app/app/ui/components/buttons/grpc-send-button.js
rename to packages/insomnia-app/app/ui/components/buttons/grpc-send-button.tsx
index 123099811c..0e09def08e 100644
--- a/packages/insomnia-app/app/ui/components/buttons/grpc-send-button.js
+++ b/packages/insomnia-app/app/ui/components/buttons/grpc-send-button.tsx
@@ -1,24 +1,23 @@
-// @flow
-import React from 'react';
+import React, { FunctionComponent } from 'react';
 import type { GrpcMethodType } from '../../../network/grpc/method';
-import { Button } from 'insomnia-components';
+import { Button, ButtonProps } from 'insomnia-components';
 import { GrpcMethodTypeEnum } from '../../../network/grpc/method';
 
-type Props = {
-  running: boolean,
-  methodType?: GrpcMethodType,
-  handleStart: () => Promise<void>,
-  handleCancel: () => void,
-};
+interface Props {
+  running: boolean;
+  methodType?: GrpcMethodType;
+  handleStart: () => Promise<void>;
+  handleCancel: () => void;
+}
 
-const buttonProps = {
+const buttonProps: ButtonProps = {
   className: 'tall',
   size: 'medium',
   variant: 'text',
   radius: '0',
 };
 
-const GrpcSendButton = ({ running, methodType, handleStart, handleCancel }: Props) => {
+const GrpcSendButton: FunctionComponent<Props> = ({ running, methodType, handleStart, handleCancel }) => {
   if (running) {
     return (
       <Button {...buttonProps} onClick={handleCancel}>
diff --git a/packages/insomnia-app/app/ui/components/buttons/settings-button.js b/packages/insomnia-app/app/ui/components/buttons/settings-button.tsx
similarity index 67%
rename from packages/insomnia-app/app/ui/components/buttons/settings-button.js
rename to packages/insomnia-app/app/ui/components/buttons/settings-button.tsx
index 6375a37aad..3e89c36342 100644
--- a/packages/insomnia-app/app/ui/components/buttons/settings-button.js
+++ b/packages/insomnia-app/app/ui/components/buttons/settings-button.tsx
@@ -1,6 +1,4 @@
-// @flow
-
-import React from 'react';
+import React, { FunctionComponent } from 'react';
 import { CircleButton, SvgIcon, Tooltip } from 'insomnia-components';
 import { showSettingsModal } from '../modals/settings-modal';
 import type { Settings } from '../../../models/settings';
@@ -9,12 +7,12 @@ import { connect } from 'react-redux';
 import Hotkey from '../hotkey';
 import { hotKeyRefs } from '../../../common/hotkeys';
 
-type Props = {
-  className?: string,
-  settings: Settings,
-};
+interface Props {
+  className?: string;
+  settings: Settings;
+}
 
-const SettingsButton = ({ className, settings }: Props) => (
+const SettingsButton: FunctionComponent<Props> = ({ className, settings }) => (
   <Tooltip
     delay={1000}
     position="bottom"
@@ -30,10 +28,7 @@ const SettingsButton = ({ className, settings }: Props) => (
   </Tooltip>
 );
 
-const mapStateToProps = (state, props) => {
-  const settings = selectSettings(state, props);
-
-  return { settings };
-};
-
-export default connect(mapStateToProps)(SettingsButton);
+export default connect((state, props) => ({
+    // @ts-expect-error -- TSCONVERSION
+    settings: selectSettings(state, props),
+}))(SettingsButton);
diff --git a/packages/insomnia-app/app/ui/components/check-for-updates-button.js b/packages/insomnia-app/app/ui/components/check-for-updates-button.tsx
similarity index 58%
rename from packages/insomnia-app/app/ui/components/check-for-updates-button.js
rename to packages/insomnia-app/app/ui/components/check-for-updates-button.tsx
index 75b4f56dd4..1e8a58f689 100644
--- a/packages/insomnia-app/app/ui/components/check-for-updates-button.js
+++ b/packages/insomnia-app/app/ui/components/check-for-updates-button.tsx
@@ -1,38 +1,39 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import * as electron from 'electron';
 import { AUTOBIND_CFG } from '../../common/constants';
 
-type Props = {
-  children: React.Node,
-  className: ?string,
-};
+interface Props {
+  children: ReactNode;
+  className?: string | null;
+}
 
-type State = {
-  status: string,
-  checking: boolean,
-  updateAvailable: boolean,
-};
+interface State {
+  status: string;
+  checking: boolean;
+  updateAvailable: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class CheckForUpdatesButton extends React.PureComponent<Props, State> {
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      status: '',
-      checking: false,
-      updateAvailable: false,
-    };
+class CheckForUpdatesButton extends PureComponent<Props, State> {
+  state: State = {
+    status: '',
+    checking: false,
+    updateAvailable: false,
   }
 
-  _listenerCheckComplete(e: any, updateAvailable: true, status: string) {
-    this.setState({ status, updateAvailable });
+  _listenerCheckComplete(_e, updateAvailable: true, status: string) {
+    this.setState({
+      status,
+      updateAvailable,
+    });
   }
 
-  _listenerCheckStatus(e: any, status: string) {
+  _listenerCheckStatus(_e, status: string) {
     if (this.state.checking) {
-      this.setState({ status });
+      this.setState({
+        status,
+      });
     }
   }
 
@@ -54,9 +55,12 @@ class CheckForUpdatesButton extends React.PureComponent<Props, State> {
   render() {
     const { children, className } = this.props;
     const { status, checking } = this.state;
-
     return (
-      <button className={className} disabled={checking} onClick={this._handleCheckForUpdates}>
+      <button
+        className={className ?? ''}
+        disabled={checking}
+        onClick={this._handleCheckForUpdates}
+      >
         {status || children}
       </button>
     );
diff --git a/packages/insomnia-app/app/ui/components/codemirror/base-imports.js b/packages/insomnia-app/app/ui/components/codemirror/base-imports.ts
similarity index 97%
rename from packages/insomnia-app/app/ui/components/codemirror/base-imports.js
rename to packages/insomnia-app/app/ui/components/codemirror/base-imports.ts
index 2827e4d38d..d509f0d6f0 100644
--- a/packages/insomnia-app/app/ui/components/codemirror/base-imports.js
+++ b/packages/insomnia-app/app/ui/components/codemirror/base-imports.ts
@@ -14,7 +14,6 @@ import 'codemirror/mode/ruby/ruby';
 import 'codemirror/mode/shell/shell';
 import 'codemirror/mode/swift/swift';
 import 'codemirror/mode/yaml/yaml';
-
 import 'codemirror/addon/display/autorefresh';
 import 'codemirror/addon/dialog/dialog';
 import 'codemirror/addon/dialog/dialog.css';
@@ -59,16 +58,14 @@ import './lint/javascript-async-lint';
 import './extensions/autocomplete';
 import './extensions/clickable';
 import './extensions/nunjucks-tags';
-
 // CSS
 import 'codemirror/lib/codemirror.css';
 import '../../css/editor/index.less';
-
 // Make jsonlint available to the json-lint addon
 import { parser as jsonlint } from 'jsonlint';
-
 // Make js-yaml available to the yaml-lint addon
 import * as jsYaml from 'js-yaml';
 
+// @ts-expect-error -- TSCONVERSION needs global augmentation
 global.jsonlint = jsonlint;
 global.jsyaml = jsYaml;
diff --git a/packages/insomnia-app/app/ui/components/codemirror/code-editor.js b/packages/insomnia-app/app/ui/components/codemirror/code-editor.tsx
similarity index 78%
rename from packages/insomnia-app/app/ui/components/codemirror/code-editor.js
rename to packages/insomnia-app/app/ui/components/codemirror/code-editor.tsx
index c67a135973..3855f31939 100644
--- a/packages/insomnia-app/app/ui/components/codemirror/code-editor.js
+++ b/packages/insomnia-app/app/ui/components/codemirror/code-editor.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-import PropTypes from 'prop-types';
+import React, { Component, CSSProperties, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import {
   AUTOBIND_CFG,
@@ -15,8 +14,7 @@ import vkBeautify from 'vkbeautify';
 import { showModal } from '../modals/index';
 import FilterHelpModal from '../modals/filter-help-modal';
 import * as misc from '../../../common/misc';
-import prettify from 'insomnia-prettify';
-
+import { json as jsonPrettify } from 'insomnia-prettify';
 import { keyboardKeys as keyCodes } from '../../../common/keyboard-keys';
 import './base-imports';
 import { getTagDefinitions } from '../../../templating/index';
@@ -26,19 +24,21 @@ import DropdownItem from '../base/dropdown/dropdown-item';
 import { query as queryXPath } from 'insomnia-xpath';
 import deepEqual from 'deep-equal';
 import zprint from 'zprint-clj';
-
+import { CodeMirrorLinkClickCallback } from './extensions/clickable';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
+import { NunjucksParsedTag } from '../../../templating/utils';
 const TAB_KEY = 9;
 const TAB_SIZE = 4;
 const MAX_SIZE_FOR_LINTING = 1000000; // Around 1MB
 
 // Global object used for storing and persisting editor states
 const editorStates = {};
-
-const BASE_CODEMIRROR_OPTIONS = {
+const BASE_CODEMIRROR_OPTIONS: CodeMirror.EditorConfiguration = {
   lineNumbers: true,
   placeholder: 'Start Typing...',
   foldGutter: true,
   height: 'auto',
+  // @ts-expect-error -- TSCONVERSION should be autoRefresh: { delay: 2000 }
   autoRefresh: 2000,
   lineWrapping: true,
   scrollbarStyle: 'native',
@@ -47,52 +47,118 @@ const BASE_CODEMIRROR_OPTIONS = {
   autoCloseBrackets: true,
   tabSize: TAB_SIZE,
   indentUnit: TAB_SIZE,
-  hintOptions: null,
+  hintOptions: undefined,
   dragDrop: true,
-  viewportMargin: 30, // default 10
+  viewportMargin: 30,
+  // default 10
   selectionPointer: 'default',
   styleActiveLine: true,
   indentWithTabs: true,
   showCursorWhenSelecting: false,
-  cursorScrollMargin: 12, // NOTE: This is px
+  cursorScrollMargin: 12,
+  // NOTE: This is px
   keyMap: 'default',
   extraKeys: CodeMirror.normalizeKeyMap({
     'Ctrl-Q': function(cm) {
       cm.foldCode(cm.getCursor());
     },
-    [isMac() ? 'Cmd-Enter' : 'Ctrl-Enter']: function(cm) {
+    [isMac() ? 'Cmd-Enter' : 'Ctrl-Enter']: function() {
       // HACK: So nothing conflicts withe the "Send Request" shortcut
     },
     [isMac() ? 'Cmd-/' : 'Ctrl-/']: 'toggleComment',
-
     // Autocomplete
     'Ctrl-Space': 'autocomplete',
-
     // Change default find command from "find" to "findPersistent" so the
     // search box stays open after pressing Enter
     [isMac() ? 'Cmd-F' : 'Ctrl-F']: 'findPersistent',
-
     [isMac() ? 'Shift-Cmd--' : 'Shift-Ctrl--']: 'foldAll',
     [isMac() ? 'Shift-Cmd-=' : 'Shift-Ctrl-=']: 'unfoldAll',
-
     'Shift-Tab': 'indentLess',
     Tab: 'indentMore',
   }),
-
   // NOTE: Because the lint mode is initialized immediately, the lint gutter needs to
   //   be in the default options. DO NOT REMOVE THIS.
   gutters: ['CodeMirror-lint-markers'],
 };
 
-@autoBindMethodsForReact(AUTOBIND_CFG)
-class CodeEditor extends React.Component {
-  constructor(props) {
-    super(props);
+export type CodeEditorOnChange = (value: string) => void;
 
+interface Props {
+  indentWithTabs?: boolean,
+  onChange?: CodeEditorOnChange,
+  onCursorActivity?: Function,
+  onFocus?: Function,
+  onBlur?: Function,
+  onClickLink?: CodeMirrorLinkClickCallback,
+  onKeyDown?: Function,
+  onMouseLeave?: React.MouseEventHandler<HTMLDivElement>,
+  onClick?: React.MouseEventHandler<HTMLDivElement>,
+  onPaste?: Function,
+  onCodeMirrorInit?: (editor: CodeMirror.EditorFromTextArea) => void,
+  render?: HandleRender,
+  nunjucksPowerUserMode?: boolean,
+  getRenderContext?: HandleGetRenderContext,
+  getAutocompleteConstants?: Function,
+  getAutocompleteSnippets?: Function,
+  keyMap?: string,
+  mode?: string,
+  id?: string,
+  placeholder?: string,
+  lineWrapping?: boolean,
+  hideLineNumbers?: boolean,
+  hideGutters?: boolean,
+  noMatchBrackets?: boolean,
+  hideScrollbars?: boolean,
+  fontSize?: number,
+  indentSize?: number,
+  defaultValue?: string,
+  tabIndex?: number,
+  autoPrettify?: boolean,
+  manualPrettify?: boolean,
+  noLint?: boolean,
+  noDragDrop?: boolean,
+  noStyleActiveLine?: boolean,
+  className?: string,
+  style?: Object,
+  updateFilter?: (filter: string) => void,
+  defaultTabBehavior?: boolean,
+  readOnly?: boolean,
+  type?: string,
+  filter?: string,
+  filterHistory?: Array<string>,
+  singleLine?: boolean,
+  debounceMillis?: number,
+  dynamicHeight?: boolean,
+  autoCloseBrackets?: boolean,
+  hintOptions?: Object,
+  lintOptions?: Object,
+  infoOptions?: Object,
+  jumpOptions?: Object,
+  uniquenessKey?: string,
+  isVariableUncovered?: boolean,
+  raw?: boolean,
+}
+
+interface State {
+  filter: string
+}
+
+@autoBindMethodsForReact(AUTOBIND_CFG)
+class CodeEditor extends Component<Props, State> {
+  private _uniquenessKey?: string;
+  private _previousUniquenessKey?: string;
+  private _originalCode: string;
+  codeMirror?: CodeMirror.EditorFromTextArea;
+  private _filterInput: HTMLInputElement;
+  private _autocompleteDebounce: NodeJS.Timeout | null = null;
+  private _ignoreNextChange: boolean;
+  private _filterTimeout: NodeJS.Timeout | null = null;
+
+  constructor(props: Props) {
+    super(props);
     this.state = {
       filter: props.filter || '',
     };
-
     this._originalCode = '';
     this._uniquenessKey = this.props.uniquenessKey;
     this._previousUniquenessKey = 'n/a';
@@ -101,24 +167,29 @@ class CodeEditor extends React.Component {
   componentWillUnmount() {
     if (this.codeMirror) {
       this.codeMirror.toTextArea();
+      // @ts-expect-error -- TSCONVERSION this comes from a custom extension
       this.codeMirror.closeHintDropdown();
     }
   }
 
   // eslint-disable-next-line camelcase
-  UNSAFE_componentWillReceiveProps(nextProps) {
+  UNSAFE_componentWillReceiveProps(nextProps: Props) {
     this._uniquenessKey = nextProps.uniquenessKey;
     this._previousUniquenessKey = this.props.uniquenessKey;
-
     // Sync the filter too
-    this.setState({ filter: nextProps.filter || '' });
+    this.setState({
+      filter: nextProps.filter || '',
+    });
   }
 
   componentDidUpdate() {
     this._codemirrorSetOptions();
+
     const { defaultValue } = this.props;
+
     if (this._uniquenessKey && this._uniquenessKey !== this._previousUniquenessKey) {
       this._codemirrorSetValue(defaultValue);
+
       this._restoreState();
     }
   }
@@ -129,6 +200,7 @@ class CodeEditor extends React.Component {
       if (key === 'defaultValue') {
         continue;
       }
+
       if (this.props[key] !== nextProps[key]) {
         return true;
       }
@@ -140,8 +212,14 @@ class CodeEditor extends React.Component {
   selectAll() {
     if (this.codeMirror) {
       this.codeMirror.setSelection(
-        { line: 0, ch: 0 },
-        { line: this.codeMirror.lineCount(), ch: 0 },
+        {
+          line: 0,
+          ch: 0,
+        },
+        {
+          line: this.codeMirror.lineCount(),
+          ch: 0,
+        },
       );
     }
   }
@@ -163,31 +241,63 @@ class CodeEditor extends React.Component {
       if (!this.hasFocus()) {
         this.focus();
       }
-      this.codeMirror.setCursor({ line, ch });
+
+      this.codeMirror.setCursor({
+        line,
+        ch,
+      });
     }
   }
 
   setSelection(chStart, chEnd, lineStart, lineEnd) {
     if (this.codeMirror) {
-      this.codeMirror.setSelection({ line: lineStart, ch: chStart }, { line: lineEnd, ch: chEnd });
-      this.codeMirror.scrollIntoView({ line: lineStart, char: chStart });
+      this.codeMirror.setSelection(
+        {
+          line: lineStart,
+          ch: chStart,
+        },
+        {
+          line: lineEnd,
+          ch: chEnd,
+        },
+      );
+      this.codeMirror.scrollIntoView({
+        // @ts-expect-error -- TSCONVERSION
+        line: lineStart,
+        char: chStart,
+      });
     }
   }
 
   scrollToSelection(chStart, chEnd, lineStart, lineEnd) {
     const selectionFocusPos = window.innerHeight / 2 - 100;
+
     if (this.codeMirror) {
-      this.codeMirror.setSelection({ line: lineStart, ch: chStart }, { line: lineEnd, ch: chEnd });
+      this.codeMirror.setSelection(
+        {
+          line: lineStart,
+          ch: chStart,
+        },
+        {
+          line: lineEnd,
+          ch: chEnd,
+        },
+      );
       this.codeMirror.scrollIntoView(
-        { line: lineStart, char: chStart },
-        // If sizing permits, position selection just above center
+        {
+          // @ts-expect-error -- TSCONVERSION
+          line: lineStart,
+          char: chStart,
+        }, // If sizing permits, position selection just above center
         selectionFocusPos,
       );
     }
   }
 
   getSelectionStart() {
+    // @ts-expect-error -- TSCONVERSION
     const selections = this.codeMirror.listSelections();
+
     if (selections.length) {
       return selections[0].anchor.ch;
     } else {
@@ -196,7 +306,9 @@ class CodeEditor extends React.Component {
   }
 
   getSelectionEnd() {
+    // @ts-expect-error -- TSCONVERSION
     const selections = this.codeMirror.listSelections();
+
     if (selections.length) {
       return selections[0].head.ch;
     } else {
@@ -209,6 +321,7 @@ class CodeEditor extends React.Component {
       if (!this.hasFocus()) {
         this.focus();
       }
+
       const doc = this.codeMirror.getDoc();
       doc.setCursor(doc.lineCount(), 0);
     }
@@ -223,25 +336,41 @@ class CodeEditor extends React.Component {
   }
 
   setAttribute(name, value) {
+    // @ts-expect-error -- TSCONVERSION
     this.codeMirror.getTextArea().parentNode.setAttribute(name, value);
   }
 
   removeAttribute(name) {
+    // @ts-expect-error -- TSCONVERSION
     this.codeMirror.getTextArea().parentNode.removeAttribute(name);
   }
 
   getAttribute(name) {
+    // @ts-expect-error -- TSCONVERSION
     this.codeMirror.getTextArea().parentNode.getAttribute(name);
   }
 
   clearSelection() {
     // Never do this if dropdown is open
+    // @ts-expect-error -- TSCONVERSION this comes from a custom extension
     if (this.codeMirror.isHintDropdownActive()) {
       return;
     }
 
     if (this.codeMirror) {
-      this.codeMirror.setSelection({ line: -1, ch: -1 }, { line: -1, ch: -1 }, { scroll: false });
+      this.codeMirror.setSelection(
+        {
+          line: -1,
+          ch: -1,
+        },
+        {
+          line: -1,
+          ch: -1,
+        },
+        {
+          scroll: false,
+        },
+      );
     }
   }
 
@@ -259,15 +388,19 @@ class CodeEditor extends React.Component {
     if (!uniquenessKey || !this.codeMirror) {
       return;
     }
+
     const marks = this.codeMirror
       .getAllMarks()
+      // @ts-expect-error -- TSCONVERSION
       .filter(c => c.__isFold)
       .map(mark => {
+        // @ts-expect-error -- TSCONVERSION
         const { from, to } = mark.find();
-
-        return { from, to };
+        return {
+          from,
+          to,
+        };
       });
-
     editorStates[uniquenessKey] = {
       scroll: this.codeMirror.getScrollInfo(),
       selections: this.codeMirror.listSelections(),
@@ -279,29 +412,40 @@ class CodeEditor extends React.Component {
 
   _restoreState() {
     const { uniquenessKey } = this.props;
+
+    // @ts-expect-error -- TSCONVERSION only try access if uniquenessKey is defined
     if (!editorStates.hasOwnProperty(uniquenessKey)) {
       return;
     }
 
+    // @ts-expect-error -- TSCONVERSION only try access if uniquenessKey is defined
     const { scroll, selections, cursor, history, marks } = editorStates[uniquenessKey];
+    // @ts-expect-error -- TSCONVERSION
     this.codeMirror.scrollTo(scroll.left, scroll.top);
+    // @ts-expect-error -- TSCONVERSION
     this.codeMirror.setHistory(history);
-
     // NOTE: These won't be visible unless the editor is focused
-    this.codeMirror.setCursor(cursor.line, cursor.ch, { scroll: false });
-    this.codeMirror.setSelections(selections, null, { scroll: false });
+    // @ts-expect-error -- TSCONVERSION
+    this.codeMirror.setCursor(cursor.line, cursor.ch, {
+      scroll: false,
+    });
+    // @ts-expect-error -- TSCONVERSION
+    this.codeMirror.setSelections(selections, null, {
+      scroll: false,
+    });
 
     // Restore marks one-by-one
     for (const { from, to } of marks || []) {
+      // @ts-expect-error -- TSCONVERSION
       this.codeMirror.foldCode(from, to);
     }
   }
 
-  _setFilterInputRef(n) {
+  _setFilterInputRef(n: HTMLInputElement) {
     this._filterInput = n;
   }
 
-  _handleInitTextarea(textarea) {
+  _handleInitTextarea(textarea: HTMLTextAreaElement) {
     if (!textarea) {
       // Not mounted
       return;
@@ -318,12 +462,10 @@ class CodeEditor extends React.Component {
         // Get open / close token
         let startToken = '{';
         let endToken = '}';
-
         // Prevent retrieving an invalid content if undefined
         if (!from?.line || !to?.line) return '\u2194';
-
+        // @ts-expect-error -- TSCONVERSION
         const prevLine = this.codeMirror.getLine(from.line);
-
         if (!prevLine) return '\u2194';
 
         if (prevLine.lastIndexOf('[') > prevLine.lastIndexOf('{')) {
@@ -332,6 +474,7 @@ class CodeEditor extends React.Component {
         }
 
         // Get json content
+        // @ts-expect-error -- TSCONVERSION
         const internal = this.codeMirror.getRange(from, to);
         const toParse = startToken + internal + endToken;
 
@@ -339,18 +482,16 @@ class CodeEditor extends React.Component {
         try {
           const parsed = JSON.parse(toParse);
           count = Object.keys(parsed).length;
-        } catch (e) {}
+        } catch (e) { }
+
         return count ? `\u21A4 ${count} \u21A6` : '\u2194';
       },
     };
-
     const { defaultValue, debounceMillis: ms } = this.props;
-
     this.codeMirror = CodeMirror.fromTextArea(textarea, {
       ...BASE_CODEMIRROR_OPTIONS,
       foldOptions,
     });
-
     // Set default listeners
     const debounceMillis = typeof ms === 'number' ? ms : DEBOUNCE_MILLIS;
     this.codeMirror.on('changes', misc.debounce(this._codemirrorValueChanged, debounceMillis));
@@ -365,15 +506,16 @@ class CodeEditor extends React.Component {
     this.codeMirror.on('fold', this._codemirrorToggleFold);
     this.codeMirror.on('unfold', this._codemirrorToggleFold);
     this.codeMirror.on('keyHandled', this._codemirrorKeyHandled);
-
     // Prevent these things if we're type === "password"
     this.codeMirror.on('copy', this._codemirrorPreventWhenTypePassword);
     this.codeMirror.on('cut', this._codemirrorPreventWhenTypePassword);
     this.codeMirror.on('dragstart', this._codemirrorPreventWhenTypePassword);
-
-    this.codeMirror.setCursor({ line: -1, ch: -1 });
-
+    this.codeMirror.setCursor({
+      line: -1,
+      ch: -1,
+    });
     this.codeMirror.setOption('extraKeys', {
+      // @ts-expect-error -- TSCONVERSION
       ...BASE_CODEMIRROR_OPTIONS.extraKeys,
       Tab: cm => {
         // Indent with tabs or spaces
@@ -394,10 +536,12 @@ class CodeEditor extends React.Component {
       this._codemirrorSetValue(defaultValue || '');
 
       // Clear history so we can't undo the initial set
+      // @ts-expect-error -- TSCONVERSION
       this.codeMirror.clearHistory();
 
       // Setup nunjucks listeners
       if (this.props.render && !this.props.nunjucksPowerUserMode) {
+        // @ts-expect-error -- TSCONVERSION this comes from a custom extension
         this.codeMirror.enableNunjucksTags(
           this.props.render,
           this.props.getRenderContext,
@@ -407,12 +551,14 @@ class CodeEditor extends React.Component {
 
       // Make URLs clickable
       if (this.props.onClickLink) {
+        // @ts-expect-error -- TSCONVERSION this comes from a custom extension
         this.codeMirror.makeLinksClickable(this.props.onClickLink);
       }
 
       // HACK: Refresh because sometimes it renders too early and the scroll doesn't
       // quite fit.
       setTimeout(() => {
+        // @ts-expect-error -- TSCONVERSION
         this.codeMirror.refresh();
       }, 100);
 
@@ -469,12 +615,15 @@ class CodeEditor extends React.Component {
   }
 
   _indentChars() {
+    // @ts-expect-error -- TSCONVERSION
     return this.codeMirror.getOption('indentWithTabs')
       ? '\t'
+      // @ts-expect-error -- TSCONVERSION
       : new Array(this.codeMirror.getOption('indentUnit') + 1).join(' ');
   }
 
   _handleBeautify() {
+    // @ts-expect-error -- TSCONVERSION
     this._prettify(this.codeMirror.getValue());
   }
 
@@ -497,7 +646,7 @@ class CodeEditor extends React.Component {
         }
       }
 
-      return prettify.json(jsonString, this._indentChars(), this.props.autoPrettify);
+      return jsonPrettify(jsonString, this._indentChars(), this.props.autoPrettify);
     } catch (e) {
       // That's Ok, just leave it
       return code;
@@ -561,10 +710,13 @@ class CodeEditor extends React.Component {
       readOnly,
       tabIndex,
     } = this.props;
-
     let mode;
+
     if (this.props.render) {
-      mode = { name: 'nunjucks', baseMode: CodeEditor._normalizeMode(rawMode) };
+      mode = {
+        name: 'nunjucks',
+        baseMode: CodeEditor._normalizeMode(rawMode),
+      };
     } else {
       // foo bar baz
       mode = CodeEditor._normalizeMode(rawMode);
@@ -573,8 +725,7 @@ class CodeEditor extends React.Component {
     // NOTE: YAML is not valid when indented with Tabs
     const isYaml = typeof rawMode === 'string' ? rawMode.includes('yaml') : false;
     const actuallyIndentWithTabs = indentWithTabs && !isYaml;
-
-    const options = {
+    const options: any = {
       readOnly: !!readOnly,
       placeholder: placeholder || '',
       mode: mode,
@@ -636,8 +787,9 @@ class CodeEditor extends React.Component {
 
     // Setup the hint options
     if (getRenderContext || getAutocompleteConstants || getAutocompleteSnippets) {
-      let getVariables = null;
-      let getTags = null;
+      let getVariables: (() => Promise<Array<Object>>) | undefined;
+      let getTags: (() => Promise<Array<NunjucksParsedTag>>) | undefined;
+
       if (getRenderContext) {
         getVariables = async () => {
           const context = await getRenderContext();
@@ -647,15 +799,18 @@ class CodeEditor extends React.Component {
 
         // Only allow tags if we have variables too
         getTags = async () => {
-          const expandedTags = [];
+          const expandedTags: Array<NunjucksParsedTag> = [];
+
           for (const tagDef of await getTagDefinitions()) {
             const firstArg = tagDef.args[0];
+
             if (!firstArg || firstArg.type !== 'enum') {
               expandedTags.push(tagDef);
               continue;
             }
 
-            for (const option of tagDef.args[0].options) {
+            for (const option of firstArg.options || []) {
+              // @ts-expect-error -- TSCONVERSION option.name doesn't exist
               const optionName = misc.fnOrString(option.displayName, tagDef.args) || option.name;
               const newDef = clone(tagDef);
               newDef.displayName = `${tagDef.displayName} ⇒ ${optionName}`;
@@ -667,6 +822,7 @@ class CodeEditor extends React.Component {
           return expandedTags;
         };
       }
+
       options.environmentAutocomplete = {
         getVariables,
         getTags,
@@ -695,7 +851,9 @@ class CodeEditor extends React.Component {
     if (key === 'jump' || key === 'info' || key === 'lint' || key === 'hintOptions') {
       // Use stringify here because these could be infinitely recursive due to GraphQL
       // schemas
+      // @ts-expect-error -- TSCONVERSION
       shouldSetOption = JSON.stringify(value) !== JSON.stringify(cm.options[key]);
+      // @ts-expect-error -- TSCONVERSION
     } else if (!deepEqual(value, cm.options[key])) {
       // Don't set the option if it hasn't changed
       shouldSetOption = true;
@@ -709,9 +867,13 @@ class CodeEditor extends React.Component {
     // Set the option safely. When setting "lint", for example, it can throw an exception
     // and cause the editor to break.
     try {
+      // @ts-expect-error -- TSCONVERSION
       cm.setOption(key, value);
     } catch (err) {
-      console.log('Failed to set CodeMirror option', err.message, { key, value });
+      console.log('Failed to set CodeMirror option', err.message, {
+        key,
+        value,
+      });
     }
   }
 
@@ -758,7 +920,9 @@ class CodeEditor extends React.Component {
   }
 
   _codemirrorEndCompletion() {
-    clearInterval(this._autocompleteDebounce);
+    if (this._autocompleteDebounce !== null) {
+      clearInterval(this._autocompleteDebounce);
+    }
   }
 
   _codemirrorTriggerCompletionKeyUp(doc, e) {
@@ -770,21 +934,24 @@ class CodeEditor extends React.Component {
         return;
       }
 
-      clearTimeout(this._autocompleteDebounce);
+      if (this._autocompleteDebounce !== null) {
+        clearTimeout(this._autocompleteDebounce);
+      }
       this._autocompleteDebounce = setTimeout(() => {
         doc.execCommand('autocomplete');
       }, 700);
     }
   }
 
-  _codemirrorFocus(doc, e) {
+  _codemirrorFocus(_doc, e) {
     if (this.props.onFocus) {
       this.props.onFocus(e);
     }
   }
 
-  _codemirrorBlur(doc, e) {
+  _codemirrorBlur(_doc, e) {
     this._persistState();
+
     if (this.props.onBlur) {
       this.props.onBlur(e);
     }
@@ -798,10 +965,9 @@ class CodeEditor extends React.Component {
     this._persistState();
   }
 
-  _codemirrorKeyHandled(codeMirror, keyName, event) {
+  _codemirrorKeyHandled(_codeMirror, _keyName, event) {
     const { keyMap } = this.props;
     const { keyCode } = event;
-
     const isVimKeyMap = keyMap === EDITOR_KEY_MAP_VIM;
     const pressedEscape = keyCode === keyCodes.esc.keyCode;
 
@@ -811,13 +977,15 @@ class CodeEditor extends React.Component {
   }
 
   _codemirrorValueBeforeChange(doc, change) {
+    // @ts-expect-error -- TSCONVERSION
     const value = this.codeMirror.getDoc().getValue();
 
     // If we're in single-line mode, merge all changed lines into one
     if (this.props.singleLine && change.text && change.text.length > 1) {
       const text = change.text
         .join('') // join all changed lines into one
-        .replace(/\n/g, ' '); // Convert all whitespace to spaces
+        .replace(/\n/g, ' ');
+      // Convert all whitespace to spaces
       change.update(change.from, change.to, [text]);
     }
 
@@ -834,14 +1002,15 @@ class CodeEditor extends React.Component {
     }
   }
 
-  _codemirrorPaste(cm, e) {
+  _codemirrorPaste(_cm, e) {
     if (this.props.onPaste) {
       this.props.onPaste(e);
     }
   }
 
-  _codemirrorPreventWhenTypePassword(cm, e) {
+  _codemirrorPreventWhenTypePassword(_cm, e) {
     const { type } = this.props;
+
     if (type && type.toLowerCase() === 'password') {
       e.preventDefault();
     }
@@ -857,15 +1026,18 @@ class CodeEditor extends React.Component {
       return;
     }
 
+    // @ts-expect-error -- TSCONVERSION
     const value = this.codeMirror.getDoc().getValue();
-
     // Disable linting if the document reaches a maximum size or is empty
     const shouldLint =
       value.length > MAX_SIZE_FOR_LINTING || value.length === 0 ? false : !this.props.noLint;
+    // @ts-expect-error -- TSCONVERSION
     const existingLint = this.codeMirror.options.lint || false;
+
     if (shouldLint !== existingLint) {
       const { lintOptions } = this.props;
       const lint = shouldLint ? lintOptions || true : false;
+
       this._codemirrorSmartSetOption('lint', lint);
     }
 
@@ -903,11 +1075,13 @@ class CodeEditor extends React.Component {
       }
     }
 
+    // @ts-expect-error -- TSCONVERSION
     this.codeMirror.setValue(code || '');
   }
 
   _handleFilterHistorySelect(filter) {
     this._filterInput.value = filter;
+
     this._setFilter(filter);
   }
 
@@ -916,10 +1090,16 @@ class CodeEditor extends React.Component {
   }
 
   _setFilter(filter) {
-    clearTimeout(this._filterTimeout);
+    if (this._filterTimeout !== null) {
+      clearTimeout(this._filterTimeout);
+    }
     this._filterTimeout = setTimeout(() => {
-      this.setState({ filter });
+      this.setState({
+        filter,
+      });
+
       this._codemirrorSetValue(this._originalCode);
+
       if (this.props.updateFilter) {
         this.props.updateFilter(filter);
       }
@@ -933,6 +1113,7 @@ class CodeEditor extends React.Component {
 
   _showFilterHelp() {
     const isJson = CodeEditor._isJSON(this.props.mode);
+
     showModal(FilterHelpModal, isJson);
   }
 
@@ -953,15 +1134,14 @@ class CodeEditor extends React.Component {
       isVariableUncovered,
       raw,
     } = this.props;
-
     const classes = classnames(className, {
       editor: true,
       'editor--dynamic-height': dynamicHeight,
       'editor--readonly': readOnly,
       'raw-editor': raw,
     });
+    const toolbarChildren: Array<ReactNode> = [];
 
-    const toolbarChildren = [];
     if (this.props.updateFilter && (CodeEditor._isJSON(mode) || CodeEditor._isXML(mode))) {
       toolbarChildren.push(
         <input
@@ -977,11 +1157,13 @@ class CodeEditor extends React.Component {
 
       if (filterHistory && filterHistory.length) {
         toolbarChildren.push(
+
           <Dropdown key="history" className="tall" right>
             <DropdownButton className="btn btn--compact">
               <i className="fa fa-clock-o" />
             </DropdownButton>
             {filterHistory.reverse().map(filter => (
+
               <DropdownItem key={filter} value={filter} onClick={this._handleFilterHistorySelect}>
                 {filter}
               </DropdownItem>
@@ -999,6 +1181,7 @@ class CodeEditor extends React.Component {
 
     if (this.props.manualPrettify && this._canPrettify()) {
       let contentTypeName = '';
+
       if (CodeEditor._isJSON(mode)) {
         contentTypeName = 'JSON';
       } else if (CodeEditor._isXML(mode)) {
@@ -1018,7 +1201,8 @@ class CodeEditor extends React.Component {
       );
     }
 
-    let toolbar = null;
+    let toolbar: ReactNode = null;
+
     if (toolbarChildren.length) {
       toolbar = (
         <div key={this._uniquenessKey} className="editor__toolbar">
@@ -1027,7 +1211,8 @@ class CodeEditor extends React.Component {
       );
     }
 
-    const styles = {};
+    const styles: CSSProperties = {};
+
     if (fontSize) {
       styles.fontSize = `${fontSize}px`;
     }
@@ -1043,10 +1228,11 @@ class CodeEditor extends React.Component {
             key={isVariableUncovered ? 'foo' : 'bar'}
             id={id}
             ref={this._handleInitTextarea}
-            style={{ display: 'none' }}
+            style={{
+              display: 'none',
+            }}
             readOnly={readOnly}
-            autoComplete="off"
-            // NOTE: When setting this to empty string, it breaks the _ignoreNextChange
+            autoComplete="off" // NOTE: When setting this to empty string, it breaks the _ignoreNextChange
             //   logic on initial component mount
             defaultValue=" "
           />
@@ -1057,59 +1243,4 @@ class CodeEditor extends React.Component {
   }
 }
 
-CodeEditor.propTypes = {
-  onChange: PropTypes.func,
-  onCursorActivity: PropTypes.func,
-  onFocus: PropTypes.func,
-  onBlur: PropTypes.func,
-  onClickLink: PropTypes.func,
-  onKeyDown: PropTypes.func,
-  onMouseLeave: PropTypes.func,
-  onClick: PropTypes.func,
-  onPaste: PropTypes.func,
-  onCodeMirrorInit: PropTypes.func,
-  render: PropTypes.func,
-  nunjucksPowerUserMode: PropTypes.bool,
-  getRenderContext: PropTypes.func,
-  getAutocompleteConstants: PropTypes.func,
-  getAutocompleteSnippets: PropTypes.func,
-  keyMap: PropTypes.string,
-  mode: PropTypes.string,
-  id: PropTypes.string,
-  placeholder: PropTypes.string,
-  lineWrapping: PropTypes.bool,
-  hideLineNumbers: PropTypes.bool,
-  hideGutters: PropTypes.bool,
-  noMatchBrackets: PropTypes.bool,
-  hideScrollbars: PropTypes.bool,
-  fontSize: PropTypes.number,
-  indentSize: PropTypes.number,
-  defaultValue: PropTypes.string,
-  tabIndex: PropTypes.number,
-  autoPrettify: PropTypes.bool,
-  manualPrettify: PropTypes.bool,
-  noLint: PropTypes.bool,
-  noDragDrop: PropTypes.bool,
-  noStyleActiveLine: PropTypes.bool,
-  className: PropTypes.any,
-  style: PropTypes.object,
-  updateFilter: PropTypes.func,
-  defaultTabBehavior: PropTypes.bool,
-  readOnly: PropTypes.bool,
-  type: PropTypes.string,
-  filter: PropTypes.string,
-  filterHistory: PropTypes.arrayOf(PropTypes.string.isRequired),
-  singleLine: PropTypes.bool,
-  debounceMillis: PropTypes.number,
-  dynamicHeight: PropTypes.bool,
-  autoCloseBrackets: PropTypes.bool,
-  hintOptions: PropTypes.object,
-  lintOptions: PropTypes.object,
-  infoOptions: PropTypes.object,
-  jumpOptions: PropTypes.object,
-  uniquenessKey: PropTypes.any,
-  isVariableUncovered: PropTypes.bool,
-  raw: PropTypes.bool,
-};
-
 export default CodeEditor;
diff --git a/packages/insomnia-app/app/ui/components/codemirror/extensions/autocomplete.js b/packages/insomnia-app/app/ui/components/codemirror/extensions/autocomplete.ts
similarity index 90%
rename from packages/insomnia-app/app/ui/components/codemirror/extensions/autocomplete.js
rename to packages/insomnia-app/app/ui/components/codemirror/extensions/autocomplete.ts
index 052951d037..333ff9929b 100644
--- a/packages/insomnia-app/app/ui/components/codemirror/extensions/autocomplete.js
+++ b/packages/insomnia-app/app/ui/components/codemirror/extensions/autocomplete.ts
@@ -3,7 +3,6 @@ import 'codemirror/addon/mode/overlay';
 import * as models from '../../../../models';
 import { getDefaultFill } from '../../../../templating/utils';
 import { escapeHTML, escapeRegex } from '../../../../common/misc';
-
 const NAME_MATCH_FLEXIBLE = /[\w.\][\-/]+$/;
 const NAME_MATCH = /[\w.\][]+$/;
 const AFTER_VARIABLE_MATCH = /{{\s*[\w.\][]*$/;
@@ -20,14 +19,24 @@ const MAX_CONSTANTS = -1;
 const MAX_SNIPPETS = -1;
 const MAX_VARIABLES = -1;
 const MAX_TAGS = -1;
-
 const ICONS = {
-  [TYPE_CONSTANT]: { char: '𝒄', title: 'Constant' },
-  [TYPE_SNIPPET]: { char: '§', title: 'Snippet' },
-  [TYPE_VARIABLE]: { char: '𝑥', title: 'Environment Variable' },
-  [TYPE_TAG]: { char: 'ƒ', title: 'Generator Tag' },
+  [TYPE_CONSTANT]: {
+    char: '𝒄',
+    title: 'Constant',
+  },
+  [TYPE_SNIPPET]: {
+    char: '§',
+    title: 'Snippet',
+  },
+  [TYPE_VARIABLE]: {
+    char: '𝑥',
+    title: 'Environment Variable',
+  },
+  [TYPE_TAG]: {
+    char: 'ƒ',
+    title: 'Generator Tag',
+  },
 };
-
 CodeMirror.defineExtension('isHintDropdownActive', function() {
   return (
     this.state.completionActive &&
@@ -36,11 +45,9 @@ CodeMirror.defineExtension('isHintDropdownActive', function() {
     this.state.completionActive.data.list.length
   );
 });
-
 CodeMirror.defineExtension('closeHintDropdown', function() {
   this.state.completionActive?.close();
 });
-
 CodeMirror.defineOption('environmentAutocomplete', null, (cm, options) => {
   if (!options) {
     return;
@@ -62,6 +69,7 @@ CodeMirror.defineOption('environmentAutocomplete', null, (cm, options) => {
     }
 
     let hintsContainer = document.querySelector('#hints-container');
+
     if (!hintsContainer) {
       const el = document.createElement('div');
       el.id = 'hints-container';
@@ -74,7 +82,6 @@ CodeMirror.defineOption('environmentAutocomplete', null, (cm, options) => {
     const variables = options.getVariables ? await options.getVariables() : null;
     const snippets = options.getSnippets ? await options.getSnippets() : null;
     const tags = options.getTags ? await options.getTags() : null;
-
     // Actually show the hint
     cm.showHint({
       // Insomnia-specific options
@@ -83,21 +90,18 @@ CodeMirror.defineOption('environmentAutocomplete', null, (cm, options) => {
       snippets: snippets || [],
       tags: tags || [],
       showAllOnNoMatch,
-
       // Codemirror native options
       hint,
       container: hintsContainer,
       closeCharacters: COMPLETION_CLOSE_KEYS,
       completeSingle: false,
       extraKeys: {
-        Tab: (cm, widget) => {
+        Tab: (_cm, widget) => {
           // Override default behavior and don't select hint on Tab
           widget.close();
           return CodeMirror.Pass;
         },
-      },
-
-      // Good for debugging
+      }, // Good for debugging
       // ,closeOnUnfocus: false
     });
   }
@@ -109,7 +113,6 @@ CodeMirror.defineOption('environmentAutocomplete', null, (cm, options) => {
       const range = cm.getRange(pos, cur);
       return range.match(COMPLETE_AFTER_WORD);
     });
-
     return CodeMirror.Pass;
   }
 
@@ -124,7 +127,6 @@ CodeMirror.defineOption('environmentAutocomplete', null, (cm, options) => {
       },
       true,
     );
-
     return CodeMirror.Pass;
   }
 
@@ -133,8 +135,7 @@ CodeMirror.defineOption('environmentAutocomplete', null, (cm, options) => {
     return CodeMirror.Pass;
   }
 
-  let keydownDebounce = null;
-
+  let keydownDebounce: NodeJS.Timeout | null = null;
   cm.on('keydown', async (cm, e) => {
     // Close autocomplete on Escape if it's open
     if (cm.isHintDropdownActive() && e.key === 'Escape') {
@@ -144,7 +145,6 @@ CodeMirror.defineOption('environmentAutocomplete', null, (cm, options) => {
 
       e.preventDefault();
       e.stopPropagation();
-
       cm.state.completionActive.close();
     }
 
@@ -154,8 +154,9 @@ CodeMirror.defineOption('environmentAutocomplete', null, (cm, options) => {
       return;
     }
 
-    clearTimeout(keydownDebounce);
-
+    if (keydownDebounce !== null) {
+      clearTimeout(keydownDebounce);
+    }
     const { autocompleteDelay } = await models.settings.getOrCreate();
 
     if (autocompleteDelay > 0) {
@@ -164,19 +165,19 @@ CodeMirror.defineOption('environmentAutocomplete', null, (cm, options) => {
       }, autocompleteDelay);
     }
   });
-
   // Clear timeout if we already closed the completion
   cm.on('endCompletion', () => {
-    clearTimeout(keydownDebounce);
+    if (keydownDebounce !== null) {
+      clearTimeout(keydownDebounce);
+    }
   });
-
   // Remove keymap if we're already added it
   cm.removeKeyMap('autocomplete-keymap');
-
   // Add keymap
   cm.addKeyMap({
     name: 'autocomplete-keymap',
-    'Ctrl-Space': completeForce, // Force autocomplete on hotkey
+    'Ctrl-Space': completeForce,
+    // Force autocomplete on hotkey
     "' '": completeIfAfterTagOrVarOpen,
   });
 });
@@ -195,15 +196,14 @@ function hint(cm, options) {
   const constantsToMatch = (options.constants || []).map(s => ({
     name: s,
     value: s,
-    displayValue: '', // No display since name === value
+    displayValue: '',
+    // No display since name === value
     type: TYPE_CONSTANT,
   }));
-
   // Get the text from the cursor back
   const cur = cm.getCursor();
   const pos = CodeMirror.Pos(cur.line, cur.ch - MAX_HINT_LOOK_BACK);
   const previousText = cm.getRange(pos, cur);
-
   // See if we're allowed matching tags, vars, or both
   const isInVariable = previousText.match(AFTER_VARIABLE_MATCH);
   const isInTag = previousText.match(AFTER_TAG_MATCH);
@@ -211,22 +211,19 @@ function hint(cm, options) {
   const allowMatchingVariables = isInNothing || isInVariable;
   const allowMatchingTags = isInNothing || isInTag;
   const allowMatchingConstants = isInNothing;
-
   // Define fallback segment to match everything or nothing
   const fallbackSegment = options.showAllOnNoMatch ? '' : '__will_not_match_anything__';
-
   // See if we're completing a variable name
   const nameMatch = previousText.match(NAME_MATCH);
   const nameMatchLong = previousText.match(NAME_MATCH_FLEXIBLE);
   const nameSegment = nameMatch ? nameMatch[0] : fallbackSegment;
   const nameSegmentLong = nameMatchLong ? nameMatchLong[0] : fallbackSegment;
   const nameSegmentFull = previousText;
-
   // Actually try to match the list of things
   const lowPriorityMatches = [];
   const highPriorityMatches = [];
-
   let mode;
+
   try {
     mode = cm.getOption('mode').baseMode;
   } catch (e) {
@@ -252,8 +249,9 @@ function hint(cm, options) {
       const segment = token.string
         .trim()
         .replace(/^{?"?/, '') // Remove leading '{' and spaces
-        .replace(/"?}?$/, ''); // Remove trailing quotes and spaces
+        .replace(/"?}?$/, '');
 
+      // Remove trailing quotes and spaces
       if (token.type === 'variable') {
         // We're inside a JSON key
         matchSegments(constantsToMatch, segment, TYPE_CONSTANT, MAX_CONSTANTS).forEach(m =>
@@ -266,6 +264,7 @@ function hint(cm, options) {
       ) {
         // We're outside of a JSON key
         matchSegments(constantsToMatch, segment, TYPE_CONSTANT, MAX_CONSTANTS).forEach(m =>
+          // @ts-expect-error -- TSCONVERSION
           highPriorityMatches.push({ ...m, text: '"' + m.text + '": ' }),
         );
       }
@@ -290,17 +289,14 @@ function hint(cm, options) {
   matchSegments(snippetsToMatch, nameSegment, TYPE_SNIPPET, MAX_SNIPPETS).forEach(m =>
     highPriorityMatches.push(m),
   );
-
   const matches = [...highPriorityMatches, ...lowPriorityMatches];
-
   // Autocomplete from longest matched segment
   const segment = highPriorityMatches.length ? nameSegmentLong : nameSegment;
-
   const uniqueMatches = matches.reduce(
+    // @ts-expect-error -- TSCONVERSION
     (arr, v) => (arr.find(a => a.text === v.text) ? arr : [...arr, v]),
     [], // Default value
   );
-
   return {
     list: uniqueMatches,
     from: CodeMirror.Pos(cur.line, cur.ch - segment.length),
@@ -315,7 +311,7 @@ function hint(cm, options) {
  * @param self
  * @param data
  */
-async function replaceHintMatch(cm, self, data) {
+async function replaceHintMatch(cm, _self, data) {
   if (typeof data.text === 'function') {
     data.text = await data.text();
   }
@@ -323,13 +319,10 @@ async function replaceHintMatch(cm, self, data) {
   const cur = cm.getCursor();
   const from = CodeMirror.Pos(cur.line, cur.ch - data.segment.length);
   const to = CodeMirror.Pos(cur.line, cur.ch);
-
   const prevStart = CodeMirror.Pos(from.line, from.ch - 10);
   const prevChars = cm.getRange(prevStart, from);
-
   const nextEnd = CodeMirror.Pos(to.line, to.ch + 10);
   const nextChars = cm.getRange(to, nextEnd);
-
   let prefix = '';
   let suffix = '';
 
@@ -375,13 +368,14 @@ function matchSegments(listOfThings, segment, type, limit = -1) {
   }
 
   const matches = [];
+
   for (const t of listOfThings) {
     const name = typeof t === 'string' ? t : t.name;
     const value = typeof t === 'string' ? '' : t.value;
     const displayName = t.displayName || name;
-
     // Generate the value we'll fill it with
     let defaultFill;
+
     if (t.type === TYPE_CONSTANT) {
       defaultFill = t.value;
     } else if (t.type === TYPE_SNIPPET) {
@@ -406,22 +400,32 @@ function matchSegments(listOfThings, segment, type, limit = -1) {
     }
 
     let displayValue = t.displayValue;
+
     if (typeof displayValue !== 'string' && typeof value !== 'function') {
       displayValue = JSON.stringify(value);
     }
 
     matches.push({
       // Custom Insomnia keys
+      // @ts-expect-error -- TSCONVERSION
       type,
+      // @ts-expect-error -- TSCONVERSION
       segment,
+      // @ts-expect-error -- TSCONVERSION
       displayValue,
+      // @ts-expect-error -- TSCONVERSION
       comment: value,
-      score: name.length, // In case we want to sort by this
-
+      // @ts-expect-error -- TSCONVERSION
+      score: name.length,
+      // In case we want to sort by this
       // CodeMirror
+      // @ts-expect-error -- TSCONVERSION
       text: defaultFill,
+      // @ts-expect-error -- TSCONVERSION
       displayText: displayName,
+      // @ts-expect-error -- TSCONVERSION
       render: renderHintMatch,
+      // @ts-expect-error -- TSCONVERSION
       hint: replaceHintMatch,
     });
   }
@@ -453,14 +457,12 @@ function replaceWithSurround(text, find, prefix, suffix) {
  * @param self
  * @param data
  */
-function renderHintMatch(li, self, data) {
+function renderHintMatch(li, _self, data) {
   // Bold the matched text
   const { displayText, segment } = data;
   const markedName = replaceWithSurround(displayText, segment, '<strong>', '</strong>');
-
   const { char, title } = ICONS[data.type];
   const safeValue = escapeHTML(data.displayValue);
-
   li.className += ` fancy-hint type--${data.type}`;
   li.innerHTML = `
     <label class="label" title="${title}">${char}</label>
diff --git a/packages/insomnia-app/app/ui/components/codemirror/extensions/clickable.js b/packages/insomnia-app/app/ui/components/codemirror/extensions/clickable.ts
similarity index 81%
rename from packages/insomnia-app/app/ui/components/codemirror/extensions/clickable.js
rename to packages/insomnia-app/app/ui/components/codemirror/extensions/clickable.ts
index 8cd195e7d3..7e8a3344a9 100644
--- a/packages/insomnia-app/app/ui/components/codemirror/extensions/clickable.js
+++ b/packages/insomnia-app/app/ui/components/codemirror/extensions/clickable.ts
@@ -2,13 +2,14 @@ import CodeMirror from 'codemirror';
 import 'codemirror/addon/mode/overlay';
 import { AllHtmlEntities } from 'html-entities';
 import { FLEXIBLE_URL_REGEX } from '../../../../common/constants';
-
 const entities = new AllHtmlEntities();
 
-CodeMirror.defineExtension('makeLinksClickable', function(handleClick) {
+export type CodeMirrorLinkClickCallback = (url: string) => void;
+
+CodeMirror.defineExtension('makeLinksClickable', function(handleClick: CodeMirrorLinkClickCallback) {
   // Only add the click mode if we have links to click
   this.addOverlay({
-    token: function(stream, state) {
+    token: function(stream) {
       if (stream.match(FLEXIBLE_URL_REGEX, true)) {
         return 'clickable';
       }
@@ -23,21 +24,19 @@ CodeMirror.defineExtension('makeLinksClickable', function(handleClick) {
 
   const el = this.getWrapperElement();
   let movedDuringClick = false;
-
-  el.addEventListener('mousemove', e => {
+  el.addEventListener('mousemove', () => {
     movedDuringClick = true;
   });
-
-  el.addEventListener('mousedown', e => {
+  el.addEventListener('mousedown', () => {
     movedDuringClick = false;
   });
-
   el.addEventListener('mouseup', e => {
     if (movedDuringClick) {
       return;
     }
 
     const cls = e.target.className;
+
     if (cls.indexOf('cm-clickable') >= 0) {
       handleClick(entities.decode(e.target.innerHTML));
     }
diff --git a/packages/insomnia-app/app/ui/components/codemirror/extensions/nunjucks-tags.js b/packages/insomnia-app/app/ui/components/codemirror/extensions/nunjucks-tags.ts
similarity index 73%
rename from packages/insomnia-app/app/ui/components/codemirror/extensions/nunjucks-tags.js
rename to packages/insomnia-app/app/ui/components/codemirror/extensions/nunjucks-tags.ts
index 5e079a1b86..d04c9ebc09 100644
--- a/packages/insomnia-app/app/ui/components/codemirror/extensions/nunjucks-tags.js
+++ b/packages/insomnia-app/app/ui/components/codemirror/extensions/nunjucks-tags.ts
@@ -1,61 +1,64 @@
-import CodeMirror from 'codemirror';
+import CodeMirror, { Token } from 'codemirror';
 import * as misc from '../../../../common/misc';
 import NunjucksVariableModal from '../../modals/nunjucks-modal';
 import { showModal } from '../../modals/index';
 import { tokenizeTag } from '../../../../templating/utils';
 import { getTagDefinitions } from '../../../../templating/index';
 
-CodeMirror.defineExtension('enableNunjucksTags', function(
-  handleRender,
-  handleGetRenderContext,
-  isVariableUncovered = false,
-) {
-  if (!handleRender) {
-    console.warn("enableNunjucksTags wasn't passed a render function");
-    return;
-  }
-
-  const refreshFn = _highlightNunjucksTags.bind(
-    this,
-    handleRender,
-    handleGetRenderContext,
-    isVariableUncovered,
-  );
-  const debouncedRefreshFn = misc.debounce(refreshFn);
-
-  this.on('change', (cm, change) => {
-    const origin = change.origin || 'unknown';
-    if (!origin.match(/^[+*]/)) {
-      // Refresh immediately on non-joinable events
-      // (cut, paste, autocomplete; as opposed to +input, +delete)
-      refreshFn();
-    } else {
-      // Debounce all joinable events
-      debouncedRefreshFn();
+CodeMirror.defineExtension(
+  'enableNunjucksTags',
+  function(handleRender, handleGetRenderContext, isVariableUncovered = false) {
+    if (!handleRender) {
+      console.warn("enableNunjucksTags wasn't passed a render function");
+      return;
     }
-  });
-  this.on('cursorActivity', debouncedRefreshFn);
-  this.on('viewportChange', debouncedRefreshFn);
 
-  // Trigger once right away to snappy perf
-  refreshFn();
-});
+    const refreshFn = _highlightNunjucksTags.bind(
+      this,
+      handleRender,
+      handleGetRenderContext,
+      isVariableUncovered,
+    );
+
+    const debouncedRefreshFn = misc.debounce(refreshFn);
+    this.on('change', (_cm, change) => {
+      const origin = change.origin || 'unknown';
+
+      if (!origin.match(/^[+*]/)) {
+        // Refresh immediately on non-joinable events
+        // (cut, paste, autocomplete; as opposed to +input, +delete)
+        refreshFn();
+      } else {
+        // Debounce all joinable events
+        debouncedRefreshFn();
+      }
+    });
+    this.on('cursorActivity', debouncedRefreshFn);
+    this.on('viewportChange', debouncedRefreshFn);
+    // Trigger once right away to snappy perf
+    refreshFn();
+  },
+);
 
 async function _highlightNunjucksTags(render, renderContext, isVariableUncovered) {
   const renderCacheKey = Math.random() + '';
+
   const renderString = text => render(text, renderCacheKey);
-  const activeMarks = [];
-  const doc = this.getDoc();
+
+  const activeMarks: Array<CodeMirror.TextMarker> = [];
+  const doc: CodeMirror.Doc = this.getDoc();
 
   // Only mark up Nunjucks tokens that are in the viewport
   const vp = this.getViewport();
+
   for (let lineNo = vp.from; lineNo < vp.to; lineNo++) {
     const line = this.getLineTokens(lineNo);
     const tokens = line.filter(({ type }) => type && type.indexOf('nunjucks') >= 0);
 
     // Aggregate same tokens
-    const newTokens = [];
-    let currTok = null;
+    const newTokens: Array<Token> = [];
+    let currTok: Token | null = null;
+
     for (let i = 0; i < tokens.length; i++) {
       const nextTok = tokens[i];
 
@@ -78,8 +81,14 @@ async function _highlightNunjucksTags(render, renderContext, isVariableUncovered
     }
 
     for (const tok of newTokens) {
-      const start = { line: lineNo, ch: tok.start };
-      const end = { line: lineNo, ch: tok.end };
+      const start = {
+        line: lineNo,
+        ch: tok.start,
+      };
+      const end = {
+        line: lineNo,
+        ch: tok.end,
+      };
       const cursor = doc.getCursor();
       const isSameLine = cursor.line === lineNo;
       const isCursorInToken = isSameLine && cursor.ch > tok.start && cursor.ch < tok.end;
@@ -92,13 +101,15 @@ async function _highlightNunjucksTags(render, renderContext, isVariableUncovered
 
       // See if we already have a mark for this
       let hasOwnMark = false;
-      for (const m of doc.findMarks(start, end)) {
+
+      for (const mark of doc.findMarks(start, end)) {
         // Only check marks we created
-        if (m.__nunjucks) {
+        // @ts-expect-error -- TSCONVERSION need to extend nunjucks
+        if (mark.__nunjucks) {
           hasOwnMark = true;
         }
 
-        activeMarks.push(m);
+        activeMarks.push(mark);
       }
 
       // Already have a mark for this, so leave it alone
@@ -111,9 +122,9 @@ async function _highlightNunjucksTags(render, renderContext, isVariableUncovered
       el.setAttribute('draggable', 'true');
       el.setAttribute('data-error', 'off');
       el.setAttribute('data-template', tok.string);
-
       const mark = this.markText(start, end, {
-        __nunjucks: true, // Mark that we created it
+        __nunjucks: true,
+        // Mark that we created it
         __template: tok.string,
         handleMouseEvents: false,
         replacedWith: el,
@@ -139,15 +150,14 @@ async function _highlightNunjucksTags(render, renderContext, isVariableUncovered
           isVariableUncovered,
         );
       });
-
       activeMarks.push(mark);
-
       el.addEventListener('click', async () => {
         // Define the dialog HTML
         showModal(NunjucksVariableModal, {
           template: mark.__template,
           onDone: template => {
             const pos = mark.find();
+
             if (pos) {
               const { from, to } = pos;
               this.replaceRange(template, from, to);
@@ -157,38 +167,37 @@ async function _highlightNunjucksTags(render, renderContext, isVariableUncovered
           },
         });
       });
-
       // ~~~~~~~~~~~~~~~~~~~~~~~ //
       // Setup Drag-n-Drop stuff //
       // ~~~~~~~~~~~~~~~~~~~~~~~ //
-
       let droppedInSameEditor = false;
 
       // Modify paste events so we can merge into them
-      const beforeChangeCb = (cm, change) => {
+      const beforeChangeCb = (_cm, change) => {
         if (change.origin === 'paste') {
           change.origin = '+dnd';
         }
       };
 
-      const dropCb = (cm, e) => {
+      const dropCb = () => {
         droppedInSameEditor = true;
       };
 
       // Set up the drag
-      el.addEventListener('dragstart', e => {
+      el.addEventListener('dragstart', event => {
         // Setup the drag contents
-        const template = e.target.getAttribute('data-template');
-        e.dataTransfer.setData('text/plain', template);
-        e.dataTransfer.effectAllowed = 'copyMove';
-        e.dataTransfer.dropEffect = 'move';
-
+        // @ts-expect-error -- TSCONVERSION
+        const template = event.target?.getAttribute('data-template');
+        event.dataTransfer?.setData('text/plain', template);
+        // @ts-expect-error -- TSCONVERSION
+        event.dataTransfer.effectAllowed = 'copyMove';
+        // @ts-expect-error -- TSCONVERSION
+        event.dataTransfer.dropEffect = 'move';
         // Add some listeners
         this.on('beforeChange', beforeChangeCb);
         this.on('drop', dropCb);
       });
-
-      el.addEventListener('dragend', e => {
+      el.addEventListener('dragend', () => {
         // If dragged within same editor, delete the old reference
         // TODO: Actually only use dropEffect for this logic. For some reason
         // changing it doesn't seem to take affect in Chromium 56 (maybe bug?)
@@ -201,7 +210,6 @@ async function _highlightNunjucksTags(render, renderContext, isVariableUncovered
         this.off('beforeChange', beforeChangeCb);
         this.off('drop', dropCb);
       });
-
       // Don't allow dropping on itself
       el.addEventListener('drop', e => {
         e.stopPropagation();
@@ -211,16 +219,28 @@ async function _highlightNunjucksTags(render, renderContext, isVariableUncovered
 
   // Clear all the marks that we didn't just modify/add
   // For example, adding a {% raw %} tag would need to clear everything it wrapped
-  const marksInViewport = doc.findMarks({ ch: 0, line: vp.from }, { ch: 0, line: vp.to });
+  const marksInViewport = doc.findMarks(
+    {
+      ch: 0,
+      line: vp.from,
+    },
+    {
+      ch: 0,
+      line: vp.to,
+    },
+  );
 
   for (const mark of marksInViewport) {
     // Only check marks we created
+    // @ts-expect-error -- TSCONVERSION needs type extension for TextMarker for the extension
     if (!mark.__nunjucks) {
       continue;
     }
 
     let inActiveMarks = false;
+
     for (const activeMark of activeMarks) {
+      // @ts-expect-error -- TSCONVERSION need to investigate in CodeMirror types
       if (activeMark.id === mark.id) {
         inActiveMarks = true;
       }
@@ -234,12 +254,10 @@ async function _highlightNunjucksTags(render, renderContext, isVariableUncovered
 
 async function _updateElementText(render, mark, text, renderContext, isVariableUncovered) {
   const el = mark.replacedWith;
-
   let innerHTML = '';
   let title = '';
   let dataIgnore = '';
   let dataError = '';
-
   const str = text.replace(/\\/g, '');
   const tagMatch = str.match(/{% *([^ ]+) *.*%}/);
   const cleanedStr = str
@@ -256,19 +274,25 @@ async function _updateElementText(render, mark, text, renderContext, isVariableU
 
       if (tagDefinition) {
         // Try rendering these so we can show errors if needed
+        // @ts-expect-error -- TSCONVERSION
         const liveDisplayName = tagDefinition.liveDisplayName(tagData.args);
         const firstArg = tagDefinition.args[0];
+
         if (liveDisplayName) {
           innerHTML = liveDisplayName;
         } else if (firstArg && firstArg.type === 'enum') {
           const argData = tagData.args[0];
+          // @ts-expect-error -- TSCONVERSION
           const foundOption = firstArg.options.find(d => d.value === argData.value);
+          // @ts-expect-error -- TSCONVERSION
           const option = foundOption || firstArg.options[0];
           innerHTML = `${tagDefinition.displayName} &rArr; ${option.displayName}`;
         } else {
           innerHTML = tagDefinition.displayName || tagData.name;
         }
+
         const preview = await render(text);
+        // @ts-expect-error -- TSCONVERSION
         title = tagDefinition.disablePreview(tagData.args) ? preview.replace(/./g, '*') : preview;
       } else {
         innerHTML = cleanedStr;
@@ -281,11 +305,11 @@ async function _updateElementText(render, mark, text, renderContext, isVariableU
       const context = await renderContext();
       const con = context.context.getKeysContext();
       const contextForKey = con.keyContext[cleanedStr];
-
       // Only prefix the title with context, if context is found
       title = contextForKey ? `{${contextForKey}}: ${title}` : title;
       innerHTML = isVariableUncovered ? title : cleanedStr;
     }
+
     dataError = 'off';
   } catch (err) {
     title = err.message.replace(/\[.+,.+]\s*/, '');
@@ -294,6 +318,7 @@ async function _updateElementText(render, mark, text, renderContext, isVariableU
 
   el.title = title;
   el.setAttribute('data-ignore', dataIgnore);
+
   if (dataError === 'on') {
     el.setAttribute('data-error', dataError);
     el.innerHTML = '<label><i class="fa fa-exclamation-triangle"></i></label>' + cleanedStr;
diff --git a/packages/insomnia-app/app/ui/components/codemirror/lint/javascript-async-lint.js b/packages/insomnia-app/app/ui/components/codemirror/lint/javascript-async-lint.ts
similarity index 98%
rename from packages/insomnia-app/app/ui/components/codemirror/lint/javascript-async-lint.js
rename to packages/insomnia-app/app/ui/components/codemirror/lint/javascript-async-lint.ts
index f741e9f033..3f4c7ed34a 100644
--- a/packages/insomnia-app/app/ui/components/codemirror/lint/javascript-async-lint.js
+++ b/packages/insomnia-app/app/ui/components/codemirror/lint/javascript-async-lint.ts
@@ -3,22 +3,20 @@
 // lint errors to account for the wrapper.
 //
 // The major modifications are marked in comments starting with "CHANGED ---"
-
 import CodeMirror from 'codemirror';
 import { JSHINT } from 'jshint';
-
 CodeMirror.registerHelper('lint', 'javascript', validator);
 
 function validator(text, options) {
   if (!options.indent) {
     // JSHint error.character actually is a column index, this fixes underlining on lines using tabs for indentation
     options.indent = 1;
-  } // JSHint default value is 4
+  }
 
+  // JSHint default value is 4
   // CHANGED ----------------------------------------------------------- //
   // Wrap text with async function to "enable" top-level await
   const textWithWrapper = `async function asyncWrapper() {\n${text}\n}`;
-
   JSHINT(textWithWrapper, options, options.globals);
   const errors = JSHINT.data().errors;
   const result = [];
@@ -33,6 +31,7 @@ function validator(text, options) {
 function parseErrors(errors, output) {
   for (let i = 0; i < errors.length; i++) {
     const error = errors[i];
+
     if (error) {
       if (error.line <= 0) {
         if (window.console) {
@@ -41,13 +40,16 @@ function parseErrors(errors, output) {
             error,
           );
         }
+
         continue;
       }
 
       const start = error.character - 1;
       let end = start + 1;
+
       if (error.evidence) {
         const index = error.evidence.substring(start).search(/.\b/);
+
         if (index > -1) {
           end += index;
         }
@@ -60,12 +62,10 @@ function parseErrors(errors, output) {
         from: CodeMirror.Pos(error.line - 1, start),
         to: CodeMirror.Pos(error.line - 1, end),
       };
-
       // CHANGED ----------------------------------------------------------- //
       // Offset an extra line to account for async wrapper function
       hint.from.line -= 1;
       hint.to.line -= 1;
-
       output.push(hint);
     }
   }
diff --git a/packages/insomnia-app/app/ui/components/codemirror/lint/openapi.js b/packages/insomnia-app/app/ui/components/codemirror/lint/openapi.ts
similarity index 85%
rename from packages/insomnia-app/app/ui/components/codemirror/lint/openapi.js
rename to packages/insomnia-app/app/ui/components/codemirror/lint/openapi.ts
index b8ec1f1245..b606967c0b 100644
--- a/packages/insomnia-app/app/ui/components/codemirror/lint/openapi.js
+++ b/packages/insomnia-app/app/ui/components/codemirror/lint/openapi.ts
@@ -5,9 +5,10 @@ const spectral = new Spectral();
 
 CodeMirror.registerHelper('lint', 'openapi', async function(text) {
   const results = await spectral.run(text);
-
   return results.map(result => ({
+    // @ts-expect-error -- TSCONVERSION
     from: CodeMirror.Pos(result.range.start.line, result.range.start.chracter),
+    // @ts-expect-error -- TSCONVERSION
     to: CodeMirror.Pos(result.range.end.line, result.range.end.chracter),
     message: result.message,
   }));
diff --git a/packages/insomnia-app/app/ui/components/codemirror/modes/curl.js b/packages/insomnia-app/app/ui/components/codemirror/modes/curl.ts
similarity index 80%
rename from packages/insomnia-app/app/ui/components/codemirror/modes/curl.js
rename to packages/insomnia-app/app/ui/components/codemirror/modes/curl.ts
index 797f566316..24c291260b 100644
--- a/packages/insomnia-app/app/ui/components/codemirror/modes/curl.js
+++ b/packages/insomnia-app/app/ui/components/codemirror/modes/curl.ts
@@ -1,6 +1,5 @@
 import CodeMirror from 'codemirror';
 import 'codemirror/addon/mode/simple';
-
 CodeMirror.defineSimpleMode('curl', {
   start: [
     // Regular key-value header tokens
@@ -11,9 +10,7 @@ CodeMirror.defineSimpleMode('curl', {
     {
       regex: /^(< )([^:]*:)(.*)$/,
       token: ['curl-prefix curl-in', 'curl-in', 'curl-in curl-value'],
-    },
-
-    // Header fields ("POST /foo/bar HTTP/1.1")
+    }, // Header fields ("POST /foo/bar HTTP/1.1")
     {
       regex: /^(> )([^:]+ .*)$/,
       token: ['curl-prefix curl-out curl-header', 'curl-out curl-header'],
@@ -21,12 +18,11 @@ CodeMirror.defineSimpleMode('curl', {
     {
       regex: /^(< )([^:]+ .*)$/,
       token: ['curl-prefix curl-in curl-header', 'curl-in curl-header'],
-    },
-
-    // Data
-    { regex: /^(\| )(.*)$/, token: ['curl-prefix curl-data', 'curl-data'] },
-
-    // Informational text
+    }, // Data
+    {
+      regex: /^(\| )(.*)$/,
+      token: ['curl-prefix curl-data', 'curl-data'],
+    }, // Informational text
     {
       regex: /^(\* )(.*)$/,
       token: ['curl-prefix curl-comment', 'curl-comment'],
diff --git a/packages/insomnia-app/app/ui/components/codemirror/modes/nunjucks.js b/packages/insomnia-app/app/ui/components/codemirror/modes/nunjucks.ts
similarity index 97%
rename from packages/insomnia-app/app/ui/components/codemirror/modes/nunjucks.js
rename to packages/insomnia-app/app/ui/components/codemirror/modes/nunjucks.ts
index 9446b1f88f..1ab96235d7 100644
--- a/packages/insomnia-app/app/ui/components/codemirror/modes/nunjucks.js
+++ b/packages/insomnia-app/app/ui/components/codemirror/modes/nunjucks.ts
@@ -1,8 +1,9 @@
 import CodeMirror from 'codemirror';
-
 CodeMirror.defineMode('nunjucks', (config, parserConfig) => {
   const baseMode = CodeMirror.getMode(config, parserConfig.baseMode || 'text/plain');
+
   const nunjucksMode = _nunjucksMode();
+
   return CodeMirror.overlayMode(baseMode, nunjucksMode, false);
 });
 
@@ -11,20 +12,22 @@ function _nunjucksMode() {
   const regexTag = /^{%\s*([^ }]+)\s*[^%]*\s*%}/;
   const regexComment = /^{#\s*[^#]+\s*#}/;
   let ticker = 1;
-
   return {
     startState() {
-      return { inRaw: false };
+      return {
+        inRaw: false,
+      };
     },
+
     token(stream, state) {
       let m;
-
       // This makes sure that adjacent tags still have unique types
       ticker *= -1;
-
       m = stream.match(regexTag, true);
+
       if (m) {
         const name = m[1];
+
         if (state.inRaw && name === 'endraw') {
           state.inRaw = false;
         } else if (!state.inRaw && name === 'raw') {
@@ -39,6 +42,7 @@ function _nunjucksMode() {
 
       if (!state.inRaw) {
         m = stream.match(regexVariable, true);
+
         if (m) {
           return `nunjucks-variable ${ticker}`;
         }
@@ -46,6 +50,7 @@ function _nunjucksMode() {
 
       if (!state.inRaw) {
         m = stream.match(regexComment, true);
+
         if (m) {
           return `nunjucks-comment ${ticker}`;
         }
diff --git a/packages/insomnia-app/app/ui/components/codemirror/modes/openapi.js b/packages/insomnia-app/app/ui/components/codemirror/modes/openapi.ts
similarity index 99%
rename from packages/insomnia-app/app/ui/components/codemirror/modes/openapi.js
rename to packages/insomnia-app/app/ui/components/codemirror/modes/openapi.ts
index 08e2bfeaae..be22f03949 100644
--- a/packages/insomnia-app/app/ui/components/codemirror/modes/openapi.js
+++ b/packages/insomnia-app/app/ui/components/codemirror/modes/openapi.ts
@@ -1,14 +1,13 @@
 import CodeMirror from 'codemirror';
-
 CodeMirror.defineMode('openapi', function() {
   const cons = ['true', 'false', 'on', 'off', 'yes', 'no'];
   const keywordRegex = new RegExp('\\b((' + cons.join(')|(') + '))$', 'i');
-
   return {
     token: function(stream, state) {
       const ch = stream.peek();
       const esc = state.escaped;
       state.escaped = false;
+
       /* comments */
       if (ch === '#' && (stream.pos === 0 || /\s/.test(stream.string.charAt(stream.pos - 1)))) {
         stream.skipToEnd();
@@ -25,23 +24,28 @@ CodeMirror.defineMode('openapi', function() {
       } else if (state.literal) {
         state.literal = false;
       }
+
       if (stream.sol()) {
         state.keyCol = 0;
         state.pair = false;
         state.pairStart = false;
+
         /* document start */
         if (stream.match(/---/)) {
           return 'def';
         }
+
         /* document end */
         if (stream.match(/\.\.\./)) {
           return 'def';
         }
+
         /* array list item */
         if (stream.match(/\s*-\s+/)) {
           return 'meta';
         }
       }
+
       /* inline pairs/lists */
       if (stream.match(/^(\{|\}|\[|\])/)) {
         if (ch === '{') {
@@ -53,6 +57,7 @@ CodeMirror.defineMode('openapi', function() {
         } else {
           state.inlineList--;
         }
+
         return 'meta';
       }
 
@@ -61,6 +66,7 @@ CodeMirror.defineMode('openapi', function() {
         stream.next();
         return 'meta';
       }
+
       /* pairs seperator */
       if (state.inlinePairs > 0 && !esc && ch === ',') {
         state.keyCol = 0;
@@ -107,6 +113,7 @@ CodeMirror.defineMode('openapi', function() {
         state.keyCol = stream.indentation();
         return 'atom';
       }
+
       if (state.pair && stream.match(/^:\s*/)) {
         state.pairStart = true;
         return 'meta';
@@ -133,6 +140,5 @@ CodeMirror.defineMode('openapi', function() {
     fold: 'indent',
   };
 });
-
 CodeMirror.defineMIME('text/x-openapi', 'openapi');
 CodeMirror.defineMIME('text/openapi', 'openapi');
diff --git a/packages/insomnia-app/app/ui/components/codemirror/one-line-editor.js b/packages/insomnia-app/app/ui/components/codemirror/one-line-editor.tsx
similarity index 72%
rename from packages/insomnia-app/app/ui/components/codemirror/one-line-editor.js
rename to packages/insomnia-app/app/ui/components/codemirror/one-line-editor.tsx
index e63c38f995..d21a50bd2a 100644
--- a/packages/insomnia-app/app/ui/components/codemirror/one-line-editor.js
+++ b/packages/insomnia-app/app/ui/components/codemirror/one-line-editor.tsx
@@ -1,23 +1,52 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { Fragment, PureComponent } from 'react';
 import ReactDOM from 'react-dom';
 import classnames from 'classnames';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import CodeEditor from './code-editor';
 import Input from '../base/debounced-input';
-
 const MODE_INPUT = 'input';
 const MODE_EDITOR = 'editor';
 const TYPE_TEXT = 'text';
 const NUNJUCKS_REGEX = /({%|%}|{{|}})/;
 
-@autoBindMethodsForReact(AUTOBIND_CFG)
-class OneLineEditor extends PureComponent {
-  constructor(props) {
-    super(props);
+interface Props {
+  defaultValue: string;
+  id?: string;
+  type?: string;
+  mode?: string;
+  onBlur?: Function;
+  onKeyDown?: Function;
+  onFocus?: Function;
+  onChange?: Function;
+  onPaste?: Function;
+  render?: Function;
+  getRenderContext?: Function;
+  nunjucksPowerUserMode?: boolean;
+  getAutocompleteConstants?: Function | null;
+  placeholder?: string;
+  className?: string;
+  forceEditor?: boolean;
+  forceInput?: boolean;
+  isVariableUncovered?: boolean;
+  // TODO(TSCONVERSION) figure out why so many components pass this in yet it isn't used anywhere in this
+  disabled?: boolean;
+}
 
+interface State {
+  mode: string;
+}
+
+@autoBindMethodsForReact(AUTOBIND_CFG)
+class OneLineEditor extends PureComponent<Props, State> {
+  _editor: CodeEditor | null = null;
+  _input: Input | null = null;
+  _mouseEnterTimeout: NodeJS.Timeout | null = null;
+
+  constructor(props: Props) {
+    super(props);
     let mode;
+
     if (props.forceInput) {
       mode = MODE_INPUT;
     } else if (props.forceEditor) {
@@ -35,12 +64,12 @@ class OneLineEditor extends PureComponent {
 
   focus(setToEnd = false) {
     if (this.state.mode === MODE_EDITOR) {
-      if (this._editor && !this._editor.hasFocus()) {
-        setToEnd ? this._editor.focusEnd() : this._editor.focus();
+      if (this._editor && !this._editor?.hasFocus()) {
+        setToEnd ? this._editor?.focusEnd() : this._editor?.focus();
       }
     } else {
-      if (this._input && !this._input.hasFocus()) {
-        setToEnd ? this._input.focusEnd() : this._input.focus();
+      if (this._input && !this._input?.hasFocus()) {
+        setToEnd ? this._input?.focusEnd() : this._input?.focus();
       }
     }
   }
@@ -51,35 +80,37 @@ class OneLineEditor extends PureComponent {
 
   selectAll() {
     if (this.state.mode === MODE_EDITOR) {
-      this._editor.selectAll();
+      this._editor?.selectAll();
     } else {
-      this._input.select();
+      this._input?.select();
     }
   }
 
   getValue() {
     if (this.state.mode === MODE_EDITOR) {
-      return this._editor.getValue();
+      return this._editor?.getValue();
     } else {
-      return this._input.getValue();
+      return this._input?.getValue();
     }
   }
 
   getSelectionStart() {
     if (this._editor) {
-      return this._editor.getSelectionStart();
+      return this._editor?.getSelectionStart();
     } else {
       console.warn('Tried to get selection start of one-line-editor when <input>');
-      return this._input.value.length;
+      // @ts-expect-error -- TSCONVERSION
+      return this._input?.value.length;
     }
   }
 
   getSelectionEnd() {
     if (this._editor) {
-      return this._editor.getSelectionEnd();
+      return this._editor?.getSelectionEnd();
     } else {
       console.warn('Tried to get selection end of one-line-editor when <input>');
-      return this._input.value.length;
+      // @ts-expect-error -- TSCONVERSION
+      return this._input?.value.length;
     }
   }
 
@@ -100,9 +131,11 @@ class OneLineEditor extends PureComponent {
     // a regular <input>
     // NOTE: Must be "mousedown", not "click" because "click" triggers on selection drags
     const node = ReactDOM.findDOMNode(this._editor);
+    // @ts-expect-error -- TSCONVERSION
     const clickWasOutsideOfComponent = !node.contains(e.target);
+
     if (clickWasOutsideOfComponent) {
-      this._editor.clearSelection();
+      this._editor?.clearSelection();
     }
   }
 
@@ -112,6 +145,7 @@ class OneLineEditor extends PureComponent {
 
   _handleInputMouseEnter() {
     // Convert to editor when user hovers mouse over input
+
     /*
      * NOTE: we're doing it in a timeout because we don't want to convert if the
      * mouse goes in an out right away.
@@ -120,7 +154,9 @@ class OneLineEditor extends PureComponent {
   }
 
   _handleInputMouseLeave() {
-    clearTimeout(this._mouseEnterTimeout);
+    if (this._mouseEnterTimeout !== null) {
+      clearTimeout(this._mouseEnterTimeout);
+    }
   }
 
   _handleEditorMouseLeave() {
@@ -131,7 +167,7 @@ class OneLineEditor extends PureComponent {
     const focusedFromTabEvent = !!e.sourceCapabilities;
 
     if (focusedFromTabEvent) {
-      this._editor.focusEnd();
+      this._editor?.focusEnd();
     }
 
     if (!this._editor) {
@@ -140,20 +176,22 @@ class OneLineEditor extends PureComponent {
     }
 
     // Set focused state
-    this._editor.setAttribute('data-focused', 'on');
+    this._editor?.setAttribute('data-focused', 'on');
 
-    this.props.onFocus && this.props.onFocus(e);
+    this.props.onFocus?.(e);
   }
 
   _handleInputFocus(e) {
     // If we're focusing the whole thing, blur the input. This happens when
     // the user tabs to the field.
-    const start = this._input.getSelectionStart();
-    const end = this._input.getSelectionEnd();
+    const start = this._input?.getSelectionStart();
+
+    const end = this._input?.getSelectionEnd();
+
     const focusedFromTabEvent = start === 0 && end === e.target.value.length;
 
     if (focusedFromTabEvent) {
-      this._input.focusEnd();
+      this._input?.focusEnd();
 
       // Also convert to editor if we tabbed to it. Just in case the user
       // needs an editor
@@ -161,15 +199,16 @@ class OneLineEditor extends PureComponent {
     }
 
     // Set focused state
-    this._input.setAttribute('data-focused', 'on');
+    this._input?.setAttribute('data-focused', 'on');
 
     // Also call the regular callback
-    this.props.onFocus && this.props.onFocus(e);
+    this.props.onFocus?.(e);
   }
 
   _handleInputChange(value) {
     this._convertToEditorPreserveFocus();
-    this.props.onChange && this.props.onChange(value);
+
+    this.props.onChange?.(value);
   }
 
   _handleInputKeyDown(e) {
@@ -180,9 +219,9 @@ class OneLineEditor extends PureComponent {
 
   _handleInputBlur() {
     // Set focused state
-    this._input.removeAttribute('data-focused');
+    this._input?.removeAttribute('data-focused');
 
-    this.props.onBlur && this.props.onBlur();
+    this.props.onBlur?.();
   }
 
   _handleEditorBlur() {
@@ -192,7 +231,7 @@ class OneLineEditor extends PureComponent {
     }
 
     // Set focused state
-    this._editor.removeAttribute('data-focused');
+    this._editor?.removeAttribute('data-focused');
 
     if (!this.props.forceEditor) {
       // Convert back to input sometime in the future.
@@ -204,13 +243,14 @@ class OneLineEditor extends PureComponent {
       }, 2000);
     }
 
-    this.props.onBlur && this.props.onBlur();
+    this.props.onBlur?.();
   }
 
   _handleKeyDown(e) {
     // submit form if needed
     if (e.keyCode === 13) {
       let node = e.target;
+
       for (let i = 0; i < 20 && node; i++) {
         if (node.tagName === 'FORM') {
           node.dispatchEvent(new window.Event('submit'));
@@ -218,11 +258,12 @@ class OneLineEditor extends PureComponent {
           e.stopPropagation();
           break;
         }
+
         node = node.parentNode;
       }
     }
 
-    this.props.onKeyDown && this.props.onKeyDown(e, this.getValue());
+    this.props.onKeyDown?.(e, this.getValue());
   }
 
   _convertToEditorPreserveFocus() {
@@ -234,15 +275,17 @@ class OneLineEditor extends PureComponent {
       return;
     }
 
-    if (this._input.hasFocus()) {
-      const start = this._input.getSelectionStart();
-      const end = this._input.getSelectionEnd();
+    if (this._input?.hasFocus()) {
+      const start = this._input?.getSelectionStart();
+
+      const end = this._input?.getSelectionEnd();
 
       // Wait for the editor to swap and restore cursor position
       const check = () => {
         if (this._editor) {
-          this._editor.focus();
-          this._editor.setSelection(start, end, 0, 0);
+          this._editor?.focus();
+
+          this._editor?.setSelection(start, end, 0, 0);
         } else {
           setTimeout(check, 40);
         }
@@ -252,7 +295,9 @@ class OneLineEditor extends PureComponent {
       setTimeout(check);
     }
 
-    this.setState({ mode: MODE_EDITOR });
+    this.setState({
+      mode: MODE_EDITOR,
+    });
   }
 
   _convertToInputIfNotFocused() {
@@ -260,7 +305,7 @@ class OneLineEditor extends PureComponent {
       return;
     }
 
-    if (!this._editor || this._editor.hasFocus()) {
+    if (!this._editor || this._editor?.hasFocus()) {
       return;
     }
 
@@ -268,14 +313,16 @@ class OneLineEditor extends PureComponent {
       return;
     }
 
-    this.setState({ mode: MODE_INPUT });
+    this.setState({
+      mode: MODE_INPUT,
+    });
   }
 
-  _setEditorRef(n) {
+  _setEditorRef(n: CodeEditor) {
     this._editor = n;
   }
 
-  _setInputRef(n) {
+  _setInputRef(n: Input) {
     this._input = n;
   }
 
@@ -305,15 +352,13 @@ class OneLineEditor extends PureComponent {
       mode: syntaxMode,
       type: originalType,
     } = this.props;
-
     const { mode } = this.state;
-
     const type = originalType || TYPE_TEXT;
     const showEditor = mode === MODE_EDITOR;
 
     if (showEditor) {
       return (
-        <React.Fragment>
+        <Fragment>
           <CodeEditor
             ref={this._setEditorRef}
             defaultTabBehavior
@@ -334,21 +379,26 @@ class OneLineEditor extends PureComponent {
             onKeyDown={this._handleKeyDown}
             onFocus={this._handleEditorFocus}
             onMouseLeave={this._handleEditorMouseLeave}
+            // @ts-expect-error -- TSCONVERSION
             onChange={onChange}
+            // @ts-expect-error -- TSCONVERSION
             render={render}
+            // @ts-expect-error -- TSCONVERSION
             getRenderContext={getRenderContext}
             nunjucksPowerUserMode={nunjucksPowerUserMode}
+            // @ts-expect-error -- TSCONVERSION
             getAutocompleteConstants={getAutocompleteConstants}
             className={classnames('editor--single-line', className)}
             defaultValue={defaultValue}
             isVariableUncovered={isVariableUncovered}
           />
-        </React.Fragment>
+        </Fragment>
       );
     } else {
       return (
         <Input
           ref={this._setInputRef}
+          // @ts-expect-error -- TSCONVERSION
           id={id}
           type={type}
           className={className}
@@ -372,27 +422,4 @@ class OneLineEditor extends PureComponent {
   }
 }
 
-OneLineEditor.propTypes = {
-  defaultValue: PropTypes.string.isRequired,
-
-  // Optional
-  id: PropTypes.string,
-  type: PropTypes.string,
-  mode: PropTypes.string,
-  onBlur: PropTypes.func,
-  onKeyDown: PropTypes.func,
-  onFocus: PropTypes.func,
-  onChange: PropTypes.func,
-  onPaste: PropTypes.func,
-  render: PropTypes.func,
-  getRenderContext: PropTypes.func,
-  nunjucksPowerUserMode: PropTypes.bool,
-  getAutocompleteConstants: PropTypes.func,
-  placeholder: PropTypes.string,
-  className: PropTypes.string,
-  forceEditor: PropTypes.bool,
-  forceInput: PropTypes.bool,
-  isVariableUncovered: PropTypes.bool,
-};
-
 export default OneLineEditor;
diff --git a/packages/insomnia-app/app/ui/components/cookie-list.js b/packages/insomnia-app/app/ui/components/cookie-list.tsx
similarity index 76%
rename from packages/insomnia-app/app/ui/components/cookie-list.js
rename to packages/insomnia-app/app/ui/components/cookie-list.tsx
index 314899139e..583331c3d5 100644
--- a/packages/insomnia-app/app/ui/components/cookie-list.js
+++ b/packages/insomnia-app/app/ui/components/cookie-list.tsx
@@ -1,5 +1,4 @@
-// @flow
-import React from 'react';
+import React, { PureComponent } from 'react';
 import * as uuid from 'uuid';
 import * as toughCookie from 'tough-cookie';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
@@ -9,23 +8,24 @@ import RenderedText from './rendered-text';
 import type { Cookie } from '../../models/cookie-jar';
 import { Dropdown, DropdownButton, DropdownItem } from './base/dropdown/index';
 import { AUTOBIND_CFG } from '../../common/constants';
+import { HandleRender } from '../../common/render';
 
-type Props = {
-  handleCookieAdd: Function,
-  handleCookieDelete: Function,
-  handleDeleteAll: Function,
-  cookies: Array<Cookie>,
-  newCookieDomainName: string,
-  handleShowModifyCookieModal: Function,
-  handleRender: Function,
-};
+interface Props {
+  handleCookieAdd: Function;
+  handleCookieDelete: Function;
+  handleDeleteAll: Function;
+  cookies: Array<Cookie>;
+  newCookieDomainName: string;
+  handleShowModifyCookieModal: Function;
+  handleRender: HandleRender;
+}
 
 // Use tough-cookie MAX_DATE value
 // https://github.com/salesforce/tough-cookie/blob/5ae97c6a28122f3fb309adcd8428274d9b2bd795/lib/cookie.js#L77
 const MAX_TIME = 2147483647000;
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class CookieList extends React.PureComponent<Props> {
+class CookieList extends PureComponent<Props> {
   _handleCookieAdd() {
     const newCookie: Cookie = {
       id: uuid.v4(),
@@ -37,7 +37,6 @@ class CookieList extends React.PureComponent<Props> {
       secure: false,
       httpOnly: false,
     };
-
     this.props.handleCookieAdd(newCookie);
   }
 
@@ -47,15 +46,28 @@ class CookieList extends React.PureComponent<Props> {
 
   render() {
     const { cookies, handleDeleteAll, handleShowModifyCookieModal, handleRender } = this.props;
-
     return (
       <div>
         <table className="table--fancy cookie-table table--striped">
           <thead>
             <tr>
-              <th style={{ minWidth: '10rem' }}>Domain</th>
-              <th style={{ width: '90%' }}>Cookie</th>
-              <th style={{ width: '2rem' }} className="text-right">
+              <th
+                style={{
+                  minWidth: '10rem',
+                }}>
+                Domain
+              </th>
+              <th
+                style={{
+                  width: '90%',
+                }}>
+                Cookie
+              </th>
+              <th
+                style={{
+                  width: '2rem',
+                }}
+                className="text-right">
                 <Dropdown right>
                   <DropdownButton
                     title="Add cookie"
@@ -83,10 +95,10 @@ class CookieList extends React.PureComponent<Props> {
                   <td className="force-wrap wide">
                     <RenderedText render={handleRender}>{cookieString || ''}</RenderedText>
                   </td>
-                  <td onClick={null} className="text-right no-wrap">
+                  <td onClick={() => {}} className="text-right no-wrap">
                     <button
                       className="btn btn--super-compact btn--outlined"
-                      onClick={e => handleShowModifyCookieModal(cookie)}
+                      onClick={() => handleShowModifyCookieModal(cookie)}
                       title="Edit cookie properties">
                       Edit
                     </button>{' '}
@@ -94,7 +106,7 @@ class CookieList extends React.PureComponent<Props> {
                       className="btn btn--super-compact btn--outlined"
                       addIcon
                       confirmMessage=""
-                      onClick={e => this._handleDeleteCookie(cookie)}
+                      onClick={() => this._handleDeleteCookie(cookie)}
                       title="Delete cookie">
                       <i className="fa fa-trash-o" />
                     </PromptButton>
@@ -108,7 +120,7 @@ class CookieList extends React.PureComponent<Props> {
           <div className="pad faint italic text-center">
             <p>I couldn't find any cookies for you.</p>
             <p>
-              <button className="btn btn--clicky" onClick={e => this._handleCookieAdd()}>
+              <button className="btn btn--clicky" onClick={() => this._handleCookieAdd()}>
                 Add Cookie <i className="fa fa-plus-circle" />
               </button>
             </p>
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/account-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/account-dropdown.tsx
similarity index 82%
rename from packages/insomnia-app/app/ui/components/dropdowns/account-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/account-dropdown.tsx
index c2501b456e..ea61f44b96 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/account-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/account-dropdown.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent } from 'react';
 import { CircleButton, SvgIcon, Tooltip } from 'insomnia-components';
 import * as session from '../../../account/session';
 import { showLoginModal } from '../modals/login-modal';
@@ -10,9 +9,9 @@ import DropdownItem from '../base/dropdown/dropdown-item';
 import DropdownButton from '../base/dropdown/dropdown-button';
 import styled from 'styled-components';
 
-type Props = {
-  className?: string,
-};
+interface Props {
+  className?: string;
+}
 
 const StyledIconContainer = styled.div`
   display: flex;
@@ -24,7 +23,7 @@ const StyledIconContainer = styled.div`
   }
 `;
 
-const AccountDropdown = ({ className }: Props) => (
+const AccountDropdown: FunctionComponent<Props> = ({ className }) => (
   <div className={className}>
     <Dropdown>
       <DropdownButton noWrap>
@@ -54,7 +53,13 @@ const AccountDropdown = ({ className }: Props) => (
         </DropdownItem>
       )}
       {!session.isLoggedIn() && (
-        <DropdownItem key="invite" buttonClass={Link} href="https://insomnia.rest/pricing" button>
+        <DropdownItem
+          key="invite"
+          buttonClass={Link}
+          // @ts-expect-error -- TSCONVERSION appears to be genuine
+          href="https://insomnia.rest/pricing"
+          button
+        >
           <StyledIconContainer>
             <i className="fa fa-users" />
           </StyledIconContainer>{' '}
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/auth-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/auth-dropdown.tsx
similarity index 88%
rename from packages/insomnia-app/app/ui/components/dropdowns/auth-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/auth-dropdown.tsx
index f85d3a69d1..36e9960d49 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/auth-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/auth-dropdown.tsx
@@ -1,6 +1,4 @@
-// @flow
-
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import {
   AUTOBIND_CFG,
@@ -23,17 +21,15 @@ import AlertModal from '../modals/alert-modal';
 import * as models from '../../../models';
 import type { Request, RequestAuthentication } from '../../../models/request';
 
-type Props = {
-  onChange: (r: Request, RequestAuthentication) => Promise<Request>,
-  request: Request,
-
-  // Optional
-  className: string,
-  children: React.Node,
-};
+interface Props {
+  onChange: (r: Request, arg1: RequestAuthentication) => Promise<Request>;
+  request: Request;
+  className?: string;
+  children?: ReactNode;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class AuthDropdown extends React.PureComponent<Props> {
+class AuthDropdown extends PureComponent<Props> {
   async _handleTypeChange(type: string) {
     const { request, onChange } = this.props;
     const { authentication } = request;
@@ -72,7 +68,6 @@ class AuthDropdown extends React.PureComponent<Props> {
   renderAuthType(type: string, nameOverride: string | null = null) {
     const { authentication } = this.props.request;
     const currentType = authentication.type || AUTH_NONE;
-
     return (
       <DropdownItem onClick={this._handleTypeChange} value={type}>
         {currentType === type ? <i className="fa fa-check" /> : <i className="fa fa-empty" />}{' '}
@@ -84,7 +79,11 @@ class AuthDropdown extends React.PureComponent<Props> {
   render() {
     const { children, className } = this.props;
     return (
-      <Dropdown beside debug="true">
+      <Dropdown
+        beside
+        // @ts-expect-error -- TSCONVERSION appears to be genuine
+        debug="true"
+      >
         <DropdownDivider>Auth Types</DropdownDivider>
         <DropdownButton className={className}>{children}</DropdownButton>
         {this.renderAuthType(AUTH_BASIC)}
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/content-type-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/content-type-dropdown.tsx
similarity index 90%
rename from packages/insomnia-app/app/ui/components/dropdowns/content-type-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/content-type-dropdown.tsx
index fd11573595..863aa5c228 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/content-type-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/content-type-dropdown.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import {
   AUTOBIND_CFG,
@@ -15,26 +14,22 @@ import {
   getContentTypeName,
 } from '../../../common/constants';
 import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown';
-
 import { showModal } from '../modals/index';
 import AlertModal from '../modals/alert-modal';
 import type { Request, RequestBody } from '../../../models/request';
 import { trackEvent } from '../../../common/analytics';
+import { DropdownProps } from '../base/dropdown/dropdown';
 
-type Props = {
-  onChange: Function,
-  contentType: ?string,
-  children: ?React.Node,
-
-  // Optional
-  className?: string,
-  request?: Request,
-};
-
+interface Props extends DropdownProps {
+  onChange: (mimeType: string | null) => void;
+  contentType?: string | null;
+  className?: string;
+  request?: Request;
+}
 const EMPTY_MIME_TYPE = null;
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class ContentTypeDropdown extends React.PureComponent<Props> {
+class ContentTypeDropdown extends PureComponent<Props> {
   async _checkMimeTypeChange(body: RequestBody, mimeType: string | null) {
     // Nothing to do
     if (body.mimeType === mimeType) {
@@ -49,11 +44,9 @@ class ContentTypeDropdown extends React.PureComponent<Props> {
     const isMultipart = body.mimeType === CONTENT_TYPE_FORM_DATA;
     const isFormUrlEncoded = body.mimeType === CONTENT_TYPE_FORM_URLENCODED;
     const isText = !isFile && !isMultipart;
-
     const willBeFile = mimeType === CONTENT_TYPE_FILE;
     const willBeMultipart = mimeType === CONTENT_TYPE_FORM_DATA;
     const willBeGraphQL = mimeType === CONTENT_TYPE_GRAPHQL;
-
     const willConvertToText = !willBeGraphQL && !willBeFile && !willBeMultipart;
     const willPreserveText = willConvertToText && isText;
     const willPreserveForm = isFormUrlEncoded && willBeMultipart;
@@ -75,16 +68,13 @@ class ContentTypeDropdown extends React.PureComponent<Props> {
     }
 
     this.props.onChange(mimeType);
-
     trackEvent('Request', 'Change MimeType', mimeType);
   }
 
-  _renderDropdownItem(mimeType: string | null, forcedName: string = '') {
+  _renderDropdownItem(mimeType: string | null, forcedName = '') {
     const contentType =
       typeof this.props.contentType === 'string' ? this.props.contentType : EMPTY_MIME_TYPE;
-
     const iconClass = mimeType === contentType ? 'fa-check' : 'fa-empty';
-
     return (
       <DropdownItem onClick={this._handleChangeMimeType} value={mimeType}>
         <i className={`fa ${iconClass}`} />
@@ -96,7 +86,7 @@ class ContentTypeDropdown extends React.PureComponent<Props> {
   render() {
     const { children, className, ...extraProps } = this.props;
     return (
-      <Dropdown beside {...(extraProps: Object)}>
+      <Dropdown beside {...extraProps}>
         <DropdownButton className={className}>{children}</DropdownButton>
         <DropdownDivider>
           <span>
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/document-card-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/document-card-dropdown.tsx
similarity index 79%
rename from packages/insomnia-app/app/ui/components/dropdowns/document-card-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/document-card-dropdown.tsx
index 1e37921e4a..490d4b2715 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/document-card-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/document-card-dropdown.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG, getAppName } from '../../../common/constants';
 import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown';
@@ -18,39 +17,39 @@ import getWorkspaceName from '../../../models/helpers/get-workspace-name';
 import * as workspaceOperations from '../../../models/helpers/workspace-operations';
 import { WorkspaceScopeKeys } from '../../../models/workspace';
 
-type Props = {
-  apiSpec: ?ApiSpec,
-  children: ?React.Node,
-  workspace: Workspace,
-  handleSetActiveWorkspace: (workspaceId: string) => void,
-  isLastWorkspace: boolean,
-  className?: string,
-};
+interface Props {
+  apiSpec?: ApiSpec | null;
+  children?: ReactNode | null;
+  workspace: Workspace;
+  handleSetActiveWorkspace: (workspaceId: string) => void;
+  isLastWorkspace: boolean;
+  className?: string;
+}
 
-type State = {
-  actionPlugins: Array<DocumentAction>,
-  loadingActions: { [string]: boolean },
-};
+interface State {
+  actionPlugins: Array<DocumentAction>;
+  loadingActions: Record<string, boolean>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class DocumentCardDropdown extends React.PureComponent<Props, State> {
-  state = {
+class DocumentCardDropdown extends PureComponent<Props, State> {
+  state: State = {
     actionPlugins: [],
     loadingActions: {},
   };
 
   _handleDuplicate() {
     const { apiSpec, workspace, handleSetActiveWorkspace } = this.props;
-
     showPrompt({
       title: `Duplicate ${getWorkspaceLabel(workspace)}`,
+      // @ts-expect-error -- TSCONVERSION
       defaultValue: getWorkspaceName(workspace, apiSpec),
       submitName: 'Create',
       selectText: true,
       label: 'New Name',
       onComplete: async newName => {
         const newWorkspace = workspaceOperations.duplicate(workspace, newName);
-
+        // @ts-expect-error -- TSCONVERSION
         handleSetActiveWorkspace(newWorkspace._id);
       },
     });
@@ -58,14 +57,15 @@ class DocumentCardDropdown extends React.PureComponent<Props, State> {
 
   _handleRename() {
     const { apiSpec, workspace } = this.props;
-
     showPrompt({
       title: `Rename ${getWorkspaceLabel(workspace)}`,
+      // @ts-expect-error -- TSCONVERSION
       defaultValue: getWorkspaceName(workspace, apiSpec),
       submitName: 'Rename',
       selectText: true,
       label: 'Name',
       onComplete: async name => {
+        // @ts-expect-error -- TSCONVERSION
         await workspaceOperations.rename(workspace, apiSpec, name);
       },
     });
@@ -73,16 +73,14 @@ class DocumentCardDropdown extends React.PureComponent<Props, State> {
 
   _handleDelete() {
     const { apiSpec, workspace, isLastWorkspace } = this.props;
-
     const label = getWorkspaceLabel(workspace);
-
     const messages = [
+      // @ts-expect-error -- TSCONVERSION
       `Do you really want to delete "${getWorkspaceName(workspace, apiSpec)}"?`,
       isLastWorkspace
         ? ` This is the only ${label.toLowerCase()} so a new one will be created for you.`
         : null,
     ];
-
     showModal(AskModal, {
       title: `Delete ${label}`,
       message: messages.join(' '),
@@ -95,11 +93,13 @@ class DocumentCardDropdown extends React.PureComponent<Props, State> {
 
         if (isLastWorkspace) {
           // Create a new workspace and default scope to designer
-          await models.workspace.create({ name: getAppName(), scope: WorkspaceScopeKeys.design });
+          await models.workspace.create({
+            name: getAppName(),
+            scope: WorkspaceScopeKeys.design,
+          });
         }
 
         await models.stats.incrementDeletedRequestsForDescendents(workspace);
-
         await models.workspace.remove(workspace);
       },
     });
@@ -109,27 +109,25 @@ class DocumentCardDropdown extends React.PureComponent<Props, State> {
     // Only load document plugins if the scope is designer, for now
     if (this.props.workspace.scope === WorkspaceScopeKeys.design) {
       const plugins = await getDocumentActions();
-      this.setState({ actionPlugins: plugins });
+      this.setState({
+        actionPlugins: plugins,
+      });
     }
   }
 
   async _handlePluginClick(p: DocumentAction) {
     this.setState(state => ({
-      loadingActions: {
-        ...state.loadingActions,
-        [p.label]: true,
-      },
+      loadingActions: { ...state.loadingActions, [p.label]: true },
     }));
 
     try {
       const { apiSpec } = this.props;
-
       const context = {
         ...pluginContexts.app.init(RENDER_PURPOSE_NO_RENDER),
         ...pluginContexts.data.init(),
         ...pluginContexts.store.init(p.plugin),
       };
-
+      // @ts-expect-error -- TSCONVERSION
       await p.action(context, parseApiSpec(apiSpec.contents));
     } catch (err) {
       showError({
@@ -138,15 +136,16 @@ class DocumentCardDropdown extends React.PureComponent<Props, State> {
       });
     }
 
-    this.setState(state => ({ loadingActions: { ...state.loadingActions, [p.label]: false } }));
-    this._dropdown && this._dropdown.hide();
+    this.setState(state => ({
+      loadingActions: { ...state.loadingActions, [p.label]: false },
+    }));
+    // @ts-expect-error -- TSCONVERSION appears to be genuine
+    this._dropdown?.hide();
   }
 
   render() {
     const { children, className } = this.props;
-
     const { actionPlugins, loadingActions } = this.state;
-
     return (
       <Dropdown beside onOpen={this._onOpen}>
         <DropdownButton className={className}>{children}</DropdownButton>
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/environments-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/environments-dropdown.tsx
similarity index 81%
rename from packages/insomnia-app/app/ui/components/dropdowns/environments-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/environments-dropdown.tsx
index c647ac5335..955f8d7a4e 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/environments-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/environments-dropdown.tsx
@@ -1,15 +1,14 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import EnvironmentsModal from '../modals/workspace-environments-edit-modal';
 import {
-  Dropdown,
   DropdownButton,
   DropdownDivider,
   DropdownHint,
   DropdownItem,
 } from '../base/dropdown';
+import Dropdown from '../base/dropdown/dropdown';
 import { showModal } from '../modals/index';
 import Tooltip from '../tooltip';
 import KeydownBinder from '../keydown-binder';
@@ -19,21 +18,19 @@ import type { HotKeyRegistry } from '../../../common/hotkeys';
 import { hotKeyRefs } from '../../../common/hotkeys';
 import { executeHotKey } from '../../../common/hotkeys-listener';
 
-type Props = {
-  handleChangeEnvironment: Function,
-  workspace: Workspace,
-  environments: Array<Environment>,
-  environmentHighlightColorStyle: string,
-  hotKeyRegistry: HotKeyRegistry,
-
-  // Optional
-  className?: string,
-  activeEnvironment: Environment | null,
-};
+interface Props {
+  handleChangeEnvironment: Function;
+  workspace: Workspace;
+  environments: Array<Environment>;
+  environmentHighlightColorStyle: string;
+  hotKeyRegistry: HotKeyRegistry;
+  className?: string;
+  activeEnvironment?: Environment | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class EnvironmentsDropdown extends React.PureComponent<Props> {
-  _dropdown: ?Dropdown;
+class EnvironmentsDropdown extends PureComponent<Props> {
+  _dropdown: Dropdown | null = null;
 
   _handleActivateEnvironment(environmentId: string) {
     this.props.handleChangeEnvironment(environmentId);
@@ -43,7 +40,7 @@ class EnvironmentsDropdown extends React.PureComponent<Props> {
     showModal(EnvironmentsModal, this.props.workspace);
   }
 
-  _setDropdownRef(n: ?Dropdown) {
+  _setDropdownRef(n: Dropdown) {
     this._dropdown = n;
   }
 
@@ -53,7 +50,13 @@ class EnvironmentsDropdown extends React.PureComponent<Props> {
         key={environment._id}
         value={environment._id}
         onClick={this._handleActivateEnvironment}>
-        <i className="fa fa-random" style={{ color: environment.color }} />
+        <i
+          className="fa fa-random"
+          style={{
+            // @ts-expect-error -- TSCONVERSION don't set color if undefined
+            color: environment.color,
+          }}
+        />
         Use <strong>{environment.name}</strong>
       </DropdownItem>
     );
@@ -75,14 +78,13 @@ class EnvironmentsDropdown extends React.PureComponent<Props> {
       hotKeyRegistry,
       ...other
     } = this.props;
-
     // NOTE: Base environment might not exist if the users hasn't managed environments yet.
     const baseEnvironment = environments.find(e => e.parentId === workspace._id);
     const subEnvironments = environments
       .filter(e => e.parentId === (baseEnvironment && baseEnvironment._id))
       .sort((e1, e2) => e1.metaSortKey - e2.metaSortKey);
-
     let description;
+
     if (!activeEnvironment || activeEnvironment === baseEnvironment) {
       description = 'No Environment';
     } else {
@@ -91,7 +93,10 @@ class EnvironmentsDropdown extends React.PureComponent<Props> {
 
     return (
       <KeydownBinder onKeydown={this._handleKeydown}>
-        <Dropdown ref={this._setDropdownRef} {...(other: Object)} className={className}>
+        <Dropdown
+          ref={this._setDropdownRef}
+          {...(other as Record<string, any>)}
+          className={className}>
           <DropdownButton className="btn btn--super-compact no-wrap">
             <div className="sidebar__menu__thing">
               {!activeEnvironment && subEnvironments.length > 0 && (
@@ -108,7 +113,9 @@ class EnvironmentsDropdown extends React.PureComponent<Props> {
                 environmentHighlightColorStyle === 'sidebar-indicator' ? (
                   <i
                     className="fa fa-circle space-right"
-                    style={{ color: activeEnvironment.color }}
+                    style={{
+                      color: activeEnvironment.color,
+                    }}
                   />
                 ) : null}
                 {description}
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/git-sync-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/git-sync-dropdown.tsx
similarity index 78%
rename from packages/insomnia-app/app/ui/components/dropdowns/git-sync-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/git-sync-dropdown.tsx
index 871b7fdae5..c33615c26a 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/git-sync-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/git-sync-dropdown.tsx
@@ -1,14 +1,14 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import classnames from 'classnames';
-import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown';
+import { DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown';
+import Dropdown from '../base/dropdown/dropdown';
 import type { Workspace } from '../../../models/workspace';
 import type { GitVCS, GitLogEntry } from '../../../sync/git/git-vcs';
 import { showAlert, showError, showModal } from '../modals';
 import GitStagingModal from '../modals/git-staging-modal';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import * as models from '../../../models';
 import type { GitRepository } from '../../../models/git-repository';
 import GitLogModal from '../modals/git-log-modal';
@@ -27,52 +27,46 @@ import type {
   UpdateGitRepositoryCallback,
 } from '../../redux/modules/git';
 
-type Props = {|
-  handleInitializeEntities: () => Promise<void>,
-  handleGitBranchChanged: (branch: string) => void,
-  workspace: Workspace,
-  vcs: GitVCS,
-  gitRepository: GitRepository | null,
-  setupGitRepository: SetupGitRepositoryCallback,
-  updateGitRepository: UpdateGitRepositoryCallback,
+interface Props {
+  handleInitializeEntities: () => Promise<void>;
+  handleGitBranchChanged: (branch: string) => void;
+  workspace: Workspace;
+  vcs: GitVCS;
+  gitRepository: GitRepository | null;
+  setupGitRepository: SetupGitRepositoryCallback;
+  updateGitRepository: UpdateGitRepositoryCallback;
+  className?: string;
+  renderDropdownButton?: (children: ReactNode) => ReactNode;
+}
 
-  // Optional
-  className?: string,
-  renderDropdownButton?: (children: React.Node) => React.Node,
-|};
-
-type State = {|
-  initializing: boolean,
-  loadingPush: boolean,
-  loadingPull: boolean,
-  log: Array<GitLogEntry>,
-  branch: string,
-  branches: Array<string>,
-|};
+interface State {
+  initializing: boolean;
+  loadingPush: boolean;
+  loadingPull: boolean;
+  log: Array<GitLogEntry>;
+  branch: string;
+  branches: Array<string>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class GitSyncDropdown extends React.PureComponent<Props, State> {
-  _dropdown: ?Dropdown;
+class GitSyncDropdown extends PureComponent<Props, State> {
+  _dropdown: Dropdown | null = null;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      initializing: false,
-      loadingPush: false,
-      loadingPull: false,
-      log: [],
-      branch: '',
-      branches: [],
-    };
+  state: State = {
+    initializing: false,
+    loadingPush: false,
+    loadingPull: false,
+    log: [],
+    branch: '',
+    branches: [],
   }
 
-  _setDropdownRef(n: ?Dropdown) {
+  _setDropdownRef(n: Dropdown) {
     this._dropdown = n;
   }
 
-  async _refreshState(otherState?: Object) {
+  async _refreshState(otherState?: Record<string, any>) {
     const { vcs, workspace, handleGitBranchChanged } = this.props;
-
     const workspaceMeta = await models.workspaceMeta.getOrCreateByParentId(workspace._id);
 
     // Clear cached items and return if no state
@@ -91,6 +85,7 @@ class GitSyncDropdown extends React.PureComponent<Props, State> {
           cachedGitLastCommitTime: null,
         });
       }
+
       return;
     }
 
@@ -98,11 +93,9 @@ class GitSyncDropdown extends React.PureComponent<Props, State> {
     const branches = await vcs.listBranches();
     const log = (await vcs.log()) || [];
     this.setState({ ...(otherState || {}), log, branch, branches });
-
     const author = log[0] ? log[0].commit.author : null;
     const cachedGitRepositoryBranch = branch;
     const cachedGitLastAuthor = author ? author.name : null;
-
     // NOTE: We're converting timestamp to ms here
     const cachedGitLastCommitTime = author ? author.timestamp * 1000 : null;
     await models.workspaceMeta.updateByParentId(workspace._id, {
@@ -119,7 +112,9 @@ class GitSyncDropdown extends React.PureComponent<Props, State> {
   }
 
   async _handlePull() {
-    this.setState({ loadingPull: true });
+    this.setState({
+      loadingPull: true,
+    });
     const { vcs, gitRepository } = this.props;
 
     if (!gitRepository) {
@@ -128,18 +123,26 @@ class GitSyncDropdown extends React.PureComponent<Props, State> {
     }
 
     const bufferId = await db.bufferChanges();
+
     try {
       await vcs.pull(gitRepository.credentials);
     } catch (err) {
-      showError({ title: 'Error Pulling Repository', error: err });
+      showError({
+        title: 'Error Pulling Repository',
+        error: err,
+      });
     }
-    await db.flushChanges(bufferId);
 
-    this.setState({ loadingPull: false });
+    await db.flushChanges(bufferId);
+    this.setState({
+      loadingPull: false,
+    });
   }
 
-  async _handlePush(e: any, force: boolean = false) {
-    this.setState({ loadingPush: true });
+  async _handlePush(_e, force = false) {
+    this.setState({
+      loadingPush: true,
+    });
     const { vcs, gitRepository } = this.props;
 
     if (!gitRepository) {
@@ -149,11 +152,17 @@ class GitSyncDropdown extends React.PureComponent<Props, State> {
 
     // Check if there is anything to push
     let canPush = false;
+
     try {
       canPush = await vcs.canPush(gitRepository.credentials);
     } catch (err) {
-      showError({ title: 'Error Pushing Repository', error: err });
-      this.setState({ loadingPush: false });
+      showError({
+        title: 'Error Pushing Repository',
+        error: err,
+      });
+      this.setState({
+        loadingPush: false,
+      });
       return;
     }
 
@@ -163,11 +172,14 @@ class GitSyncDropdown extends React.PureComponent<Props, State> {
         title: 'Push Skipped',
         message: 'Everything up-to-date. Nothing was pushed to the remote',
       });
-      this.setState({ loadingPush: false });
+      this.setState({
+        loadingPush: false,
+      });
       return;
     }
 
     const bufferId = await db.bufferChanges();
+
     try {
       await vcs.push(gitRepository.credentials, force);
     } catch (err) {
@@ -183,21 +195,31 @@ class GitSyncDropdown extends React.PureComponent<Props, State> {
           },
         });
       } else {
-        showError({ title: 'Error Pushing Repository', error: err });
+        showError({
+          title: 'Error Pushing Repository',
+          error: err,
+        });
       }
     }
 
     await db.flushChanges(bufferId);
-
-    this.setState({ loadingPush: false });
+    this.setState({
+      loadingPush: false,
+    });
   }
 
   _handleConfig() {
     const { gitRepository, workspace, updateGitRepository, setupGitRepository } = this.props;
+
     if (gitRepository) {
-      updateGitRepository({ gitRepository });
+      updateGitRepository({
+        gitRepository,
+      });
     } else {
-      setupGitRepository({ workspace, createFsClient: MemClient.createClient });
+      setupGitRepository({
+        workspace,
+        createFsClient: MemClient.createClient,
+      });
     }
   }
 
@@ -206,24 +228,31 @@ class GitSyncDropdown extends React.PureComponent<Props, State> {
   }
 
   async _handleCommit() {
-    showModal(GitStagingModal, { onCommit: this._refreshState });
+    showModal(GitStagingModal, {
+      onCommit: this._refreshState,
+    });
   }
 
   _handleManageBranches() {
-    showModal(GitBranchesModal, { onHide: this._refreshState });
+    showModal(GitBranchesModal, {
+      onHide: this._refreshState,
+    });
   }
 
   async _handleCheckoutBranch(branch: string) {
     const { vcs, handleInitializeEntities } = this.props;
-
     const bufferId = await db.bufferChanges();
+
     try {
       await vcs.checkout(branch);
     } catch (err) {
-      showError({ title: 'Checkout Error', error: err });
+      showError({
+        title: 'Checkout Error',
+        error: err,
+      });
     }
-    await db.flushChanges(bufferId, true);
 
+    await db.flushChanges(bufferId, true);
     await handleInitializeEntities();
     await this._refreshState();
   }
@@ -246,34 +275,35 @@ class GitSyncDropdown extends React.PureComponent<Props, State> {
 
     if (!vcs.isInitialized()) {
       return renderBtn(
-        <React.Fragment>
+        <Fragment>
           <i className="fa fa-code-fork space-right" />
           Setup Git Sync
-        </React.Fragment>,
+        </Fragment>,
       );
     }
 
     const initializing = false;
     return renderBtn(
-      <React.Fragment>
+      <Fragment>
         <div className="ellipsis">{initializing ? 'Initializing...' : branch}</div>
         <i className="fa fa-code-fork space-left" />
-      </React.Fragment>,
+      </Fragment>,
     );
   }
 
   renderBranch(branch: string) {
     const { branch: currentBranch } = this.state;
-
     const icon =
       branch === currentBranch ? <i className="fa fa-tag" /> : <i className="fa fa-empty" />;
-
     const isCurrentBranch = branch === currentBranch;
     return (
+      // @ts-expect-error -- TSCONVERSION
       <DropdownItem
         key={branch}
         onClick={isCurrentBranch ? null : () => this._handleCheckoutBranch(branch)}
-        className={classnames({ bold: isCurrentBranch })}
+        className={classnames({
+          bold: isCurrentBranch,
+        })}
         title={isCurrentBranch ? null : `Switch to "${branch}"`}>
         {icon}
         {branch}
@@ -284,7 +314,6 @@ class GitSyncDropdown extends React.PureComponent<Props, State> {
   render() {
     const { className, vcs } = this.props;
     const { log, branches, branch, loadingPull, loadingPush } = this.state;
-
     return (
       <div className={className}>
         <Dropdown className="wide tall" onOpen={this._handleOpen} ref={this._setDropdownRef}>
@@ -308,15 +337,15 @@ class GitSyncDropdown extends React.PureComponent<Props, State> {
           </DropdownItem>
 
           {vcs.isInitialized() && (
-            <React.Fragment>
+            <Fragment>
               <DropdownItem onClick={this._handleManageBranches}>
                 <i className="fa fa-code-fork" /> Branches
               </DropdownItem>
-            </React.Fragment>
+            </Fragment>
           )}
 
           {vcs.isInitialized() && (
-            <React.Fragment>
+            <Fragment>
               <DropdownDivider>Branches</DropdownDivider>
               {branches.map(this.renderBranch)}
 
@@ -350,7 +379,7 @@ class GitSyncDropdown extends React.PureComponent<Props, State> {
               <DropdownItem onClick={this._handleLog} disabled={log.length === 0}>
                 <i className="fa fa-clock-o" /> History ({log.length})
               </DropdownItem>
-            </React.Fragment>
+            </Fragment>
           )}
         </Dropdown>
       </div>
@@ -365,4 +394,5 @@ function mapDispatchToProps(dispatch) {
     updateGitRepository: boundGitActions.updateGitRepository,
   };
 }
+
 export default connect(null, mapDispatchToProps)(GitSyncDropdown);
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/__tests__/grpc-method-dropdown-button.test.js b/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/__tests__/grpc-method-dropdown-button.test.tsx
similarity index 99%
rename from packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/__tests__/grpc-method-dropdown-button.test.js
rename to packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/__tests__/grpc-method-dropdown-button.test.tsx
index b6acbcc9bc..42a7ea2f91 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/__tests__/grpc-method-dropdown-button.test.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/__tests__/grpc-method-dropdown-button.test.tsx
@@ -5,25 +5,20 @@ import GrpcMethodDropdownButton from '../grpc-method-dropdown-button';
 describe('<GrpcMethodDropdownButton />', () => {
   it('should show "Select Method" when nothing is selected', () => {
     const { getByRole, queryByRole } = render(<GrpcMethodDropdownButton />);
-
     expect(getByRole('button')).toHaveTextContent('Select Method');
     expect(queryByRole('tooltip')).toBeNull();
   });
 
   it('should show path if selection exists', () => {
     const { getByRole } = render(<GrpcMethodDropdownButton fullPath={'/pkg.svc/mthd'} />);
-
     expect(getByRole('button')).toHaveTextContent('/svc/mthd');
     expect(getByRole('tooltip', { hidden: true })).toHaveTextContent('/pkg.svc/mthd');
   });
 
   it('should show path if selection exists and clear if method selection is removed', () => {
     const { getByRole, rerender } = render(<GrpcMethodDropdownButton fullPath={'/pkg.svc/mthd'} />);
-
     expect(getByRole('button')).toHaveTextContent('/svc/mthd');
-
     rerender(<GrpcMethodDropdownButton />);
-
     expect(getByRole('button')).toHaveTextContent('Select Method');
   });
 });
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/__tests__/grpc-method-dropdown.test.js b/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/__tests__/grpc-method-dropdown.test.tsx
similarity index 99%
rename from packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/__tests__/grpc-method-dropdown.test.js
rename to packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/__tests__/grpc-method-dropdown.test.tsx
index 0d20324fe8..ca63290007 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/__tests__/grpc-method-dropdown.test.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/__tests__/grpc-method-dropdown.test.tsx
@@ -13,7 +13,6 @@ describe('<GrpcMethodDropdown />', () => {
 
   it('should show "No methods found" and clicking it should do nothing', () => {
     const handleChange = jest.fn();
-
     const { getByRole, queryByText } = render(
       <GrpcMethodDropdown
         methods={[]}
@@ -24,17 +23,14 @@ describe('<GrpcMethodDropdown />', () => {
 
     // Open dropdown
     fireEvent.click(getByRole('button'));
-
     const nothingFound = queryByText('No methods found');
     expect(nothingFound).toBeTruthy();
     fireEvent.click(nothingFound);
-
     expect(handleChange).not.toHaveBeenCalled();
   });
 
   it('should allow you to change a proto file when no methods exist', () => {
     const handleChangeProtoFile = jest.fn();
-
     const { getByRole, queryByText } = render(
       <GrpcMethodDropdown
         methods={[]}
@@ -45,17 +41,14 @@ describe('<GrpcMethodDropdown />', () => {
 
     // Open dropdown
     fireEvent.click(getByRole('button'));
-
     const clickToChange = queryByText('Click to change proto file');
     expect(clickToChange).toBeTruthy();
     fireEvent.click(clickToChange);
-
     expect(handleChangeProtoFile).toHaveBeenCalledTimes(1);
   });
 
   it('should allow you to change a proto file when methods exist', () => {
     const handleChangeProtoFile = jest.fn();
-
     const { getByRole, getByText } = render(
       <GrpcMethodDropdown
         methods={[builder.build()]}
@@ -66,16 +59,13 @@ describe('<GrpcMethodDropdown />', () => {
 
     // Open dropdown
     fireEvent.click(getByRole('button'));
-
     fireEvent.click(getByText('Click to change proto file'));
-
     expect(handleChangeProtoFile).toHaveBeenCalledTimes(1);
   });
 
   it('should send selected method path to handle change', () => {
     const handleChange = jest.fn();
     const method = builder.path('/service/method').build();
-
     const { getByRole, queryAllByText } = render(
       <GrpcMethodDropdown
         methods={[method]}
@@ -86,23 +76,18 @@ describe('<GrpcMethodDropdown />', () => {
 
     // Open dropdown
     fireEvent.click(getByRole('button'));
-
     // Should find two items - a dropdown item and a tooltip with the same text
     const [dropdownButton, tooltip] = queryAllByText(method.path);
-
     expect(tooltip).toBeTruthy();
     expect(tooltip).toHaveAttribute('role', 'tooltip');
     expect(tooltip).toHaveAttribute('aria-hidden', 'true');
-
     fireEvent.click(dropdownButton);
-
     expect(handleChange).toHaveBeenCalledWith(method.path, expect.anything());
   });
 
   it('should create a divider with the package name', () => {
     const handleChange = jest.fn();
     const method = builder.path('/package.service/method').build();
-
     const { getByRole, queryByText, getByText } = render(
       <GrpcMethodDropdown
         methods={[method]}
@@ -113,10 +98,8 @@ describe('<GrpcMethodDropdown />', () => {
 
     // Open dropdown
     fireEvent.click(getByRole('button'));
-
     expect(queryByText('pkg: package')).toBeTruthy();
     fireEvent.click(getByText('/service/method'));
-
     expect(handleChange).toHaveBeenCalledWith(method.path, expect.anything());
   });
 });
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/grpc-method-dropdown-button.js b/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/grpc-method-dropdown-button.tsx
similarity index 78%
rename from packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/grpc-method-dropdown-button.js
rename to packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/grpc-method-dropdown-button.tsx
index 621986a678..d6be2dfbe7 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/grpc-method-dropdown-button.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/grpc-method-dropdown-button.tsx
@@ -1,5 +1,4 @@
-// @flow
-import React from 'react';
+import React, { FunctionComponent, useMemo } from 'react';
 import styled from 'styled-components';
 import { getGrpcPathSegments, getShortGrpcPath } from '../../../../common/grpc-paths';
 import { Button, Tooltip } from 'insomnia-components';
@@ -12,10 +11,12 @@ const FlexSpaceBetween = styled.span`
   align-items: center;
 `;
 
-type Props = { fullPath?: string };
+interface Props {
+  fullPath?: string;
+}
 
-const useLabel = (fullPath: string): string =>
-  React.useMemo(() => {
+const useLabel = (fullPath?: string) =>
+  useMemo(() => {
     if (fullPath) {
       const segments = getGrpcPathSegments(fullPath);
       return getShortGrpcPath(segments, fullPath);
@@ -24,7 +25,7 @@ const useLabel = (fullPath: string): string =>
     return 'Select Method';
   }, [fullPath]);
 
-const GrpcMethodDropdownButton = ({ fullPath }: Props) => (
+const GrpcMethodDropdownButton: FunctionComponent<Props> = ({ fullPath }) => (
   <Button className="tall wide" variant="text" size="medium" radius="0">
     <Tooltip className="tall wide" message={fullPath} position="bottom" delay={500}>
       <FlexSpaceBetween>
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/grpc-method-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/grpc-method-dropdown.tsx
similarity index 74%
rename from packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/grpc-method-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/grpc-method-dropdown.tsx
index 5efc58b7e2..dda70d79a1 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/grpc-method-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/grpc-method-dropdown.tsx
@@ -1,5 +1,4 @@
-// @flow
-import React from 'react';
+import React, { Fragment, FunctionComponent, useMemo } from 'react';
 import { Dropdown, DropdownItem, DropdownDivider, Tooltip } from 'insomnia-components';
 import type { GrpcMethodDefinition } from '../../../../network/grpc/method';
 import styled from 'styled-components';
@@ -12,32 +11,31 @@ import {
 import type { GrpcMethodInfo } from '../../../../common/grpc-paths';
 import GrpcMethodDropdownButton from './grpc-method-dropdown-button';
 
-type Props = {
-  disabled?: boolean,
-  methods: Array<GrpcMethodDefinition>,
-  selectedMethod?: GrpcMethodDefinition,
-  handleChange: string => Promise<void>,
-  handleChangeProtoFile: string => Promise<void>,
-};
+interface Props {
+  disabled?: boolean;
+  methods: Array<GrpcMethodDefinition>;
+  selectedMethod?: GrpcMethodDefinition;
+  handleChange: (arg0: string) => Promise<void>;
+  handleChangeProtoFile: (arg0: string) => Promise<void>;
+}
 
 const NormalCase = styled.span`
   text-transform: initial;
 `;
 
-const GrpcMethodDropdown = ({
+const GrpcMethodDropdown: FunctionComponent<Props> = ({
   disabled,
   methods,
   selectedMethod,
   handleChange,
   handleChangeProtoFile,
-}: Props) => {
-  const dropdownButton = React.useMemo(
+}) => {
+  const dropdownButton = useMemo(
     () => () => <GrpcMethodDropdownButton fullPath={selectedMethod?.path} />,
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- TSCONVERSION this error appears to be correct, actually
     [selectedMethod?.path],
   );
-
-  const groupedByPkg = React.useMemo(() => groupGrpcMethodsByPackage(methods), [methods]);
-
+  const groupedByPkg = useMemo(() => groupGrpcMethodsByPackage(methods), [methods]);
   return (
     <Dropdown className="tall wide" renderButton={dropdownButton}>
       <DropdownItem onClick={handleChangeProtoFile}>
@@ -50,7 +48,7 @@ const GrpcMethodDropdown = ({
         </>
       )}
       {Object.keys(groupedByPkg).map(pkgName => (
-        <React.Fragment key={pkgName}>
+        <Fragment key={pkgName}>
           <DropdownDivider
             children={pkgName !== NO_PACKAGE_KEY && <NormalCase>pkg: {pkgName}</NormalCase>}
           />
@@ -67,7 +65,7 @@ const GrpcMethodDropdown = ({
               </Tooltip>
             </DropdownItem>
           ))}
-        </React.Fragment>
+        </Fragment>
       ))}
     </Dropdown>
   );
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/index.js b/packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/index.ts
similarity index 100%
rename from packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/index.js
rename to packages/insomnia-app/app/ui/components/dropdowns/grpc-method-dropdown/index.ts
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/method-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/method-dropdown.tsx
similarity index 83%
rename from packages/insomnia-app/app/ui/components/dropdowns/method-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/method-dropdown.tsx
index 4ec519b4bd..6f58d40561 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/method-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/method-dropdown.tsx
@@ -1,24 +1,35 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
-import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown';
+import { DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown';
+import Dropdown from '../base/dropdown/dropdown';
 import * as constants from '../../../common/constants';
 import { showPrompt } from '../modals/index';
 import { METHOD_GRPC, AUTOBIND_CFG } from '../../../common/constants';
-
 const LOCALSTORAGE_KEY = 'insomnia.httpMethods';
 const GRPC_LABEL = 'gRPC';
 
+interface Props {
+  onChange: Function,
+  method: string,
+  right?: boolean,
+  showGrpc?: boolean,
+  className?: string,
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class MethodDropdown extends PureComponent {
-  _setDropdownRef(n) {
+class MethodDropdown extends PureComponent<Props> {
+  _dropdown: Dropdown | null = null;
+
+  _setDropdownRef(n: Dropdown) {
     this._dropdown = n;
   }
 
   _handleSetCustomMethod() {
     let recentMethods;
+
     try {
       const v = window.localStorage.getItem(LOCALSTORAGE_KEY);
+      // @ts-expect-error -- TSCONVERSION don't try parse if no item found
       recentMethods = JSON.parse(v) || [];
     } catch (err) {
       recentMethods = [];
@@ -54,7 +65,6 @@ class MethodDropdown extends PureComponent {
         recentMethods = recentMethods.filter(m => m !== method);
         recentMethods.unshift(method);
         window.localStorage.setItem(LOCALSTORAGE_KEY, JSON.stringify(recentMethods));
-
         // Invoke callback
         this.props.onChange(method);
       },
@@ -66,22 +76,22 @@ class MethodDropdown extends PureComponent {
   }
 
   toggle() {
-    this._dropdown && this._dropdown.toggle(true);
+    this._dropdown?.toggle(true);
   }
 
   render() {
     const {
       method,
       right,
-      onChange, // eslint-disable-line no-unused-vars
+      onChange,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
       showGrpc,
       ...extraProps
     } = this.props;
     const buttonLabel = method === METHOD_GRPC ? GRPC_LABEL : method;
-
     return (
       <Dropdown ref={this._setDropdownRef} className="method-dropdown" right={right}>
-        <DropdownButton type="button" {...extraProps}>
+        <DropdownButton {...extraProps}>
           <span className={`http-method-${method}`}>{buttonLabel}</span>{' '}
           <i className="fa fa-caret-down space-left" />
         </DropdownButton>
@@ -114,14 +124,4 @@ class MethodDropdown extends PureComponent {
   }
 }
 
-MethodDropdown.propTypes = {
-  // Required
-  onChange: PropTypes.func.isRequired,
-  method: PropTypes.string.isRequired,
-
-  // Optional
-  right: PropTypes.bool,
-  showGrpc: PropTypes.bool,
-};
-
 export default MethodDropdown;
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/preview-mode-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/preview-mode-dropdown.tsx
similarity index 86%
rename from packages/insomnia-app/app/ui/components/dropdowns/preview-mode-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/preview-mode-dropdown.tsx
index 22233698d5..77a3a5f8ff 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/preview-mode-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/preview-mode-dropdown.tsx
@@ -1,19 +1,18 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG, getPreviewModeName, PREVIEW_MODES } from '../../../common/constants';
 import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown';
 
-type Props = {|
-  download: (pretty: boolean) => any,
-  fullDownload: (pretty: boolean) => any,
-  updatePreviewMode: string => any,
-  previewMode: string,
-  showPrettifyOption?: boolean,
-|};
+interface Props {
+  download: (pretty: boolean) => any;
+  fullDownload: (pretty: boolean) => any;
+  updatePreviewMode: Function;
+  previewMode: string;
+  showPrettifyOption?: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class PreviewModeDropdown extends React.PureComponent<Props> {
+class PreviewModeDropdown extends PureComponent<Props> {
   async _handleClick(previewMode: string) {
     const { updatePreviewMode } = this.props;
     await updatePreviewMode(previewMode);
@@ -41,7 +40,6 @@ class PreviewModeDropdown extends React.PureComponent<Props> {
 
   render() {
     const { fullDownload, previewMode, showPrettifyOption } = this.props;
-
     return (
       <Dropdown beside>
         <DropdownButton className="tall">
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/remote-workspaces-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/remote-workspaces-dropdown.tsx
similarity index 83%
rename from packages/insomnia-app/app/ui/components/dropdowns/remote-workspaces-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/remote-workspaces-dropdown.tsx
index eb60fa30d7..6df9c0443f 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/remote-workspaces-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/remote-workspaces-dropdown.tsx
@@ -1,6 +1,4 @@
-// @flow
-
-import * as React from 'react';
+import React, { Component } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import * as session from '../../../account/session';
@@ -10,38 +8,35 @@ import { Dropdown, DropdownDivider, DropdownItem, Button, Tooltip } from 'insomn
 import type { Workspace } from '../../../models/workspace';
 import HelpTooltip from '../help-tooltip';
 import * as models from '../../../models';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import { showAlert } from '../modals';
 import { stringsPlural } from '../../../common/strings';
 
-type Props = {
-  className?: string,
-  vcs?: VCS,
-  workspaces: Array<Workspace>,
-};
+interface Props {
+  className?: string;
+  vcs?: VCS | null;
+  workspaces: Array<Workspace>;
+}
 
-type State = {
-  loading: boolean,
-  localProjects: Array<Project>,
-  pullingProjects: { [string]: boolean },
-  remoteProjects: Array<Project>,
-};
+interface State {
+  loading: boolean;
+  localProjects: Array<Project>;
+  pullingProjects: Record<string, boolean>;
+  remoteProjects: Array<Project>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class RemoteWorkspacesDropdown extends React.Component<Props, State> {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      loading: false,
-      localProjects: [],
-      pullingProjects: {},
-      remoteProjects: [],
-    };
+class RemoteWorkspacesDropdown extends Component<Props, State> {
+  state: State = {
+    loading: false,
+    localProjects: [],
+    pullingProjects: {},
+    remoteProjects: [],
   }
 
   async _refreshRemoteWorkspaces() {
     const { vcs } = this.props;
+
     if (!vcs) {
       return;
     }
@@ -50,15 +45,21 @@ class RemoteWorkspacesDropdown extends React.Component<Props, State> {
       return;
     }
 
-    this.setState({ loading: true });
-
+    this.setState({
+      loading: true,
+    });
     const remoteProjects = await vcs.remoteProjects();
     const localProjects = await vcs.localProjects();
-    this.setState({ remoteProjects, localProjects, loading: false });
+    this.setState({
+      remoteProjects,
+      localProjects,
+      loading: false,
+    });
   }
 
   async _handlePullRemoteWorkspace(project: Project) {
     const { vcs } = this.props;
+
     if (!vcs) {
       throw new Error('VCS is not defined');
     }
@@ -70,16 +71,12 @@ class RemoteWorkspacesDropdown extends React.Component<Props, State> {
     try {
       // Clone old VCS so we don't mess anything up while working on other projects
       const newVCS = vcs.newInstance();
-
       // Remove all projects for workspace first
       await newVCS.removeProjectsForRoot(project.rootDocumentId);
-
       // Set project, checkout master, and pull
       const defaultBranch = 'master';
-
       await newVCS.setProject(project);
       await newVCS.checkout([], defaultBranch);
-
       const remoteBranches = await newVCS.getRemoteBranches();
       const defaultBranchMissing = !remoteBranches.includes(defaultBranch);
 
@@ -89,21 +86,24 @@ class RemoteWorkspacesDropdown extends React.Component<Props, State> {
           _id: project.rootDocumentId,
           name: project.name,
         });
-
         await db.upsert(workspace);
       } else {
         await newVCS.pull([]); // There won't be any existing docs since it's a new pull
 
         const flushId = await db.bufferChanges();
-        for (const doc of await newVCS.allDocuments()) {
+
+        // @ts-expect-error -- TSCONVERSION
+        for (const doc of (await newVCS.allDocuments() || [])) {
           await db.upsert(doc);
         }
+
         await db.flushChanges(flushId);
       }
 
       await this._refreshRemoteWorkspaces();
     } catch (err) {
-      this._dropdown && this._dropdown.hide();
+      // @ts-expect-error -- TSCONVERSION this appears to be a genuine error because there's no _dropdown assigned elsewhere in this class and it doesn't extend another class that has _dropdown and even if it did it's supposed to be private presumably so....
+      this._dropdown.hide();
       showAlert({
         title: 'Pull Error',
         message: `Failed to pull workspace. ${err.message}`,
@@ -137,7 +137,6 @@ class RemoteWorkspacesDropdown extends React.Component<Props, State> {
 
   render() {
     const { workspaces } = this.props;
-
     const { loading, remoteProjects, localProjects, pullingProjects } = this.state;
 
     if (!session.isLoggedIn()) {
@@ -151,15 +150,12 @@ class RemoteWorkspacesDropdown extends React.Component<Props, State> {
     const missingRemoteProjects = remoteProjects.filter(({ id, rootDocumentId }) => {
       const localProjectExists = localProjects.find(p => p.id === id);
       const workspaceExists = workspaces.find(w => w._id === rootDocumentId);
-
       // Mark as missing if:
       //   - the project doesn't yet exists locally
       //   - the project exists locally but somehow the workspace doesn't anymore
       return !(workspaceExists && localProjectExists);
     });
-
     const button = this.renderButton();
-
     return (
       <Dropdown onOpen={this._refreshRemoteWorkspaces} renderButton={button}>
         <DropdownDivider>
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/request-actions-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/request-actions-dropdown.tsx
similarity index 68%
rename from packages/insomnia-app/app/ui/components/dropdowns/request-actions-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/request-actions-dropdown.tsx
index 319c5b5572..5f537c6eb5 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/request-actions-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/request-actions-dropdown.tsx
@@ -1,24 +1,21 @@
-// @flow
-import React from 'react';
-import PropTypes from 'prop-types';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import PromptButton from '../base/prompt-button';
 import {
-  Dropdown,
   DropdownButton,
   DropdownDivider,
   DropdownHint,
   DropdownItem,
 } from '../base/dropdown/index';
+import Dropdown, { DropdownProps } from '../base/dropdown/dropdown';
 import { hotKeyRefs } from '../../../common/hotkeys';
 import * as misc from '../../../common/misc';
 import { isRequest } from '../../../models/helpers/is-model';
 import * as requestOperations from '../../../models/helpers/request-operations';
 import { incrementDeletedRequests } from '../../../models/stats';
-
 // Plugin action related imports
-import type { RequestAction, RequestGroupAction } from '../../../plugins';
+import type { RequestAction } from '../../../plugins';
 import type { HotKeyRegistry } from '../../../common/hotkeys';
 import type { Request } from '../../../models/request';
 import type { RequestGroup } from '../../../models/request-group';
@@ -28,36 +25,37 @@ import * as pluginContexts from '../../../plugins/context/index';
 import { showError } from '../modals';
 import { RENDER_PURPOSE_NO_RENDER } from '../../../common/render';
 import classnames from 'classnames';
+import { GrpcRequest } from '../../../models/grpc-request';
 
-type Props = {
-  handleDuplicateRequest: Function,
-  handleGenerateCode: Function,
-  handleCopyAsCurl: Function,
-  handleShowSettings: Function,
-  isPinned: Boolean,
-  request: Request,
-  requestGroup: RequestGroup,
-  hotKeyRegistry: HotKeyRegistry,
-  handleSetRequestPinned: Function,
-  activeEnvironment: Environment | null,
-};
+interface Props extends Partial<DropdownProps> {
+  handleDuplicateRequest: Function;
+  handleGenerateCode: Function;
+  handleCopyAsCurl: Function;
+  handleShowSettings: Function;
+  isPinned: Boolean;
+  request: Request | GrpcRequest;
+  requestGroup?: RequestGroup;
+  hotKeyRegistry: HotKeyRegistry;
+  handleSetRequestPinned: Function;
+  activeEnvironment?: Environment | null;
+}
 
 // Setup state for plugin actions
-type State = {
-  actionPlugins: Array<RequestGroupAction>,
-  loadingActions: { [string]: boolean },
-};
+interface State {
+  actionPlugins: Array<RequestAction>;
+  loadingActions: Record<string, boolean>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class RequestActionsDropdown extends React.PureComponent<Props, State> {
-  _dropdown: ?Dropdown;
+class RequestActionsDropdown extends PureComponent<Props, State> {
+  _dropdown: Dropdown | null = null;
 
-  state = {
+  state: State = {
     actionPlugins: [],
     loadingActions: {},
   };
 
-  _setDropdownRef(n) {
+  _setDropdownRef(n: Dropdown) {
     this._dropdown = n;
   }
 
@@ -84,34 +82,37 @@ class RequestActionsDropdown extends React.PureComponent<Props, State> {
 
   _handleRemove() {
     const { request } = this.props;
-
     incrementDeletedRequests();
     return requestOperations.remove(request);
   }
 
   async _onOpen() {
-    const plugins = await getRequestActions();
-    this.setState({ actionPlugins: plugins });
+    const actionPlugins = await getRequestActions();
+    this.setState({ actionPlugins });
   }
 
   async show() {
-    this._dropdown && this._dropdown.show();
+    this._dropdown?.show();
   }
 
   async _handlePluginClick(p: RequestAction) {
-    this.setState(state => ({ loadingActions: { ...state.loadingActions, [p.label]: true } }));
+    this.setState(state => ({
+      loadingActions: { ...state.loadingActions, [p.label]: true },
+    }));
 
     try {
       const { activeEnvironment, request, requestGroup } = this.props;
       const activeEnvironmentId = activeEnvironment ? activeEnvironment._id : null;
       const context = {
-        ...(pluginContexts.app.init(RENDER_PURPOSE_NO_RENDER): Object),
-        ...(pluginContexts.data.init(): Object),
-        ...(pluginContexts.store.init(p.plugin): Object),
-        ...(pluginContexts.network.init(activeEnvironmentId): Object),
+        ...(pluginContexts.app.init(RENDER_PURPOSE_NO_RENDER) as Record<string, any>),
+        ...(pluginContexts.data.init() as Record<string, any>),
+        ...(pluginContexts.store.init(p.plugin) as Record<string, any>),
+        ...(pluginContexts.network.init(activeEnvironmentId) as Record<string, any>),
       };
-
-      await p.action(context, { request, requestGroup });
+      await p.action(context, {
+        request,
+        requestGroup,
+      });
     } catch (err) {
       showError({
         title: 'Plugin Action Failed',
@@ -119,23 +120,23 @@ class RequestActionsDropdown extends React.PureComponent<Props, State> {
       });
     }
 
-    this.setState(state => ({ loadingActions: { ...state.loadingActions, [p.label]: false } }));
-    this._dropdown && this._dropdown.hide();
+    this.setState(state => ({
+      loadingActions: { ...state.loadingActions, [p.label]: false },
+    }));
+    this._dropdown?.hide();
   }
 
   render() {
     const {
-      request, // eslint-disable-line no-unused-vars
+      request,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
       handleShowSettings,
       hotKeyRegistry,
       ...other
     } = this.props;
-
     const { actionPlugins, loadingActions } = this.state;
-
     // Can only generate code for regular requests, not gRPC requests
     const canGenerateCode = isRequest(request);
-
     return (
       <Dropdown ref={this._setDropdownRef} onOpen={this._onOpen} {...other}>
         <DropdownButton>
@@ -173,18 +174,18 @@ class RequestActionsDropdown extends React.PureComponent<Props, State> {
         </DropdownItem>
 
         {actionPlugins.length > 0 && <DropdownDivider>Plugins</DropdownDivider>}
-        {actionPlugins.map((p: RequestAction) => (
+        {actionPlugins.map((plugin: RequestAction) => (
           <DropdownItem
-            key={`${p.plugin.name}::${p.label}`}
-            value={p}
+            key={`${plugin.plugin.name}::${plugin.label}`}
+            value={plugin}
             onClick={this._handlePluginClick}
             stayOpenAfterClick>
-            {loadingActions[p.label] ? (
+            {loadingActions[plugin.label] ? (
               <i className="fa fa-refresh fa-spin" />
             ) : (
-              <i className={classnames('fa', p.icon || 'fa-code')} />
+              <i className={classnames('fa', plugin.icon || 'fa-code')} />
             )}
-            {p.label}
+            {plugin.label}
           </DropdownItem>
         ))}
 
@@ -199,15 +200,4 @@ class RequestActionsDropdown extends React.PureComponent<Props, State> {
   }
 }
 
-RequestActionsDropdown.propTypes = {
-  handleDuplicateRequest: PropTypes.func.isRequired,
-  handleGenerateCode: PropTypes.func.isRequired,
-  handleCopyAsCurl: PropTypes.func.isRequired,
-  handleShowSettings: PropTypes.func.isRequired,
-  isPinned: PropTypes.bool.isRequired,
-  request: PropTypes.object.isRequired, // can be Request or GrpcRequest
-  hotKeyRegistry: PropTypes.object.isRequired,
-  handleSetRequestPinned: PropTypes.func.isRequired,
-};
-
 export default RequestActionsDropdown;
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/request-group-actions-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/request-group-actions-dropdown.tsx
similarity index 74%
rename from packages/insomnia-app/app/ui/components/dropdowns/request-group-actions-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/request-group-actions-dropdown.tsx
index 143f0d2e3e..233f1f84c6 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/request-group-actions-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/request-group-actions-dropdown.tsx
@@ -1,16 +1,15 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import classnames from 'classnames';
 import PromptButton from '../base/prompt-button';
 import {
-  Dropdown,
   DropdownButton,
   DropdownDivider,
   DropdownHint,
   DropdownItem,
 } from '../base/dropdown';
+import Dropdown from '../base/dropdown/dropdown';
 import EnvironmentEditModal from '../modals/environment-edit-modal';
 import * as models from '../../../models';
 import { showError, showModal, showPrompt } from '../modals';
@@ -24,43 +23,43 @@ import * as pluginContexts from '../../../plugins/context/index';
 import { RENDER_PURPOSE_NO_RENDER } from '../../../common/render';
 import type { Environment } from '../../../models/environment';
 
-type Props = {
-  workspace: Workspace,
-  requestGroup: RequestGroup,
-  hotKeyRegistry: HotKeyRegistry,
-  activeEnvironment: Environment | null,
-  handleCreateRequest: (id: string) => any,
-  handleDuplicateRequestGroup: (rg: RequestGroup) => any,
-  handleMoveRequestGroup: (rg: RequestGroup) => any,
-  handleCreateRequestGroup: (id: string) => any,
-};
+interface Props {
+  workspace: Workspace;
+  requestGroup: RequestGroup;
+  hotKeyRegistry: HotKeyRegistry;
+  activeEnvironment?: Environment | null;
+  handleCreateRequest: (id: string) => any;
+  handleDuplicateRequestGroup: (requestGroup: RequestGroup) => any;
+  handleMoveRequestGroup: (requestGroup: RequestGroup) => any;
+  handleCreateRequestGroup: (requestGroup: string) => any;
+}
 
-type State = {
-  actionPlugins: Array<RequestGroupAction>,
-  loadingActions: { [string]: boolean },
-};
+interface State {
+  actionPlugins: Array<RequestGroupAction>;
+  loadingActions: Record<string, boolean>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class RequestGroupActionsDropdown extends React.PureComponent<Props, State> {
-  _dropdown: ?Dropdown;
-
-  state = {
+class RequestGroupActionsDropdown extends PureComponent<Props, State> {
+  _dropdown: Dropdown | null = null;
+  state: State = {
     actionPlugins: [],
     loadingActions: {},
   };
 
-  _setDropdownRef(n: ?Dropdown) {
+  _setDropdownRef(n: Dropdown) {
     this._dropdown = n;
   }
 
   _handleRename() {
     const { requestGroup } = this.props;
-
     showPrompt({
       title: 'Rename Folder',
       defaultValue: requestGroup.name,
       onComplete: name => {
-        models.requestGroup.update(requestGroup, { name });
+        models.requestGroup.update(requestGroup, {
+          name,
+        });
       },
     });
   }
@@ -83,7 +82,6 @@ class RequestGroupActionsDropdown extends React.PureComponent<Props, State> {
 
   async _handleDeleteFolder() {
     await models.stats.incrementDeletedRequestsForDescendents(this.props.requestGroup);
-
     models.requestGroup.remove(this.props.requestGroup);
   }
 
@@ -93,7 +91,9 @@ class RequestGroupActionsDropdown extends React.PureComponent<Props, State> {
 
   async onOpen() {
     const plugins = await getRequestGroupActions();
-    this.setState({ actionPlugins: plugins });
+    this.setState({
+      actionPlugins: plugins,
+    });
   }
 
   async show() {
@@ -101,22 +101,25 @@ class RequestGroupActionsDropdown extends React.PureComponent<Props, State> {
   }
 
   async _handlePluginClick(p: RequestGroupAction) {
-    this.setState(state => ({ loadingActions: { ...state.loadingActions, [p.label]: true } }));
+    this.setState(state => ({
+      loadingActions: { ...state.loadingActions, [p.label]: true },
+    }));
 
     try {
       const { activeEnvironment, requestGroup } = this.props;
       const activeEnvironmentId = activeEnvironment ? activeEnvironment._id : null;
-
       const context = {
-        ...(pluginContexts.app.init(RENDER_PURPOSE_NO_RENDER): Object),
-        ...(pluginContexts.data.init(): Object),
-        ...(pluginContexts.store.init(p.plugin): Object),
-        ...(pluginContexts.network.init(activeEnvironmentId): Object),
+        ...(pluginContexts.app.init(RENDER_PURPOSE_NO_RENDER) as Record<string, any>),
+        ...(pluginContexts.data.init() as Record<string, any>),
+        ...(pluginContexts.store.init(p.plugin) as Record<string, any>),
+        ...(pluginContexts.network.init(activeEnvironmentId) as Record<string, any>),
       };
-
       const requests = await models.request.findByParentId(requestGroup._id);
       requests.sort((a, b) => a.metaSortKey - b.metaSortKey);
-      await p.action(context, { requestGroup, requests });
+      await p.action(context, {
+        requestGroup,
+        requests,
+      });
     } catch (err) {
       showError({
         title: 'Plugin Action Failed',
@@ -124,22 +127,24 @@ class RequestGroupActionsDropdown extends React.PureComponent<Props, State> {
       });
     }
 
-    this.setState(state => ({ loadingActions: { ...state.loadingActions, [p.label]: false } }));
+    this.setState(state => ({
+      loadingActions: { ...state.loadingActions, [p.label]: false },
+    }));
     this._dropdown && this._dropdown.hide();
   }
 
   render() {
     const {
-      workspace, // eslint-disable-line no-unused-vars
-      requestGroup, // eslint-disable-line no-unused-vars
+      workspace,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
+      requestGroup,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
       hotKeyRegistry,
       ...other
     } = this.props;
-
     const { actionPlugins, loadingActions } = this.state;
-
     return (
-      <Dropdown ref={this._setDropdownRef} onOpen={this.onOpen} {...(other: Object)}>
+      <Dropdown ref={this._setDropdownRef} onOpen={this.onOpen} {...(other as Record<string, any>)}>
         <DropdownButton>
           <i className="fa fa-caret-down" />
         </DropdownButton>
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/response-history-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/response-history-dropdown.tsx
similarity index 77%
rename from packages/insomnia-app/app/ui/components/dropdowns/response-history-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/response-history-dropdown.tsx
index cdc922fe88..64df801683 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/response-history-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/response-history-dropdown.tsx
@@ -1,9 +1,9 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import moment from 'moment';
-import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown';
+import { DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown';
+import Dropdown from '../base/dropdown/dropdown';
 import StatusTag from '../tags/status-tag';
 import URLTag from '../tags/url-tag';
 import PromptButton from '../base/prompt-button';
@@ -18,24 +18,21 @@ import type { RequestVersion } from '../../../models/request-version';
 import { decompressObject } from '../../../common/misc';
 import type { Environment } from '../../../models/environment';
 
-type Props = {
-  handleSetActiveResponse: Response => Promise<void>,
-  handleDeleteResponses: (requestId: string, environmentId: string | null) => Promise<void>,
-  handleDeleteResponse: Response => Promise<void>,
-  requestId: string,
-  responses: Array<Response>,
-  requestVersions: Array<RequestVersion>,
-  activeResponse: Response,
-  activeEnvironment: ?Environment,
-};
+interface Props {
+  handleSetActiveResponse: Function;
+  handleDeleteResponses: Function;
+  handleDeleteResponse: Function;
+  requestId: string;
+  responses: Array<Response>;
+  requestVersions: Array<RequestVersion>;
+  activeResponse: Response;
+  activeEnvironment?: Environment | null;
+  className?: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class ResponseHistoryDropdown extends React.PureComponent<Props> {
-  _dropdown: ?Dropdown;
-
-  _setDropdownRef(n: ?Dropdown) {
-    this._dropdown = n;
-  }
+class ResponseHistoryDropdown extends PureComponent<Props> {
+  _dropdown: Dropdown | null = null;
 
   _handleDeleteResponses() {
     const { requestId, activeEnvironment } = this.props;
@@ -59,7 +56,6 @@ class ResponseHistoryDropdown extends React.PureComponent<Props> {
 
   renderDropdownItem(response: Response, i: number) {
     const { activeResponse, requestVersions } = this.props;
-
     const activeResponseId = activeResponse ? activeResponse._id : 'n/a';
     const active = response._id === activeResponseId;
     const message =
@@ -67,7 +63,6 @@ class ResponseHistoryDropdown extends React.PureComponent<Props> {
       'it was created before this ability was added';
     const requestVersion = requestVersions.find(v => v._id === response.requestVersionId);
     const request = requestVersion ? decompressObject(requestVersion.compressedRequest) : null;
-
     return (
       <DropdownItem
         key={response._id}
@@ -102,29 +97,37 @@ class ResponseHistoryDropdown extends React.PureComponent<Props> {
   renderPastResponses(responses: Array<Response>) {
     const now = moment();
     // Four arrays for four time groups
-    const categories = { minutes: [], hours: [], today: [], week: [], other: [] };
-    responses.forEach(r => {
-      const resTime = moment(r.created);
+    const categories = {
+      minutes: [] as Array<Response>,
+      hours: [] as Array<Response>,
+      today: [] as Array<Response>,
+      week: [] as Array<Response>,
+      other: [] as Array<Response>,
+    };
+
+    responses.forEach(response => {
+      const resTime = moment(response.created);
+
       if (now.diff(resTime, 'minutes') < 5) {
         // Five minutes ago
-        categories.minutes.push(r);
+        categories.minutes.push(response);
       } else if (now.diff(resTime, 'hours') < 2) {
         // Two hours ago
-        categories.hours.push(r);
+        categories.hours.push(response);
       } else if (now.isSame(resTime, 'day')) {
         // Today
-        categories.today.push(r);
+        categories.today.push(response);
       } else if (now.isSame(resTime, 'week')) {
         // This week
-        categories.week.push(r);
+        categories.week.push(response);
       } else {
         // Older
-        categories.other.push(r);
+        categories.other.push(response);
       }
     });
 
     return (
-      <React.Fragment>
+      <Fragment>
         <DropdownDivider>5 Minutes Ago</DropdownDivider>
         {categories.minutes.map(this.renderDropdownItem)}
         <DropdownDivider>2 Hours Ago</DropdownDivider>
@@ -135,31 +138,33 @@ class ResponseHistoryDropdown extends React.PureComponent<Props> {
         {categories.week.map(this.renderDropdownItem)}
         <DropdownDivider>Older Than This Week</DropdownDivider>
         {categories.other.map(this.renderDropdownItem)}
-      </React.Fragment>
+      </Fragment>
     );
   }
 
   render() {
     const {
-      activeResponse, // eslint-disable-line no-unused-vars
-      handleSetActiveResponse, // eslint-disable-line no-unused-vars
-      handleDeleteResponses, // eslint-disable-line no-unused-vars
-      handleDeleteResponse, // eslint-disable-line no-unused-vars
+      activeResponse,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
+      handleSetActiveResponse,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
+      handleDeleteResponses,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
+      handleDeleteResponse,
+      // eslint-disable-line @typescript-eslint/no-unused-vars
       responses,
       activeEnvironment,
       ...extraProps
     } = this.props;
-
     const environmentName = activeEnvironment ? activeEnvironment.name : 'Base';
-
     const isLatestResponseActive = !responses.length || activeResponse._id === responses[0]._id;
-
     return (
       <KeydownBinder onKeydown={this._handleKeydown}>
         <Dropdown
-          ref={this._setDropdownRef}
+          ref={ref => { this._dropdown = ref; }}
           key={activeResponse ? activeResponse._id : 'n/a'}
-          {...(extraProps: Object)}>
+          {...extraProps}
+        >
           <DropdownButton className="btn btn--super-compact tall" title="Response history">
             {activeResponse && <TimeFromNow timestamp={activeResponse.created} capitalize />}
             {!isLatestResponseActive ? (
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/sync-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/sync-dropdown.tsx
similarity index 85%
rename from packages/insomnia-app/app/ui/components/dropdowns/sync-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/sync-dropdown.tsx
index 5a82adc9da..2614169a85 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/sync-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/sync-dropdown.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import classnames from 'classnames';
@@ -20,80 +19,74 @@ import Tooltip from '../tooltip';
 import LoginModal from '../modals/login-modal';
 import * as session from '../../../account/session';
 import PromptButton from '../base/prompt-button';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import * as models from '../../../models';
 import { docsVersionControl } from '../../../common/documentation';
 import { strings } from '../../../common/strings';
-
 // Stop refreshing if user hasn't been active in this long
 const REFRESH_USER_ACTIVITY = 1000 * 60 * 10;
-
 // Refresh dropdown periodically
 const REFRESH_PERIOD = 1000 * 60 * 1;
-
 const DEFAULT_BRANCH_NAME = 'master';
 
-type Props = {
-  workspace: Workspace,
-  vcs: VCS,
-  syncItems: Array<StatusCandidate>,
+interface Props {
+  workspace: Workspace;
+  vcs: VCS;
+  syncItems: Array<StatusCandidate>;
+  className?: string;
+}
 
-  // Optional
-  className?: string,
-};
-
-type State = {
-  currentBranch: string,
-  localBranches: Array<string>,
+interface State {
+  currentBranch: string;
+  localBranches: Array<string>;
   compare: {
-    ahead: number,
-    behind: number,
-  },
-  status: Status,
-  initializing: boolean,
-  historyCount: number,
-  loadingPull: boolean,
-  loadingProjectPull: boolean,
-  loadingPush: boolean,
-  remoteProjects: Array<Project>,
-};
+    ahead: number;
+    behind: number;
+  };
+  status: Status;
+  initializing: boolean;
+  historyCount: number;
+  loadingPull: boolean;
+  loadingProjectPull: boolean;
+  loadingPush: boolean;
+  remoteProjects: Array<Project>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SyncDropdown extends React.PureComponent<Props, State> {
-  checkInterval: IntervalID;
+class SyncDropdown extends PureComponent<Props, State> {
+  checkInterval: NodeJS.Timeout | null = null;
   refreshOnNextSyncItems = false;
   lastUserActivity = Date.now();
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      localBranches: [],
-      currentBranch: '',
-      compare: {
-        ahead: 0,
-        behind: 0,
-      },
-      historyCount: 0,
-      initializing: true,
-      loadingPull: false,
-      loadingPush: false,
-      loadingProjectPull: false,
-      status: {
-        key: 'n/a',
-        stage: {},
-        unstaged: {},
-      },
-      remoteProjects: [],
-    };
+  state: State = {
+    localBranches: [],
+    currentBranch: '',
+    compare: {
+      ahead: 0,
+      behind: 0,
+    },
+    historyCount: 0,
+    initializing: true,
+    loadingPull: false,
+    loadingPush: false,
+    loadingProjectPull: false,
+    status: {
+      key: 'n/a',
+      stage: {},
+      unstaged: {},
+    },
+    remoteProjects: [],
   }
 
-  async refreshMainAttributes(extraState?: Object = {}) {
+  async refreshMainAttributes(extraState: Record<string, any> = {}) {
     const { vcs, syncItems, workspace } = this.props;
 
     if (!vcs.hasProject()) {
       const remoteProjects = await vcs.remoteProjects();
       const matchedProjects = remoteProjects.filter(p => p.rootDocumentId === workspace._id);
-      this.setState({ remoteProjects: matchedProjects });
+      this.setState({
+        remoteProjects: matchedProjects,
+      });
       return;
     }
 
@@ -101,7 +94,6 @@ class SyncDropdown extends React.PureComponent<Props, State> {
     const currentBranch = await vcs.getBranch();
     const historyCount = await vcs.getHistoryCount();
     const status = await vcs.status(syncItems, {});
-
     const newState = {
       status,
       historyCount,
@@ -113,33 +105,41 @@ class SyncDropdown extends React.PureComponent<Props, State> {
     // Do the remote stuff
     if (session.isLoggedIn()) {
       try {
+        // @ts-expect-error -- TSCONVERSION
         newState.compare = await vcs.compareRemoteBranch();
       } catch (err) {
         console.log('Failed to compare remote branches', err.message);
       }
     }
 
+    // @ts-expect-error -- TSCONVERSION
     this.setState(newState);
   }
 
   componentDidMount() {
-    this.setState({ initializing: true });
+    this.setState({
+      initializing: true,
+    });
     this.refreshMainAttributes()
       .catch(err => console.log('[sync_menu] Error refreshing sync state', err))
-      .finally(() => this.setState({ initializing: false }));
-
+      .finally(() =>
+        this.setState({
+          initializing: false,
+        }),
+      );
     // Refresh but only if the user has been active in the last n minutes
     this.checkInterval = setInterval(async () => {
       if (Date.now() - this.lastUserActivity < REFRESH_USER_ACTIVITY) {
         await this.refreshMainAttributes();
       }
     }, REFRESH_PERIOD);
-
     document.addEventListener('mousemove', this._handleUserActivity);
   }
 
   componentWillUnmount() {
-    clearInterval(this.checkInterval);
+    if (this.checkInterval !== null) {
+      clearInterval(this.checkInterval);
+    }
     document.removeEventListener('mousemove', this._handleUserActivity);
   }
 
@@ -150,7 +150,9 @@ class SyncDropdown extends React.PureComponent<Props, State> {
     if (syncItems !== prevProps.syncItems) {
       if (vcs.hasProject()) {
         vcs.status(syncItems, {}).then(status => {
-          this.setState({ status });
+          this.setState({
+            status,
+          });
         });
       }
 
@@ -192,7 +194,9 @@ class SyncDropdown extends React.PureComponent<Props, State> {
 
   async _handlePushChanges() {
     const { vcs } = this.props;
-    this.setState({ loadingPush: true });
+    this.setState({
+      loadingPush: true,
+    });
 
     try {
       await vcs.push();
@@ -203,15 +207,20 @@ class SyncDropdown extends React.PureComponent<Props, State> {
       });
     }
 
-    await this.refreshMainAttributes({ loadingPush: false });
+    await this.refreshMainAttributes({
+      loadingPush: false,
+    });
   }
 
   async _handlePullChanges() {
     const { vcs, syncItems } = this.props;
+    this.setState({
+      loadingPull: true,
+    });
 
-    this.setState({ loadingPull: true });
     try {
       const delta = await vcs.pull(syncItems);
+      // @ts-expect-error -- TSCONVERSION
       await db.batchModifyDocs(delta);
       this.refreshOnNextSyncItems = true;
     } catch (err) {
@@ -220,12 +229,16 @@ class SyncDropdown extends React.PureComponent<Props, State> {
         message: err.message,
       });
     }
-    this.setState({ loadingPull: false });
+
+    this.setState({
+      loadingPull: false,
+    });
   }
 
   async _handleRollback(snapshot: Snapshot) {
     const { vcs, syncItems } = this.props;
     const delta = await vcs.rollback(snapshot.id, syncItems);
+    // @ts-expect-error -- TSCONVERSION
     await db.batchModifyDocs(delta);
     this.refreshOnNextSyncItems = true;
   }
@@ -235,6 +248,7 @@ class SyncDropdown extends React.PureComponent<Props, State> {
 
     try {
       const delta = await vcs.rollbackToLatest(syncItems);
+      // @ts-expect-error -- TSCONVERSION
       await db.batchModifyDocs(delta);
     } catch (err) {
       showModal(ErrorModal, {
@@ -255,10 +269,14 @@ class SyncDropdown extends React.PureComponent<Props, State> {
   }
 
   async _handleEnableSync() {
-    this.setState({ loadingProjectPull: true });
+    this.setState({
+      loadingProjectPull: true,
+    });
     const { vcs, workspace } = this.props;
     await vcs.switchAndCreateProjectIfNotExist(workspace._id, workspace.name);
-    await this.refreshMainAttributes({ loadingProjectPull: false });
+    await this.refreshMainAttributes({
+      loadingProjectPull: false,
+    });
   }
 
   _handleShowDeleteModal() {
@@ -269,11 +287,11 @@ class SyncDropdown extends React.PureComponent<Props, State> {
 
   async _handleSetProject(p: Project) {
     const { vcs } = this.props;
-    this.setState({ loadingProjectPull: true });
+    this.setState({
+      loadingProjectPull: true,
+    });
     await vcs.setProject(p);
-
     await vcs.checkout([], DEFAULT_BRANCH_NAME);
-
     const remoteBranches = await vcs.getRemoteBranches();
     const defaultBranchMissing = !remoteBranches.includes(DEFAULT_BRANCH_NAME);
 
@@ -283,19 +301,24 @@ class SyncDropdown extends React.PureComponent<Props, State> {
         _id: p.rootDocumentId,
         name: p.name,
       });
-
       await db.upsert(workspace);
     } else {
       // Pull changes
       await vcs.pull([]); // There won't be any existing docs since it's a new pull
+
       const flushId = await db.bufferChanges();
+
+      // @ts-expect-error -- TSCONVERSION
       for (const doc of await vcs.allDocuments()) {
         await db.upsert(doc);
       }
+
       await db.flushChanges(flushId);
     }
 
-    await this.refreshMainAttributes({ loadingProjectPull: false });
+    await this.refreshMainAttributes({
+      loadingProjectPull: false,
+    });
   }
 
   async _handleSwitchBranch(branch: string) {
@@ -312,10 +335,11 @@ class SyncDropdown extends React.PureComponent<Props, State> {
         // It will result in the workspace getting deleted
         // So we filter out the workspace from the delta to prevent this
         if (!defaultBranchHistoryCount && historyCount) {
-          delta.remove = delta.remove.filter(e => e.type !== models.workspace.type);
+          delta.remove = delta.remove.filter(e => e?.type !== models.workspace.type);
         }
       }
 
+      // @ts-expect-error -- TSCONVERSION
       await db.batchModifyDocs(delta);
     } catch (err) {
       showAlert({
@@ -326,23 +350,25 @@ class SyncDropdown extends React.PureComponent<Props, State> {
 
     // We can't refresh now because we won't yet have the new syncItems
     this.refreshOnNextSyncItems = true;
-
     // Still need to do this in case sync items don't change
-    this.setState({ currentBranch: branch });
+    this.setState({
+      currentBranch: branch,
+    });
   }
 
   renderBranch(branch: string) {
     const { currentBranch } = this.state;
-
     const icon =
       branch === currentBranch ? <i className="fa fa-tag" /> : <i className="fa fa-empty" />;
-
     const isCurrentBranch = branch === currentBranch;
     return (
+      // @ts-expect-error -- TSCONVERSION
       <DropdownItem
         key={branch}
         onClick={isCurrentBranch ? null : () => this._handleSwitchBranch(branch)}
-        className={classnames({ bold: isCurrentBranch })}
+        className={classnames({
+          bold: isCurrentBranch,
+        })}
         title={isCurrentBranch ? null : `Switch to "${branch}"`}>
         {icon}
         {branch}
@@ -359,26 +385,21 @@ class SyncDropdown extends React.PureComponent<Props, State> {
       loadingPull,
       loadingPush,
     } = this.state;
-
     const canPush = ahead > 0;
     const canPull = behind > 0;
     const canCreateSnapshot =
       Object.keys(status.stage).length > 0 || Object.keys(status.unstaged).length > 0;
-
     const loadIcon = <i className="fa fa-spin fa-refresh fa--fixed-width" />;
-
     const pullToolTipMsg = canPull
       ? `There ${behind === 1 ? 'is' : 'are'} ${behind} snapshot${behind === 1 ? '' : 's'} to pull`
       : 'No changes to pull';
-
     const pushToolTipMsg = canPush
       ? `There ${ahead === 1 ? 'is' : 'are'} ${ahead} snapshot${ahead === 1 ? '' : 's'} to push`
       : 'No changes to push';
-
     const snapshotToolTipMsg = canCreateSnapshot ? 'Local changes made' : 'No local changes made';
 
     if (currentBranch === null) {
-      return <React.Fragment>Sync</React.Fragment>;
+      return <Fragment>Sync</Fragment>;
     }
 
     return (
@@ -398,7 +419,7 @@ class SyncDropdown extends React.PureComponent<Props, State> {
 
           {/* Only show cloud icons if logged in */}
           {session.isLoggedIn() && (
-            <React.Fragment>
+            <Fragment>
               {loadingPull ? (
                 loadIcon
               ) : (
@@ -422,7 +443,7 @@ class SyncDropdown extends React.PureComponent<Props, State> {
                   />
                 </Tooltip>
               )}
-            </React.Fragment>
+            </Fragment>
           )}
         </div>
       </DropdownButton>
@@ -446,12 +467,9 @@ class SyncDropdown extends React.PureComponent<Props, State> {
       remoteProjects,
       compare: { ahead, behind },
     } = this.state;
-
     const canCreateSnapshot =
       Object.keys(status.stage).length > 0 || Object.keys(status.unstaged).length > 0;
-
     const visibleBranches = localBranches.filter(b => !b.match(/\.hidden$/));
-
     const syncMenuHeader = (
       <DropdownDivider>
         Insomnia Sync{' '}
@@ -554,27 +572,27 @@ class SyncDropdown extends React.PureComponent<Props, State> {
 
           <DropdownItem onClick={this._handlePullChanges} disabled={behind === 0 || loadingPull}>
             {loadingPull ? (
-              <React.Fragment>
+              <Fragment>
                 <i className="fa fa-spin fa-refresh" /> Pulling Snapshots...
-              </React.Fragment>
+              </Fragment>
             ) : (
-              <React.Fragment>
+              <Fragment>
                 <i className="fa fa-cloud-upload" /> Pull {behind || ''} Snapshot
                 {behind === 1 ? '' : 's'}
-              </React.Fragment>
+              </Fragment>
             )}
           </DropdownItem>
 
           <DropdownItem onClick={this._handlePushChanges} disabled={ahead === 0 || loadingPush}>
             {loadingPush ? (
-              <React.Fragment>
+              <Fragment>
                 <i className="fa fa-spin fa-refresh" /> Pushing Snapshots...
-              </React.Fragment>
+              </Fragment>
             ) : (
-              <React.Fragment>
+              <Fragment>
                 <i className="fa fa-cloud-upload" /> Push {ahead || ''} Snapshot
                 {ahead === 1 ? '' : 's'}
-              </React.Fragment>
+              </Fragment>
             )}
           </DropdownItem>
         </Dropdown>
diff --git a/packages/insomnia-app/app/ui/components/dropdowns/workspace-dropdown.js b/packages/insomnia-app/app/ui/components/dropdowns/workspace-dropdown.tsx
similarity index 72%
rename from packages/insomnia-app/app/ui/components/dropdowns/workspace-dropdown.js
rename to packages/insomnia-app/app/ui/components/dropdowns/workspace-dropdown.tsx
index 3328b53fde..b965ddd391 100644
--- a/packages/insomnia-app/app/ui/components/dropdowns/workspace-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/dropdowns/workspace-dropdown.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG, getAppName, getAppVersion } from '../../../common/constants';
 import classnames from 'classnames';
@@ -10,7 +9,6 @@ import DropdownItem from '../base/dropdown/dropdown-item';
 import DropdownHint from '../base/dropdown/dropdown-hint';
 import SettingsModal, { TAB_INDEX_EXPORT } from '../modals/settings-modal';
 import * as models from '../../../models';
-
 import { showError, showModal } from '../modals';
 import WorkspaceSettingsModal from '../modals/workspace-settings-modal';
 import KeydownBinder from '../keydown-binder';
@@ -18,7 +16,7 @@ import type { HotKeyRegistry } from '../../../common/hotkeys';
 import { hotKeyRefs } from '../../../common/hotkeys';
 import { executeHotKey } from '../../../common/hotkeys-listener';
 import type { Workspace } from '../../../models/workspace';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import type { WorkspaceAction } from '../../../plugins';
 import { ConfigGenerator, getConfigGenerators, getWorkspaceActions } from '../../../plugins';
 import * as pluginContexts from '../../../plugins/context';
@@ -27,53 +25,59 @@ import type { Environment } from '../../../models/environment';
 import { showGenerateConfigModal } from '../modals/generate-config-modal';
 import { getWorkspaceLabel } from '../../../common/get-workspace-label';
 import { isDesign } from '../../../models/helpers/is-model';
+import { ApiSpec } from '../../../models/api-spec';
 
-type Props = {
-  displayName: string,
-  activeEnvironment: Environment | null,
-  activeWorkspace: Workspace,
-  activeApiSpec: ApiSpec,
-  hotKeyRegistry: HotKeyRegistry,
-  isLoading: boolean,
-  className?: string,
-};
+interface Props {
+  displayName: string;
+  activeEnvironment: Environment | null;
+  activeWorkspace: Workspace;
+  activeApiSpec: ApiSpec;
+  hotKeyRegistry: HotKeyRegistry;
+  isLoading: boolean;
+  className?: string;
+}
 
-type State = {
-  actionPlugins: Array<WorkspaceAction>,
-  configGeneratorPlugins: Array<ConfigGenerator>,
-  loadingActions: { [string]: boolean },
-};
+interface State {
+  actionPlugins: Array<WorkspaceAction>;
+  configGeneratorPlugins: Array<ConfigGenerator>;
+  loadingActions: Record<string, boolean>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class WorkspaceDropdown extends React.PureComponent<Props, State> {
-  _dropdown: ?Dropdown;
-
-  state = {
+class WorkspaceDropdown extends PureComponent<Props, State> {
+  _dropdown: Dropdown | null = null;
+  state: State = {
     actionPlugins: [],
     configGeneratorPlugins: [],
     loadingActions: {},
   };
 
   async _handlePluginClick(p: WorkspaceAction) {
-    this.setState(state => ({ loadingActions: { ...state.loadingActions, [p.label]: true } }));
-
+    this.setState(state => ({
+      loadingActions: { ...state.loadingActions, [p.label]: true },
+    }));
     const { activeEnvironment, activeWorkspace } = this.props;
 
     try {
       const activeEnvironmentId = activeEnvironment ? activeEnvironment._id : null;
-
       const context = {
-        ...(pluginContexts.app.init(RENDER_PURPOSE_NO_RENDER): Object),
-        ...(pluginContexts.data.init(): Object),
-        ...(pluginContexts.store.init(p.plugin): Object),
-        ...(pluginContexts.network.init(activeEnvironmentId): Object),
+        ...(pluginContexts.app.init(RENDER_PURPOSE_NO_RENDER) as Record<string, any>),
+        ...(pluginContexts.data.init() as Record<string, any>),
+        ...(pluginContexts.store.init(p.plugin) as Record<string, any>),
+        ...(pluginContexts.network.init(activeEnvironmentId) as Record<string, any>),
       };
-
       const docs = await db.withDescendants(activeWorkspace);
-      const requests: any = docs.filter(d => d.type === models.request.type && !(d: any).isPrivate);
-      const requestGroups: any = docs.filter(d => d.type === models.requestGroup.type);
-
-      await p.action(context, { requestGroups, requests, workspace: activeWorkspace });
+      const requests = docs.filter(doc => (
+        doc.type === models.request.type && !doc.isPrivate
+      ));
+      const requestGroups = docs.filter(d => d.type === models.requestGroup.type);
+      await p.action(context, {
+        // @ts-expect-error -- TSCONVERSION
+        requestGroups,
+        // @ts-expect-error -- TSCONVERSION
+        requests,
+        workspace: activeWorkspace,
+      });
     } catch (err) {
       showError({
         title: 'Plugin Action Failed',
@@ -81,17 +85,22 @@ class WorkspaceDropdown extends React.PureComponent<Props, State> {
       });
     }
 
-    this.setState(state => ({ loadingActions: { ...state.loadingActions, [p.label]: false } }));
+    this.setState(state => ({
+      loadingActions: { ...state.loadingActions, [p.label]: false },
+    }));
     this._dropdown && this._dropdown.hide();
   }
 
   async _handleDropdownOpen() {
     const actionPlugins = await getWorkspaceActions();
     const configGeneratorPlugins = await getConfigGenerators();
-    this.setState({ actionPlugins, configGeneratorPlugins });
+    this.setState({
+      actionPlugins,
+      configGeneratorPlugins,
+    });
   }
 
-  _setDropdownRef(n: ?Dropdown) {
+  _setDropdownRef(n: Dropdown) {
     this._dropdown = n;
   }
 
@@ -111,7 +120,10 @@ class WorkspaceDropdown extends React.PureComponent<Props, State> {
 
   async _handleGenerateConfig(label: string) {
     const { activeApiSpec } = this.props;
-    showGenerateConfigModal({ apiSpec: activeApiSpec, activeTabLabel: label });
+    showGenerateConfigModal({
+      apiSpec: activeApiSpec,
+      activeTabLabel: label,
+    });
   }
 
   render() {
@@ -123,11 +135,8 @@ class WorkspaceDropdown extends React.PureComponent<Props, State> {
       hotKeyRegistry,
       ...other
     } = this.props;
-
     const classes = classnames(className, 'wide', 'workspace-dropdown');
-
     const { actionPlugins, loadingActions, configGeneratorPlugins } = this.state;
-
     return (
       <KeydownBinder onKeydown={this._handleKeydown}>
         <Dropdown
@@ -135,10 +144,16 @@ class WorkspaceDropdown extends React.PureComponent<Props, State> {
           ref={this._setDropdownRef}
           className={classes}
           onOpen={this._handleDropdownOpen}
+          // @ts-expect-error -- TSCONVERSION appears to be genuine
           onHide={this._handleDropdownHide}
-          {...(other: Object)}>
+          {...(other as Record<string, any>)}>
           <DropdownButton className="row">
-            <div className="ellipsis" style={{ maxWidth: '400px' }} title={displayName}>
+            <div
+              className="ellipsis"
+              style={{
+                maxWidth: '400px',
+              }}
+              title={displayName}>
               {displayName}
             </div>
             <i className="fa fa-caret-down space-left" />
diff --git a/packages/insomnia-app/app/ui/components/editors/__tests__/environment-editor.test.js b/packages/insomnia-app/app/ui/components/editors/__tests__/environment-editor.test.ts
similarity index 99%
rename from packages/insomnia-app/app/ui/components/editors/__tests__/environment-editor.test.js
rename to packages/insomnia-app/app/ui/components/editors/__tests__/environment-editor.test.ts
index adad053c07..2739b7128d 100644
--- a/packages/insomnia-app/app/ui/components/editors/__tests__/environment-editor.test.js
+++ b/packages/insomnia-app/app/ui/components/editors/__tests__/environment-editor.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ensureKeyIsValid } from '../environment-editor';
 import { NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME } from '../../../../templating';
 
diff --git a/packages/insomnia-app/app/ui/components/editors/__tests__/password-editor.test.js b/packages/insomnia-app/app/ui/components/editors/__tests__/password-editor.test.tsx
similarity index 99%
rename from packages/insomnia-app/app/ui/components/editors/__tests__/password-editor.test.js
rename to packages/insomnia-app/app/ui/components/editors/__tests__/password-editor.test.tsx
index d1ac6a6f05..5442e7e3bb 100644
--- a/packages/insomnia-app/app/ui/components/editors/__tests__/password-editor.test.js
+++ b/packages/insomnia-app/app/ui/components/editors/__tests__/password-editor.test.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import { fireEvent, render } from '@testing-library/react';
 import PasswordEditor from '../password-editor';
-
 const props = {
   password: 'password',
   disabled: false,
 };
+
 describe('<PasswordEditor />', () => {
   it('should able to render the component', () => {
     const { getByRole, getByDisplayValue } = render(<PasswordEditor {...props} />);
@@ -13,6 +13,7 @@ describe('<PasswordEditor />', () => {
     expect(getByDisplayValue('password').type).toBe('password');
     expect(getByRole('button')).toBeInTheDocument();
   });
+
   it('should able to show password value as text and hide password-reveal icon if showAllPasswords is true', () => {
     const { getByDisplayValue, queryByRole } = render(
       <PasswordEditor password="password" showAllPasswords={true} />,
@@ -20,6 +21,7 @@ describe('<PasswordEditor />', () => {
     expect(getByDisplayValue('password').type).toBe('text');
     expect(queryByRole('button')).not.toBeInTheDocument();
   });
+
   it('should able to show password value if clicked on password-reveal icon', () => {
     const { getByRole, getByDisplayValue } = render(<PasswordEditor password="password" />);
     const passwordInput = getByDisplayValue('password');
diff --git a/packages/insomnia-app/app/ui/components/editors/auth/asap-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/asap-auth.tsx
similarity index 89%
rename from packages/insomnia-app/app/ui/components/editors/auth/asap-auth.js
rename to packages/insomnia-app/app/ui/components/editors/auth/asap-auth.tsx
index 123086fa9b..c2f105a2b8 100644
--- a/packages/insomnia-app/app/ui/components/editors/auth/asap-auth.js
+++ b/packages/insomnia-app/app/ui/components/editors/auth/asap-auth.tsx
@@ -1,7 +1,5 @@
-// @flow
-
 import classnames from 'classnames';
-import * as React from 'react';
+import React, { PureComponent, ReactElement } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import OneLineEditor from '../../codemirror/one-line-editor';
 import HelpTooltip from '../../help-tooltip';
@@ -10,15 +8,7 @@ import CodePromptModal from '../../modals/code-prompt-modal';
 import Button from '../../base/button';
 import type { Request, RequestAuthentication } from '../../../../models/request';
 import { AUTOBIND_CFG } from '../../../../common/constants';
-
-type Props = {
-  request: Request,
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  nunjucksPowerUserMode: boolean,
-  isVariableUncovered: boolean,
-  onChange: (Request, RequestAuthentication) => Promise<Request>,
-};
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
 
 const PRIVATE_KEY_PLACEHOLDER = `
 -----BEGIN RSA PRIVATE KEY-----
@@ -33,52 +23,52 @@ cJV+wRTs/Szp6LXAgMmTkKMJ+9XXErUIUgwbl27Y3Rv/9ox1p5VRg+A=
 -----END RSA PRIVATE KEY-----
 `.trim();
 
+interface Props {
+  request: Request;
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  nunjucksPowerUserMode: boolean;
+  isVariableUncovered: boolean;
+  onChange: (arg0: Request, arg1: RequestAuthentication) => Promise<Request>;
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class AsapAuth extends React.PureComponent<Props> {
+class AsapAuth extends PureComponent<Props> {
   _handleDisable() {
     const { request, onChange } = this.props;
-    onChange(request, {
-      ...request.authentication,
-      disabled: !request.authentication.disabled,
-    });
+    onChange(request, { ...request.authentication, disabled: !request.authentication.disabled });
   }
 
-  _handleChangeProperty(property: string, value: string | boolean): void {
+  _handleChangeProperty(property: string, value: string | boolean) {
     const { request, onChange } = this.props;
     onChange(request, { ...request.authentication, [property]: value });
   }
 
-  _handleChangePrivateKey(value: string): void {
+  _handleChangePrivateKey(value: string) {
     const { request, onChange } = this.props;
     onChange(request, { ...request.authentication, privateKey: value });
   }
 
-  renderAsapAuthenticationFields(): React.Node {
+  renderAsapAuthenticationFields() {
     const asapIssuer = this.renderTextInput('Issuer (iss)', 'issuer', 'text/plain', value =>
       this._handleChangeProperty('issuer', value),
     );
-
     const asapSubject = this.renderTextInput('Subject (sub)', 'subject', 'text/plain', value =>
       this._handleChangeProperty('subject', value),
     );
-
     const asapAudience = this.renderTextInput('Audience (aud)', 'audience', 'text/plain', value =>
       this._handleChangeProperty('audience', value),
     );
-
     const asapAdditionalClaims = this.renderTextInput(
       'Additional Claims',
       'additionalClaims',
       'application/json',
       value => this._handleChangeProperty('additionalClaims', value),
     );
-
     const asapKeyId = this.renderTextInput('Key ID (kid)', 'keyId', 'text/plain', value =>
       this._handleChangeProperty('keyId', value),
     );
-
     const asapPrivateKey = this.renderPrivateKeyInput('Private Key');
-
     return [asapIssuer, asapSubject, asapAudience, asapAdditionalClaims, asapKeyId, asapPrivateKey];
   }
 
@@ -86,8 +76,8 @@ class AsapAuth extends React.PureComponent<Props> {
     label: string,
     property: string,
     mode: string,
-    onChange: Function,
-  ): React.Element<*> {
+    onChange: (...args: Array<any>) => any,
+  ): ReactElement<any> {
     const {
       handleRender,
       handleGetRenderContext,
@@ -95,10 +85,8 @@ class AsapAuth extends React.PureComponent<Props> {
       nunjucksPowerUserMode,
       isVariableUncovered,
     } = this.props;
-
     const { authentication } = request;
     const id = label.replace(/ /g, '-');
-
     return (
       <tr key={id}>
         <td className="pad-right no-wrap valign-middle">
@@ -129,9 +117,7 @@ class AsapAuth extends React.PureComponent<Props> {
 
   _handleEditPrivateKey() {
     const { handleRender, handleGetRenderContext, request } = this.props;
-
     const { authentication } = request;
-
     showModal(CodePromptModal, {
       submitName: 'Done',
       title: 'Edit Private Key',
@@ -144,10 +130,9 @@ class AsapAuth extends React.PureComponent<Props> {
     });
   }
 
-  renderPrivateKeyInput(label: string): React.Element<*> {
+  renderPrivateKeyInput(label: string) {
     const { authentication } = this.props.request;
     const id = label.replace(/ /g, '-');
-
     return (
       <tr key={id}>
         <td className="pad-right pad-top-sm no-wrap valign-top">
@@ -180,7 +165,6 @@ class AsapAuth extends React.PureComponent<Props> {
   render() {
     const { authentication } = this.props.request;
     const fields = this.renderAsapAuthenticationFields();
-
     return (
       <div className="pad">
         <table>
diff --git a/packages/insomnia-app/app/ui/components/editors/auth/auth-wrapper.js b/packages/insomnia-app/app/ui/components/editors/auth/auth-wrapper.tsx
similarity index 89%
rename from packages/insomnia-app/app/ui/components/editors/auth/auth-wrapper.js
rename to packages/insomnia-app/app/ui/components/editors/auth/auth-wrapper.tsx
index 56c0ef5851..c735496553 100644
--- a/packages/insomnia-app/app/ui/components/editors/auth/auth-wrapper.js
+++ b/packages/insomnia-app/app/ui/components/editors/auth/auth-wrapper.tsx
@@ -1,6 +1,4 @@
-// @flow
-
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import {
   AUTH_BASIC,
   AUTH_DIGEST,
@@ -28,23 +26,22 @@ import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import type { Request, RequestAuthentication } from '../../../../models/request';
 import type { OAuth2Token } from '../../../../models/o-auth-2-token';
 import type { Settings } from '../../../../models/settings';
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
 
-type Props = {
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  handleUpdateSettingsShowPasswords: (showPasswords: boolean) => Promise<Settings>,
-  nunjucksPowerUserMode: boolean,
-  onChange: (Request, RequestAuthentication) => Promise<Request>,
-  request: Request,
-  showPasswords: boolean,
-  isVariableUncovered: boolean,
-
-  // Optional
-  oAuth2Token: ?OAuth2Token,
-};
+interface Props {
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext
+  handleUpdateSettingsShowPasswords: (showPasswords: boolean) => Promise<Settings>;
+  nunjucksPowerUserMode: boolean;
+  onChange: (arg0: Request, arg1: RequestAuthentication) => Promise<Request>;
+  request: Request;
+  showPasswords: boolean;
+  isVariableUncovered: boolean;
+  oAuth2Token?: OAuth2Token | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class AuthWrapper extends React.PureComponent<Props> {
+class AuthWrapper extends PureComponent<Props> {
   renderEditor() {
     const {
       oAuth2Token,
@@ -57,7 +54,6 @@ class AuthWrapper extends React.PureComponent<Props> {
       showPasswords,
       isVariableUncovered,
     } = this.props;
-
     const { authentication } = request;
 
     if (authentication.type === AUTH_BASIC) {
@@ -177,7 +173,13 @@ class AuthWrapper extends React.PureComponent<Props> {
       return (
         <div className="vertically-center text-center">
           <p className="pad super-faint text-sm text-center">
-            <i className="fa fa-unlock-alt" style={{ fontSize: '8rem', opacity: 0.3 }} />
+            <i
+              className="fa fa-unlock-alt"
+              style={{
+                fontSize: '8rem',
+                opacity: 0.3,
+              }}
+            />
             <br />
             <br />
             Select an auth type from above
diff --git a/packages/insomnia-app/app/ui/components/editors/auth/aws-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/aws-auth.tsx
similarity index 86%
rename from packages/insomnia-app/app/ui/components/editors/auth/aws-auth.js
rename to packages/insomnia-app/app/ui/components/editors/auth/aws-auth.tsx
index e2fa496feb..b2f14649f3 100644
--- a/packages/insomnia-app/app/ui/components/editors/auth/aws-auth.js
+++ b/packages/insomnia-app/app/ui/components/editors/auth/aws-auth.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import classnames from 'classnames';
 import OneLineEditor from '../../codemirror/one-line-editor';
@@ -8,26 +7,24 @@ import HelpTooltip from '../../help-tooltip';
 import type { Request, RequestAuthentication } from '../../../../models/request';
 import type { Settings } from '../../../../models/settings';
 import { AUTOBIND_CFG } from '../../../../common/constants';
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
 
-type Props = {
-  request: Request,
-  nunjucksPowerUserMode: boolean,
-  showPasswords: boolean,
-  isVariableUncovered: boolean,
-  onChange: (Request, RequestAuthentication) => Promise<Request>,
-  handleRender: string => Promise<string>,
-  handleGetRenderContext: () => Promise<Object>,
-  handleUpdateSettingsShowPasswords: boolean => Promise<Settings>,
-};
+interface Props {
+  request: Request;
+  nunjucksPowerUserMode: boolean;
+  showPasswords: boolean;
+  isVariableUncovered: boolean;
+  onChange: (arg0: Request, arg1: RequestAuthentication) => Promise<Request>;
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  handleUpdateSettingsShowPasswords: (arg0: boolean) => Promise<Settings>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class AWSAuth extends React.PureComponent<Props> {
+class AWSAuth extends PureComponent<Props> {
   _handleDisable() {
     const { request, onChange } = this.props;
-    onChange(request, {
-      ...request.authentication,
-      disabled: !request.authentication.disabled,
-    });
+    onChange(request, { ...request.authentication, disabled: !request.authentication.disabled });
   }
 
   _handleChangeAccessKeyId(value: string) {
@@ -55,7 +52,7 @@ class AWSAuth extends React.PureComponent<Props> {
     onChange(request, { ...request.authentication, sessionToken: value });
   }
 
-  renderRow(key: string, label: string, onChange: Function, help?: string) {
+  renderRow(key: string, label: string, onChange: (...args: Array<any>) => any, help?: string) {
     const {
       request,
       nunjucksPowerUserMode,
@@ -63,7 +60,6 @@ class AWSAuth extends React.PureComponent<Props> {
       handleGetRenderContext,
       isVariableUncovered,
     } = this.props;
-
     return (
       <tr key={key}>
         <td className="pad-right no-wrap valign-middle">
diff --git a/packages/insomnia-app/app/ui/components/editors/auth/basic-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/basic-auth.tsx
similarity index 89%
rename from packages/insomnia-app/app/ui/components/editors/auth/basic-auth.js
rename to packages/insomnia-app/app/ui/components/editors/auth/basic-auth.tsx
index cc77a897ef..db5f15c779 100644
--- a/packages/insomnia-app/app/ui/components/editors/auth/basic-auth.js
+++ b/packages/insomnia-app/app/ui/components/editors/auth/basic-auth.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../../common/constants';
@@ -9,20 +8,21 @@ import Button from '../../base/button';
 import type { Settings } from '../../../../models/settings';
 import type { Request, RequestAuthentication } from '../../../../models/request';
 import HelpTooltip from '../../help-tooltip';
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
 
-type Props = {
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  handleUpdateSettingsShowPasswords: boolean => Promise<Settings>,
-  nunjucksPowerUserMode: boolean,
-  onChange: (Request, RequestAuthentication) => Promise<Request>,
-  request: Request,
-  showPasswords: boolean,
-  isVariableUncovered: boolean,
-};
+interface Props {
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  handleUpdateSettingsShowPasswords: (arg0: boolean) => Promise<Settings>;
+  nunjucksPowerUserMode: boolean;
+  onChange: (arg0: Request, arg1: RequestAuthentication) => Promise<Request>;
+  request: Request;
+  showPasswords: boolean;
+  isVariableUncovered: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class BasicAuth extends React.PureComponent<Props> {
+class BasicAuth extends PureComponent<Props> {
   _handleUseISO88591() {
     const { request, onChange } = this.props;
     onChange(request, {
@@ -33,10 +33,7 @@ class BasicAuth extends React.PureComponent<Props> {
 
   _handleDisable() {
     const { request, onChange } = this.props;
-    onChange(request, {
-      ...request.authentication,
-      disabled: !request.authentication.disabled,
-    });
+    onChange(request, { ...request.authentication, disabled: !request.authentication.disabled });
   }
 
   _handleChangeUsername(value: string) {
@@ -58,9 +55,7 @@ class BasicAuth extends React.PureComponent<Props> {
       nunjucksPowerUserMode,
       isVariableUncovered,
     } = this.props;
-
     const { authentication } = request;
-
     return (
       <div className="pad">
         <table>
diff --git a/packages/insomnia-app/app/ui/components/editors/auth/bearer-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/bearer-auth.tsx
similarity index 89%
rename from packages/insomnia-app/app/ui/components/editors/auth/bearer-auth.js
rename to packages/insomnia-app/app/ui/components/editors/auth/bearer-auth.tsx
index 43de85d6d9..35ffd35b88 100644
--- a/packages/insomnia-app/app/ui/components/editors/auth/bearer-auth.js
+++ b/packages/insomnia-app/app/ui/components/editors/auth/bearer-auth.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../../common/constants';
@@ -7,24 +6,22 @@ import OneLineEditor from '../../codemirror/one-line-editor';
 import Button from '../../base/button';
 import HelpTooltip from '../../help-tooltip';
 import type { Request, RequestAuthentication } from '../../../../models/request';
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
 
-type Props = {
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  nunjucksPowerUserMode: boolean,
-  request: Request,
-  onChange: (Request, RequestAuthentication) => Promise<Request>,
-  isVariableUncovered: boolean,
-};
+interface Props {
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  nunjucksPowerUserMode: boolean;
+  request: Request;
+  onChange: (arg0: Request, arg1: RequestAuthentication) => Promise<Request>;
+  isVariableUncovered: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class BearerAuth extends React.PureComponent<Props> {
+class BearerAuth extends PureComponent<Props> {
   _handleDisable() {
     const { request, onChange } = this.props;
-    onChange(request, {
-      ...request.authentication,
-      disabled: !request.authentication.disabled,
-    });
+    onChange(request, { ...request.authentication, disabled: !request.authentication.disabled });
   }
 
   _handleChangeToken(token: string) {
@@ -45,9 +42,7 @@ class BearerAuth extends React.PureComponent<Props> {
       nunjucksPowerUserMode,
       isVariableUncovered,
     } = this.props;
-
     const { authentication } = request;
-
     return (
       <div className="pad">
         <table>
diff --git a/packages/insomnia-app/app/ui/components/editors/auth/digest-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/digest-auth.tsx
similarity index 86%
rename from packages/insomnia-app/app/ui/components/editors/auth/digest-auth.js
rename to packages/insomnia-app/app/ui/components/editors/auth/digest-auth.tsx
index 10b566eeb1..9b5dfacd30 100644
--- a/packages/insomnia-app/app/ui/components/editors/auth/digest-auth.js
+++ b/packages/insomnia-app/app/ui/components/editors/auth/digest-auth.tsx
@@ -1,6 +1,4 @@
-// @flow
-
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../../common/constants';
@@ -9,26 +7,24 @@ import PasswordEditor from '../password-editor';
 import Button from '../../base/button';
 import type { Settings } from '../../../../models/settings';
 import type { Request, RequestAuthentication } from '../../../../models/request';
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
 
-type Props = {
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  handleUpdateSettingsShowPasswords: boolean => Promise<Settings>,
-  nunjucksPowerUserMode: boolean,
-  onChange: (Request, RequestAuthentication) => Promise<Request>,
-  request: Request,
-  showPasswords: boolean,
-  isVariableUncovered: boolean,
-};
+interface Props {
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  handleUpdateSettingsShowPasswords: (arg0: boolean) => Promise<Settings>;
+  nunjucksPowerUserMode: boolean;
+  onChange: (arg0: Request, arg1: RequestAuthentication) => Promise<Request>;
+  request: Request;
+  showPasswords: boolean;
+  isVariableUncovered: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class DigestAuth extends React.PureComponent<Props> {
+class DigestAuth extends PureComponent<Props> {
   _handleDisable() {
     const { request, onChange } = this.props;
-    onChange(request, {
-      ...request.authentication,
-      disabled: !request.authentication.disabled,
-    });
+    onChange(request, { ...request.authentication, disabled: !request.authentication.disabled });
   }
 
   _handleChangeUsername(value: string) {
@@ -50,9 +46,7 @@ class DigestAuth extends React.PureComponent<Props> {
       handleGetRenderContext,
       isVariableUncovered,
     } = this.props;
-
     const { authentication } = request;
-
     return (
       <div className="pad">
         <table>
diff --git a/packages/insomnia-app/app/ui/components/editors/auth/hawk-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/hawk-auth.tsx
similarity index 82%
rename from packages/insomnia-app/app/ui/components/editors/auth/hawk-auth.js
rename to packages/insomnia-app/app/ui/components/editors/auth/hawk-auth.tsx
index a1023f8572..aaff332d16 100644
--- a/packages/insomnia-app/app/ui/components/editors/auth/hawk-auth.js
+++ b/packages/insomnia-app/app/ui/components/editors/auth/hawk-auth.tsx
@@ -1,6 +1,4 @@
-// @flow
-
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import {
@@ -9,93 +7,95 @@ import {
   HAWK_ALGORITHM_SHA256,
 } from '../../../../common/constants';
 import OneLineEditor from '../../codemirror/one-line-editor';
-
 import HelpTooltip from '../../help-tooltip';
 import Button from '../../base/button';
 import type { Request, RequestAuthentication } from '../../../../models/request';
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
 
-type Props = {
-  request: Request,
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  nunjucksPowerUserMode: boolean,
-  isVariableUncovered: boolean,
-  onChange: (Request, RequestAuthentication) => Promise<Request>,
-};
+interface Props {
+  request: Request;
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  nunjucksPowerUserMode: boolean;
+  isVariableUncovered: boolean;
+  onChange: (arg0: Request, arg1: RequestAuthentication) => Promise<Request>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class HawkAuth extends React.PureComponent<Props> {
+class HawkAuth extends PureComponent<Props> {
   _handleDisable() {
     const { request, onChange } = this.props;
-    onChange(request, {
-      ...request.authentication,
-      disabled: !request.authentication.disabled,
-    });
+    onChange(request, { ...request.authentication, disabled: !request.authentication.disabled });
   }
 
-  _handleChangeProperty(property: string, value: string | boolean): void {
+  _handleChangeProperty(property: string, value: string | boolean) {
     const { request, onChange } = this.props;
     onChange(request, { ...request.authentication, [property]: value });
   }
 
-  _handleChangeHawkAuthId(value: string): void {
+  _handleChangeHawkAuthId(value: string) {
     this._handleChangeProperty('id', value);
   }
 
-  _handleChangeHawkAuthKey(value: string): void {
+  _handleChangeHawkAuthKey(value: string) {
     this._handleChangeProperty('key', value);
   }
 
-  _handleChangeAlgorithm(e: SyntheticEvent<HTMLSelectElement>): void {
+  _handleChangeAlgorithm(e: React.SyntheticEvent<HTMLSelectElement>) {
     this._handleChangeProperty('algorithm', e.currentTarget.value);
   }
 
-  _handleChangeExt(value: string): void {
+  _handleChangeExt(value: string) {
     this._handleChangeProperty('ext', value);
   }
 
-  _handleChangePayloadValidation(): void {
+  _handleChangePayloadValidation() {
     const { request } = this.props;
+
     this._handleChangeProperty('validatePayload', !request.authentication.validatePayload);
   }
 
-  renderHawkAuthenticationFields(): React.Node {
+  renderHawkAuthenticationFields() {
     const hawkAuthId = this.renderInputRow('Auth ID', 'id', this._handleChangeHawkAuthId);
-
     const hawkAuthKey = this.renderInputRow('Auth Key', 'key', this._handleChangeHawkAuthKey);
-
     const algorithm = this.renderSelectRow(
       'Algorithm',
       'algorithm',
       [
-        { name: HAWK_ALGORITHM_SHA256, value: HAWK_ALGORITHM_SHA256 },
-        { name: HAWK_ALGORITHM_SHA1, value: HAWK_ALGORITHM_SHA1 },
+        {
+          name: HAWK_ALGORITHM_SHA256,
+          value: HAWK_ALGORITHM_SHA256,
+        },
+        {
+          name: HAWK_ALGORITHM_SHA1,
+          value: HAWK_ALGORITHM_SHA1,
+        },
       ],
       this._handleChangeAlgorithm,
     );
-
     const ext = this.renderInputRow('Ext', 'ext', this._handleChangeExt);
-
     const payloadValidation = this.renderButtonRow(
       'Validate Payload',
+      // @ts-expect-error -- TSCONVERSION
       'validatePayload',
       this._handleChangePayloadValidation,
     );
-
     return [hawkAuthId, hawkAuthKey, algorithm, ext, payloadValidation];
   }
 
   renderSelectRow(
     label: string,
     property: string,
-    options: Array<{ name: string, value: string }>,
-    onChange: Function,
+    options: Array<{
+      name: string;
+      value: string;
+    }>,
+    onChange: (...args: Array<any>) => any,
     help: string | null = null,
-  ): React.Element<*> {
+  ) {
     const { authentication } = this.props.request;
     const id = label.replace(/ /g, '-');
     const value = authentication.hasOwnProperty(property) ? authentication[property] : options[0];
-
     return (
       <tr key={id}>
         <td className="pad-right no-wrap valign-middle">
@@ -122,7 +122,11 @@ class HawkAuth extends React.PureComponent<Props> {
     );
   }
 
-  renderInputRow(label: string, property: string, onChange: Function): React.Element<*> {
+  renderInputRow(
+    label: string,
+    property: string,
+    onChange: (...args: Array<any>) => any,
+  ) {
     const {
       handleRender,
       handleGetRenderContext,
@@ -130,9 +134,7 @@ class HawkAuth extends React.PureComponent<Props> {
       nunjucksPowerUserMode,
       isVariableUncovered,
     } = this.props;
-
     const { authentication } = request;
-
     const id = label.replace(/ /g, '-');
     return (
       <tr key={id}>
@@ -162,7 +164,7 @@ class HawkAuth extends React.PureComponent<Props> {
     );
   }
 
-  renderButtonRow(label: string, property: string, onChange: Function): React.Element<*> {
+  renderButtonRow(label: string) {
     const { request } = this.props;
     const { authentication } = request;
     const id = label.replace(/ /g, '-');
@@ -203,7 +205,6 @@ class HawkAuth extends React.PureComponent<Props> {
   render() {
     const fields = this.renderHawkAuthenticationFields();
     const { authentication } = this.props.request;
-
     return (
       <div className="pad">
         <table>
diff --git a/packages/insomnia-app/app/ui/components/editors/auth/netrc-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/netrc-auth.tsx
similarity index 100%
rename from packages/insomnia-app/app/ui/components/editors/auth/netrc-auth.js
rename to packages/insomnia-app/app/ui/components/editors/auth/netrc-auth.tsx
diff --git a/packages/insomnia-app/app/ui/components/editors/auth/ntlm-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/ntlm-auth.tsx
similarity index 86%
rename from packages/insomnia-app/app/ui/components/editors/auth/ntlm-auth.js
rename to packages/insomnia-app/app/ui/components/editors/auth/ntlm-auth.tsx
index a552165c8e..bcad984885 100644
--- a/packages/insomnia-app/app/ui/components/editors/auth/ntlm-auth.js
+++ b/packages/insomnia-app/app/ui/components/editors/auth/ntlm-auth.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../../common/constants';
@@ -8,26 +7,24 @@ import PasswordEditor from '../password-editor';
 import Button from '../../base/button';
 import type { Request, RequestAuthentication } from '../../../../models/request';
 import type { Settings } from '../../../../models/settings';
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
 
-type Props = {
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  handleUpdateSettingsShowPasswords: boolean => Promise<Settings>,
-  nunjucksPowerUserMode: boolean,
-  onChange: (Request, RequestAuthentication) => Promise<Request>,
-  request: Request,
-  showPasswords: boolean,
-  isVariableUncovered: boolean,
-};
+interface Props {
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  handleUpdateSettingsShowPasswords: (arg0: boolean) => Promise<Settings>;
+  nunjucksPowerUserMode: boolean;
+  onChange: (arg0: Request, arg1: RequestAuthentication) => Promise<Request>;
+  request: Request;
+  showPasswords: boolean;
+  isVariableUncovered: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class NTLMAuth extends React.PureComponent<Props> {
+class NTLMAuth extends PureComponent<Props> {
   _handleDisable() {
     const { request, onChange } = this.props;
-    onChange(request, {
-      ...request.authentication,
-      disabled: !request.authentication.disabled,
-    });
+    onChange(request, { ...request.authentication, disabled: !request.authentication.disabled });
   }
 
   _handleChangeUsername(value: string) {
@@ -49,9 +46,7 @@ class NTLMAuth extends React.PureComponent<Props> {
       nunjucksPowerUserMode,
       isVariableUncovered,
     } = this.props;
-
     const { authentication } = request;
-
     return (
       <div className="pad">
         <table>
diff --git a/packages/insomnia-app/app/ui/components/editors/auth/o-auth-1-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/o-auth-1-auth.tsx
similarity index 84%
rename from packages/insomnia-app/app/ui/components/editors/auth/o-auth-1-auth.js
rename to packages/insomnia-app/app/ui/components/editors/auth/o-auth-1-auth.tsx
index 2d70e6ebbc..9752aa36f6 100644
--- a/packages/insomnia-app/app/ui/components/editors/auth/o-auth-1-auth.js
+++ b/packages/insomnia-app/app/ui/components/editors/auth/o-auth-1-auth.tsx
@@ -1,6 +1,5 @@
-// @flow
 import type { Request, RequestAuthentication } from '../../../../models/request';
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../../common/constants';
@@ -15,16 +14,7 @@ import {
 import CodePromptModal from '../../modals/code-prompt-modal';
 import { showModal } from '../../modals';
 import Button from '../../base/button';
-
-type Props = {
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  nunjucksPowerUserMode: boolean,
-  showPasswords: boolean,
-  isVariableUncovered: boolean,
-  onChange: (Request, RequestAuthentication) => Promise<Request>,
-  request: Request,
-};
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
 
 const PRIVATE_KEY_PLACEHOLDER = `
 -----BEGIN RSA PRIVATE KEY-----
@@ -39,8 +29,18 @@ cJV+wRTs/Szp6LXAgMmTkKMJ+9XXErUIUgwbl27Y3Rv/9ox1p5VRg+A=
 -----END RSA PRIVATE KEY-----
 `.trim();
 
+interface Props {
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  nunjucksPowerUserMode: boolean;
+  showPasswords: boolean;
+  isVariableUncovered: boolean;
+  onChange: (arg0: Request, arg1: RequestAuthentication) => Promise<Request>;
+  request: Request;
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class OAuth1Auth extends React.PureComponent<Props> {
+class OAuth1Auth extends PureComponent<Props> {
   _handleEditPrivateKey() {
     const { handleRender, handleGetRenderContext, request } = this.props;
     const { privateKey } = request.authentication;
@@ -56,7 +56,7 @@ class OAuth1Auth extends React.PureComponent<Props> {
     });
   }
 
-  _handleChangeProperty(property: string, value: string | boolean): void {
+  _handleChangeProperty(property: string, value: string | boolean) {
     const { request } = this.props;
     const authentication = Object.assign({}, request.authentication, {
       [property]: value,
@@ -64,59 +64,59 @@ class OAuth1Auth extends React.PureComponent<Props> {
     this.props.onChange(request, authentication);
   }
 
-  _handleChangeConsumerKey(value: string): void {
+  _handleChangeConsumerKey(value: string) {
     this._handleChangeProperty('consumerKey', value);
   }
 
-  _handleChangeConsumerSecret(value: string): void {
+  _handleChangeConsumerSecret(value: string) {
     this._handleChangeProperty('consumerSecret', value);
   }
 
-  _handleChangeTokenKey(value: string): void {
+  _handleChangeTokenKey(value: string) {
     this._handleChangeProperty('tokenKey', value);
   }
 
-  _handleChangeTokenSecret(value: string): void {
+  _handleChangeTokenSecret(value: string) {
     this._handleChangeProperty('tokenSecret', value);
   }
 
-  _handleChangeRealm(value: string): void {
+  _handleChangeRealm(value: string) {
     this._handleChangeProperty('realm', value);
   }
 
-  _handleChangeCallback(value: string): void {
+  _handleChangeCallback(value: string) {
     this._handleChangeProperty('callback', value);
   }
 
-  _handleChangeNonce(value: string): void {
+  _handleChangeNonce(value: string) {
     this._handleChangeProperty('nonce', value);
   }
 
-  _handleChangeVerifier(value: string): void {
+  _handleChangeVerifier(value: string) {
     this._handleChangeProperty('verifier', value);
   }
 
-  _handleChangeTimestamp(value: string): void {
+  _handleChangeTimestamp(value: string) {
     this._handleChangeProperty('timestamp', value);
   }
 
-  _handleChangeSignatureMethod(e: SyntheticEvent<HTMLInputElement>): void {
+  _handleChangeSignatureMethod(e: React.SyntheticEvent<HTMLInputElement>) {
     this._handleChangeProperty('signatureMethod', e.currentTarget.value);
   }
 
-  _handleChangePrivateKey(value: string): void {
+  _handleChangePrivateKey(value: string) {
     this._handleChangeProperty('privateKey', value);
   }
 
-  _handleChangeIncludeBodyHash(value: boolean): void {
+  _handleChangeIncludeBodyHash(value: boolean) {
     this._handleChangeProperty('includeBodyHash', value);
   }
 
-  _handleChangeVersion(value: string): void {
+  _handleChangeVersion(value: string) {
     this._handleChangeProperty('version', value);
   }
 
-  _handleChangeEnabled(value: boolean): void {
+  _handleChangeEnabled(value: boolean) {
     this._handleChangeProperty('disabled', value);
   }
 
@@ -124,8 +124,8 @@ class OAuth1Auth extends React.PureComponent<Props> {
     label: string,
     property: string,
     help: string,
-    onChange: boolean => void,
-  ): React.Element<*> {
+    onChange: (arg0: boolean) => void,
+  ) {
     const { request } = this.props;
     const { authentication } = request;
     return (
@@ -155,7 +155,7 @@ class OAuth1Auth extends React.PureComponent<Props> {
     );
   }
 
-  renderEnabledRow(onChange: boolean => void): React.Element<*> {
+  renderEnabledRow(onChange: (arg0: boolean) => void) {
     const { request } = this.props;
     const { authentication } = request;
     return (
@@ -188,10 +188,10 @@ class OAuth1Auth extends React.PureComponent<Props> {
   renderInputRow(
     label: string,
     property: string,
-    onChange: Function,
+    onChange: (...args: Array<any>) => any,
     help: string | null = null,
-    handleAutocomplete: Function | null = null,
-  ): React.Element<*> {
+    handleAutocomplete: ((...args: Array<any>) => any) | null = null,
+  ) {
     const {
       handleRender,
       handleGetRenderContext,
@@ -235,17 +235,19 @@ class OAuth1Auth extends React.PureComponent<Props> {
   renderSelectRow(
     label: string,
     property: string,
-    options: Array<{ name: string, value: string }>,
-    onChange: Function,
+    options: Array<{
+      name: string;
+      value: string;
+    }>,
+    onChange: (...args: Array<any>) => any,
     help: string | null = null,
-  ): React.Element<*> {
+  ) {
     const { request } = this.props;
     const { authentication } = request;
     const id = label.replace(/ /g, '-');
     const value = request.authentication.hasOwnProperty(property)
       ? request.authentication[property]
       : options[0];
-
     return (
       <tr key={id}>
         <td className="pad-right no-wrap valign-middle">
@@ -272,7 +274,7 @@ class OAuth1Auth extends React.PureComponent<Props> {
     );
   }
 
-  renderPrivateKeyInput(label: string, property: string, onChange: Function): React.Element<*> {
+  renderPrivateKeyInput(label: string) {
     const id = label.replace(/ /g, '-');
     const { authentication } = this.props.request;
     return (
@@ -295,77 +297,78 @@ class OAuth1Auth extends React.PureComponent<Props> {
     );
   }
 
-  renderFields(): Array<React.Element<*>> {
+  renderFields() {
     const consumerKey = this.renderInputRow(
       'Consumer Key',
       'consumerKey',
       this._handleChangeConsumerKey,
     );
-
     const consumerSecret = this.renderInputRow(
       'Consumer Secret',
       'consumerSecret',
       this._handleChangeConsumerSecret,
     );
-
     const tokenKey = this.renderInputRow('Token', 'tokenKey', this._handleChangeTokenKey);
-
     const tokenSecret = this.renderInputRow(
       'Token Secret',
       'tokenSecret',
       this._handleChangeTokenSecret,
     );
-
     const callback = this.renderInputRow('Callback URL', 'callback', this._handleChangeCallback);
-
     const realm = this.renderInputRow(
       'Realm',
       'realm',
       this._handleChangeRealm,
       'Leave blank for default',
     );
-
     const nonce = this.renderInputRow(
       'Nonce',
       'nonce',
       this._handleChangeNonce,
       'Leave blank for default',
     );
-
     const verifier = this.renderInputRow(
       'Verifier',
       'verifier',
       this._handleChangeVerifier,
       'Leave blank for default',
     );
-
     const timestamp = this.renderInputRow(
       'Timestamp',
       'timestamp',
       this._handleChangeTimestamp,
       'Leave blank for default',
     );
-
     const signatureMethod = this.renderSelectRow(
       'Signature Method',
       'signatureMethod',
       [
-        { name: 'HMAC-SHA1', value: SIGNATURE_METHOD_HMAC_SHA1 },
-        { name: 'HMAC-SHA256', value: SIGNATURE_METHOD_HMAC_SHA256 },
-        { name: 'RSA-SHA1', value: SIGNATURE_METHOD_RSA_SHA1 },
-        { name: 'PLAINTEXT', value: SIGNATURE_METHOD_PLAINTEXT },
+        {
+          name: 'HMAC-SHA1',
+          value: SIGNATURE_METHOD_HMAC_SHA1,
+        },
+        {
+          name: 'HMAC-SHA256',
+          value: SIGNATURE_METHOD_HMAC_SHA256,
+        },
+        {
+          name: 'RSA-SHA1',
+          value: SIGNATURE_METHOD_RSA_SHA1,
+        },
+        {
+          name: 'PLAINTEXT',
+          value: SIGNATURE_METHOD_PLAINTEXT,
+        },
       ],
       this._handleChangeSignatureMethod,
     );
-
     const privateKey = this.renderPrivateKeyInput(
       'Private Key',
+      // @ts-expect-error -- TSCONVERSION
       'privateKey',
       this._handleChangePrivateKey,
     );
-
     const version = this.renderInputRow('Version', 'version', this._handleChangeVersion);
-
     const bodyHash = this.renderCheckbox(
       'Hash Body',
       'includeBodyHash',
@@ -373,9 +376,7 @@ class OAuth1Auth extends React.PureComponent<Props> {
         'oauth_body_hash property',
       this._handleChangeIncludeBodyHash,
     );
-
     const enabled = this.renderEnabledRow(this._handleChangeEnabled);
-
     const fields = [
       consumerKey,
       consumerSecret,
@@ -391,8 +392,8 @@ class OAuth1Auth extends React.PureComponent<Props> {
       bodyHash,
       enabled,
     ];
-
     const { authentication } = this.props.request;
+
     if (authentication.signatureMethod === SIGNATURE_METHOD_RSA_SHA1) {
       const i = fields.indexOf(signatureMethod);
       fields.splice(i + 1, 0, privateKey);
@@ -403,7 +404,6 @@ class OAuth1Auth extends React.PureComponent<Props> {
 
   render() {
     const fields = this.renderFields();
-
     return (
       <div className="pad">
         <table>
diff --git a/packages/insomnia-app/app/ui/components/editors/auth/o-auth-2-auth.js b/packages/insomnia-app/app/ui/components/editors/auth/o-auth-2-auth.tsx
similarity index 82%
rename from packages/insomnia-app/app/ui/components/editors/auth/o-auth-2-auth.js
rename to packages/insomnia-app/app/ui/components/editors/auth/o-auth-2-auth.tsx
index 27f96b84e2..a1d8167b0d 100644
--- a/packages/insomnia-app/app/ui/components/editors/auth/o-auth-2-auth.js
+++ b/packages/insomnia-app/app/ui/components/editors/auth/o-auth-2-auth.tsx
@@ -1,8 +1,6 @@
-// @flow
 import type { Request, RequestAuthentication } from '../../../../models/request';
 import type { OAuth2Token } from '../../../../models/o-auth-2-token';
-
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../../common/constants';
@@ -30,56 +28,56 @@ import ResponseDebugModal from '../../modals/response-debug-modal';
 import type { Settings } from '../../../../models/settings';
 import { initNewOAuthSession } from '../../../../network/o-auth-2/misc';
 import { convertEpochToMilliseconds } from '../../../../common/misc';
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
 
-type Props = {
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  handleUpdateSettingsShowPasswords: boolean => Promise<Settings>,
-  nunjucksPowerUserMode: boolean,
-  onChange: (Request, RequestAuthentication) => Promise<Request>,
-  request: Request,
-  showPasswords: boolean,
-  isVariableUncovered: boolean,
+interface Props {
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  handleUpdateSettingsShowPasswords: (arg0: boolean) => Promise<Settings>;
+  nunjucksPowerUserMode: boolean;
+  onChange: (arg0: Request, arg1: RequestAuthentication) => Promise<Request>;
+  request: Request;
+  showPasswords: boolean;
+  isVariableUncovered: boolean;
+  oAuth2Token?: OAuth2Token | null;
+}
 
-  // Optional
-  oAuth2Token: ?OAuth2Token,
-};
-
-type State = {
-  error: string,
-  loading: boolean,
-  showAdvanced: boolean,
-};
+interface State {
+  error: string;
+  loading: boolean;
+  showAdvanced: boolean;
+}
 
 const getAuthorizationUrls = () => authorizationUrls;
+
 const getAccessTokenUrls = () => accessTokenUrls;
 
 let showAdvanced = false;
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class OAuth2Auth extends React.PureComponent<Props, State> {
-  constructor(props: any) {
-    super(props);
-
-    this.state = {
-      error: '',
-      loading: false,
-      showAdvanced: showAdvanced, // Remember from last time
-    };
+class OAuth2Auth extends PureComponent<Props, State> {
+  state: State = {
+    error: '',
+    loading: false,
+    showAdvanced, // Remember from last time
   }
 
-  _handleToggleAdvanced(): void {
+  _handleToggleAdvanced() {
     // Remember this for the entirety of the session
     showAdvanced = !this.state.showAdvanced;
-    this.setState({ showAdvanced });
+    this.setState({
+      showAdvanced,
+    });
   }
 
-  async _handleUpdateAccessToken(e: SyntheticEvent<HTMLInputElement>): Promise<void> {
+  async _handleUpdateAccessToken(e: React.SyntheticEvent<HTMLInputElement>) {
     const { oAuth2Token } = this.props;
     const accessToken = e.currentTarget.value;
 
     if (oAuth2Token) {
-      await models.oAuth2Token.update(oAuth2Token, { accessToken });
+      await models.oAuth2Token.update(oAuth2Token, {
+        accessToken,
+      });
     } else {
       await models.oAuth2Token.create({
         accessToken,
@@ -88,12 +86,14 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
     }
   }
 
-  async _handleUpdateIdentityToken(e: SyntheticEvent<HTMLInputElement>): Promise<void> {
+  async _handleUpdateIdentityToken(e: React.SyntheticEvent<HTMLInputElement>) {
     const { oAuth2Token } = this.props;
     const identityToken = e.currentTarget.value;
 
     if (oAuth2Token) {
-      await models.oAuth2Token.update(oAuth2Token, { identityToken });
+      await models.oAuth2Token.update(oAuth2Token, {
+        identityToken,
+      });
     } else {
       await models.oAuth2Token.create({
         identityToken,
@@ -102,12 +102,14 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
     }
   }
 
-  async _handleUpdateRefreshToken(e: SyntheticEvent<HTMLInputElement>): Promise<void> {
+  async _handleUpdateRefreshToken(e: React.SyntheticEvent<HTMLInputElement>) {
     const { oAuth2Token } = this.props;
     const refreshToken = e.currentTarget.value;
 
     if (oAuth2Token) {
-      await models.oAuth2Token.update(oAuth2Token, { refreshToken });
+      await models.oAuth2Token.update(oAuth2Token, {
+        refreshToken,
+      });
     } else {
       await models.oAuth2Token.create({
         refreshToken,
@@ -116,117 +118,127 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
     }
   }
 
-  async _handleClearTokens(): Promise<void> {
+  async _handleClearTokens() {
     const oAuth2Token = await models.oAuth2Token.getByParentId(this.props.request._id);
+
     if (oAuth2Token) {
       await models.oAuth2Token.remove(oAuth2Token);
     }
   }
 
-  _handleDebugResponseClick(responseId: string) {
+  _handleDebugResponseClick() {
     const { oAuth2Token } = this.props;
 
     if (!oAuth2Token || !oAuth2Token.xResponseId) {
       return;
     }
 
-    showModal(ResponseDebugModal, { responseId: oAuth2Token.xResponseId });
+    showModal(ResponseDebugModal, {
+      responseId: oAuth2Token.xResponseId,
+    });
   }
 
-  async _handleRefreshToken(): Promise<void> {
+  async _handleRefreshToken() {
     // First, clear the state and the current tokens
-    this.setState({ error: '', loading: true });
-
+    this.setState({
+      error: '',
+      loading: true,
+    });
     const { request } = this.props;
 
     try {
       const authentication = await this.props.handleRender(request.authentication);
       await getAccessToken(request._id, authentication, true);
-      this.setState({ loading: false });
+      this.setState({
+        loading: false,
+      });
     } catch (err) {
       await this._handleClearTokens(); // Clear existing tokens if there's an error
-      this.setState({ error: err.message, loading: false });
+
+      this.setState({
+        error: err.message,
+        loading: false,
+      });
     }
   }
 
-  _handleChangeProperty(property: string, value: string | boolean): void {
+  _handleChangeProperty(property: string, value: string | boolean) {
     const { onChange, request } = this.props;
     const authentication = Object.assign({}, request.authentication, {
       [property]: value,
     });
-
     onChange(request, authentication);
   }
 
-  _handlerChangeResponseType(e: SyntheticEvent<HTMLInputElement>): void {
+  _handlerChangeResponseType(e: React.SyntheticEvent<HTMLInputElement>) {
     this._handleChangeProperty('responseType', e.currentTarget.value);
   }
 
-  _handleChangeClientId(value: string): void {
+  _handleChangeClientId(value: string) {
     this._handleChangeProperty('clientId', value);
   }
 
-  _handleChangeCredentialsInBody(e: SyntheticEvent<HTMLInputElement>): void {
+  _handleChangeCredentialsInBody(e: React.SyntheticEvent<HTMLInputElement>) {
     this._handleChangeProperty('credentialsInBody', e.currentTarget.value === 'true');
   }
 
-  _handleChangeEnabled(value: boolean): void {
+  _handleChangeEnabled(value: boolean) {
     this._handleChangeProperty('disabled', value);
   }
 
-  _handleChangeClientSecret(value: string): void {
+  _handleChangeClientSecret(value: string) {
     this._handleChangeProperty('clientSecret', value);
   }
 
-  _handleChangePkce(value: boolean): void {
+  _handleChangePkce(value: boolean) {
     this._handleChangeProperty('usePkce', value);
   }
 
-  _handleChangeAuthorizationUrl(value: string): void {
+  _handleChangeAuthorizationUrl(value: string) {
     this._handleChangeProperty('authorizationUrl', value);
   }
 
-  _handleChangeAccessTokenUrl(value: string): void {
+  _handleChangeAccessTokenUrl(value: string) {
     this._handleChangeProperty('accessTokenUrl', value);
   }
 
-  _handleChangeRedirectUrl(value: string): void {
+  _handleChangeRedirectUrl(value: string) {
     this._handleChangeProperty('redirectUrl', value);
   }
 
-  _handleChangeScope(value: string): void {
+  _handleChangeScope(value: string) {
     this._handleChangeProperty('scope', value);
   }
 
-  _handleChangeState(value: string): void {
+  _handleChangeState(value: string) {
     this._handleChangeProperty('state', value);
   }
 
-  _handleChangeUsername(value: string): void {
+  _handleChangeUsername(value: string) {
     this._handleChangeProperty('username', value);
   }
 
-  _handleChangePassword(value: string): void {
+  _handleChangePassword(value: string) {
     this._handleChangeProperty('password', value);
   }
 
-  _handleChangeTokenPrefix(value: string): void {
+  _handleChangeTokenPrefix(value: string) {
     this._handleChangeProperty('tokenPrefix', value);
   }
 
-  _handleChangeAudience(value: string): void {
+  _handleChangeAudience(value: string) {
     this._handleChangeProperty('audience', value);
   }
 
-  _handleChangeResource(value: string): void {
+  _handleChangeResource(value: string) {
     this._handleChangeProperty('resource', value);
   }
 
-  _handleChangeGrantType(e: SyntheticEvent<HTMLInputElement>): void {
+  _handleChangeGrantType(e: React.SyntheticEvent<HTMLInputElement>) {
     this._handleChangeProperty('grantType', e.currentTarget.value);
   }
 
-  renderEnabledRow(onChange: boolean => void): React.Element<*> {
+  renderEnabledRow(onChange: (arg0: boolean) => void) {
     const { request } = this.props;
     const { authentication } = request;
     return (
@@ -256,7 +268,7 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
     );
   }
 
-  renderUsePkceRow(onChange: boolean => void): React.Element<*> {
+  renderUsePkceRow(onChange: (arg0: boolean) => void) {
     const { request } = this.props;
     const { authentication } = request;
     return (
@@ -289,10 +301,10 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
   renderInputRow(
     label: string,
     property: string,
-    onChange: Function,
+    onChange: (...args: Array<any>) => any,
     help: string | null = null,
-    handleAutocomplete: Function | null = null,
-  ): React.Element<*> {
+    handleAutocomplete: ((...args: Array<any>) => any) | null = null,
+  ) {
     const {
       handleRender,
       handleGetRenderContext,
@@ -336,17 +348,19 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
   renderSelectRow(
     label: string,
     property: string,
-    options: Array<{ name: string, value: string }>,
-    onChange: Function,
+    options: Array<{
+      name: string;
+      value: string;
+    }>,
+    onChange: (...args: Array<any>) => any,
     help: string | null = null,
-  ): React.Element<*> {
+  ) {
     const { request } = this.props;
     const { authentication } = request;
     const id = label.replace(/ /g, '-');
     const value = request.authentication.hasOwnProperty(property)
       ? request.authentication[property]
       : options[0];
-
     return (
       <tr key={id}>
         <td className="pad-right no-wrap valign-middle">
@@ -373,22 +387,16 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
     );
   }
 
-  renderGrantTypeFields(
-    grantType: string,
-  ): { basic: Array<React.Element<*>>, advanced: Array<React.Element<*>> } {
-    let basicFields = [];
-    let advancedFields = [];
-
+  renderGrantTypeFields(grantType: string) {
+    let basicFields: Array<JSX.Element> = [];
+    let advancedFields: Array<JSX.Element> = [];
     const clientId = this.renderInputRow('Client ID', 'clientId', this._handleChangeClientId);
-
     const clientSecret = this.renderInputRow(
       'Client Secret',
       'clientSecret',
       this._handleChangeClientSecret,
     );
-
     const usePkce = this.renderUsePkceRow(this._handleChangePkce);
-
     const authorizationUrl = this.renderInputRow(
       'Authorization URL',
       'authorizationUrl',
@@ -396,7 +404,6 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
       null,
       getAuthorizationUrls,
     );
-
     const accessTokenUrl = this.renderInputRow(
       'Access Token URL',
       'accessTokenUrl',
@@ -404,7 +411,6 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
       null,
       getAccessTokenUrls,
     );
-
     const redirectUri = this.renderInputRow(
       'Redirect URL',
       'redirectUrl',
@@ -413,15 +419,10 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
         'detect a redirect in the client browser window and extract the code from the ' +
         'redirected URL',
     );
-
     const state = this.renderInputRow('State', 'state', this._handleChangeState);
-
     const scope = this.renderInputRow('Scope', 'scope', this._handleChangeScope);
-
     const username = this.renderInputRow('Username', 'username', this._handleChangeUsername);
-
     const password = this.renderInputRow('Password', 'password', this._handleChangePassword);
-
     const tokenPrefix = this.renderInputRow(
       'Header Prefix',
       'tokenPrefix',
@@ -429,44 +430,54 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
       'Change Authorization header prefix from "Bearer" to something else. Use "NO_PREFIX" to ' +
         'send raw token without prefix.',
     );
-
     const responseType = this.renderSelectRow(
       'Response Type',
       'responseType',
       [
-        { name: 'Access Token', value: RESPONSE_TYPE_TOKEN },
-        { name: 'ID Token', value: RESPONSE_TYPE_ID_TOKEN },
-        { name: 'ID and Access Token', value: RESPONSE_TYPE_ID_TOKEN_TOKEN },
+        {
+          name: 'Access Token',
+          value: RESPONSE_TYPE_TOKEN,
+        },
+        {
+          name: 'ID Token',
+          value: RESPONSE_TYPE_ID_TOKEN,
+        },
+        {
+          name: 'ID and Access Token',
+          value: RESPONSE_TYPE_ID_TOKEN_TOKEN,
+        },
       ],
       this._handlerChangeResponseType,
       'Indicates the type of credentials returned in the response',
     );
-
     const audience = this.renderInputRow(
       'Audience',
       'audience',
       this._handleChangeAudience,
       'Indicate what resource server to access',
     );
-
     const resource = this.renderInputRow(
       'Resource',
       'resource',
       this._handleChangeResource,
       'Indicate what resource to access',
     );
-
     const credentialsInBody = this.renderSelectRow(
       'Credentials',
       'credentialsInBody',
       [
-        { name: 'As Basic Auth Header (default)', value: 'false' },
-        { name: 'In Request Body', value: 'true' },
+        {
+          name: 'As Basic Auth Header (default)',
+          value: 'false',
+        },
+        {
+          name: 'In Request Body',
+          value: 'true',
+        },
       ],
       this._handleChangeCredentialsInBody,
       'Whether or not to send credentials as Basic Auth, or as plain text in the request body',
     );
-
     const enabled = this.renderEnabledRow(this._handleChangeEnabled);
 
     if (grantType === GRANT_TYPE_AUTHORIZATION_CODE) {
@@ -479,40 +490,44 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
         redirectUri,
         enabled,
       ];
-
       advancedFields = [scope, state, credentialsInBody, tokenPrefix, audience, resource];
     } else if (grantType === GRANT_TYPE_CLIENT_CREDENTIALS) {
       basicFields = [accessTokenUrl, clientId, clientSecret, enabled];
-
       advancedFields = [scope, credentialsInBody, tokenPrefix, audience, resource];
     } else if (grantType === GRANT_TYPE_PASSWORD) {
       basicFields = [username, password, accessTokenUrl, clientId, clientSecret, enabled];
-
       advancedFields = [scope, credentialsInBody, tokenPrefix, audience];
     } else if (grantType === GRANT_TYPE_IMPLICIT) {
       basicFields = [authorizationUrl, clientId, redirectUri, enabled];
-
       advancedFields = [responseType, scope, state, tokenPrefix, audience];
     }
 
-    return { basic: basicFields, advanced: advancedFields };
+    return {
+      basic: basicFields,
+      advanced: advancedFields,
+    };
   }
 
-  static renderIdentityTokenExpiry(token: ?OAuth2Token): React.Element<*> | string | null {
+  static renderIdentityTokenExpiry(token?: OAuth2Token | null) {
     if (!token || !token.identityToken) {
       return null;
     }
+
     const base64Url = token.identityToken.split('.')[1];
     let decodedString = '';
+
     try {
       decodedString = window.atob(base64Url);
     } catch (error) {
       return null;
     }
+
     const { exp } = JSON.parse(decodedString);
+
     if (!exp) {
       return '(never expires)';
     }
+
     const convertedExp = convertEpochToMilliseconds(exp);
     return (
       <span>
@@ -522,7 +537,7 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
     );
   }
 
-  static renderAccessTokenExpiry(token: ?OAuth2Token): React.Element<*> | string | null {
+  static renderAccessTokenExpiry(token?: OAuth2Token | null) {
     if (!token || !token.accessToken) {
       return null;
     }
@@ -530,6 +545,7 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
     if (!token.expiresAt) {
       return '(never expires)';
     }
+
     return (
       <span>
         &#x28;expires <TimeFromNow timestamp={token.expiresAt} />
@@ -540,7 +556,6 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
 
   renderError() {
     const { oAuth2Token } = this.props;
-
     const debugButton =
       oAuth2Token && oAuth2Token.xResponseId ? (
         <button
@@ -550,14 +565,12 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
           <i className="fa fa-bug" />
         </button>
       ) : null;
-
     const errorUriButton =
       oAuth2Token && oAuth2Token.errorUri ? (
         <Link href={oAuth2Token.errorUri} title={oAuth2Token.errorUri} className="space-left icon">
           <i className="fa fa-question-circle" />
         </Link>
       ) : null;
-
     const error = oAuth2Token ? oAuth2Token.error || oAuth2Token.xError : null;
 
     if (oAuth2Token && error) {
@@ -573,16 +586,15 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
         </div>
       );
     }
+    return undefined;
   }
 
   render() {
     const { request, oAuth2Token: tok } = this.props;
     const { loading, error, showAdvanced } = this.state;
-
     const accessExpireLabel = OAuth2Auth.renderAccessTokenExpiry(tok);
     const identityExpireLabel = OAuth2Auth.renderIdentityTokenExpiry(tok);
     const fields = this.renderGrantTypeFields(request.authentication.grantType);
-
     return (
       <div className="pad">
         <table>
@@ -595,7 +607,10 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
                   name: 'Authorization Code',
                   value: GRANT_TYPE_AUTHORIZATION_CODE,
                 },
-                { name: 'Implicit', value: GRANT_TYPE_IMPLICIT },
+                {
+                  name: 'Implicit',
+                  value: GRANT_TYPE_IMPLICIT,
+                },
                 {
                   name: 'Resource Owner Password Credentials',
                   value: GRANT_TYPE_PASSWORD,
@@ -612,7 +627,9 @@ class OAuth2Auth extends React.PureComponent<Props, State> {
               <td className="pad-top">
                 <button onClick={this._handleToggleAdvanced} className="faint">
                   <i
-                    style={{ minWidth: '0.8rem' }}
+                    style={{
+                      minWidth: '0.8rem',
+                    }}
                     className={classnames(
                       'fa fa--skinny',
                       `fa-caret-${showAdvanced ? 'down' : 'right'}`,
diff --git a/packages/insomnia-app/app/ui/components/editors/body/body-editor.js b/packages/insomnia-app/app/ui/components/editors/body/body-editor.tsx
similarity index 86%
rename from packages/insomnia-app/app/ui/components/editors/body/body-editor.js
rename to packages/insomnia-app/app/ui/components/editors/body/body-editor.tsx
index 70d224ab60..4cf75366ad 100644
--- a/packages/insomnia-app/app/ui/components/editors/body/body-editor.js
+++ b/packages/insomnia-app/app/ui/components/editors/body/body-editor.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import * as mimes from 'mime-types';
 import clone from 'clone';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
@@ -33,29 +32,27 @@ import type { Settings } from '../../../../models/settings';
 import type { Workspace } from '../../../../models/workspace';
 import { showModal } from '../../modals/index';
 import AskModal from '../../modals/ask-modal';
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
 
-type Props = {
-  // Required
-  onChange: (r: Request, body: RequestBody) => Promise<Request>,
-  onChangeHeaders: (r: Request, headers: Array<RequestHeader>) => Promise<Request>,
-  handleUpdateRequestMimeType: (r: Request, mimeType: string) => Promise<Request>,
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  request: Request,
-  workspace: Workspace,
-  settings: Settings,
-  environmentId: string,
-  isVariableUncovered: boolean,
-};
+interface Props {
+  onChange: (r: Request, body: RequestBody) => Promise<Request>;
+  onChangeHeaders: (r: Request, headers: Array<RequestHeader>) => Promise<Request>;
+  handleUpdateRequestMimeType: (mimeType: string | null) => Promise<Request | null>;
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  request: Request;
+  workspace: Workspace;
+  settings: Settings;
+  environmentId: string;
+  isVariableUncovered: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class BodyEditor extends React.PureComponent<Props> {
+class BodyEditor extends PureComponent<Props> {
   _handleRawChange(rawValue: string) {
     const { onChange, request } = this.props;
-
     const oldContentType = request.body.mimeType || '';
     const newBody = newBodyRaw(rawValue, oldContentType);
-
     onChange(request, newBody);
   }
 
@@ -80,20 +77,22 @@ class BodyEditor extends React.PureComponent<Props> {
   async _handleFileChange(path: string) {
     const { onChange, onChangeHeaders, request } = this.props;
     const headers = clone(request.headers);
-
     const newBody = newBodyFile(path);
-
     const newRequest = await onChange(request, newBody);
     let contentTypeHeader = getContentTypeHeader(headers);
 
     if (!contentTypeHeader) {
-      contentTypeHeader = { name: 'Content-Type', value: CONTENT_TYPE_FILE };
+      contentTypeHeader = {
+        name: 'Content-Type',
+        value: CONTENT_TYPE_FILE,
+      };
       headers.push(contentTypeHeader);
     }
 
     // Update Content-Type header if the user wants
     const contentType = contentTypeHeader.value;
     const newContentType = mimes.lookup(path) || CONTENT_TYPE_FILE;
+
     if (contentType !== newContentType && path) {
       contentTypeHeader.value = newContentType;
       showModal(AskModal, {
@@ -123,13 +122,10 @@ class BodyEditor extends React.PureComponent<Props> {
       handleGetRenderContext: getRenderContext,
       isVariableUncovered,
     } = this.props;
-
     const noRender = request.settingDisableRenderRequestBody;
-    const handleRender = noRender ? null : render;
-    const handleGetRenderContext = noRender ? null : getRenderContext;
-
+    const handleRender = noRender ? undefined : render;
+    const handleGetRenderContext = noRender ? undefined : getRenderContext;
     const uniqueKey = `${request._id}::${noRender ? 'no-render' : 'render'}`;
-
     const fileName = request.body.fileName;
     const mimeType = request.body.mimeType;
     const isBodyEmpty = typeof mimeType !== 'string' && !request.body.text;
@@ -172,7 +168,6 @@ class BodyEditor extends React.PureComponent<Props> {
           settings={settings}
           environmentId={environmentId}
           getRenderContext={handleGetRenderContext}
-          nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
           isVariableUncovered={isVariableUncovered}
           onChange={this._handleGraphQLChange}
         />
@@ -200,7 +195,13 @@ class BodyEditor extends React.PureComponent<Props> {
       return (
         <div className="overflow-hidden editor vertically-center text-center">
           <p className="pad super-faint text-sm text-center">
-            <i className="fa fa-hand-peace-o" style={{ fontSize: '8rem', opacity: 0.3 }} />
+            <i
+              className="fa fa-hand-peace-o"
+              style={{
+                fontSize: '8rem',
+                opacity: 0.3,
+              }}
+            />
             <br />
             <br />
             Select a body type from above
diff --git a/packages/insomnia-app/app/ui/components/editors/body/file-editor.js b/packages/insomnia-app/app/ui/components/editors/body/file-editor.tsx
similarity index 90%
rename from packages/insomnia-app/app/ui/components/editors/body/file-editor.js
rename to packages/insomnia-app/app/ui/components/editors/body/file-editor.tsx
index 8ecfad7298..585c5a0edc 100644
--- a/packages/insomnia-app/app/ui/components/editors/body/file-editor.js
+++ b/packages/insomnia-app/app/ui/components/editors/body/file-editor.tsx
@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../../common/constants';
 import fs from 'fs';
@@ -8,24 +7,28 @@ import FileInputButton from '../../base/file-input-button';
 import PromptButton from '../../base/prompt-button';
 import * as misc from '../../../../common/misc';
 
+interface Props {
+  onChange: (path: string) => void;
+  path: string;
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class FileEditor extends PureComponent {
+class FileEditor extends PureComponent<Props> {
   _handleResetFile() {
     this.props.onChange('');
   }
 
-  _handleChooseFile(path) {
+  _handleChooseFile(path: string) {
     this.props.onChange(path);
   }
 
   render() {
     const { path } = this.props;
-
     // Replace home path with ~/ to make the path shorter
     const homeDirectory = electron.remote.app.getPath('home');
     const pathDescription = path.replace(homeDirectory, '~');
-
     let sizeDescription = '';
+
     try {
       const bytes = fs.statSync(path).size;
       sizeDescription = misc.describeByteSize(bytes);
@@ -67,9 +70,4 @@ class FileEditor extends PureComponent {
   }
 }
 
-FileEditor.propTypes = {
-  onChange: PropTypes.func.isRequired,
-  path: PropTypes.string.isRequired,
-};
-
 export default FileEditor;
diff --git a/packages/insomnia-app/app/ui/components/editors/body/form-editor.js b/packages/insomnia-app/app/ui/components/editors/body/form-editor.tsx
similarity index 73%
rename from packages/insomnia-app/app/ui/components/editors/body/form-editor.js
rename to packages/insomnia-app/app/ui/components/editors/body/form-editor.tsx
index bd7fc7b6fc..e9d8f14eae 100644
--- a/packages/insomnia-app/app/ui/components/editors/body/form-editor.js
+++ b/packages/insomnia-app/app/ui/components/editors/body/form-editor.tsx
@@ -1,11 +1,20 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../../common/constants';
 import KeyValueEditor from '../../key-value-editor/editor';
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
+
+interface Props {
+  onChange: Function,
+  parameters: Array<any>,
+  nunjucksPowerUserMode: boolean,
+  isVariableUncovered: boolean,
+  handleRender?: HandleRender,
+  handleGetRenderContext?: HandleGetRenderContext,
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class FormEditor extends PureComponent {
+class FormEditor extends PureComponent<Props> {
   render() {
     const {
       parameters,
@@ -15,7 +24,6 @@ class FormEditor extends PureComponent {
       nunjucksPowerUserMode,
       isVariableUncovered,
     } = this.props;
-
     return (
       <div className="scrollable-container tall wide">
         <div className="scrollable">
@@ -39,16 +47,4 @@ class FormEditor extends PureComponent {
   }
 }
 
-FormEditor.propTypes = {
-  // Required
-  onChange: PropTypes.func.isRequired,
-  parameters: PropTypes.arrayOf(PropTypes.object).isRequired,
-  nunjucksPowerUserMode: PropTypes.bool.isRequired,
-  isVariableUncovered: PropTypes.bool.isRequired,
-
-  // Optional
-  handleRender: PropTypes.func,
-  handleGetRenderContext: PropTypes.func,
-};
-
 export default FormEditor;
diff --git a/packages/insomnia-app/app/ui/components/editors/body/graph-ql-editor.js b/packages/insomnia-app/app/ui/components/editors/body/graph-ql-editor.tsx
similarity index 81%
rename from packages/insomnia-app/app/ui/components/editors/body/graph-ql-editor.js
rename to packages/insomnia-app/app/ui/components/editors/body/graph-ql-editor.tsx
index 04c4d4470b..00e9ed8fdf 100644
--- a/packages/insomnia-app/app/ui/components/editors/body/graph-ql-editor.js
+++ b/packages/insomnia-app/app/ui/components/editors/body/graph-ql-editor.tsx
@@ -1,26 +1,25 @@
-// @flow
 import classnames from 'classnames';
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
+import React, { PureComponent } from 'react';
+import ReactDOM from 'react-dom';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { markdownToHTML } from '../../../../common/markdown-to-html';
 import type { GraphQLArgument, GraphQLField, GraphQLSchema, GraphQLType } from 'graphql';
 import { parse, print, typeFromAST } from 'graphql';
 import { introspectionQuery } from 'graphql/utilities/introspectionQuery';
 import { buildClientSchema } from 'graphql/utilities/buildClientSchema';
-import type { CodeMirror, TextMarker } from 'codemirror';
+// import type { CodeMirror, TextMarker } from 'codemirror';
 import CodeEditor from '../../codemirror/code-editor';
 import { jsonParseOr } from '../../../../common/misc';
 import HelpTooltip from '../../help-tooltip';
 import { CONTENT_TYPE_JSON, DEBOUNCE_MILLIS, AUTOBIND_CFG } from '../../../../common/constants';
-import prettify from 'insomnia-prettify';
+import { json as jsonPrettify } from 'insomnia-prettify';
 import type { ResponsePatch } from '../../../../network/network';
 import * as network from '../../../../network/network';
 import type { Workspace } from '../../../../models/workspace';
 import type { Settings } from '../../../../models/settings';
 import TimeFromNow from '../../time-from-now';
 import * as models from '../../../../models/index';
-import * as db from '../../../../common/database';
+import { database as db } from '../../../../common/database';
 import { showModal } from '../../modals';
 import type { Request } from '../../../../models/request';
 import { newBodyRaw } from '../../../../models/request';
@@ -28,72 +27,73 @@ import ResponseDebugModal from '../../modals/response-debug-modal';
 import Tooltip from '../../tooltip';
 import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../../base/dropdown';
 import GraphqlExplorer from '../../graph-ql-explorer/graph-ql-explorer';
-
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
+import { EditorFromTextArea, TextMarker } from 'codemirror';
 const explorerContainer = document.querySelector('#graphql-explorer-container');
+
 if (!explorerContainer) {
   throw new Error('Failed to find #graphql-explorer-container');
 }
 
-type GraphQLBody = {
-  query: string,
-  variables?: Object,
-  operationName?: string,
-};
+interface GraphQLBody {
+  query: string;
+  variables?: Record<string, any>;
+  operationName?: string;
+}
 
-type Props = {
-  onChange: Function,
-  content: string,
-  render: Function | null,
-  getRenderContext: Function | null,
-  request: Request,
-  workspace: Workspace,
-  settings: Settings,
-  environmentId: string,
-  isVariableUncovered: boolean,
-  // Optional
-  className?: string,
-  uniquenessKey?: string,
-};
+interface ActiveReference {
+  type: GraphQLType | null;
+  argument: GraphQLArgument | null;
+  field: GraphQLField<any, any> | null;
+}
 
-type State = {
-  body: GraphQLBody,
-  schema: GraphQLSchema | null,
+interface Props {
+  onChange: Function;
+  content: string;
+  render?: HandleRender;
+  getRenderContext?: HandleGetRenderContext;
+  request: Request;
+  workspace: Workspace;
+  settings: Settings;
+  environmentId: string;
+  isVariableUncovered: boolean;
+  className?: string;
+  uniquenessKey?: string;
+}
+
+interface State {
+  body: GraphQLBody;
+  schema: GraphQLSchema | null;
   schemaFetchError: {
-    message: string,
-    response: ResponsePatch | null,
-  } | null,
-  schemaLastFetchTime: number,
-  schemaIsFetching: boolean,
-  hideSchemaFetchErrors: boolean,
-  variablesSyntaxError: string,
-  automaticFetch: boolean,
-  explorerVisible: boolean,
-  activeReference: null | {
-    type: GraphQLType | null,
-    argument: GraphQLArgument | null,
-    field: GraphQLField<any, any> | null,
-  },
-};
+    message: string;
+    response: ResponsePatch | null;
+  } | null;
+  schemaLastFetchTime: number;
+  schemaIsFetching: boolean;
+  hideSchemaFetchErrors: boolean;
+  variablesSyntaxError: string;
+  automaticFetch: boolean;
+  explorerVisible: boolean;
+  activeReference: null | ActiveReference;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class GraphQLEditor extends React.PureComponent<Props, State> {
-  _disabledOperationMarkers: Array<TextMarker>;
-  _documentAST: null | Object;
-  _isMounted: boolean;
-  _queryEditor: null | CodeMirror;
-  _schemaFetchTimeout: TimeoutID;
+class GraphQLEditor extends PureComponent<Props, State> {
+  _disabledOperationMarkers: Array<TextMarker> = [];
+  _documentAST: null | Record<string, any> = null;
+  _isMounted = false;
+  _queryEditor: null | EditorFromTextArea = null;
+  _schemaFetchTimeout: NodeJS.Timeout | null = null;
 
   constructor(props: Props) {
     super(props);
-    this._disabledOperationMarkers = [];
-    this._queryEditor = null;
-    this._isMounted = false;
 
     const body = GraphQLEditor._stringToGraphQL(props.content);
     this._setDocumentAST(body.query);
-
     let automaticFetch;
+
     try {
+      // @ts-expect-error -- TSCONVERSION don't parse if the read item is not defined
       automaticFetch = JSON.parse(window.localStorage.getItem('graphql.automaticFetch'));
     } catch (err) {
       automaticFetch = true;
@@ -126,11 +126,13 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
     }
 
     const operations = this._getOperations();
+
     const cursor = _queryEditor.getCursor();
+
     const cursorIndex = _queryEditor.indexFromPos(cursor);
 
-    let operationName = null;
-    const allOperationNames = [];
+    let operationName: string | null = null;
+    const allOperationNames: Array<string | null> = [];
 
     // Loop through all operations to see if one contains the cursor.
     for (let i = 0; i < operations.length; i++) {
@@ -141,8 +143,8 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
       }
 
       allOperationNames.push(operation.name.value);
-
       const { start, end } = operation.loc;
+
       if (start <= cursorIndex && end >= cursorIndex) {
         operationName = operation.name.value;
       }
@@ -160,12 +162,17 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
   }
 
   _handleCloseExplorer() {
-    this.setState({ explorerVisible: false });
+    this.setState({
+      explorerVisible: false,
+    });
   }
 
-  _handleClickReference(reference: Object, e: MouseEvent) {
-    e.preventDefault();
-    this.setState({ explorerVisible: true, activeReference: reference });
+  _handleClickReference(reference: ActiveReference, event: React.MouseEvent) {
+    event.preventDefault();
+    this.setState({
+      explorerVisible: true,
+      activeReference: reference,
+    });
   }
 
   _handleQueryFocus() {
@@ -176,6 +183,7 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
     const newOperationName = this._getCurrentOperation();
 
     const { query, variables, operationName } = this.state.body;
+
     if (newOperationName !== operationName) {
       this._handleBodyChange(query, variables, newOperationName);
     }
@@ -201,21 +209,21 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
     // Add "Unhighlight" markers
     this._disabledOperationMarkers = disabledDefinitions.map(definition => {
       const { startToken, endToken } = definition.loc;
-
       const from = {
         line: startToken.line - 1,
         ch: startToken.column - 1,
       };
-
       const to = {
         line: endToken.line,
         ch: endToken.column - 1,
       };
-
+      // @ts-expect-error - doc doesn't exist, use getDoc()
       return _queryEditor.doc.markText(from, to, {
         className: 'cm-gql-disabled',
       });
     });
+
+    return null;
   }
 
   _handleViewResponse() {
@@ -226,7 +234,6 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
     }
 
     const { response } = schemaFetchError;
-
     showModal(ResponseDebugModal, {
       title: 'GraphQL Introspection Response',
       response: response,
@@ -234,48 +241,50 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
   }
 
   _hideSchemaFetchError() {
-    this.setState({ hideSchemaFetchErrors: true });
+    this.setState({
+      hideSchemaFetchErrors: true,
+    });
   }
 
-  _handleQueryEditorInit(codeMirror: CodeMirror) {
+  _handleQueryEditorInit(codeMirror: EditorFromTextArea) {
     this._queryEditor = codeMirror;
+    // @ts-expect-error -- TSCONVERSION window.cm doesn't exist
     window.cm = this._queryEditor;
     const { query, variables, operationName } = this.state.body;
+
     this._handleBodyChange(query, variables, operationName);
   }
 
   async _fetchAndSetSchema(rawRequest: Request) {
-    this.setState({ schemaIsFetching: true });
-
+    this.setState({
+      schemaIsFetching: true,
+    });
     const { environmentId } = this.props;
-
     const newState = {
       schema: this.state.schema,
-      schemaFetchError: (null: any),
+      schemaFetchError: null as any,
       schemaLastFetchTime: this.state.schemaLastFetchTime,
       schemaIsFetching: false,
     };
-
     let responsePatch: ResponsePatch | null = null;
+
     try {
       const bodyJson = JSON.stringify({
         query: introspectionQuery,
         operationName: 'IntrospectionQuery',
       });
-
       const introspectionRequest = await db.upsert(
         Object.assign({}, rawRequest, {
           _id: rawRequest._id + '.graphql',
           settingMaxTimelineDataSize: 5000,
           parentId: rawRequest._id,
-          isPrivate: true, // So it doesn't get synced or exported
+          isPrivate: true,
+          // So it doesn't get synced or exported
           body: newBodyRaw(bodyJson, CONTENT_TYPE_JSON),
         }),
       );
-
       responsePatch = await network.send(introspectionRequest._id, environmentId);
       const bodyBuffer = models.response.getBodyBuffer(responsePatch);
-
       const status = typeof responsePatch.statusCode === 'number' ? responsePatch.statusCode : 0;
       const error = typeof responsePatch.error === 'string' ? responsePatch.error : '';
 
@@ -313,13 +322,16 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
     }
   }
 
-  _buildVariableTypes(schema: Object | null): { [string]: Object } | null {
+  _buildVariableTypes(
+    schema: Record<string, any> | null,
+  ): Record<string, Record<string, any>> | null {
     if (!schema) {
       return null;
     }
 
     const definitions = this._documentAST ? this._documentAST.definitions : [];
     const variableToType = {};
+
     for (const { kind, variableDefinitions } of definitions) {
       if (kind !== 'OperationDefinition') {
         continue;
@@ -330,13 +342,17 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
       }
 
       for (const { variable, type } of variableDefinitions) {
+        // @ts-expect-error -- TSCONVERSION
         const inputType = typeFromAST(schema, type);
+
         if (!inputType) {
           continue;
         }
+
         variableToType[variable.name.value] = inputType;
       }
     }
+
     return variableToType;
   }
 
@@ -349,14 +365,22 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
   _handleRefreshSchema() {
     // First, "forget" preference to hide errors so they always show
     // again after a refresh
-    this.setState({ hideSchemaFetchErrors: false }, async () => {
-      await this._fetchAndSetSchema(this.props.request);
-    });
+    this.setState(
+      {
+        hideSchemaFetchErrors: false,
+      },
+      async () => {
+        await this._fetchAndSetSchema(this.props.request);
+      },
+    );
   }
 
-  async _handleToggleAutomaticFetching(): Promise<void> {
+  async _handleToggleAutomaticFetching() {
     const automaticFetch = !this.state.automaticFetch;
-    this.setState({ automaticFetch });
+    this.setState({
+      automaticFetch,
+    });
+    // @ts-expect-error -- TSCONVERSION convert boolean to string when setting
     window.localStorage.setItem('graphql.automaticFetch', automaticFetch);
   }
 
@@ -364,7 +388,8 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
     const { body } = this.state;
     const { variables, query } = body;
     const prettyQuery = query && print(parse(query));
-    const prettyVariables = variables && JSON.parse(prettify.json(JSON.stringify(variables)));
+    const prettyVariables = variables && JSON.parse(jsonPrettify(JSON.stringify(variables)));
+
     this._handleBodyChange(prettyQuery, prettyVariables, this.state.body.operationName);
 
     // Update editor contents
@@ -389,10 +414,16 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
     }
   }
 
-  _handleBodyChange(query: string, variables: ?Object, operationName: ?string): void {
+  _handleBodyChange(
+    query: string,
+    variables?: Record<string, any> | null,
+    operationName?: string | null,
+  ) {
     this._setDocumentAST(query);
 
-    const body: GraphQLBody = { query };
+    const body: GraphQLBody = {
+      query,
+    };
 
     if (variables) {
       body.variables = variables;
@@ -405,6 +436,7 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
     // Find op if there isn't one yet
     if (!body.operationName) {
       const newOperationName = this._getCurrentOperation();
+
       if (newOperationName) {
         body.operationName = newOperationName;
       }
@@ -416,33 +448,39 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
       variablesSyntaxError: '',
       body,
     });
-
     this.props.onChange(newContent);
+
     this._highlightOperation(body.operationName || null);
   }
 
-  _handleQueryChange(query: string): void {
+  _handleQueryChange(query: string) {
     // Since we're editing the query, we may be changing the operation name, so
     // Don't pass it to the body change in order to automatically re-detect it
     // based on the current cursor position.
     this._handleBodyChange(query, this.state.body.variables, null);
   }
 
-  _handleVariablesChange(variables: string): void {
+  _handleVariablesChange(variables: string) {
     try {
       const variablesObj = JSON.parse(variables || 'null');
+
       this._handleBodyChange(this.state.body.query, variablesObj, this.state.body.operationName);
     } catch (err) {
-      this.setState({ variablesSyntaxError: err.message });
+      this.setState({
+        variablesSyntaxError: err.message,
+      });
     }
   }
 
   static _stringToGraphQL(text: string): GraphQLBody {
     let obj: GraphQLBody;
+
     try {
       obj = JSON.parse(text);
     } catch (err) {
-      obj = { query: '' };
+      obj = {
+        query: '',
+      };
     }
 
     if (typeof obj.variables === 'string') {
@@ -452,8 +490,9 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
     const query = obj.query || '';
     const variables = obj.variables || null;
     const operationName = obj.operationName || null;
-
-    const body: GraphQLBody = { query };
+    const body: GraphQLBody = {
+      query,
+    };
 
     if (variables) {
       body.variables = variables;
@@ -466,14 +505,16 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
     return body;
   }
 
-  static _graphQLToString(body: GraphQLBody): string {
+  static _graphQLToString(body: GraphQLBody) {
     return JSON.stringify(body);
   }
 
   // eslint-disable-next-line camelcase
   UNSAFE_componentWillReceiveProps(nextProps: Props) {
     if (this.state.automaticFetch && nextProps.request.url !== this.props.request.url) {
-      clearTimeout(this._schemaFetchTimeout);
+      if (this._schemaFetchTimeout !== null) {
+        clearTimeout(this._schemaFetchTimeout);
+      }
       this._schemaFetchTimeout = setTimeout(async () => {
         await this._fetchAndSetSchema(nextProps.request);
       }, 2000);
@@ -482,6 +523,7 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
 
   componentDidMount() {
     this._isMounted = true;
+
     (async () => {
       await this._fetchAndSetSchema(this.props.request);
     })();
@@ -489,11 +531,14 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
 
   componentWillUnmount() {
     this._isMounted = false;
-    clearTimeout(this._schemaFetchTimeout);
+    if (this._schemaFetchTimeout !== null) {
+      clearTimeout(this._schemaFetchTimeout);
+    }
   }
 
   renderSelectedOperationName() {
     const { operationName } = this.state.body;
+
     if (!operationName) {
       return null;
     } else {
@@ -504,6 +549,7 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
   renderSchemaFetchMessage() {
     let message;
     const { schemaLastFetchTime, schemaIsFetching } = this.state;
+
     if (schemaIsFetching) {
       message = 'fetching schema...';
     } else if (schemaLastFetchTime > 0) {
@@ -534,7 +580,6 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
       uniquenessKey,
       isVariableUncovered,
     } = this.props;
-
     const {
       schema,
       schemaFetchError,
@@ -549,7 +594,7 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
 
     const { query, variables: variablesObject } = GraphQLEditor._stringToGraphQL(content);
 
-    const variables = prettify.json(JSON.stringify(variablesObject));
+    const variables = jsonPrettify(JSON.stringify(variablesObject));
 
     const variableTypes = this._buildVariableTypes(schema);
 
@@ -562,9 +607,9 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
         reference={activeReference}
         handleClose={this._handleCloseExplorer}
       />,
+      // @ts-expect-error -- TSCONVERSION
       explorerContainer,
     );
-
     return (
       <div className="graphql-editor">
         <Dropdown right className="graphql-editor__schema-dropdown margin-bottom-xs">
@@ -607,7 +652,13 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
               schema: schema || null,
               onClick: this._handleClickReference,
             }}
-            lintOptions={schema ? { schema } : null}
+            lintOptions={
+              schema
+                ? {
+                    schema,
+                  }
+                : undefined
+            }
             fontSize={settings.editorFontSize}
             indentSize={settings.editorIndentSize}
             keyMap={settings.editorKeyMap}
@@ -668,7 +719,9 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
             render={render}
             getRenderContext={getRenderContext}
             getAutocompleteConstants={() => Object.keys(variableTypes || {})}
-            lintOptions={{ variableToType: variableTypes }}
+            lintOptions={{
+              variableToType: variableTypes,
+            }}
             noLint={!variableTypes}
             nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
             isVariableUncovered={isVariableUncovered}
diff --git a/packages/insomnia-app/app/ui/components/editors/body/raw-editor.js b/packages/insomnia-app/app/ui/components/editors/body/raw-editor.tsx
similarity index 57%
rename from packages/insomnia-app/app/ui/components/editors/body/raw-editor.js
rename to packages/insomnia-app/app/ui/components/editors/body/raw-editor.tsx
index e16841f6e9..625ab99f7d 100644
--- a/packages/insomnia-app/app/ui/components/editors/body/raw-editor.js
+++ b/packages/insomnia-app/app/ui/components/editors/body/raw-editor.tsx
@@ -1,11 +1,28 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { Fragment, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../../common/constants';
-import CodeEditor from '../../codemirror/code-editor';
+import CodeEditor, { CodeEditorOnChange } from '../../codemirror/code-editor';
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
+
+interface Props {
+  onChange: CodeEditorOnChange;
+  content: string;
+  contentType: string;
+  fontSize: number;
+  indentSize: number;
+  keyMap: string;
+  lineWrapping: boolean;
+  nunjucksPowerUserMode: boolean;
+  uniquenessKey: string;
+  isVariableUncovered: boolean;
+  className?: string;
+  render?: HandleRender;
+  getRenderContext?: HandleGetRenderContext;
+  indentWithTabs?: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class RawEditor extends PureComponent {
+class RawEditor extends PureComponent<Props> {
   render() {
     const {
       className,
@@ -23,9 +40,8 @@ class RawEditor extends PureComponent {
       render,
       uniquenessKey,
     } = this.props;
-
     return (
-      <React.Fragment>
+      <Fragment>
         <CodeEditor
           manualPrettify
           uniquenessKey={uniquenessKey}
@@ -44,29 +60,9 @@ class RawEditor extends PureComponent {
           lineWrapping={lineWrapping}
           placeholder="..."
         />
-      </React.Fragment>
+      </Fragment>
     );
   }
 }
 
-RawEditor.propTypes = {
-  // Required
-  onChange: PropTypes.func.isRequired,
-  content: PropTypes.string.isRequired,
-  contentType: PropTypes.string.isRequired,
-  fontSize: PropTypes.number.isRequired,
-  indentSize: PropTypes.number.isRequired,
-  keyMap: PropTypes.string.isRequired,
-  lineWrapping: PropTypes.bool.isRequired,
-  nunjucksPowerUserMode: PropTypes.bool.isRequired,
-  uniquenessKey: PropTypes.string.isRequired,
-  isVariableUncovered: PropTypes.bool.isRequired,
-
-  // Optional
-  className: PropTypes.string,
-  render: PropTypes.func,
-  getRenderContext: PropTypes.func,
-  indentWithTabs: PropTypes.bool,
-};
-
 export default RawEditor;
diff --git a/packages/insomnia-app/app/ui/components/editors/body/url-encoded-editor.js b/packages/insomnia-app/app/ui/components/editors/body/url-encoded-editor.tsx
similarity index 72%
rename from packages/insomnia-app/app/ui/components/editors/body/url-encoded-editor.js
rename to packages/insomnia-app/app/ui/components/editors/body/url-encoded-editor.tsx
index e0dc7ce8ed..b38a16eca4 100644
--- a/packages/insomnia-app/app/ui/components/editors/body/url-encoded-editor.js
+++ b/packages/insomnia-app/app/ui/components/editors/body/url-encoded-editor.tsx
@@ -1,11 +1,20 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../../common/constants';
 import KeyValueEditor from '../../key-value-editor/editor';
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
+
+interface Props {
+  onChange: Function;
+  parameters: Array<any>;
+  nunjucksPowerUserMode: boolean;
+  isVariableUncovered: boolean;
+  handleRender?: HandleRender;
+  handleGetRenderContext?: HandleGetRenderContext;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class UrlEncodedEditor extends PureComponent {
+class UrlEncodedEditor extends PureComponent<Props> {
   render() {
     const {
       parameters,
@@ -15,7 +24,6 @@ class UrlEncodedEditor extends PureComponent {
       nunjucksPowerUserMode,
       isVariableUncovered,
     } = this.props;
-
     return (
       <div className="scrollable-container tall wide">
         <div className="scrollable">
@@ -38,16 +46,4 @@ class UrlEncodedEditor extends PureComponent {
   }
 }
 
-UrlEncodedEditor.propTypes = {
-  // Required
-  onChange: PropTypes.func.isRequired,
-  parameters: PropTypes.arrayOf(PropTypes.object).isRequired,
-  nunjucksPowerUserMode: PropTypes.bool.isRequired,
-  isVariableUncovered: PropTypes.bool.isRequired,
-
-  // Optional
-  handleRender: PropTypes.func,
-  handleGetRenderContext: PropTypes.func,
-};
-
 export default UrlEncodedEditor;
diff --git a/packages/insomnia-app/app/ui/components/editors/environment-editor.js b/packages/insomnia-app/app/ui/components/editors/environment-editor.tsx
similarity index 77%
rename from packages/insomnia-app/app/ui/components/editors/environment-editor.js
rename to packages/insomnia-app/app/ui/components/editors/environment-editor.tsx
index 240a11ddc8..9837e69607 100644
--- a/packages/insomnia-app/app/ui/components/editors/environment-editor.js
+++ b/packages/insomnia-app/app/ui/components/editors/environment-editor.tsx
@@ -1,16 +1,12 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG, JSON_ORDER_PREFIX, JSON_ORDER_SEPARATOR } from '../../../common/constants';
 import CodeEditor from '../codemirror/code-editor';
 import orderedJSON from 'json-order';
-
 import { NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME } from '../../../templating';
-
 // NeDB field names cannot begin with '$' or contain a period '.'
 // Docs: https://github.com/DeNA/nedb#inserting-documents
 const INVALID_NEDB_KEY_REGEX = /^\$|\./;
-
 export const ensureKeyIsValid = (key: string): string | null => {
   if (key.match(INVALID_NEDB_KEY_REGEX)) {
     return `"${key}" cannot begin with '$' or contain a '.'`;
@@ -23,44 +19,41 @@ export const ensureKeyIsValid = (key: string): string | null => {
   return null;
 };
 
-export type EnvironmentInfo = {
-  object: Object,
-  propertyOrder: Object | null,
-};
+export interface EnvironmentInfo {
+  object: Record<string, any>;
+  propertyOrder: Record<string, any> | null;
+}
 
-type Props = {
-  environmentInfo: EnvironmentInfo,
-  didChange: Function,
-  editorFontSize: number,
-  editorIndentSize: number,
-  editorKeyMap: string,
-  render: Function,
-  getRenderContext: Function,
-  nunjucksPowerUserMode: boolean,
-  isVariableUncovered: boolean,
-  lineWrapping: boolean,
-};
+interface Props {
+  environmentInfo: EnvironmentInfo;
+  didChange: (...args: Array<any>) => any;
+  editorFontSize: number;
+  editorIndentSize: number;
+  editorKeyMap: string;
+  render: (...args: Array<any>) => any;
+  getRenderContext: (...args: Array<any>) => any;
+  nunjucksPowerUserMode: boolean;
+  isVariableUncovered: boolean;
+  lineWrapping: boolean;
+}
 
 // There was existing logic to also handle warnings, but it was removed in PR#2601 as there were no more warnings
 // to show. If warnings need to be added again, review git history to revert that particular change.
-type State = {
-  error: string | null,
-};
+interface State {
+  error: string | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class EnvironmentEditor extends React.PureComponent<Props, State> {
-  _editor: CodeEditor | null;
+class EnvironmentEditor extends PureComponent<Props, State> {
+  _editor: CodeEditor | null = null;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      error: null,
-    };
+  state: State = {
+    error: null,
   }
 
   _handleChange() {
-    let error = null;
-    let value = null;
+    let error: string | null = null;
+    let value: EnvironmentInfo | null = null;
 
     // Check for JSON parse errors
     try {
@@ -74,6 +67,7 @@ class EnvironmentEditor extends React.PureComponent<Props, State> {
     if (value && value.object) {
       for (const key of Object.keys(value.object)) {
         error = ensureKeyIsValid(key);
+
         if (error) {
           break;
         }
@@ -82,15 +76,20 @@ class EnvironmentEditor extends React.PureComponent<Props, State> {
 
     // Call this last in case component unmounted
     if (this.state.error !== error) {
-      this.setState({ error }, () => {
-        this.props.didChange();
-      });
+      this.setState(
+        {
+          error,
+        },
+        () => {
+          this.props.didChange();
+        },
+      );
     } else {
       this.props.didChange();
     }
   }
 
-  _setEditorRef(n: ?CodeEditor) {
+  _setEditorRef(n: CodeEditor) {
     this._editor = n;
   }
 
@@ -101,7 +100,6 @@ class EnvironmentEditor extends React.PureComponent<Props, State> {
         JSON_ORDER_PREFIX,
         JSON_ORDER_SEPARATOR,
       );
-
       return {
         object: data.object,
         propertyOrder: data.map || null,
@@ -128,15 +126,12 @@ class EnvironmentEditor extends React.PureComponent<Props, State> {
       lineWrapping,
       ...props
     } = this.props;
-
     const { error } = this.state;
-
     const defaultValue = orderedJSON.stringify(
       environmentInfo.object,
       environmentInfo.propertyOrder || null,
       JSON_ORDER_SEPARATOR,
     );
-
     return (
       <div className="environment-editor">
         <CodeEditor
@@ -153,7 +148,7 @@ class EnvironmentEditor extends React.PureComponent<Props, State> {
           render={render}
           getRenderContext={getRenderContext}
           mode="application/json"
-          {...(props: Object)}
+          {...props}
         />
         {error && <p className="notice error margin">{error}</p>}
       </div>
diff --git a/packages/insomnia-app/app/ui/components/editors/grpc-editor.js b/packages/insomnia-app/app/ui/components/editors/grpc-editor.tsx
similarity index 66%
rename from packages/insomnia-app/app/ui/components/editors/grpc-editor.js
rename to packages/insomnia-app/app/ui/components/editors/grpc-editor.tsx
index 6ce77d0d83..e339292c8a 100644
--- a/packages/insomnia-app/app/ui/components/editors/grpc-editor.js
+++ b/packages/insomnia-app/app/ui/components/editors/grpc-editor.tsx
@@ -1,20 +1,19 @@
-// @flow
-import React from 'react';
+import React, { FunctionComponent } from 'react';
 import CodeEditor from '../codemirror/code-editor';
 import type { Settings } from '../../../models/settings';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
 
-type Props = {
-  content: string,
-  handleChange: string => Promise<void>,
-  settings: Settings,
-  readOnly: boolean,
+interface Props {
+  content?: string;
+  handleChange?: (arg0: string) => void;
+  settings: Settings;
+  readOnly?: boolean;
+  handleRender?: HandleRender;
+  isVariableUncovered?: boolean;
+  handleGetRenderContext?: HandleGetRenderContext;
+}
 
-  handleRender?: string => Promise<string>,
-  isVariableUncovered?: boolean,
-  handleGetRenderContext?: Function,
-};
-
-const GRPCEditor = ({
+const GRPCEditor: FunctionComponent<Props> = ({
   content,
   handleChange,
   readOnly,
@@ -22,7 +21,7 @@ const GRPCEditor = ({
   handleGetRenderContext,
   handleRender,
   isVariableUncovered,
-}: Props) => (
+}) => (
   <CodeEditor
     fontSize={settings.editorFontSize}
     indentSize={settings.editorIndentSize}
diff --git a/packages/insomnia-app/app/ui/components/editors/password-editor.js b/packages/insomnia-app/app/ui/components/editors/password-editor.tsx
similarity index 71%
rename from packages/insomnia-app/app/ui/components/editors/password-editor.js
rename to packages/insomnia-app/app/ui/components/editors/password-editor.tsx
index 49049b5771..de66c8b6e6 100644
--- a/packages/insomnia-app/app/ui/components/editors/password-editor.js
+++ b/packages/insomnia-app/app/ui/components/editors/password-editor.tsx
@@ -1,37 +1,36 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import Button from '../base/button';
 import OneLineEditor from '../codemirror/one-line-editor';
 import { AUTOBIND_CFG } from '../../../common/constants';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
 
-type State = {
-  showPassword: boolean,
-};
+interface Props {
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  nunjucksPowerUserMode: boolean;
+  onChange: (...args: Array<any>) => any;
+  password: string;
+  disabled: boolean;
+  isVariableUncovered: boolean;
+  showAllPasswords: boolean;
+}
 
-type Props = {
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  nunjucksPowerUserMode: boolean,
-  onChange: Function,
-  password: string,
-  disabled: boolean,
-  isVariableUncovered: boolean,
-  showAllPasswords: boolean,
-};
+interface State {
+  showPassword: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class PasswordEditor extends React.PureComponent<Props, State> {
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      showPassword: false,
-    };
+class PasswordEditor extends PureComponent<Props, State> {
+  state: State = {
+    showPassword: false,
   }
 
   _handleShowPassword() {
-    this.setState({ showPassword: !this.state.showPassword });
+    this.setState({
+      showPassword: !this.state.showPassword,
+    });
   }
 
   render() {
@@ -46,7 +45,6 @@ class PasswordEditor extends React.PureComponent<Props, State> {
       isVariableUncovered,
       onChange,
     } = this.props;
-
     return (
       <>
         <div
diff --git a/packages/insomnia-app/app/ui/components/editors/request-headers-editor.js b/packages/insomnia-app/app/ui/components/editors/request-headers-editor.tsx
similarity index 85%
rename from packages/insomnia-app/app/ui/components/editors/request-headers-editor.js
rename to packages/insomnia-app/app/ui/components/editors/request-headers-editor.tsx
index cc0ae8a776..293445f8b2 100644
--- a/packages/insomnia-app/app/ui/components/editors/request-headers-editor.js
+++ b/packages/insomnia-app/app/ui/components/editors/request-headers-editor.tsx
@@ -1,6 +1,4 @@
-// @flow
-
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import KeyValueEditor from '../key-value-editor/editor';
@@ -10,24 +8,26 @@ import allCharsets from '../../../datasets/charsets';
 import allMimeTypes from '../../../datasets/content-types';
 import allEncodings from '../../../datasets/encodings';
 import type { Request, RequestHeader } from '../../../models/request';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
 
-type Props = {
-  onChange: (r: Request, headers: Array<RequestHeader>) => Promise<Request>,
-  bulk: boolean,
-  editorFontSize: number,
-  editorIndentSize: number,
-  editorLineWrapping: boolean,
-  nunjucksPowerUserMode: boolean,
-  isVariableUncovered: boolean,
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  request: Request,
-};
+interface Props {
+  onChange: (r: Request, headers: Array<RequestHeader>) => Promise<Request>;
+  bulk: boolean;
+  editorFontSize: number;
+  editorIndentSize: number;
+  editorLineWrapping: boolean;
+  nunjucksPowerUserMode: boolean;
+  isVariableUncovered: boolean;
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  request: Request;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class RequestHeadersEditor extends React.PureComponent<Props> {
+class RequestHeadersEditor extends PureComponent<Props> {
   _handleBulkUpdate(headersString: string) {
     const { onChange, request } = this.props;
+
     const headers = RequestHeadersEditor._getHeadersFromString(headersString);
 
     onChange(request, headers);
@@ -39,12 +39,11 @@ class RequestHeadersEditor extends React.PureComponent<Props> {
   }
 
   static _getHeadersFromString(headersString: string) {
-    const headers = [];
+    const headers: Array<{ name: string; value: string }> = [];
     const rows = headersString.split(/\n+/);
 
     for (const row of rows) {
       const [rawName, rawValue] = row.split(/:(.*)$/);
-
       const name = (rawName || '').trim();
       const value = (rawValue || '').trim();
 
@@ -52,7 +51,10 @@ class RequestHeadersEditor extends React.PureComponent<Props> {
         continue;
       }
 
-      headers.push({ name, value });
+      headers.push({
+        name,
+        value,
+      });
     }
 
     return headers;
@@ -60,7 +62,6 @@ class RequestHeadersEditor extends React.PureComponent<Props> {
 
   _getHeadersString() {
     const { headers } = this.props.request;
-
     let headersString = '';
 
     for (const header of headers) {
@@ -85,16 +86,19 @@ class RequestHeadersEditor extends React.PureComponent<Props> {
       case 'content-type':
       case 'accept':
         return allMimeTypes;
+
       case 'accept-charset':
         return allCharsets;
+
       case 'accept-encoding':
         return allEncodings;
+
       default:
         return [];
     }
   }
 
-  static _getCommonHeaderNames(pair: RequestHeader) {
+  static _getCommonHeaderNames() {
     return allHeaderNames;
   }
 
@@ -110,7 +114,6 @@ class RequestHeadersEditor extends React.PureComponent<Props> {
       nunjucksPowerUserMode,
       isVariableUncovered,
     } = this.props;
-
     return bulk ? (
       <div className="tall">
         <CodeEditor
diff --git a/packages/insomnia-app/app/ui/components/editors/request-parameters-editor.js b/packages/insomnia-app/app/ui/components/editors/request-parameters-editor.tsx
similarity index 81%
rename from packages/insomnia-app/app/ui/components/editors/request-parameters-editor.js
rename to packages/insomnia-app/app/ui/components/editors/request-parameters-editor.tsx
index e04e65ef21..de4a5f8601 100644
--- a/packages/insomnia-app/app/ui/components/editors/request-parameters-editor.js
+++ b/packages/insomnia-app/app/ui/components/editors/request-parameters-editor.tsx
@@ -1,29 +1,29 @@
-// @flow
-
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import KeyValueEditor from '../key-value-editor/editor';
 import CodeEditor from '../codemirror/code-editor';
 import type { Request, RequestParameter } from '../../../models/request';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
 
-type Props = {
-  onChange: (r: Request, parameters: Array<RequestParameter>) => Promise<Request>,
-  bulk: boolean,
-  editorFontSize: number,
-  editorIndentSize: number,
-  editorLineWrapping: boolean,
-  nunjucksPowerUserMode: boolean,
-  isVariableUncovered: boolean,
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  request: Request,
-};
+interface Props {
+  onChange: (r: Request, parameters: Array<RequestParameter>) => Promise<Request>;
+  bulk: boolean;
+  editorFontSize: number;
+  editorIndentSize: number;
+  editorLineWrapping: boolean;
+  nunjucksPowerUserMode: boolean;
+  isVariableUncovered: boolean;
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  request: Request;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class RequestParametersEditor extends React.PureComponent<Props> {
+class RequestParametersEditor extends PureComponent<Props> {
   _handleBulkUpdate(paramsString: string) {
     const { onChange, request } = this.props;
+
     const params = RequestParametersEditor._getParamsFromString(paramsString);
 
     onChange(request, params);
@@ -35,12 +35,11 @@ class RequestParametersEditor extends React.PureComponent<Props> {
   }
 
   static _getParamsFromString(paramsString: string) {
-    const params = [];
+    const params: Array<{ name: string; value: string }> = [];
     const rows = paramsString.split(/\n+/);
 
     for (const row of rows) {
       const [rawName, rawValue] = row.split(/:(.*)$/);
-
       const name = (rawName || '').trim();
       const value = (rawValue || '').trim();
 
@@ -48,7 +47,10 @@ class RequestParametersEditor extends React.PureComponent<Props> {
         continue;
       }
 
-      params.push({ name, value });
+      params.push({
+        name,
+        value,
+      });
     }
 
     return params;
@@ -56,7 +58,6 @@ class RequestParametersEditor extends React.PureComponent<Props> {
 
   _getQueriesString() {
     const { parameters } = this.props.request;
-
     let paramsString = '';
 
     for (const param of parameters) {
@@ -88,7 +89,6 @@ class RequestParametersEditor extends React.PureComponent<Props> {
       nunjucksPowerUserMode,
       isVariableUncovered,
     } = this.props;
-
     return bulk ? (
       <CodeEditor
         getRenderContext={handleGetRenderContext}
diff --git a/packages/insomnia-app/app/ui/components/error-boundary.js b/packages/insomnia-app/app/ui/components/error-boundary.tsx
similarity index 66%
rename from packages/insomnia-app/app/ui/components/error-boundary.js
rename to packages/insomnia-app/app/ui/components/error-boundary.tsx
index 045537e69a..8bb5877e87 100644
--- a/packages/insomnia-app/app/ui/components/error-boundary.js
+++ b/packages/insomnia-app/app/ui/components/error-boundary.tsx
@@ -1,54 +1,58 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { showError } from './modals/index';
 import Mailto from './base/mailto';
 
-type Props = {
-  children: React.Node,
-  errorClassName?: string,
-  showAlert?: boolean,
-
+interface Props {
+  children: ReactNode;
+  errorClassName?: string;
+  showAlert?: boolean;
   // Avoid using invalidation with showAlert, otherwise an alert will be shown with every attempted re-render
-  invalidationKey?: string,
-  renderError?: (error: Error) => React.Node,
-};
+  invalidationKey?: string;
+  renderError?: (error: Error) => ReactNode;
+}
 
-type State = {
-  error: Error | null,
-  info: { componentStack: string } | null,
-};
+interface State {
+  error: Error | null;
+  info: {
+    componentStack: string;
+  } | null;
+}
 
-class SingleErrorBoundary extends React.PureComponent<Props, State> {
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      error: null,
-      info: null,
-    };
+class SingleErrorBoundary extends PureComponent<Props, State> {
+  state: State = {
+    error: null,
+    info: null,
   }
 
   // eslint-disable-next-line camelcase
-  UNSAFE_componentWillReceiveProps(nextProps: $ReadOnly<Props>) {
+  UNSAFE_componentWillReceiveProps(nextProps: Props) {
     const { error, info } = this.state;
-
     const invalidationKeyChanged = nextProps.invalidationKey !== this.props.invalidationKey;
     const isErrored = error !== null || info !== null;
     const shouldResetError = invalidationKeyChanged && isErrored;
 
     if (shouldResetError) {
-      this.setState({ error: null, info: null });
+      this.setState({
+        error: null,
+        info: null,
+      });
     }
   }
 
-  componentDidCatch(error: Error, info: { componentStack: string }) {
+  componentDidCatch(
+    error: Error,
+    info: {
+      componentStack: string;
+    },
+  ) {
     const { children } = this.props;
     const firstChild = Array.isArray(children) && children.length === 1 ? children[0] : children;
-
     this.setState({ error, info });
-
     let componentName = 'component';
+
     try {
-      componentName = (firstChild: any).type.name;
+      // @ts-expect-error -- TSCONVERSION
+      componentName = firstChild.type.name;
     } catch (err) {
       // It's okay
     }
@@ -58,6 +62,7 @@ class SingleErrorBoundary extends React.PureComponent<Props, State> {
         showError({
           error,
           title: 'Application Error',
+          // @ts-expect-error -- TSCONVERSION
           message: (
             <p>
               Failed to render {componentName}. Please send the following error to{' '}
@@ -79,7 +84,7 @@ class SingleErrorBoundary extends React.PureComponent<Props, State> {
       return renderError ? (
         renderError(error)
       ) : (
-        <div className={errorClassName || null}>Render Failure: {error.message}</div>
+        <div className={errorClassName ?? ''}>Render Failure: {error.message}</div>
       );
     }
 
@@ -87,8 +92,8 @@ class SingleErrorBoundary extends React.PureComponent<Props, State> {
   }
 }
 
-class ErrorBoundary extends React.PureComponent<Props> {
-  render(): React.Node {
+class ErrorBoundary extends PureComponent<Props> {
+  render() {
     const { children, ...extraProps } = this.props;
 
     if (!children) {
@@ -98,7 +103,7 @@ class ErrorBoundary extends React.PureComponent<Props> {
     // Unwrap multiple children into single children for better error isolation
     const childArray = Array.isArray(children) ? children : [children];
     return childArray.map((child, i) => (
-      <SingleErrorBoundary key={i} {...(extraProps: Object)}>
+      <SingleErrorBoundary key={i} {...extraProps}>
         {child}
       </SingleErrorBoundary>
     ));
diff --git a/packages/insomnia-app/app/ui/components/export-requests/request-group-row.js b/packages/insomnia-app/app/ui/components/export-requests/request-group-row.tsx
similarity index 79%
rename from packages/insomnia-app/app/ui/components/export-requests/request-group-row.js
rename to packages/insomnia-app/app/ui/components/export-requests/request-group-row.tsx
index 137fab841d..ac994bf092 100644
--- a/packages/insomnia-app/app/ui/components/export-requests/request-group-row.js
+++ b/packages/insomnia-app/app/ui/components/export-requests/request-group-row.tsx
@@ -1,31 +1,25 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import classnames from 'classnames';
 import type { RequestGroup } from '../../../models/request-group';
 
-type Props = {
-  // Required.
-  handleSetRequestGroupCollapsed: Function,
-  handleSetItemSelected: Function,
-  isCollapsed: boolean,
-  totalRequests: number,
-  selectedRequests: number,
-  requestGroup: RequestGroup,
-
-  // Optional.
-  children?: React.Node,
-};
+interface Props {
+  handleSetRequestGroupCollapsed: (...args: Array<any>) => any;
+  handleSetItemSelected: (...args: Array<any>) => any;
+  isCollapsed: boolean;
+  totalRequests: number;
+  selectedRequests: number;
+  requestGroup: RequestGroup;
+  children?: ReactNode;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class RequestGroupRow extends React.PureComponent<Props> {
+class RequestGroupRow extends PureComponent<Props> {
   checkbox: HTMLInputElement;
 
-  setCheckboxRef(checkbox: ?HTMLInputElement) {
-    if (checkbox != null) {
-      this.checkbox = checkbox;
-    }
+  setCheckboxRef(checkbox: HTMLInputElement) {
+    this.checkbox = checkbox;
   }
 
   handleCollapse() {
@@ -33,7 +27,7 @@ class RequestGroupRow extends React.PureComponent<Props> {
     handleSetRequestGroupCollapsed(requestGroup._id, !isCollapsed);
   }
 
-  handleSelect(e: SyntheticEvent<HTMLInputElement>) {
+  handleSelect(e: React.SyntheticEvent<HTMLInputElement>) {
     const el = e.currentTarget;
     const value = el.checked;
     const { handleSetItemSelected, requestGroup } = this.props;
@@ -42,12 +36,10 @@ class RequestGroupRow extends React.PureComponent<Props> {
 
   render() {
     const { children, requestGroup, isCollapsed, totalRequests, selectedRequests } = this.props;
-
     let folderIconClass = 'fa-folder';
-
     folderIconClass += isCollapsed ? '' : '-open';
-
     const isSelected = selectedRequests === totalRequests;
+
     if (this.checkbox != null) {
       // Partial or indeterminate checkbox.
       this.checkbox.indeterminate = selectedRequests > 0 && selectedRequests < totalRequests;
diff --git a/packages/insomnia-app/app/ui/components/export-requests/request-row.js b/packages/insomnia-app/app/ui/components/export-requests/request-row.tsx
similarity index 76%
rename from packages/insomnia-app/app/ui/components/export-requests/request-row.js
rename to packages/insomnia-app/app/ui/components/export-requests/request-row.tsx
index 79c432d23c..0bf8aeec30 100644
--- a/packages/insomnia-app/app/ui/components/export-requests/request-row.js
+++ b/packages/insomnia-app/app/ui/components/export-requests/request-row.tsx
@@ -1,4 +1,3 @@
-// @flow
 import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
@@ -8,15 +7,15 @@ import type { GrpcRequest } from '../../../models/grpc-request';
 import { isGrpcRequest } from '../../../models/helpers/is-model';
 import GrpcTag from '../tags/grpc-tag';
 
-type Props = {
-  handleSetItemSelected: Function,
-  isSelected: boolean,
-  request: Request | GrpcRequest,
-};
+interface Props {
+  handleSetItemSelected: (...args: Array<any>) => any;
+  isSelected: boolean;
+  request: Request | GrpcRequest;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
 class RequestRow extends PureComponent<Props> {
-  handleSelect(e: SyntheticEvent<HTMLInputElement>) {
+  handleSelect(e: React.SyntheticEvent<HTMLInputElement>) {
     const el = e.currentTarget;
     const value = el.checked;
     const { handleSetItemSelected, request } = this.props;
@@ -26,7 +25,6 @@ class RequestRow extends PureComponent<Props> {
   render() {
     const { request, isSelected } = this.props;
     const isGrpc = isGrpcRequest(request);
-
     return (
       <li className="tree__row">
         <div className="tree__item tree__item--request">
@@ -34,7 +32,12 @@ class RequestRow extends PureComponent<Props> {
             <input type="checkbox" checked={isSelected} onChange={this.handleSelect} />
           </div>
           <button className="wide">
-            {isGrpc ? <GrpcTag /> : <MethodTag method={request.method} />}
+            {isGrpc ? (
+              <GrpcTag />
+             ) : (
+               // @ts-expect-error -- TSCONVERSION
+               <MethodTag method={request.method} />
+             )}
             <span className="inline-block">{request.name}</span>
           </button>
         </div>
diff --git a/packages/insomnia-app/app/ui/components/export-requests/tree.js b/packages/insomnia-app/app/ui/components/export-requests/tree.tsx
similarity index 79%
rename from packages/insomnia-app/app/ui/components/export-requests/tree.js
rename to packages/insomnia-app/app/ui/components/export-requests/tree.tsx
index 634052026f..22894b9104 100644
--- a/packages/insomnia-app/app/ui/components/export-requests/tree.js
+++ b/packages/insomnia-app/app/ui/components/export-requests/tree.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import RequestRow from './request-row';
 import RequestGroupRow from './request-group-row';
 import type { Node } from '../modals/export-requests-modal';
@@ -8,21 +7,21 @@ import type { RequestGroup } from '../../../models/request-group';
 import { isGrpcRequest, isRequest } from '../../../models/helpers/is-model';
 import type { GrpcRequest } from '../../../models/grpc-request';
 
-type Props = {
-  root: ?Node,
-  handleSetRequestGroupCollapsed: Function,
-  handleSetItemSelected: Function,
-};
+interface Props {
+  root?: Node | null;
+  handleSetRequestGroupCollapsed: (...args: Array<any>) => any;
+  handleSetItemSelected: (...args: Array<any>) => any;
+}
 
-class Tree extends React.PureComponent<Props> {
-  renderChildren(node: ?Node) {
+class Tree extends PureComponent<Props> {
+  renderChildren(node?: Node | null) {
     if (node == null) {
       return null;
     }
 
     if (isRequest(node.doc) || isGrpcRequest(node.doc)) {
       // Directly casting will result in error, so cast it to any first.
-      const request: Request | GrpcRequest = ((node.doc: any): Request | GrpcRequest);
+      const request: Request | GrpcRequest = (node.doc as any) as Request | GrpcRequest;
       return (
         <RequestRow
           key={node.doc._id}
@@ -39,9 +38,8 @@ class Tree extends React.PureComponent<Props> {
     }
 
     const children = node.children.map(child => this.renderChildren(child));
-
     // Directly cast to RequestGroup will result in error, so cast it to any first.
-    const requestGroup: RequestGroup = ((node.doc: any): RequestGroup);
+    const requestGroup: RequestGroup = (node.doc as any) as RequestGroup;
     return (
       <RequestGroupRow
         key={node.doc._id}
diff --git a/packages/insomnia-app/app/ui/components/forms.stories.js b/packages/insomnia-app/app/ui/components/forms.stories.tsx
similarity index 98%
rename from packages/insomnia-app/app/ui/components/forms.stories.js
rename to packages/insomnia-app/app/ui/components/forms.stories.tsx
index 3f757ca0c5..faf3579abe 100644
--- a/packages/insomnia-app/app/ui/components/forms.stories.js
+++ b/packages/insomnia-app/app/ui/components/forms.stories.tsx
@@ -2,7 +2,9 @@ import React from 'react';
 import '../../../.storybook/index.less';
 import IndeterminateCheckbox from './base/indeterminate-checkbox';
 
-export default { title: 'Forms' };
+export default {
+  title: 'Forms',
+};
 
 export const input = () => (
   <form>
diff --git a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-default-value.js b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-default-value.tsx
similarity index 71%
rename from packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-default-value.js
rename to packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-default-value.tsx
index f1cc894c79..3113f3743f 100644
--- a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-default-value.js
+++ b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-default-value.tsx
@@ -1,18 +1,16 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import type { GraphQLField } from 'graphql';
 import { astFromValue, print } from 'graphql';
 
-type Props = {
-  field: GraphQLField<any, any>,
-};
+interface Props {
+  field: GraphQLField<any, any>;
+}
 
-class GraphQLDefaultValue extends React.PureComponent<Props> {
+class GraphQLDefaultValue extends PureComponent<Props> {
   render() {
     const { field } = this.props;
-
     // Make Flow happy :/
-    const fieldO: Object = field;
+    const fieldO: Record<string, any> = field;
 
     if ('defaultValue' in fieldO && fieldO.defaultValue !== undefined) {
       const ast = astFromValue(fieldO.defaultValue, fieldO.type);
diff --git a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-enum.js b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-enum.tsx
similarity index 88%
rename from packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-enum.js
rename to packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-enum.tsx
index 84c6f284a7..c1cb731eab 100644
--- a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-enum.js
+++ b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-enum.tsx
@@ -1,17 +1,16 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import MarkdownPreview from '../markdown-preview';
 import type { GraphQLEnumValue } from 'graphql';
 import { GraphQLEnumType } from 'graphql';
 
-type Props = {|
-  type: GraphQLEnumType,
-|};
+interface Props {
+  type: GraphQLEnumType;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class GraphQLExplorerEnum extends React.PureComponent<Props> {
+class GraphQLExplorerEnum extends PureComponent<Props> {
   renderDescription() {
     const { type } = this.props;
     return <MarkdownPreview markdown={type.description || '*no description*'} />;
@@ -19,11 +18,9 @@ class GraphQLExplorerEnum extends React.PureComponent<Props> {
 
   renderValues() {
     const { type } = this.props;
-
     const values = type.getValues();
-
     return (
-      <React.Fragment>
+      <Fragment>
         <h2 className="graphql-explorer__subheading">Values</h2>
         <ul className="graphql-explorer__defs">
           {values.map((value: GraphQLEnumValue) => {
@@ -42,7 +39,7 @@ class GraphQLExplorerEnum extends React.PureComponent<Props> {
             );
           })}
         </ul>
-      </React.Fragment>
+      </Fragment>
     );
   }
 
diff --git a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-field-link.js b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-field-link.tsx
similarity index 62%
rename from packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-field-link.js
rename to packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-field-link.tsx
index b5d81220ed..b7b630b9bd 100644
--- a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-field-link.js
+++ b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-field-link.tsx
@@ -1,25 +1,23 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import type { GraphQLField } from 'graphql';
 
-type Props = {
-  onNavigate: (type: Object) => void,
-  field: GraphQLField<any, any>,
-};
+interface Props {
+  onNavigate: (type: Record<string, any>) => void;
+  field: GraphQLField<any, any>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class GraphQLExplorerFieldLink extends React.PureComponent<Props> {
-  _handleClick(e: MouseEvent) {
-    e.preventDefault();
+class GraphQLExplorerFieldLink extends PureComponent<Props> {
+  _handleClick(event: React.MouseEvent<HTMLAnchorElement>) {
+    event.preventDefault();
     const { onNavigate, field } = this.props;
     onNavigate(field);
   }
 
   render() {
     const { field } = this.props;
-
     return (
       <a href="#" onClick={this._handleClick} className="success">
         {field.name}
diff --git a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-field.js b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-field.tsx
similarity index 78%
rename from packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-field.js
rename to packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-field.tsx
index 9f97e94c57..e2a13d35ba 100644
--- a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-field.js
+++ b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-field.tsx
@@ -1,16 +1,15 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import type { GraphQLField, GraphQLType } from 'graphql';
 import GraphQLExplorerTypeLink from './graph-ql-explorer-type-link';
 import MarkdownPreview from '../markdown-preview';
 import GraphQLDefaultValue from './graph-ql-default-value';
 
-type Props = {
-  onNavigateType: (type: GraphQLType) => void,
-  field: GraphQLField<any, any>,
-};
+interface Props {
+  onNavigateType: (type: GraphQLType) => void;
+  field: GraphQLField<any, any>;
+}
 
-class GraphQLExplorerField extends React.PureComponent<Props> {
+class GraphQLExplorerField extends PureComponent<Props> {
   renderDescription() {
     const { field } = this.props;
     return <MarkdownPreview markdown={field.description || '*no description*'} />;
@@ -18,23 +17,23 @@ class GraphQLExplorerField extends React.PureComponent<Props> {
 
   renderType() {
     const { field, onNavigateType } = this.props;
-
     return (
-      <React.Fragment>
+      <Fragment>
         <h2 className="graphql-explorer__subheading">Type</h2>
         <GraphQLExplorerTypeLink type={field.type} onNavigate={onNavigateType} />
-      </React.Fragment>
+      </Fragment>
     );
   }
 
   renderArgumentsMaybe() {
     const { field, onNavigateType } = this.props;
+
     if (!field.args || field.args.length === 0) {
       return null;
     }
 
     return (
-      <React.Fragment>
+      <Fragment>
         <h2 className="graphql-explorer__subheading">Arguments</h2>
         <ul className="graphql-explorer__defs">
           {field.args.map(a => {
@@ -42,13 +41,16 @@ class GraphQLExplorerField extends React.PureComponent<Props> {
               <li key={a.name}>
                 <span className="info">{a.name}</span>:{' '}
                 <GraphQLExplorerTypeLink onNavigate={onNavigateType} type={a.type} />
-                <GraphQLDefaultValue field={(a: Object)} />
+                <GraphQLDefaultValue
+                  // @ts-expect-error -- TSCONVERSION
+                  field={a}
+                />
                 {a.description && <MarkdownPreview markdown={a.description} />}
               </li>
             );
           })}
         </ul>
-      </React.Fragment>
+      </Fragment>
     );
   }
 
diff --git a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-schema.js b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-schema.tsx
similarity index 82%
rename from packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-schema.js
rename to packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-schema.tsx
index 4819356315..738231c0a7 100644
--- a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-schema.js
+++ b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-schema.tsx
@@ -1,17 +1,15 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import type { GraphQLSchema, GraphQLType } from 'graphql';
 import GraphQLExplorerTypeLink from './graph-ql-explorer-type-link';
 
-type Props = {
-  onNavigateType: (type: GraphQLType) => void,
-  schema: GraphQLSchema,
-};
+interface Props {
+  onNavigateType: (type: GraphQLType) => void;
+  schema: GraphQLSchema;
+}
 
-class GraphQLExplorerSchema extends React.PureComponent<Props> {
+class GraphQLExplorerSchema extends PureComponent<Props> {
   renderQueryType() {
     const { schema, onNavigateType } = this.props;
-
     const type = schema.getQueryType();
 
     if (!type) {
@@ -19,16 +17,15 @@ class GraphQLExplorerSchema extends React.PureComponent<Props> {
     }
 
     return (
-      <React.Fragment>
+      <Fragment>
         <span className="success">query</span>:{' '}
         <GraphQLExplorerTypeLink onNavigate={onNavigateType} type={type} />
-      </React.Fragment>
+      </Fragment>
     );
   }
 
   renderMutationType() {
     const { schema, onNavigateType } = this.props;
-
     const type = schema.getMutationType();
 
     if (!type) {
@@ -36,16 +33,15 @@ class GraphQLExplorerSchema extends React.PureComponent<Props> {
     }
 
     return (
-      <React.Fragment>
+      <Fragment>
         <span className="success">mutation</span>:{' '}
         <GraphQLExplorerTypeLink onNavigate={onNavigateType} type={type} />
-      </React.Fragment>
+      </Fragment>
     );
   }
 
   renderSubscriptionType() {
     const { schema, onNavigateType } = this.props;
-
     const type = schema.getSubscriptionType();
 
     if (!type) {
@@ -53,10 +49,10 @@ class GraphQLExplorerSchema extends React.PureComponent<Props> {
     }
 
     return (
-      <React.Fragment>
+      <Fragment>
         <span className="success">subscription</span>:{' '}
         <GraphQLExplorerTypeLink onNavigate={onNavigateType} type={type} />
-      </React.Fragment>
+      </Fragment>
     );
   }
 
diff --git a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-type-link.js b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-type-link.tsx
similarity index 63%
rename from packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-type-link.js
rename to packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-type-link.tsx
index 1d1d8b60eb..e0deb14dfe 100644
--- a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-type-link.js
+++ b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-type-link.tsx
@@ -1,19 +1,18 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import { GraphQLList, GraphQLNonNull } from 'graphql';
 import type { GraphQLType } from 'graphql';
 
-type Props = {
-  onNavigate: (type: Object) => void,
-  type: GraphQLType,
-};
+interface Props {
+  onNavigate: (type: Record<string, any>) => void;
+  type: GraphQLType;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class GraphQLExplorerTypeLink extends React.PureComponent<Props> {
-  _handleClick(e: MouseEvent) {
-    e.preventDefault();
+class GraphQLExplorerTypeLink extends PureComponent<Props> {
+  _handleClick(event: React.MouseEvent<HTMLAnchorElement>) {
+    event.preventDefault();
     const { onNavigate, type } = this.props;
     onNavigate(type);
   }
@@ -23,18 +22,17 @@ class GraphQLExplorerTypeLink extends React.PureComponent<Props> {
 
     if (type instanceof GraphQLList) {
       return (
-        <React.Fragment>
-          [
-          <GraphQLExplorerTypeLink onNavigate={onNavigate} type={type.ofType} />]
-        </React.Fragment>
+        <Fragment>
+          [<GraphQLExplorerTypeLink onNavigate={onNavigate} type={type.ofType} />]
+        </Fragment>
       );
     }
 
     if (type instanceof GraphQLNonNull) {
       return (
-        <React.Fragment>
+        <Fragment>
           <GraphQLExplorerTypeLink onNavigate={onNavigate} type={type.ofType} />!
-        </React.Fragment>
+        </Fragment>
       );
     }
 
diff --git a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-type.js b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-type.tsx
similarity index 81%
rename from packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-type.js
rename to packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-type.tsx
index 933e6a619f..e9fbbbce20 100644
--- a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-type.js
+++ b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer-type.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import { SvgIcon } from 'insomnia-components';
 import GraphQLExplorerTypeLink from './graph-ql-explorer-type-link';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
@@ -11,27 +10,28 @@ import { GraphQLInterfaceType, GraphQLObjectType, GraphQLUnionType } from 'graph
 import GraphQLDefaultValue from './graph-ql-default-value';
 import Tooltip from '../../components/tooltip';
 
-type Props = {
-  onNavigateType: (type: Object) => void,
-  onNavigateField: (field: Object) => void,
-  type: GraphQLType,
-  schema: GraphQLSchema | null,
-};
+interface Props {
+  onNavigateType: (type: Record<string, any>) => void;
+  onNavigateField: (field: Record<string, any>) => void;
+  type: GraphQLType;
+  schema: GraphQLSchema | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class GraphQLExplorerType extends React.PureComponent<Props> {
-  _handleNavigateType(type: Object) {
+class GraphQLExplorerType extends PureComponent<Props> {
+  _handleNavigateType(type: Record<string, any>) {
     const { onNavigateType } = this.props;
     onNavigateType(type);
   }
 
-  _handleNavigateField(field: Object) {
+  _handleNavigateField(field: Record<string, any>) {
     const { onNavigateField } = this.props;
     onNavigateField(field);
   }
 
   renderDescription() {
     const { type } = this.props;
+    // @ts-expect-error -- TSCONVERSION
     return <MarkdownPreview markdown={type.description || '*no description*'} />;
   }
 
@@ -43,13 +43,15 @@ class GraphQLExplorerType extends React.PureComponent<Props> {
     }
 
     let title = 'Types';
-    let types = [];
+    let types: Array<GraphQLInterfaceType> | Array<GraphQLObjectType> = [];
 
     if (type instanceof GraphQLUnionType) {
       title = 'Possible Types';
+      // @ts-expect-error -- TSCONVERSION
       types = schema.getPossibleTypes(type);
     } else if (type instanceof GraphQLInterfaceType) {
       title = 'Implementations';
+      // @ts-expect-error -- TSCONVERSION
       types = schema.getPossibleTypes(type);
     } else if (type instanceof GraphQLObjectType) {
       title = 'Implements';
@@ -59,7 +61,7 @@ class GraphQLExplorerType extends React.PureComponent<Props> {
     }
 
     return (
-      <React.Fragment>
+      <Fragment>
         <h2 className="graphql-explorer__subheading">{title}</h2>
         <ul className="graphql-explorer__defs">
           {types.map(type => (
@@ -68,32 +70,33 @@ class GraphQLExplorerType extends React.PureComponent<Props> {
             </li>
           ))}
         </ul>
-      </React.Fragment>
+      </Fragment>
     );
   }
 
   renderFieldsMaybe() {
     const { type, onNavigateType } = this.props;
+
+      // @ts-expect-error -- TSCONVERSION
     if (typeof type.getFields !== 'function') {
       return null;
     }
 
-    // $FlowFixMe
+    // @ts-expect-error -- TSCONVERSION
     const fields = type.getFields();
     const fieldKeys = Object.keys(fields).sort((a, b) => a.localeCompare(b));
-
     return (
-      <React.Fragment>
+      <Fragment>
         <h2 className="graphql-explorer__subheading">Fields</h2>
         <ul className="graphql-explorer__defs">
           {fieldKeys.map(key => {
-            const field: GraphQLField<any, any> = (fields[key]: any);
+            const field: GraphQLField<any, any> = fields[key] as any;
+            let argLinks: JSX.Element | null = null;
+            const { args } = field;
 
-            let argLinks = null;
-            const args = (field: any).args;
             if (args && args.length) {
               argLinks = (
-                <React.Fragment>
+                <Fragment>
                   (
                   {args.map(a => (
                     <div key={a.name} className="graphql-explorer__defs__arg">
@@ -102,18 +105,16 @@ class GraphQLExplorerType extends React.PureComponent<Props> {
                     </div>
                   ))}
                   )
-                </React.Fragment>
+                </Fragment>
               );
             }
 
             const fieldLink = (
               <GraphQLExplorerFieldLink onNavigate={this._handleNavigateField} field={field} />
             );
-
             const typeLink = (
               <GraphQLExplorerTypeLink onNavigate={this._handleNavigateType} type={field.type} />
             );
-
             const isDeprecated = field.isDeprecated;
             const description = field.description;
             return (
@@ -137,7 +138,7 @@ class GraphQLExplorerType extends React.PureComponent<Props> {
             );
           })}
         </ul>
-      </React.Fragment>
+      </Fragment>
     );
   }
 
diff --git a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer.js b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer.tsx
similarity index 77%
rename from packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer.js
rename to packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer.tsx
index 8435761b38..4c653e1877 100644
--- a/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer.js
+++ b/packages/insomnia-app/app/ui/components/graph-ql-explorer/graph-ql-explorer.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import GraphQLExplorerField from './graph-ql-explorer-field';
@@ -9,35 +8,32 @@ import { GraphQLEnumType } from 'graphql';
 import GraphQLExplorerSchema from './graph-ql-explorer-schema';
 import GraphQLExplorerEnum from './graph-ql-explorer-enum';
 
-type Props = {
-  handleClose: () => void,
-  schema: GraphQLSchema | null,
-  visible: boolean,
+interface Props {
+  handleClose: () => void;
+  schema: GraphQLSchema | null;
+  visible: boolean;
   reference: null | {
-    type: GraphQLType | GraphQLEnumType | null,
-    argument: GraphQLArgument | null,
-    field: GraphQLField<any, any> | null,
-  },
-};
+    type: GraphQLType | GraphQLEnumType | null;
+    argument: GraphQLArgument | null;
+    field: GraphQLField<any, any> | null;
+  };
+}
 
-type HistoryItem = {
-  currentType: null | GraphQLType | GraphQLEnumType,
-  currentField: null | GraphQLField<any, any>,
-};
+interface HistoryItem {
+  currentType: null | GraphQLType | GraphQLEnumType;
+  currentField: null | GraphQLField<any, any>;
+}
 
-type State = HistoryItem & {
-  history: Array<HistoryItem>,
-};
+interface State extends HistoryItem {
+  history: Array<HistoryItem>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class GraphQLExplorer extends React.PureComponent<Props, State> {
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      history: [],
-      currentType: null,
-      currentField: null,
-    };
+class GraphQLExplorer extends PureComponent<Props, State> {
+  state: State = {
+    history: [],
+    currentType: null,
+    currentField: null,
   }
 
   _handleNavigateType(type: GraphQLType | GraphQLEnumType) {
@@ -75,7 +71,13 @@ class GraphQLExplorer extends React.PureComponent<Props, State> {
       return history;
     }
 
-    return [...history, { currentType, currentField }];
+    return [
+      ...history,
+      {
+        currentType,
+        currentField,
+      },
+    ];
   }
 
   // eslint-disable-next-line camelcase
@@ -87,8 +89,9 @@ class GraphQLExplorer extends React.PureComponent<Props, State> {
     const { type, field } = nextProps.reference;
     const { currentType, currentField } = this.state;
 
-    const compare = (a: any, b: any) => (!a && !b) || (a && b && a.name === b.name);
+    const compare = <T extends { name: string } | null, U extends { name: string } | null>(a: T, b: U) => (!a && !b) || (a && b && a.name === b.name);
 
+    // @ts-expect-error -- needs generic for `name`
     const sameType = compare(currentType, type);
     const sameField = compare(currentField, field);
     const nothingChanged = sameType && sameField;
@@ -116,6 +119,7 @@ class GraphQLExplorer extends React.PureComponent<Props, State> {
           className="graphql-explorer__header__back-btn"
           onClick={e => {
             e.preventDefault();
+
             this._handlePopHistory();
           }}>
           <i className="fa--skinny fa fa-angle-left" /> Schema
@@ -126,13 +130,13 @@ class GraphQLExplorer extends React.PureComponent<Props, State> {
     }
 
     const { currentType: lastType, currentField: lastField } = history[history.length - 1];
-
-    let name = null;
+    let name: string | null = null;
 
     if (lastField) {
-      name = (lastField: any).name || 'Unknown';
+      name = lastField.name || 'Unknown';
     } else if (lastType) {
-      name = (lastType: any).name || 'Unknown';
+      // @ts-expect-error -- needs generic for `name`
+      name = lastType.name || 'Unknown';
     } else {
       return null;
     }
@@ -143,6 +147,7 @@ class GraphQLExplorer extends React.PureComponent<Props, State> {
         className="graphql-explorer__header__back-btn"
         onClick={e => {
           e.preventDefault();
+
           this._handlePopHistory();
         }}>
         <i className="fa--skinny fa fa-angle-left" /> {name}
@@ -158,8 +163,8 @@ class GraphQLExplorer extends React.PureComponent<Props, State> {
     }
 
     const { currentType, currentField } = this.state;
+    let child: JSX.Element | null = null;
 
-    let child = null;
     if (currentField) {
       child = (
         <GraphQLExplorerField onNavigateType={this._handleNavigateType} field={currentField} />
@@ -183,10 +188,10 @@ class GraphQLExplorer extends React.PureComponent<Props, State> {
       return null;
     }
 
-    const fieldName = currentField ? (currentField: any).name : null;
-    const typeName = currentType ? (currentType: any).name : null;
+    const fieldName = currentField ? currentField.name : null;
+    // @ts-expect-error -- needs generic for `name`
+    const typeName = currentType ? currentType.name : null;
     const schemaName = schema ? 'Schema' : null;
-
     return (
       <div className="graphql-explorer theme--dialog">
         <div className="graphql-explorer__header">
diff --git a/packages/insomnia-app/app/ui/components/grpc-spinner.js b/packages/insomnia-app/app/ui/components/grpc-spinner.js
deleted file mode 100644
index a4dc8f7305..0000000000
--- a/packages/insomnia-app/app/ui/components/grpc-spinner.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// @flow
-import React from 'react';
-import classnames from 'classnames';
-import { useGrpcRequestState } from '../context/grpc';
-
-type Props = {
-  className?: string,
-  requestId: string,
-};
-
-const GrpcSpinner = ({ className, requestId }: Props) => {
-  const { running } = useGrpcRequestState(requestId);
-
-  return running && <i className={classnames('fa fa-refresh fa-spin', className)} />;
-};
-
-export default GrpcSpinner;
diff --git a/packages/insomnia-app/app/ui/components/grpc-spinner.tsx b/packages/insomnia-app/app/ui/components/grpc-spinner.tsx
new file mode 100644
index 0000000000..2f2f30a606
--- /dev/null
+++ b/packages/insomnia-app/app/ui/components/grpc-spinner.tsx
@@ -0,0 +1,15 @@
+import React, { FunctionComponent } from 'react';
+import classnames from 'classnames';
+import { useGrpcRequestState } from '../context/grpc';
+
+interface Props {
+  className?: string;
+  requestId: string;
+}
+
+const GrpcSpinner: FunctionComponent<Props> = ({ className, requestId }) => {
+  const { running } = useGrpcRequestState(requestId);
+  return running ? <i className={classnames('fa fa-refresh fa-spin', className)} /> : null;
+};
+
+export default GrpcSpinner;
diff --git a/packages/insomnia-app/app/ui/components/help-tooltip.js b/packages/insomnia-app/app/ui/components/help-tooltip.js
deleted file mode 100644
index dfc4d27218..0000000000
--- a/packages/insomnia-app/app/ui/components/help-tooltip.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// @flow
-import * as React from 'react';
-import { autoBindMethodsForReact } from 'class-autobind-decorator';
-import Tooltip from './tooltip';
-import { AUTOBIND_CFG } from '../../common/constants';
-
-type Props = {
-  children: React.Node,
-
-  // Optional
-  position?: string,
-  className?: string,
-  style?: Object,
-  info?: boolean,
-};
-
-@autoBindMethodsForReact(AUTOBIND_CFG)
-class HelpTooltip extends React.PureComponent<Props> {
-  render() {
-    const { children, className, style, info } = this.props;
-    return (
-      <Tooltip position="top" className={className} message={children} style={style}>
-        <i className={'fa ' + (info ? 'fa-info-circle' : 'fa-question-circle')} />
-      </Tooltip>
-    );
-  }
-}
-
-export default HelpTooltip;
diff --git a/packages/insomnia-app/app/ui/components/help-tooltip.stories.js b/packages/insomnia-app/app/ui/components/help-tooltip.stories.tsx
similarity index 84%
rename from packages/insomnia-app/app/ui/components/help-tooltip.stories.js
rename to packages/insomnia-app/app/ui/components/help-tooltip.stories.tsx
index 2ad2c1d14f..6d41c723a1 100644
--- a/packages/insomnia-app/app/ui/components/help-tooltip.stories.js
+++ b/packages/insomnia-app/app/ui/components/help-tooltip.stories.tsx
@@ -2,7 +2,9 @@ import React from 'react';
 import '../../../.storybook/index.less';
 import HelpTooltip from './help-tooltip';
 
-export default { title: 'Help Tooltip' };
+export default {
+  title: 'Help Tooltip',
+};
 
 export const _default = () => (
   <p>
diff --git a/packages/insomnia-app/app/ui/components/help-tooltip.tsx b/packages/insomnia-app/app/ui/components/help-tooltip.tsx
new file mode 100644
index 0000000000..0f232fe994
--- /dev/null
+++ b/packages/insomnia-app/app/ui/components/help-tooltip.tsx
@@ -0,0 +1,33 @@
+import React, { PureComponent, ReactNode } from 'react';
+import { autoBindMethodsForReact } from 'class-autobind-decorator';
+import Tooltip from './tooltip';
+import { AUTOBIND_CFG } from '../../common/constants';
+import { CSSProperties } from 'styled-components';
+
+interface Props {
+  children: ReactNode;
+  position?: string;
+  className?: string;
+  style?: CSSProperties;
+  info?: boolean;
+}
+
+@autoBindMethodsForReact(AUTOBIND_CFG)
+class HelpTooltip extends PureComponent<Props> {
+  render() {
+    const { children, className, style, info } = this.props;
+    return (
+      <Tooltip
+        position="top"
+        className={className}
+        message={children}
+        // @ts-expect-error -- TSCONVERSION appears to be a genuine error because style is not accepted or used or spread by Tooltip
+        style={style}
+      >
+        <i className={'fa ' + (info ? 'fa-info-circle' : 'fa-question-circle')} />
+      </Tooltip>
+    );
+  }
+}
+
+export default HelpTooltip;
diff --git a/packages/insomnia-app/app/ui/components/hotkey.js b/packages/insomnia-app/app/ui/components/hotkey.tsx
similarity index 73%
rename from packages/insomnia-app/app/ui/components/hotkey.js
rename to packages/insomnia-app/app/ui/components/hotkey.tsx
index 9a39378998..2d6ecd8cf7 100644
--- a/packages/insomnia-app/app/ui/components/hotkey.js
+++ b/packages/insomnia-app/app/ui/components/hotkey.tsx
@@ -1,24 +1,19 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { isMac } from '../../common/constants';
 import type { KeyBindings, KeyCombination } from '../../common/hotkeys';
 import { constructKeyCombinationDisplay, getPlatformKeyCombinations } from '../../common/hotkeys';
 
-type Props = {
-  // One of these two must be given.
-  // If both is given, keyCombination will be used.
-  keyCombination?: KeyCombination,
-  keyBindings?: KeyBindings,
+interface Props {
+  /** One of these two must be given. If both is given, keyCombination will be used. */
+  keyCombination?: KeyCombination;
+  keyBindings?: KeyBindings;
+  className?: string;
+  /** Show fallback message if keyCombination is not given, but keyBindings has no key combinations. */
+  useFallbackMessage?: boolean;
+}
 
-  // Optional
-  className?: string,
-  // Show fallback message if keyCombination is not given,
-  // but keyBindings has no key combinations.
-  useFallbackMessage?: boolean,
-};
-
-class Hotkey extends React.PureComponent<Props> {
+class Hotkey extends PureComponent<Props> {
   render() {
     const { keyCombination, keyBindings, className, useFallbackMessage } = this.props;
 
@@ -27,11 +22,13 @@ class Hotkey extends React.PureComponent<Props> {
       return null;
     }
 
-    let keyComb = null;
+    let keyComb: KeyCombination | null = null;
+
     if (keyCombination != null) {
       keyComb = keyCombination;
     } else if (keyBindings != null) {
       const keyCombs = getPlatformKeyCombinations(keyBindings);
+
       // Only take the first key combination if there is a mapping.
       if (keyCombs.length > 0) {
         keyComb = keyCombs[0];
@@ -39,19 +36,21 @@ class Hotkey extends React.PureComponent<Props> {
     }
 
     let display = '';
+
     if (keyComb != null) {
       display = constructKeyCombinationDisplay(keyComb, false);
     }
 
     const isFallback = display.length === 0 && useFallbackMessage;
+
     if (isFallback) {
       display = 'Not defined';
     }
+
     const classes = {
       'font-normal': isMac(),
       italic: isFallback,
     };
-
     return <span className={classnames(className, classes)}>{display}</span>;
   }
 }
diff --git a/packages/insomnia-app/app/ui/components/html-element-wrapper.js b/packages/insomnia-app/app/ui/components/html-element-wrapper.tsx
similarity index 77%
rename from packages/insomnia-app/app/ui/components/html-element-wrapper.js
rename to packages/insomnia-app/app/ui/components/html-element-wrapper.tsx
index 338940051f..2eb3fd945a 100644
--- a/packages/insomnia-app/app/ui/components/html-element-wrapper.js
+++ b/packages/insomnia-app/app/ui/components/html-element-wrapper.tsx
@@ -1,12 +1,11 @@
-// @flow
-import * as React from 'react';
+import React, { Component } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../common/constants';
 
-type Props = {|
-  el: HTMLElement,
-  onUnmount?: () => void,
-|};
+interface Props {
+  el: HTMLElement;
+  onUnmount?: () => void;
+}
 
 /**
  * This component provides an easy way to place a raw DOM node inside a React
@@ -14,8 +13,8 @@ type Props = {|
  * and the Insomnia application.
  */
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class HtmlElementWrapper extends React.Component<Props> {
-  _setRef(n: ?HTMLDivElement) {
+class HtmlElementWrapper extends Component<Props> {
+  _setRef(n: HTMLDivElement | null | undefined) {
     if (!n) {
       return;
     }
@@ -27,6 +26,7 @@ class HtmlElementWrapper extends React.Component<Props> {
 
   componentWillUnmount() {
     const { onUnmount } = this.props;
+
     if (typeof onUnmount === 'function') {
       onUnmount();
     }
diff --git a/packages/insomnia-app/app/ui/components/key-value-editor/editor.js b/packages/insomnia-app/app/ui/components/key-value-editor/editor.tsx
similarity index 85%
rename from packages/insomnia-app/app/ui/components/key-value-editor/editor.js
rename to packages/insomnia-app/app/ui/components/key-value-editor/editor.tsx
index cdb6fcc3e6..c6f849a9d6 100644
--- a/packages/insomnia-app/app/ui/components/key-value-editor/editor.js
+++ b/packages/insomnia-app/app/ui/components/key-value-editor/editor.tsx
@@ -1,14 +1,13 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG, DEBOUNCE_MILLIS } from '../../../common/constants';
 import classnames from 'classnames';
-
 import Lazy from '../base/lazy';
 import KeyValueEditorRow from './row';
 import { generateId, nullFn } from '../../../common/misc';
 import { Dropdown, DropdownItem, DropdownButton } from '../base/dropdown';
 import PromptButton from '../base/prompt-button';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
 
 const NAME = 'name';
 const VALUE = 'value';
@@ -20,17 +19,50 @@ const DOWN = 40;
 const LEFT = 37;
 const RIGHT = 39;
 
+interface Props {
+  onChange: Function;
+  pairs: Array<any>;
+  handleRender?: HandleRender;
+  handleGetRenderContext?: HandleGetRenderContext;
+  nunjucksPowerUserMode?: boolean;
+  isVariableUncovered?: boolean;
+  handleGetAutocompleteNameConstants?: Function;
+  handleGetAutocompleteValueConstants?: Function;
+  allowFile?: boolean;
+  allowMultiline?: boolean;
+  sortable?: boolean;
+  maxPairs?: number;
+  namePlaceholder?: string;
+  valuePlaceholder?: string;
+  descriptionPlaceholder?: string;
+  valueInputType?: string;
+  disableDelete?: boolean;
+  onToggleDisable?: Function;
+  onChangeType?: Function;
+  onChooseFile?: Function;
+  onDelete?: Function;
+  onCreate?: Function;
+  className?: string;
+}
+
+interface State {
+  pairs: Props['pairs'];
+  displayDescription: boolean;
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Editor extends PureComponent {
-  constructor(props) {
+class Editor extends PureComponent<Props, State> {
+  _focusedPairId: string | null = null;
+  _focusedField: string | null = NAME;
+  // @ts-expect-error -- TSCONVERSION being imported as a value but should be usable as a type
+  private _rows: Array<KeyValueEditorRow> = [];
+  _triggerTimeout: NodeJS.Timeout | null = null;
+
+  constructor(props: Props) {
     super(props);
-
-    this._focusedPairId = null;
-    this._focusedField = NAME;
-    this._rows = [];
-
     // Migrate and add IDs to all pairs (pairs didn't used to have IDs)
     const pairs = [...props.pairs];
+
     for (const pair of pairs) {
       if (props.maxPairs !== 1 && !pair.id) {
         pair.id = generateId('pair');
@@ -38,14 +70,14 @@ class Editor extends PureComponent {
     }
 
     this.state = {
-      pairs: pairs,
-
+      pairs,
       // If any pair has a description, display description field
       displayDescription: props.pairs.some(p => p.description),
     };
   }
 
-  _setRowRef(n) {
+  // @ts-expect-error -- TSCONVERSION being imported as a value but should be usable as a type
+  private _setRowRef(n?: KeyValueEditorRow) {
     // NOTE: We're not handling unmounting (may lead to a bug)
     if (n) {
       this._rows[n.props.pair.id] = n;
@@ -54,6 +86,7 @@ class Editor extends PureComponent {
 
   _handlePairChange(pair) {
     const i = this._getPairIndex(pair);
+
     const pairs = [
       ...this.state.pairs.slice(0, i),
       Object.assign({}, pair),
@@ -92,6 +125,7 @@ class Editor extends PureComponent {
 
   _handlePairDelete(pair) {
     const i = this.state.pairs.findIndex(p => p.id === pair.id);
+
     this._deletePair(i, true);
   }
 
@@ -109,39 +143,48 @@ class Editor extends PureComponent {
 
   _handleFocusName(pair) {
     this._setFocusedPair(pair);
+
     this._focusedField = NAME;
+
     this._rows[pair.id].focusNameEnd();
   }
 
   _handleFocusValue(pair) {
     this._setFocusedPair(pair);
+
     this._focusedField = VALUE;
+
     this._rows[pair.id].focusValueEnd();
   }
 
   _handleFocusDescription(pair) {
     this._setFocusedPair(pair);
+
     this._focusedField = DESCRIPTION;
+
     this._rows[pair.id].focusDescriptionEnd();
   }
 
   _handleAddFromName() {
     this._focusedField = NAME;
+
     this._addPair();
   }
 
   // Sometimes multiple focus events come in, so lets debounce it
   _handleAddFromValue() {
     this._focusedField = VALUE;
+
     this._addPair();
   }
 
   _handleAddFromDescription() {
     this._focusedField = DESCRIPTION;
+
     this._addPair();
   }
 
-  _handleKeyDown(pair, e, value) {
+  _handleKeyDown(_pair, e, value) {
     if (e.metaKey || e.ctrlKey) {
       return;
     }
@@ -154,9 +197,11 @@ class Editor extends PureComponent {
       }
     } else if (e.keyCode === DOWN) {
       e.preventDefault();
+
       this._focusNextPair();
     } else if (e.keyCode === UP) {
       e.preventDefault();
+
       this._focusPreviousPair();
     } else if (e.keyCode === LEFT) {
       // TODO: Implement this
@@ -166,15 +211,22 @@ class Editor extends PureComponent {
   }
 
   _onChange(pairs) {
-    this.setState({ pairs }, () => {
-      clearTimeout(this._triggerTimeout);
-      this._triggerTimeout = setTimeout(() => {
-        this.props.onChange(pairs);
-      }, DEBOUNCE_MILLIS);
-    });
+    this.setState(
+      {
+        pairs,
+      },
+      () => {
+        if (this._triggerTimeout !== null) {
+          clearTimeout(this._triggerTimeout);
+        }
+        this._triggerTimeout = setTimeout(() => {
+          this.props.onChange(pairs);
+        }, DEBOUNCE_MILLIS);
+      },
+    );
   }
 
-  _addPair(position) {
+  _addPair(position?: number) {
     const numPairs = this.state.pairs.length;
     const { maxPairs } = this.props;
 
@@ -184,8 +236,8 @@ class Editor extends PureComponent {
     }
 
     position = position === undefined ? numPairs : position;
-
     const pair = {
+      id: '',
       name: '',
       value: '',
       description: '',
@@ -203,6 +255,7 @@ class Editor extends PureComponent {
     ];
 
     this._setFocusedPair(pair);
+
     this._onChange(pairs);
 
     this.props.onCreate && this.props.onCreate();
@@ -217,11 +270,11 @@ class Editor extends PureComponent {
 
     const pair = this.state.pairs[position];
     this.props.onDelete && this.props.onDelete(pair);
-
     const pairs = [...this.state.pairs.slice(0, position), ...this.state.pairs.slice(position + 1)];
 
     if (focusedPosition >= position) {
       const newPosition = breakFocus ? -1 : focusedPosition - 1;
+
       this._setFocusedPair(pairs[newPosition]);
     }
 
@@ -235,12 +288,15 @@ class Editor extends PureComponent {
 
     if (this._focusedField === NAME) {
       this._focusedField = VALUE;
+
       this._updateFocus();
     } else if (this._focusedField === VALUE && this.state.displayDescription) {
       this._focusedField = DESCRIPTION;
+
       this._updateFocus();
     } else if (this._focusedField === VALUE || this._focusedField === DESCRIPTION) {
       this._focusedField = NAME;
+
       if (addIfValue) {
         this._addPair(this._getFocusedPairIndex() + 1);
       } else {
@@ -252,19 +308,24 @@ class Editor extends PureComponent {
   _focusPrevious(deleteIfEmpty = false) {
     if (this._focusedField === DESCRIPTION) {
       this._focusedField = VALUE;
+
       this._updateFocus();
     } else if (this._focusedField === VALUE) {
       this._focusedField = NAME;
+
       this._updateFocus();
     } else if (this._focusedField === NAME) {
       const p = this._getFocusedPair();
+
       const notEmpty = !p.name && !p.value && !p.fileName;
 
       if (!this.props.disableDelete && notEmpty && deleteIfEmpty) {
         this._focusedField = VALUE;
+
         this._deletePair(this._getFocusedPairIndex());
       } else if (!p.name) {
         this._focusedField = VALUE;
+
         this._focusPreviousPair();
       }
     }
@@ -287,6 +348,7 @@ class Editor extends PureComponent {
       this._addPair();
     } else {
       this._setFocusedPair(this.state.pairs[i + 1]);
+
       this._updateFocus();
     }
   }
@@ -297,14 +359,17 @@ class Editor extends PureComponent {
     }
 
     const i = this._getFocusedPairIndex();
+
     if (i > 0) {
       this._setFocusedPair(this.state.pairs[i - 1]);
+
       this._updateFocus();
     }
   }
 
   _updateFocus() {
     const pair = this._getFocusedPair();
+
     const id = pair ? pair.id : 'n/a';
     const row = this._rows[id];
 
@@ -346,7 +411,9 @@ class Editor extends PureComponent {
   }
 
   _toggleDescription() {
-    this.setState({ displayDescription: !this.state.displayDescription });
+    this.setState({
+      displayDescription: !this.state.displayDescription,
+    });
   }
 
   componentDidUpdate() {
@@ -372,9 +439,7 @@ class Editor extends PureComponent {
       sortable,
       disableDelete,
     } = this.props;
-
     const { pairs } = this.state;
-
     const classes = classnames('key-value-editor', 'wide', className);
     return (
       <Lazy delay={pairs.length > 20 ? 50 : -1}>
@@ -445,7 +510,12 @@ class Editor extends PureComponent {
               onFocusDescription={this._handleAddFromDescription}
               allowMultiline={allowMultiline}
               allowFile={allowFile}
-              pair={{ name: '', value: '', description: '' }}
+              // @ts-expect-error -- TSCONVERSION missing defaults
+              pair={{
+                name: '',
+                value: '',
+                description: '',
+              }}
             />
           ) : null}
         </ul>
@@ -454,32 +524,4 @@ class Editor extends PureComponent {
   }
 }
 
-Editor.propTypes = {
-  onChange: PropTypes.func.isRequired,
-  pairs: PropTypes.arrayOf(PropTypes.object).isRequired,
-
-  // Optional
-  handleRender: PropTypes.func,
-  handleGetRenderContext: PropTypes.func,
-  nunjucksPowerUserMode: PropTypes.bool,
-  isVariableUncovered: PropTypes.bool,
-  handleGetAutocompleteNameConstants: PropTypes.func,
-  handleGetAutocompleteValueConstants: PropTypes.func,
-  allowFile: PropTypes.bool,
-  allowMultiline: PropTypes.bool,
-  sortable: PropTypes.bool,
-  maxPairs: PropTypes.number,
-  namePlaceholder: PropTypes.string,
-  valuePlaceholder: PropTypes.string,
-  descriptionPlaceholder: PropTypes.string,
-  valueInputType: PropTypes.string,
-  disableDelete: PropTypes.bool,
-  onToggleDisable: PropTypes.func,
-  onChangeType: PropTypes.func,
-  onChooseFile: PropTypes.func,
-  onDelete: PropTypes.func,
-  onCreate: PropTypes.func,
-  className: PropTypes.string,
-};
-
 export default Editor;
diff --git a/packages/insomnia-app/app/ui/components/key-value-editor/row.js b/packages/insomnia-app/app/ui/components/key-value-editor/row.tsx
similarity index 71%
rename from packages/insomnia-app/app/ui/components/key-value-editor/row.js
rename to packages/insomnia-app/app/ui/components/key-value-editor/row.tsx
index 75a6353564..a5cb0adbf5 100644
--- a/packages/insomnia-app/app/ui/components/key-value-editor/row.js
+++ b/packages/insomnia-app/app/ui/components/key-value-editor/row.tsx
@@ -1,10 +1,9 @@
 // eslint-disable-next-line filenames/match-exported
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
-import { DragSource, DropTarget } from 'react-dnd';
+import { ConnectDragPreview, ConnectDragSource, ConnectDropTarget, DragSource, DropTarget } from 'react-dnd';
 import classnames from 'classnames';
 import FileInputButton from '../base/file-input-button';
 import { Dropdown, DropdownButton, DropdownItem } from '../base/dropdown/index';
@@ -14,19 +13,70 @@ import Button from '../base/button';
 import OneLineEditor from '../codemirror/one-line-editor';
 import { showModal } from '../modals/index';
 import { describeByteSize } from '../../../common/misc';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
+
+interface Props {
+  onChange: Function,
+  onDelete: Function,
+  onFocusName: Function,
+  onFocusValue: Function,
+  onFocusDescription: Function,
+  displayDescription: boolean,
+  index: number,
+  pair: {
+    id: string,
+    name: string,
+    value: string,
+    description: string,
+    fileName: string,
+    type: string,
+    disabled: boolean,
+  },
+  readOnly?: boolean,
+  onMove?: Function,
+  onKeyDown?: Function,
+  onBlurName?: Function,
+  onBlurValue?: Function,
+  onBlurDescription?: Function,
+  handleRender?: HandleRender,
+  handleGetRenderContext?: HandleGetRenderContext,
+  nunjucksPowerUserMode?: boolean,
+  isVariableUncovered?: boolean,
+  handleGetAutocompleteNameConstants?: Function,
+  handleGetAutocompleteValueConstants?: Function,
+  namePlaceholder?: string,
+  valuePlaceholder?: string,
+  descriptionPlaceholder?: string,
+  valueInputType?: string,
+  forceInput?: boolean,
+  allowMultiline?: boolean,
+  allowFile?: boolean,
+  sortable?: boolean,
+  noDelete?: boolean,
+  noDropZone?: boolean,
+  hideButtons?: boolean,
+  className?: string,
+  renderLeftIcon?: Function,
+  // For drag-n-drop
+  connectDragSource?: ConnectDragSource,
+  connectDragPreview?: ConnectDragPreview,
+  connectDropTarget?: ConnectDropTarget,
+  isDragging?: boolean,
+  isDraggingOver?: boolean,
+}
+
+interface State {
+  dragDirection: number;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class KeyValueEditorRow extends PureComponent {
-  constructor(props) {
-    super(props);
-
-    this._nameInput = null;
-    this._valueInput = null;
-    this._descriptionInput = null;
-    this.state = {
-      dragDirection: 0,
-    };
-  }
+class KeyValueEditorRow extends PureComponent<Props, State> {
+  _nameInput: OneLineEditor | null = null;
+  _valueInput: OneLineEditor | FileInputButton | null = null;
+  _descriptionInput: OneLineEditor | null = null;
+  state: State = {
+    dragDirection: 0,
+  };
 
   focusNameEnd() {
     if (this._nameInput) {
@@ -36,31 +86,23 @@ class KeyValueEditorRow extends PureComponent {
 
   focusValueEnd() {
     if (this._valueInput) {
-      this._valueInput.focusEnd();
+      this._valueInput?.focusEnd();
     }
   }
 
   focusDescriptionEnd() {
-    if (this._descriptionInput) {
-      this._descriptionInput.focusEnd();
-    }
+    this._descriptionInput?.focusEnd();
   }
 
   setDragDirection(dragDirection) {
     if (dragDirection !== this.state.dragDirection) {
-      this.setState({ dragDirection });
+      this.setState({
+        dragDirection,
+      });
     }
   }
 
-  _setNameInputRef(n) {
-    this._nameInput = n;
-  }
-
-  _setValueInputRef(n) {
-    this._valueInput = n;
-  }
-
-  _setDescriptionInputRef(n) {
+  _setDescriptionInputRef(n: OneLineEditor) {
     this._descriptionInput = n;
   }
 
@@ -70,7 +112,9 @@ class KeyValueEditorRow extends PureComponent {
   }
 
   _handleNameChange(name) {
-    this._sendChange({ name });
+    this._sendChange({
+      name,
+    });
   }
 
   _handleValuePaste(e) {
@@ -79,46 +123,68 @@ class KeyValueEditorRow extends PureComponent {
     }
 
     const value = e.clipboardData.getData('text/plain');
+
     if (value && value.includes('\n')) {
       e.preventDefault();
 
-      // Insert the pasted text into the current selection. Unfortunately, this
-      // is the easiest way to do this.
-      const currentValue = this._valueInput.getValue();
-      const prefix = currentValue.slice(0, this._valueInput.getSelectionStart());
-      const suffix = currentValue.slice(this._valueInput.getSelectionEnd());
+      // Insert the pasted text into the current selection.
+      // Unfortunately, this is the easiest way to do this.
+      // @ts-expect-error -- TSCONVERSION
+      const currentValue = this._valueInput?.getValue();
+
+      // @ts-expect-error -- TSCONVERSION
+      const prefix = currentValue.slice(0, this._valueInput?.getSelectionStart());
+      // @ts-expect-error -- TSCONVERSION
+      const suffix = currentValue.slice(this._valueInput?.getSelectionEnd());
       const finalValue = `${prefix}${value}${suffix}`;
 
       // Update type and value
-      this._handleTypeChange({ type: 'text', multiline: 'text/plain' });
+      this._handleTypeChange({
+        type: 'text',
+        multiline: 'text/plain',
+      });
+
       this._handleValueChange(finalValue);
     }
   }
 
   _handleValueChange(value) {
-    this._sendChange({ value });
+    this._sendChange({
+      value,
+    });
   }
 
   _handleFileNameChange(fileName) {
-    this._sendChange({ fileName });
+    this._sendChange({
+      fileName,
+    });
   }
 
   _handleDescriptionChange(description) {
-    this._sendChange({ description });
+    this._sendChange({
+      description,
+    });
   }
 
   _handleTypeChange(def) {
     // Remove newlines if converting to text
     let value = this.props.pair.value || '';
+
     if (def.type === 'text' && !def.multiline && value.includes('\n')) {
       value = value.replace(/\n/g, '');
     }
 
-    this._sendChange({ type: def.type, multiline: def.multiline, value });
+    this._sendChange({
+      type: def.type,
+      multiline: def.multiline,
+      value,
+    });
   }
 
   _handleDisableChange(disabled) {
-    this._sendChange({ disabled });
+    this._sendChange({
+      disabled,
+    });
   }
 
   _handleFocusName(e) {
@@ -141,7 +207,7 @@ class KeyValueEditorRow extends PureComponent {
 
   _handleBlurValue(e) {
     if (this.props.onBlurName) {
-      this.props.onBlurValue(this.props.pair, e);
+      this.props.onBlurValue?.(this.props.pair, e);
     }
   }
 
@@ -165,6 +231,7 @@ class KeyValueEditorRow extends PureComponent {
 
   _handleAutocompleteNames() {
     const { handleGetAutocompleteNameConstants } = this.props;
+
     if (handleGetAutocompleteNameConstants) {
       return handleGetAutocompleteNameConstants(this.props.pair);
     }
@@ -172,6 +239,7 @@ class KeyValueEditorRow extends PureComponent {
 
   _handleAutocompleteValues() {
     const { handleGetAutocompleteValueConstants } = this.props;
+
     if (handleGetAutocompleteValueConstants) {
       return handleGetAutocompleteValueConstants(this.props.pair);
     }
@@ -179,16 +247,20 @@ class KeyValueEditorRow extends PureComponent {
 
   _handleEditMultiline() {
     const { pair, handleRender, handleGetRenderContext } = this.props;
-
     showModal(CodePromptModal, {
       submitName: 'Done',
       title: `Edit ${pair.name}`,
       defaultValue: pair.value,
       onChange: this._handleValueChange,
       enableRender: handleRender || handleGetRenderContext,
+      // @ts-expect-error -- TSCONVERSION
       mode: pair.multiline || 'text/plain',
       onModeChange: mode => {
-        this._handleTypeChange(Object.assign({}, pair, { multiline: mode }));
+        this._handleTypeChange(
+          Object.assign({}, pair, {
+            multiline: mode,
+          }),
+        );
       },
     });
   }
@@ -205,7 +277,6 @@ class KeyValueEditorRow extends PureComponent {
       nunjucksPowerUserMode,
       isVariableUncovered,
     } = this.props;
-
     return displayDescription ? (
       <div
         className={classnames(
@@ -216,6 +287,7 @@ class KeyValueEditorRow extends PureComponent {
         )}>
         <OneLineEditor
           ref={this._setDescriptionInputRef}
+          // @ts-expect-error -- TSCONVERSION very strange that one of the `OneLineEditor`s in this file _doesn't_ error with this...
           readOnly={readOnly}
           forceInput={forceInput}
           placeholder={descriptionPlaceholder || 'Description'}
@@ -249,7 +321,7 @@ class KeyValueEditorRow extends PureComponent {
     if (pair.type === 'file') {
       return (
         <FileInputButton
-          ref={this._setValueInputRef}
+          ref={ref => { this._valueInput = ref; }}
           showFileName
           showFileIcon
           className="btn btn--outlined btn--super-duper-compact wide ellipsis"
@@ -257,6 +329,7 @@ class KeyValueEditorRow extends PureComponent {
           onChange={this._handleFileNameChange}
         />
       );
+      // @ts-expect-error -- TSCONVERSION
     } else if (pair.type === 'text' && pair.multiline) {
       const bytes = Buffer.from(pair.value, 'utf8').length;
       return (
@@ -270,7 +343,8 @@ class KeyValueEditorRow extends PureComponent {
     } else {
       return (
         <OneLineEditor
-          ref={this._setValueInputRef}
+          ref={ref => { this._valueInput = ref; }}
+          // @ts-expect-error -- TSCONVERSION very strange that one of the `OneLineEditor`s in this file _doesn't_ error with this...
           readOnly={readOnly}
           forceInput={forceInput}
           type={valueInputType || 'text'}
@@ -293,7 +367,6 @@ class KeyValueEditorRow extends PureComponent {
 
   renderPairSelector() {
     const { hideButtons, allowMultiline, allowFile } = this.props;
-
     const showDropdown = allowMultiline || allowFile;
 
     // Put a spacer in for dropdown if needed
@@ -315,18 +388,30 @@ class KeyValueEditorRow extends PureComponent {
           <DropdownButton className="tall">
             <i className="fa fa-caret-down" />
           </DropdownButton>
-          <DropdownItem onClick={this._handleTypeChange} value={{ type: 'text', multiline: false }}>
+          <DropdownItem
+            onClick={this._handleTypeChange}
+            value={{
+              type: 'text',
+              multiline: false,
+            }}>
             Text
           </DropdownItem>
           {allowMultiline && (
             <DropdownItem
               onClick={this._handleTypeChange}
-              value={{ type: 'text', multiline: true }}>
+              value={{
+                type: 'text',
+                multiline: true,
+              }}>
               Text (Multi-line)
             </DropdownItem>
           )}
           {allowFile && (
-            <DropdownItem onClick={this._handleTypeChange} value={{ type: 'file' }}>
+            <DropdownItem
+              onClick={this._handleTypeChange}
+              value={{
+                type: 'file',
+              }}>
               File
             </DropdownItem>
           )}
@@ -359,9 +444,7 @@ class KeyValueEditorRow extends PureComponent {
       connectDragPreview,
       connectDropTarget,
     } = this.props;
-
     const { dragDirection } = this.state;
-
     const classes = classnames(className, {
       'key-value-editor__row-wrapper': true,
       'key-value-editor__row-wrapper--dragging': isDragging,
@@ -370,12 +453,13 @@ class KeyValueEditorRow extends PureComponent {
       'key-value-editor__row-wrapper--disabled': pair.disabled,
     });
 
-    let handle = null;
+    let handle: ConnectDragSource | JSX.Element | undefined | null = null;
+
     if (sortable) {
       handle = renderLeftIcon ? (
         <div className="key-value-editor__drag">{renderLeftIcon()}</div>
       ) : (
-        connectDragSource(
+        connectDragSource?.(
           <div className="key-value-editor__drag">
             <i className={'fa ' + (hideButtons ? 'fa-empty' : 'fa-reorder')} />
           </div>,
@@ -392,7 +476,7 @@ class KeyValueEditorRow extends PureComponent {
               'form-control--inactive': pair.disabled,
             })}>
             <OneLineEditor
-              ref={this._setNameInputRef}
+              ref={ref => { this._nameInput = ref; }}
               placeholder={namePlaceholder || 'Name'}
               defaultValue={pair.name}
               render={handleRender}
@@ -401,6 +485,7 @@ class KeyValueEditorRow extends PureComponent {
               isVariableUncovered={isVariableUncovered}
               getAutocompleteConstants={this._handleAutocompleteNames}
               forceInput={forceInput}
+              // @ts-expect-error -- TSCONVERSION very strange that one of the `OneLineEditor`s in this file _doesn't_ error with this...
               readOnly={readOnly}
               onBlur={this._handleBlurName}
               onChange={this._handleNameChange}
@@ -458,77 +543,28 @@ class KeyValueEditorRow extends PureComponent {
     if (noDropZone) {
       return row;
     } else {
-      return connectDragPreview(connectDropTarget(row));
+      const dropTarget = connectDropTarget?.(row);
+      // @ts-expect-error -- TSCONVERSION investigate whether a cast is actually appropriate here
+      return connectDragPreview?.(dropTarget);
     }
   }
 }
 
-KeyValueEditorRow.propTypes = {
-  // Required
-  onChange: PropTypes.func.isRequired,
-  onDelete: PropTypes.func.isRequired,
-  onFocusName: PropTypes.func.isRequired,
-  onFocusValue: PropTypes.func.isRequired,
-  onFocusDescription: PropTypes.func.isRequired,
-  displayDescription: PropTypes.bool,
-  index: PropTypes.number.isRequired,
-  pair: PropTypes.shape({
-    name: PropTypes.string.isRequired,
-    value: PropTypes.string,
-    description: PropTypes.string,
-    fileName: PropTypes.string,
-    type: PropTypes.string,
-    disabled: PropTypes.bool,
-  }).isRequired,
-
-  // Optional
-  readOnly: PropTypes.bool,
-  onMove: PropTypes.func,
-  onKeyDown: PropTypes.func,
-  onBlurName: PropTypes.func,
-  onBlurValue: PropTypes.func,
-  onBlurDescription: PropTypes.func,
-  handleRender: PropTypes.func,
-  handleGetRenderContext: PropTypes.func,
-  nunjucksPowerUserMode: PropTypes.bool,
-  isVariableUncovered: PropTypes.bool,
-  handleGetAutocompleteNameConstants: PropTypes.func,
-  handleGetAutocompleteValueConstants: PropTypes.func,
-  namePlaceholder: PropTypes.string,
-  valuePlaceholder: PropTypes.string,
-  descriptionPlaceholder: PropTypes.string,
-  valueInputType: PropTypes.string,
-  forceInput: PropTypes.bool,
-  allowMultiline: PropTypes.bool,
-  allowFile: PropTypes.bool,
-  sortable: PropTypes.bool,
-  noDelete: PropTypes.bool,
-  noDropZone: PropTypes.bool,
-  hideButtons: PropTypes.bool,
-  className: PropTypes.string,
-  renderLeftIcon: PropTypes.func,
-
-  // For drag-n-drop
-  connectDragSource: PropTypes.func,
-  connectDragPreview: PropTypes.func,
-  connectDropTarget: PropTypes.func,
-  isDragging: PropTypes.bool,
-  isDraggingOver: PropTypes.bool,
-};
-
 const dragSource = {
-  beginDrag(props) {
-    return { pair: props.pair };
+  beginDrag(props: Props) {
+    return {
+      pair: props.pair,
+    };
   },
 };
 
 function isAbove(monitor, component) {
   const hoveredNode = ReactDOM.findDOMNode(component);
-
+  // @ts-expect-error -- TSCONVERSION
   const hoveredTop = hoveredNode.getBoundingClientRect().top;
+  // @ts-expect-error -- TSCONVERSION
   const height = hoveredNode.clientHeight;
   const draggedTop = monitor.getSourceClientOffset().y;
-
   // NOTE: Not quite sure why it's height / 3 (seems to work)
   return hoveredTop > draggedTop - height / 3;
 }
@@ -541,7 +577,8 @@ const dragTarget = {
       props.onMove(monitor.getItem().pair, props.pair, -1);
     }
   },
-  hover(props, monitor, component) {
+
+  hover(_props, monitor, component) {
     if (isAbove(monitor, component)) {
       component.setDragDirection(1);
     } else {
@@ -550,23 +587,16 @@ const dragTarget = {
   },
 };
 
-function sourceCollect(connect, monitor) {
-  return {
-    connectDragSource: connect.dragSource(),
-    connectDragPreview: connect.dragPreview(),
-    isDragging: monitor.isDragging(),
-  };
-}
+const source = DragSource('KEY_VALUE_EDITOR', dragSource, (connect, monitor) => ({
+  connectDragSource: connect.dragSource(),
+  connectDragPreview: connect.dragPreview(),
+  isDragging: monitor.isDragging(),
+}))(KeyValueEditorRow);
 
-function targetCollect(connect, monitor) {
-  return {
-    connectDropTarget: connect.dropTarget(),
-    isDraggingOver: monitor.isOver(),
-  };
-}
-
-const source = DragSource('KEY_VALUE_EDITOR', dragSource, sourceCollect)(KeyValueEditorRow);
-const target = DropTarget('KEY_VALUE_EDITOR', dragTarget, targetCollect)(source);
+const target = DropTarget('KEY_VALUE_EDITOR', dragTarget, (connect, monitor) => ({
+  connectDropTarget: connect.dropTarget(),
+  isDraggingOver: monitor.isOver(),
+}))(source);
 
 target.prototype.focusNameEnd = function() {
   this.decoratedRef.current.decoratedRef.current.focusNameEnd();
diff --git a/packages/insomnia-app/app/ui/components/keydown-binder.js b/packages/insomnia-app/app/ui/components/keydown-binder.ts
similarity index 85%
rename from packages/insomnia-app/app/ui/components/keydown-binder.js
rename to packages/insomnia-app/app/ui/components/keydown-binder.ts
index 9563323278..d862096bca 100644
--- a/packages/insomnia-app/app/ui/components/keydown-binder.js
+++ b/packages/insomnia-app/app/ui/components/keydown-binder.ts
@@ -1,20 +1,19 @@
-// @flow
-import * as React from 'react';
+import { PureComponent, ReactNode } from 'react';
 import ReactDOM from 'react-dom';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { isMac, AUTOBIND_CFG } from '../../common/constants';
 
-type Props = {
-  children: React.Node,
-  onKeydown?: Function,
-  onKeyup?: Function,
-  disabled?: boolean,
-  scoped?: boolean,
-  stopMetaPropagation?: boolean,
-};
+interface Props {
+  children: ReactNode;
+  onKeydown?: (...args: Array<any>) => any;
+  onKeyup?: (...args: Array<any>) => any;
+  disabled?: boolean;
+  scoped?: boolean;
+  stopMetaPropagation?: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class KeydownBinder extends React.PureComponent<Props> {
+class KeydownBinder extends PureComponent<Props> {
   _handleKeydown(e: KeyboardEvent) {
     const { stopMetaPropagation, onKeydown, disabled } = this.props;
 
@@ -23,6 +22,7 @@ class KeydownBinder extends React.PureComponent<Props> {
     }
 
     const isMeta = isMac() ? e.metaKey : e.ctrlKey;
+
     if (stopMetaPropagation && isMeta) {
       e.stopPropagation();
     }
@@ -40,6 +40,7 @@ class KeydownBinder extends React.PureComponent<Props> {
     }
 
     const isMeta = isMac() ? e.metaKey : e.ctrlKey;
+
     if (stopMetaPropagation && isMeta) {
       e.stopPropagation();
     }
diff --git a/packages/insomnia-app/app/ui/components/markdown-editor.js b/packages/insomnia-app/app/ui/components/markdown-editor.tsx
similarity index 77%
rename from packages/insomnia-app/app/ui/components/markdown-editor.js
rename to packages/insomnia-app/app/ui/components/markdown-editor.tsx
index d3187a8540..5180ba4c60 100644
--- a/packages/insomnia-app/app/ui/components/markdown-editor.js
+++ b/packages/insomnia-app/app/ui/components/markdown-editor.tsx
@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../common/constants';
 import classnames from 'classnames';
@@ -7,10 +6,35 @@ import { Tab, TabList, TabPanel, Tabs } from 'react-tabs';
 import Button from './base/button';
 import CodeEditor from './codemirror/code-editor';
 import MarkdownPreview from './markdown-preview';
+import { HandleGetRenderContext, HandleRender } from '../../common/render';
+
+interface Props {
+  onChange: Function,
+  defaultValue: string,
+  fontSize: number,
+  indentSize: number,
+  keyMap: string,
+  lineWrapping: boolean,
+  handleRender: HandleRender,
+  handleGetRenderContext: HandleGetRenderContext,
+  nunjucksPowerUserMode: boolean,
+  isVariableUncovered: boolean,
+  placeholder?: string,
+  defaultPreviewMode?: boolean,
+  className?: string,
+  mode?: string,
+  tall?: boolean,
+}
+
+interface State {
+  markdown: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class MarkdownEditor extends PureComponent {
-  constructor(props) {
+class MarkdownEditor extends PureComponent<Props, State> {
+  _editor: CodeEditor | null = null;
+
+  constructor(props: Props) {
     super(props);
     this.state = {
       markdown: props.defaultValue,
@@ -19,10 +43,12 @@ class MarkdownEditor extends PureComponent {
 
   _handleChange(markdown) {
     this.props.onChange(markdown);
-    this.setState({ markdown });
+    this.setState({
+      markdown,
+    });
   }
 
-  _setEditorRef(n) {
+  _setEditorRef(n: CodeEditor) {
     this._editor = n;
   }
 
@@ -50,13 +76,10 @@ class MarkdownEditor extends PureComponent {
       nunjucksPowerUserMode,
       isVariableUncovered,
     } = this.props;
-
     const { markdown } = this.state;
-
     const classes = classnames('react-tabs', 'markdown-editor', 'outlined', className, {
       'markdown-editor--dynamic-height': !tall,
     });
-
     return (
       <Tabs className={classes} defaultIndex={defaultPreviewMode ? 1 : 0}>
         <TabList>
@@ -101,25 +124,4 @@ class MarkdownEditor extends PureComponent {
   }
 }
 
-MarkdownEditor.propTypes = {
-  // Required
-  onChange: PropTypes.func.isRequired,
-  defaultValue: PropTypes.string.isRequired,
-  fontSize: PropTypes.number.isRequired,
-  indentSize: PropTypes.number.isRequired,
-  keyMap: PropTypes.string.isRequired,
-  lineWrapping: PropTypes.bool.isRequired,
-  handleRender: PropTypes.func.isRequired,
-  handleGetRenderContext: PropTypes.func.isRequired,
-  nunjucksPowerUserMode: PropTypes.bool.isRequired,
-  isVariableUncovered: PropTypes.bool.isRequired,
-
-  // Optional
-  placeholder: PropTypes.string,
-  defaultPreviewMode: PropTypes.bool,
-  className: PropTypes.string,
-  mode: PropTypes.string,
-  tall: PropTypes.bool,
-};
-
 export default MarkdownEditor;
diff --git a/packages/insomnia-app/app/ui/components/markdown-preview.js b/packages/insomnia-app/app/ui/components/markdown-preview.tsx
similarity index 71%
rename from packages/insomnia-app/app/ui/components/markdown-preview.js
rename to packages/insomnia-app/app/ui/components/markdown-preview.tsx
index d7448f7c18..f9e9e72d26 100644
--- a/packages/insomnia-app/app/ui/components/markdown-preview.js
+++ b/packages/insomnia-app/app/ui/components/markdown-preview.tsx
@@ -1,28 +1,44 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import classnames from 'classnames';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../common/constants';
 import highlight from 'highlight.js';
-import * as misc from '../../common/misc';
 import { markdownToHTML } from '../../common/markdown-to-html';
+import { HandleRender } from '../../common/render';
+import { clickLink } from '../../common/electron-helpers';
+
+interface Props {
+  markdown: string,
+  handleRender?: HandleRender,
+  className?: string,
+  debounceMillis?: number,
+  heading?: string,
+}
+
+interface State {
+  compiled: string;
+  renderError: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class MarkdownPreview extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      compiled: '',
-      renderError: '',
-    };
+class MarkdownPreview extends PureComponent<Props, State> {
+  state: State = {
+    compiled: '',
+    renderError: '',
   }
 
+  _compileTimeout: NodeJS.Timeout | null = null;
+  _preview: HTMLDivElement | null = null;
+
   /**
    * Debounce and compile the markdown (won't debounce first render)
    */
   _compileMarkdown(markdown) {
-    clearTimeout(this._compileTimeout);
+    if (this._compileTimeout !== null) {
+      clearTimeout(this._compileTimeout);
+    }
+    // @ts-expect-error -- TSCONVERSION
     this._compileTimeout = setTimeout(
       async () => {
         try {
@@ -44,13 +60,13 @@ class MarkdownPreview extends PureComponent {
     );
   }
 
-  _setPreviewRef(n) {
+  _setPreviewRef(n: HTMLDivElement) {
     this._preview = n;
   }
 
   _handleClickLink(e) {
     e.preventDefault();
-    misc.clickLink(e.target.getAttribute('href'));
+    clickLink(e.target.getAttribute('href'));
   }
 
   _highlightCodeBlocks() {
@@ -59,10 +75,13 @@ class MarkdownPreview extends PureComponent {
     }
 
     const el = ReactDOM.findDOMNode(this._preview);
+
+    // @ts-expect-error -- TSCONVERSION
     for (const block of el.querySelectorAll('pre > code')) {
       highlight.highlightBlock(block);
     }
 
+    // @ts-expect-error -- TSCONVERSION
     for (const a of el.querySelectorAll('a')) {
       a.title = `Open ${a.getAttribute('href')} in browser`;
       a.removeEventListener('click', this._handleClickLink);
@@ -71,7 +90,9 @@ class MarkdownPreview extends PureComponent {
   }
 
   componentWillUnmount() {
-    clearTimeout(this._compileTimeout);
+    if (this._compileTimeout !== null) {
+      clearTimeout(this._compileTimeout);
+    }
   }
 
   // eslint-disable-next-line camelcase
@@ -80,7 +101,7 @@ class MarkdownPreview extends PureComponent {
   }
 
   // eslint-disable-next-line camelcase
-  UNSAFE_componentWillReceiveProps(nextProps) {
+  UNSAFE_componentWillReceiveProps(nextProps: Props) {
     this._compileMarkdown(nextProps.markdown);
   }
 
@@ -95,15 +116,15 @@ class MarkdownPreview extends PureComponent {
   render() {
     const { className, heading } = this.props;
     const { compiled, renderError } = this.state;
-
     const html = heading ? `<h1>${heading}</h1>\n${compiled}` : compiled;
-
     return (
       <div ref={this._setPreviewRef} className={classnames('markdown-preview', className)}>
         {renderError && <p className="notice error no-margin">Failed to render: {renderError}</p>}
         <div
           className="markdown-preview__content selectable"
-          dangerouslySetInnerHTML={{ __html: html }}>
+          dangerouslySetInnerHTML={{
+            __html: html,
+          }}>
           {/* Set from above */}
         </div>
       </div>
@@ -111,15 +132,4 @@ class MarkdownPreview extends PureComponent {
   }
 }
 
-MarkdownPreview.propTypes = {
-  // Required
-  markdown: PropTypes.string.isRequired,
-
-  // Optional
-  handleRender: PropTypes.func,
-  className: PropTypes.string,
-  debounceMillis: PropTypes.number,
-  heading: PropTypes.string,
-};
-
 export default MarkdownPreview;
diff --git a/packages/insomnia-app/app/ui/components/modals/__mocks__/index.js b/packages/insomnia-app/app/ui/components/modals/__mocks__/index.ts
similarity index 67%
rename from packages/insomnia-app/app/ui/components/modals/__mocks__/index.js
rename to packages/insomnia-app/app/ui/components/modals/__mocks__/index.ts
index 6d247b3fe8..0e14e922f5 100644
--- a/packages/insomnia-app/app/ui/components/modals/__mocks__/index.js
+++ b/packages/insomnia-app/app/ui/components/modals/__mocks__/index.ts
@@ -6,4 +6,5 @@ modals.showAlert = jest.fn();
 modals.showPrompt = jest.fn();
 modals.showModal = jest.fn();
 
+// WARNING: changing this to `export default` will break the mock and be incredibly hard to debug. Ask me how I know.
 module.exports = modals;
diff --git a/packages/insomnia-app/app/ui/components/modals/add-key-combination-modal.js b/packages/insomnia-app/app/ui/components/modals/add-key-combination-modal.tsx
similarity index 85%
rename from packages/insomnia-app/app/ui/components/modals/add-key-combination-modal.js
rename to packages/insomnia-app/app/ui/components/modals/add-key-combination-modal.tsx
index af06a823a4..e0e2b7617f 100644
--- a/packages/insomnia-app/app/ui/components/modals/add-key-combination-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/add-key-combination-modal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
@@ -11,30 +10,25 @@ import { constructKeyCombinationDisplay, isModifierKeyCode } from '../../../comm
 import { keyboardKeys } from '../../../common/keyboard-keys';
 import * as misc from '../../../common/misc';
 
-type Props = {};
-
-type State = {
-  hotKeyRefId: string | null,
-  checkKeyCombinationDuplicate: Function,
-  onAddKeyCombination: Function,
-  pressedKeyCombination: KeyCombination | null,
-};
+interface State {
+  hotKeyRefId: string | null;
+  checkKeyCombinationDuplicate: (...args: Array<any>) => any;
+  onAddKeyCombination: (...args: Array<any>) => any;
+  pressedKeyCombination: KeyCombination | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class AddKeyCombinationModal extends PureComponent<Props, State> {
-  _modal: Modal | null;
+class AddKeyCombinationModal extends PureComponent<{}, State> {
+  _modal: Modal | null = null;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      hotKeyRefId: null,
-      checkKeyCombinationDuplicate: misc.nullFn,
-      onAddKeyCombination: misc.nullFn,
-      pressedKeyCombination: null,
-    };
+  state: State = {
+    hotKeyRefId: null,
+    checkKeyCombinationDuplicate: misc.nullFn,
+    onAddKeyCombination: misc.nullFn,
+    pressedKeyCombination: null,
   }
 
-  _setModalRef(modal: ?Modal) {
+  _setModalRef(modal: Modal) {
     this._modal = modal;
   }
 
@@ -95,7 +89,11 @@ class AddKeyCombinationModal extends PureComponent<Props, State> {
     });
   }
 
-  show(hotKeyRefId: string, checkKeyCombinationDuplicate: Function, onAddKeyCombination: Function) {
+  show(
+    hotKeyRefId: string,
+    checkKeyCombinationDuplicate: (...args: Array<any>) => any,
+    onAddKeyCombination: (...args: Array<any>) => any,
+  ) {
     this.setState({
       hotKeyRefId: hotKeyRefId,
       checkKeyCombinationDuplicate: checkKeyCombinationDuplicate,
@@ -113,14 +111,15 @@ class AddKeyCombinationModal extends PureComponent<Props, State> {
     const { checkKeyCombinationDuplicate, pressedKeyCombination } = this.state;
     let keyCombDisplay = '';
     let isDuplicate = false;
+
     if (pressedKeyCombination != null) {
       keyCombDisplay = constructKeyCombinationDisplay(pressedKeyCombination, true).toLowerCase();
       isDuplicate = checkKeyCombinationDuplicate(pressedKeyCombination);
     }
+
     const duplicateMessageClasses = classnames('margin-bottom margin-left faint italic txt-md', {
       hidden: !isDuplicate,
     });
-
     return (
       <Modal
         ref={this._setModalRef}
diff --git a/packages/insomnia-app/app/ui/components/modals/alert-modal.js b/packages/insomnia-app/app/ui/components/modals/alert-modal.tsx
similarity index 70%
rename from packages/insomnia-app/app/ui/components/modals/alert-modal.js
rename to packages/insomnia-app/app/ui/components/modals/alert-modal.tsx
index 452dec58b9..392804bbe1 100644
--- a/packages/insomnia-app/app/ui/components/modals/alert-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/alert-modal.tsx
@@ -6,26 +6,36 @@ import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import ModalFooter from '../base/modal-footer';
 
-@autoBindMethodsForReact(AUTOBIND_CFG)
-class AlertModal extends PureComponent {
-  constructor(props) {
-    super(props);
+interface State {
+  title: string;
+  message: string;
+  addCancel: boolean;
+  okLabel: string;
+}
 
-    this.state = {
-      title: '',
-      message: '',
-      addCancel: false,
-      okLabel: '',
-    };
+@autoBindMethodsForReact(AUTOBIND_CFG)
+class AlertModal extends PureComponent<{}, State> {
+  state: State = {
+    title: '',
+    message: '',
+    addCancel: false,
+    okLabel: '',
   }
 
-  _setModalRef(m) {
+  modal: Modal | null = null;
+  _cancel: HTMLButtonElement | null = null;
+  _ok: HTMLButtonElement | null = null;
+  _okCallback: Function | null = null;
+  _okCallback2: Function | null = null;
+
+  _setModalRef(m: Modal) {
     this.modal = m;
   }
 
   _handleOk() {
     this.hide();
-    this._okCallback();
+
+    this._okCallback?.();
 
     if (typeof this._okCallback2 === 'function') {
       this._okCallback2();
@@ -33,30 +43,32 @@ class AlertModal extends PureComponent {
   }
 
   hide() {
-    this.modal.hide();
+    this.modal?.hide();
   }
 
-  setCancelRef(n) {
+  setCancelRef(n: HTMLButtonElement) {
     this._cancel = n;
   }
 
-  setOkRef(n) {
+  setOkRef(n: HTMLButtonElement) {
     this._ok = n;
   }
 
   show(options = {}) {
+    // @ts-expect-error -- TSCONVERSION
     const { title, message, addCancel, onConfirm, okLabel } = options;
-    this.setState({ title, message, addCancel, okLabel });
-
+    this.setState({
+      title,
+      message,
+      addCancel,
+      okLabel,
+    });
     this.modal && this.modal.show();
-
     // Need to do this after render because modal focuses itself too
     setTimeout(() => {
       this._cancel && this._cancel.focus();
     }, 100);
-
     this._okCallback2 = onConfirm;
-
     return new Promise(resolve => {
       this._okCallback = resolve;
     });
@@ -64,7 +76,6 @@ class AlertModal extends PureComponent {
 
   render() {
     const { message, title, addCancel, okLabel } = this.state;
-
     return (
       <Modal ref={this._setModalRef} closeOnKeyCodes={[13]} skinny>
         <ModalHeader>{title || 'Uh Oh!'}</ModalHeader>
diff --git a/packages/insomnia-app/app/ui/components/modals/ask-modal.js b/packages/insomnia-app/app/ui/components/modals/ask-modal.tsx
similarity index 73%
rename from packages/insomnia-app/app/ui/components/modals/ask-modal.js
rename to packages/insomnia-app/app/ui/components/modals/ask-modal.tsx
index 36b7e3a9ed..60ec29b5f7 100644
--- a/packages/insomnia-app/app/ui/components/modals/ask-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/ask-modal.tsx
@@ -6,30 +6,41 @@ import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import ModalFooter from '../base/modal-footer';
 
-@autoBindMethodsForReact(AUTOBIND_CFG)
-class AskModal extends PureComponent {
-  constructor(props) {
-    super(props);
+interface State {
+  title: string;
+  message: string;
+  yesText: string;
+  noText: string;
+  loading: boolean;
+}
 
-    this.state = {
-      title: '',
-      message: '',
-      yesText: 'Yes',
-      noText: 'No',
-      loading: false,
-    };
+@autoBindMethodsForReact(AUTOBIND_CFG)
+class AskModal extends PureComponent<{}, State> {
+  state: State = {
+    title: '',
+    message: '',
+    yesText: 'Yes',
+    noText: 'No',
+    loading: false,
   }
 
-  _setModalRef(m) {
+  modal: Modal | null = null;
+  yesButton: HTMLButtonElement | null = null;
+  _doneCallback: Function = () => {};
+  _promiseCallback: Function = () => {};
+
+  _setModalRef(m: Modal) {
     this.modal = m;
   }
 
-  _setYesButtonRef(n) {
+  _setYesButtonRef(n: HTMLButtonElement) {
     this.yesButton = n;
   }
 
   async _handleYes() {
-    this.setState({ loading: true });
+    this.setState({
+      loading: true,
+    });
 
     if (this._doneCallback) {
       // Wait for the callback to finish before closing
@@ -43,19 +54,18 @@ class AskModal extends PureComponent {
 
   _handleNo() {
     this.hide();
-    this._doneCallback && this._doneCallback(false);
+    this?._doneCallback(false);
+
     this._promiseCallback(false);
   }
 
   hide() {
-    this.modal.hide();
+    this.modal?.hide();
   }
 
-  show(options = {}) {
+  show(options: any = {}) {
     const { title, message, onDone, yesText, noText } = options;
-
     this._doneCallback = onDone;
-
     this.setState({
       title: title || 'Confirm',
       message: message || 'No message provided',
@@ -63,13 +73,10 @@ class AskModal extends PureComponent {
       noText: noText || 'No',
       loading: false,
     });
-
-    this.modal.show();
-
+    this.modal?.show();
     setTimeout(() => {
       this.yesButton && this.yesButton.focus();
     }, 100);
-
     return new Promise(resolve => {
       this._promiseCallback = resolve;
     });
@@ -77,7 +84,6 @@ class AskModal extends PureComponent {
 
   render() {
     const { message, title, yesText, noText, loading } = this.state;
-
     return (
       <Modal noEscape ref={this._setModalRef} closeOnKeyCodes={[13]}>
         <ModalHeader>{title || 'Confirm?'}</ModalHeader>
@@ -91,7 +97,8 @@ class AskModal extends PureComponent {
               ref={this._setYesButtonRef}
               className="btn"
               onClick={this._handleYes}
-              disabled={loading}>
+              disabled={loading}
+            >
               {loading && <i className="fa fa-refresh fa-spin" />} {yesText}
             </button>
           </div>
diff --git a/packages/insomnia-app/app/ui/components/modals/code-prompt-modal.js b/packages/insomnia-app/app/ui/components/modals/code-prompt-modal.tsx
similarity index 78%
rename from packages/insomnia-app/app/ui/components/modals/code-prompt-modal.js
rename to packages/insomnia-app/app/ui/components/modals/code-prompt-modal.tsx
index 84c4c7ffc1..8b8a4892a3 100644
--- a/packages/insomnia-app/app/ui/components/modals/code-prompt-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/code-prompt-modal.tsx
@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Modal from '../base/modal';
@@ -13,6 +12,7 @@ import DropdownItem from '../base/dropdown/dropdown-item';
 import DropdownDivider from '../base/dropdown/dropdown-divider';
 import MarkdownEditor from '../markdown-editor';
 import CopyButton from '../base/copy-button';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
 
 const MODES = {
   'text/plain': 'Plain Text',
@@ -23,24 +23,48 @@ const MODES = {
   'text/html': 'HTML',
 };
 
+interface Props {
+  editorFontSize: number;
+  editorIndentSize: number;
+  editorKeyMap: string;
+  editorLineWrapping: boolean;
+  nunjucksPowerUserMode: boolean;
+  isVariableUncovered: boolean;
+  handleGetRenderContext?: HandleGetRenderContext;
+  handleRender?: HandleRender;
+}
+
+interface State {
+  title: string;
+  defaultValue: string;
+  submitName: string;
+  placeholder: string;
+  hint: string;
+  mode: string;
+  hideMode: boolean,
+  enableRender: boolean,
+  showCopyButton: boolean,
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class CodePromptModal extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      title: 'Not Set',
-      defaultValue: '',
-      submitName: 'Not Set',
-      placeholder: '',
-      hint: '',
-      mode: 'text/plain',
-      hideMode: false,
-      enableRender: false,
-      showCopyButton: false,
-    };
+class CodePromptModal extends PureComponent<Props, State> {
+  state: State = {
+    title: 'Not Set',
+    defaultValue: '',
+    submitName: 'Not Set',
+    placeholder: '',
+    hint: '',
+    mode: 'text/plain',
+    hideMode: false,
+    enableRender: false,
+    showCopyButton: false,
   }
 
-  _setModalRef(n) {
+  modal: Modal | null = null;
+  _onModeChange: Function = () => {};
+  _onChange: Function = () => {};
+
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
@@ -50,11 +74,11 @@ class CodePromptModal extends PureComponent {
 
   _handleChangeMode(mode) {
     this.setState({ mode });
-    this._onModeChange && this._onModeChange(mode);
+    this._onModeChange?.(mode);
   }
 
   hide() {
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   show(options) {
@@ -71,12 +95,9 @@ class CodePromptModal extends PureComponent {
       onModeChange,
       showCopyButton,
     } = options;
-
     this._onChange = onChange;
     this._onModeChange = onModeChange;
-
     const realMode = typeof mode === 'string' ? mode : 'text/plain';
-
     this.setState({
       title,
       defaultValue,
@@ -89,7 +110,7 @@ class CodePromptModal extends PureComponent {
       mode: realMode || this.state.mode || 'text/plain',
     });
 
-    this.modal.show();
+    this.modal?.show();
   }
 
   render() {
@@ -103,7 +124,6 @@ class CodePromptModal extends PureComponent {
       editorFontSize,
       editorLineWrapping,
     } = this.props;
-
     const {
       submitName,
       title,
@@ -129,7 +149,9 @@ class CodePromptModal extends PureComponent {
                   gridTemplateColumns: 'minmax(0, 1fr)',
                   gridTemplateRows: 'auto minmax(0, 1fr)',
                 }
-              : { minHeight: '10rem' }
+              : {
+                  minHeight: '10rem',
+                }
           }>
           {showCopyButton ? (
             <div className="pad-top-sm pad-right-sm">
@@ -143,7 +165,9 @@ class CodePromptModal extends PureComponent {
                 defaultValue={defaultValue}
                 placeholder={placeholder}
                 onChange={this._handleChange}
+                // @ts-expect-error -- TSCONVERSION appears to be a genuine error
                 handleGetRenderContext={enableRender ? handleGetRenderContext : null}
+                // @ts-expect-error -- TSCONVERSION appears to be a genuine error
                 handleRender={enableRender ? handleRender : null}
                 mode={mode}
                 keyMap={editorKeyMap}
@@ -166,7 +190,9 @@ class CodePromptModal extends PureComponent {
                   onChange={this._handleChange}
                   nunjucksPowerUserMode={nunjucksPowerUserMode}
                   isVariableUncovered={isVariableUncovered}
+                  // @ts-expect-error -- TSCONVERSION appears to be a genuine error
                   getRenderContext={enableRender ? handleGetRenderContext : null}
+                  // @ts-expect-error -- TSCONVERSION appears to be a genuine error
                   render={enableRender ? handleRender : null}
                   mode={mode}
                   keyMap={editorKeyMap}
@@ -204,18 +230,4 @@ class CodePromptModal extends PureComponent {
   }
 }
 
-CodePromptModal.propTypes = {
-  // Required
-  editorFontSize: PropTypes.number.isRequired,
-  editorIndentSize: PropTypes.number.isRequired,
-  editorKeyMap: PropTypes.string.isRequired,
-  editorLineWrapping: PropTypes.bool.isRequired,
-  nunjucksPowerUserMode: PropTypes.bool.isRequired,
-  isVariableUncovered: PropTypes.bool.isRequired,
-
-  // Optional
-  handleGetRenderContext: PropTypes.func,
-  handleRender: PropTypes.func,
-};
-
 export default CodePromptModal;
diff --git a/packages/insomnia-app/app/ui/components/modals/cookie-modify-modal.js b/packages/insomnia-app/app/ui/components/modals/cookie-modify-modal.tsx
similarity index 83%
rename from packages/insomnia-app/app/ui/components/modals/cookie-modify-modal.js
rename to packages/insomnia-app/app/ui/components/modals/cookie-modify-modal.tsx
index 7c9834acee..a86e5e23fc 100644
--- a/packages/insomnia-app/app/ui/components/modals/cookie-modify-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/cookie-modify-modal.tsx
@@ -1,13 +1,11 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { Tab, TabList, TabPanel, Tabs } from 'react-tabs';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG, DEBOUNCE_MILLIS } from '../../../common/constants';
 import * as toughCookie from 'tough-cookie';
 import * as models from '../../../models';
 import clone from 'clone';
-
-import Modal from '../base/modal';
+import Modal, { ModalProps } from '../base/modal';
 import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import ModalFooter from '../base/modal-footer';
@@ -15,44 +13,40 @@ import OneLineEditor from '../codemirror/one-line-editor';
 import { cookieToString } from 'insomnia-cookies';
 import type { Cookie, CookieJar } from '../../../models/cookie-jar';
 import type { Workspace } from '../../../models/workspace';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
 
-type Props = {
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  nunjucksPowerUserMode: boolean,
-  isVariableUncovered: boolean,
-  workspace: Workspace,
-  cookieJar: CookieJar,
-};
+interface Props extends ModalProps {
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  nunjucksPowerUserMode: boolean;
+  isVariableUncovered: boolean;
+  workspace: Workspace;
+  cookieJar: CookieJar;
+}
 
-type State = {
-  cookie: Cookie | null,
-  rawValue: string,
-};
+interface State {
+  cookie: Cookie | null;
+  rawValue: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class CookieModifyModal extends React.PureComponent<Props, State> {
-  modal: Modal | null;
-  _rawTimeout: TimeoutID;
-  _cookieUpdateTimeout: TimeoutID;
+class CookieModifyModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
+  _rawTimeout: NodeJS.Timeout | null = null;
+  _cookieUpdateTimeout: NodeJS.Timeout | null = null;
 
-  constructor(props: any) {
-    super(props);
-
-    this.state = {
-      cookie: null,
-      rawValue: '',
-    };
+  state: State = {
+    cookie: null,
+    rawValue: '',
   }
 
-  _setModalRef(n: Modal | null) {
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
   async show(cookie: Cookie) {
     // Dunno why this is sent as an array
     cookie = cookie[0] || cookie;
-
     const { cookieJar } = this.props;
     const oldCookie = cookieJar.cookies.find(c => c.id === cookie.id);
 
@@ -61,8 +55,9 @@ class CookieModifyModal extends React.PureComponent<Props, State> {
       return;
     }
 
-    this.setState({ cookie });
-
+    this.setState({
+      cookie,
+    });
     this.modal && this.modal.show();
   }
 
@@ -74,15 +69,18 @@ class CookieModifyModal extends React.PureComponent<Props, State> {
     await models.cookieJar.update(cookieJar);
   }
 
-  _handleChangeRawValue(e: SyntheticEvent<HTMLInputElement>) {
+  _handleChangeRawValue(e: React.SyntheticEvent<HTMLInputElement>) {
     const value = e.currentTarget.value;
-
-    clearTimeout(this._rawTimeout);
+    if (this._rawTimeout !== null) {
+      clearTimeout(this._rawTimeout);
+    }
     this._rawTimeout = setTimeout(async () => {
       const oldCookie = this.state.cookie;
       let cookie;
+
       try {
         // NOTE: Perform toJSON so we have a plain JS object instead of Cookie instance
+        // @ts-expect-error -- TSCONVERSION
         cookie = toughCookie.Cookie.parse(value).toJSON();
       } catch (err) {
         console.warn(`Failed to parse cookie string "${value}"`, err);
@@ -95,22 +93,22 @@ class CookieModifyModal extends React.PureComponent<Props, State> {
 
       // Make sure cookie has an id
       cookie.id = oldCookie.id;
-
       await this._handleCookieUpdate(cookie);
     }, DEBOUNCE_MILLIS * 2);
   }
 
   async _handleCookieUpdate(newCookie: Cookie) {
     const oldCookie = this.state.cookie;
+
     if (!oldCookie) {
       // We don't have a cookie to edit
       return;
     }
 
     const cookie = clone(newCookie);
-
     // Sanitize expires field
     const expires = new Date(cookie.expires || '').getTime();
+
     if (isNaN(expires)) {
       cookie.expires = null;
     } else {
@@ -119,7 +117,6 @@ class CookieModifyModal extends React.PureComponent<Props, State> {
 
     // Clone so we don't modify the original
     const cookieJar = clone(this.props.cookieJar);
-
     const { cookies } = cookieJar;
     const index = cookies.findIndex(c => c.id === cookie.id);
 
@@ -129,17 +126,15 @@ class CookieModifyModal extends React.PureComponent<Props, State> {
     }
 
     cookieJar.cookies = [...cookies.slice(0, index), cookie, ...cookies.slice(index + 1)];
-
-    this.setState({ cookie });
-
+    this.setState({
+      cookie,
+    });
     await CookieModifyModal._saveChanges(cookieJar);
-
     return cookie;
   }
 
-  _handleChange(field: string, eventOrValue: string | Event) {
+  _handleChange(field: string, eventOrValue: string | React.ChangeEvent<HTMLInputElement>) {
     const { cookie } = this.state;
-
     let value;
 
     if (typeof eventOrValue === 'string') {
@@ -154,12 +149,17 @@ class CookieModifyModal extends React.PureComponent<Props, State> {
       // Should never happen
     }
 
-    const newCookie = Object.assign({}, cookie, { [field]: value });
-
-    clearTimeout(this._cookieUpdateTimeout);
+    const newCookie = Object.assign({}, cookie, {
+      [field]: value,
+    });
+    if (this._cookieUpdateTimeout !== null) {
+      clearTimeout(this._cookieUpdateTimeout);
+    }
     this._cookieUpdateTimeout = setTimeout(async () => {
       await this._handleCookieUpdate(newCookie);
-      this.setState({ cookie: newCookie });
+      this.setState({
+        cookie: newCookie,
+      });
     }, DEBOUNCE_MILLIS * 2);
   }
 
@@ -196,7 +196,6 @@ class CookieModifyModal extends React.PureComponent<Props, State> {
     }
 
     const val = (cookie[field] || '').toString();
-
     return (
       <div className="form-control form-control--outlined">
         <label>
@@ -218,9 +217,8 @@ class CookieModifyModal extends React.PureComponent<Props, State> {
     const { cookieJar } = this.props;
     const { cookie } = this.state;
     const checkFields = ['secure', 'httpOnly'];
-
     return (
-      <Modal ref={this._setModalRef} {...(this.props: Object)}>
+      <Modal ref={this._setModalRef} {...this.props}>
         <ModalHeader>Edit Cookie</ModalHeader>
         <ModalBody className="cookie-modify">
           {cookieJar && cookie && (
@@ -251,7 +249,6 @@ class CookieModifyModal extends React.PureComponent<Props, State> {
                 <div className="pad no-pad-top cookie-modify__checkboxes row-around txt-lg">
                   {checkFields.map((field, i) => {
                     const checked = !!cookie[field];
-
                     return (
                       <label key={i}>
                         {CookieModifyModal._capitalize(field)}
@@ -290,7 +287,6 @@ class CookieModifyModal extends React.PureComponent<Props, State> {
       </Modal>
     );
   }
-}
+} // export CookieModifyModal;
 
-// export CookieModifyModal;
 export default CookieModifyModal;
diff --git a/packages/insomnia-app/app/ui/components/modals/cookies-modal.js b/packages/insomnia-app/app/ui/components/modals/cookies-modal.tsx
similarity index 80%
rename from packages/insomnia-app/app/ui/components/modals/cookies-modal.js
rename to packages/insomnia-app/app/ui/components/modals/cookies-modal.tsx
index 41afee67fe..f79df628d3 100644
--- a/packages/insomnia-app/app/ui/components/modals/cookies-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/cookies-modal.tsx
@@ -1,9 +1,8 @@
-// @flow
-import React, { PureComponent } from 'react';
+import React, { ChangeEvent, PureComponent } from 'react';
 import deepEqual from 'deep-equal';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
-import Modal from '../base/modal';
+import Modal, { ModalProps } from '../base/modal';
 import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import ModalFooter from '../base/modal-footer';
@@ -12,38 +11,35 @@ import * as models from '../../../models';
 import type { Cookie, CookieJar } from '../../../models/cookie-jar';
 import type { Workspace } from '../../../models/workspace';
 import { fuzzyMatch } from '../../../common/misc';
+import { HandleRender } from '../../../common/render';
 
-type Props = {
-  handleShowModifyCookieModal: Function,
-  handleRender: (string | Object) => Promise<string | Object>,
-  cookieJar: CookieJar,
-  workspace: Workspace,
-};
+interface Props extends ModalProps {
+  handleShowModifyCookieModal: Function;
+  handleRender: HandleRender;
+  cookieJar: CookieJar;
+  workspace: Workspace;
+}
 
-type State = {
-  filter: string,
-  visibleCookieIndexes: Array<number> | null,
-};
+interface State {
+  filter: string;
+  visibleCookieIndexes: Array<number> | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
 class CookiesModal extends PureComponent<Props, State> {
-  modal: Modal | null;
-  filterInput: HTMLInputElement | null;
+  modal: Modal | null = null;
+  filterInput: HTMLInputElement | null = null;
 
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      filter: '',
-      visibleCookieIndexes: null,
-    };
+  state: State = {
+    filter: '',
+    visibleCookieIndexes: null,
   }
 
-  _setModalRef(n: React.Component<*> | null) {
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
-  _setFilterInputRef(n: HTMLInputElement | null) {
+  _setFilterInputRef(n: HTMLInputElement) {
     this.filterInput = n;
   }
 
@@ -55,7 +51,6 @@ class CookiesModal extends PureComponent<Props, State> {
   async _handleCookieAdd(cookie: Cookie) {
     const { cookieJar } = this.props;
     const { cookies } = cookieJar;
-
     cookieJar.cookies = [cookie, ...cookies];
     await this._saveChanges();
   }
@@ -69,19 +64,18 @@ class CookiesModal extends PureComponent<Props, State> {
   async _handleCookieDelete(cookie: Cookie) {
     const { cookieJar } = this.props;
     const { cookies } = cookieJar;
-
     // NOTE: This is sketchy because it relies on the same reference
     cookieJar.cookies = cookies.filter(c => c.id !== cookie.id);
-
     await this._saveChanges();
   }
 
-  async _handleFilterChange(e: Event) {
+  async _handleFilterChange(e: ChangeEvent<HTMLInputElement>) {
     if (!(e.target instanceof HTMLInputElement)) {
       return;
     }
 
     const filter = e.target.value;
+
     this._applyFilter(filter, this.props.cookieJar.cookies);
   }
 
@@ -97,7 +91,7 @@ class CookiesModal extends PureComponent<Props, State> {
   }
 
   async _applyFilter(filter: string, cookies: Array<Cookie>) {
-    const renderedCookies = [];
+    const renderedCookies: Array<Cookie> = [];
 
     for (const cookie of cookies) {
       try {
@@ -113,9 +107,13 @@ class CookiesModal extends PureComponent<Props, State> {
 
     if (filter) {
       visibleCookieIndexes = [];
+
       for (let i = 0; i < renderedCookies.length; i++) {
         const toSearch = JSON.stringify(renderedCookies[i]);
-        const match = fuzzyMatch(filter, toSearch, { splitSpace: true });
+        const match = fuzzyMatch(filter, toSearch, {
+          splitSpace: true,
+        });
+
         if (match) {
           visibleCookieIndexes.push(i);
         }
@@ -124,7 +122,10 @@ class CookiesModal extends PureComponent<Props, State> {
       visibleCookieIndexes = null;
     }
 
-    this.setState({ filter, visibleCookieIndexes });
+    this.setState({
+      filter,
+      visibleCookieIndexes,
+    });
   }
 
   _getVisibleCookies(): Array<Cookie> {
@@ -135,17 +136,15 @@ class CookiesModal extends PureComponent<Props, State> {
       return cookieJar.cookies;
     }
 
-    return cookieJar.cookies.filter((c, i) => visibleCookieIndexes.includes(i));
+    return cookieJar.cookies.filter((_, i) => visibleCookieIndexes.includes(i));
   }
 
   async show() {
     setTimeout(() => {
       this.filterInput && this.filterInput.focus();
     }, 100);
-
     // make sure the filter is up to date
     await this._applyFilter(this.state.filter, this.props.cookieJar.cookies);
-
     this.modal && this.modal.show();
   }
 
@@ -155,13 +154,12 @@ class CookiesModal extends PureComponent<Props, State> {
 
   render() {
     const { handleShowModifyCookieModal, handleRender, cookieJar } = this.props;
-
     const { filter } = this.state;
 
     const cookies = this._getVisibleCookies();
 
     return (
-      <Modal ref={this._setModalRef} wide tall {...(this.props: Object)}>
+      <Modal ref={this._setModalRef} wide tall {...this.props}>
         <ModalHeader>Manage Cookies</ModalHeader>
         <ModalBody noScroll>
           {cookieJar && (
@@ -187,8 +185,7 @@ class CookiesModal extends PureComponent<Props, State> {
                   handleRender={handleRender}
                   handleDeleteAll={this._handleDeleteAllCookies}
                   handleCookieAdd={this._handleCookieAdd}
-                  handleCookieDelete={this._handleCookieDelete}
-                  // Set the domain to the filter so that it shows up if we're filtering
+                  handleCookieDelete={this._handleCookieDelete} // Set the domain to the filter so that it shows up if we're filtering
                   newCookieDomainName={filter || 'domain.com'}
                 />
               </div>
@@ -206,7 +203,6 @@ class CookiesModal extends PureComponent<Props, State> {
       </Modal>
     );
   }
-}
+} // export CookiesModal;
 
-// export CookiesModal;
 export default CookiesModal;
diff --git a/packages/insomnia-app/app/ui/components/modals/environment-edit-modal.js b/packages/insomnia-app/app/ui/components/modals/environment-edit-modal.tsx
similarity index 75%
rename from packages/insomnia-app/app/ui/components/modals/environment-edit-modal.js
rename to packages/insomnia-app/app/ui/components/modals/environment-edit-modal.tsx
index 113e0f20a0..76e153d380 100644
--- a/packages/insomnia-app/app/ui/components/modals/environment-edit-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/environment-edit-modal.tsx
@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import EnvironmentEditor from '../editors/environment-editor';
@@ -7,33 +6,54 @@ import Modal from '../base/modal';
 import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import ModalFooter from '../base/modal-footer';
+import { RequestGroup } from '../../../models/request-group';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
+
+interface Props {
+  onChange: Function;
+  editorFontSize: number;
+  editorIndentSize: number;
+  editorKeyMap: string;
+  render: HandleRender;
+  getRenderContext: HandleGetRenderContext;
+  nunjucksPowerUserMode: boolean;
+  isVariableUncovered: boolean;
+  lineWrapping: boolean;
+}
+
+interface State {
+  requestGroup: RequestGroup | null;
+  isValid: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class EnvironmentEditModal extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      requestGroup: null,
-      isValid: true,
-    };
+class EnvironmentEditModal extends PureComponent<Props, State> {
+  state: State = {
+    requestGroup: null,
+    isValid: true,
   }
 
-  _setModalRef(n) {
+  modal: Modal | null = null;
+  _envEditor: EnvironmentEditor | null = null;
+
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
-  _setEditorRef(n) {
+  _setEditorRef(n: EnvironmentEditor) {
     this._envEditor = n;
   }
 
   _saveChanges() {
-    if (!this._envEditor.isValid()) {
+    if (!this._envEditor?.isValid()) {
       return;
     }
 
     let patch;
+
     try {
       const data = this._envEditor.getValue();
+
       patch = {
         environment: data && data.object,
         environmentPropertyOrder: data && data.propertyOrder,
@@ -42,15 +62,15 @@ class EnvironmentEditModal extends PureComponent {
       // Invalid JSON probably
       return;
     }
-    const { requestGroup } = this.state;
 
+    const { requestGroup } = this.state;
     this.props.onChange(Object.assign({}, requestGroup, patch));
   }
 
   _didChange() {
     this._saveChanges();
 
-    const isValid = this._envEditor.isValid();
+    const isValid = Boolean(this._envEditor?.isValid());
 
     if (this.state.isValid !== isValid) {
       this.setState({ isValid });
@@ -59,11 +79,11 @@ class EnvironmentEditModal extends PureComponent {
 
   show(requestGroup) {
     this.setState({ requestGroup });
-    this.modal.show();
+    this.modal?.show();
   }
 
   hide() {
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   render() {
@@ -78,14 +98,11 @@ class EnvironmentEditModal extends PureComponent {
       isVariableUncovered,
       ...extraProps
     } = this.props;
-
     const { requestGroup, isValid } = this.state;
-
     const environmentInfo = {
       object: requestGroup ? requestGroup.environment : {},
       propertyOrder: requestGroup && requestGroup.environmentPropertyOrder,
     };
-
     return (
       <Modal ref={this._setModalRef} tall {...extraProps}>
         <ModalHeader>Environment Overrides (JSON Format)</ModalHeader>
@@ -118,16 +135,4 @@ class EnvironmentEditModal extends PureComponent {
   }
 }
 
-EnvironmentEditModal.propTypes = {
-  onChange: PropTypes.func.isRequired,
-  editorFontSize: PropTypes.number.isRequired,
-  editorIndentSize: PropTypes.number.isRequired,
-  editorKeyMap: PropTypes.string.isRequired,
-  render: PropTypes.func.isRequired,
-  getRenderContext: PropTypes.func.isRequired,
-  nunjucksPowerUserMode: PropTypes.bool.isRequired,
-  isVariableUncovered: PropTypes.bool.isRequired,
-  lineWrapping: PropTypes.bool.isRequired,
-};
-
 export default EnvironmentEditModal;
diff --git a/packages/insomnia-app/app/ui/components/modals/error-modal.js b/packages/insomnia-app/app/ui/components/modals/error-modal.tsx
similarity index 79%
rename from packages/insomnia-app/app/ui/components/modals/error-modal.js
rename to packages/insomnia-app/app/ui/components/modals/error-modal.tsx
index 85b3e46cbc..6f80e28328 100644
--- a/packages/insomnia-app/app/ui/components/modals/error-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/error-modal.tsx
@@ -1,5 +1,3 @@
-// @flow
-
 import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
@@ -8,47 +6,51 @@ import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import ModalFooter from '../base/modal-footer';
 
-export type ErrorModalOptions = {|
-  title?: string,
-  error?: Error,
-  addCancel?: boolean,
-  message?: string,
-|};
+export interface ErrorModalOptions {
+  title?: string;
+  error?: Error | null;
+  addCancel?: boolean;
+  message?: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
 class ErrorModal extends PureComponent<{}, ErrorModalOptions> {
-  constructor(props) {
-    super(props);
+  modal: Modal | null = null;
+  _okCallback: (value?: unknown) => void = () => {};
 
-    this.state = {
-      title: '',
-      error: null,
-      message: '',
-      addCancel: false,
-    };
+  state: ErrorModalOptions = {
+    title: '',
+    error: null,
+    message: '',
+    addCancel: false,
   }
 
-  _setModalRef(m) {
+  _setModalRef(m: Modal) {
     this.modal = m;
   }
 
   _handleOk() {
     this.hide();
+
     this._okCallback();
   }
 
   hide() {
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   show(options: ErrorModalOptions = {}) {
     const { title, error, addCancel, message } = options;
-    this.setState({ title, error, addCancel, message });
+    this.setState({
+      title,
+      error,
+      addCancel,
+      message,
+    });
 
-    this.modal.show();
+    this.modal?.show();
 
     console.log('[ErrorModal]', error);
-
     return new Promise(resolve => {
       this._okCallback = resolve;
     });
@@ -56,9 +58,7 @@ class ErrorModal extends PureComponent<{}, ErrorModalOptions> {
 
   render() {
     const { error, title, addCancel } = this.state;
-
     const message = this.state.message || error?.message;
-
     return (
       <Modal ref={this._setModalRef}>
         <ModalHeader>{title || 'Uh Oh!'}</ModalHeader>
diff --git a/packages/insomnia-app/app/ui/components/modals/export-requests-modal.js b/packages/insomnia-app/app/ui/components/modals/export-requests-modal.tsx
similarity index 86%
rename from packages/insomnia-app/app/ui/components/modals/export-requests-modal.js
rename to packages/insomnia-app/app/ui/components/modals/export-requests-modal.tsx
index ca1b206879..b5ec81b398 100644
--- a/packages/insomnia-app/app/ui/components/modals/export-requests-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/export-requests-modal.tsx
@@ -1,8 +1,7 @@
-// @flow
 import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
-import Modal from '../base/modal';
+import Modal, { ModalProps } from '../base/modal';
 import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import ModalFooter from '../base/modal-footer';
@@ -12,55 +11,55 @@ import type { RequestGroup } from '../../../models/request-group';
 import * as models from '../../../models';
 import type { GrpcRequest } from '../../../models/grpc-request';
 import { isGrpcRequest, isRequest, isRequestGroup } from '../../../models/helpers/is-model';
+import { Child } from '../sidebar/sidebar-children';
 
-export type Node = {
-  doc: Request | GrpcRequest | RequestGroup,
-  children: Array<Node>,
-  collapsed: boolean,
-  totalRequests: number,
-  selectedRequests: number,
-};
+export interface Node {
+  doc: Request | GrpcRequest | RequestGroup;
+  children: Array<Node>;
+  collapsed: boolean;
+  totalRequests: number;
+  selectedRequests: number;
+}
 
-type Props = {
-  childObjects: Array<Object>,
-  handleExportRequestsToFile: Function,
-};
+interface Props extends ModalProps {
+  childObjects: Array<Child>;
+  handleExportRequestsToFile: Function;
+}
 
-type State = {
-  treeRoot: ?Node,
-};
+interface State {
+  treeRoot: Node | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
 class ExportRequestsModal extends PureComponent<Props, State> {
-  modal: Modal;
+  modal: Modal | null = null;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      treeRoot: null,
-    };
+  state: State = {
+    treeRoot: null,
   }
 
-  setModalRef(modal: ?Modal) {
+  setModalRef(modal: Modal) {
     if (modal != null) {
       this.modal = modal;
     }
   }
 
   show() {
-    this.modal.show();
+    this.modal?.show();
     this.createTree();
   }
 
   hide() {
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   handleExport() {
     const { treeRoot } = this.state;
+
     if (treeRoot == null || treeRoot.selectedRequests === 0) {
       return;
     }
+
     const exportedRequestIds = this.getSelectedRequestIds(treeRoot);
     this.props.handleExportRequestsToFile(exportedRequestIds);
     this.hide();
@@ -68,14 +67,18 @@ class ExportRequestsModal extends PureComponent<Props, State> {
 
   getSelectedRequestIds(node: Node): Array<string> {
     const docIsRequest = isRequest(node.doc) || isGrpcRequest(node.doc);
+
     if (docIsRequest && node.selectedRequests === node.totalRequests) {
       return [node.doc._id];
     }
+
     const requestIds: Array<string> = [];
+
     for (const child of node.children) {
       const reqIds = this.getSelectedRequestIds(child);
       requestIds.push(...reqIds);
     }
+
     return requestIds;
   }
 
@@ -85,6 +88,7 @@ class ExportRequestsModal extends PureComponent<Props, State> {
     const totalRequests = children
       .map(child => child.totalRequests)
       .reduce((acc, totalRequests) => acc + totalRequests, 0);
+    // @ts-expect-error -- TSCONVERSION missing property
     const rootFolder: RequestGroup = Object.assign({}, models.requestGroup.init(), {
       _id: 'all',
       type: models.requestGroup.type,
@@ -104,16 +108,17 @@ class ExportRequestsModal extends PureComponent<Props, State> {
     });
   }
 
-  createNode(item: Object): Node {
+  createNode(item: Record<string, any>): Node {
     const children: Array<Node> = item.children.map(child => this.createNode(child));
     let totalRequests = children
       .map(child => child.totalRequests)
       .reduce((acc, totalRequests) => acc + totalRequests, 0);
-
     const docIsRequest = isRequest(item.doc) || isGrpcRequest(item.doc);
+
     if (docIsRequest) {
       totalRequests++;
     }
+
     return {
       doc: item.doc,
       collapsed: false,
@@ -125,13 +130,17 @@ class ExportRequestsModal extends PureComponent<Props, State> {
 
   handleSetRequestGroupCollapsed(requestGroupId: string, isCollapsed: boolean) {
     const { treeRoot } = this.state;
+
     if (treeRoot == null) {
       return;
     }
+
     const found = this.setRequestGroupCollapsed(treeRoot, isCollapsed, requestGroupId);
+
     if (!found) {
       return;
     }
+
     this.setState({
       treeRoot: { ...treeRoot },
     });
@@ -139,47 +148,57 @@ class ExportRequestsModal extends PureComponent<Props, State> {
 
   handleSetItemSelected(itemId: string, isSelected: boolean) {
     const { treeRoot } = this.state;
+
     if (treeRoot == null) {
       return;
     }
+
     const found = this.setItemSelected(treeRoot, isSelected, itemId);
+
     if (!found) {
       return;
     }
+
     this.setState({
       treeRoot: { ...treeRoot },
     });
   }
 
-  setRequestGroupCollapsed(node: Node, isCollapsed: boolean, requestGroupId: string): boolean {
+  setRequestGroupCollapsed(node: Node, isCollapsed: boolean, requestGroupId: string) {
     if (!isRequestGroup(node.doc)) {
       return false;
     }
+
     if (node.doc._id === requestGroupId) {
       node.collapsed = isCollapsed;
       return true;
     }
+
     for (const child of node.children) {
       const found = this.setRequestGroupCollapsed(child, isCollapsed, requestGroupId);
+
       if (found) {
         return true;
       }
     }
+
     return false;
   }
 
-  setItemSelected(node: Node, isSelected: boolean, id?: string): boolean {
+  setItemSelected(node: Node, isSelected: boolean, id?: string) {
     if (id == null || node.doc._id === id) {
       // Switch the flags of all children in this subtree.
       for (const child of node.children) {
         this.setItemSelected(child, isSelected);
       }
+
       node.selectedRequests = isSelected ? node.totalRequests : 0;
       return true;
     }
 
     for (const child of node.children) {
       const found = this.setItemSelected(child, isSelected, id);
+
       if (found) {
         node.selectedRequests = node.children
           .map(ch => ch.selectedRequests)
@@ -187,6 +206,7 @@ class ExportRequestsModal extends PureComponent<Props, State> {
         return true;
       }
     }
+
     return false;
   }
 
@@ -194,7 +214,7 @@ class ExportRequestsModal extends PureComponent<Props, State> {
     const { treeRoot } = this.state;
     const isExportDisabled = treeRoot != null ? treeRoot.selectedRequests === 0 : false;
     return (
-      <Modal ref={this.setModalRef} tall freshState {...(this.props: Object)}>
+      <Modal ref={this.setModalRef} tall freshState {...this.props}>
         <ModalHeader>Select Requests to Export</ModalHeader>
         <ModalBody>
           <div className="requests-tree">
diff --git a/packages/insomnia-app/app/ui/components/modals/filter-help-modal.js b/packages/insomnia-app/app/ui/components/modals/filter-help-modal.tsx
similarity index 91%
rename from packages/insomnia-app/app/ui/components/modals/filter-help-modal.js
rename to packages/insomnia-app/app/ui/components/modals/filter-help-modal.tsx
index ada99c7fa3..54724d1376 100644
--- a/packages/insomnia-app/app/ui/components/modals/filter-help-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/filter-help-modal.tsx
@@ -6,37 +6,38 @@ import Modal from '../base/modal';
 import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 
+interface State {
+  isJson: boolean;
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class FilterHelpModal extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      isJson: true,
-    };
+class FilterHelpModal extends PureComponent<{}, State> {
+  state: State = {
+    isJson: true,
   }
 
-  _setModalRef(n) {
+  modal: Modal | null = null;
+
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
-  show(isJson) {
+  show(isJson: boolean) {
     this.setState({ isJson });
-    this.modal.show();
+    this.modal?.show();
   }
 
   hide() {
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   render() {
     const { isJson } = this.state;
-
     const link = isJson ? (
       <Link href="http://goessner.net/articles/JsonPath/">JSONPath</Link>
     ) : (
       <Link href="https://www.w3.org/TR/xpath/">XPath</Link>
     );
-
     return (
       <Modal ref={this._setModalRef}>
         <ModalHeader>Response Filtering Help</ModalHeader>
diff --git a/packages/insomnia-app/app/ui/components/modals/generate-code-modal.js b/packages/insomnia-app/app/ui/components/modals/generate-code-modal.tsx
similarity index 78%
rename from packages/insomnia-app/app/ui/components/modals/generate-code-modal.js
rename to packages/insomnia-app/app/ui/components/modals/generate-code-modal.tsx
index 616e3bcf2e..cac7e35df9 100644
--- a/packages/insomnia-app/app/ui/components/modals/generate-code-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/generate-code-modal.tsx
@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import HTTPSnippet, { availableTargets } from 'httpsnippet';
@@ -23,25 +22,39 @@ const MODE_MAP = {
   objc: 'clike',
   ocaml: 'mllike',
 };
-
 const TO_ADD_CONTENT_LENGTH = {
   node: ['native'],
 };
 
-@autoBindMethodsForReact(AUTOBIND_CFG)
-class GenerateCodeModal extends PureComponent {
-  constructor(props) {
-    super(props);
+interface Props {
+  environmentId: string;
+  editorFontSize: number;
+  editorIndentSize: number;
+  editorKeyMap: string;
+}
 
+interface State {
+  cmd: string;
+  request: null;
+  target: string;
+  client: string;
+}
+
+@autoBindMethodsForReact(AUTOBIND_CFG)
+class GenerateCodeModal extends PureComponent<Props, State> {
+  constructor(props: Props) {
+    super(props);
     let client;
     let target;
 
     // Load preferences from localStorage
-
     try {
+      // @ts-expect-error -- TSCONVERSION
       target = JSON.parse(window.localStorage.getItem('insomnia::generateCode::target'));
     } catch (e) {}
+
     try {
+      // @ts-expect-error -- TSCONVERSION
       client = JSON.parse(window.localStorage.getItem('insomnia::generateCode::client'));
     } catch (e) {}
 
@@ -53,45 +66,54 @@ class GenerateCodeModal extends PureComponent {
     };
   }
 
-  _setModalRef(n) {
+  modal: Modal | null = null;
+  _editor: CodeEditor | null = null;
+
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
-  _setEditorRef(n) {
+  _setEditorRef(n: CodeEditor) {
     this._editor = n;
   }
 
   hide() {
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   _handleClientChange(client) {
     const { target, request } = this.state;
+
     this._generateCode(request, target, client);
   }
 
   _handleTargetChange(target) {
     const { target: currentTarget } = this.state;
+
+    // @ts-expect-error -- TSCONVERSION
     if (currentTarget.key === target.key) {
       // No change
       return;
     }
 
     const client = target.clients.find(c => c.key === target.default);
+
     this._generateCode(this.state.request, target, client);
   }
 
   async _generateCode(request, target, client) {
     // Some clients need a content-length for the request to succeed
     const addContentLength = (TO_ADD_CONTENT_LENGTH[target.key] || []).find(c => c === client.key);
-
     const { environmentId } = this.props;
     const har = await exportHarRequest(request._id, environmentId, addContentLength);
     const snippet = new HTTPSnippet(har);
     const cmd = snippet.convert(target.key, client.key);
-
-    this.setState({ request, cmd, client, target });
-
+    this.setState({
+      request,
+      cmd,
+      client,
+      target,
+    });
     // Save client/target for next time
     window.localStorage.setItem('insomnia::generateCode::client', JSON.stringify(client));
     window.localStorage.setItem('insomnia::generateCode::target', JSON.stringify(target));
@@ -99,19 +121,22 @@ class GenerateCodeModal extends PureComponent {
 
   show(request) {
     const { client, target } = this.state;
+
     this._generateCode(request, target, client);
-    this.modal.show();
+
+    this.modal?.show();
   }
 
   render() {
     const { cmd, target, client } = this.state;
     const { editorFontSize, editorIndentSize, editorKeyMap } = this.props;
-
     const targets = availableTargets();
-
     // NOTE: Just some extra precautions in case the target is messed up
     let clients = [];
+
+    // @ts-expect-error -- TSCONVERSION
     if (target && Array.isArray(target.clients)) {
+      // @ts-expect-error -- TSCONVERSION
       clients = target.clients;
     }
 
@@ -128,7 +153,10 @@ class GenerateCodeModal extends PureComponent {
           <div className="pad">
             <Dropdown outline>
               <DropdownButton className="btn btn--clicky">
-                {target ? target.title : 'n/a'}
+                {
+                  // @ts-expect-error -- TSCONVERSION
+                  target ? target.title : 'n/a'
+                }
                 <i className="fa fa-caret-down" />
               </DropdownButton>
               {targets.map(target => (
@@ -140,12 +168,24 @@ class GenerateCodeModal extends PureComponent {
             &nbsp;&nbsp;
             <Dropdown outline>
               <DropdownButton className="btn btn--clicky">
-                {client ? client.title : 'n/a'}
+                {
+
+                  // @ts-expect-error -- TSCONVERSION
+                  client ? client.title : 'n/a'
+                }
                 <i className="fa fa-caret-down" />
               </DropdownButton>
               {clients.map(client => (
-                <DropdownItem key={client.key} onClick={this._handleClientChange} value={client}>
-                  {client.title}
+                <DropdownItem
+                  // @ts-expect-error -- TSCONVERSION
+                  key={client.key}
+                  onClick={this._handleClientChange}
+                  value={client}
+                >
+                  {
+                    // @ts-expect-error -- TSCONVERSION
+                    client.title
+                  }
                 </DropdownItem>
               ))}
             </Dropdown>
@@ -157,6 +197,7 @@ class GenerateCodeModal extends PureComponent {
             placeholder="Generating code snippet..."
             className="border-top"
             key={Date.now()}
+            // @ts-expect-error -- TSCONVERSION
             mode={MODE_MAP[target.key] || target.key}
             ref={this._setEditorRef}
             fontSize={editorFontSize}
@@ -179,11 +220,4 @@ class GenerateCodeModal extends PureComponent {
   }
 }
 
-GenerateCodeModal.propTypes = {
-  environmentId: PropTypes.string.isRequired,
-  editorFontSize: PropTypes.number.isRequired,
-  editorIndentSize: PropTypes.number.isRequired,
-  editorKeyMap: PropTypes.string.isRequired,
-};
-
 export default GenerateCodeModal;
diff --git a/packages/insomnia-app/app/ui/components/modals/generate-config-modal.js b/packages/insomnia-app/app/ui/components/modals/generate-config-modal.tsx
similarity index 81%
rename from packages/insomnia-app/app/ui/components/modals/generate-config-modal.js
rename to packages/insomnia-app/app/ui/components/modals/generate-config-modal.tsx
index e747e741d4..2379b1083b 100644
--- a/packages/insomnia-app/app/ui/components/modals/generate-config-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/generate-config-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Modal from '../base/modal';
@@ -17,53 +16,51 @@ import * as plugins from '../../../plugins';
 import { parseApiSpec } from '../../../common/api-specs';
 import { showModal } from './index';
 
-type Props = {|
-  settings: Settings,
-|};
+interface Props {
+  settings: Settings;
+}
 
-type Config = {|
-  label: string,
-  content: string,
-  mimeType: string,
-  error: string | null,
-|};
+interface Config {
+  label: string;
+  content: string;
+  mimeType: string;
+  error: string | null;
+}
 
-type State = {|
-  configs: Array<Config>,
-  activeTab: number,
-|};
+interface State {
+  configs: Array<Config>;
+  activeTab: number;
+}
 
-type ShowOptions = {
-  apiSpec: ApiSpec,
-  activeTabLabel: string,
-};
+interface ShowOptions {
+  apiSpec: ApiSpec;
+  activeTabLabel: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class GenerateConfigModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
+class GenerateConfigModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      configs: [],
-      activeTab: 0,
-    };
+  state: State = {
+    configs: [],
+    activeTab: 0,
   }
 
-  _setModalRef(n: ?Modal) {
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
-  async _generate(generatePlugin: ConfigGenerator, apiSpec: ApiSpec): Promise<Config> {
+  async _generate(generatePlugin: ConfigGenerator, apiSpec: ApiSpec) {
     const config: Config = {
       content: '',
       mimeType: 'text/yaml',
       label: generatePlugin.label,
       error: null,
     };
-
     let result;
+
     try {
+      // @ts-expect-error -- TSCONVERSION
       result = await generatePlugin.generate(parseApiSpec(apiSpec.contents));
     } catch (err) {
       config.error = err.message;
@@ -72,21 +69,21 @@ class GenerateConfigModal extends React.PureComponent<Props, State> {
 
     config.content = result.document || null;
     config.error = result.error || null;
-
     return config;
   }
 
   async show({ activeTabLabel, apiSpec }: ShowOptions) {
-    const configs = [];
+    const configs: Array<Config> = [];
 
     for (const p of await plugins.getConfigGenerators()) {
       configs.push(await this._generate(p, apiSpec));
     }
 
     const foundIndex = configs.findIndex(c => c.label === activeTabLabel);
-
-    this.setState({ configs, activeTab: foundIndex < 0 ? 0 : foundIndex });
-
+    this.setState({
+      configs,
+      activeTab: foundIndex < 0 ? 0 : foundIndex,
+    });
     this.modal && this.modal.show();
   }
 
@@ -114,6 +111,7 @@ class GenerateConfigModal extends React.PureComponent<Props, State> {
           lineWrapping={settings.editorLineWrapping}
           mode={config.mimeType}
           nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
+          // @ts-expect-error -- TSCONVERSION appears to be genuine
           onChange={this._handleChange}
           readOnly
         />
@@ -122,7 +120,9 @@ class GenerateConfigModal extends React.PureComponent<Props, State> {
   }
 
   _handleTabSelect(index: number) {
-    this.setState({ activeTab: index });
+    this.setState({
+      activeTab: index,
+    });
   }
 
   renderConfigTab(config: Config) {
@@ -135,9 +135,7 @@ class GenerateConfigModal extends React.PureComponent<Props, State> {
 
   render() {
     const { configs, activeTab } = this.state;
-
     const activeConfig = configs[activeTab];
-
     return (
       <Modal ref={this._setModalRef} freshState tall>
         <ModalHeader>Generate Config</ModalHeader>
diff --git a/packages/insomnia-app/app/ui/components/modals/git-branches-modal.js b/packages/insomnia-app/app/ui/components/modals/git-branches-modal.tsx
similarity index 83%
rename from packages/insomnia-app/app/ui/components/modals/git-branches-modal.js
rename to packages/insomnia-app/app/ui/components/modals/git-branches-modal.tsx
index 6987f6362b..3e95a6a0e6 100644
--- a/packages/insomnia-app/app/ui/components/modals/git-branches-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/git-branches-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Modal from '../base/modal';
@@ -8,64 +7,61 @@ import ModalHeader from '../base/modal-header';
 import { GitVCS } from '../../../sync/git/git-vcs';
 import classnames from 'classnames';
 import PromptButton from '../base/prompt-button';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import type { GitRepository } from '../../../models/git-repository';
 import ModalFooter from '../base/modal-footer';
 
-type Props = {|
-  vcs: GitVCS,
-  gitRepository: GitRepository,
-  handleInitializeEntities: () => Promise<void>,
-  handleGitBranchChanged: (branch: string) => void,
-|};
+interface Props {
+  vcs: GitVCS;
+  gitRepository: GitRepository;
+  handleInitializeEntities: () => Promise<void>;
+  handleGitBranchChanged: (branch: string) => void;
+}
 
-type State = {|
-  error: string,
-  branches: Array<string>,
-  remoteBranches: Array<string>,
-  branch: string,
-  newBranchName: string,
-|};
+interface State {
+  error: string;
+  branches: Array<string>;
+  remoteBranches: Array<string>;
+  branch: string;
+  newBranchName: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class GitBranchesModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
-  input: ?HTMLInputElement;
+class GitBranchesModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
+  input: HTMLInputElement | null = null;
   _onHide: (() => void) | null;
 
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      error: '',
-      branch: '??',
-      branches: [],
-      remoteBranches: [],
-      newBranchName: '',
-    };
+  state: State = {
+    error: '',
+    branch: '??',
+    branches: [],
+    remoteBranches: [],
+    newBranchName: '',
   }
 
-  _setModalRef(ref: ?Modal) {
+  _setModalRef(ref: Modal) {
     this.modal = ref;
   }
 
-  _setInputRef(ref: ?HTMLInputElement) {
+  _setInputRef(ref: HTMLInputElement) {
     this.input = ref;
   }
 
-  async show(options: { onHide?: () => void } = {}) {
+  async show(
+    options: {
+      onHide?: () => void;
+    } = {},
+  ) {
     await this._refreshState({
       newBranchName: '',
     });
-
     this._onHide = options.onHide || null;
     this.modal && this.modal.show();
-
     // Focus input when modal shows
     setTimeout(() => {
       this.input && this.input.focus();
     }, 100);
-
     // Do a fetch of remotes and refresh again. NOTE: we're doing this
     // last because it's super slow
     const { vcs, gitRepository } = this.props;
@@ -73,13 +69,11 @@ class GitBranchesModal extends React.PureComponent<Props, State> {
     await this._refreshState();
   }
 
-  async _refreshState(newState?: Object) {
+  async _refreshState(newState?: Record<string, any>) {
     const { vcs, handleGitBranchChanged } = this.props;
-
     const branch = await vcs.getBranch();
     const branches = await vcs.listBranches();
     const remoteBranches = await vcs.listRemoteBranches();
-
     this.setState({
       branch,
       branches,
@@ -90,7 +84,9 @@ class GitBranchesModal extends React.PureComponent<Props, State> {
   }
 
   _handleClearError() {
-    this.setState({ error: '' });
+    this.setState({
+      error: '',
+    });
   }
 
   _handleHide() {
@@ -103,28 +99,28 @@ class GitBranchesModal extends React.PureComponent<Props, State> {
     try {
       return await cb();
     } catch (err) {
-      this.setState({ error: err.message });
+      this.setState({
+        error: err.message,
+      });
     }
   }
 
-  async _handleCreate(e: SyntheticEvent<HTMLFormElement>) {
+  async _handleCreate(e: React.SyntheticEvent<HTMLFormElement>) {
     e.preventDefault();
-
     await this._errorHandler(async () => {
       const { vcs } = this.props;
       const { newBranchName } = this.state;
-
       await vcs.checkout(newBranchName);
-      await this._refreshState({ newBranchName: '' });
+      await this._refreshState({
+        newBranchName: '',
+      });
     });
   }
 
   async _handleMerge(branch: string) {
     await this._errorHandler(async () => {
       const { vcs } = this.props;
-
       await vcs.merge(branch);
-
       // Apparently merge doesn't update the working dir so need to checkout too
       await this._handleCheckout(branch);
     });
@@ -133,7 +129,6 @@ class GitBranchesModal extends React.PureComponent<Props, State> {
   async _handleDelete(branch: string) {
     await this._errorHandler(async () => {
       const { vcs } = this.props;
-
       await vcs.deleteBranch(branch);
       await this._refreshState();
     });
@@ -142,10 +137,8 @@ class GitBranchesModal extends React.PureComponent<Props, State> {
   async _handleRemoteCheckout(branch: string) {
     await this._errorHandler(async () => {
       const { vcs, gitRepository } = this.props;
-
       // First fetch more history to make sure we have lots
       await vcs.fetch(true, 20, gitRepository.credentials);
-
       await this._handleCheckout(branch);
     });
   }
@@ -153,18 +146,18 @@ class GitBranchesModal extends React.PureComponent<Props, State> {
   async _handleCheckout(branch: string) {
     await this._errorHandler(async () => {
       const { vcs, handleInitializeEntities } = this.props;
-
       const bufferId = await db.bufferChanges();
       await vcs.checkout(branch);
       await db.flushChanges(bufferId, true);
-
       await handleInitializeEntities();
       await this._refreshState();
     });
   }
 
-  _updateNewBranchName(e: SyntheticEvent<HTMLInputElement>) {
-    this.setState({ newBranchName: e.currentTarget.value });
+  _updateNewBranchName(e: React.SyntheticEvent<HTMLInputElement>) {
+    this.setState({
+      newBranchName: e.currentTarget.value,
+    });
   }
 
   hide() {
@@ -173,9 +166,7 @@ class GitBranchesModal extends React.PureComponent<Props, State> {
 
   render() {
     const { branch: currentBranch, branches, remoteBranches, newBranchName, error } = this.state;
-
     const remoteOnlyBranches = remoteBranches.filter(b => !branches.includes(b));
-
     return (
       <Modal ref={this._setModalRef} onHide={this._handleHide}>
         <ModalHeader>Local Branches</ModalHeader>
@@ -222,14 +213,19 @@ class GitBranchesModal extends React.PureComponent<Props, State> {
                 {branches.map(name => (
                   <tr key={name} className="table--no-outline-row">
                     <td>
-                      <span className={classnames({ bold: name === currentBranch })}>{name}</span>
+                      <span
+                        className={classnames({
+                          bold: name === currentBranch,
+                        })}>
+                        {name}
+                      </span>
                       {name === currentBranch ? (
                         <span className="txt-sm space-left">(current)</span>
                       ) : null}
                     </td>
                     <td className="text-right">
                       {name !== currentBranch && (
-                        <React.Fragment>
+                        <Fragment>
                           <PromptButton
                             className="btn btn--micro btn--outlined space-left"
                             doneMessage="Merged"
@@ -247,7 +243,7 @@ class GitBranchesModal extends React.PureComponent<Props, State> {
                             onClick={() => this._handleCheckout(name)}>
                             Checkout
                           </button>
-                        </React.Fragment>
+                        </Fragment>
                       )}
                     </td>
                   </tr>
diff --git a/packages/insomnia-app/app/ui/components/modals/git-log-modal.js b/packages/insomnia-app/app/ui/components/modals/git-log-modal.tsx
similarity index 84%
rename from packages/insomnia-app/app/ui/components/modals/git-log-modal.js
rename to packages/insomnia-app/app/ui/components/modals/git-log-modal.tsx
index e2dcecd190..ab766bc63c 100644
--- a/packages/insomnia-app/app/ui/components/modals/git-log-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/git-log-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Modal from '../base/modal';
@@ -10,40 +9,36 @@ import ModalFooter from '../base/modal-footer';
 import Tooltip from '../tooltip';
 import TimeFromNow from '../time-from-now';
 
-type Props = {|
-  vcs: GitVCS,
-|};
+interface Props {
+  vcs: GitVCS;
+}
 
-type State = {|
-  logs: Array<GitLogEntry>,
-  branch: string,
-|};
+interface State {
+  logs: Array<GitLogEntry>;
+  branch: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class GitLogModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
+class GitLogModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
 
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      logs: [],
-      branch: '??',
-    };
+  state: State = {
+    logs: [],
+    branch: '??',
   }
 
-  _setModalRef(ref: ?Modal) {
+  _setModalRef(ref: Modal) {
     this.modal = ref;
   }
 
   async show() {
     const { vcs } = this.props;
-
     const logs = await vcs.log();
     const branch = await vcs.getBranch();
-
-    this.setState({ logs, branch });
-
+    this.setState({
+      logs,
+      branch,
+    });
     this.modal && this.modal.show();
   }
 
@@ -56,7 +51,6 @@ class GitLogModal extends React.PureComponent<Props, State> {
       commit: { author, message },
       oid,
     } = entry;
-
     return (
       <tr key={oid}>
         <td>{message}</td>
@@ -78,7 +72,6 @@ class GitLogModal extends React.PureComponent<Props, State> {
 
   render() {
     const { logs, branch } = this.state;
-
     return (
       <Modal ref={this._setModalRef}>
         <ModalHeader>Git History ({logs.length})</ModalHeader>
diff --git a/packages/insomnia-app/app/ui/components/modals/git-repository-settings-modal.js b/packages/insomnia-app/app/ui/components/modals/git-repository-settings-modal.tsx
similarity index 84%
rename from packages/insomnia-app/app/ui/components/modals/git-repository-settings-modal.js
rename to packages/insomnia-app/app/ui/components/modals/git-repository-settings-modal.tsx
index e0dcb9cfe0..7a4ebe2fe8 100644
--- a/packages/insomnia-app/app/ui/components/modals/git-repository-settings-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/git-repository-settings-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Modal from '../base/modal';
@@ -12,43 +11,37 @@ import { docsGitAccessToken, docsGitSync } from '../../../common/documentation';
 import Link from '../base/link';
 import { deleteGitRepository } from '../../../models/helpers/git-repository-operations';
 
-type Props = {||};
-
-type State = {|
-  gitRepository: GitRepository | null,
+interface State {
+  gitRepository: GitRepository | null;
   inputs: {
-    uri?: string,
-    authorName?: string,
-    authorEmail?: string,
-    username?: string,
-    token?: string,
-  },
-|};
+    uri?: string;
+    authorName?: string;
+    authorEmail?: string;
+    username?: string;
+    token?: string;
+  };
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class GitRepositorySettingsModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
-  input: ?HTMLInputElement;
-  _onSubmitEdits: ?(GitRepository) => any;
+class GitRepositorySettingsModal extends PureComponent<{}, State> {
+  modal: Modal | null = null;
+  input: HTMLInputElement | null = null;
+  _onSubmitEdits?: ((arg0: GitRepository) => any) | null;
 
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      inputs: {},
-      gitRepository: null,
-    };
+  state: State = {
+    inputs: {},
+    gitRepository: null,
   }
 
-  _setModalRef(n: ?Modal) {
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
-  _setInputRef(n: ?HTMLInputElement) {
+  _setInputRef(n: HTMLInputElement) {
     this.input = n;
   }
 
-  async _handleInputChange(e: SyntheticEvent<HTMLInputElement>) {
+  async _handleInputChange(e: React.SyntheticEvent<HTMLInputElement>) {
     const { name, value } = e.currentTarget;
     this.setState(state => ({
       inputs: { ...state.inputs, [name]: value },
@@ -64,17 +57,13 @@ class GitRepositorySettingsModal extends React.PureComponent<Props, State> {
     }
 
     await deleteGitRepository(gitRepository);
-
     this.hide();
   }
 
-  async _handleSubmitEdit(e: SyntheticEvent<HTMLFormElement>) {
+  async _handleSubmitEdit(e: React.SyntheticEvent<HTMLFormElement>) {
     e.preventDefault();
-
     const { inputs, gitRepository } = this.state;
-
     const uri = inputs.uri || '';
-
     const credentials = inputs.token
       ? {
           type: 'token',
@@ -82,41 +71,51 @@ class GitRepositorySettingsModal extends React.PureComponent<Props, State> {
           token: inputs.token,
         }
       : null;
-
     const author = {
       name: inputs.authorName || '',
       email: inputs.authorEmail || '',
     };
-
-    const patch = { uri, credentials, author };
+    const patch = {
+      uri,
+      credentials,
+      author,
+    };
 
     if (this._onSubmitEdits) {
+      // @ts-expect-error -- TSCONVERSION
       this._onSubmitEdits({ ...gitRepository, ...patch });
     }
 
     this.hide();
   }
 
-  show(options: { gitRepository: GitRepository | null, onSubmitEdits: GitRepository => any }) {
+  show(options: {
+    gitRepository: GitRepository | null;
+    onSubmitEdits: (arg0: GitRepository) => any;
+  }) {
     this._onSubmitEdits = options.onSubmitEdits;
-
     const { gitRepository } = options;
-
     const inputs = {};
 
     if (gitRepository) {
       const creds = gitRepository.credentials || {};
+      // @ts-expect-error -- TSCONVERSION
       inputs.token = typeof creds.token === 'string' ? creds.token : '';
+      // @ts-expect-error -- TSCONVERSION
       inputs.authorEmail = gitRepository.author.email;
+      // @ts-expect-error -- TSCONVERSION
       inputs.authorName = gitRepository.author.name;
+      // @ts-expect-error -- TSCONVERSION
       inputs.username = gitRepository.credentials?.username || '';
+      // @ts-expect-error -- TSCONVERSION
       inputs.uri = gitRepository.uri;
     }
 
-    this.setState({ gitRepository, inputs });
-
+    this.setState({
+      gitRepository,
+      inputs,
+    });
     this.modal && this.modal.show();
-
     setTimeout(() => {
       this.input && this.input.focus();
     }, 100);
@@ -128,9 +127,7 @@ class GitRepositorySettingsModal extends React.PureComponent<Props, State> {
 
   render() {
     const { inputs, gitRepository } = this.state;
-
     const linkIcon = <i className="fa fa-external-link-square" />;
-
     return (
       <form onSubmit={this._handleSubmitEdit}>
         <Modal ref={this._setModalRef} {...this.props}>
diff --git a/packages/insomnia-app/app/ui/components/modals/git-staging-modal.js b/packages/insomnia-app/app/ui/components/modals/git-staging-modal.tsx
similarity index 85%
rename from packages/insomnia-app/app/ui/components/modals/git-staging-modal.js
rename to packages/insomnia-app/app/ui/components/modals/git-staging-modal.tsx
index 0d79b58717..ce550738b2 100644
--- a/packages/insomnia-app/app/ui/components/modals/git-staging-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/git-staging-modal.tsx
@@ -1,6 +1,5 @@
-// @flow
 import YAML from 'yaml';
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import path from 'path';
@@ -10,7 +9,7 @@ import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import type { Workspace } from '../../../models/workspace';
 import { GitVCS, GIT_INSOMNIA_DIR, GIT_INSOMNIA_DIR_NAME } from '../../../sync/git/git-vcs';
-import { withDescendants } from '../../../common/database';
+import { database as db } from '../../../common/database';
 import IndeterminateCheckbox from '../base/indeterminate-checkbox';
 import ModalFooter from '../base/modal-footer';
 import Tooltip from '../tooltip';
@@ -20,28 +19,26 @@ import classnames from 'classnames';
 import parseGitPath from '../../../sync/git/parse-git-path';
 import { strings } from '../../../common/strings';
 
-type Props = {|
-  workspace: Workspace,
-  vcs: GitVCS,
-|};
+interface Item {
+  path: string;
+  type: string;
+  status: string;
+  staged: boolean;
+  added: boolean;
+  editable: boolean;
+}
 
-type Item = {|
-  path: string,
-  type: string,
-  status: string,
-  staged: boolean,
-  added: boolean,
-  editable: boolean,
-|};
+interface Props {
+  workspace: Workspace;
+  vcs: GitVCS;
+}
 
-type State = {|
-  loading: boolean,
-  branch: string,
-  message: string,
-  items: {
-    [string]: Item,
-  },
-|};
+interface State {
+  loading: boolean;
+  branch: string;
+  message: string;
+  items: Record<string, Item>;
+}
 
 const INITIAL_STATE: State = {
   loading: false,
@@ -51,10 +48,10 @@ const INITIAL_STATE: State = {
 };
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class GitStagingModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
-  statusNames: { [string]: string };
-  textarea: ?HTMLTextAreaElement;
+class GitStagingModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
+  statusNames: Record<string, string>;
+  textarea: HTMLTextAreaElement | null = null;
   onCommit: null | (() => void);
 
   constructor(props: Props) {
@@ -63,19 +60,21 @@ class GitStagingModal extends React.PureComponent<Props, State> {
     this.onCommit = null;
   }
 
-  _setModalRef(ref: ?Modal) {
+  _setModalRef(ref: Modal) {
     this.modal = ref;
   }
 
-  _setTextareaRef(ref: ?Modal) {
+  _setTextareaRef(ref: HTMLTextAreaElement) {
     this.textarea = ref;
   }
 
-  async _handleMessageChange(e: SyntheticEvent<HTMLTextAreaElement>) {
-    this.setState({ message: e.currentTarget.value });
+  async _handleMessageChange(e: React.SyntheticEvent<HTMLTextAreaElement>) {
+    this.setState({
+      message: e.currentTarget.value,
+    });
   }
 
-  async _handleCommit(e: SyntheticEvent<HTMLButtonElement>) {
+  async _handleCommit() {
     const { vcs } = this.props;
     const { items, message } = this.state;
 
@@ -95,7 +94,6 @@ class GitStagingModal extends React.PureComponent<Props, State> {
     }
 
     await vcs.commit(message);
-
     this.modal && this.modal.hide();
 
     if (typeof this.onCommit === 'function') {
@@ -107,10 +105,9 @@ class GitStagingModal extends React.PureComponent<Props, State> {
     this.modal && this.modal.hide();
   }
 
-  async _toggleAll(items: Array<Item>, forceAdd: boolean = false) {
+  async _toggleAll(items: Array<Item>, forceAdd = false) {
     const allStaged = items.every(i => i.staged);
     const doStage = !allStaged;
-
     const newItems = { ...this.state.items };
 
     for (const { path: p } of items) {
@@ -121,12 +118,13 @@ class GitStagingModal extends React.PureComponent<Props, State> {
       newItems[p].staged = doStage || forceAdd;
     }
 
-    this.setState({ items: newItems });
+    this.setState({
+      items: newItems,
+    });
   }
 
-  async _handleToggleOne(e: SyntheticEvent<HTMLInputElement>) {
+  async _handleToggleOne(e: React.SyntheticEvent<HTMLInputElement>) {
     const newItems = { ...this.state.items };
-
     const gitPath = e.currentTarget.name;
 
     if (!newItems[gitPath] || !newItems[gitPath].editable) {
@@ -134,18 +132,20 @@ class GitStagingModal extends React.PureComponent<Props, State> {
     }
 
     newItems[gitPath].staged = !newItems[gitPath].staged;
-
-    this.setState({ items: newItems });
+    this.setState({
+      items: newItems,
+    });
   }
 
   async getAllPaths(): Promise<Array<string>> {
     const { vcs } = this.props;
-
+    // @ts-expect-error -- TSCONVERSION
     const f = vcs.getFs().promises;
+    const fsPaths: Array<string> = [];
 
-    const fsPaths = [];
     for (const type of await f.readdir(GIT_INSOMNIA_DIR)) {
       const typeDir = path.join(GIT_INSOMNIA_DIR, type);
+
       for (const name of await f.readdir(typeDir)) {
         // NOTE: git paths don't start with '/' so we're omitting
         //  it here too.
@@ -159,15 +159,12 @@ class GitStagingModal extends React.PureComponent<Props, State> {
     // file can be deleted from FS or from Git.
     const gitPaths = await vcs.listFiles();
     const uniquePaths = new Set([...fsPaths, ...gitPaths]);
-
     return Array.from(uniquePaths).sort();
   }
 
   async show(options: { onCommit?: () => void }) {
     this.onCommit = options.onCommit || null;
-
     this.modal && this.modal.show();
-
     // Reset state
     this.setState(INITIAL_STATE);
     await this._refresh(() => {
@@ -177,19 +174,21 @@ class GitStagingModal extends React.PureComponent<Props, State> {
 
   async _refresh(callback?: () => void) {
     const { vcs, workspace } = this.props;
-
-    this.setState({ loading: true });
-
+    this.setState({
+      loading: true,
+    });
     // Get and set branch name
     const branch = await vcs.getBranch();
-    this.setState({ branch });
-
+    this.setState({
+      branch,
+    });
     // Cache status names
-    const docs = await withDescendants(workspace);
+    const docs = await db.withDescendants(workspace);
     const allPaths = await this.getAllPaths();
-
     this.statusNames = {};
+
     for (const doc of docs) {
+      // @ts-expect-error -- TSCONVERSION
       const name = (doc.type === models.apiSpec.type && doc.fileName) || doc.name || '';
       this.statusNames[path.join(GIT_INSOMNIA_DIR_NAME, doc.type, `${doc._id}.json`)] = name;
       this.statusNames[path.join(GIT_INSOMNIA_DIR_NAME, doc.type, `${doc._id}.yml`)] = name;
@@ -198,21 +197,25 @@ class GitStagingModal extends React.PureComponent<Props, State> {
     // Create status items
     const items = {};
     const log = (await vcs.log(1)) || [];
+
     for (const gitPath of allPaths) {
       const status = await vcs.status(gitPath);
+
       if (status === 'unmodified') {
         continue;
       }
 
       if (!this.statusNames[gitPath] && log.length > 0) {
         const docYML = await vcs.readObjFromTree(log[0].commit.tree, gitPath);
+
         if (!docYML) {
           continue;
         }
 
         try {
+          // @ts-expect-error -- TSCONVERSION
           const doc = YAML.parse(docYML);
-          this.statusNames[gitPath] = (doc: any).name || '';
+          this.statusNames[gitPath] = doc.name || '';
         } catch (err) {
           // Nothing here
         }
@@ -220,17 +223,19 @@ class GitStagingModal extends React.PureComponent<Props, State> {
 
       // We know that type is in the path; extract it. If the model is not found, set to Unknown.
       let { type } = parseGitPath(gitPath);
+
+      // @ts-expect-error -- TSCONVERSION
       if (!models.types().includes(type)) {
         type = 'Unknown';
       }
 
       const added = status.includes('added');
       let staged = !added;
-
       // We want to enforce that the workspace is committed because otherwise
       // others won't be able to clone from it. So here we're preventing
       // people from un-staging the workspace if it's not added yet.
       let editable = true;
+
       if (type === models.workspace.type && added) {
         editable = false;
         staged = true;
@@ -246,11 +251,17 @@ class GitStagingModal extends React.PureComponent<Props, State> {
       };
     }
 
-    this.setState({ items, loading: false }, callback);
+    this.setState(
+      {
+        items,
+        loading: false,
+      },
+      callback,
+    );
   }
 
   renderOperation(item: Item) {
-    let child = null;
+    let child: JSX.Element | null = null;
     let message = '';
     let type = item.type;
 
@@ -273,28 +284,27 @@ class GitStagingModal extends React.PureComponent<Props, State> {
     }
 
     return (
-      <React.Fragment>
+      <Fragment>
         <Tooltip message={message}>
           {child} {type}
         </Tooltip>
-      </React.Fragment>
+      </Fragment>
     );
   }
 
   async _handleRollback(items: Array<Item>) {
     const { vcs } = this.props;
-
-    const files = items.map(i => ({ filePath: i.path, status: i.status }));
-
+    const files = items.map(i => ({
+      filePath: i.path,
+      status: i.status,
+    }));
     await gitRollback(vcs, files);
     await this._refresh();
   }
 
   renderItem(item: Item) {
     const { path: gitPath, staged, editable } = item;
-
     const docName = this.statusNames[gitPath] || 'n/a';
-
     return (
       <tr key={gitPath} className="table--no-outline-row">
         <td>
@@ -331,7 +341,6 @@ class GitStagingModal extends React.PureComponent<Props, State> {
 
     const allStaged = items.every(i => i.staged);
     const allUnstaged = items.every(i => !i.staged);
-
     return (
       <div className="pad-top">
         <strong>{title}</strong>
@@ -348,6 +357,7 @@ class GitStagingModal extends React.PureComponent<Props, State> {
                   <span className="txt-md">
                     <IndeterminateCheckbox
                       className="space-right"
+                      // @ts-expect-error -- TSCONVERSION
                       type="checkbox"
                       checked={allStaged}
                       onChange={() => this._toggleAll(items, !allStaged)}
@@ -378,16 +388,14 @@ class GitStagingModal extends React.PureComponent<Props, State> {
 
   _renderItems(items: Array<Item>) {
     const { message } = this.state;
-
     const newItems = items.filter(i => i.status.includes('added'));
     const existingItems = items.filter(i => !i.status.includes('added'));
-
     return (
       <>
         <div className="form-control form-control--outlined">
           <textarea
             ref={this._setTextareaRef}
-            rows="3"
+            rows={3}
             required
             placeholder="A descriptive message to describe changes made"
             defaultValue={message}
@@ -402,10 +410,8 @@ class GitStagingModal extends React.PureComponent<Props, State> {
 
   render() {
     const { items, branch, loading } = this.state;
-
     const itemsList = Object.keys(items).map(k => items[k]);
     const hasChanges = !!itemsList.length;
-
     return (
       <Modal ref={this._setModalRef}>
         <ModalHeader>Commit Changes</ModalHeader>
diff --git a/packages/insomnia-app/app/ui/components/modals/index.js b/packages/insomnia-app/app/ui/components/modals/index.ts
similarity index 99%
rename from packages/insomnia-app/app/ui/components/modals/index.js
rename to packages/insomnia-app/app/ui/components/modals/index.ts
index f5d7088f1d..013c836c56 100644
--- a/packages/insomnia-app/app/ui/components/modals/index.js
+++ b/packages/insomnia-app/app/ui/components/modals/index.ts
@@ -1,4 +1,3 @@
-// @flow
 import PromptModal from './prompt-modal';
 import AlertModal from './alert-modal';
 import ErrorModal from './error-modal';
@@ -12,9 +11,15 @@ export function registerModal(instance) {
     // Modal was unmounted
     return;
   }
+
   modals[instance.constructor.name] = instance;
 }
 
+export function showModal(modalCls, ...args) {
+  trackEvent('Modals', 'Show', modalCls.name);
+  return _getModal(modalCls).show(...args);
+}
+
 export function showPrompt(config) {
   return showModal(PromptModal, config);
 }
@@ -31,11 +36,6 @@ export function showError(config: ErrorModalOptions) {
   }
 }
 
-export function showModal(modalCls, ...args) {
-  trackEvent('Modals', 'Show', modalCls.name);
-  return _getModal(modalCls).show(...args);
-}
-
 export function hideAllModals() {
   for (const key of Object.keys(modals)) {
     const modal = modals[key];
@@ -45,6 +45,7 @@ export function hideAllModals() {
 
 function _getModal(modalCls) {
   const m = modals[modalCls.name || modalCls.WrappedComponent?.name];
+
   if (!m) {
     throw new Error('Modal was not registered with the app');
   }
diff --git a/packages/insomnia-app/app/ui/components/modals/login-modal.js b/packages/insomnia-app/app/ui/components/modals/login-modal.tsx
similarity index 71%
rename from packages/insomnia-app/app/ui/components/modals/login-modal.js
rename to packages/insomnia-app/app/ui/components/modals/login-modal.tsx
index e70596e9a6..f1fe68fa72 100644
--- a/packages/insomnia-app/app/ui/components/modals/login-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/login-modal.tsx
@@ -9,55 +9,73 @@ import ModalFooter from '../base/modal-footer';
 import * as session from '../../../account/session';
 import { showModal } from './index';
 
-@autoBindMethodsForReact(AUTOBIND_CFG)
-class LoginModal extends PureComponent {
-  constructor(props) {
-    super(props);
+interface State {
+  loading: boolean;
+  error: string;
+  title: string;
+  message: string;
+}
 
-    this.state = {
-      loading: false,
-      error: '',
-      title: '',
-      message: '',
-    };
+@autoBindMethodsForReact(AUTOBIND_CFG)
+class LoginModal extends PureComponent<{}, State> {
+  state: State = {
+    loading: false,
+    error: '',
+    title: '',
+    message: '',
   }
 
-  _setModalRef(n) {
+  modal: Modal | null = null;
+  _passwordInput: HTMLInputElement | null = null;
+  _emailInput: HTMLInputElement | null = null;
+
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
-  _setPasswordInputRef(n) {
+  _setPasswordInputRef(n: HTMLInputElement) {
     this._passwordInput = n;
   }
 
-  _setEmailInputRef(n) {
+  _setEmailInputRef(n: HTMLInputElement) {
     this._emailInput = n;
   }
 
   async _handleLogin(e) {
     e.preventDefault();
-    this.setState({ error: '', loading: true });
-
-    const email = this._emailInput.value;
-    const password = this._passwordInput.value;
+    this.setState({
+      error: '',
+      loading: true,
+    });
+    const email = this._emailInput?.value;
+    const password = this._passwordInput?.value;
 
     try {
       await session.login(email, password);
       this.hide();
     } catch (e) {
-      this.setState({ error: e.message, loading: false });
+      this.setState({
+        error: e.message,
+        loading: false,
+      });
     }
   }
 
   show(options = {}) {
+    // @ts-expect-error -- TSCONVERSION
     const { title, message } = options;
-    this.setState({ error: '', loading: false, title, message });
-    this.modal.show();
-    setTimeout(() => this._emailInput.focus(), 100);
+    this.setState({
+      error: '',
+      loading: false,
+      title,
+      message,
+    });
+    this.modal?.show();
+    setTimeout(() => this._emailInput?.focus(), 100);
   }
 
   hide() {
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   render() {
@@ -73,6 +91,7 @@ class LoginModal extends PureComponent {
                 Email
                 <input
                   type="email"
+                  // @ts-expect-error -- TSCONVERSION appears to be genuine
                   required="required"
                   placeholder="me@mydomain.com"
                   ref={this._setEmailInputRef}
@@ -84,6 +103,7 @@ class LoginModal extends PureComponent {
                 Password
                 <input
                   type="password"
+                  // @ts-expect-error -- TSCONVERSION appears to be genuine
                   required="required"
                   placeholder="•••••••••••••••••"
                   ref={this._setPasswordInputRef}
diff --git a/packages/insomnia-app/app/ui/components/modals/move-request-group-modal.js b/packages/insomnia-app/app/ui/components/modals/move-request-group-modal.tsx
similarity index 77%
rename from packages/insomnia-app/app/ui/components/modals/move-request-group-modal.js
rename to packages/insomnia-app/app/ui/components/modals/move-request-group-modal.tsx
index e9189334d8..22964347c4 100644
--- a/packages/insomnia-app/app/ui/components/modals/move-request-group-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/move-request-group-modal.tsx
@@ -1,8 +1,7 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
-import Modal from '../base/modal';
+import Modal, { ModalProps } from '../base/modal';
 import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import ModalFooter from '../base/modal-footer';
@@ -11,67 +10,66 @@ import type { Workspace } from '../../../models/workspace';
 import * as models from '../../../models';
 import HelpTooltip from '../help-tooltip';
 
-type Props = {
-  workspaces: Array<Workspace>,
-  activeWorkspace: Workspace,
-};
+interface Props extends ModalProps {
+  workspaces: Array<Workspace>;
+  activeWorkspace: Workspace;
+}
 
-type State = {
-  requestGroup: RequestGroup | null,
-  selectedWorkspaceId: string | null,
-};
+interface State {
+  requestGroup: RequestGroup | null;
+  selectedWorkspaceId?: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class MoveRequestGroupModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
+class MoveRequestGroupModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
 
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      requestGroup: null,
-      selectedWorkspaceId: null,
-    };
+  state: State = {
+    requestGroup: null,
+    selectedWorkspaceId: undefined,
   }
 
-  _setModalRef(n: ?Modal) {
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
-  async _handleSubmit(e: SyntheticEvent<HTMLFormElement>) {
+  async _handleSubmit(e: React.SyntheticEvent<HTMLFormElement>) {
     e.preventDefault();
-
     const { requestGroup, selectedWorkspaceId } = this.state;
+
     if (!requestGroup || !selectedWorkspaceId) {
       return;
     }
 
     const workspace = await models.workspace.getById(selectedWorkspaceId);
+
     if (!workspace) {
       return;
     }
 
     // TODO: if there are gRPC requests in a request group
     //  we should also copy the protofiles to the destination workspace - INS-267
-
     await models.requestGroup.duplicate(requestGroup, {
       metaSortKey: -1e9,
       parentId: selectedWorkspaceId,
       name: requestGroup.name, // Because duplicating will add (Copy) suffix
     });
-
     await models.requestGroup.remove(requestGroup);
     this.hide();
   }
 
-  _handleChangeSelectedWorkspace(e: SyntheticEvent<HTMLSelectElement>) {
+  _handleChangeSelectedWorkspace(e: React.SyntheticEvent<HTMLSelectElement>) {
     const selectedWorkspaceId = e.currentTarget.value;
-    this.setState({ selectedWorkspaceId });
+    this.setState({
+      selectedWorkspaceId,
+    });
   }
 
   show(options: { requestGroup: RequestGroup }) {
     const { requestGroup } = options;
-    this.setState({ requestGroup });
+    this.setState({
+      requestGroup,
+    });
     this.modal && this.modal.show();
   }
 
@@ -84,7 +82,7 @@ class MoveRequestGroupModal extends React.PureComponent<Props, State> {
     const { selectedWorkspaceId } = this.state;
     return (
       <form onSubmit={this._handleSubmit}>
-        <Modal ref={this._setModalRef} {...(this.props: Object)}>
+        <Modal ref={this._setModalRef} {...this.props}>
           <ModalHeader key="header">Move Folder to Workspace</ModalHeader>
           <ModalBody key="body" className="pad">
             <div className="form-control form-control--outlined">
diff --git a/packages/insomnia-app/app/ui/components/modals/nunjucks-modal.js b/packages/insomnia-app/app/ui/components/modals/nunjucks-modal.tsx
similarity index 73%
rename from packages/insomnia-app/app/ui/components/modals/nunjucks-modal.js
rename to packages/insomnia-app/app/ui/components/modals/nunjucks-modal.tsx
index 11febf68f6..6a081ba4f5 100644
--- a/packages/insomnia-app/app/ui/components/modals/nunjucks-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/nunjucks-modal.tsx
@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import VariableEditor from '../templating/variable-editor';
@@ -8,24 +7,34 @@ import Modal from '../base/modal';
 import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import ModalFooter from '../base/modal-footer';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
+
+interface Props {
+  uniqueKey: string;
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  workspace: any;
+}
+
+interface State {
+  defaultTemplate: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class NunjucksModal extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      defaultTemplate: '',
-    };
-
-    this._onDone = null;
-    this._currentTemplate = null;
+class NunjucksModal extends PureComponent<Props, State> {
+  state: State = {
+    defaultTemplate: '',
   }
 
-  _setModalRef(n) {
+  _onDone: Function | null = null;
+  _currentTemplate: string | null = null;
+  modal: Modal | null = null;
+
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
-  _handleTemplateChange(template) {
+  _handleTemplateChange(template: string | null) {
     this._currentTemplate = template;
   }
 
@@ -37,28 +46,32 @@ class NunjucksModal extends PureComponent {
   _handleModalHide() {
     if (this._onDone) {
       this._onDone(this._currentTemplate);
-      this.setState({ defaultTemplate: '' });
+
+      this.setState({
+        defaultTemplate: '',
+      });
     }
   }
 
   show({ template, onDone }) {
     this._onDone = onDone;
     this._currentTemplate = template;
-
-    this.setState({ defaultTemplate: template });
-    this.modal.show();
+    this.setState({
+      defaultTemplate: template,
+    });
+    this.modal?.show();
   }
 
   hide() {
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   render() {
     const { handleRender, handleGetRenderContext, uniqueKey, workspace } = this.props;
     const { defaultTemplate } = this.state;
-
-    let editor = null;
+    let editor: JSX.Element | null = null;
     let title = '';
+
     if (defaultTemplate.indexOf('{{') === 0) {
       title = 'Variable';
       editor = (
@@ -98,11 +111,4 @@ class NunjucksModal extends PureComponent {
   }
 }
 
-NunjucksModal.propTypes = {
-  uniqueKey: PropTypes.string.isRequired,
-  handleRender: PropTypes.func.isRequired,
-  handleGetRenderContext: PropTypes.func.isRequired,
-  workspace: PropTypes.object.isRequired,
-};
-
 export default NunjucksModal;
diff --git a/packages/insomnia-app/app/ui/components/modals/payment-notification-modal.js b/packages/insomnia-app/app/ui/components/modals/payment-notification-modal.tsx
similarity index 89%
rename from packages/insomnia-app/app/ui/components/modals/payment-notification-modal.js
rename to packages/insomnia-app/app/ui/components/modals/payment-notification-modal.tsx
index 5be20a9dd0..5bbb93b9b8 100644
--- a/packages/insomnia-app/app/ui/components/modals/payment-notification-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/payment-notification-modal.tsx
@@ -7,7 +7,6 @@ import Modal from '../base/modal';
 import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import { getFirstName, endTrial, logout } from '../../../account/session';
-
 let hidePaymentNotificationUntilNextLaunch = false;
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
@@ -19,10 +18,13 @@ class PaymentNotificationModal extends PureComponent {
     } catch (err) {
       // That's okay
     }
+
     this.hide();
   }
 
-  _setModalRef(n) {
+  modal: Modal | null = null;
+
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
@@ -33,11 +35,11 @@ class PaymentNotificationModal extends PureComponent {
     }
 
     hidePaymentNotificationUntilNextLaunch = true;
-    this.modal.show();
+    this.modal?.show();
   }
 
   hide() {
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   render() {
@@ -47,7 +49,11 @@ class PaymentNotificationModal extends PureComponent {
         <ModalBody className="pad changelog">
           <div className="text-center pad">
             <h1>Hi {getFirstName()},</h1>
-            <p style={{ maxWidth: '30rem', margin: 'auto' }}>
+            <p
+              style={{
+                maxWidth: '30rem',
+                margin: 'auto',
+              }}>
               Your Insomnia Plus trial has come to an end. Please enter your billing info to
               continue using Plus features like encrypted data synchronization and backup.
             </p>
diff --git a/packages/insomnia-app/app/ui/components/modals/prompt-modal.js b/packages/insomnia-app/app/ui/components/modals/prompt-modal.tsx
similarity index 70%
rename from packages/insomnia-app/app/ui/components/modals/prompt-modal.js
rename to packages/insomnia-app/app/ui/components/modals/prompt-modal.tsx
index 12c3d8b639..2a14b93646 100644
--- a/packages/insomnia-app/app/ui/components/modals/prompt-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/prompt-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import classnames from 'classnames';
@@ -10,52 +9,47 @@ import ModalFooter from '../base/modal-footer';
 import Button from '../base/button';
 import PromptButton from '../base/prompt-button';
 
-type Props = {};
-
-type State = {
-  title: string,
-  hints: Array<string>,
-  defaultValue: ?string,
-  submitName: ?string,
-  selectText: ?boolean,
-  upperCase: ?boolean,
-  validate: ?(string) => string,
-  hint: ?string,
-  label: ?string,
-  placeholder: ?string,
-  inputType: ?string,
-  cancelable: ?boolean,
-  onComplete: ?(string) => void,
-  onCancel: ?() => void,
-  onDeleteHint: ?(string) => void,
-  currentValue: string,
-};
+interface State {
+  title: string;
+  hints: Array<string>;
+  defaultValue?: string | null;
+  submitName?: string | null;
+  selectText?: boolean | null;
+  upperCase?: boolean | null;
+  validate?: ((arg0: string) => string) | null;
+  hint?: string | null;
+  label?: string | null;
+  placeholder?: string | null;
+  inputType?: string | null;
+  cancelable?: boolean | null;
+  onComplete?: ((arg0: string) => void) | null;
+  onCancel?: (() => void) | null;
+  onDeleteHint?: ((arg0: string) => void) | null;
+  currentValue: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class PromptModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
-  _input: ?HTMLInputElement;
+class PromptModal extends PureComponent<{}, State> {
+  modal: Modal | null = null;
+  _input: HTMLInputElement | null = null;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      title: 'Not Set',
-      hints: [],
-      defaultValue: '',
-      submitName: '',
-      selectText: false,
-      upperCase: false,
-      validate: null,
-      hint: '',
-      label: '',
-      placeholder: '',
-      inputType: '',
-      cancelable: false,
-      onComplete: undefined,
-      onCancel: undefined,
-      onDeleteHint: undefined,
-      currentValue: '',
-    };
+  state: State = {
+    title: 'Not Set',
+    hints: [],
+    defaultValue: '',
+    submitName: '',
+    selectText: false,
+    upperCase: false,
+    validate: null,
+    hint: '',
+    label: '',
+    placeholder: '',
+    inputType: '',
+    cancelable: false,
+    onComplete: undefined,
+    onCancel: undefined,
+    onDeleteHint: undefined,
+    currentValue: '',
   }
 
   _done(rawValue: string) {
@@ -65,11 +59,11 @@ class PromptModal extends React.PureComponent<Props, State> {
     this.hide();
   }
 
-  _setInputRef(n: ?HTMLInputElement) {
+  _setInputRef(n: HTMLInputElement) {
     this._input = n;
   }
 
-  _setModalRef(n: ?Modal) {
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
@@ -81,20 +75,23 @@ class PromptModal extends React.PureComponent<Props, State> {
     const { onDeleteHint } = this.state;
     onDeleteHint && onDeleteHint(hint);
     const hints = this.state.hints.filter(h => h !== hint);
-    this.setState({ hints });
+    this.setState({
+      hints,
+    });
   }
 
-  _handleSubmit(e: SyntheticEvent<HTMLFormElement>) {
+  _handleSubmit(e: React.SyntheticEvent<HTMLFormElement | HTMLButtonElement>) {
     e.preventDefault();
 
     if (this._input) {
       const result =
         this._input.type === 'checkbox' ? this._input.checked.toString() : this._input.value;
+
       this._done(result);
     }
   }
 
-  _handleChange(e: SyntheticEvent<HTMLInputElement>) {
+  _handleChange(e: React.SyntheticEvent<HTMLInputElement>) {
     const { validate } = this.state;
 
     if (validate) {
@@ -108,21 +105,21 @@ class PromptModal extends React.PureComponent<Props, State> {
   }
 
   show(options: {
-    title: string,
-    defaultValue?: string,
-    submitName?: string,
-    selectText?: boolean,
-    upperCase?: boolean,
-    hint?: string,
-    cancelable?: boolean,
-    inputType?: string,
-    placeholder?: string,
-    validate?: string => string,
-    label?: string,
-    hints?: Array<string>,
-    onComplete?: string => void,
-    onDeleteHint?: string => void,
-    onCancel?: () => void,
+    title: string;
+    defaultValue?: string;
+    submitName?: string;
+    selectText?: boolean;
+    upperCase?: boolean;
+    hint?: string;
+    cancelable?: boolean;
+    inputType?: string;
+    placeholder?: string;
+    validate?: (arg0: string) => string;
+    label?: string;
+    hints?: Array<string>;
+    onComplete?: (arg0: string) => void;
+    onDeleteHint?: (arg0: string) => void;
+    onCancel?: () => void;
   }) {
     const {
       title,
@@ -141,7 +138,6 @@ class PromptModal extends React.PureComponent<Props, State> {
       validate,
       onDeleteHint,
     } = options;
-
     this.setState({
       currentValue: '',
       title,
@@ -160,20 +156,21 @@ class PromptModal extends React.PureComponent<Props, State> {
       validate,
       hints: hints || [],
     });
-
     this.modal && this.modal.show();
-
     // Need to do this after render because modal focuses itself too
     setTimeout(() => {
       if (!this._input) {
         return;
       }
+
       if (inputType === 'checkbox') {
         this._input.checked = !!defaultValue;
       } else {
         this._input.value = defaultValue || '';
       }
+
       this._input.focus();
+
       selectText && this._input && this._input.select();
     }, 100);
   }
@@ -183,7 +180,6 @@ class PromptModal extends React.PureComponent<Props, State> {
       'btn btn--outlined btn--super-duper-compact',
       'margin-right-sm margin-top-sm inline-block',
     );
-
     return (
       <div key={hint} className={classes}>
         <Button className="tall" onClick={this._handleSelectHint} value={hint}>
@@ -214,26 +210,28 @@ class PromptModal extends React.PureComponent<Props, State> {
       cancelable,
       onCancel,
     } = this.state;
-
     const input = (
       <input
         ref={this._setInputRef}
         onChange={this._handleChange}
         id="prompt-input"
         type={inputType === 'decimal' ? 'number' : inputType || 'text'}
-        step={inputType === 'decimal' ? '0.1' : null}
-        min={inputType === 'decimal' ? '0.5' : null}
-        style={{ textTransform: upperCase ? 'uppercase' : 'none' }}
+        step={inputType === 'decimal' ? '0.1' : undefined}
+        min={inputType === 'decimal' ? '0.5' : undefined}
+        style={{
+          textTransform: upperCase ? 'uppercase' : 'none',
+        }}
         placeholder={placeholder || ''}
       />
     );
+    let sanitizedHints: Array<ReactNode> = [];
 
-    let sanitizedHints = [];
     if (Array.isArray(hints)) {
       sanitizedHints = hints.slice(0, 15).map(this._renderHintButton);
     }
 
     let field = input;
+
     if (label) {
       const labelClasses = classnames({
         'inline-block': inputType === 'checkbox',
@@ -249,7 +247,7 @@ class PromptModal extends React.PureComponent<Props, State> {
       'form-control--outlined': inputType !== 'checkbox',
     });
     return (
-      <Modal ref={this._setModalRef} noEscape={!cancelable} onCancel={onCancel}>
+      <Modal ref={this._setModalRef} noEscape={!cancelable} onCancel={onCancel || undefined}>
         <ModalHeader>{title}</ModalHeader>
         <ModalBody className="wide">
           <form onSubmit={this._handleSubmit} className="wide pad">
diff --git a/packages/insomnia-app/app/ui/components/modals/proto-files-modal.js b/packages/insomnia-app/app/ui/components/modals/proto-files-modal.tsx
similarity index 74%
rename from packages/insomnia-app/app/ui/components/modals/proto-files-modal.js
rename to packages/insomnia-app/app/ui/components/modals/proto-files-modal.tsx
index 88c73b9ead..4d39ed9389 100644
--- a/packages/insomnia-app/app/ui/components/modals/proto-files-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/proto-files-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import type { ProtoFile } from '../../../models/proto-file';
 import ModalHeader from '../base/modal-header';
 import ModalBody from '../base/modal-body';
@@ -19,20 +18,20 @@ import { selectExpandedActiveProtoDirectories } from '../../redux/proto-selector
 import type { ProtoDirectory } from '../../../models/proto-directory';
 import * as protoManager from '../../../network/grpc/proto-manager';
 
-type Props = {|
-  grpcDispatch: GrpcDispatch,
-  workspace: Workspace,
-  protoDirectories: Array<ExpandedProtoDirectory>,
-|};
+interface Props {
+  grpcDispatch: GrpcDispatch;
+  workspace: Workspace;
+  protoDirectories: Array<ExpandedProtoDirectory>;
+}
 
-type State = {|
-  selectedProtoFileId: string,
-|};
+interface State {
+  selectedProtoFileId: string;
+}
 
-type ProtoFilesModalOptions = {|
-  preselectProtoFileId?: string,
-  onSave: string => Promise<void>,
-|};
+interface ProtoFilesModalOptions {
+  preselectProtoFileId?: string;
+  onSave: (arg0: string) => Promise<void>;
+}
 
 const INITIAL_STATE: State = {
   selectedProtoFileId: '',
@@ -41,33 +40,33 @@ const INITIAL_STATE: State = {
 const spinner = <i className="fa fa-spin fa-refresh" />;
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class ProtoFilesModal extends React.PureComponent<Props, State> {
-  modal: Modal | null;
-  onSave: (string => Promise<void>) | null;
+class ProtoFilesModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
+  onSave: ((arg0: string) => Promise<void>) | null;
 
   constructor(props: Props) {
     super(props);
-
     this.state = INITIAL_STATE;
     this.onSave = null;
   }
 
-  _setModalRef(ref: ?Modal) {
+  _setModalRef(ref: Modal) {
     this.modal = ref;
   }
 
   async show(options: ProtoFilesModalOptions) {
     this.onSave = options.onSave;
-    this.setState({ selectedProtoFileId: options.preselectProtoFileId });
-
+    this.setState({
+      selectedProtoFileId: options.preselectProtoFileId || '',
+    });
     this.modal && this.modal.show();
   }
 
-  async _handleSave(e: SyntheticEvent<HTMLButtonElement>) {
+  async _handleSave(e: React.SyntheticEvent<HTMLButtonElement>) {
     e.preventDefault();
     this.hide();
 
-    if (typeof this.onSave === 'function') {
+    if (typeof this.onSave === 'function' && this.state.selectedProtoFileId) {
       await this.onSave(this.state.selectedProtoFileId);
     }
   }
@@ -77,36 +76,43 @@ class ProtoFilesModal extends React.PureComponent<Props, State> {
   }
 
   _handleSelect(id: string) {
-    this.setState({ selectedProtoFileId: id });
+    this.setState({
+      selectedProtoFileId: id,
+    });
   }
 
-  _handleDeleteFile(protoFile: ProtoFile): Promise<void> {
+  _handleDeleteFile(protoFile: ProtoFile) {
     return protoManager.deleteFile(protoFile, deletedId => {
       // if the deleted protoFile was previously selected, clear the selection
       if (this.state.selectedProtoFileId === deletedId) {
-        this.setState({ selectedProtoFileId: '' });
+        this.setState({
+          selectedProtoFileId: '',
+        });
       }
     });
   }
 
-  _handleDeleteDirectory(protoDirectory: ProtoDirectory): Promise<void> {
+  _handleDeleteDirectory(protoDirectory: ProtoDirectory) {
     return protoManager.deleteDirectory(protoDirectory, deletedIds => {
       // if previously selected protoFile has been deleted, clear the selection
       if (deletedIds.includes(this.state.selectedProtoFileId)) {
-        this.setState({ selectedProtoFileId: '' });
+        this.setState({
+          selectedProtoFileId: '',
+        });
       }
     });
   }
 
-  _handleAdd(): Promise<void> {
+  _handleAdd() {
     return protoManager.addFile(this.props.workspace._id, createdId => {
-      this.setState({ selectedProtoFileId: createdId });
+      this.setState({
+        selectedProtoFileId: createdId,
+      });
     });
   }
 
-  _handleUpload(protoFile: ProtoFile): Promise<void> {
+  _handleUpload(protoFile: ProtoFile) {
     const { grpcDispatch } = this.props;
-
     return protoManager.updateFile(protoFile, async updatedId => {
       const action = await grpcActions.invalidateMany(updatedId);
       grpcDispatch(action);
@@ -114,18 +120,17 @@ class ProtoFilesModal extends React.PureComponent<Props, State> {
     });
   }
 
-  _handleAddDirectory(): Promise<void> {
+  _handleAddDirectory() {
     return protoManager.addDirectory(this.props.workspace._id);
   }
 
-  _handleRename(protoFile: ProtoFile, name: string): Promise<void> {
+  _handleRename(protoFile: ProtoFile, name: string) {
     return protoManager.renameFile(protoFile, name);
   }
 
   render() {
     const { protoDirectories } = this.props;
     const { selectedProtoFileId } = this.state;
-
     return (
       <Modal ref={this._setModalRef}>
         <ModalHeader>Select Proto File</ModalHeader>
@@ -167,9 +172,13 @@ class ProtoFilesModal extends React.PureComponent<Props, State> {
 }
 
 const mapStateToProps = (state, props) => {
+  // @ts-expect-error -- TSCONVERSION
   const protoDirectories = selectExpandedActiveProtoDirectories(state, props);
-
-  return { protoDirectories };
+  return {
+    protoDirectories,
+  };
 };
 
-export default connect(mapStateToProps, null, null, { forwardRef: true })(ProtoFilesModal);
+export default connect(mapStateToProps, null, null, {
+  forwardRef: true,
+})(ProtoFilesModal);
diff --git a/packages/insomnia-app/app/ui/components/modals/request-create-modal.js b/packages/insomnia-app/app/ui/components/modals/request-create-modal.tsx
similarity index 74%
rename from packages/insomnia-app/app/ui/components/modals/request-create-modal.js
rename to packages/insomnia-app/app/ui/components/modals/request-create-modal.tsx
index 3ada3f7a32..85c42af850 100644
--- a/packages/insomnia-app/app/ui/components/modals/request-create-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/request-create-modal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import {
@@ -16,35 +15,41 @@ import Modal from '../base/modal';
 import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import ModalFooter from '../base/modal-footer';
-
 import * as models from '../../../models/index';
 import { trackEvent } from '../../../common/analytics';
 import { showModal } from './index';
 import ProtoFilesModal from './proto-files-modal';
+import { Request } from '../../../models/request';
+interface RequestCreateModalOptions {
+  parentId: string;
+  onComplete: (arg0: string) => void;
+}
 
-type RequestCreateModalOptions = {
-  parentId: string,
-  onComplete: string => void,
-};
+interface State {
+  selectedContentType: string | null;
+  selectedMethod: string;
+  parentId: string | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class RequestCreateModal extends PureComponent {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      selectedContentType: null,
-      selectedMethod: METHOD_GET,
-      parentId: null,
-    };
+class RequestCreateModal extends PureComponent<{}, State> {
+  state: State = {
+    selectedContentType: null,
+    selectedMethod: METHOD_GET,
+    parentId: null,
   }
 
-  _setModalRef(n) {
+  modal: Modal | null = null;
+  _input: HTMLInputElement | null = null;
+  private _onComplete: (arg0: string) => void;
+
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
-  _setInputRef(n) {
+  _setInputRef(n: HTMLInputElement) {
     this._input = n;
+
     if (this._input) {
       this._input.value = 'My Request';
       this._input.placeholder = 'My Request';
@@ -57,13 +62,14 @@ class RequestCreateModal extends PureComponent {
 
   async _handleSubmit(e) {
     e.preventDefault();
-
     const { parentId, selectedContentType, selectedMethod } = this.state;
-    const requestName = this._input.value;
+    const requestName = this._input?.value;
+
     if (this._isGrpcSelected()) {
       showModal(ProtoFilesModal, {
         onSave: async (protoFileId: string) => {
           const createdRequest = await models.grpcRequest.create({
+            // @ts-expect-error -- TSCONVERSION should not reach here at all if parentId is undefined, it shouldn't even open the modal
             parentId,
             name: requestName,
             protoFileId,
@@ -73,14 +79,14 @@ class RequestCreateModal extends PureComponent {
         },
       });
     } else {
-      const request = await models.initModel(models.request.type, {
+      const request = await models.initModel<Request>(models.request.type, {
         parentId,
         name: requestName,
         method: selectedMethod,
       });
-
       const finalRequest = await models.request.updateMimeType(
         request,
+        // @ts-expect-error -- TSCONVERSION null not accepted
         this._shouldNotHaveBody() ? null : selectedContentType,
         true,
       );
@@ -89,16 +95,19 @@ class RequestCreateModal extends PureComponent {
     }
 
     this.hide();
-
     trackEvent('Request', 'Create');
   }
 
-  _handleChangeSelectedContentType(selectedContentType) {
-    this.setState({ selectedContentType });
+  _handleChangeSelectedContentType(selectedContentType: string | null) {
+    this.setState({
+      selectedContentType,
+    });
   }
 
   _handleChangeSelectedMethod(selectedMethod) {
-    this.setState({ selectedMethod });
+    this.setState({
+      selectedMethod,
+    });
   }
 
   _shouldNotHaveBody() {
@@ -113,7 +122,7 @@ class RequestCreateModal extends PureComponent {
   }
 
   hide() {
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   show({ parentId, onComplete }: RequestCreateModalOptions) {
@@ -122,21 +131,18 @@ class RequestCreateModal extends PureComponent {
       selectedContentType: null,
       selectedMethod: METHOD_GET,
     });
-
-    this.modal.show();
-
+    this.modal?.show();
     // Need to do this after render because modal focuses itself too
     setTimeout(() => {
-      this._input.focus();
-      this._input.select();
-    }, 200);
+      this._input?.focus();
 
+      this._input?.select();
+    }, 200);
     this._onComplete = onComplete;
   }
 
   render() {
     const { selectedContentType, selectedMethod } = this.state;
-
     return (
       <Modal ref={this._setModalRef}>
         <ModalHeader>New Request</ModalHeader>
@@ -152,7 +158,11 @@ class RequestCreateModal extends PureComponent {
                   <input ref={this._setInputRef} type="text" />
                 </label>
               </div>
-              <div className="form-control form-control--no-label" style={{ width: 'auto' }}>
+              <div
+                className="form-control form-control--no-label"
+                style={{
+                  width: 'auto',
+                }}>
                 <MethodDropdown
                   right
                   showGrpc
@@ -162,12 +172,15 @@ class RequestCreateModal extends PureComponent {
                 />
               </div>
               {!this._shouldNotHaveBody() && (
-                <div className="form-control form-control--no-label" style={{ width: 'auto' }}>
+                <div
+                  className="form-control form-control--no-label"
+                  style={{
+                    width: 'auto',
+                  }}>
                   <ContentTypeDropdown
                     className="btn btn--clicky no-wrap"
                     right
                     contentType={selectedContentType}
-                    request={null}
                     onChange={this._handleChangeSelectedContentType}>
                     {getContentTypeName(selectedContentType) || 'No Body'}{' '}
                     <i className="fa fa-caret-down" />
diff --git a/packages/insomnia-app/app/ui/components/modals/request-render-error-modal.js b/packages/insomnia-app/app/ui/components/modals/request-render-error-modal.tsx
similarity index 86%
rename from packages/insomnia-app/app/ui/components/modals/request-render-error-modal.js
rename to packages/insomnia-app/app/ui/components/modals/request-render-error-modal.tsx
index 6ff6204333..2c5f060e1e 100644
--- a/packages/insomnia-app/app/ui/components/modals/request-render-error-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/request-render-error-modal.tsx
@@ -10,41 +10,46 @@ import { showModal } from './index';
 import Link from '../base/link';
 import { docsTemplateTags } from '../../../common/documentation';
 
+interface State {
+  error: Error | null;
+  request: any | null;
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class RequestRenderErrorModal extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      error: null,
-    };
+class RequestRenderErrorModal extends PureComponent<{}, State> {
+  state: State = {
+    error: null,
+    request: null,
   }
 
-  _setModalRef(n) {
+  modal: Modal | null = null;
+
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
   _handleShowRequestSettings() {
     this.hide();
-    showModal(RequestSettingsModal, { request: this.state.request });
+    showModal(RequestSettingsModal, {
+      request: this.state.request,
+    });
   }
 
   show({ request, error }) {
     this.setState({ request, error });
-    this.modal.show();
+    this.modal?.show();
   }
 
   hide() {
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   renderModalBody(request, error) {
     const fullPath = `Request.${error.path}`;
-
     const result = jq.query(request, `$.${error.path}`);
     const template = result && result.length ? result[0] : null;
     const locationLabel =
       template && template.includes('\n') ? `line ${error.location.line} of` : null;
-
     return (
       <div className="pad">
         <div className="notice warning">
diff --git a/packages/insomnia-app/app/ui/components/modals/request-settings-modal.js b/packages/insomnia-app/app/ui/components/modals/request-settings-modal.tsx
similarity index 81%
rename from packages/insomnia-app/app/ui/components/modals/request-settings-modal.js
rename to packages/insomnia-app/app/ui/components/modals/request-settings-modal.tsx
index 7415cbb965..e21418b918 100644
--- a/packages/insomnia-app/app/ui/components/modals/request-settings-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/request-settings-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Modal from '../base/modal';
@@ -9,68 +8,67 @@ import HelpTooltip from '../help-tooltip';
 import * as models from '../../../models';
 import DebouncedInput from '../base/debounced-input';
 import MarkdownEditor from '../markdown-editor';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import type { Workspace } from '../../../models/workspace';
 import type { Request } from '../../../models/request';
 import type { GrpcRequest } from '../../../models/grpc-request';
 import { isGrpcRequest } from '../../../models/helpers/is-model';
 import * as requestOperations from '../../../models/helpers/request-operations';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
 
-type Props = {
-  editorFontSize: number,
-  editorIndentSize: number,
-  editorKeyMap: string,
-  editorLineWrapping: boolean,
-  nunjucksPowerUserMode: boolean,
-  isVariableUncovered: boolean,
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  workspaces: Array<Workspace>,
-};
+interface Props {
+  editorFontSize: number;
+  editorIndentSize: number;
+  editorKeyMap: string;
+  editorLineWrapping: boolean;
+  nunjucksPowerUserMode: boolean;
+  isVariableUncovered: boolean;
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  workspaces: Array<Workspace>;
+}
 
-type State = {
-  request: Request | GrpcRequest | null,
-  showDescription: boolean,
-  defaultPreviewMode: boolean,
-  activeWorkspaceIdToCopyTo: string | null,
-  workspace: Workspace | null,
-  justCopied: boolean,
-  justMoved: boolean,
-};
+interface State {
+  request: Request | GrpcRequest | null;
+  showDescription: boolean;
+  defaultPreviewMode: boolean;
+  activeWorkspaceIdToCopyTo: string | null;
+  workspace?: Workspace;
+  workspaces: Array<Workspace>;
+  justCopied: boolean;
+  justMoved: boolean;
+}
 
-type RequestSettingsModalOptions = {
-  request: Request | GrpcRequest,
-  forceEditMode: boolean,
-};
+interface RequestSettingsModalOptions {
+  request: Request | GrpcRequest;
+  forceEditMode: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class RequestSettingsModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
-  _editor: ?MarkdownEditor;
+class RequestSettingsModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
+  _editor: MarkdownEditor | null = null;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      request: null,
-      showDescription: false,
-      defaultPreviewMode: false,
-      activeWorkspaceIdToCopyTo: null,
-      workspace: null,
-      workspaces: [],
-      justCopied: false,
-      justMoved: false,
-    };
+  state: State = {
+    request: null,
+    showDescription: false,
+    defaultPreviewMode: false,
+    activeWorkspaceIdToCopyTo: null,
+    workspace: undefined,
+    workspaces: [],
+    justCopied: false,
+    justMoved: false,
   }
 
-  _setModalRef(n: ?Modal) {
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
-  _setEditorRef(n: ?MarkdownEditor) {
+  _setEditorRef(n: MarkdownEditor) {
     this._editor = n;
   }
 
-  async _updateRequestSettingBoolean(e: SyntheticEvent<HTMLInputElement>) {
+  async _updateRequestSettingBoolean(e: React.SyntheticEvent<HTMLInputElement>) {
     if (!this.state.request) {
       // Should never happen
       return;
@@ -78,13 +76,14 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
 
     const value = e.currentTarget.checked;
     const setting = e.currentTarget.name;
+    // @ts-expect-error -- TSCONVERSION request settings only exist for regular requests, the types should filter down and exit if grpc
     const request = await models.request.update(this.state.request, {
       [setting]: value,
     });
     this.setState({ request });
   }
 
-  async _updateRequestSettingString(e: SyntheticEvent<HTMLInputElement>) {
+  async _updateRequestSettingString(e: React.SyntheticEvent<HTMLInputElement | HTMLSelectElement>) {
     if (!this.state.request) {
       // Should never happen
       return;
@@ -92,6 +91,7 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
 
     const value = e.currentTarget.value;
     const setting = e.currentTarget.name;
+    // @ts-expect-error -- TSCONVERSION request settings only exist for regular requests, the types should filter down and exit if grpc
     const request = await models.request.update(this.state.request, {
       [setting]: value,
     });
@@ -104,12 +104,13 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
     if (!originalRequest) {
       return;
     }
-    const patch = { name };
 
+    const patch = {
+      name,
+    };
     const updatedRequest = isGrpcRequest(originalRequest)
       ? await models.grpcRequest.update(originalRequest, patch)
       : await models.request.update(originalRequest, patch);
-
     this.setState({ request: updatedRequest });
   }
 
@@ -117,17 +118,22 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
     if (!this.state.request) {
       return;
     }
+
+    // @ts-expect-error -- TSCONVERSION description only exists for regular requests at the moment, the types should filter down and exit if grpc
     const request = await models.request.update(this.state.request, {
       description,
     });
-    this.setState({ request, defaultPreviewMode: false });
+    this.setState({
+      request,
+      defaultPreviewMode: false,
+    });
   }
 
   _handleAddDescription() {
     this.setState({ showDescription: true });
   }
 
-  _handleUpdateMoveCopyWorkspace(e: SyntheticEvent<HTMLSelectElement>) {
+  _handleUpdateMoveCopyWorkspace(e: React.SyntheticEvent<HTMLSelectElement>) {
     const { value } = e.currentTarget;
     const workspaceId = value === '__NULL__' ? null : value;
     this.setState({ activeWorkspaceIdToCopyTo: workspaceId });
@@ -135,25 +141,27 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
 
   async _handleMoveToWorkspace() {
     const { activeWorkspaceIdToCopyTo, request } = this.state;
+
     if (!request || !activeWorkspaceIdToCopyTo) {
       return;
     }
 
     const workspace = await models.workspace.getById(activeWorkspaceIdToCopyTo);
+
     if (!workspace) {
       return;
     }
 
     const patch = {
-      metaSortKey: -1e9, // Move to top of sort order
+      metaSortKey: -1e9,
+      // Move to top of sort order
       parentId: activeWorkspaceIdToCopyTo,
     };
-
     // TODO: if gRPC, we should also copy the protofile to the destination workspace - INS-267
-
     await requestOperations.update(request, patch);
-
-    this.setState({ justMoved: true });
+    this.setState({
+      justMoved: true,
+    });
     setTimeout(() => {
       this.setState({ justMoved: false });
     }, 2000);
@@ -161,44 +169,45 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
 
   async _handleCopyToWorkspace() {
     const { activeWorkspaceIdToCopyTo, request } = this.state;
+
     if (!request || !activeWorkspaceIdToCopyTo) {
       return;
     }
 
     const workspace = await models.workspace.getById(activeWorkspaceIdToCopyTo);
+
     if (!workspace) {
       return;
     }
 
     const patch = {
-      metaSortKey: -1e9, // Move to top of sort order
-      name: request.name, // Because duplicate will add (Copy) suffix if name is not provided in patch
+      metaSortKey: -1e9,
+      // Move to top of sort order
+      name: request.name,
+      // Because duplicate will add (Copy) suffix if name is not provided in patch
       parentId: activeWorkspaceIdToCopyTo,
     };
-
     // TODO: if gRPC, we should also copy the protofile to the destination workspace - INS-267
-
     await requestOperations.duplicate(request, patch);
-
-    this.setState({ justCopied: true });
+    this.setState({
+      justCopied: true,
+    });
     setTimeout(() => {
-      this.setState({ justCopied: false });
+      this.setState({
+        justCopied: false,
+      });
     }, 2000);
-
     models.stats.incrementCreatedRequests();
   }
 
   async show({ request, forceEditMode }: RequestSettingsModalOptions) {
     const { workspaces } = this.props;
-
     const hasDescription = !!request.description;
-
     // Find workspaces for use with moving workspace
     const ancestors = await db.withAncestors(request);
     const doc = ancestors.find(doc => doc.type === models.workspace.type);
     const workspaceId = doc ? doc._id : 'should-never-happen';
     const workspace = workspaces.find(w => w._id === workspaceId);
-
     this.setState(
       {
         request,
@@ -225,6 +234,7 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
 
   renderCheckboxInput(setting: string) {
     const { request } = this.state;
+
     if (!request) {
       return;
     }
@@ -239,7 +249,7 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
     );
   }
 
-  _renderRequestSettings(): React.Node {
+  _renderRequestSettings() {
     const { request } = this.state;
 
     // GrpcRequests do not have any request settings (yet)
@@ -298,6 +308,7 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
           <label>
             Follow redirects <span className="txt-sm faint italic">(overrides global setting)</span>
             <select
+              // @ts-expect-error -- TSCONVERSION this setting only exists for a Request not GrpcRequest
               defaultValue={this.state.request && this.state.request.settingFollowRedirects}
               name="settingFollowRedirects"
               onChange={this._updateRequestSettingString}>
@@ -311,7 +322,7 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
     );
   }
 
-  _renderDescription(): React.Node {
+  _renderDescription() {
     const {
       editorLineWrapping,
       editorFontSize,
@@ -322,7 +333,6 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
       nunjucksPowerUserMode,
       isVariableUncovered,
     } = this.props;
-
     const { showDescription, defaultPreviewMode, request } = this.state;
 
     // Don't show description if it doesn't exist, or if it is a gRPC request
@@ -356,7 +366,7 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
     );
   }
 
-  _renderFeatureRequestPrompt(): React.Node {
+  _renderFeatureRequestPrompt() {
     const { request } = this.state;
 
     // Don't show move/copy items if it doesn't exist, or if it is a gRPC request
@@ -372,9 +382,8 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
     return null;
   }
 
-  _renderMoveCopy(): React.Node {
+  _renderMoveCopy() {
     const { workspaces } = this.props;
-
     const { activeWorkspaceIdToCopyTo, justMoved, justCopied, workspace, request } = this.state;
 
     // Don't show move/copy items if it doesn't exist, or if it is a gRPC request
@@ -429,7 +438,7 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
     );
   }
 
-  renderModalBody(): React.Node {
+  renderModalBody() {
     const { request } = this.state;
 
     if (!request) {
@@ -444,6 +453,7 @@ class RequestSettingsModal extends React.PureComponent<Props, State> {
             <span className="txt-sm faint italic">(also rename by double-clicking in sidebar)</span>
             <DebouncedInput
               delay={500}
+              // @ts-expect-error -- TSCONVERSION props expand into an input but are difficult to type
               type="text"
               placeholder={request.url || 'My Request'}
               defaultValue={request.name}
diff --git a/packages/insomnia-app/app/ui/components/modals/request-switcher-modal.js b/packages/insomnia-app/app/ui/components/modals/request-switcher-modal.tsx
similarity index 84%
rename from packages/insomnia-app/app/ui/components/modals/request-switcher-modal.js
rename to packages/insomnia-app/app/ui/components/modals/request-switcher-modal.tsx
index d36eac23c0..ba7e3c1b94 100644
--- a/packages/insomnia-app/app/ui/components/modals/request-switcher-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/request-switcher-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import classnames from 'classnames';
@@ -22,57 +21,53 @@ import KeydownBinder from '../keydown-binder';
 import type { RequestMeta } from '../../../models/request-meta';
 import { keyboardKeys } from '../../../common/keyboard-keys';
 
-type Props = {
-  handleSetActiveWorkspace: (id: string) => void,
-  activateRequest: (id: string) => void,
-  activeRequest: ?Request,
-  workspaceChildren: Array<Request | RequestGroup>,
-  workspace: Workspace,
-  workspaces: Array<Workspace>,
-  requestMetas: Array<RequestMeta>,
-};
+interface Props {
+  handleSetActiveWorkspace: (id: string) => void;
+  activateRequest: (id: string) => void;
+  activeRequest?: Request | null;
+  workspaceChildren: Array<Request | RequestGroup>;
+  workspace: Workspace;
+  workspaces: Array<Workspace>;
+  requestMetas: Array<RequestMeta>;
+}
 
-type State = {
-  searchString: string,
-  workspaces: Array<Workspace>,
-  matchedRequests: Array<Request>,
-  matchedWorkspaces: Array<Workspace>,
-  activeIndex: number,
-  maxRequests: number,
-  maxWorkspaces: number,
-  disableInput: boolean,
-  selectOnKeyup: boolean,
-  hideNeverActiveRequests: boolean,
-  isModalVisible: boolean,
-  title: string | null,
-};
+interface State {
+  searchString: string;
+  workspaces: Array<Workspace>;
+  matchedRequests: Array<Request>;
+  matchedWorkspaces: Array<Workspace>;
+  activeIndex: number;
+  maxRequests: number;
+  maxWorkspaces: number;
+  disableInput: boolean;
+  selectOnKeyup: boolean;
+  hideNeverActiveRequests: boolean;
+  isModalVisible: boolean;
+  title: string | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class RequestSwitcherModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
-  _input: ?HTMLInputElement;
-  _openTimeout: TimeoutID;
+class RequestSwitcherModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
+  _input: HTMLInputElement | null = null;
+  _openTimeout: NodeJS.Timeout | null = null;
 
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      searchString: '',
-      workspaces: [],
-      matchedRequests: [],
-      matchedWorkspaces: [],
-      activeIndex: -1,
-      maxRequests: 20,
-      maxWorkspaces: 20,
-      disableInput: false,
-      selectOnKeyup: false,
-      hideNeverActiveRequests: false,
-      isModalVisible: true,
-      title: null,
-    };
+  state: State = {
+    searchString: '',
+    workspaces: [],
+    matchedRequests: [],
+    matchedWorkspaces: [],
+    activeIndex: -1,
+    maxRequests: 20,
+    maxWorkspaces: 20,
+    disableInput: false,
+    selectOnKeyup: false,
+    hideNeverActiveRequests: false,
+    isModalVisible: true,
+    title: null,
   }
 
-  _handleInputKeydown(e: KeyboardEvent) {
+  _handleInputKeydown(e: React.KeyboardEvent<HTMLDivElement>) {
     const keyCode = e.keyCode;
 
     if (keyCode === 38 || (keyCode === 9 && e.shiftKey)) {
@@ -91,23 +86,26 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
     e.preventDefault();
   }
 
-  _setModalRef(n: ?Modal) {
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
-  _setInputRef(n: ?HTMLInputElement) {
+  _setInputRef(n: HTMLInputElement) {
     this._input = n;
   }
 
   _setActiveIndex(activeIndex: number) {
     const maxIndex = this.state.matchedRequests.length + this.state.matchedWorkspaces.length;
+
     if (activeIndex < 0) {
       activeIndex = this.state.matchedRequests.length - 1;
     } else if (activeIndex >= maxIndex) {
       activeIndex = 0;
     }
 
-    this.setState({ activeIndex });
+    this.setState({
+      activeIndex,
+    });
   }
 
   async _activateCurrentIndex() {
@@ -116,11 +114,13 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
     if (activeIndex < matchedRequests.length) {
       // Activate the request if there is one
       const request = matchedRequests[activeIndex];
+
       this._activateRequest(request);
     } else if (activeIndex < matchedRequests.length + matchedWorkspaces.length) {
       // Activate the workspace if there is one
       const index = activeIndex - matchedRequests.length;
       const workspace = matchedWorkspaces[index];
+
       if (workspace) {
         this._activateWorkspace(workspace);
       }
@@ -135,15 +135,14 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
   async _createRequestFromSearch() {
     const { activeRequest, workspace } = this.props;
     const { searchString } = this.state;
-
     // Create the request if nothing matched
     const parentId = activeRequest ? activeRequest.parentId : workspace._id;
     const patch = {
       parentId,
       name: searchString,
     };
-
     const request = await models.request.create(patch);
+
     this._activateRequest(request);
   }
 
@@ -152,7 +151,7 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
     this.modal && this.modal.hide();
   }
 
-  _activateRequest(request: ?Request) {
+  _activateRequest(request: Request) {
     if (!request) {
       return;
     }
@@ -161,7 +160,7 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
     this.modal && this.modal.hide();
   }
 
-  _handleChange(e: SyntheticEvent<HTMLInputElement>) {
+  _handleChange(e: React.SyntheticEvent<HTMLInputElement>) {
     this._handleChangeValue(e.currentTarget.value);
   }
 
@@ -172,7 +171,7 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
     const matchedGroups = requestGroups.filter(g => g._id === requestOrRequestGroup.parentId);
     const currentGroupName =
       requestOrRequestGroup.type === models.requestGroup.type
-        ? `${(requestOrRequestGroup: any).name}`
+        ? `${requestOrRequestGroup.name}`
         : '';
 
     // It's the final parent
@@ -191,6 +190,7 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
 
   _isMatch(request: Request, searchStrings: string): number | null {
     let finalUrl = request.url;
+
     if (request.parameters) {
       finalUrl = joinUrlAndQueryString(finalUrl, buildQueryStringFromParams(request.parameters));
     }
@@ -198,9 +198,10 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
     const match = fuzzyMatchAll(
       searchStrings,
       [request.name, finalUrl, request.method || '', this._groupOf(request).join('/')],
-      { splitSpace: true },
+      {
+        splitSpace: true,
+      },
     );
-
     // Match exact Id
     const matchesId = request._id === searchStrings;
 
@@ -219,8 +220,8 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
   _handleChangeValue(searchString: string) {
     const { workspace, workspaceChildren, workspaces, requestMetas, activeRequest } = this.props;
     const { maxRequests, maxWorkspaces, hideNeverActiveRequests } = this.state;
-
     const lastActiveMap = {};
+
     for (const meta of requestMetas) {
       lastActiveMap[meta.parentId] = meta.lastActive;
     }
@@ -248,7 +249,7 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
       matchedRequests = matchedRequests
         .map(r => ({
           request: r,
-          score: this._isMatch((r: any), searchString),
+          score: this._isMatch(r as any, searchString),
         }))
         .filter(v => v.score !== null)
         .sort((a, b) => (a.score || -Infinity) - (b.score || -Infinity))
@@ -262,29 +263,27 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
         const toMatch = searchString.toLowerCase();
         return name.indexOf(toMatch) !== -1;
       });
-
     // Make sure we select the first item but we don't want to select the currently active
     // one because that wouldn't make any sense.
     const activeRequestId = activeRequest ? activeRequest._id : 'n/a';
     const indexOfFirstNonActiveRequest = matchedRequests.findIndex(r => r._id !== activeRequestId);
-
     this.setState({
       searchString,
       activeIndex: indexOfFirstNonActiveRequest >= 0 ? indexOfFirstNonActiveRequest : 0,
-      matchedRequests: (matchedRequests: Array<any>).slice(0, maxRequests),
+      matchedRequests: (matchedRequests as Array<any>).slice(0, maxRequests),
       matchedWorkspaces: matchedWorkspaces.slice(0, maxWorkspaces),
     });
   }
 
   async show(
     options: {
-      maxRequests?: number,
-      maxWorkspaces?: number,
-      disableInput?: boolean,
-      selectOnKeyup?: boolean,
-      hideNeverActiveRequests?: boolean,
-      title?: string,
-      openDelay?: number,
+      maxRequests?: number;
+      maxWorkspaces?: number;
+      disableInput?: boolean;
+      selectOnKeyup?: boolean;
+      hideNeverActiveRequests?: boolean;
+      title?: string;
+      openDelay?: number;
     } = {},
   ) {
     // Don't show if we're already showing
@@ -306,7 +305,9 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
     // here via keyboard BEFORE the modal shows.
     if (options.openDelay) {
       this._openTimeout = setTimeout(() => {
-        this.setState({ isModalVisible: true });
+        this.setState({
+          isModalVisible: true,
+        });
       }, options.openDelay);
     } else {
       newState.isModalVisible = true;
@@ -316,14 +317,14 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
       // Change value after because it accesses state properties
       this._handleChangeValue('');
     });
-
     this.modal && this.modal.show();
-
     setTimeout(() => this._input && this._input.focus(), 100);
   }
 
   hide() {
-    clearTimeout(this._openTimeout);
+    if (this._openTimeout !== null) {
+      clearTimeout(this._openTimeout);
+    }
     this.modal && this.modal.hide();
   }
 
@@ -347,7 +348,6 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
         this._setActiveIndex(this.state.activeIndex + 1);
       }
     });
-
     // Only control up/down with tab if modal is visible
     executeHotKey(e, hotKeyRefs.SHOW_RECENT_REQUESTS_PREVIOUS, () => {
       if (this.state.isModalVisible) {
@@ -358,12 +358,12 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
 
   async _handleKeyup(e: KeyboardEvent) {
     const { selectOnKeyup } = this.state;
-
     // Handle selection if unpresses all modifier keys. Ideally this would trigger once
     // the user unpresses the hotkey that triggered this modal but we currently do not
     // have the facilities to do that.
     const isMetaKeyDown = e.ctrlKey || e.shiftKey || e.metaKey || e.altKey;
     const isActive = this.modal && this.modal.isOpen();
+
     if (selectOnKeyup && isActive && !isMetaKeyDown) {
       await this._activateCurrentIndex();
       this.hide();
@@ -380,10 +380,8 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
       title,
       isModalVisible,
     } = this.state;
-
     const { workspaceChildren } = this.props;
     const requestGroups = workspaceChildren.filter(d => d.type === models.requestGroup.type);
-
     return (
       <KeydownBinder onKeydown={this._handleKeydown} onKeyup={this._handleKeyup}>
         <Modal
@@ -392,7 +390,7 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
           className={isModalVisible ? '' : 'hide'}>
           <ModalHeader hideCloseButton>
             {title || (
-              <React.Fragment>
+              <Fragment>
                 <div className="pull-right txt-sm pad-right tall">
                   <span className="vertically-center">
                     <div>
@@ -404,7 +402,7 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
                   </span>
                 </div>
                 <div>Quick Switch</div>
-              </React.Fragment>
+              </Fragment>
             )}
           </ModalHeader>
           <ModalBody className="request-switcher">
@@ -426,9 +424,10 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
                 const requestGroup = requestGroups.find(rg => rg._id === r.parentId);
                 const buttonClasses = classnames(
                   'btn btn--expandable-small wide text-left pad-bottom',
-                  { focus: activeIndex === i },
+                  {
+                    focus: activeIndex === i,
+                  },
                 );
-
                 return (
                   <li key={r._id}>
                     <Button onClick={this._activateRequest} value={r} className={buttonClasses}>
@@ -440,11 +439,11 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
                             <i className="fa fa-folder-o" />
                           </div>
                         ) : null}
-                        <Highlight search={searchString} text={(r: any).name} />
+                        <Highlight search={searchString} text={r.name} />
                       </div>
                       <div className="margin-left-xs faint">
-                        <MethodTag method={(r: any).method} />
-                        <Highlight search={searchString} text={(r: any).url} />
+                        <MethodTag method={r.method} />
+                        <Highlight search={searchString} text={r.url} />
                       </div>
                     </Button>
                   </li>
@@ -461,12 +460,11 @@ class RequestSwitcherModal extends React.PureComponent<Props, State> {
                 const buttonClasses = classnames('btn btn--super-compact wide text-left', {
                   focus: activeIndex - matchedRequests.length === i,
                 });
-
                 return (
                   <li key={w._id}>
                     <Button onClick={this._activateWorkspace} value={w} className={buttonClasses}>
                       <i className="fa fa-random" />
-                      &nbsp;&nbsp;&nbsp; Switch to <strong>{(w: any).name}</strong>
+                      &nbsp;&nbsp;&nbsp; Switch to <strong>{w.name}</strong>
                     </Button>
                   </li>
                 );
diff --git a/packages/insomnia-app/app/ui/components/modals/response-debug-modal.js b/packages/insomnia-app/app/ui/components/modals/response-debug-modal.tsx
similarity index 73%
rename from packages/insomnia-app/app/ui/components/modals/response-debug-modal.js
rename to packages/insomnia-app/app/ui/components/modals/response-debug-modal.tsx
index e0f8ccdac2..ead81820b1 100644
--- a/packages/insomnia-app/app/ui/components/modals/response-debug-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/response-debug-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import ResponseTimelineViewer from '../../components/viewers/response-timeline-viewer';
@@ -10,58 +9,55 @@ import * as models from '../../../models/index';
 import type { Response } from '../../../models/response';
 import type { Settings } from '../../../models/settings';
 
-type Props = {|
-  settings: Settings,
-|};
+interface Props {
+  settings: Settings;
+}
 
-type State = {|
-  response: Response | null,
-  title: string | null,
-|};
+interface State {
+  response: Response | null;
+  title: string | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class ResponseDebugModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
+class ResponseDebugModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
 
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      response: null,
-      title: '',
-    };
+  state: State = {
+    response: null,
+    title: '',
   }
 
-  _setModalRef(n: ?Modal) {
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
   hide() {
-    this.modal && this.modal.hide();
+    this.modal?.hide();
   }
 
-  async show(options: { responseId?: string, response?: Response, title?: string }) {
+  async show(options: { responseId?: string; response?: Response; title?: string }) {
     const response = options.response
       ? options.response
       : await models.response.getById(options.responseId || 'n/a');
-
     this.setState({
       response,
       title: options.title || null,
     });
-
     this.modal && this.modal.show();
   }
 
   render() {
     const { settings } = this.props;
     const { response, title } = this.state;
-
     return (
       <Modal ref={this._setModalRef} tall>
         <ModalHeader>{title || 'Response Timeline'}</ModalHeader>
         <ModalBody>
-          <div style={{ display: 'grid' }} className="tall">
+          <div
+            style={{
+              display: 'grid',
+            }}
+            className="tall">
             {response ? (
               <ResponseTimelineViewer
                 editorFontSize={settings.editorFontSize}
diff --git a/packages/insomnia-app/app/ui/components/modals/select-modal.js b/packages/insomnia-app/app/ui/components/modals/select-modal.tsx
similarity index 66%
rename from packages/insomnia-app/app/ui/components/modals/select-modal.js
rename to packages/insomnia-app/app/ui/components/modals/select-modal.tsx
index e2384e27e4..b712ca57d2 100644
--- a/packages/insomnia-app/app/ui/components/modals/select-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/select-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Modal from '../base/modal';
@@ -7,38 +6,35 @@ import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import ModalFooter from '../base/modal-footer';
 
-type Props = {};
-
-type State = {
-  title: string,
-  options: Array<{ name: string, value: string }>,
-  value: string,
-  message: string,
-  onCancel?: Function,
-};
+interface State {
+  title: string;
+  options: Array<{
+    name: string;
+    value: string;
+  }>;
+  value: string;
+  message: string;
+  onCancel?: (...args: Array<any>) => any;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SelectModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
-  doneButton: ?HTMLButtonElement;
-  _doneCallback: ?Function;
+class SelectModal extends PureComponent<{}, State> {
+  modal: Modal | null = null;
+  doneButton: HTMLButtonElement | null = null;
+  _doneCallback: ((...args: Array<any>) => any) | null = null;
 
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      title: '',
-      options: [],
-      message: '',
-      value: '',
-    };
+  state: State = {
+    title: '',
+    options: [],
+    message: '',
+    value: '',
   }
 
-  _setModalRef(m: ?Modal) {
+  _setModalRef(m: Modal) {
     this.modal = m;
   }
 
-  _setDoneButtonRef(n: ?HTMLButtonElement) {
+  _setDoneButtonRef(n: HTMLButtonElement) {
     this.doneButton = n;
   }
 
@@ -47,21 +43,26 @@ class SelectModal extends React.PureComponent<Props, State> {
     this._doneCallback && this._doneCallback(this.state.value);
   }
 
-  _handleSelectChange(e: SyntheticEvent<HTMLInputElement>) {
-    this.setState({ value: e.currentTarget.value });
+  _handleSelectChange(e: React.SyntheticEvent<HTMLSelectElement>) {
+    this.setState({
+      value: e.currentTarget.value,
+    });
   }
 
   hide() {
     this.modal && this.modal.hide();
   }
 
-  show(data: Object = {}) {
+  show(data: Record<string, any> = {}) {
     const { title, message, options, value, onDone, onCancel } = data;
-
     this._doneCallback = onDone;
-
-    this.setState({ title, message, options, value, onCancel });
-
+    this.setState({
+      title,
+      message,
+      options,
+      value,
+      onCancel,
+    });
     this.modal && this.modal.show();
     setTimeout(() => {
       this.doneButton && this.doneButton.focus();
@@ -70,7 +71,6 @@ class SelectModal extends React.PureComponent<Props, State> {
 
   render() {
     const { message, title, options, value, onCancel } = this.state;
-
     return (
       <Modal ref={this._setModalRef} onCancel={onCancel}>
         <ModalHeader>{title || 'Confirm?'}</ModalHeader>
diff --git a/packages/insomnia-app/app/ui/components/modals/settings-modal.js b/packages/insomnia-app/app/ui/components/modals/settings-modal.tsx
similarity index 83%
rename from packages/insomnia-app/app/ui/components/modals/settings-modal.js
rename to packages/insomnia-app/app/ui/components/modals/settings-modal.tsx
index 12f07bf672..d3a2b9b904 100644
--- a/packages/insomnia-app/app/ui/components/modals/settings-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/settings-modal.tsx
@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { Tab, TabList, TabPanel, Tabs } from 'react-tabs';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG, getAppName, getAppVersion } from '../../../common/constants';
@@ -25,60 +24,85 @@ export const TAB_INDEX_SHORTCUTS = 3;
 export const TAB_INDEX_THEMES = 2;
 export const TAB_INDEX_PLUGINS = 5;
 
+interface Props {
+  handleShowExportRequestsModal: Function;
+  handleExportAllToFile: Function;
+  handleImportFile: Function;
+  handleImportUri: Function;
+  handleToggleMenuBar: Function;
+  handleImportClipBoard: Function;
+  settings: any;
+}
+
+interface State {
+  currentTabIndex: number | null;
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SettingsModal extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {};
+class SettingsModal extends PureComponent<Props, State> {
+  state: State = {
+    currentTabIndex: null,
   }
 
-  _setModalRef(n) {
+  modal: Modal | null = null;
+
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
-  async _handleUpdateSetting(key, value) {
-    return models.settings.update(this.props.settings, { [key]: value });
+  async _handleUpdateSetting(key: string, value: any) {
+    return models.settings.update(this.props.settings, {
+      [key]: value,
+    });
   }
 
   _handleExportAllToFile() {
     this.props.handleExportAllToFile();
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   _handleShowExportRequestsModal() {
     this.props.handleShowExportRequestsModal();
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   _handleImportFile() {
     this.props.handleImportFile();
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   _handleImportClipBoard() {
     this.props.handleImportClipBoard();
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   _handleImportUri(uri) {
     this.props.handleImportUri(uri);
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   async _handleChangeTheme(themeName, colorScheme, persist = true) {
     const { settings } = this.props;
-
     let patch;
+
     switch (colorScheme) {
       case 'light':
-        patch = { lightTheme: themeName };
+        patch = {
+          lightTheme: themeName,
+        };
         break;
+
       case 'dark':
-        patch = { darkTheme: themeName };
+        patch = {
+          darkTheme: themeName,
+        };
         break;
+
       case 'default':
       default:
-        patch = { theme: themeName };
+        patch = {
+          theme: themeName,
+        };
         break;
     }
 
@@ -91,16 +115,19 @@ class SettingsModal extends PureComponent {
 
   async _handleAutoDetectColorSchemeChange(autoDetectColorScheme, persist = true) {
     const { settings } = this.props;
-
     applyColorScheme({ ...settings, autoDetectColorScheme });
 
     if (persist) {
-      models.settings.update(settings, { autoDetectColorScheme });
+      models.settings.update(settings, {
+        autoDetectColorScheme,
+      });
     }
   }
 
   async _handleUpdateKeyBindings(hotKeyRegistry) {
-    models.settings.update(this.props.settings, { hotKeyRegistry });
+    models.settings.update(this.props.settings, {
+      hotKeyRegistry,
+    });
   }
 
   show(currentTabIndex = 0) {
@@ -108,19 +135,20 @@ class SettingsModal extends PureComponent {
       currentTabIndex = 0;
     }
 
-    this.setState({ currentTabIndex });
-    this.modal.show();
+    this.setState({
+      currentTabIndex,
+    });
+    this.modal?.show();
   }
 
   hide() {
-    this.modal.hide();
+    this.modal?.hide();
   }
 
   render() {
     const { settings } = this.props;
     const { currentTabIndex } = this.state;
     const email = session.isLoggedIn() ? session.getFullName() : null;
-
     return (
       <Modal ref={this._setModalRef} tall freshState {...this.props}>
         <ModalHeader>
@@ -134,7 +162,7 @@ class SettingsModal extends PureComponent {
           </span>
         </ModalHeader>
         <ModalBody noScroll>
-          <Tabs className="react-tabs" defaultIndex={currentTabIndex}>
+          <Tabs className="react-tabs" defaultIndex={currentTabIndex ?? undefined}>
             <TabList>
               <Tab tabIndex="-1">
                 <Button value="General">General</Button>
@@ -161,7 +189,6 @@ class SettingsModal extends PureComponent {
                 hideModal={this.hide}
                 handleToggleMenuBar={this.props.handleToggleMenuBar}
                 updateSetting={this._handleUpdateSetting}
-                handleRootCssChange={this._handleRootCssChange}
               />
             </TabPanel>
             <TabPanel className="react-tabs__tab-panel pad scrollable">
@@ -202,18 +229,6 @@ class SettingsModal extends PureComponent {
   }
 }
 
-SettingsModal.propTypes = {
-  // Functions
-  handleShowExportRequestsModal: PropTypes.func.isRequired,
-  handleExportAllToFile: PropTypes.func.isRequired,
-  handleImportFile: PropTypes.func.isRequired,
-  handleImportUri: PropTypes.func.isRequired,
-  handleToggleMenuBar: PropTypes.func.isRequired,
-
-  // Properties
-  settings: PropTypes.object.isRequired,
-};
-
 export const showSettingsModal = () => showModal(SettingsModal);
 
 export default SettingsModal;
diff --git a/packages/insomnia-app/app/ui/components/modals/sync-branches-modal.js b/packages/insomnia-app/app/ui/components/modals/sync-branches-modal.tsx
similarity index 80%
rename from packages/insomnia-app/app/ui/components/modals/sync-branches-modal.js
rename to packages/insomnia-app/app/ui/components/modals/sync-branches-modal.tsx
index 3182f3f2fc..42a8f8ed85 100644
--- a/packages/insomnia-app/app/ui/components/modals/sync-branches-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/sync-branches-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
@@ -8,112 +7,126 @@ import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import type { Workspace } from '../../../models/workspace';
 import VCS from '../../../sync/vcs';
-import { batchModifyDocs } from '../../../common/database';
+import { database as db } from '../../../common/database';
 import type { StatusCandidate } from '../../../sync/types';
 import PromptButton from '../base/prompt-button';
 import SyncPullButton from '../sync-pull-button';
 
-type Props = {
-  workspace: Workspace,
-  syncItems: Array<StatusCandidate>,
-  vcs: VCS,
-};
+interface Props {
+  workspace: Workspace;
+  syncItems: Array<StatusCandidate>;
+  vcs: VCS;
+}
 
-type State = {
-  error: string,
-  newBranchName: string,
-  currentBranch: string,
-  branches: Array<string>,
-  remoteBranches: Array<string>,
-};
+interface State {
+  error: string;
+  newBranchName: string;
+  currentBranch: string;
+  branches: Array<string>;
+  remoteBranches: Array<string>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SyncBranchesModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
+class SyncBranchesModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      error: '',
-      newBranchName: '',
-      branches: [],
-      remoteBranches: [],
-      currentBranch: '',
-    };
+  state: State = {
+    error: '',
+    newBranchName: '',
+    branches: [],
+    remoteBranches: [],
+    currentBranch: '',
   }
 
-  _setModalRef(m: ?Modal) {
+  _setModalRef(m: Modal) {
     this.modal = m;
   }
 
   async _handleCheckout(branch: string) {
     const { vcs, syncItems } = this.props;
+
     try {
       const delta = await vcs.checkout(syncItems, branch);
-      await batchModifyDocs(delta);
+      // @ts-expect-error -- TSCONVERSION
+      await db.batchModifyDocs(delta);
       await this.refreshState();
     } catch (err) {
       console.log('Failed to checkout', err.stack);
-      this.setState({ error: err.message });
+      this.setState({
+        error: err.message,
+      });
     }
   }
 
   async _handleMerge(branch: string) {
     const { vcs, syncItems } = this.props;
     const delta = await vcs.merge(syncItems, branch);
+
     try {
-      await batchModifyDocs(delta);
+      // @ts-expect-error -- TSCONVERSION
+      await db.batchModifyDocs(delta);
       await this.refreshState();
     } catch (err) {
       console.log('Failed to merge', err.stack);
-      this.setState({ error: err.message });
+      this.setState({
+        error: err.message,
+      });
     }
   }
 
   async _handleRemoteDelete(branch: string) {
     const { vcs } = this.props;
+
     try {
       await vcs.removeRemoteBranch(branch);
       await this.refreshState();
     } catch (err) {
       console.log('Failed to remote delete', err.stack);
-      this.setState({ error: err.message });
+      this.setState({
+        error: err.message,
+      });
     }
   }
 
   async _handleDelete(branch: string) {
     const { vcs } = this.props;
+
     try {
       await vcs.removeBranch(branch);
       await this.refreshState();
     } catch (err) {
       console.log('Failed to delete', err.stack);
-      this.setState({ error: err.message });
+      this.setState({
+        error: err.message,
+      });
     }
   }
 
-  async _handleCreate(e: SyntheticEvent<HTMLFormElement>) {
+  async _handleCreate(e: React.SyntheticEvent<HTMLFormElement>) {
     e.preventDefault();
-
     const { vcs, syncItems } = this.props;
+
     try {
       // Create new branch
       const { newBranchName } = this.state;
       await vcs.fork(newBranchName);
-
       // Checkout new branch
       const delta = await vcs.checkout(syncItems, newBranchName);
-      await batchModifyDocs(delta);
-
+      // @ts-expect-error -- TSCONVERSION
+      await db.batchModifyDocs(delta);
       // Clear branch name and refresh things
-      await this.refreshState({ newBranchName: '' });
+      await this.refreshState({
+        newBranchName: '',
+      });
     } catch (err) {
       console.log('Failed to create', err.stack);
-      this.setState({ error: err.message });
+      this.setState({
+        error: err.message,
+      });
     }
   }
 
-  _updateNewBranchName(e: SyntheticEvent<HTMLTextAreaElement>) {
+  _updateNewBranchName(e: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>) {
     this.setState({ newBranchName: e.currentTarget.value });
   }
 
@@ -121,26 +134,29 @@ class SyncBranchesModal extends React.PureComponent<Props, State> {
     this.setState({ error: '' });
   }
 
-  async refreshState(newState?: Object) {
+  async refreshState(newState?: Record<string, any>) {
     const { vcs } = this.props;
+
     try {
       const currentBranch = await vcs.getBranch();
       const branches = (await vcs.getBranches()).sort();
-
       this.setState({
         branches,
         currentBranch,
         error: '',
         ...newState,
       });
-
       const remoteBranches = (await vcs.getRemoteBranches())
         .filter(b => !branches.includes(b))
         .sort();
-      this.setState({ remoteBranches });
+      this.setState({
+        remoteBranches,
+      });
     } catch (err) {
       console.log('Failed to refresh', err.stack);
-      this.setState({ error: err.message });
+      this.setState({
+        error: err.message,
+      });
     }
   }
 
@@ -148,15 +164,17 @@ class SyncBranchesModal extends React.PureComponent<Props, State> {
     this.modal && this.modal.hide();
   }
 
-  async show(options: { onHide: Function }) {
-    this.modal && this.modal.show({ onHide: options.onHide });
+  async show(options: { onHide: (...args: Array<any>) => any }) {
+    this.modal &&
+      this.modal.show({
+        onHide: options.onHide,
+      });
     await this.refreshState();
   }
 
   render() {
     const { vcs } = this.props;
     const { branches, remoteBranches, currentBranch, newBranchName, error } = this.state;
-
     return (
       <Modal ref={this._setModalRef}>
         <ModalHeader>Branches</ModalHeader>
@@ -202,7 +220,12 @@ class SyncBranchesModal extends React.PureComponent<Props, State> {
                 {branches.map(name => (
                   <tr key={name} className="table--no-outline-row">
                     <td>
-                      <span className={classnames({ bold: name === currentBranch })}>{name}</span>
+                      <span
+                        className={classnames({
+                          bold: name === currentBranch,
+                        })}>
+                        {name}
+                      </span>
                       {name === currentBranch ? (
                         <span className="txt-sm space-left">(current)</span>
                       ) : null}
diff --git a/packages/insomnia-app/app/ui/components/modals/sync-delete-modal.js b/packages/insomnia-app/app/ui/components/modals/sync-delete-modal.tsx
similarity index 74%
rename from packages/insomnia-app/app/ui/components/modals/sync-delete-modal.js
rename to packages/insomnia-app/app/ui/components/modals/sync-delete-modal.tsx
index 0daa1e3bb8..2dcf3f501c 100644
--- a/packages/insomnia-app/app/ui/components/modals/sync-delete-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/sync-delete-modal.tsx
@@ -1,6 +1,4 @@
-// @flow
-
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Modal from '../base/modal';
@@ -11,15 +9,15 @@ import VCS from '../../../sync/vcs';
 import { Button } from 'insomnia-components';
 import { strings } from '../../../common/strings';
 
-type Props = {
-  workspace: Workspace,
-  vcs: VCS,
-};
+interface Props {
+  workspace: Workspace;
+  vcs: VCS;
+}
 
-type State = {
-  error: string,
-  workspaceName: string,
-};
+interface State {
+  error: string;
+  workspaceName: string;
+}
 
 const INITIAL_STATE: State = {
   error: '',
@@ -27,30 +25,31 @@ const INITIAL_STATE: State = {
 };
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SyncDeleteModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
-  input: ?HTMLInputElement;
+class SyncDeleteModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
+  input: HTMLInputElement | null = null;
 
   constructor(props: Props) {
     super(props);
     this.state = INITIAL_STATE;
   }
 
-  _setModalRef(n: ?Modal) {
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
-  _setInputRef(m: ?HTMLInputElement) {
+  _setInputRef(m: HTMLInputElement) {
     this.input = m;
   }
 
-  _updateWorkspaceName(e: SyntheticEvent<HTMLInputElement>) {
-    this.setState({ workspaceName: e.currentTarget.value });
+  _updateWorkspaceName(e: React.SyntheticEvent<HTMLInputElement>) {
+    this.setState({
+      workspaceName: e.currentTarget.value,
+    });
   }
 
-  async _handleDelete(e: SyntheticEvent<HTMLFormElement>) {
+  async _handleDelete(e: React.SyntheticEvent<HTMLFormElement>) {
     e.preventDefault();
-
     const { vcs } = this.props;
 
     try {
@@ -63,12 +62,13 @@ class SyncDeleteModal extends React.PureComponent<Props, State> {
     }
   }
 
-  async show(options: { onHide: Function }) {
-    this.modal && this.modal.show({ onHide: options.onHide });
-
+  async show(options: { onHide: (...args: Array<any>) => any }) {
+    this.modal &&
+      this.modal.show({
+        onHide: options.onHide,
+      });
     // Reset state
     this.setState(INITIAL_STATE);
-
     // Focus input when modal shows
     setTimeout(() => {
       this.input && this.input.focus();
@@ -82,11 +82,14 @@ class SyncDeleteModal extends React.PureComponent<Props, State> {
   render() {
     const { error, workspaceName } = this.state;
     const { workspace } = this.props;
-
     const workspaceNameElement = (
-      <strong style={{ whiteSpace: 'pre-wrap' }}>{workspace.name}</strong>
+      <strong
+        style={{
+          whiteSpace: 'pre-wrap',
+        }}>
+        {workspace.name}
+      </strong>
     );
-
     return (
       <Modal ref={this._setModalRef} skinny>
         <ModalHeader>Delete {strings.collection}</ModalHeader>
diff --git a/packages/insomnia-app/app/ui/components/modals/sync-history-modal.js b/packages/insomnia-app/app/ui/components/modals/sync-history-modal.tsx
similarity index 84%
rename from packages/insomnia-app/app/ui/components/modals/sync-history-modal.js
rename to packages/insomnia-app/app/ui/components/modals/sync-history-modal.tsx
index 4aa6e315f7..bad5402b86 100644
--- a/packages/insomnia-app/app/ui/components/modals/sync-history-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/sync-history-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Modal from '../base/modal';
@@ -14,30 +13,27 @@ import type { Snapshot } from '../../../sync/types';
 import VCS from '../../../sync/vcs';
 import * as session from '../../../account/session';
 
-type Props = {
-  workspace: Workspace,
-  vcs: VCS,
-};
+interface Props {
+  workspace: Workspace;
+  vcs: VCS;
+}
 
-type State = {
-  branch: string,
-  history: Array<Snapshot>,
-};
+interface State {
+  branch: string;
+  history: Array<Snapshot>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SyncHistoryModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
-  handleRollback: Snapshot => Promise<void>;
+class SyncHistoryModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
+  handleRollback: (arg0: Snapshot) => Promise<void>;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      branch: '',
-      history: [],
-    };
+  state: State = {
+    branch: '',
+    history: [],
   }
 
-  _setModalRef(m: ?Modal) {
+  _setModalRef(m: Modal) {
     this.modal = m;
   }
 
@@ -46,11 +42,10 @@ class SyncHistoryModal extends React.PureComponent<Props, State> {
     await this.refreshState();
   }
 
-  async refreshState(newState?: Object) {
+  async refreshState(newState?: Record<string, any>) {
     const { vcs } = this.props;
     const branch = await vcs.getBranch();
     const history = await vcs.getHistory();
-
     this.setState({
       branch,
       history: history.sort((a, b) => (a.created < b.created ? 1 : -1)),
@@ -62,7 +57,7 @@ class SyncHistoryModal extends React.PureComponent<Props, State> {
     this.modal && this.modal.hide();
   }
 
-  async show(options: { handleRollback: Snapshot => Promise<void> }) {
+  async show(options: { handleRollback: (arg0: Snapshot) => Promise<void> }) {
     this.modal && this.modal.show();
     this.handleRollback = options.handleRollback;
     await this.refreshState();
@@ -84,12 +79,16 @@ class SyncHistoryModal extends React.PureComponent<Props, State> {
 
     if (name) {
       return (
-        <React.Fragment>
+        <Fragment>
           {name}{' '}
-          <HelpTooltip info delay={500}>
+          <HelpTooltip
+            info
+            // @ts-expect-error -- TSCONVERSION
+            delay={500}
+          >
             {email}
           </HelpTooltip>
-        </React.Fragment>
+        </Fragment>
       );
     } else {
       return '--';
@@ -98,7 +97,6 @@ class SyncHistoryModal extends React.PureComponent<Props, State> {
 
   render() {
     const { branch, history } = this.state;
-
     return (
       <Modal ref={this._setModalRef}>
         <ModalHeader>
diff --git a/packages/insomnia-app/app/ui/components/modals/sync-merge-modal.js b/packages/insomnia-app/app/ui/components/modals/sync-merge-modal.tsx
similarity index 79%
rename from packages/insomnia-app/app/ui/components/modals/sync-merge-modal.js
rename to packages/insomnia-app/app/ui/components/modals/sync-merge-modal.tsx
index d04ef806b7..321fbc0ae6 100644
--- a/packages/insomnia-app/app/ui/components/modals/sync-merge-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/sync-merge-modal.tsx
@@ -1,6 +1,4 @@
-// @flow
-
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Modal from '../base/modal';
@@ -11,38 +9,36 @@ import VCS from '../../../sync/vcs';
 import type { DocumentKey, MergeConflict, StatusCandidate } from '../../../sync/types';
 import ModalFooter from '../base/modal-footer';
 
-type Props = {
-  workspace: Workspace,
-  vcs: VCS,
-  syncItems: Array<StatusCandidate>,
-};
+interface Props {
+  workspace: Workspace;
+  vcs: VCS;
+  syncItems: Array<StatusCandidate>;
+}
 
-type State = {
-  conflicts: Array<MergeConflict>,
-};
+interface State {
+  conflicts: Array<MergeConflict>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SyncMergeModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
-  _handleDone: (Array<MergeConflict>) => void;
+class SyncMergeModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
+  _handleDone: (arg0: Array<MergeConflict>) => void;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      conflicts: [],
-    };
+  state: State = {
+    conflicts: [],
   }
 
-  _setModalRef(n: ?Modal) {
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
   _handleOk() {
     this._handleDone(this.state.conflicts);
+
     this.hide();
   }
 
-  _handleToggleSelect(key: DocumentKey, e: SyntheticEvent<HTMLInputElement>) {
+  _handleToggleSelect(key: DocumentKey, e: React.SyntheticEvent<HTMLInputElement>) {
     const conflicts = this.state.conflicts.map(c => {
       if (c.key !== key) {
         return c;
@@ -50,17 +46,17 @@ class SyncMergeModal extends React.PureComponent<Props, State> {
 
       return { ...c, choose: e.currentTarget.value || null };
     });
-
-    this.setState({ conflicts });
+    this.setState({
+      conflicts,
+    });
   }
 
   async show(options: {
-    conflicts: Array<MergeConflict>,
-    handleDone: (Array<MergeConflict>) => void,
+    conflicts: Array<MergeConflict>;
+    handleDone: (arg0: Array<MergeConflict>) => void;
   }) {
     this.modal && this.modal.show();
     this._handleDone = options.handleDone;
-
     this.setState({
       conflicts: options.conflicts,
     });
@@ -81,7 +77,12 @@ class SyncMergeModal extends React.PureComponent<Props, State> {
               <tr>
                 <th>Name</th>
                 <th>Description</th>
-                <th style={{ width: '10rem' }}>Choose</th>
+                <th
+                  style={{
+                    width: '10rem',
+                  }}>
+                  Choose
+                </th>
               </tr>
             </thead>
             <tbody>
diff --git a/packages/insomnia-app/app/ui/components/modals/sync-share-modal.js b/packages/insomnia-app/app/ui/components/modals/sync-share-modal.tsx
similarity index 83%
rename from packages/insomnia-app/app/ui/components/modals/sync-share-modal.js
rename to packages/insomnia-app/app/ui/components/modals/sync-share-modal.tsx
index 55384cdd43..ff7aa332c6 100644
--- a/packages/insomnia-app/app/ui/components/modals/sync-share-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/sync-share-modal.tsx
@@ -1,6 +1,4 @@
-// @flow
-
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown';
@@ -14,41 +12,43 @@ import VCS from '../../../sync/vcs';
 import { showModal } from './index';
 import { strings } from '../../../common/strings';
 
-type Props = {
-  workspace: Workspace,
-  vcs: VCS,
-};
+interface Props {
+  workspace: Workspace;
+  vcs: VCS;
+}
 
-type Team = { id: string, name: string };
+interface Team {
+  id: string;
+  name: string;
+}
 
-type State = {
-  loading: boolean,
-  selectedTeam: null | Team,
-  teams: Array<Team>,
-  error: string,
-};
+interface State {
+  loading: boolean;
+  selectedTeam: null | Team;
+  teams: Array<Team>;
+  error: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SyncShareModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
+class SyncShareModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      selectedTeam: null,
-      teams: [],
-      error: '',
-      loading: false,
-    };
+  state: State = {
+    selectedTeam: null,
+    teams: [],
+    error: '',
+    loading: false,
   }
 
-  _setModalRef(n: ?Modal) {
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
   async _handleChangeTeam(team: Team) {
     const { vcs } = this.props;
-    this.setState({ loading: true });
+    this.setState({
+      loading: true,
+    });
 
     try {
       if (team) {
@@ -72,7 +72,9 @@ class SyncShareModal extends React.PureComponent<Props, State> {
 
   async show() {
     const { vcs } = this.props;
-    this.setState({ loading: true });
+    this.setState({
+      loading: true,
+    });
     this.modal && this.modal.show();
 
     if (!vcs.hasProject()) {
@@ -84,10 +86,14 @@ class SyncShareModal extends React.PureComponent<Props, State> {
     }
 
     let results;
+
     try {
       results = await Promise.all([vcs.teams(), vcs.projectTeams()]);
     } catch (err) {
-      this.setState({ error: err.message, loading: false });
+      this.setState({
+        error: err.message,
+        loading: false,
+      });
       return;
     }
 
@@ -119,6 +125,7 @@ class SyncShareModal extends React.PureComponent<Props, State> {
             <Dropdown outline>
               <DropdownDivider>Teams</DropdownDivider>
               {selectedTeam ? (
+                  // @ts-expect-error -- TSCONVERSION
                 <DropdownButton className="btn btn--clicky" disabled={loading}>
                   {loading ? (
                     <i className="fa fa-refresh fa-spin" />
@@ -129,6 +136,7 @@ class SyncShareModal extends React.PureComponent<Props, State> {
                   <i className="fa fa-caret-down" />
                 </DropdownButton>
               ) : (
+                // @ts-expect-error -- TSCONVERSION
                 <DropdownButton className="btn btn--clicky" disabled={loading}>
                   {loading ? (
                     <i className="fa fa-refresh fa-spin" />
@@ -144,6 +152,7 @@ class SyncShareModal extends React.PureComponent<Props, State> {
                 </DropdownItem>
               ))}
               {teams.length === 0 && (
+                  // @ts-expect-error -- TSCONVERSION
                 <DropdownItem disabled>
                   <i className="fa fa-warning" /> You have no teams
                 </DropdownItem>
@@ -152,6 +161,7 @@ class SyncShareModal extends React.PureComponent<Props, State> {
               <DropdownItem
                 addIcon
                 buttonClass={PromptButton}
+                // @ts-expect-error -- TSCONVERSION
                 confirmMessage="Really make private?"
                 value={null}
                 onClick={this._handleChangeTeam}>
@@ -173,5 +183,4 @@ class SyncShareModal extends React.PureComponent<Props, State> {
 }
 
 export const showSyncShareModal = () => showModal(SyncShareModal);
-
 export default SyncShareModal;
diff --git a/packages/insomnia-app/app/ui/components/modals/sync-staging-modal.js b/packages/insomnia-app/app/ui/components/modals/sync-staging-modal.tsx
similarity index 82%
rename from packages/insomnia-app/app/ui/components/modals/sync-staging-modal.js
rename to packages/insomnia-app/app/ui/components/modals/sync-staging-modal.tsx
index ab4cb8c858..08b50fdfe5 100644
--- a/packages/insomnia-app/app/ui/components/modals/sync-staging-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/sync-staging-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Modal from '../base/modal';
@@ -15,26 +14,27 @@ import IndeterminateCheckbox from '../base/indeterminate-checkbox';
 import { describeChanges } from '../../../sync/vcs/util';
 import { strings } from '../../../common/strings';
 
-type Props = {
-  workspace: Workspace,
-  syncItems: Array<StatusCandidate>,
-  vcs: VCS,
-};
+interface Props {
+  workspace: Workspace;
+  syncItems: Array<StatusCandidate>;
+  vcs: VCS;
+}
 
-type State = {
-  status: Status,
-  message: string,
-  error: string,
-  branch: string,
-  lookupMap: {
-    [string]: {|
-      entry: StageEntry,
-      changes: null | Array<string>,
-      type: string,
-      checked: boolean,
-    |},
-  },
-};
+interface State {
+  status: Status;
+  message: string;
+  error: string;
+  branch: string;
+  lookupMap: Record<
+    string,
+    {
+      entry: StageEntry;
+      changes: null | Array<string>;
+      type: string;
+      checked: boolean;
+    }
+  >;
+}
 
 const _initialState: State = {
   status: {
@@ -49,19 +49,18 @@ const _initialState: State = {
 };
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SyncStagingModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
-  _onSnapshot: ?() => void;
-  _handlePush: ?() => Promise<void>;
-  textarea: ?HTMLTextAreaElement;
-
+class SyncStagingModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
+  _onSnapshot: (() => void) | null = null;
+  _handlePush: (() => Promise<void>) | null = null;
+  textarea: HTMLTextAreaElement | null = null;
   state = _initialState;
 
-  _setModalRef(m: ?Modal) {
+  _setModalRef(m: Modal) {
     this.modal = m;
   }
 
-  _setTextAreaRef(m: ?HTMLTextAreaElement) {
+  _setTextAreaRef(m: HTMLTextAreaElement) {
     this.textarea = m;
   }
 
@@ -69,44 +68,45 @@ class SyncStagingModal extends React.PureComponent<Props, State> {
     this.setState({ error: '' });
   }
 
-  _handleMessageChange(e: SyntheticEvent<HTMLInputElement>) {
+  _handleMessageChange(e: React.ChangeEvent<HTMLTextAreaElement>) {
     this.setState({ message: e.currentTarget.value });
   }
 
-  async _handleStageToggle(e: SyntheticEvent<HTMLInputElement>) {
+  async _handleStageToggle(e: React.SyntheticEvent<HTMLInputElement>) {
     const { vcs } = this.props;
     const { status } = this.state;
     const id = e.currentTarget.name;
-
     const isStaged = !!status.stage[id];
-
     const newStage = isStaged
       ? await vcs.unstage(status.stage, [status.stage[id]])
       : await vcs.stage(status.stage, [status.unstaged[id]]);
-
     await this.refreshMainAttributes({}, newStage);
   }
 
   async _handleAllToggle(keys: Array<DocumentKey>, doStage: boolean) {
     const { vcs } = this.props;
     const { status } = this.state;
-
     let stage;
+
     if (doStage) {
       const entries: Array<StageEntry> = [];
+
       for (const k of Object.keys(status.unstaged)) {
         if (keys.includes(k)) {
           entries.push(status.unstaged[k]);
         }
       }
+
       stage = await vcs.stage(status.stage, entries);
     } else {
       const entries: Array<StageEntry> = [];
+
       for (const k of Object.keys(status.stage)) {
         if (keys.includes(k)) {
           entries.push(status.stage[k]);
         }
       }
+
       stage = await vcs.unstage(status.stage, entries);
     }
 
@@ -115,12 +115,13 @@ class SyncStagingModal extends React.PureComponent<Props, State> {
 
   async _handleTakeSnapshotAndPush() {
     const success = await this._handleTakeSnapshot();
+
     if (success) {
       this._handlePush && this._handlePush();
     }
   }
 
-  async _handleTakeSnapshot(): Promise<boolean> {
+  async _handleTakeSnapshot() {
     const { vcs } = this.props;
     const {
       message,
@@ -130,26 +131,31 @@ class SyncStagingModal extends React.PureComponent<Props, State> {
     try {
       await vcs.takeSnapshot(stage, message);
     } catch (err) {
-      this.setState({ error: err.message });
+      this.setState({
+        error: err.message,
+      });
       return false;
     }
 
     this._onSnapshot && this._onSnapshot();
-    await this.refreshMainAttributes({ message: '', error: '' });
+    await this.refreshMainAttributes({
+      message: '',
+      error: '',
+    });
     this.hide();
     return true;
   }
 
-  async refreshMainAttributes(newState?: Object = {}, newStage?: Stage = {}) {
+  async refreshMainAttributes(newState: Partial<State> = {}, newStage: Stage = {}) {
     const { vcs, syncItems } = this.props;
     const branch = await vcs.getBranch();
     const status = await vcs.status(syncItems, newStage);
-
     const lookupMap = {};
     const allKeys = [...Object.keys(status.stage), ...Object.keys(status.unstaged)];
+
     for (const key of allKeys) {
       const item = syncItems.find(si => si.key === key);
-      const oldDoc: Object | null = await vcs.blobFromLastSnapshot(key);
+      const oldDoc: Record<string, any> | null = await vcs.blobFromLastSnapshot(key);
       const doc = (item && item.document) || oldDoc;
       const entry = status.stage[key] || status.unstaged[key];
 
@@ -157,7 +163,8 @@ class SyncStagingModal extends React.PureComponent<Props, State> {
         continue;
       }
 
-      let changes = null;
+      let changes: Array<string> | null = null;
+
       if (item && item.document && oldDoc) {
         changes = describeChanges(item.document, oldDoc);
       }
@@ -170,6 +177,7 @@ class SyncStagingModal extends React.PureComponent<Props, State> {
       };
     }
 
+    // @ts-expect-error -- TSCONVERSION
     this.setState({
       status,
       branch,
@@ -183,20 +191,20 @@ class SyncStagingModal extends React.PureComponent<Props, State> {
     this.modal && this.modal.hide();
   }
 
-  async show(options: { onSnapshot?: () => any, handlePush: () => Promise<void> }) {
+  async show(options: { onSnapshot?: () => any; handlePush: () => Promise<void> }) {
     const { vcs, syncItems } = this.props;
-
     this.modal && this.modal.show();
+    // @ts-expect-error -- TSCONVERSION
     this._onSnapshot = options.onSnapshot;
     this._handlePush = options.handlePush;
-
     // Reset state
     this.setState(_initialState);
-
     // Add everything to stage by default except new items
     const status: Status = await vcs.status(syncItems, {});
-    const toStage = [];
+    const toStage: Array<StageEntry> = [];
+
     for (const key of Object.keys(status.unstaged)) {
+      // @ts-expect-error -- TSCONVERSION
       if (status.unstaged[key].added) {
         // Don't automatically stage added resources
         continue;
@@ -211,15 +219,18 @@ class SyncStagingModal extends React.PureComponent<Props, State> {
   }
 
   static renderOperation(entry: StageEntry, type: string, changes: Array<string>) {
-    let child = null;
+    let child: JSX.Element | null = null;
     let message = '';
 
+    // @ts-expect-error -- TSCONVERSION type narrowing
     if (entry.added) {
       child = <i className="fa fa-plus-circle success" />;
       message = 'Added';
+      // @ts-expect-error -- TSCONVERSION type narrowing
     } else if (entry.modified) {
       child = <i className="fa fa-circle faded" />;
       message = `Modified (${changes.join(', ')})`;
+      // @ts-expect-error -- TSCONVERSION type narrowing
     } else if (entry.deleted) {
       child = <i className="fa fa-minus-circle danger" />;
       message = 'Deleted';
@@ -233,15 +244,15 @@ class SyncStagingModal extends React.PureComponent<Props, State> {
     }
 
     return (
-      <React.Fragment>
+      <Fragment>
         <Tooltip message={message}>
           {child} {type}
         </Tooltip>
-      </React.Fragment>
+      </Fragment>
     );
   }
 
-  renderTable(keys: Array<DocumentKey>, title: React.Node) {
+  renderTable(keys: Array<DocumentKey>, title: ReactNode) {
     const { status, lookupMap } = this.state;
 
     if (keys.length === 0) {
@@ -262,7 +273,6 @@ class SyncStagingModal extends React.PureComponent<Props, State> {
     }
 
     const indeterminate = !allChecked && !allUnChecked;
-
     return (
       <div className="pad-top">
         <strong>{title}</strong>
@@ -274,7 +284,6 @@ class SyncStagingModal extends React.PureComponent<Props, State> {
                   <span className="txt-md">
                     <IndeterminateCheckbox
                       className="space-right"
-                      type="checkbox"
                       checked={allChecked}
                       onChange={() => this._handleAllToggle(keys, allUnChecked)}
                       indeterminate={indeterminate}
@@ -323,12 +332,13 @@ class SyncStagingModal extends React.PureComponent<Props, State> {
 
   render() {
     const { status, message, error, branch } = this.state;
-
-    const nonAddedKeys = [];
-    const addedKeys = [];
+    const nonAddedKeys: Array<string> = [];
+    const addedKeys: Array<string> = [];
     const allMap = { ...status.stage, ...status.unstaged };
     const allKeys = Object.keys(allMap);
+
     for (const key of allKeys) {
+      // @ts-expect-error -- TSCONVERSION
       if (allMap[key].added) {
         addedKeys.push(key);
       } else {
@@ -355,8 +365,8 @@ class SyncStagingModal extends React.PureComponent<Props, State> {
                 Snapshot Message
                 <textarea
                   ref={this._setTextAreaRef}
-                  cols="30"
-                  rows="3"
+                  cols={30}
+                  rows={3}
                   onChange={this._handleMessageChange}
                   value={message}
                   placeholder="This is a helpful message that describe the changes made in this snapshot"
diff --git a/packages/insomnia-app/app/ui/components/modals/workspace-environments-edit-modal.js b/packages/insomnia-app/app/ui/components/modals/workspace-environments-edit-modal.tsx
similarity index 81%
rename from packages/insomnia-app/app/ui/components/modals/workspace-environments-edit-modal.js
rename to packages/insomnia-app/app/ui/components/modals/workspace-environments-edit-modal.tsx
index 642de78fd2..2bfbebbe4b 100644
--- a/packages/insomnia-app/app/ui/components/modals/workspace-environments-edit-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/workspace-environments-edit-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { FormEvent, Fragment, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG, DEBOUNCE_MILLIS } from '../../../common/constants';
 import classnames from 'classnames';
@@ -10,58 +9,60 @@ import Button from '../base/button';
 import Link from '../base/link';
 import EnvironmentEditor from '../editors/environment-editor';
 import Editable from '../base/editable';
-import Modal from '../base/modal';
+import Modal, { ModalProps } from '../base/modal';
 import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 import ModalFooter from '../base/modal-footer';
 import * as models from '../../../models';
-
 import type { Workspace } from '../../../models/workspace';
 import type { Environment } from '../../../models/environment';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import HelpTooltip from '../help-tooltip';
 import Tooltip from '../tooltip';
 import { docsTemplateTags } from '../../../common/documentation';
-
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
 const ROOT_ENVIRONMENT_NAME = 'Base Environment';
 
-type Props = {
-  handleChangeEnvironment: (id: string | null) => Promise<void>,
-  activeEnvironmentId: string | null,
-  editorFontSize: number,
-  editorIndentSize: number,
-  editorKeyMap: string,
-  lineWrapping: boolean,
-  render: Function,
-  getRenderContext: Function,
-  nunjucksPowerUserMode: boolean,
-  isVariableUncovered: boolean,
-};
+interface Props extends ModalProps {
+  handleChangeEnvironment: (id: string | null) => void;
+  activeEnvironmentId: string | null;
+  editorFontSize: number;
+  editorIndentSize: number;
+  editorKeyMap: string;
+  lineWrapping: boolean;
+  render: HandleRender;
+  getRenderContext: HandleGetRenderContext;
+  nunjucksPowerUserMode: boolean;
+  isVariableUncovered: boolean;
+}
 
-type State = {
-  workspace: Workspace | null,
-  isValid: boolean,
-  subEnvironments: Array<Environment>,
-  rootEnvironment: Environment | null,
-  selectedEnvironmentId: string | null,
-};
+interface State {
+  workspace: Workspace | null;
+  isValid: boolean;
+  subEnvironments: Array<Environment>;
+  rootEnvironment: Environment | null;
+  selectedEnvironmentId: string | null;
+}
 
 const SidebarListItem = SortableElement(
   ({ environment, activeEnvironment, showEnvironment, changeEnvironmentName }) => {
     const classes = classnames({
       'env-modal__sidebar-item': true,
       'env-modal__sidebar-item--active': activeEnvironment === environment,
-
       // Specify theme because dragging will pull it out to <body>
       'theme--dialog': true,
     });
-
     return (
       <li key={environment._id} className={classes}>
         <Button onClick={showEnvironment} value={environment}>
           <i className="fa fa-drag-handle drag-handle" />
           {environment.color ? (
-            <i className="space-right fa fa-circle" style={{ color: environment.color }} />
+            <i
+              className="space-right fa fa-circle"
+              style={{
+                color: environment.color,
+              }}
+            />
           ) : (
             <i className="space-right fa fa-empty" />
           )}
@@ -101,41 +102,36 @@ const SidebarList = SortableContainer(
 );
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
-  environmentEditorRef: ?EnvironmentEditor;
+class WorkspaceEnvironmentsEditModal extends PureComponent<Props, State> {
+  environmentEditorRef: EnvironmentEditor | null = null;
   environmentColorInputRef: HTMLInputElement;
-  colorChangeTimeout: any;
-  saveTimeout: any;
-  modal: Modal;
-  editorKey: number;
+  saveTimeout: NodeJS.Timeout | null = null;
+  modal: Modal | null = null;
+  editorKey = 0;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      workspace: null,
-      isValid: true,
-      subEnvironments: [],
-      rootEnvironment: null,
-      selectedEnvironmentId: null,
-    };
-
-    this.colorChangeTimeout = null;
-    this.editorKey = 0;
+  state: State = {
+    workspace: null,
+    isValid: true,
+    subEnvironments: [],
+    rootEnvironment: null,
+    selectedEnvironmentId: null,
   }
 
+  colorChangeTimeout: NodeJS.Timeout | null = null;
+
   hide() {
-    this.modal && this.modal.hide();
+    this.modal?.hide();
   }
 
-  _setEditorRef(n: ?EnvironmentEditor) {
+  _setEditorRef(n: EnvironmentEditor) {
     this.environmentEditorRef = n;
   }
 
-  _setInputColorRef(ref: HTMLInputElement | null) {
+  _setInputColorRef(ref: HTMLInputElement) {
     this.environmentColorInputRef = ref;
   }
 
-  _setModalRef(n: Modal | null) {
+  _setModalRef(n: Modal) {
     this.modal = n;
   }
 
@@ -144,11 +140,12 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
 
     // Default to showing the currently active environment
     if (activeEnvironmentId) {
-      this.setState({ selectedEnvironmentId: activeEnvironmentId });
+      this.setState({
+        selectedEnvironmentId: activeEnvironmentId,
+      });
     }
 
     await this._load(workspace);
-
     this.modal && this.modal.show();
   }
 
@@ -160,7 +157,6 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
 
     const rootEnvironment = await models.environment.getOrCreateForWorkspace(workspace);
     const subEnvironments = await models.environment.findByParentId(rootEnvironment._id);
-
     let selectedEnvironmentId;
 
     if (environmentToSelect) {
@@ -182,7 +178,7 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
     });
   }
 
-  async _handleAddEnvironment(isPrivate: boolean = false) {
+  async _handleAddEnvironment(isPrivate = false) {
     const { rootEnvironment, workspace } = this.state;
 
     if (!rootEnvironment) {
@@ -209,7 +205,6 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
     }
 
     const { workspace } = this.state;
-
     await this._load(workspace, environment);
   }
 
@@ -235,13 +230,15 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
 
     // Delete the current one
     await models.environment.remove(environment);
-
     await this._load(workspace, rootEnvironment);
   }
 
-  async _updateEnvironment(environment: Environment, patch: Object, refresh: boolean = true) {
+  async _updateEnvironment(
+    environment: Environment,
+    patch: Partial<Environment>,
+    refresh = true,
+  ) {
     const { workspace } = this.state;
-
     // NOTE: Fetch the environment first because it might not be up to date.
     // For example, editing the body updates silently.
     const realEnvironment = await models.environment.getById(environment._id);
@@ -258,13 +255,20 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
   }
 
   async _handleChangeEnvironmentName(environment: Environment, name: string) {
-    await this._updateEnvironment(environment, { name });
+    await this._updateEnvironment(environment, {
+      name,
+    });
   }
 
-  _handleChangeEnvironmentColor(environment: Environment, color: string | null) {
-    clearTimeout(this.colorChangeTimeout);
+  _handleChangeEnvironmentColor(environment: Environment | null, color: string | null) {
+    if (this.colorChangeTimeout !== null) {
+      clearTimeout(this.colorChangeTimeout);
+    }
     this.colorChangeTimeout = setTimeout(async () => {
-      await this._updateEnvironment(environment, { color });
+      // @ts-expect-error -- TSCONVERSION environment can be null
+      await this._updateEnvironment(environment, {
+        color,
+      });
     }, DEBOUNCE_MILLIS);
   }
 
@@ -273,13 +277,17 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
 
     // Call this last in case component unmounted
     const isValid = this.environmentEditorRef ? this.environmentEditorRef.isValid() : false;
+
     if (this.state.isValid !== isValid) {
-      this.setState({ isValid });
+      this.setState({
+        isValid,
+      });
     }
   }
 
   _getActiveEnvironment(): Environment | null {
     const { selectedEnvironmentId, subEnvironments, rootEnvironment } = this.state;
+
     if (rootEnvironment && rootEnvironment._id === selectedEnvironmentId) {
       return rootEnvironment;
     } else {
@@ -296,11 +304,7 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
       const { selectedEnvironmentId } = this.state;
 
       for (const change of changes) {
-        const [
-          _, // eslint-disable-line no-unused-vars
-          doc,
-          fromSync,
-        ] = change;
+        const [, doc, fromSync] = change;
 
         // Force an editor refresh if any changes from sync come in
         if (doc._id === selectedEnvironmentId && fromSync) {
@@ -312,31 +316,41 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
   }
 
   async _handleSortEnd(results: {
-    oldIndex: number,
-    newIndex: number,
-    collection: Array<Environment>,
+    oldIndex: number;
+    newIndex: number;
+    collection: Array<Environment>;
   }) {
     const { oldIndex, newIndex } = results;
+
     if (newIndex === oldIndex) {
       return;
     }
 
     const { subEnvironments } = this.state;
-
     const newSubEnvironments = arrayMove(subEnvironments, oldIndex, newIndex);
-    this.setState({ subEnvironments: newSubEnvironments });
-
+    this.setState({
+      subEnvironments: newSubEnvironments,
+    });
     // Do this last so we don't block the sorting
     db.bufferChanges();
+
     for (let i = 0; i < newSubEnvironments.length; i++) {
       const environment = newSubEnvironments[i];
-      await this._updateEnvironment(environment, { metaSortKey: i }, false);
+      await this._updateEnvironment(
+        environment,
+        {
+          metaSortKey: i,
+        },
+        false,
+      );
     }
+
     db.flushChanges();
   }
 
   async _handleClickColorChange(environment: Environment) {
     const color = environment.color || '#7d69cb';
+
     if (!environment.color) {
       await this._handleChangeEnvironmentColor(environment, color);
     }
@@ -344,9 +358,10 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
     this.environmentColorInputRef?.click();
   }
 
-  _handleInputColorChange(event: SyntheticEvent<HTMLInputElement>) {
+  _handleInputColorChange(event: FormEvent<HTMLInputElement>) {
     this._handleChangeEnvironmentColor(
       this._getActiveEnvironment(),
+      // @ts-expect-error -- TSCONVERSION what? apparently value doesn't exist on the target
       event.target && event.target.value,
     );
   }
@@ -358,6 +373,7 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
     }
 
     let patch;
+
     try {
       const data = this.environmentEditorRef.getValue();
       patch = {
@@ -372,7 +388,9 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
     const activeEnvironment = this._getActiveEnvironment();
 
     if (activeEnvironment) {
-      clearTimeout(this.saveTimeout);
+      if (this.saveTimeout !== null) {
+        clearTimeout(this.saveTimeout);
+      }
       this.saveTimeout = setTimeout(async () => {
         await this._updateEnvironment(activeEnvironment, patch);
       }, DEBOUNCE_MILLIS * 4);
@@ -390,7 +408,6 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
       nunjucksPowerUserMode,
       isVariableUncovered,
     } = this.props;
-
     const { subEnvironments, rootEnvironment, isValid } = this.state;
 
     const activeEnvironment = this._getActiveEnvironment();
@@ -399,9 +416,8 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
       object: activeEnvironment ? activeEnvironment.data : {},
       propertyOrder: activeEnvironment && activeEnvironment.dataPropertyOrder,
     };
-
     return (
-      <Modal ref={this._setModalRef} wide tall {...(this.props: Object)}>
+      <Modal ref={this._setModalRef} wide tall {...this.props}>
         <ModalHeader>Manage Environments</ModalHeader>
         <ModalBody noScroll className="env-modal">
           <div className="env-modal__sidebar">
@@ -457,6 +473,7 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
                     className="wide"
                     onSubmit={name =>
                       activeEnvironment &&
+                      // @ts-expect-error -- TSCONVERSION only set name if defined
                       this._handleChangeEnvironmentName(activeEnvironment, name)
                     }
                     value={activeEnvironment ? activeEnvironment.name : ''}
@@ -465,11 +482,11 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
               </h1>
 
               {activeEnvironment && rootEnvironment !== activeEnvironment ? (
-                <React.Fragment>
+                <Fragment>
                   <input
                     className="hidden"
                     type="color"
-                    value={activeEnvironment.color}
+                    value={activeEnvironment.color || undefined}
                     ref={this._setInputColorRef}
                     onInput={this._handleInputColorChange}
                   />
@@ -479,14 +496,22 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
                       {activeEnvironment.color && (
                         <i
                           className="fa fa-circle space-right"
-                          style={{ color: activeEnvironment.color }}
+                          style={{
+                            color: activeEnvironment.color,
+                          }}
                         />
                       )}
                       Color <i className="fa fa-caret-down" />
                     </DropdownButton>
 
                     <DropdownItem value={activeEnvironment} onClick={this._handleClickColorChange}>
-                      <i className="fa fa-circle" style={{ color: activeEnvironment.color }} />
+                      <i
+                        className="fa fa-circle"
+                        style={{
+                          // @ts-expect-error -- TSCONVERSION don't set color if undefined
+                          color: activeEnvironment.color,
+                        }}
+                      />
                       {activeEnvironment.color ? 'Change Color' : 'Assign Color'}
                     </DropdownItem>
 
@@ -512,7 +537,7 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
                     className="btn btn--clicky">
                     <i className="fa fa-trash-o" />
                   </PromptButton>
-                </React.Fragment>
+                </Fragment>
               ) : null}
             </div>
             <div className="env-modal__editor">
diff --git a/packages/insomnia-app/app/ui/components/modals/workspace-settings-modal.js b/packages/insomnia-app/app/ui/components/modals/workspace-settings-modal.tsx
similarity index 86%
rename from packages/insomnia-app/app/ui/components/modals/workspace-settings-modal.js
rename to packages/insomnia-app/app/ui/components/modals/workspace-settings-modal.tsx
index 5839c64df1..09b089cc75 100644
--- a/packages/insomnia-app/app/ui/components/modals/workspace-settings-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/workspace-settings-modal.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
@@ -18,65 +17,64 @@ import type { ApiSpec } from '../../../models/api-spec';
 import getWorkspaceName from '../../../models/helpers/get-workspace-name';
 import { getWorkspaceLabel } from '../../../common/get-workspace-label';
 import * as workspaceOperations from '../../../models/helpers/workspace-operations';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
 
-type Props = {
-  clientCertificates: Array<ClientCertificate>,
-  workspace: Workspace,
-  apiSpec: ApiSpec,
-  editorFontSize: number,
-  editorIndentSize: number,
-  editorKeyMap: string,
-  editorLineWrapping: boolean,
-  nunjucksPowerUserMode: boolean,
-  isVariableUncovered: boolean,
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  handleRemoveWorkspace: Function,
-  handleDuplicateWorkspace: Function,
-  handleClearAllResponses: Function,
-};
+interface Props {
+  clientCertificates: Array<ClientCertificate>;
+  workspace: Workspace;
+  apiSpec: ApiSpec;
+  editorFontSize: number;
+  editorIndentSize: number;
+  editorKeyMap: string;
+  editorLineWrapping: boolean;
+  nunjucksPowerUserMode: boolean;
+  isVariableUncovered: boolean;
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  handleRemoveWorkspace: Function;
+  handleDuplicateWorkspace: Function;
+  handleClearAllResponses: Function;
+}
 
-type State = {
-  showAddCertificateForm: boolean,
-  host: string,
-  crtPath: string,
-  keyPath: string,
-  pfxPath: string,
-  isPrivate: boolean,
-  passphrase: string,
-  showDescription: boolean,
-  defaultPreviewMode: boolean,
-};
+interface State {
+  showAddCertificateForm: boolean;
+  host: string;
+  crtPath: string;
+  keyPath: string;
+  pfxPath: string;
+  isPrivate: boolean;
+  passphrase: string;
+  showDescription: boolean;
+  defaultPreviewMode: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class WorkspaceSettingsModal extends React.PureComponent<Props, State> {
-  modal: Modal | null;
+class WorkspaceSettingsModal extends PureComponent<Props, State> {
+  modal: Modal | null = null;
 
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      showAddCertificateForm: false,
-      host: '',
-      crtPath: '',
-      keyPath: '',
-      pfxPath: '',
-      passphrase: '',
-      isPrivate: false,
-      showDescription: false,
-      defaultPreviewMode: false,
-    };
+  state: State = {
+    showAddCertificateForm: false,
+    host: '',
+    crtPath: '',
+    keyPath: '',
+    pfxPath: '',
+    passphrase: '',
+    isPrivate: false,
+    showDescription: false,
+    defaultPreviewMode: false,
   }
 
-  _workspaceUpdate(patch: Object) {
+  _workspaceUpdate(patch: Record<string, any>) {
     models.workspace.update(this.props.workspace, patch);
   }
 
   _handleAddDescription() {
-    this.setState({ showDescription: true });
+    this.setState({
+      showDescription: true,
+    });
   }
 
-  _handleSetModalRef(n: ?Modal) {
+  _handleSetModalRef(n: Modal) {
     this.modal = n;
   }
 
@@ -110,48 +108,61 @@ class WorkspaceSettingsModal extends React.PureComponent<Props, State> {
 
   async _handleRename(name: string) {
     const { workspace, apiSpec } = this.props;
-
     await workspaceOperations.rename(workspace, apiSpec, name);
   }
 
   _handleDescriptionChange(description: string) {
-    this._workspaceUpdate({ description });
+    this._workspaceUpdate({
+      description,
+    });
 
     if (this.state.defaultPreviewMode !== false) {
-      this.setState({ defaultPreviewMode: false });
+      this.setState({
+        defaultPreviewMode: false,
+      });
     }
   }
 
-  _handleCreateHostChange(e: SyntheticEvent<HTMLInputElement>) {
-    this.setState({ host: e.currentTarget.value });
+  _handleCreateHostChange(e: React.SyntheticEvent<HTMLInputElement>) {
+    this.setState({
+      host: e.currentTarget.value,
+    });
   }
 
   _handleCreatePfxChange(pfxPath: string) {
-    this.setState({ pfxPath });
+    this.setState({
+      pfxPath,
+    });
   }
 
   _handleCreateCrtChange(crtPath: string) {
-    this.setState({ crtPath });
+    this.setState({
+      crtPath,
+    });
   }
 
   _handleCreateKeyChange(keyPath: string) {
-    this.setState({ keyPath });
+    this.setState({
+      keyPath,
+    });
   }
 
-  _handleCreatePassphraseChange(e: SyntheticEvent<HTMLInputElement>) {
-    this.setState({ passphrase: e.currentTarget.value });
+  _handleCreatePassphraseChange(e: React.SyntheticEvent<HTMLInputElement>) {
+    this.setState({
+      passphrase: e.currentTarget.value,
+    });
   }
 
-  _handleCreateIsPrivateChange(e: SyntheticEvent<HTMLInputElement>) {
-    this.setState({ isPrivate: e.currentTarget.checked });
+  _handleCreateIsPrivateChange(e: React.SyntheticEvent<HTMLInputElement>) {
+    this.setState({
+      isPrivate: e.currentTarget.checked,
+    });
   }
 
-  async _handleCreateCertificate(e: SyntheticEvent<HTMLFormElement>) {
+  async _handleCreateCertificate(e: React.SyntheticEvent<HTMLFormElement>) {
     e.preventDefault();
-
     const { workspace } = this.props;
     const { pfxPath, crtPath, keyPath, host, passphrase, isPrivate } = this.state;
-
     const certificate = {
       host,
       isPrivate,
@@ -162,8 +173,8 @@ class WorkspaceSettingsModal extends React.PureComponent<Props, State> {
       key: keyPath || null,
       pfx: pfxPath || null,
     };
-
     await models.clientCertificate.create(certificate);
+
     this._handleToggleCertificateForm();
   }
 
@@ -184,7 +195,6 @@ class WorkspaceSettingsModal extends React.PureComponent<Props, State> {
       defaultPreviewMode: hasDescription,
       showAddCertificateForm: false,
     });
-
     this.modal && this.modal.show();
   }
 
@@ -219,7 +229,7 @@ class WorkspaceSettingsModal extends React.PureComponent<Props, State> {
               <strong>Key:</strong>{' '}
               {certificate.key ? <i className="fa fa-check" /> : <i className="fa fa-remove" />}
             </span>
-            <span className="pad-right no-wrap" title={certificate.passphrase || null}>
+            <span className="pad-right no-wrap" title={certificate.passphrase || undefined}>
               <strong>Passphrase:</strong>{' '}
               {certificate.passphrase ? (
                 <i className="fa fa-check" />
@@ -270,10 +280,8 @@ class WorkspaceSettingsModal extends React.PureComponent<Props, State> {
       nunjucksPowerUserMode,
       isVariableUncovered,
     } = this.props;
-
     const publicCertificates = clientCertificates.filter(c => !c.isPrivate);
     const privateCertificates = clientCertificates.filter(c => c.isPrivate);
-
     const {
       pfxPath,
       crtPath,
@@ -283,7 +291,6 @@ class WorkspaceSettingsModal extends React.PureComponent<Props, State> {
       showDescription,
       defaultPreviewMode,
     } = this.state;
-
     return (
       <ModalBody key={`body::${workspace._id}`} noScroll>
         <Tabs forceRenderTabPanel className="react-tabs">
@@ -300,6 +307,7 @@ class WorkspaceSettingsModal extends React.PureComponent<Props, State> {
               <label>
                 Name
                 <DebouncedInput
+                  // @ts-expect-error -- TSCONVERSION props are spread into an input element
                   type="text"
                   delay={500}
                   placeholder="Awesome API"
@@ -398,9 +406,9 @@ class WorkspaceSettingsModal extends React.PureComponent<Props, State> {
                     </HelpTooltip>
                     <input
                       type="text"
-                      required="required"
+                      required
                       placeholder="my-api.com"
-                      autoFocus="autoFocus"
+                      autoFocus
                       onChange={this._handleCreateHostChange}
                     />
                   </label>
@@ -467,6 +475,7 @@ class WorkspaceSettingsModal extends React.PureComponent<Props, State> {
                     </HelpTooltip>
                     <input
                       type="checkbox"
+                      // @ts-expect-error -- TSCONVERSION boolean not valid
                       value={isPrivate}
                       onChange={this._handleCreateIsPrivateChange}
                     />
diff --git a/packages/insomnia-app/app/ui/components/modals/wrapper-modal.js b/packages/insomnia-app/app/ui/components/modals/wrapper-modal.tsx
similarity index 52%
rename from packages/insomnia-app/app/ui/components/modals/wrapper-modal.js
rename to packages/insomnia-app/app/ui/components/modals/wrapper-modal.tsx
index e8bea81265..24f0efe4e1 100644
--- a/packages/insomnia-app/app/ui/components/modals/wrapper-modal.js
+++ b/packages/insomnia-app/app/ui/components/modals/wrapper-modal.tsx
@@ -1,43 +1,37 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Modal from '../base/modal';
 import ModalBody from '../base/modal-body';
 import ModalHeader from '../base/modal-header';
 
-type Props = {};
-type State = {
-  title: string,
-  body: React.Node,
-  bodyHTML: ?string,
-  tall: ?boolean,
-  skinny: ?boolean,
-  wide: ?boolean,
-};
+interface State {
+  title: string;
+  body: ReactNode;
+  bodyHTML?: string | null;
+  tall?: boolean | null;
+  skinny?: boolean | null;
+  wide?: boolean | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class WrapperModal extends React.PureComponent<Props, State> {
-  modal: ?Modal;
+class WrapperModal extends PureComponent<{}, State> {
+  modal: Modal | null = null;
 
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      title: '',
-      body: null,
-      bodyHTML: null,
-      tall: false,
-      skinny: false,
-      wide: false,
-    };
+  state: State = {
+    title: '',
+    body: null,
+    bodyHTML: null,
+    tall: false,
+    skinny: false,
+    wide: false,
   }
 
-  _setModalRef(m: ?Modal) {
+  _setModalRef(m: Modal) {
     this.modal = m;
   }
 
-  show(options: Object = {}) {
+  show(options: Record<string, any> = {}) {
     const { title, body, bodyHTML, tall, skinny, wide } = options;
     this.setState({
       title,
@@ -47,20 +41,26 @@ class WrapperModal extends React.PureComponent<Props, State> {
       skinny: !!skinny,
       wide: !!wide,
     });
-
     this.modal && this.modal.show();
   }
 
   render() {
     const { title, body, bodyHTML, tall, skinny, wide } = this.state;
-
     let finalBody = body;
+
     if (bodyHTML) {
-      finalBody = <div dangerouslySetInnerHTML={{ __html: bodyHTML }} className="tall wide pad" />;
+      finalBody = (
+        <div
+          dangerouslySetInnerHTML={{
+            __html: bodyHTML,
+          }}
+          className="tall wide pad"
+        />
+      );
     }
 
     return (
-      <Modal ref={this._setModalRef} tall={tall} skinny={skinny} wide={wide}>
+      <Modal ref={this._setModalRef} tall={tall ?? undefined} skinny={skinny ?? undefined} wide={wide ?? undefined}>
         <ModalHeader>{title || 'Uh Oh!'}</ModalHeader>
         <ModalBody>{finalBody}</ModalBody>
       </Modal>
diff --git a/packages/insomnia-app/app/ui/components/notice.stories.js b/packages/insomnia-app/app/ui/components/notice.stories.tsx
similarity index 95%
rename from packages/insomnia-app/app/ui/components/notice.stories.js
rename to packages/insomnia-app/app/ui/components/notice.stories.tsx
index 34eed4fae7..080709222f 100644
--- a/packages/insomnia-app/app/ui/components/notice.stories.js
+++ b/packages/insomnia-app/app/ui/components/notice.stories.tsx
@@ -2,7 +2,9 @@ import React from 'react';
 import '../../../.storybook/index.less';
 import Notice from './notice';
 
-export default { title: 'Notice' };
+export default {
+  title: 'Notice',
+};
 
 export const _default = () => (
   <Notice>This is a notice. It is a bright block of text, meant to stand out from the rest!</Notice>
diff --git a/packages/insomnia-app/app/ui/components/notice.js b/packages/insomnia-app/app/ui/components/notice.tsx
similarity index 78%
rename from packages/insomnia-app/app/ui/components/notice.js
rename to packages/insomnia-app/app/ui/components/notice.tsx
index f34fead6e8..f4d221b69b 100644
--- a/packages/insomnia-app/app/ui/components/notice.js
+++ b/packages/insomnia-app/app/ui/components/notice.tsx
@@ -1,33 +1,30 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../common/constants';
 import classnames from 'classnames';
-
 const DISMISSED_VALUE = 'dismissed';
 
-type Props = {|
-  dismissKey?: string,
-  color?: 'surprise' | 'success' | 'warning' | 'info' | 'error' | 'subtle',
-  children: React.Node,
-  className?: string,
-|};
+interface Props {
+  dismissKey?: string;
+  color?: 'surprise' | 'success' | 'warning' | 'info' | 'error' | 'subtle';
+  children: ReactNode;
+  className?: string;
+}
 
-type State = {
-  visible: boolean,
-  localStorageKey: string | null,
-};
+interface State {
+  visible: boolean;
+  localStorageKey: string | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Notice extends React.PureComponent<Props, State> {
+class Notice extends PureComponent<Props, State> {
   constructor(props: Props) {
     super(props);
-
     const { dismissKey } = props;
     const localStorageKey = dismissKey ? 'insomnia::notice::' + dismissKey : null;
-
     // It's visible if it's not dismissible
     let visible = false;
+
     if (localStorageKey) {
       visible = window.localStorage.getItem(localStorageKey) !== DISMISSED_VALUE;
     } else {
@@ -42,11 +39,11 @@ class Notice extends React.PureComponent<Props, State> {
 
   _dismissNotification() {
     const { localStorageKey } = this.state;
-
     // Hide the currently showing notification
     this.setState({ visible: false });
-
-    window.localStorage.setItem(localStorageKey, DISMISSED_VALUE);
+    if (localStorageKey !== null) {
+      window.localStorage.setItem(localStorageKey, DISMISSED_VALUE);
+    }
   }
 
   render() {
diff --git a/packages/insomnia-app/app/ui/components/onboarding-container.js b/packages/insomnia-app/app/ui/components/onboarding-container.tsx
similarity index 75%
rename from packages/insomnia-app/app/ui/components/onboarding-container.js
rename to packages/insomnia-app/app/ui/components/onboarding-container.tsx
index da5ba12be3..093116b6d0 100644
--- a/packages/insomnia-app/app/ui/components/onboarding-container.js
+++ b/packages/insomnia-app/app/ui/components/onboarding-container.tsx
@@ -1,14 +1,15 @@
-// @flow
-import React from 'react';
+import React, { FunctionComponent } from 'react';
 import type { WrapperProps } from './wrapper';
 import PageLayout from './page-layout';
 import coreLogo from '../images/insomnia-core-logo.png';
 
-type Props = {
-  wrapperProps: WrapperProps,
-};
+interface Props {
+  wrapperProps: WrapperProps;
+  header: string;
+  subHeader: string;
+}
 
-const OnboardingContainer = ({ wrapperProps, children, header, subHeader }: Props) => (
+const OnboardingContainer: FunctionComponent<Props> = ({ wrapperProps, children, header, subHeader }) => (
   <PageLayout
     wrapperProps={wrapperProps}
     renderPageBody={() => (
diff --git a/packages/insomnia-app/app/ui/components/page-layout.js b/packages/insomnia-app/app/ui/components/page-layout.tsx
similarity index 78%
rename from packages/insomnia-app/app/ui/components/page-layout.js
rename to packages/insomnia-app/app/ui/components/page-layout.tsx
index 52ec8cbf77..0cddc95267 100644
--- a/packages/insomnia-app/app/ui/components/page-layout.js
+++ b/packages/insomnia-app/app/ui/components/page-layout.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import type { WrapperProps } from './wrapper';
 import classnames from 'classnames';
@@ -7,27 +6,22 @@ import ErrorBoundary from './error-boundary';
 import Sidebar from './sidebar/sidebar';
 import { AUTOBIND_CFG } from '../../common/constants';
 
-type Props = {
-  wrapperProps: WrapperProps,
-
-  // Render props
-  renderPageSidebar?: () => React.Node,
-  renderPageHeader?: () => React.Node,
-  renderPageBody?: () => React.Node,
-  renderPaneOne?: () => React.Node,
-  renderPaneTwo?: () => React.Node,
-};
-
-type State = {};
+interface Props {
+  wrapperProps: WrapperProps;
+  renderPageSidebar?: () => ReactNode;
+  renderPageHeader?: () => ReactNode;
+  renderPageBody?: () => ReactNode;
+  renderPaneOne?: () => ReactNode;
+  renderPaneTwo?: () => ReactNode;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class PageLayout extends React.PureComponent<Props, State> {
+class PageLayout extends PureComponent<Props> {
   // Special request updaters
-  _handleStartDragSidebar(e: Event): void {
+  _handleStartDragSidebar(e: React.MouseEvent<HTMLDivElement>) {
     e.preventDefault();
-
     const { handleStartDragSidebar } = this.props.wrapperProps;
-    handleStartDragSidebar();
+    handleStartDragSidebar(e);
   }
 
   render() {
@@ -39,7 +33,6 @@ class PageLayout extends React.PureComponent<Props, State> {
       renderPageSidebar,
       wrapperProps,
     } = this.props;
-
     const {
       activeEnvironment,
       activeGitRepository,
@@ -64,23 +57,21 @@ class PageLayout extends React.PureComponent<Props, State> {
       unseenWorkspaces,
       workspaces,
     } = wrapperProps;
-
     const realSidebarWidth = sidebarHidden ? 0 : sidebarWidth;
-
     const paneTwo = renderPaneTwo && renderPaneTwo();
-
     const gridRows = paneTwo
       ? `auto minmax(0, ${paneHeight}fr) 0 minmax(0, ${1 - paneHeight}fr)`
-      : `auto 1fr`;
+      : 'auto 1fr';
     const gridColumns =
       `auto ${realSidebarWidth}rem 0 ` +
       `${paneTwo ? `minmax(0, ${paneWidth}fr) 0 minmax(0, ${1 - paneWidth}fr)` : '1fr'}`;
-
     return (
       <div
         key="wrapper"
         id="wrapper"
-        className={classnames('wrapper', { 'wrapper--vertical': settings.forceVerticalLayout })}
+        className={classnames('wrapper', {
+          'wrapper--vertical': settings.forceVerticalLayout,
+        })}
         style={{
           gridTemplateColumns: gridColumns,
           gridTemplateRows: gridRows,
@@ -90,31 +81,32 @@ class PageLayout extends React.PureComponent<Props, State> {
             activeEnvironment.color &&
             settings.environmentHighlightColorStyle === 'window-top'
               ? '5px solid ' + activeEnvironment.color
-              : null,
+              : undefined,
           borderBottom:
             activeEnvironment &&
             activeEnvironment.color &&
             settings.environmentHighlightColorStyle === 'window-bottom'
               ? '5px solid ' + activeEnvironment.color
-              : null,
+              : undefined,
           borderLeft:
             activeEnvironment &&
             activeEnvironment.color &&
             settings.environmentHighlightColorStyle === 'window-left'
               ? '5px solid ' + activeEnvironment.color
-              : null,
+              : undefined,
           borderRight:
             activeEnvironment &&
             activeEnvironment.color &&
             settings.environmentHighlightColorStyle === 'window-right'
               ? '5px solid ' + activeEnvironment.color
-              : null,
+              : undefined,
         }}>
         {renderPageHeader && <ErrorBoundary showAlert>{renderPageHeader()}</ErrorBoundary>}
 
         {renderPageSidebar && (
           <ErrorBoundary showAlert>
             <Sidebar
+              // @ts-expect-error -- TSCONVERSION
               ref={handleSetSidebarRef}
               activeEnvironment={activeEnvironment}
               activeGitRepository={activeGitRepository}
@@ -125,6 +117,7 @@ class PageLayout extends React.PureComponent<Props, State> {
               hidden={sidebarHidden || false}
               hotKeyRegistry={settings.hotKeyRegistry}
               isLoading={isLoading}
+              // @ts-expect-error -- TSCONVERSION appears to be a genuine error, or is it that it comes from Wrapper?
               showEnvironmentsModal={this._handleShowEnvironmentsModal}
               unseenWorkspaces={unseenWorkspaces}
               gitVCS={gitVCS}
@@ -147,7 +140,11 @@ class PageLayout extends React.PureComponent<Props, State> {
           <>
             {renderPaneOne && (
               <ErrorBoundary showAlert>
-                <Pane position="one" ref={handleSetRequestPaneRef}>
+                <Pane
+                  position="one"
+                  // @ts-expect-error -- TSCONVERSION
+                  ref={handleSetRequestPaneRef}
+                >
                   {renderPaneOne()}
                 </Pane>
               </ErrorBoundary>
@@ -169,7 +166,11 @@ class PageLayout extends React.PureComponent<Props, State> {
                 </div>
 
                 <ErrorBoundary showAlert>
-                  <Pane position="two" ref={handleSetResponsePaneRef}>
+                  <Pane
+                    position="two"
+                    // @ts-expect-error -- TSCONVERSION
+                    ref={handleSetResponsePaneRef}
+                  >
                     {paneTwo}
                   </Pane>
                 </ErrorBoundary>
@@ -184,10 +185,15 @@ class PageLayout extends React.PureComponent<Props, State> {
 
 export default PageLayout;
 
-class Pane extends React.PureComponent {
+class Pane extends PureComponent {
   render() {
     return (
-      <section className={`pane-${this.props.position} theme--pane`}>{this.props.children}</section>
+      <section
+        // @ts-expect-error -- TSCONVERSION
+        className={`pane-${this.props.position} theme--pane`}
+      >
+        {this.props.children}
+      </section>
     );
   }
 }
diff --git a/packages/insomnia-app/app/ui/components/panes/blank-pane.js b/packages/insomnia-app/app/ui/components/panes/blank-pane.tsx
similarity index 50%
rename from packages/insomnia-app/app/ui/components/panes/blank-pane.js
rename to packages/insomnia-app/app/ui/components/panes/blank-pane.tsx
index 2558c9cbd8..4106ef21d9 100644
--- a/packages/insomnia-app/app/ui/components/panes/blank-pane.js
+++ b/packages/insomnia-app/app/ui/components/panes/blank-pane.tsx
@@ -1,12 +1,11 @@
-// @flow
-import React from 'react';
+import React, { FunctionComponent } from 'react';
 import { Pane, PaneBody, PaneHeader } from './pane';
 
-type Props = {
-  type: 'request' | 'response',
-};
+interface Props {
+  type: 'request' | 'response';
+}
 
-const BlankPane = ({ type }: Props) => (
+const BlankPane: FunctionComponent<Props> = ({ type }) => (
   <Pane type={type}>
     <PaneHeader />
     <PaneBody placeholder />
diff --git a/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/__tests__/use-proto-file-reload.test.js b/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/__tests__/use-proto-file-reload.test.ts
similarity index 84%
rename from packages/insomnia-app/app/ui/components/panes/grpc-request-pane/__tests__/use-proto-file-reload.test.js
rename to packages/insomnia-app/app/ui/components/panes/grpc-request-pane/__tests__/use-proto-file-reload.test.ts
index 0fd32d8573..8e65a49a02 100644
--- a/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/__tests__/use-proto-file-reload.test.js
+++ b/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/__tests__/use-proto-file-reload.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { renderHook } from '@testing-library/react-hooks';
 import useProtoFileReload from '../use-proto-file-reload';
 import { createBuilder } from '@develohpanda/fluent-builder';
@@ -18,63 +17,53 @@ describe('useProtoFileReload', () => {
   it('should not dispatch anything if methods do not need to be reloaded', () => {
     const state = requestStateBuilder.reloadMethods(false).build();
     const dispatch = jest.fn();
-
     renderHook(() => useProtoFileReload(state, dispatch, {}));
-
     expect(dispatch).not.toHaveBeenCalled();
   });
 
   it('should not dispatch anything if the request is running', () => {
-    const state = requestStateBuilder
-      .reloadMethods(true)
-      .running(true)
-      .build();
+    const state = requestStateBuilder.reloadMethods(true).running(true).build();
     const dispatch = jest.fn();
-
     renderHook(() => useProtoFileReload(state, dispatch, {}));
-
     expect(dispatch).not.toHaveBeenCalled();
   });
 
   it('should dispatch clear before dispatching loadMethods', () => {
-    const state = requestStateBuilder
-      .reloadMethods(true)
-      .running(false)
-      .build();
+    const state = requestStateBuilder.reloadMethods(true).running(false).build();
     const dispatch = jest.fn();
-    const r1 = { _id: 'rid', protoFileId: 'pfid' };
-
+    const r1 = {
+      _id: 'rid',
+      protoFileId: 'pfid',
+    };
     const { rerender } = renderHook(request => useProtoFileReload(state, dispatch, request), {
       initialProps: r1,
     });
-
     expect(grpcActions.clear).toHaveBeenCalledWith(r1._id);
     expect(grpcActions.loadMethods).toHaveBeenCalledWith(r1._id, r1.protoFileId);
-
     setTimeout(() => {
       expect(dispatch).toHaveBeenCalledTimes(2);
     }, 100);
-
     // Should re-run after id changes
     jest.clearAllMocks();
-    const r2 = { _id: 'new-rid', protoFileId: 'pfid' };
+    const r2 = {
+      _id: 'new-rid',
+      protoFileId: 'pfid',
+    };
     rerender(r2);
-
     expect(grpcActions.clear).toHaveBeenCalledWith(r2._id);
     expect(grpcActions.loadMethods).toHaveBeenCalledWith(r2._id, r2.protoFileId);
-
     setTimeout(() => {
       expect(dispatch).toHaveBeenCalledTimes(2);
     }, 100);
-
     // Should re-run after protoFile id changes
     jest.clearAllMocks();
-    const r3 = { _id: 'rid', protoFileId: 'new-pfid' };
+    const r3 = {
+      _id: 'rid',
+      protoFileId: 'new-pfid',
+    };
     rerender(r3);
-
     expect(grpcActions.clear).toHaveBeenCalledWith(r3._id);
     expect(grpcActions.loadMethods).toHaveBeenCalledWith(r3._id, r3.protoFileId);
-
     setTimeout(() => {
       expect(dispatch).toHaveBeenCalledTimes(2);
     }, 100);
diff --git a/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/index.js b/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/index.tsx
similarity index 87%
rename from packages/insomnia-app/app/ui/components/panes/grpc-request-pane/index.js
rename to packages/insomnia-app/app/ui/components/panes/grpc-request-pane/index.tsx
index e6822b234a..f17b8bc985 100644
--- a/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/index.js
+++ b/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/index.tsx
@@ -1,5 +1,4 @@
-// @flow
-import React from 'react';
+import React, { FunctionComponent } from 'react';
 import { Pane, PaneBody, PaneHeader } from '../pane';
 import { Tab, TabList, TabPanel, Tabs } from 'react-tabs';
 import { GrpcMethodDropdown } from '../../dropdowns/grpc-method-dropdown';
@@ -15,19 +14,19 @@ import useProtoFileReload from './use-proto-file-reload';
 import styled from 'styled-components';
 import useActionHandlers from './use-action-handlers';
 import useExistingGrpcUrls from './use-existing-grpc-urls';
+import { HandleGetRenderContext, HandleRender } from '../../../../common/render';
 
-type Props = {
-  forceRefreshKey: string,
-  activeRequest: GrpcRequest,
-  environmentId: string,
-  workspaceId: string,
-  settings: Settings,
-
+interface Props {
+  forceRefreshKey: number;
+  activeRequest: GrpcRequest;
+  environmentId: string;
+  workspaceId: string;
+  settings: Settings;
   // For variables
-  handleRender: string => Promise<string>,
-  isVariableUncovered: boolean,
-  handleGetRenderContext: Function,
-};
+  handleRender: HandleRender;
+  isVariableUncovered: boolean;
+  handleGetRenderContext: HandleGetRenderContext;
+}
 
 const StyledUrlBar = styled.div`
   width: 100%;
@@ -47,7 +46,7 @@ const StyledDropdown = styled.div`
   flex: 1 0 auto;
 `;
 
-const GrpcRequestPane = ({
+const GrpcRequestPane: FunctionComponent<Props> = ({
   activeRequest,
   environmentId,
   workspaceId,
@@ -56,23 +55,19 @@ const GrpcRequestPane = ({
   handleRender,
   handleGetRenderContext,
   isVariableUncovered,
-}: Props) => {
+}) => {
   const [state, dispatch] = useGrpc(activeRequest._id);
   const { requestMessages, running, methods } = state;
-
   useProtoFileReload(state, dispatch, activeRequest);
   const selection = useSelectedMethod(state, activeRequest);
-
   const { method, methodType, methodTypeLabel, enableClientStream } = selection;
-
   const handleChange = useChangeHandlers(activeRequest, dispatch);
+  // @ts-expect-error -- TSCONVERSION methodType can be undefined
   const handleAction = useActionHandlers(activeRequest._id, environmentId, methodType, dispatch);
   const getExistingGrpcUrls = useExistingGrpcUrls(workspaceId, activeRequest._id);
-
   // Used to refresh input fields to their default value when switching between requests.
   // This is a common pattern in this codebase.
   const uniquenessKey = `${forceRefreshKey}::${activeRequest._id}`;
-
   return (
     <Pane type="request">
       <PaneHeader>
@@ -146,7 +141,13 @@ const GrpcRequestPane = ({
         {!methodType && (
           <div className="overflow-hidden editor vertically-center text-center">
             <p className="pad super-faint text-sm text-center">
-              <i className="fa fa-hand-peace-o" style={{ fontSize: '8rem', opacity: 0.3 }} />
+              <i
+                className="fa fa-hand-peace-o"
+                style={{
+                  fontSize: '8rem',
+                  opacity: 0.3,
+                }}
+              />
               <br />
               <br />
               Select a gRPC method from above
diff --git a/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-action-handlers.js b/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-action-handlers.ts
similarity index 87%
rename from packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-action-handlers.js
rename to packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-action-handlers.ts
index 81c1764d96..dc4b47514b 100644
--- a/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-action-handlers.js
+++ b/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-action-handlers.ts
@@ -1,9 +1,8 @@
-// @flow
 import { useCallback } from 'react';
 import type { GrpcMethodType } from '../../../../network/grpc/method';
 import { GrpcRequestEventEnum } from '../../../../common/grpc-events';
 import { ipcRenderer } from 'electron';
-import { grpcActions } from '../../../context/grpc';
+import { grpcActions, GrpcDispatch } from '../../../context/grpc';
 import { prepareGrpcMessage, prepareGrpcRequest } from '../../../../network/grpc/prepare';
 
 const _sendStart = async (
@@ -15,6 +14,7 @@ const _sendStart = async (
   if (!reqId) {
     return;
   }
+
   const preparedRequest = await prepareGrpcRequest(reqId, envId, type);
   ipcRenderer.send(GrpcRequestEventEnum.start, preparedRequest);
   dispatch(grpcActions.clear(reqId));
@@ -24,6 +24,7 @@ const _sendCancel = (reqId: string) => {
   if (!reqId) {
     return;
   }
+
   ipcRenderer.send(GrpcRequestEventEnum.cancel, reqId);
 };
 
@@ -31,8 +32,10 @@ const _sendMessage = async (reqId: string, envId: string, dispatch: GrpcDispatch
   if (!reqId) {
     return;
   }
+
   const preparedMessage = await prepareGrpcMessage(reqId, envId);
   ipcRenderer.send(GrpcRequestEventEnum.sendMessage, preparedMessage);
+  // @ts-expect-error -- TSCONVERSION
   dispatch(grpcActions.requestMessage(reqId, preparedMessage.body.text));
 };
 
@@ -40,15 +43,16 @@ const _sendCommit = (reqId: string) => {
   if (!reqId) {
     return;
   }
+
   ipcRenderer.send(GrpcRequestEventEnum.commit, reqId);
 };
 
-type ActionHandlers = {
-  start: () => Promise<void>,
-  stream: () => Promise<void>,
-  cancel: () => void,
-  commit: () => void,
-};
+interface ActionHandlers {
+  start: () => Promise<void>;
+  stream: () => Promise<void>;
+  cancel: () => void;
+  commit: () => void;
+}
 
 const useActionHandlers = (
   reqId: string,
diff --git a/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-change-handlers.js b/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-change-handlers.ts
similarity index 69%
rename from packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-change-handlers.js
rename to packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-change-handlers.ts
index bce7602d2f..351f609970 100644
--- a/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-change-handlers.js
+++ b/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-change-handlers.ts
@@ -1,6 +1,4 @@
-// @flow
-
-import React from 'react';
+import { useMemo } from 'react';
 import type { GrpcRequest } from '../../../../models/grpc-request';
 import type { GrpcDispatch } from '../../../context/grpc';
 import * as models from '../../../../models';
@@ -8,26 +6,32 @@ import { grpcActions } from '../../../context/grpc';
 import { showModal } from '../../modals';
 import ProtoFilesModal from '../../modals/proto-files-modal';
 
-type ChangeHandlers = {
-  url: string => Promise<void>,
-  body: string => Promise<void>,
-  method: string => Promise<void>,
-  protoFile: string => Promise<void>,
-};
+interface ChangeHandlers {
+  url: (arg0: string) => Promise<void>;
+  body: (arg0: string) => Promise<void>;
+  method: (arg0: string) => Promise<void>;
+  protoFile: (arg0: string) => Promise<void>;
+}
 
 // This will create memoized change handlers for the url, body and method selection
 const useChangeHandlers = (request: GrpcRequest, dispatch: GrpcDispatch): ChangeHandlers => {
-  return React.useMemo(() => {
+  return useMemo(() => {
     const url = async (value: string) => {
-      await models.grpcRequest.update(request, { url: value });
+      await models.grpcRequest.update(request, {
+        url: value,
+      });
     };
 
     const body = async (value: string) => {
-      await models.grpcRequest.update(request, { body: { ...request.body, text: value } });
+      await models.grpcRequest.update(request, {
+        body: { ...request.body, text: value },
+      });
     };
 
     const method = async (value: string) => {
-      await models.grpcRequest.update(request, { protoMethodName: value });
+      await models.grpcRequest.update(request, {
+        protoMethodName: value,
+      });
       dispatch(grpcActions.clear(request._id));
     };
 
@@ -37,7 +41,6 @@ const useChangeHandlers = (request: GrpcRequest, dispatch: GrpcDispatch): Change
         onSave: async (protoFileId: string) => {
           if (request.protoFileId !== protoFileId) {
             const initial = models.grpcRequest.init();
-
             // Reset the body as it is no longer relevant
             await models.grpcRequest.update(request, {
               protoFileId,
@@ -50,7 +53,12 @@ const useChangeHandlers = (request: GrpcRequest, dispatch: GrpcDispatch): Change
       });
     };
 
-    return { url, body, method, protoFile };
+    return {
+      url,
+      body,
+      method,
+      protoFile,
+    };
   }, [request, dispatch]);
 };
 
diff --git a/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-existing-grpc-urls.js b/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-existing-grpc-urls.ts
similarity index 98%
rename from packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-existing-grpc-urls.js
rename to packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-existing-grpc-urls.ts
index 16ea082eef..c6aca8d578 100644
--- a/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-existing-grpc-urls.js
+++ b/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-existing-grpc-urls.ts
@@ -1,4 +1,3 @@
-// @flow
 import { useCallback } from 'react';
 import * as models from '../../../../models';
 import { queryAllWorkspaceUrls } from '../../../../models/helpers/query-all-workspace-urls';
diff --git a/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-proto-file-reload.js b/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-proto-file-reload.ts
similarity index 89%
rename from packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-proto-file-reload.js
rename to packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-proto-file-reload.ts
index 575689cab7..7f9e460426 100644
--- a/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-proto-file-reload.js
+++ b/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-proto-file-reload.ts
@@ -1,5 +1,4 @@
-// @flow
-import React from 'react';
+import { useEffect } from 'react';
 import { grpcActions } from '../../../context/grpc';
 import type { GrpcRequestState, GrpcDispatch } from '../../../context/grpc';
 import type { GrpcRequest } from '../../../../models/grpc-request';
@@ -10,16 +9,19 @@ const useProtoFileReload = (
   grpcDispatch: GrpcDispatch,
   { _id, protoFileId }: GrpcRequest,
 ): void => {
-  React.useEffect(() => {
+  useEffect(() => {
     // don't actually reload until the request has stopped running or if methods do not need to be reloaded
     if (!reloadMethods || running) {
       return;
     }
 
     grpcDispatch(grpcActions.clear(_id));
+
     const func = async () => {
+      // @ts-expect-error -- TSCONVERSION
       grpcDispatch(await grpcActions.loadMethods(_id, protoFileId));
     };
+
     func();
   }, [_id, protoFileId, reloadMethods, grpcDispatch, running]);
 };
diff --git a/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-selected-method.js b/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-selected-method.ts
similarity index 70%
rename from packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-selected-method.js
rename to packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-selected-method.ts
index aae85a81e8..e0daf118c7 100644
--- a/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-selected-method.js
+++ b/packages/insomnia-app/app/ui/components/panes/grpc-request-pane/use-selected-method.ts
@@ -1,5 +1,4 @@
-// @flow
-import React from 'react';
+import { useEffect, useState } from 'react';
 import type { GrpcMethodDefinition, GrpcMethodType } from '../../../../network/grpc/method';
 import {
   canClientStream,
@@ -9,36 +8,38 @@ import {
 import type { GrpcRequest } from '../../../../models/grpc-request';
 import type { GrpcRequestState } from '../../../context/grpc';
 
-type MethodSelection = {
-  method?: GrpcMethodDefinition,
-  methodType?: GrpcMethodType,
-  methodTypeLabel?: string,
-  enableClientStream?: boolean,
-};
+interface MethodSelection {
+  method?: GrpcMethodDefinition;
+  methodType?: GrpcMethodType;
+  methodTypeLabel?: string;
+  enableClientStream?: boolean;
+}
 
 const useSelectedMethod = (
   { methods, reloadMethods }: GrpcRequestState,
-  { _id, protoMethodName }: GrpcRequest,
+  { protoMethodName }: GrpcRequest,
 ): MethodSelection => {
-  const [selection, setSelection] = React.useState({});
-
+  const [selection, setSelection] = useState({});
   // if methods are waiting to be reloaded because they are stale, don't update the method selection.
   //  This is a bit of a hack needed to avoid a split-second blank state showing on the page because
   //  component refreshes are also triggered by database changes and before the methods have been updated.
-  React.useEffect(() => {
+  useEffect(() => {
     if (reloadMethods) {
       return;
     }
 
     const selectedMethod = methods.find(c => c.path === protoMethodName);
-
     const methodType = selectedMethod && getMethodType(selectedMethod);
+    // @ts-expect-error -- TSCONVERSION undefined as index
     const methodTypeLabel = GrpcMethodTypeName[methodType];
     const enableClientStream = canClientStream(methodType);
-
-    setSelection({ method: selectedMethod, methodType, methodTypeLabel, enableClientStream });
+    setSelection({
+      method: selectedMethod,
+      methodType,
+      methodTypeLabel,
+      enableClientStream,
+    });
   }, [methods, protoMethodName, reloadMethods]);
-
   return selection;
 };
 
diff --git a/packages/insomnia-app/app/ui/components/panes/grpc-response-pane.js b/packages/insomnia-app/app/ui/components/panes/grpc-response-pane.tsx
similarity index 81%
rename from packages/insomnia-app/app/ui/components/panes/grpc-response-pane.js
rename to packages/insomnia-app/app/ui/components/panes/grpc-response-pane.tsx
index 5ec8fa5d5d..9834605be9 100644
--- a/packages/insomnia-app/app/ui/components/panes/grpc-response-pane.js
+++ b/packages/insomnia-app/app/ui/components/panes/grpc-response-pane.tsx
@@ -1,26 +1,23 @@
-// @flow
-import React from 'react';
+import React, { FunctionComponent } from 'react';
 import { Pane, PaneBody, PaneHeader } from './pane';
-import GrpcTabbedMessages from '../viewers/grpc-tabbed-messages.js';
+import GrpcTabbedMessages from '../viewers/grpc-tabbed-messages';
 import type { Settings } from '../../../models/settings';
 import type { GrpcRequest } from '../../../models/grpc-request';
 import GrpcStatusTag from '../tags/grpc-status-tag';
 import GrpcSpinner from '../grpc-spinner';
 import { useGrpcRequestState } from '../../context/grpc';
 
-type Props = {
-  forceRefreshKey: string,
-  activeRequest: GrpcRequest,
-  settings: Settings,
-};
+interface Props {
+  forceRefreshKey: number;
+  activeRequest: GrpcRequest;
+  settings: Settings;
+}
 
-const GrpcResponsePane = ({ settings, activeRequest, forceRefreshKey }: Props) => {
+const GrpcResponsePane: FunctionComponent<Props> = ({ settings, activeRequest, forceRefreshKey }) => {
   // Used to refresh input fields to their default value when switching between requests.
   // This is a common pattern in this codebase.
   const uniquenessKey = `${forceRefreshKey}::${activeRequest._id}`;
-
   const { responseMessages, status, error } = useGrpcRequestState(activeRequest._id);
-
   return (
     <Pane type="response">
       <PaneHeader className="row-spaced">
diff --git a/packages/insomnia-app/app/ui/components/panes/pane.js b/packages/insomnia-app/app/ui/components/panes/pane.tsx
similarity index 51%
rename from packages/insomnia-app/app/ui/components/panes/pane.js
rename to packages/insomnia-app/app/ui/components/panes/pane.tsx
index 3cc4781fac..79b4a335fe 100644
--- a/packages/insomnia-app/app/ui/components/panes/pane.js
+++ b/packages/insomnia-app/app/ui/components/panes/pane.tsx
@@ -1,36 +1,34 @@
-// @flow
 import classnames from 'classnames';
 import React from 'react';
 
-type PaneProps = {
-  className?: string,
-  type: 'request' | 'response',
-};
+interface PaneProps {
+  className?: string;
+  type: 'request' | 'response';
+}
 
-type PaneHeaderProps = {
-  className?: string,
-};
+interface PaneHeaderProps {
+  className?: string;
+}
 
-type PaneBodyProps = {
-  className?: string,
-  placeholder?: boolean,
-};
+interface PaneBodyProps {
+  className?: string;
+  placeholder?: boolean;
+}
 
-export const Pane = ({ className, type, children }: PaneProps) => (
+export const Pane: React.FC<PaneProps> = ({ className, type, children }) => (
   <section className={classnames(`${type}-pane`, 'theme--pane', 'pane', className)}>
     {children}
   </section>
 );
 
-export const PaneHeader = ({ className, children }: PaneHeaderProps) => (
+export const PaneHeader: React.FC<PaneHeaderProps> = ({ className, children }) => (
   <header className={classnames('pane__header', 'theme--pane__header', className)}>
     {children}
   </header>
 );
 
 export const paneBodyClasses = 'pane__body theme--pane__body';
-
-export const PaneBody = ({ placeholder, children }: PaneBodyProps) => (
+export const PaneBody: React.FC<PaneBodyProps> = ({ placeholder, children }) => (
   <div className={classnames(paneBodyClasses, placeholder && 'pane__body--placeholder')}>
     {children}
   </div>
diff --git a/packages/insomnia-app/app/ui/components/panes/placeholder-request-pane.js b/packages/insomnia-app/app/ui/components/panes/placeholder-request-pane.tsx
similarity index 85%
rename from packages/insomnia-app/app/ui/components/panes/placeholder-request-pane.js
rename to packages/insomnia-app/app/ui/components/panes/placeholder-request-pane.tsx
index ca125078df..1da9abfdea 100644
--- a/packages/insomnia-app/app/ui/components/panes/placeholder-request-pane.js
+++ b/packages/insomnia-app/app/ui/components/panes/placeholder-request-pane.tsx
@@ -1,23 +1,21 @@
-// @flow
-import React from 'react';
+import React, { FunctionComponent } from 'react';
 import Hotkey from '../hotkey';
 import { hotKeyRefs } from '../../../common/hotkeys';
 import * as hotkeys from '../../../common/hotkeys';
-import type { Request } from '../../../models/request';
 import { Pane, PaneBody, PaneHeader } from './pane';
 import type { HandleImportFileCallback } from '../wrapper';
 
-type Props = {
-  hotKeyRegistry: hotkeys.HotKeyRegistry,
-  handleImportFile: HandleImportFileCallback,
-  handleCreateRequest: () => Promise<Request>,
-};
+interface Props {
+  hotKeyRegistry: hotkeys.HotKeyRegistry;
+  handleImportFile: HandleImportFileCallback;
+  handleCreateRequest: () => void;
+}
 
-const PlaceholderRequestPane = ({
+const PlaceholderRequestPane: FunctionComponent<Props> = ({
   hotKeyRegistry,
   handleImportFile,
   handleCreateRequest,
-}: Props) => (
+}) => (
   <Pane type="request">
     <PaneHeader />
     <PaneBody placeholder>
@@ -61,6 +59,7 @@ const PlaceholderRequestPane = ({
         </table>
 
         <div className="text-center pane__body--placeholder__cta">
+          {/* @ts-expect-error -- TSCONVERSION event not used */}
           <button className="btn inline-block btn--clicky" onClick={handleImportFile}>
             Import from File
           </button>
diff --git a/packages/insomnia-app/app/ui/components/panes/placeholder-response-pane.js b/packages/insomnia-app/app/ui/components/panes/placeholder-response-pane.tsx
similarity index 90%
rename from packages/insomnia-app/app/ui/components/panes/placeholder-response-pane.js
rename to packages/insomnia-app/app/ui/components/panes/placeholder-response-pane.tsx
index 79ff37daba..628948e611 100644
--- a/packages/insomnia-app/app/ui/components/panes/placeholder-response-pane.js
+++ b/packages/insomnia-app/app/ui/components/panes/placeholder-response-pane.tsx
@@ -1,15 +1,14 @@
-// @flow
-import React from 'react';
+import React, { FunctionComponent } from 'react';
 import Hotkey from '../hotkey';
 import { hotKeyRefs } from '../../../common/hotkeys';
 import * as hotkeys from '../../../common/hotkeys';
 import { Pane, PaneBody, PaneHeader } from './pane';
 
-type Props = {
-  hotKeyRegistry: hotkeys.HotKeyRegistry,
-};
+interface Props {
+  hotKeyRegistry: hotkeys.HotKeyRegistry;
+}
 
-const PlaceholderResponsePane = ({ hotKeyRegistry, children }: Props) => (
+const PlaceholderResponsePane: FunctionComponent<Props> = ({ hotKeyRegistry, children }) => (
   <Pane type="response">
     <PaneHeader />
     <PaneBody placeholder>
diff --git a/packages/insomnia-app/app/ui/components/panes/request-pane.js b/packages/insomnia-app/app/ui/components/panes/request-pane.tsx
similarity index 87%
rename from packages/insomnia-app/app/ui/components/panes/request-pane.js
rename to packages/insomnia-app/app/ui/components/panes/request-pane.tsx
index 8c90af2610..3f37759897 100644
--- a/packages/insomnia-app/app/ui/components/panes/request-pane.js
+++ b/packages/insomnia-app/app/ui/components/panes/request-pane.tsx
@@ -1,4 +1,3 @@
-// @flow
 import type {
   Request,
   RequestAuthentication,
@@ -11,9 +10,8 @@ import type { OAuth2Token } from '../../../models/o-auth-2-token';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG, getAuthTypeName, getContentTypeName } from '../../../common/constants';
 import { deconstructQueryStringToParams, extractQueryStringFromUrl } from 'insomnia-url';
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { Tab, TabList, TabPanel, Tabs } from 'react-tabs';
-
 import * as models from '../../../models';
 import AuthDropdown from '../dropdowns/auth-dropdown';
 import ContentTypeDropdown from '../dropdowns/content-type-dropdown';
@@ -25,7 +23,7 @@ import MarkdownPreview from '../markdown-preview';
 import { showModal } from '../modals';
 import RequestSettingsModal from '../modals/request-settings-modal';
 import RenderedQueryString from '../rendered-query-string';
-import RequestUrlBar from '../request-url-bar.js';
+import RequestUrlBar from '../request-url-bar';
 import type { Settings } from '../../../models/settings';
 import RequestParametersEditor from '../editors/request-parameters-editor';
 import PlaceholderRequestPane from './placeholder-request-pane';
@@ -33,47 +31,44 @@ import { Pane, paneBodyClasses, PaneHeader } from './pane';
 import classnames from 'classnames';
 import { queryAllWorkspaceUrls } from '../../../models/helpers/query-all-workspace-urls';
 import type { HandleImportFileCallback } from '../wrapper';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
 
-type Props = {
+interface Props {
   // Functions
-  forceUpdateRequest: (r: Request, patch: Object) => Promise<Request>,
-  forceUpdateRequestHeaders: (r: Request, headers: Array<RequestHeader>) => Promise<Request>,
-  handleSend: () => void,
-  handleSendAndDownload: (filepath?: string) => Promise<void>,
-  handleCreateRequest: () => Promise<Request>,
-  handleGenerateCode: Function,
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  handleUpdateDownloadPath: Function,
-  updateRequestUrl: (r: Request, url: string) => Promise<Request>,
-  updateRequestMethod: (r: Request, method: string) => Promise<Request>,
-  updateRequestBody: (r: Request, body: RequestBody) => Promise<Request>,
-  updateRequestParameters: (r: Request, params: Array<RequestParameter>) => Promise<Request>,
-  updateRequestAuthentication: (r: Request, auth: RequestAuthentication) => Promise<Request>,
-  updateRequestHeaders: (r: Request, headers: Array<RequestHeader>) => Promise<Request>,
-  updateRequestMimeType: (r: Request, mimeType: string) => Promise<Request>,
-  updateSettingsShowPasswords: Function,
-  updateSettingsUseBulkHeaderEditor: Function,
-  updateSettingsUseBulkParametersEditor: Function,
-  handleImport: Function,
-  handleImportFile: HandleImportFileCallback,
-
-  // Other
-  workspace: Workspace,
-  settings: Settings,
-  isVariableUncovered: boolean,
-  environmentId: string,
-  forceRefreshCounter: number,
-  headerEditorKey: string,
-
-  // Optional
-  request: ?Request,
-  downloadPath: string | null,
-  oAuth2Token: ?OAuth2Token,
-};
+  forceUpdateRequest: (r: Request, patch: Partial<Request>) => Promise<Request>;
+  forceUpdateRequestHeaders: (r: Request, headers: Array<RequestHeader>) => Promise<Request>;
+  handleSend: () => void;
+  handleSendAndDownload: (filepath?: string) => Promise<void>;
+  handleCreateRequest: () => void;
+  handleGenerateCode: Function;
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  handleUpdateDownloadPath: Function;
+  updateRequestUrl: (r: Request, url: string) => Promise<Request>;
+  updateRequestMethod: (r: Request, method: string) => Promise<Request>;
+  updateRequestBody: (r: Request, body: RequestBody) => Promise<Request>;
+  updateRequestParameters: (r: Request, params: Array<RequestParameter>) => Promise<Request>;
+  updateRequestAuthentication: (r: Request, auth: RequestAuthentication) => Promise<Request>;
+  updateRequestHeaders: (r: Request, headers: Array<RequestHeader>) => Promise<Request>;
+  updateRequestMimeType: (mimeType: string | null) => Promise<Request | null>;
+  updateSettingsShowPasswords: (showPasswords: boolean) => Promise<Settings>;
+  updateSettingsUseBulkHeaderEditor: Function;
+  updateSettingsUseBulkParametersEditor: (useBulkParametersEditor: boolean) => Promise<Settings>;
+  handleImport: Function;
+  handleImportFile: HandleImportFileCallback;
+  workspace: Workspace;
+  settings: Settings;
+  isVariableUncovered: boolean;
+  environmentId: string;
+  forceRefreshCounter: number;
+  headerEditorKey: string;
+  request?: Request | null;
+  downloadPath: string | null;
+  oAuth2Token?: OAuth2Token | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class RequestPane extends React.PureComponent<Props> {
+class RequestPane extends PureComponent<Props> {
   _handleEditDescriptionAdd() {
     this._handleEditDescription(true);
   }
@@ -109,6 +104,7 @@ class RequestPane extends React.PureComponent<Props> {
     }
 
     let query;
+
     try {
       query = extractQueryStringFromUrl(request.url);
     } catch (e) {
@@ -122,7 +118,10 @@ class RequestPane extends React.PureComponent<Props> {
 
     // Only update if url changed
     if (url !== request.url) {
-      forceUpdateRequest(request, { url, parameters });
+      forceUpdateRequest(request, {
+        url,
+        parameters,
+      });
     }
   }
 
@@ -156,7 +155,6 @@ class RequestPane extends React.PureComponent<Props> {
       headerEditorKey,
       downloadPath,
     } = this.props;
-
     const hotKeyRegistry = settings.hotKeyRegistry;
 
     if (!request) {
@@ -170,6 +168,7 @@ class RequestPane extends React.PureComponent<Props> {
     }
 
     let numBodyParams = 0;
+
     if (request.body && request.body.params) {
       numBodyParams = request.body.params.filter(p => !p.disabled).length;
     }
@@ -177,9 +176,7 @@ class RequestPane extends React.PureComponent<Props> {
     const numParameters = request.parameters.filter(p => !p.disabled).length;
     const numHeaders = request.headers.filter(h => !h.disabled).length;
     const urlHasQueryParameters = request.url.indexOf('?') >= 0;
-
     const uniqueKey = `${forceRefreshCounter}::${request._id}`;
-
     return (
       <Pane type="request">
         <PaneHeader>
@@ -206,7 +203,7 @@ class RequestPane extends React.PureComponent<Props> {
         </PaneHeader>
         <Tabs className={classnames(paneBodyClasses, 'react-tabs')} forceRenderTabPanel>
           <TabList>
-            <Tab tabIndex="-1">
+            <Tab tabIndex="=1">
               <ContentTypeDropdown
                 onChange={updateRequestMimeType}
                 contentType={request.body.mimeType}
@@ -219,7 +216,7 @@ class RequestPane extends React.PureComponent<Props> {
                 <i className="fa fa-caret-down space-left" />
               </ContentTypeDropdown>
             </Tab>
-            <Tab tabIndex="-1">
+            <Tab tabIndex="=1">
               <AuthDropdown
                 onChange={updateRequestAuthentication}
                 request={request}
@@ -228,19 +225,19 @@ class RequestPane extends React.PureComponent<Props> {
                 <i className="fa fa-caret-down space-left" />
               </AuthDropdown>
             </Tab>
-            <Tab tabIndex="-1">
+            <Tab tabIndex="=1">
               <button>
                 Query
                 {numParameters > 0 && <span className="bubble space-left">{numParameters}</span>}
               </button>
             </Tab>
-            <Tab tabIndex="-1">
+            <Tab tabIndex="=1">
               <button>
                 Header
                 {numHeaders > 0 && <span className="bubble space-left">{numHeaders}</span>}
               </button>
             </Tab>
-            <Tab tabIndex="-1">
+            <Tab tabIndex="=1">
               <button>
                 Docs
                 {request.description && (
@@ -263,7 +260,6 @@ class RequestPane extends React.PureComponent<Props> {
               settings={settings}
               onChange={updateRequestBody}
               onChangeHeaders={forceUpdateRequestHeaders}
-              nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
               isVariableUncovered={isVariableUncovered}
             />
           </TabPanel>
@@ -357,6 +353,7 @@ class RequestPane extends React.PureComponent<Props> {
             {request.description ? (
               <div>
                 <div className="pull-right pad bg-default">
+                  {/* @ts-expect-error -- TSCONVERSION the click handler expects a boolean prop... */}
                   <button className="btn btn--clicky" onClick={this._handleEditDescription}>
                     Edit
                   </button>
@@ -376,7 +373,13 @@ class RequestPane extends React.PureComponent<Props> {
               <div className="overflow-hidden editor vertically-center text-center">
                 <p className="pad text-sm text-center">
                   <span className="super-faint">
-                    <i className="fa fa-file-text-o" style={{ fontSize: '8rem', opacity: 0.3 }} />
+                    <i
+                      className="fa fa-file-text-o"
+                      style={{
+                        fontSize: '8rem',
+                        opacity: 0.3,
+                      }}
+                    />
                   </span>
                   <br />
                   <br />
diff --git a/packages/insomnia-app/app/ui/components/panes/response-pane.js b/packages/insomnia-app/app/ui/components/panes/response-pane.tsx
similarity index 89%
rename from packages/insomnia-app/app/ui/components/panes/response-pane.js
rename to packages/insomnia-app/app/ui/components/panes/response-pane.tsx
index 57fe39e526..b245597b3b 100644
--- a/packages/insomnia-app/app/ui/components/panes/response-pane.js
+++ b/packages/insomnia-app/app/ui/components/panes/response-pane.tsx
@@ -1,8 +1,6 @@
-// @flow
 import type { Request } from '../../../models/request';
 import type { Response } from '../../../models/response';
-
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG, PREVIEW_MODE_SOURCE } from '../../../common/constants';
 import fs from 'fs';
@@ -21,7 +19,6 @@ import ResponseTimelineViewer from '../viewers/response-timeline-viewer';
 import ResponseHeadersViewer from '../viewers/response-headers-viewer';
 import ResponseCookiesViewer from '../viewers/response-cookies-viewer';
 import * as models from '../../../models';
-
 import { getSetCookieHeaders } from '../../../common/misc';
 import { cancelRequestById } from '../../../network/network';
 import ErrorBoundary from '../error-boundary';
@@ -36,43 +33,38 @@ import PlaceholderResponsePane from './placeholder-response-pane';
 import { Pane, paneBodyClasses, PaneHeader } from './pane';
 import classnames from 'classnames';
 
-type Props = {
-  // Functions
-  handleSetFilter: Function,
-  showCookiesModal: Function,
-  handleSetPreviewMode: Function,
-  handleSetActiveResponse: Function,
-  handleDeleteResponses: Function,
-  handleDeleteResponse: Function,
-  handleShowRequestSettings: Function,
-
-  // Required
-  previewMode: string,
-  filter: string,
-  filterHistory: Array<string>,
-  disableHtmlPreviewJs: boolean,
-  editorFontSize: number,
-  editorIndentSize: number,
-  editorKeyMap: string,
-  editorLineWrapping: boolean,
-  loadStartTime: number,
-  responses: Array<Response>,
-  hotKeyRegistry: HotKeyRegistry,
-  disableResponsePreviewLinks: boolean,
-
-  // Other
-  requestVersions: Array<RequestVersion>,
-  request: ?Request,
-  response: ?Response,
-  environment: ?Environment,
-  unitTestResult: ?UnitTestResult,
-};
+interface Props {
+  handleSetFilter: (filter: string) => void;
+  showCookiesModal: Function;
+  handleSetPreviewMode: Function;
+  handleSetActiveResponse: Function;
+  handleDeleteResponses: Function;
+  handleDeleteResponse: Function;
+  handleShowRequestSettings: Function;
+  previewMode: string;
+  filter: string;
+  filterHistory: Array<string>;
+  disableHtmlPreviewJs: boolean;
+  editorFontSize: number;
+  editorIndentSize: number;
+  editorKeyMap: string;
+  editorLineWrapping: boolean;
+  loadStartTime: number;
+  responses: Array<Response>;
+  hotKeyRegistry: HotKeyRegistry;
+  disableResponsePreviewLinks: boolean;
+  requestVersions: Array<RequestVersion>;
+  request?: Request | null;
+  response?: Response | null;
+  environment?: Environment | null;
+  unitTestResult?: UnitTestResult | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class ResponsePane extends React.PureComponent<Props> {
-  _responseViewer: any;
+class ResponsePane extends PureComponent<Props> {
+  _responseViewer: ResponseViewer | null = null;
 
-  _setResponseViewerRef(n: any) {
+  _setResponseViewerRef(n: ResponseViewer) {
     this._responseViewer = n;
   }
 
@@ -86,6 +78,7 @@ class ResponsePane extends React.PureComponent<Props> {
 
   async _handleDownloadResponseBody(prettify: boolean) {
     const { response, request } = this.props;
+
     if (!response || !request) {
       // Should never happen
       console.warn('No response to download');
@@ -94,28 +87,28 @@ class ResponsePane extends React.PureComponent<Props> {
 
     const { contentType } = response;
     const extension = mime.extension(contentType) || 'unknown';
-
     const options = {
       title: 'Save Response Body',
       buttonLabel: 'Save',
       defaultPath: `${request.name.replace(/ +/g, '_')}-${Date.now()}.${extension}`,
     };
-
     const { canceled, filePath: outputPath } = await remote.dialog.showSaveDialog(options);
+
     if (canceled) {
       return;
     }
 
     const readStream = models.response.getBodyStream(response);
-    const dataBuffers = [];
+    const dataBuffers: Array<any> = [];
+
     if (readStream) {
       readStream.on('data', data => {
         dataBuffers.push(data);
       });
       readStream.on('end', () => {
+        // @ts-expect-error -- TSCONVERSION
         const to = fs.createWriteStream(outputPath);
         const finalBuffer = Buffer.concat(dataBuffers);
-
         to.on('error', err => {
           showError({
             title: 'Save Failed',
@@ -129,6 +122,7 @@ class ResponsePane extends React.PureComponent<Props> {
         } else {
           to.write(finalBuffer);
         }
+
         to.end();
       });
     }
@@ -148,20 +142,21 @@ class ResponsePane extends React.PureComponent<Props> {
       .filter(v => v.name === 'HEADER_IN')
       .map(v => v.value)
       .join('');
-
     const options = {
       title: 'Save Full Response',
       buttonLabel: 'Save',
       defaultPath: `${request.name.replace(/ +/g, '_')}-${Date.now()}.txt`,
     };
-
     const { canceled, filePath } = await remote.dialog.showSaveDialog(options);
+
     if (canceled) {
       return;
     }
 
     const readStream = models.response.getBodyStream(response);
+
     if (readStream) {
+      // @ts-expect-error -- TSCONVERSION
       const to = fs.createWriteStream(filePath);
       to.write(headers);
       readStream.pipe(to);
@@ -177,6 +172,7 @@ class ResponsePane extends React.PureComponent<Props> {
       // Refresh must be called when the editor is visible,
       // so use nextTick to give time for it to be visible.
       process.nextTick(() => {
+        // @ts-expect-error -- TSCONVERSION
         this._responseViewer.refresh();
       });
     }
@@ -225,7 +221,6 @@ class ResponsePane extends React.PureComponent<Props> {
     }
 
     const cookieHeaders = getSetCookieHeaders(response.headers);
-
     return (
       <Pane type="response">
         {!response ? null : (
@@ -245,7 +240,6 @@ class ResponsePane extends React.PureComponent<Props> {
               handleDeleteResponses={handleDeleteResponses}
               handleDeleteResponse={handleDeleteResponse}
               className="tall pane__header__right"
-              right
             />
           </PaneHeader>
         )}
@@ -301,7 +295,7 @@ class ResponsePane extends React.PureComponent<Props> {
               getBody={this._handleGetResponseBody}
               previewMode={response.error ? PREVIEW_MODE_SOURCE : previewMode}
               responseId={response._id}
-              updateFilter={response.error ? null : handleSetFilter}
+              updateFilter={response.error ? undefined : handleSetFilter}
               url={response.url}
             />
           </TabPanel>
diff --git a/packages/insomnia-app/app/ui/components/proto-file/proto-directory-list-item.js b/packages/insomnia-app/app/ui/components/proto-file/proto-directory-list-item.tsx
similarity index 69%
rename from packages/insomnia-app/app/ui/components/proto-file/proto-directory-list-item.js
rename to packages/insomnia-app/app/ui/components/proto-file/proto-directory-list-item.tsx
index 73c262109f..8ae6234c6a 100644
--- a/packages/insomnia-app/app/ui/components/proto-file/proto-directory-list-item.js
+++ b/packages/insomnia-app/app/ui/components/proto-file/proto-directory-list-item.tsx
@@ -1,25 +1,23 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent, useCallback } from 'react';
 import { Button } from 'insomnia-components';
 import ProtoListItem from './proto-list-item';
 import type { ProtoDirectory } from '../../../models/proto-directory';
 import type { DeleteProtoDirectoryHandler } from './proto-file-list';
 
-type Props = {
-  dir: ProtoDirectory,
-  indentLevel: number,
-  handleDeleteDirectory: DeleteProtoDirectoryHandler,
-};
+interface Props {
+  dir: ProtoDirectory;
+  indentLevel: number;
+  handleDeleteDirectory: DeleteProtoDirectoryHandler;
+}
 
-const ProtoDirectoryListItem = ({ dir, indentLevel, handleDeleteDirectory }: Props) => {
-  const handleDeleteCallback = React.useCallback(
-    async (e: SyntheticEvent<HTMLButtonElement>) => {
+const ProtoDirectoryListItem: FunctionComponent<Props> = ({ dir, indentLevel, handleDeleteDirectory }) => {
+  const handleDeleteCallback = useCallback(
+    async (e: React.SyntheticEvent<HTMLButtonElement>) => {
       e.stopPropagation();
       await handleDeleteDirectory(dir);
     },
     [handleDeleteDirectory, dir],
   );
-
   return (
     <ProtoListItem indentLevel={indentLevel}>
       <span className="wide">
diff --git a/packages/insomnia-app/app/ui/components/proto-file/proto-file-list-item.js b/packages/insomnia-app/app/ui/components/proto-file/proto-file-list-item.tsx
similarity index 75%
rename from packages/insomnia-app/app/ui/components/proto-file/proto-file-list-item.js
rename to packages/insomnia-app/app/ui/components/proto-file/proto-file-list-item.tsx
index 1e5fb648ca..dbd9405472 100644
--- a/packages/insomnia-app/app/ui/components/proto-file/proto-file-list-item.js
+++ b/packages/insomnia-app/app/ui/components/proto-file/proto-file-list-item.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent, useCallback } from 'react';
 import type { ProtoFile } from '../../../models/proto-file';
 import type {
   DeleteProtoFileHandler,
@@ -11,19 +10,19 @@ import { Button, AsyncButton } from 'insomnia-components';
 import Editable from '../base/editable';
 import ProtoListItem from './proto-list-item';
 
-type Props = {
-  protoFile: ProtoFile,
-  isSelected?: boolean,
-  handleSelect: SelectProtoFileHandler,
-  indentLevel: number,
-  handleDelete: DeleteProtoFileHandler,
-  handleRename: RenameProtoFileHandler,
-  handleUpdate: UpdateProtoFileHandler,
-};
+interface Props {
+  protoFile: ProtoFile;
+  isSelected?: boolean;
+  handleSelect: SelectProtoFileHandler;
+  indentLevel: number;
+  handleDelete: DeleteProtoFileHandler;
+  handleRename: RenameProtoFileHandler;
+  handleUpdate: UpdateProtoFileHandler;
+}
 
 const spinner = <i className="fa fa-spin fa-refresh" />;
 
-const ProtoFileListItem = ({
+const ProtoFileListItem: FunctionComponent<Props> = ({
   protoFile,
   isSelected,
   handleSelect,
@@ -31,35 +30,31 @@ const ProtoFileListItem = ({
   handleRename,
   handleUpdate,
   indentLevel,
-}: Props) => {
+}) => {
   const { name, _id } = protoFile;
-
   // Don't re-instantiate the callbacks if the dependencies have not changed
-  const handleSelectCallback = React.useCallback(() => handleSelect(_id), [handleSelect, _id]);
-  const handleDeleteCallback = React.useCallback(
-    async (e: SyntheticEvent<HTMLButtonElement>) => {
+  const handleSelectCallback = useCallback(() => handleSelect(_id), [handleSelect, _id]);
+  const handleDeleteCallback = useCallback(
+    async (e: React.SyntheticEvent<HTMLButtonElement>) => {
       e.stopPropagation();
       await handleDelete(protoFile);
     },
     [handleDelete, protoFile],
   );
-  const handleRenameCallback = React.useCallback(
+  const handleRenameCallback = useCallback(
     async (newName: string) => {
       await handleRename(protoFile, newName);
     },
     [handleRename, protoFile],
   );
-
-  const handleUpdateCallback = React.useCallback(
-    async (e: SyntheticEvent<HTMLButtonElement>) => {
+  const handleUpdateCallback = useCallback(
+    async (e: React.SyntheticEvent<HTMLButtonElement>) => {
       e.stopPropagation();
       await handleUpdate(protoFile);
     },
     [handleUpdate, protoFile],
   );
-
   const isReadOnly = indentLevel > 0;
-
   return (
     <ProtoListItem
       selectable
diff --git a/packages/insomnia-app/app/ui/components/proto-file/proto-file-list.js b/packages/insomnia-app/app/ui/components/proto-file/proto-file-list.tsx
similarity index 79%
rename from packages/insomnia-app/app/ui/components/proto-file/proto-file-list.js
rename to packages/insomnia-app/app/ui/components/proto-file/proto-file-list.tsx
index f4b506683e..e8417dc5ca 100644
--- a/packages/insomnia-app/app/ui/components/proto-file/proto-file-list.js
+++ b/packages/insomnia-app/app/ui/components/proto-file/proto-file-list.tsx
@@ -1,10 +1,10 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent } from 'react';
 import type { ProtoFile } from '../../../models/proto-file';
 import { ListGroup, ListGroupItem } from 'insomnia-components';
 import ProtoFileListItem from './proto-file-list-item';
 import type { ExpandedProtoDirectory } from '../../redux/proto-selectors';
 import ProtoDirectoryListItem from './proto-directory-list-item';
+import { ProtoDirectory } from '../../../models/proto-directory';
 
 export type SelectProtoFileHandler = (id: string) => void;
 export type DeleteProtoFileHandler = (protofile: ProtoFile) => Promise<void>;
@@ -12,15 +12,15 @@ export type DeleteProtoDirectoryHandler = (protoDirectory: ProtoDirectory) => Pr
 export type UpdateProtoFileHandler = (protofile: ProtoFile) => Promise<void>;
 export type RenameProtoFileHandler = (protoFile: ProtoFile, name: string) => Promise<void>;
 
-type Props = {
-  protoDirectories: Array<ExpandedProtoDirectory>,
-  selectedId?: string,
-  handleSelect: SelectProtoFileHandler,
-  handleDelete: DeleteProtoFileHandler,
-  handleRename: RenameProtoFileHandler,
-  handleUpdate: UpdateProtoFileHandler,
-  handleDeleteDirectory: DeleteProtoDirectoryHandler,
-};
+interface Props {
+  protoDirectories: Array<ExpandedProtoDirectory>;
+  selectedId?: string;
+  handleSelect: SelectProtoFileHandler;
+  handleDelete: DeleteProtoFileHandler;
+  handleRename: RenameProtoFileHandler;
+  handleUpdate: UpdateProtoFileHandler;
+  handleDeleteDirectory: DeleteProtoDirectoryHandler;
+}
 
 const recursiveRender = (
   { dir, files, subDirs }: ExpandedProtoDirectory,
@@ -35,7 +35,6 @@ const recursiveRender = (
     handleUpdate,
     selectedId,
   } = props;
-
   const dirNode = dir && (
     <ProtoDirectoryListItem
       key={dir.name}
@@ -57,11 +56,10 @@ const recursiveRender = (
     />
   ));
   const subDirNodes = subDirs.map(sd => recursiveRender(sd, props, indent));
-
   return [dirNode, ...fileNodes, ...subDirNodes];
 };
 
-const ProtoFileList = (props: Props) => (
+const ProtoFileList: FunctionComponent<Props> = props => (
   <ListGroup bordered>
     {!props.protoDirectories.length && (
       <ListGroupItem>No proto files exist for this workspace</ListGroupItem>
diff --git a/packages/insomnia-app/app/ui/components/proto-file/proto-list-item.js b/packages/insomnia-app/app/ui/components/proto-file/proto-list-item.ts
similarity index 68%
rename from packages/insomnia-app/app/ui/components/proto-file/proto-list-item.js
rename to packages/insomnia-app/app/ui/components/proto-file/proto-list-item.ts
index 35ffe0308c..0a2c368224 100644
--- a/packages/insomnia-app/app/ui/components/proto-file/proto-list-item.js
+++ b/packages/insomnia-app/app/ui/components/proto-file/proto-list-item.ts
@@ -1,13 +1,12 @@
-// @flow
 import styled from 'styled-components';
 import { ListGroupItem } from 'insomnia-components';
-
-const ProtoListItem = styled(ListGroupItem).attrs(() => ({ className: 'row-spaced' }))`
+const ProtoListItem = styled(ListGroupItem).attrs(() => ({
+  className: 'row-spaced',
+}))`
   button i.fa {
     font-size: var(--font-size-lg);
   }
 
   height: var(--line-height-sm);
 `;
-
 export default ProtoListItem;
diff --git a/packages/insomnia-app/app/ui/components/rendered-query-string.js b/packages/insomnia-app/app/ui/components/rendered-query-string.tsx
similarity index 64%
rename from packages/insomnia-app/app/ui/components/rendered-query-string.js
rename to packages/insomnia-app/app/ui/components/rendered-query-string.tsx
index d7fa84c950..9930781800 100644
--- a/packages/insomnia-app/app/ui/components/rendered-query-string.js
+++ b/packages/insomnia-app/app/ui/components/rendered-query-string.tsx
@@ -1,32 +1,41 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../common/constants';
 import { buildQueryStringFromParams, joinUrlAndQueryString, smartEncodeUrl } from 'insomnia-url';
 import CopyButton from './base/copy-button';
+import { HandleRender } from '../../common/render';
+
+interface Props {
+  request: any,
+  handleRender: HandleRender,
+}
+
+interface State {
+  string: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class RenderedQueryString extends PureComponent {
-  constructor(props) {
-    super(props);
-    this._interval = null;
-    this.state = {
-      string: '',
-    };
+class RenderedQueryString extends PureComponent<Props, State> {
+  state: State = {
+    string: '',
+  };
+
+  _interval: NodeJS.Timeout | null = null;
+
+  async _debouncedUpdate(props: Props) {
+    if (this._interval !== null) {
+      clearTimeout(this._interval);
+      this._interval = setTimeout(() => {
+        this._update(props);
+      }, 300);
+    }
   }
 
-  async _debouncedUpdate(props) {
-    clearTimeout(this._interval);
-    this._interval = setTimeout(() => {
-      this._update(props);
-    }, 300);
-  }
-
-  async _update(props) {
+  async _update(props: Props) {
     const { request } = props;
     const enabledParameters = request.parameters.filter(p => !p.disabled);
-
     let result;
+
     try {
       result = await props.handleRender({
         url: request.url,
@@ -51,11 +60,13 @@ class RenderedQueryString extends PureComponent {
   }
 
   componentWillUnmount() {
-    clearTimeout(this._interval);
+    if (this._interval !== null) {
+      clearTimeout(this._interval);
+    }
   }
 
   // eslint-disable-next-line camelcase
-  UNSAFE_componentWillReceiveProps(nextProps) {
+  UNSAFE_componentWillReceiveProps(nextProps: Props) {
     if (nextProps.request._id !== this.props.request._id) {
       this._update(nextProps);
     } else {
@@ -64,12 +75,13 @@ class RenderedQueryString extends PureComponent {
   }
 
   render() {
-    let inner;
-    if (this.state.string) {
-      inner = <span className="selectable force-wrap">{this.state.string}</span>;
-    } else {
-      inner = <span className="super-duper-faint italic">...</span>;
-    }
+    const { string } = this.state;
+
+    const inner = string ? (
+      <span className="selectable force-wrap">{this.state.string}</span>
+    ) : (
+      <span className="super-duper-faint italic">...</span>
+    );
 
     return (
       <div className="wide scrollable">
@@ -87,9 +99,4 @@ class RenderedQueryString extends PureComponent {
   }
 }
 
-RenderedQueryString.propTypes = {
-  request: PropTypes.object.isRequired,
-  handleRender: PropTypes.func.isRequired,
-};
-
 export default RenderedQueryString;
diff --git a/packages/insomnia-app/app/ui/components/rendered-text.js b/packages/insomnia-app/app/ui/components/rendered-text.js
deleted file mode 100644
index bc894f48b3..0000000000
--- a/packages/insomnia-app/app/ui/components/rendered-text.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// @flow
-import * as React from 'react';
-
-type Props = {
-  children: string,
-  render: Function,
-};
-
-type State = {
-  renderedText: string,
-  error: string,
-};
-
-class RenderedText extends React.PureComponent<Props, State> {
-  constructor(props: any) {
-    super(props);
-    this.state = {
-      renderedText: '',
-      error: '',
-    };
-  }
-
-  async _render() {
-    const { render, children } = this.props;
-
-    if (!children) {
-      return;
-    }
-
-    try {
-      const renderedText = await render(children);
-      this.setState({ renderedText, error: '' });
-    } catch (err) {
-      this.setState({ error: err.message });
-    }
-  }
-
-  componentDidMount() {
-    this._render();
-  }
-
-  componentDidUpdate() {
-    this._render();
-  }
-
-  render() {
-    if (this.state.error) {
-      return (
-        <span className="font-error" style={{ fontSize: '0.9em', fontStyle: 'italic' }}>
-          {this.state.error || 'Unknown Error'}
-        </span>
-      );
-    } else {
-      return this.state.renderedText || '';
-    }
-  }
-}
-
-export default RenderedText;
diff --git a/packages/insomnia-app/app/ui/components/rendered-text.tsx b/packages/insomnia-app/app/ui/components/rendered-text.tsx
new file mode 100644
index 0000000000..49c062d491
--- /dev/null
+++ b/packages/insomnia-app/app/ui/components/rendered-text.tsx
@@ -0,0 +1,64 @@
+import React, { PureComponent } from 'react';
+
+interface Props {
+  children: string;
+  render: (...args: Array<any>) => any;
+}
+interface State {
+  renderedText: string;
+  error: string;
+}
+
+class RenderedText extends PureComponent<Props, State> {
+  state: State = {
+    renderedText: '',
+    error: '',
+  }
+
+  async _render() {
+    const { render, children } = this.props;
+
+    if (!children) {
+      return;
+    }
+
+    try {
+      const renderedText = await render(children);
+      this.setState({
+        renderedText,
+        error: '',
+      });
+    } catch (err) {
+      this.setState({
+        error: err.message,
+      });
+    }
+  }
+
+  componentDidMount() {
+    this._render();
+  }
+
+  componentDidUpdate() {
+    this._render();
+  }
+
+  render() {
+    if (this.state.error) {
+      return (
+        <span
+          className="font-error"
+          style={{
+            fontSize: '0.9em',
+            fontStyle: 'italic',
+          }}>
+          {this.state.error || 'Unknown Error'}
+        </span>
+      );
+    } else {
+      return this.state.renderedText || '';
+    }
+  }
+}
+
+export default RenderedText;
diff --git a/packages/insomnia-app/app/ui/components/request-url-bar.js b/packages/insomnia-app/app/ui/components/request-url-bar.tsx
similarity index 79%
rename from packages/insomnia-app/app/ui/components/request-url-bar.js
rename to packages/insomnia-app/app/ui/components/request-url-bar.tsx
index 8cea6a9330..086d2e4b6b 100644
--- a/packages/insomnia-app/app/ui/components/request-url-bar.js
+++ b/packages/insomnia-app/app/ui/components/request-url-bar.tsx
@@ -1,15 +1,14 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
-import { remote } from 'electron';
+import { OpenDialogOptions, remote } from 'electron';
 import { DEBOUNCE_MILLIS, AUTOBIND_CFG, isMac } from '../../common/constants';
 import {
-  Dropdown,
   DropdownButton,
   DropdownDivider,
   DropdownHint,
   DropdownItem,
 } from './base/dropdown';
+import Dropdown from './base/dropdown/dropdown';
 import { showPrompt } from './modals/index';
 import MethodDropdown from './dropdowns/method-dropdown';
 import PromptButton from './base/prompt-button';
@@ -19,69 +18,65 @@ import type { Request } from '../../models/request';
 import type { HotKeyRegistry } from '../../common/hotkeys';
 import { hotKeyRefs } from '../../common/hotkeys';
 import { executeHotKey } from '../../common/hotkeys-listener';
+import { HandleGetRenderContext, HandleRender } from '../../common/render';
 
-type Props = {
-  handleAutocompleteUrls: Function,
-  handleGenerateCode: Function,
-  handleGetRenderContext: Function,
-  handleImport: Function,
-  handleRender: string => Promise<string>,
-  handleSend: () => void,
-  handleSendAndDownload: (filepath?: string) => Promise<void>,
-  handleUpdateDownloadPath: Function,
-  isVariableUncovered: boolean,
-  nunjucksPowerUserMode: boolean,
-  onMethodChange: (r: Request, method: string) => Promise<Request>,
-  onUrlChange: (r: Request, url: string) => Promise<Request>,
-  request: Request,
-  uniquenessKey: string,
-  hotKeyRegistry: HotKeyRegistry,
-  downloadPath: string | null,
-};
+interface Props {
+  handleAutocompleteUrls: Function;
+  handleGenerateCode: Function;
+  handleGetRenderContext: HandleGetRenderContext;
+  handleImport: Function;
+  handleRender: HandleRender;
+  handleSend: () => void;
+  handleSendAndDownload: (filepath?: string) => Promise<void>;
+  handleUpdateDownloadPath: Function;
+  isVariableUncovered: boolean;
+  nunjucksPowerUserMode: boolean;
+  onMethodChange: (r: Request, method: string) => Promise<Request>;
+  onUrlChange: (r: Request, url: string) => Promise<Request>;
+  request: Request;
+  uniquenessKey: string;
+  hotKeyRegistry: HotKeyRegistry;
+  downloadPath: string | null;
+}
 
-type State = {
-  currentInterval: number | null,
-  currentTimeout: number | null,
-};
+interface State {
+  currentInterval: number | null;
+  currentTimeout: number | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class RequestUrlBar extends React.PureComponent<Props, State> {
-  _urlChangeDebounceTimeout: TimeoutID;
-  _sendTimeout: TimeoutID;
-  _sendInterval: IntervalID;
-  _lastPastedText: string | null;
-  _dropdown: ?Dropdown;
-  _methodDropdown: ?Dropdown;
-  _input: ?OneLineEditor;
-
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      currentInterval: null,
-      currentTimeout: null,
-    };
-
-    this._lastPastedText = null;
+class RequestUrlBar extends PureComponent<Props, State> {
+  _urlChangeDebounceTimeout: NodeJS.Timeout | null = null;
+  _sendTimeout: NodeJS.Timeout | null = null;
+  _sendInterval: NodeJS.Timeout | null = null;
+  _dropdown: Dropdown | null = null;
+  _methodDropdown: MethodDropdown | null = null;
+  _input: OneLineEditor | null = null;
+  state: State = {
+    currentInterval: null,
+    currentTimeout: null,
   }
 
-  _setDropdownRef(n: Dropdown | null) {
+  _lastPastedText: string | null = null;
+
+  _setDropdownRef(n: Dropdown) {
     this._dropdown = n;
   }
 
-  _setMethodDropdownRef(n: Dropdown | null) {
+  _setMethodDropdownRef(n: MethodDropdown) {
     this._methodDropdown = n;
   }
 
-  _setInputRef(n: HTMLInputElement | null) {
+  _setInputRef(n: OneLineEditor) {
     this._input = n;
   }
 
-  _handleMetaClickSend(e: MouseEvent) {
+  _handleMetaClickSend(e: React.MouseEvent<HTMLButtonElement>) {
     e.preventDefault();
     this._dropdown && this._dropdown.show();
   }
 
-  _handleFormSubmit(e: SyntheticEvent<HTMLFormElement>) {
+  _handleFormSubmit(e: React.SyntheticEvent<HTMLFormElement>) {
     e.preventDefault();
     e.stopPropagation();
 
@@ -93,7 +88,9 @@ class RequestUrlBar extends React.PureComponent<Props, State> {
   }
 
   _handleUrlChange(url: string) {
-    clearTimeout(this._urlChangeDebounceTimeout);
+    if (this._urlChangeDebounceTimeout !== null) {
+      clearTimeout(this._urlChangeDebounceTimeout);
+    }
     this._urlChangeDebounceTimeout = setTimeout(async () => {
       const pastedText = this._lastPastedText;
 
@@ -105,7 +102,6 @@ class RequestUrlBar extends React.PureComponent<Props, State> {
 
       // Reset pasted text cache
       this._lastPastedText = null;
-
       // Attempt to import the pasted text
       const importedRequest = await this.props.handleImport(pastedText);
 
@@ -116,7 +112,7 @@ class RequestUrlBar extends React.PureComponent<Props, State> {
     }, DEBOUNCE_MILLIS);
   }
 
-  _handleUrlPaste(e: SyntheticClipboardEvent<HTMLInputElement>) {
+  _handleUrlPaste(e: React.ClipboardEvent<HTMLInputElement>) {
     // NOTE: We're not actually doing the import here to avoid races with onChange
     this._lastPastedText = e.clipboardData.getData('text/plain');
   }
@@ -127,14 +123,13 @@ class RequestUrlBar extends React.PureComponent<Props, State> {
 
   async _handleSetDownloadLocation() {
     const { request } = this.props;
-
-    const options = {
+    const options: OpenDialogOptions = {
       title: 'Select Download Location',
       buttonLabel: 'Select',
       properties: ['openDirectory'],
     };
-
     const { canceled, filePaths } = await remote.dialog.showOpenDialog(options);
+
     if (canceled) {
       return;
     }
@@ -144,7 +139,6 @@ class RequestUrlBar extends React.PureComponent<Props, State> {
 
   _handleClearDownloadLocation() {
     const { request } = this.props;
-
     this.props.handleUpdateDownloadPath(request._id, null);
   }
 
@@ -157,11 +151,9 @@ class RequestUrlBar extends React.PureComponent<Props, State> {
       this._input && this._input.focus();
       this._input && this._input.selectAll();
     });
-
     executeHotKey(e, hotKeyRefs.REQUEST_TOGGLE_HTTP_METHOD_MENU, () => {
       this._methodDropdown && this._methodDropdown.toggle();
     });
-
     executeHotKey(e, hotKeyRefs.REQUEST_SHOW_OPTIONS, () => {
       this._dropdown && this._dropdown.toggle(true);
     });
@@ -170,10 +162,10 @@ class RequestUrlBar extends React.PureComponent<Props, State> {
   _handleSend() {
     // Don't stop interval because duh, it needs to keep going!
     // XXX this._handleStopInterval(); XXX
-
     this._handleStopTimeout();
 
     const { downloadPath } = this.props;
+
     if (downloadPath) {
       this.props.handleSendAndDownload(downloadPath);
     } else {
@@ -194,8 +186,11 @@ class RequestUrlBar extends React.PureComponent<Props, State> {
       submitName: 'Start',
       onComplete: seconds => {
         this._handleStopTimeout();
+
         this._sendTimeout = setTimeout(this._handleSend, seconds * 1000);
-        this.setState({ currentTimeout: seconds });
+        this.setState({
+          currentTimeout: seconds,
+        });
       },
     });
   }
@@ -209,32 +204,46 @@ class RequestUrlBar extends React.PureComponent<Props, State> {
       submitName: 'Start',
       onComplete: seconds => {
         this._handleStopInterval();
+
         this._sendInterval = setInterval(this._handleSend, seconds * 1000);
-        this.setState({ currentInterval: seconds });
+        this.setState({
+          currentInterval: seconds,
+        });
       },
     });
   }
 
   _handleStopInterval() {
-    clearInterval(this._sendInterval);
+    if (this._sendInterval) {
+      clearInterval(this._sendInterval);
+    }
+
     if (this.state.currentInterval) {
-      this.setState({ currentInterval: null });
+      this.setState({
+        currentInterval: null,
+      });
     }
   }
 
   _handleStopTimeout() {
-    clearTimeout(this._sendTimeout);
+    if (this._sendTimeout !== null) {
+      clearTimeout(this._sendTimeout);
+    }
+
     if (this.state.currentTimeout) {
-      this.setState({ currentTimeout: null });
+      this.setState({
+        currentTimeout: null,
+      });
     }
   }
 
   _handleResetTimeouts() {
     this._handleStopTimeout();
+
     this._handleStopInterval();
   }
 
-  _handleClickSend(e: MouseEvent) {
+  _handleClickSend(e: React.MouseEvent<HTMLButtonElement>) {
     const metaPressed = isMac() ? e.metaKey : e.ctrlKey;
 
     // If we're pressing a meta key, let the dropdown open
@@ -244,6 +253,7 @@ class RequestUrlBar extends React.PureComponent<Props, State> {
 
     // If we're not pressing a meta key, cancel dropdown and send the request
     e.stopPropagation(); // Don't trigger the dropdown
+
     this._handleSend();
   }
 
@@ -257,8 +267,8 @@ class RequestUrlBar extends React.PureComponent<Props, State> {
   renderSendButton() {
     const { hotKeyRegistry, downloadPath } = this.props;
     const { currentInterval, currentTimeout } = this.state;
+    let cancelButton: ReactNode = null;
 
-    let cancelButton = null;
     if (currentInterval) {
       cancelButton = (
         <button
@@ -282,6 +292,7 @@ class RequestUrlBar extends React.PureComponent<Props, State> {
     }
 
     let sendButton;
+
     if (!cancelButton) {
       sendButton = (
         <Dropdown key="dropdown" className="tall" right ref={this._setDropdownRef}>
@@ -289,6 +300,7 @@ class RequestUrlBar extends React.PureComponent<Props, State> {
             className="urlbar__send-btn"
             onContextMenu={this._handleMetaClickSend}
             onClick={this._handleClickSend}
+            // @ts-expect-error -- TSCONVERSION type doesn't exist
             type="button">
             {downloadPath ? 'Download' : 'Send'}
           </DropdownButton>
@@ -340,9 +352,7 @@ class RequestUrlBar extends React.PureComponent<Props, State> {
       handleAutocompleteUrls,
       uniquenessKey,
     } = this.props;
-
     const { url, method } = request;
-
     return (
       <KeydownBinder onKeydown={this._handleKeyDown}>
         <div className="urlbar">
diff --git a/packages/insomnia-app/app/ui/components/response-timer.js b/packages/insomnia-app/app/ui/components/response-timer.tsx
similarity index 72%
rename from packages/insomnia-app/app/ui/components/response-timer.js
rename to packages/insomnia-app/app/ui/components/response-timer.tsx
index 97f96eb6b1..408887ea2e 100644
--- a/packages/insomnia-app/app/ui/components/response-timer.js
+++ b/packages/insomnia-app/app/ui/components/response-timer.tsx
@@ -1,19 +1,28 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { DOMAttributes, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { REQUEST_TIME_TO_SHOW_COUNTER, AUTOBIND_CFG } from '../../common/constants';
 
+interface Props {
+  handleCancel: DOMAttributes<HTMLButtonElement>['onClick'],
+  loadStartTime: number,
+}
+
+interface State {
+  elapsedTime: number;
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class ResponseTimer extends PureComponent {
-  constructor(props) {
-    super(props);
-    this._interval = null;
-    this.state = {
-      elapsedTime: 0,
-    };
-  }
+class ResponseTimer extends PureComponent<Props, State> {
+  _interval: NodeJS.Timeout | null = null;
+
+  state: State = {
+    elapsedTime: 0,
+  };
 
   componentWillUnmount() {
+    if (this._interval === null) {
+      return;
+    }
     clearInterval(this._interval);
   }
 
@@ -28,11 +37,17 @@ class ResponseTimer extends PureComponent {
     const { loadStartTime } = this.props;
 
     if (loadStartTime <= 0) {
-      clearInterval(this._interval);
+      if (this._interval !== null) {
+        clearInterval(this._interval);
+      }
       return;
     }
 
-    clearInterval(this._interval); // Just to be sure
+    if (this._interval !== null) {
+      // Just to be sure
+      clearInterval(this._interval);
+    }
+
     this._interval = setInterval(this._handleUpdateElapsedTime, 100);
     this._handleUpdateElapsedTime();
   }
@@ -40,7 +55,6 @@ class ResponseTimer extends PureComponent {
   render() {
     const { handleCancel, loadStartTime } = this.props;
     const { elapsedTime } = this.state;
-
     const show = loadStartTime > 0;
 
     if (!show) {
@@ -67,9 +81,4 @@ class ResponseTimer extends PureComponent {
   }
 }
 
-ResponseTimer.propTypes = {
-  handleCancel: PropTypes.func.isRequired,
-  loadStartTime: PropTypes.number.isRequired,
-};
-
 export default ResponseTimer;
diff --git a/packages/insomnia-app/app/ui/components/settings/account.js b/packages/insomnia-app/app/ui/components/settings/account.tsx
similarity index 80%
rename from packages/insomnia-app/app/ui/components/settings/account.js
rename to packages/insomnia-app/app/ui/components/settings/account.tsx
index 39536684a0..b84ee087a9 100644
--- a/packages/insomnia-app/app/ui/components/settings/account.js
+++ b/packages/insomnia-app/app/ui/components/settings/account.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Link from '../base/link';
@@ -9,21 +8,19 @@ import PromptButton from '../base/prompt-button';
 import * as session from '../../../account/session';
 import HelpTooltip from '../help-tooltip';
 
-type Props = {};
-
-type State = {
-  code: string,
-  password: string,
-  password2: string,
-  showChangePassword: boolean,
-  codeSent: boolean,
-  error: string,
-  finishedResetting: boolean,
-};
+interface State {
+  code: string;
+  password: string;
+  password2: string;
+  showChangePassword: boolean;
+  codeSent: boolean;
+  error: string;
+  finishedResetting: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Account extends React.PureComponent<Props, State> {
-  state = {
+class Account extends PureComponent<{}, State> {
+  state: State = {
     code: '',
     password: '',
     password2: '',
@@ -33,32 +30,39 @@ class Account extends React.PureComponent<Props, State> {
     finishedResetting: false,
   };
 
-  async _handleShowChangePasswordForm(e: SyntheticEvent<HTMLInputElement>) {
+  async _handleShowChangePasswordForm() {
     this.setState(state => ({
       showChangePassword: !state.showChangePassword,
       finishedResetting: false,
     }));
   }
 
-  _handleChangeCode(e: SyntheticEvent<HTMLInputElement>) {
-    this.setState({ code: e.currentTarget.value });
+  _handleChangeCode(e: React.SyntheticEvent<HTMLInputElement>) {
+    this.setState({
+      code: e.currentTarget.value,
+    });
   }
 
-  _handleChangePassword(e: SyntheticEvent<HTMLInputElement>) {
-    this.setState({ password: e.currentTarget.value });
+  _handleChangePassword(e: React.SyntheticEvent<HTMLInputElement>) {
+    this.setState({
+      password: e.currentTarget.value,
+    });
   }
 
-  _handleChangePassword2(e: SyntheticEvent<HTMLInputElement>) {
-    this.setState({ password2: e.currentTarget.value });
+  _handleChangePassword2(e: React.SyntheticEvent<HTMLInputElement>) {
+    this.setState({
+      password2: e.currentTarget.value,
+    });
   }
 
-  async _handleSubmitPasswordChange(e: SyntheticEvent<HTMLFormElement>) {
+  async _handleSubmitPasswordChange(e: React.SyntheticEvent<HTMLFormElement>) {
     e.preventDefault();
-    this.setState({ error: '' });
-
+    this.setState({
+      error: '',
+    });
     const { password, password2, code } = this.state;
-
     let error = '';
+
     if (password !== password2) {
       error = 'Passwords did not match';
     } else if (!code) {
@@ -66,18 +70,26 @@ class Account extends React.PureComponent<Props, State> {
     }
 
     if (error) {
-      this.setState({ error });
+      this.setState({
+        error,
+      });
       return;
     }
 
     try {
       await session.changePasswordWithToken(password, code);
     } catch (err) {
-      this.setState({ error: err.message });
+      this.setState({
+        error: err.message,
+      });
       return;
     }
 
-    this.setState({ error: '', finishedResetting: true, showChangePassword: false });
+    this.setState({
+      error: '',
+      finishedResetting: true,
+      showChangePassword: false,
+    });
   }
 
   async _handleLogout() {
@@ -85,7 +97,7 @@ class Account extends React.PureComponent<Props, State> {
     this.forceUpdate();
   }
 
-  static _handleLogin(e: SyntheticEvent<HTMLButtonElement>) {
+  static _handleLogin(e: React.SyntheticEvent<HTMLAnchorElement>) {
     e.preventDefault();
     hideAllModals();
     showModal(LoginModal);
@@ -95,21 +107,25 @@ class Account extends React.PureComponent<Props, State> {
     try {
       await session.sendPasswordChangeCode();
     } catch (err) {
-      this.setState({ error: err.message });
+      this.setState({
+        error: err.message,
+      });
       return;
     }
 
-    this.setState({ codeSent: true });
+    this.setState({
+      codeSent: true,
+    });
   }
 
-  async _handleSendCode(e: SyntheticEvent<HTMLAnchorElement>) {
+  async _handleSendCode(e: React.SyntheticEvent<HTMLAnchorElement>) {
     e.preventDefault();
     await this._sendCode();
   }
 
   static renderUpgrade() {
     return (
-      <React.Fragment>
+      <Fragment>
         <div className="notice pad surprise">
           <h1 className="no-margin-top">Try Insomnia Plus!</h1>
           <p>
@@ -139,7 +155,7 @@ class Account extends React.PureComponent<Props, State> {
             Log In
           </a>
         </p>
-      </React.Fragment>
+      </Fragment>
     );
   }
 
@@ -153,9 +169,8 @@ class Account extends React.PureComponent<Props, State> {
       error,
       finishedResetting,
     } = this.state;
-
     return (
-      <React.Fragment>
+      <Fragment>
         <div>
           <h2 className="no-margin-top">Welcome {session.getFirstName()}!</h2>
           <p>
@@ -234,7 +249,7 @@ class Account extends React.PureComponent<Props, State> {
             </div>
           </form>
         )}
-      </React.Fragment>
+      </Fragment>
     );
   }
 
diff --git a/packages/insomnia-app/app/ui/components/settings/general.js b/packages/insomnia-app/app/ui/components/settings/general.tsx
similarity index 85%
rename from packages/insomnia-app/app/ui/components/settings/general.js
rename to packages/insomnia-app/app/ui/components/settings/general.tsx
index 1f27cc1d3e..9190a31cb7 100644
--- a/packages/insomnia-app/app/ui/components/settings/general.js
+++ b/packages/insomnia-app/app/ui/components/settings/general.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import * as fontScanner from 'font-scanner';
 import * as electron from 'electron';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
@@ -23,7 +22,6 @@ import {
 } from '../../../common/constants';
 import HelpTooltip from '../help-tooltip';
 import type { GlobalActivity, HttpVersion } from '../../../common/constants';
-
 import type { Settings } from '../../../models/settings';
 import { setFont } from '../../../plugins/misc';
 import Tooltip from '../tooltip';
@@ -37,57 +35,59 @@ import { snapNumberToLimits } from '../../../common/misc';
 
 // Font family regex to match certain monospace fonts that don't get
 // recognized as monospace
+
 const FORCED_MONO_FONT_REGEX = /^fixedsys /i;
 
-type Props = {
-  settings: Settings,
-  hideModal: () => void,
-  updateSetting: Function,
-  handleToggleMenuBar: Function,
-  handleRootCssChange: Function,
-  handleSetActiveActivity: (activity?: GlobalActivity) => void,
-};
+interface Props {
+  settings: Settings;
+  hideModal: () => void;
+  updateSetting: (key: string, value: any) => Promise<Settings>;
+  handleToggleMenuBar: Function;
+  handleSetActiveActivity: (activity?: GlobalActivity) => void;
+}
 
-type State = {
-  fonts: Array<{ family: string, monospace: boolean }> | null,
-  fontsMono: Array<{ family: string, monospace: boolean }> | null,
-};
+interface State {
+  fonts: Array<{
+    family: string;
+    monospace: boolean;
+  }> | null;
+  fontsMono: Array<{
+    family: string;
+    monospace: boolean;
+  }> | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class General extends React.PureComponent<Props, State> {
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      fonts: null,
-      fontsMono: null,
-    };
+class General extends PureComponent<Props, State> {
+  state: State = {
+    fonts: null,
+    fontsMono: null,
   }
 
   async componentDidMount() {
     const allFonts = await fontScanner.getAvailableFonts();
-
     // Find regular fonts
     const fonts = allFonts
       .filter(i => ['regular', 'book'].includes(i.style.toLowerCase()) && !i.italic)
       .sort((a, b) => (a.family > b.family ? 1 : -1));
-
     // Find monospaced fonts
     // NOTE: Also include some others:
     //  - https://github.com/Kong/insomnia/issues/1835
     const fontsMono = fonts.filter(i => i.monospace || i.family.match(FORCED_MONO_FONT_REGEX));
-
     this.setState({
       fonts,
       fontsMono,
     });
   }
 
-  async _handleUpdateSetting(e: SyntheticEvent<HTMLInputElement>): Promise<Settings> {
+  async _handleUpdateSetting(e: React.SyntheticEvent<HTMLInputElement>) {
     const el = e.currentTarget;
     let value = el.type === 'checkbox' ? el.checked : el.value;
 
     if (el.type === 'number') {
+      // @ts-expect-error -- TSCONVERSION
       value = snapNumberToLimits(
+        // @ts-expect-error -- TSCONVERSION
         parseInt(value, 10) || 0,
         parseInt(el.min, 10),
         parseInt(el.max, 10),
@@ -95,26 +95,26 @@ class General extends React.PureComponent<Props, State> {
     }
 
     if (el.value === '__NULL__') {
+      // @ts-expect-error -- TSCONVERSION
       value = null;
     }
 
     return this.props.updateSetting(el.name, value);
   }
 
-  async _handleUpdateSettingAndRestart(e: SyntheticEvent<HTMLInputElement>) {
+  async _handleUpdateSettingAndRestart(e: React.SyntheticEvent<HTMLInputElement>) {
     await this._handleUpdateSetting(e);
     const { app } = electron.remote || electron;
     app.relaunch();
     app.exit();
   }
 
-  async _handleFontSizeChange(el: SyntheticEvent<HTMLInputElement>) {
+  async _handleFontSizeChange(el: React.SyntheticEvent<HTMLInputElement>) {
     const settings = await this._handleUpdateSetting(el);
-
     setFont(settings);
   }
 
-  async _handleFontChange(el: SyntheticEvent<HTMLInputElement>) {
+  async _handleFontChange(el: React.SyntheticEvent<HTMLInputElement>) {
     const settings = await this._handleUpdateSetting(el);
     setFont(settings);
   }
@@ -127,7 +127,10 @@ class General extends React.PureComponent<Props, State> {
   renderEnumSetting(
     label: string,
     name: string,
-    values: Array<{ name: string, value: any }>,
+    values: Array<{
+      name: string;
+      value: any;
+    }>,
     help: string,
     forceRestart?: boolean,
   ) {
@@ -138,7 +141,12 @@ class General extends React.PureComponent<Props, State> {
         <label>
           {label}
           {help && <HelpTooltip className="space-left">{help}</HelpTooltip>}
-          <select value={settings[name] || '__NULL__'} name={name} onChange={onChange}>
+          <select
+            value={settings[name] || '__NULL__'}
+            name={name}
+            // @ts-expect-error -- TSCONVERSION
+            onChange={onChange}
+          >
             {values.map(({ name, value }) => (
               <option key={value} value={value}>
                 {name}
@@ -150,7 +158,7 @@ class General extends React.PureComponent<Props, State> {
     );
   }
 
-  renderBooleanSetting(label: string, name: string, help: string, forceRestart?: boolean) {
+  renderBooleanSetting(label: string, name: string, help?: string, forceRestart?: boolean) {
     const { settings } = this.props;
 
     if (!settings.hasOwnProperty(name)) {
@@ -158,7 +166,6 @@ class General extends React.PureComponent<Props, State> {
     }
 
     const onChange = forceRestart ? this._handleUpdateSettingAndRestart : this._handleUpdateSetting;
-
     return (
       <div className="form-control form-control--thin">
         <label className="inline-block">
@@ -175,7 +182,7 @@ class General extends React.PureComponent<Props, State> {
     );
   }
 
-  renderTextSetting(label: string, name: string, help: string, props: Object) {
+  renderTextSetting(label: string, name: string, help: string, props: Record<string, any>) {
     const { settings } = this.props;
 
     if (!settings.hasOwnProperty(name)) {
@@ -199,11 +206,8 @@ class General extends React.PureComponent<Props, State> {
     );
   }
 
-  renderNumberSetting(label: string, name: string, help: string, props: Object) {
-    return this.renderTextSetting(label, name, help, {
-      ...props,
-      type: 'number',
-    });
+  renderNumberSetting(label: string, name: string, help: string, props: Record<string, any>) {
+    return this.renderTextSetting(label, name, help, { ...props, type: 'number' });
   }
 
   render() {
@@ -234,6 +238,7 @@ class General extends React.PureComponent<Props, State> {
               <select
                 defaultValue={settings.environmentHighlightColorStyle}
                 name="environmentHighlightColorStyle"
+                // @ts-expect-error -- TSCONVERSION
                 onChange={this._handleUpdateSetting}>
                 <option value="sidebar-indicator">Sidebar indicator</option>
                 <option value="sidebar-edge">Sidebar edge</option>
@@ -274,6 +279,7 @@ class General extends React.PureComponent<Props, State> {
                 <select
                   name="fontInterface"
                   value={settings.fontInterface || '__NULL__'}
+                  // @ts-expect-error -- TSCONVERSION
                   onChange={this._handleFontChange}>
                   <option value="__NULL__">-- System Default --</option>
                   {fonts.map((item, index) => (
@@ -304,6 +310,7 @@ class General extends React.PureComponent<Props, State> {
                 <select
                   name="fontMonospace"
                   value={settings.fontMonospace || '__NULL__'}
+                  // @ts-expect-error -- TSCONVERSION
                   onChange={this._handleFontChange}>
                   <option value="__NULL__">-- System Default --</option>
                   {fontsMono.map((item, index) => (
@@ -336,6 +343,7 @@ class General extends React.PureComponent<Props, State> {
               <select
                 defaultValue={settings.editorKeyMap}
                 name="editorKeyMap"
+                // @ts-expect-error -- TSCONVERSION
                 onChange={this._handleUpdateSetting}>
                 <option value={EDITOR_KEY_MAP_DEFAULT}>Default</option>
                 <option value={EDITOR_KEY_MAP_VIM}>Vim</option>
@@ -358,8 +366,8 @@ class General extends React.PureComponent<Props, State> {
               'Filter responses by environment',
               'filterResponsesByEnv',
               'Only show responses that were sent under the currently-active environment. This ' +
-                'adds additional separation when working with Development, Staging, Production ' +
-                'environments, for example.',
+              'adds additional separation when working with Development, Staging, Production ' +
+              'environments, for example.',
             )}
           </div>
           <div>
@@ -376,17 +384,30 @@ class General extends React.PureComponent<Props, State> {
           {this.renderEnumSetting(
             'Preferred HTTP version',
             'preferredHttpVersion',
-            ([
-              { name: 'Default', value: HttpVersions.default },
-              { name: 'HTTP 1.0', value: HttpVersions.V1_0 },
-              { name: 'HTTP 1.1', value: HttpVersions.V1_1 },
-              { name: 'HTTP/2', value: HttpVersions.V2_0 },
-
-              // Enable when our version of libcurl supports HTTP/3
+            [
+              {
+                name: 'Default',
+                value: HttpVersions.default,
+              },
+              {
+                name: 'HTTP 1.0',
+                value: HttpVersions.V1_0,
+              },
+              {
+                name: 'HTTP 1.1',
+                value: HttpVersions.V1_1,
+              },
+              {
+                name: 'HTTP/2',
+                value: HttpVersions.V2_0,
+              }, // Enable when our version of libcurl supports HTTP/3
               // { name: 'HTTP/3', value: HttpVersions.v3 },
-            ]: Array<{ name: string, value: HttpVersion }>),
+            ] as Array<{
+              name: string;
+              value: HttpVersion;
+            }>,
             'Preferred HTTP version to use for requests which will fall back if it cannot be' +
-              'negotiated',
+            'negotiated',
           )}
         </div>
 
@@ -394,7 +415,9 @@ class General extends React.PureComponent<Props, State> {
           {this.renderNumberSetting('Maximum Redirects', 'maxRedirects', '-1 for infinite', {
             min: -1,
           })}
-          {this.renderNumberSetting('Request Timeout', 'timeout', '-1 for infinite', { min: -1 })}
+          {this.renderNumberSetting('Request Timeout', 'timeout', '-1 for infinite', {
+            min: -1,
+          })}
         </div>
 
         <div className="form-row pad-top-sm">
@@ -402,13 +425,17 @@ class General extends React.PureComponent<Props, State> {
             'Response History Limit',
             'maxHistoryResponses',
             'Number of responses to keep for each request (-1 for infinity)',
-            { min: -1 },
+            {
+              min: -1,
+            },
           )}
           {this.renderNumberSetting(
             'Max Timeline Chunk Size (KB)',
             'maxTimelineDataSizeKB',
             'Maximum size in kilobytes to show on timeline',
-            { min: 0 },
+            {
+              min: 0,
+            },
           )}
         </div>
 
@@ -423,7 +450,9 @@ class General extends React.PureComponent<Props, State> {
           )}
           <button
             className="btn btn--clicky pointer"
-            style={{ padding: 0 }}
+            style={{
+              padding: 0,
+            }}
             onClick={initNewOAuthSession}>
             Clear OAuth 2 session
           </button>
@@ -437,6 +466,7 @@ class General extends React.PureComponent<Props, State> {
             className="space-left txt-md"
             style={{
               maxWidth: '20rem',
+              // @ts-expect-error -- TSCONVERSION
               lineWrap: 'word',
             }}>
             Enable global network proxy. Supports authentication via Basic Auth, digest, or NTLM
@@ -466,7 +496,7 @@ class General extends React.PureComponent<Props, State> {
         </div>
 
         {updatesSupported() && (
-          <React.Fragment>
+          <Fragment>
             <hr className="pad-top" />
             <div>
               <div className="pull-right">
@@ -487,17 +517,18 @@ class General extends React.PureComponent<Props, State> {
                 <select
                   value={settings.updateChannel}
                   name="updateChannel"
+                  // @ts-expect-error -- TSCONVERSION
                   onChange={this._handleUpdateSetting}>
                   <option value={UPDATE_CHANNEL_STABLE}>Release (Recommended)</option>
                   <option value={UPDATE_CHANNEL_BETA}>Early Access (Beta)</option>
                 </select>
               </label>
             </div>
-          </React.Fragment>
+          </Fragment>
         )}
 
         {!updatesSupported() && (
-          <React.Fragment>
+          <Fragment>
             <hr className="pad-top" />
             <h2>Software Updates</h2>
             {this.renderBooleanSetting(
@@ -505,7 +536,7 @@ class General extends React.PureComponent<Props, State> {
               'disableUpdateNotification',
               '',
             )}
-          </React.Fragment>
+          </Fragment>
         )}
 
         <hr className="pad-top" />
@@ -515,7 +546,9 @@ class General extends React.PureComponent<Props, State> {
           'Additional Plugin Path',
           'pluginPath',
           'Tell Insomnia to look for plugins in a different directory',
-          { placeholder: '~/.insomnia:/other/path' },
+          {
+            placeholder: '~/.insomnia:/other/path',
+          },
         )}
 
         <br />
@@ -576,8 +609,10 @@ class General extends React.PureComponent<Props, State> {
 }
 
 function mapDispatchToProps(dispatch) {
+  // @ts-expect-error -- TSCONVERSION
   const global = bindActionCreators(globalActions, dispatch);
   return {
+    // @ts-expect-error -- TSCONVERSION
     handleSetActiveActivity: global.setActiveActivity,
   };
 }
diff --git a/packages/insomnia-app/app/ui/components/settings/import-export.js b/packages/insomnia-app/app/ui/components/settings/import-export.tsx
similarity index 87%
rename from packages/insomnia-app/app/ui/components/settings/import-export.js
rename to packages/insomnia-app/app/ui/components/settings/import-export.tsx
index 046682f2a6..df0c9d16c4 100644
--- a/packages/insomnia-app/app/ui/components/settings/import-export.js
+++ b/packages/insomnia-app/app/ui/components/settings/import-export.tsx
@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown';
@@ -8,9 +7,18 @@ import { showPrompt } from '../modals/index';
 import { docsImportExport } from '../../../common/documentation';
 import { strings, stringsPlural } from '../../../common/strings';
 
+interface Props {
+  handleImportFile: Function;
+  handleImportClipBoard: Function;
+  handleImportUri: Function;
+  handleExportAll: Function;
+  handleShowExportRequestsModal: Function;
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class ImportExport extends PureComponent {
+class ImportExport extends PureComponent<Props> {
   _handleImportUri() {
+    const lastUsedImportUri = window.localStorage.getItem('insomnia.lastUsedImportUri');
     const promptOptions = {
       title: 'Import Data from URL',
       submitName: 'Fetch and Import',
@@ -20,14 +28,9 @@ class ImportExport extends PureComponent {
         window.localStorage.setItem('insomnia.lastUsedImportUri', uri);
         this.props.handleImportUri(uri);
       },
+      ...(lastUsedImportUri ? { defaultValue: lastUsedImportUri } : {}),
     };
 
-    const lastUsedImportUri = window.localStorage.getItem('insomnia.lastUsedImportUri');
-
-    if (lastUsedImportUri) {
-      promptOptions.defaultValue = lastUsedImportUri;
-    }
-
     showPrompt(promptOptions);
   }
 
@@ -38,7 +41,6 @@ class ImportExport extends PureComponent {
       handleExportAll,
       handleShowExportRequestsModal,
     } = this.props;
-
     return (
       <div>
         <p className="no-margin-top">
@@ -93,12 +95,4 @@ class ImportExport extends PureComponent {
   }
 }
 
-ImportExport.propTypes = {
-  handleImportFile: PropTypes.func.isRequired,
-  handleImportClipBoard: PropTypes.func.isRequired,
-  handleImportUri: PropTypes.func.isRequired,
-  handleExportAll: PropTypes.func.isRequired,
-  handleShowExportRequestsModal: PropTypes.func.isRequired,
-};
-
 export default ImportExport;
diff --git a/packages/insomnia-app/app/ui/components/settings/plugins.js b/packages/insomnia-app/app/ui/components/settings/plugins.tsx
similarity index 82%
rename from packages/insomnia-app/app/ui/components/settings/plugins.js
rename to packages/insomnia-app/app/ui/components/settings/plugins.tsx
index 40f6ddc779..6c0c74e5c2 100644
--- a/packages/insomnia-app/app/ui/components/settings/plugins.js
+++ b/packages/insomnia-app/app/ui/components/settings/plugins.tsx
@@ -1,8 +1,7 @@
-// @flow
 import * as path from 'path';
 import type { Plugin } from '../../../plugins/index';
 import { getPlugins } from '../../../plugins/index';
-import * as React from 'react';
+import React, { ChangeEvent, FormEvent, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import {
   AUTOBIND_CFG,
@@ -17,63 +16,63 @@ import installPlugin from '../../../plugins/install';
 import HelpTooltip from '../help-tooltip';
 import Link from '../base/link';
 import { delay } from '../../../common/misc';
-
 import type { PluginConfig, Settings } from '../../../models/settings';
 import { Button, ToggleSwitch } from 'insomnia-components';
 import { createPlugin } from '../../../plugins/create';
 import { showAlert, showPrompt } from '../modals';
 import { docsPlugins } from '../../../common/documentation';
 
-type State = {
-  plugins: Array<Plugin>,
-  npmPluginValue: string,
-  error: Object,
-  installPluginErrMsg: string,
-  isInstallingFromNpm: boolean,
-  isRefreshingPlugins: boolean,
-};
+interface Props {
+  settings: Settings;
+  updateSetting: (...args: Array<any>) => any;
+}
 
-type Props = {
-  settings: Settings,
-  updateSetting: Function,
-};
+interface State {
+  plugins: Array<Plugin>;
+  npmPluginValue: string;
+  error: Error | null;
+  installPluginErrMsg: string;
+  isInstallingFromNpm: boolean;
+  isRefreshingPlugins: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Plugins extends React.PureComponent<Props, State> {
+class Plugins extends PureComponent<Props, State> {
   _isMounted: boolean;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      plugins: [],
-      npmPluginValue: '',
-      error: null,
-      installPluginErrMsg: '',
-      isInstallingFromNpm: false,
-      isRefreshingPlugins: false,
-    };
+  state: State = {
+    plugins: [],
+    npmPluginValue: '',
+    error: null,
+    installPluginErrMsg: '',
+    isInstallingFromNpm: false,
+    isRefreshingPlugins: false,
   }
 
   _handleClearError() {
     this.setState({ error: null });
   }
 
-  _handleAddNpmPluginChange(e: Event) {
+  _handleAddNpmPluginChange(e: ChangeEvent<HTMLInputElement>) {
     if (e.target instanceof HTMLInputElement) {
-      this.setState({ npmPluginValue: e.target.value });
+      this.setState({
+        npmPluginValue: e.target.value,
+      });
     }
   }
 
-  async _handleAddFromNpm(e: Event): Promise<void> {
+  async _handleAddFromNpm(e: FormEvent<HTMLFormElement>) {
     e.preventDefault();
-
-    this.setState({ isInstallingFromNpm: true });
-
-    const newState: $Shape<State> = {
+    this.setState({
+      isInstallingFromNpm: true,
+    });
+    // @ts-expect-error -- TSCONVERSION
+    const newState: State = {
       isInstallingFromNpm: false,
       error: null,
       installPluginErrMsg: '',
     };
+
     try {
       await installPlugin(this.state.npmPluginValue.trim());
       await this._handleRefreshPlugins();
@@ -86,19 +85,18 @@ class Plugins extends React.PureComponent<Props, State> {
     this.setState(newState);
   }
 
-  static _handleOpenDirectory(directory: string): void {
+  static _handleOpenDirectory(directory: string) {
     electron.remote.shell.showItemInFolder(directory);
   }
 
-  async _handleRefreshPlugins(): Promise<void> {
+  async _handleRefreshPlugins() {
     const start = Date.now();
-
-    this.setState({ isRefreshingPlugins: true });
-
+    this.setState({
+      isRefreshingPlugins: true,
+    });
     // Get and reload plugins
     const plugins = await getPlugins(true);
     reload();
-
     // Delay loading for at least 500ms. UX FTW!
     const delta = Date.now() - start;
     await delay(500 - delta);
@@ -132,6 +130,7 @@ class Plugins extends React.PureComponent<Props, State> {
       onComplete: async name => {
         // Remove insomnia-plugin- prefix if they accidentally typed it
         name = name.replace(/^insomnia-plugin-/, '');
+
         try {
           await createPlugin(
             `insomnia-plugin-${name}`,
@@ -149,6 +148,7 @@ class Plugins extends React.PureComponent<Props, State> {
             message: err.message,
           });
         }
+
         await this._handleRefreshPlugins();
       },
     });
@@ -156,6 +156,7 @@ class Plugins extends React.PureComponent<Props, State> {
 
   componentDidMount() {
     this._isMounted = true;
+
     this._handleRefreshPlugins();
   }
 
@@ -165,21 +166,16 @@ class Plugins extends React.PureComponent<Props, State> {
 
   async _handleUpdatePluginConfig(pluginName: string, config: PluginConfig) {
     const { updateSetting, settings } = this.props;
-
-    await updateSetting('pluginConfig', {
-      ...settings.pluginConfig,
-      [pluginName]: config,
-    });
+    await updateSetting('pluginConfig', { ...settings.pluginConfig, [pluginName]: config });
   }
 
   async _togglePluginEnabled(name: string, enabled: boolean, config: PluginConfig) {
-    const newConfig = {
-      ...config,
-      disabled: !enabled,
-    };
+    const newConfig = { ...config, disabled: !enabled };
 
     if (this._isMounted) {
-      this.setState({ isRefreshingPlugins: true });
+      this.setState({
+        isRefreshingPlugins: true,
+      });
     }
 
     await this._handleUpdatePluginConfig(name, newConfig);
@@ -189,6 +185,7 @@ class Plugins extends React.PureComponent<Props, State> {
   renderToggleSwitch(plugin: Plugin) {
     return (
       <ToggleSwitch
+        // @ts-expect-error -- TSCONVERSION should this be labelClassName or switchClassName?
         className="valign-middle"
         checked={!plugin.config.disabled}
         disabled={this.state.isRefreshingPlugins}
@@ -201,10 +198,8 @@ class Plugins extends React.PureComponent<Props, State> {
 
   renderLink(plugin: Plugin) {
     const { name } = plugin;
-
     const base = /^insomnia-plugin-/.test(name) ? PLUGIN_HUB_BASE : NPM_PACKAGE_BASE;
     const link = path.join(base, name);
-
     return (
       <a className="space-left" href={link} title={link}>
         <i className="fa fa-external-link-square" />
@@ -221,7 +216,6 @@ class Plugins extends React.PureComponent<Props, State> {
       isRefreshingPlugins,
       npmPluginValue,
     } = this.state;
-
     return (
       <div>
         <p className="notice info no-margin-top">
@@ -244,7 +238,12 @@ class Plugins extends React.PureComponent<Props, State> {
               {plugins.map(plugin =>
                 !plugin.directory ? null : (
                   <tr key={plugin.name}>
-                    <td style={{ width: '4rem' }}>{this.renderToggleSwitch(plugin)}</td>
+                    <td
+                      style={{
+                        width: '4rem',
+                      }}>
+                      {this.renderToggleSwitch(plugin)}
+                    </td>
                     <td>
                       {plugin.name}
                       {plugin.description && (
@@ -257,7 +256,11 @@ class Plugins extends React.PureComponent<Props, State> {
                       {plugin.version}
                       {this.renderLink(plugin)}
                     </td>
-                    <td className="no-wrap" style={{ width: '10rem' }}>
+                    <td
+                      className="no-wrap"
+                      style={{
+                        width: '10rem',
+                      }}>
                       <CopyButton
                         size="small"
                         variant="contained"
@@ -286,7 +289,7 @@ class Plugins extends React.PureComponent<Props, State> {
             </button>
             <div className="selectable force-pre-wrap">
               <b>{installPluginErrMsg}</b>
-              {`\n\nThere may be an issue with the plugin itself, as a note you can discover and install plugins from the `}
+              {'\n\nThere may be an issue with the plugin itself, as a note you can discover and install plugins from the '}
               <a href="https://insomnia.rest/plugins">Plugin Hub.</a>
               <details>
                 <summary>Additional Information</summary>
diff --git a/packages/insomnia-app/app/ui/components/settings/shortcuts.js b/packages/insomnia-app/app/ui/components/settings/shortcuts.tsx
similarity index 84%
rename from packages/insomnia-app/app/ui/components/settings/shortcuts.js
rename to packages/insomnia-app/app/ui/components/settings/shortcuts.tsx
index 43093d2a27..4b460cc8ca 100644
--- a/packages/insomnia-app/app/ui/components/settings/shortcuts.js
+++ b/packages/insomnia-app/app/ui/components/settings/shortcuts.tsx
@@ -1,4 +1,3 @@
-// @flow
 import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
@@ -18,10 +17,10 @@ import { showModal } from '../modals';
 import AddKeyCombinationModal from '../modals/add-key-combination-modal';
 import PromptButton from '../base/prompt-button';
 
-type Props = {
-  hotKeyRegistry: HotKeyRegistry,
-  handleUpdateKeyBindings: Function,
-};
+interface Props {
+  hotKeyRegistry: HotKeyRegistry;
+  handleUpdateKeyBindings: (...args: Array<any>) => any;
+}
 
 const HOT_KEY_DEFS: Array<HotKeyDefinition> = Object.keys(hotKeyRefs).map(k => hotKeyRefs[k]);
 
@@ -32,19 +31,23 @@ class Shortcuts extends PureComponent<Props> {
    * @param newKeyComb the key combination to be checked.
    * @returns {boolean} true if already existed.
    */
-  checkKeyCombinationDuplicate(newKeyComb: KeyCombination): boolean {
+  checkKeyCombinationDuplicate(newKeyComb: KeyCombination) {
     const { hotKeyRegistry } = this.props;
+
     for (const hotKeyRefId in hotKeyRegistry) {
       if (!hotKeyRegistry.hasOwnProperty(hotKeyRefId)) {
         continue;
       }
+
       const keyCombs = getPlatformKeyCombinations(hotKeyRegistry[hotKeyRefId]);
+
       for (const keyComb of keyCombs) {
         if (areSameKeyCombinations(keyComb, newKeyComb)) {
           return true;
         }
       }
     }
+
     return false;
   }
 
@@ -69,7 +72,7 @@ class Shortcuts extends PureComponent<Props> {
     );
   }
 
-  handleRemoveKeyCombination(toBeRemoved: Object) {
+  handleRemoveKeyCombination(toBeRemoved: Record<string, any>) {
     const { hotKeyRefId, keyComb } = toBeRemoved;
     const { hotKeyRegistry, handleUpdateKeyBindings } = this.props;
     const keyCombs = getPlatformKeyCombinations(hotKeyRegistry[hotKeyRefId]);
@@ -79,6 +82,7 @@ class Shortcuts extends PureComponent<Props> {
         toBeRemovedIndex = idx;
       }
     });
+
     if (toBeRemovedIndex >= 0) {
       keyCombs.splice(toBeRemovedIndex, 1);
       handleUpdateKeyBindings(hotKeyRegistry);
@@ -101,7 +105,6 @@ class Shortcuts extends PureComponent<Props> {
     const keyCombinations = getPlatformKeyCombinations(keyBindings);
     const hasRemoveItems = keyCombinations.length > 0;
     const hasResetItems = !areKeyBindingsSameAsDefault(def.id, keyBindings);
-
     return (
       <tr key={i}>
         <td>{def.description}</td>
@@ -125,19 +128,24 @@ class Shortcuts extends PureComponent<Props> {
             </DropdownItem>
 
             {hasRemoveItems && <DropdownDivider>Remove existing</DropdownDivider>}
-            {/* Dropdown items to remove key combinations. */
-            keyCombinations.map((keyComb: KeyCombination) => {
-              const display = constructKeyCombinationDisplay(keyComb, false);
-              return (
-                <DropdownItem
-                  key={display}
-                  value={{ hotKeyRefId: def.id, keyComb: keyComb }}
-                  buttonClass={PromptButton}
-                  onClick={this.handleRemoveKeyCombination}>
-                  <i className="fa fa-trash-o" /> {display}
-                </DropdownItem>
-              );
-            })}
+            {
+              /* Dropdown items to remove key combinations. */
+              keyCombinations.map((keyComb: KeyCombination) => {
+                const display = constructKeyCombinationDisplay(keyComb, false);
+                return (
+                  <DropdownItem
+                    key={display}
+                    value={{
+                      hotKeyRefId: def.id,
+                      keyComb: keyComb,
+                    }}
+                    buttonClass={PromptButton}
+                    onClick={this.handleRemoveKeyCombination}>
+                    <i className="fa fa-trash-o" /> {display}
+                  </DropdownItem>
+                );
+              })
+            }
 
             {hasResetItems && <DropdownDivider />}
             {hasResetItems && (
diff --git a/packages/insomnia-app/app/ui/components/settings/theme.js b/packages/insomnia-app/app/ui/components/settings/theme.tsx
similarity index 87%
rename from packages/insomnia-app/app/ui/components/settings/theme.js
rename to packages/insomnia-app/app/ui/components/settings/theme.tsx
index 076cc82dff..5802400fbd 100644
--- a/packages/insomnia-app/app/ui/components/settings/theme.js
+++ b/packages/insomnia-app/app/ui/components/settings/theme.tsx
@@ -1,34 +1,29 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import Button from '../base/button';
 import type { Theme as ThemeType, ColorScheme } from '../../../plugins';
 import { getThemes } from '../../../plugins';
 import HelpTooltip from '../help-tooltip';
-
 const THEMES_PER_ROW = 5;
 
-type Props = {
-  handleChangeTheme: (string, ColorScheme) => void,
-  activeTheme: string,
-  handleAutoDetectColorSchemeChange: boolean => void,
-  autoDetectColorScheme: boolean,
-  activeLightTheme: string,
-  activeDarkTheme: string,
-};
+interface Props {
+  handleChangeTheme: (arg0: string, arg1: ColorScheme) => void;
+  activeTheme: string;
+  handleAutoDetectColorSchemeChange: (arg0: boolean) => void;
+  autoDetectColorScheme: boolean;
+  activeLightTheme: string;
+  activeDarkTheme: string;
+}
 
-type State = {
-  themes: Array<ThemeType>,
-};
+interface State {
+  themes: Array<ThemeType>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Theme extends React.PureComponent<Props, State> {
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      themes: [],
-    };
+class Theme extends PureComponent<Props, State> {
+  state: State = {
+    themes: [],
   }
 
   componentDidMount() {
@@ -37,32 +32,34 @@ class Theme extends React.PureComponent<Props, State> {
 
   async _loadThemes() {
     const themes = await getThemes();
-    this.setState({ themes });
+    this.setState({
+      themes,
+    });
   }
 
   renderTheme(theme: ThemeType) {
     const { handleChangeTheme, activeTheme, autoDetectColorScheme } = this.props;
-
     const isActive = activeTheme === theme.theme.name;
     const disabled = autoDetectColorScheme;
-
     return (
       <div
         key={theme.theme.name}
         className="themes__theme"
-        style={{ maxWidth: `${100 / THEMES_PER_ROW}%` }}>
+        style={{
+          maxWidth: `${100 / THEMES_PER_ROW}%`,
+        }}>
         <h2 className="txt-lg">{theme.theme.displayName}</h2>
         <Button
           disabled={disabled}
           onClick={() => handleChangeTheme(theme.theme.name, 'default')}
           className={isActive ? 'active' : ''}>
+          {/* @ts-expect-error -- TSCONVERSION */}
           <svg theme={theme.theme.name} width="100%" height="100%" viewBox="0 0 500 300">
             {/*
-
               A WORD TO THE WISE: If you, dear traveler from the future, are here for the purpose of theming things due to changes in the app structure, please remember to add `--sub` to your classes or else the selected class' theme variables will apply to all theme previews.  Search your codebase for `--sub` to see more.
-            
-            */}
+                        */}
 
+            {/* @ts-expect-error -- TSCONVERSION */}
             <g subtheme={theme.theme.name}>
               {/* App Header */}
               <g className="theme--app-header--sub">
@@ -109,13 +106,14 @@ class Theme extends React.PureComponent<Props, State> {
     );
   }
 
-  renderThemeRows(): React.Node {
+  renderThemeRows() {
     const { themes } = this.state;
+    const rows: Array<Array<ThemeType>> = [];
+    let row: Array<ThemeType> = [];
 
-    const rows = [];
-    let row = [];
     for (const theme of themes) {
       row.push(theme);
+
       if (row.length === THEMES_PER_ROW) {
         rows.push(row);
         row = [];
@@ -137,9 +135,7 @@ class Theme extends React.PureComponent<Props, State> {
   renderThemeSelect(scheme: 'light' | 'dark') {
     const { activeLightTheme, activeDarkTheme, handleChangeTheme } = this.props;
     const { themes } = this.state;
-
     const activeColorTheme = scheme === 'light' ? activeLightTheme : activeDarkTheme;
-
     return (
       <div className="form-control form-control--outlined">
         <label>
@@ -163,7 +159,6 @@ class Theme extends React.PureComponent<Props, State> {
 
   render() {
     const { autoDetectColorScheme, handleAutoDetectColorSchemeChange } = this.props;
-
     return (
       <>
         <div className="themes">{this.renderThemeRows()}</div>
diff --git a/packages/insomnia-app/app/ui/components/sidebar/sidebar-children.js b/packages/insomnia-app/app/ui/components/sidebar/sidebar-children.tsx
similarity index 73%
rename from packages/insomnia-app/app/ui/components/sidebar/sidebar-children.js
rename to packages/insomnia-app/app/ui/components/sidebar/sidebar-children.tsx
index 0eee65d8fe..e8e9e73a05 100644
--- a/packages/insomnia-app/app/ui/components/sidebar/sidebar-children.js
+++ b/packages/insomnia-app/app/ui/components/sidebar/sidebar-children.tsx
@@ -1,61 +1,56 @@
-// @flow
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
+import React, { Fragment, PureComponent } from 'react';
+import ReactDOM from 'react-dom';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import SidebarRequestRow from './sidebar-request-row';
 import SidebarRequestGroupRow from './sidebar-request-group-row';
-import * as models from '../../../models/index';
 import type { RequestGroup } from '../../../models/request-group';
 import type { Workspace } from '../../../models/workspace';
 import type { Request } from '../../../models/request';
 import type { HotKeyRegistry } from '../../../common/hotkeys';
 import type { Environment } from '../../../models/environment';
-import { Dropdown } from '../base/dropdown';
 import SidebarCreateDropdown from './sidebar-create-dropdown';
+import { GrpcRequest } from '../../../models/grpc-request';
+import { isGrpcRequest, isRequest } from '../../../models/helpers/is-model';
+import { HandleRender } from '../../../common/render';
 
-type Child = {
-  doc: Request | GrpcRequest | RequestGroup,
-  children: Array<Child>,
-  collapsed: boolean,
-  hidden: boolean,
-  pinned: boolean,
-};
-
-export type SidebarChildObjects = {
-  pinned: Array<Child>,
-  all: Array<Child>,
-};
-
-type Props = {
-  // Required
-  handleActivateRequest: Function,
-  handleCreateRequest: Function,
-  handleCreateRequestGroup: Function,
-  handleSetRequestPinned: Function,
-  handleSetRequestGroupCollapsed: Function,
-  handleDuplicateRequest: Function,
-  handleDuplicateRequestGroup: Function,
-  handleMoveRequestGroup: Function,
-  handleGenerateCode: Function,
-  handleCopyAsCurl: Function,
-  handleRender: Function,
-  moveDoc: Function,
-  childObjects: SidebarChildObjects,
-  workspace: Workspace,
-  filter: string,
-  hotKeyRegistry: HotKeyRegistry,
-  activeEnvironment: Environment | null,
-
-  // Optional
-  activeRequest: ?Request,
-};
+export interface Child {
+  doc: Request | GrpcRequest | RequestGroup;
+  children: Array<Child>;
+  collapsed: boolean;
+  hidden: boolean;
+  pinned: boolean;
+}
+export interface SidebarChildObjects {
+  pinned: Array<Child>;
+  all: Array<Child>;
+}
+interface Props {
+  handleActivateRequest: Function;
+  handleCreateRequest: (id: string) => any;
+  handleCreateRequestGroup: (parentId: string) => void;
+  handleSetRequestPinned: Function;
+  handleSetRequestGroupCollapsed: Function;
+  handleDuplicateRequest: Function;
+  handleDuplicateRequestGroup: (requestGroup: RequestGroup) => any;
+  handleMoveRequestGroup: (requestGroup: RequestGroup) => Promise<void>;
+  handleGenerateCode: Function;
+  handleCopyAsCurl: Function;
+  handleRender: HandleRender;
+  moveDoc: Function;
+  childObjects: SidebarChildObjects;
+  workspace: Workspace;
+  filter: string;
+  hotKeyRegistry: HotKeyRegistry;
+  activeEnvironment?: Environment | null;
+  activeRequest?: Request | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SidebarChildren extends React.PureComponent<Props> {
-  _contextMenu: ?SidebarCreateDropdown;
+class SidebarChildren extends PureComponent<Props> {
+  _contextMenu: SidebarCreateDropdown | null = null;
 
-  _handleContextMenu(e: MouseEvent) {
+  _handleContextMenu(e: React.MouseEvent<HTMLUListElement>) {
     const { target, currentTarget, clientX, clientY } = e;
 
     if (target !== currentTarget) {
@@ -63,20 +58,23 @@ class SidebarChildren extends React.PureComponent<Props> {
     }
 
     e.preventDefault();
-
     const menu = this._contextMenu;
+
     if (menu && document.body) {
       const x = clientX;
       const y = document.body.getBoundingClientRect().height - clientY;
-      menu.show({ x, y });
+      menu.show({
+        x,
+        y,
+      });
     }
   }
 
-  _setContextMenuRef(n: ?Dropdown) {
+  _setContextMenuRef(n: SidebarCreateDropdown) {
     this._contextMenu = n;
   }
 
-  _renderChildren(children: Array<Child>, isInPinnedList: boolean): React.Node {
+  _renderChildren(children: Array<Child>, isInPinnedList: boolean) {
     const {
       filter,
       handleCreateRequest,
@@ -96,15 +94,13 @@ class SidebarChildren extends React.PureComponent<Props> {
       hotKeyRegistry,
       activeEnvironment,
     } = this.props;
-
     const activeRequestId = activeRequest ? activeRequest._id : 'n/a';
-
     return children.map(child => {
       if (!isInPinnedList && child.hidden) {
         return null;
       }
 
-      if (child.doc.type === models.request.type || child.doc.type === models.grpcRequest.type) {
+      if (isRequest(child.doc) || isGrpcRequest(child.doc)) {
         return (
           <SidebarRequestRow
             key={child.doc._id}
@@ -121,16 +117,13 @@ class SidebarChildren extends React.PureComponent<Props> {
             isPinned={child.pinned}
             disableDragAndDrop={isInPinnedList}
             request={child.doc}
-            workspace={workspace}
-            hotKeyRegistry={hotKeyRegistry}
-            // Necessary for plugin actions on requests
+            hotKeyRegistry={hotKeyRegistry} // Necessary for plugin actions on requests
             activeEnvironment={activeEnvironment}
           />
         );
       }
 
       // We have a RequestGroup!
-
       const requestGroup = child.doc;
 
       function hasActiveChild(children) {
@@ -147,6 +140,7 @@ class SidebarChildren extends React.PureComponent<Props> {
       }
 
       const isActive = hasActiveChild(child.children);
+
       const children = this._renderChildren(child.children, isInPinnedList);
 
       return (
@@ -163,7 +157,6 @@ class SidebarChildren extends React.PureComponent<Props> {
           isCollapsed={child.collapsed}
           handleCreateRequest={handleCreateRequest}
           handleCreateRequestGroup={handleCreateRequestGroup}
-          numChildren={child.children.length}
           workspace={workspace}
           requestGroup={requestGroup}
           hotKeyRegistry={hotKeyRegistry}
@@ -174,7 +167,7 @@ class SidebarChildren extends React.PureComponent<Props> {
     });
   }
 
-  _renderList(children: Array<Child>, pinnedList: boolean): React.Node {
+  _renderList(children: Array<Child>, pinnedList: boolean) {
     return (
       <ul
         className="sidebar__list sidebar__list-root theme--sidebar__list"
@@ -196,9 +189,7 @@ class SidebarChildren extends React.PureComponent<Props> {
 
   render() {
     const { childObjects, hotKeyRegistry } = this.props;
-
     const showSeparator = childObjects.pinned.length > 0;
-
     const contextMenuPortal = ReactDOM.createPortal(
       <div className="hide">
         <SidebarCreateDropdown
@@ -208,16 +199,15 @@ class SidebarChildren extends React.PureComponent<Props> {
           hotKeyRegistry={hotKeyRegistry}
         />
       </div>,
-      (document.querySelector('#dropdowns-container'): any),
+      document.querySelector('#dropdowns-container') as any,
     );
-
     return (
-      <React.Fragment>
+      <Fragment>
         {this._renderList(childObjects.pinned, true)}
         <div className={`sidebar__list-separator${showSeparator ? '' : '--invisible'}`} />
         {this._renderList(childObjects.all, false)}
         {contextMenuPortal}
-      </React.Fragment>
+      </Fragment>
     );
   }
 }
diff --git a/packages/insomnia-app/app/ui/components/sidebar/sidebar-create-dropdown.js b/packages/insomnia-app/app/ui/components/sidebar/sidebar-create-dropdown.tsx
similarity index 68%
rename from packages/insomnia-app/app/ui/components/sidebar/sidebar-create-dropdown.js
rename to packages/insomnia-app/app/ui/components/sidebar/sidebar-create-dropdown.tsx
index c8218ec0f0..c2967215ce 100644
--- a/packages/insomnia-app/app/ui/components/sidebar/sidebar-create-dropdown.js
+++ b/packages/insomnia-app/app/ui/components/sidebar/sidebar-create-dropdown.tsx
@@ -1,35 +1,35 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
-import { Dropdown, DropdownHint, DropdownButton, DropdownItem } from '../base/dropdown';
+import { DropdownHint, DropdownButton, DropdownItem } from '../base/dropdown';
+import Dropdown from '../base/dropdown/dropdown';
 import type { HotKeyRegistry } from '../../../common/hotkeys';
 import { hotKeyRefs } from '../../../common/hotkeys';
+import { RequestGroup } from '../../../models/request-group';
 
-type Props = {
-  handleCreateRequest: Function,
-  handleCreateRequestGroup: Function,
-  hotKeyRegistry: HotKeyRegistry,
-  right?: boolean,
-};
+interface Props {
+  handleCreateRequest: (id: string) => any;
+  handleCreateRequestGroup: (requestGroup: RequestGroup) => any;
+  hotKeyRegistry: HotKeyRegistry;
+  right?: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SidebarCreateDropdown extends React.PureComponent<Props> {
-  _dropdown: ?Dropdown;
+class SidebarCreateDropdown extends PureComponent<Props> {
+  _dropdown: Dropdown | null = null;
 
-  show(position: { x: number, y: number }) {
+  show(position: { x: number; y: number }) {
     if (this._dropdown) {
       this._dropdown.show(false, position);
     }
   }
 
-  _setDropdownRef(n: ?Dropdown) {
+  _setDropdownRef(n: Dropdown) {
     this._dropdown = n;
   }
 
   render() {
     const { handleCreateRequest, handleCreateRequestGroup, hotKeyRegistry, right } = this.props;
-
     return (
       <Dropdown ref={this._setDropdownRef} right={right}>
         <DropdownButton className="btn btn--compact">
diff --git a/packages/insomnia-app/app/ui/components/sidebar/sidebar-filter.js b/packages/insomnia-app/app/ui/components/sidebar/sidebar-filter.tsx
similarity index 78%
rename from packages/insomnia-app/app/ui/components/sidebar/sidebar-filter.js
rename to packages/insomnia-app/app/ui/components/sidebar/sidebar-filter.tsx
index f441fcf337..388c41b760 100644
--- a/packages/insomnia-app/app/ui/components/sidebar/sidebar-filter.js
+++ b/packages/insomnia-app/app/ui/components/sidebar/sidebar-filter.tsx
@@ -1,8 +1,6 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG, DEBOUNCE_MILLIS, SortOrder } from '../../../common/constants';
-
 import KeydownBinder from '../keydown-binder';
 import type { HotKeyRegistry } from '../../../common/hotkeys';
 import { hotKeyRefs } from '../../../common/hotkeys';
@@ -10,36 +8,39 @@ import { executeHotKey } from '../../../common/hotkeys-listener';
 import SidebarCreateDropdown from './sidebar-create-dropdown';
 import SidebarSortDropdown from './sidebar-sort-dropdown';
 
-type Props = {
-  onChange: string => void,
-  requestCreate: () => void,
-  requestGroupCreate: () => void,
-  sidebarSort: (sortOrder: SortOrder) => void,
-  filter: string,
-  hotKeyRegistry: HotKeyRegistry,
-};
+interface Props {
+  onChange: (value: string) => Promise<void>;
+  requestCreate: () => void;
+  requestGroupCreate: () => void;
+  sidebarSort: (sortOrder: SortOrder) => void;
+  filter: string;
+  hotKeyRegistry: HotKeyRegistry;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SidebarFilter extends React.PureComponent<Props> {
-  _input: ?HTMLInputElement;
-  _triggerTimeout: TimeoutID;
+class SidebarFilter extends PureComponent<Props> {
+  _input: HTMLInputElement | null = null;
+  _triggerTimeout: NodeJS.Timeout | null = null;
 
-  _setInputRef(n: ?HTMLInputElement) {
+  _setInputRef(n: HTMLInputElement) {
     this._input = n;
   }
 
-  _handleClearFilter(e: SyntheticEvent<HTMLButtonElement>) {
+  _handleClearFilter() {
     this.props.onChange('');
+
     if (this._input) {
       this._input.value = '';
+
       this._input.focus();
     }
   }
 
-  _handleOnChange(e: SyntheticEvent<HTMLInputElement>) {
+  _handleOnChange(e: React.SyntheticEvent<HTMLInputElement>) {
     const value = e.currentTarget.value;
-
-    clearTimeout(this._triggerTimeout);
+    if (this._triggerTimeout) {
+      clearTimeout(this._triggerTimeout);
+    }
     this._triggerTimeout = setTimeout(() => {
       this.props.onChange(value);
     }, DEBOUNCE_MILLIS);
diff --git a/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-group-row.js b/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-group-row.tsx
similarity index 78%
rename from packages/insomnia-app/app/ui/components/sidebar/sidebar-request-group-row.js
rename to packages/insomnia-app/app/ui/components/sidebar/sidebar-request-group-row.tsx
index 7057fa68be..41cb66bbba 100644
--- a/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-group-row.js
+++ b/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-group-row.tsx
@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import ReactDOM from 'react-dom';
@@ -9,21 +8,52 @@ import Highlight from '../base/highlight';
 import RequestGroupActionsDropdown from '../dropdowns/request-group-actions-dropdown';
 import SidebarRequestRow from './sidebar-request-row';
 import * as misc from '../../../common/misc';
+import { RequestGroup } from '../../../models/request-group';
+import { Workspace } from '../../../models/workspace';
+import { Environment } from '../../../models/environment';
+import { HotKeyRegistry } from '../../../common/hotkeys';
+import { HandleRender } from '../../../common/render';
+
+interface Props {
+  handleSetRequestGroupCollapsed: Function;
+  handleDuplicateRequestGroup: (requestGroup: RequestGroup) => any;
+  handleMoveRequestGroup: (requestGroup: RequestGroup) => any;
+  moveDoc: Function;
+  handleActivateRequest: Function;
+  handleCreateRequest: (id: string) => any;
+  handleCreateRequestGroup: (requestGroup: string) => any;
+  handleRender: HandleRender;
+  filter: string;
+  isActive: boolean;
+  isCollapsed: boolean;
+  workspace: Workspace;
+  requestGroup: RequestGroup;
+  hotKeyRegistry: HotKeyRegistry;
+  isDragging?: boolean;
+  isDraggingOver?: boolean;
+  connectDragSource?: Function;
+  connectDropTarget?: Function;
+  activeEnvironment?: Environment | null;
+}
+
+interface State {
+  dragDirection: number;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SidebarRequestGroupRow extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      dragDirection: 0,
-    };
+class SidebarRequestGroupRow extends PureComponent<Props, State> {
+  state: State = {
+    dragDirection: 0,
   }
 
-  _setRequestGroupActionsDropdownRef(n) {
+  _requestGroupActionsDropdown: RequestGroupActionsDropdown | null = null;
+  _expandTag: HTMLDivElement | null = null;
+
+  _setRequestGroupActionsDropdownRef(n: RequestGroupActionsDropdown) {
     this._requestGroupActionsDropdown = n;
   }
 
-  _setExpandTagRef(n) {
+  _setExpandTagRef(n: HTMLDivElement) {
     this._expandTag = n;
   }
 
@@ -38,12 +68,15 @@ class SidebarRequestGroupRow extends PureComponent {
 
   _handleShowActions(e) {
     e.preventDefault();
-    this._requestGroupActionsDropdown.show();
+
+    this._requestGroupActionsDropdown?.show();
   }
 
   setDragDirection(dragDirection) {
     if (dragDirection !== this.state.dragDirection) {
-      this.setState({ dragDirection });
+      this.setState({
+        dragDirection,
+      });
     }
   }
 
@@ -68,22 +101,19 @@ class SidebarRequestGroupRow extends PureComponent {
       hotKeyRegistry,
       activeEnvironment,
     } = this.props;
-
     const { dragDirection } = this.state;
-
     let folderIconClass = 'fa-folder';
-
     folderIconClass += isCollapsed ? '' : '-open';
     folderIconClass += isActive ? '' : '-o';
-
     const classes = classnames('sidebar__row', {
       'sidebar__row--dragging': isDragging,
       'sidebar__row--dragging-above': isDraggingOver && dragDirection > 0,
       'sidebar__row--dragging-below': isDraggingOver && dragDirection < 0,
     });
-
     // NOTE: We only want the button draggable, not the whole container (ie. no children)
+    // @ts-expect-error -- TSCONVERSION
     const button = connectDragSource(
+      // @ts-expect-error -- TSCONVERSION
       connectDropTarget(
         <button onClick={this._handleCollapse} onContextMenu={this._handleShowActions}>
           <div className="sidebar__clickable">
@@ -109,7 +139,6 @@ class SidebarRequestGroupRow extends PureComponent {
         </button>,
       ),
     );
-
     return (
       <li key={requestGroup._id} className={classes}>
         <div
@@ -128,6 +157,7 @@ class SidebarRequestGroupRow extends PureComponent {
               requestGroup={requestGroup}
               hotKeyRegistry={hotKeyRegistry}
               activeEnvironment={activeEnvironment}
+              // @ts-expect-error -- TSCONVERSION
               right
             />
           </div>
@@ -137,7 +167,7 @@ class SidebarRequestGroupRow extends PureComponent {
           className={classnames('sidebar__list', {
             'sidebar__list--collapsed': isCollapsed,
           })}>
-          {!isCollapsed && children.length > 0 ? (
+          {!isCollapsed && children ? (
             children
           ) : (
             <SidebarRequestRow
@@ -149,14 +179,11 @@ class SidebarRequestGroupRow extends PureComponent {
               handleRender={handleRender}
               moveDoc={moveDoc}
               isActive={false}
-              request={null}
               requestGroup={requestGroup}
-              workspace={workspace}
               requestCreate={handleCreateRequest}
               filter={filter}
               hotKeyRegistry={hotKeyRegistry}
-              isPinned={false}
-              // Necessary so that plugin actions work
+              isPinned={false} // Necessary so that plugin actions work
               activeEnvironment={activeEnvironment}
             />
           )}
@@ -166,41 +193,11 @@ class SidebarRequestGroupRow extends PureComponent {
   }
 }
 
-SidebarRequestGroupRow.propTypes = {
-  // Functions
-  handleSetRequestGroupCollapsed: PropTypes.func.isRequired,
-  handleDuplicateRequestGroup: PropTypes.func.isRequired,
-  handleMoveRequestGroup: PropTypes.func.isRequired,
-  moveDoc: PropTypes.func.isRequired,
-  handleActivateRequest: PropTypes.func.isRequired,
-  handleCreateRequest: PropTypes.func.isRequired,
-  handleCreateRequestGroup: PropTypes.func.isRequired,
-  handleRender: PropTypes.func.isRequired,
-
-  // Other
-  filter: PropTypes.string.isRequired,
-  isActive: PropTypes.bool.isRequired,
-  isCollapsed: PropTypes.bool.isRequired,
-  workspace: PropTypes.object.isRequired,
-  requestGroup: PropTypes.object.isRequired,
-  hotKeyRegistry: PropTypes.object.isRequired,
-
-  // React DnD
-  isDragging: PropTypes.bool,
-  isDraggingOver: PropTypes.bool,
-  connectDragSource: PropTypes.func,
-  connectDropTarget: PropTypes.func,
-
-  // Optional
-  children: PropTypes.node,
-  activeEnvironment: PropTypes.object,
-};
-
 /**
  * Implements the drag source contract.
  */
 const dragSource = {
-  beginDrag(props) {
+  beginDrag(props: Props) {
     return {
       requestGroup: props.requestGroup,
     };
@@ -209,17 +206,15 @@ const dragSource = {
 
 function isAbove(monitor, component) {
   const hoveredNode = ReactDOM.findDOMNode(component);
-
+  // @ts-expect-error -- TSCONVERSION
   const hoveredTop = hoveredNode.getBoundingClientRect().top;
   const draggedTop = monitor.getSourceClientOffset().y;
-
   return hoveredTop > draggedTop;
 }
 
 function isOnExpandTag(monitor, component) {
   const rect = component.getExpandTag().getBoundingClientRect();
   const pointer = monitor.getClientOffset();
-
   return (
     rect.left <= pointer.x &&
     pointer.x <= rect.right &&
@@ -240,6 +235,7 @@ const dragTarget = {
       props.moveDoc(movingDoc, parentId, targetId, -1);
     }
   },
+
   hover(props, monitor, component) {
     if (props.isCollapsed && isOnExpandTag(monitor, component)) {
       component.props.handleSetRequestGroupCollapsed(props.requestGroup._id, false);
diff --git a/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-row.js b/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-row.tsx
similarity index 72%
rename from packages/insomnia-app/app/ui/components/sidebar/sidebar-request-row.js
rename to packages/insomnia-app/app/ui/components/sidebar/sidebar-request-row.tsx
index 90c0a61287..f9a29a8d66 100644
--- a/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-row.js
+++ b/packages/insomnia-app/app/ui/components/sidebar/sidebar-request-row.tsx
@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import ReactDOM from 'react-dom';
 import { DragSource, DropTarget } from 'react-dnd';
@@ -8,7 +7,6 @@ import RequestActionsDropdown from '../dropdowns/request-actions-dropdown';
 import Editable from '../base/editable';
 import Highlight from '../base/highlight';
 import MethodTag from '../tags/method-tag';
-import * as models from '../../../models';
 import { showModal } from '../modals/index';
 import RequestSettingsModal from '../modals/request-settings-modal';
 import { CONTENT_TYPE_GRAPHQL, AUTOBIND_CFG } from '../../../common/constants';
@@ -16,43 +14,85 @@ import { getMethodOverrideHeader } from '../../../common/misc';
 import GrpcTag from '../tags/grpc-tag';
 import * as requestOperations from '../../../models/helpers/request-operations';
 import GrpcSpinner from '../grpc-spinner';
+import { Environment } from '../../../models/environment';
+import { RequestGroup } from '../../../models/request-group';
+import { GrpcRequest } from '../../../models/grpc-request';
+import { Request } from '../../../models/request';
+import { isGrpcRequest } from '../../../models/helpers/is-model';
+import { HotKeyRegistry } from '../../../common/hotkeys';
+import { HandleRender } from '../../../common/render';
+
+interface Props {
+  activeEnvironment?: Environment | null;
+  handleActivateRequest: Function;
+  handleSetRequestPinned: Function;
+  handleDuplicateRequest: Function;
+  handleGenerateCode: Function;
+  handleCopyAsCurl: Function;
+  handleRender: HandleRender;
+  requestCreate: Function;
+  moveDoc: Function;
+  filter: string;
+  isActive: boolean;
+  isPinned: boolean;
+  hotKeyRegistry: HotKeyRegistry;
+  isDragging?: boolean;
+  isDraggingOver?: boolean;
+  connectDragSource?: Function;
+  connectDropTarget?: Function;
+  requestGroup?: RequestGroup;
+  request?: Request | GrpcRequest;
+  /** can be Request or GrpcRequest */
+  disableDragAndDrop?: boolean;
+}
+
+interface State {
+  dragDirection: number;
+  isEditing: boolean;
+  renderedUrl: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SidebarRequestRow extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.state = {
-      dragDirection: 0,
-      isEditing: false,
-      renderedUrl: '',
-    };
-    this._urlUpdateInterval = null;
+class SidebarRequestRow extends PureComponent<Props, State> {
+  state: State = {
+    dragDirection: 0,
+    isEditing: false,
+    renderedUrl: '',
   }
 
-  _setRequestActionsDropdownRef(n) {
+  _urlUpdateInterval: NodeJS.Timeout | null = null;
+  _requestActionsDropdown: RequestActionsDropdown | null = null;
+
+  _setRequestActionsDropdownRef(n: RequestActionsDropdown) {
     this._requestActionsDropdown = n;
   }
 
   _handleShowRequestActions(e) {
     e.preventDefault();
-    this._requestActionsDropdown.show();
+
+    this._requestActionsDropdown?.show();
   }
 
   _handleEditStart() {
-    this.setState({ isEditing: true });
+    this.setState({
+      isEditing: true,
+    });
   }
 
   async _handleRequestUpdateName(name) {
     const { request } = this.props;
-    const patch = { name };
-
+    const patch = {
+      name,
+    };
+    // @ts-expect-error -- TSCONVERSION skip this if request is undefined
     await requestOperations.update(request, patch);
-
-    this.setState({ isEditing: false });
+    this.setState({
+      isEditing: false,
+    });
   }
 
   _handleRequestCreateFromEmpty() {
-    const parentId = this.props.requestGroup._id;
+    const parentId = this.props.requestGroup?._id;
     this.props.requestCreate(parentId);
   }
 
@@ -63,16 +103,19 @@ class SidebarRequestRow extends PureComponent {
       return;
     }
 
+    // @ts-expect-error -- TSCONVERSION skip this if request is undefined
     handleActivateRequest(request._id);
   }
 
   _handleShowRequestSettings() {
-    showModal(RequestSettingsModal, { request: this.props.request });
+    showModal(RequestSettingsModal, {
+      request: this.props.request,
+    });
   }
 
   _getMethodOverrideHeaderValue() {
     const { request } = this.props;
-
+    // @ts-expect-error -- TSCONVERSION skip this if request is undefined or grpc
     const header = getMethodOverrideHeader(request.headers);
 
     if (header) {
@@ -80,6 +123,7 @@ class SidebarRequestRow extends PureComponent {
     }
 
     // If no override, use GraphQL as override if it's a gql request
+    // @ts-expect-error -- TSCONVERSION skip this if request is undefined or grpc
     if (request.body && request.body.mimeType === CONTENT_TYPE_GRAPHQL) {
       return 'GQL';
     }
@@ -87,23 +131,26 @@ class SidebarRequestRow extends PureComponent {
     return null;
   }
 
-  async _debouncedUpdateRenderedUrl(props) {
-    clearTimeout(this._urlUpdateInterval);
-
+  async _debouncedUpdateRenderedUrl(props: Props) {
+    if (this._urlUpdateInterval !== null) {
+      clearTimeout(this._urlUpdateInterval);
+    }
     this._urlUpdateInterval = setTimeout(() => {
       this._updateRenderedUrl(props);
     }, 300);
   }
 
-  async _updateRenderedUrl(props) {
+  async _updateRenderedUrl(props: Props) {
     let renderedUrl;
 
     try {
+      // @ts-expect-error -- TSCONVERSION skip this if request is undefined or grpc
       renderedUrl = await props.handleRender(props.request.url);
     } catch (e) {
       // Certain things, such as invalid variable tags and Prompts
       // without titles will result in a failure to parse. Can't do
       // much else, so let's just give them the unrendered URL
+      // @ts-expect-error -- TSCONVERSION skip this if request is undefined
       renderedUrl = props.request.url;
     }
 
@@ -114,12 +161,15 @@ class SidebarRequestRow extends PureComponent {
 
   setDragDirection(dragDirection) {
     if (dragDirection !== this.state.dragDirection) {
-      this.setState({ dragDirection });
+      this.setState({
+        dragDirection,
+      });
     }
   }
 
   componentDidMount() {
     const { request } = this.props;
+
     if (request && !request.name) {
       this._debouncedUpdateRenderedUrl(this.props);
     }
@@ -132,39 +182,39 @@ class SidebarRequestRow extends PureComponent {
     }
 
     const requestUrl = this.props.request ? this.props.request.url : '';
+
     if (nextProps.request.url !== requestUrl) {
       this._debouncedUpdateRenderedUrl(nextProps);
     }
   }
 
   componentWillUnmount() {
-    clearTimeout(this._urlUpdateInterval);
+    if (this._urlUpdateInterval !== null) {
+      clearTimeout(this._urlUpdateInterval);
+    }
   }
 
   render() {
     const {
-      filter,
-      handleDuplicateRequest,
-      handleSetRequestPinned,
-      handleGenerateCode,
-      handleCopyAsCurl,
+      activeEnvironment,
       connectDragSource,
       connectDropTarget,
+      disableDragAndDrop,
+      filter,
+      handleCopyAsCurl,
+      handleDuplicateRequest,
+      handleGenerateCode,
+      handleSetRequestPinned,
+      hotKeyRegistry,
+      isActive,
       isDragging,
       isDraggingOver,
+      isPinned,
       request,
       requestGroup,
-      isActive,
-      isPinned,
-      disableDragAndDrop,
-      hotKeyRegistry,
-      activeEnvironment,
     } = this.props;
-
     const { dragDirection } = this.state;
-
     let node;
-
     const classes = classnames('sidebar__row', {
       'sidebar__row--dragging': isDragging,
       'sidebar__row--dragging-above': isDraggingOver && dragDirection > 0,
@@ -183,12 +233,11 @@ class SidebarRequestRow extends PureComponent {
       );
     } else {
       const methodTag =
-        request.type === models.grpcRequest.type ? (
+        isGrpcRequest(request) ? (
           <GrpcTag />
         ) : (
           <MethodTag method={request.method} override={this._getMethodOverrideHeaderValue()} />
         );
-
       node = (
         <li className={classes}>
           <div
@@ -232,8 +281,7 @@ class SidebarRequestRow extends PureComponent {
                 request={request}
                 isPinned={isPinned}
                 requestGroup={requestGroup}
-                hotKeyRegistry={hotKeyRegistry}
-                // Necessary for plugin actions to have network capabilities
+                hotKeyRegistry={hotKeyRegistry} // Necessary for plugin actions to have network capabilities
                 activeEnvironment={activeEnvironment}
               />
             </div>
@@ -250,61 +298,34 @@ class SidebarRequestRow extends PureComponent {
     if (disableDragAndDrop) {
       return node;
     } else if (!this.state.isEditing) {
+      // @ts-expect-error -- TSCONVERSION
       return connectDragSource(connectDropTarget(node));
     } else {
+      // @ts-expect-error -- TSCONVERSION
       return connectDropTarget(node);
     }
   }
 }
 
-SidebarRequestRow.propTypes = {
-  // Functions
-  handleActivateRequest: PropTypes.func.isRequired,
-  handleSetRequestPinned: PropTypes.func.isRequired,
-  handleDuplicateRequest: PropTypes.func.isRequired,
-  handleGenerateCode: PropTypes.func.isRequired,
-  handleCopyAsCurl: PropTypes.func.isRequired,
-  handleRender: PropTypes.func.isRequired,
-  requestCreate: PropTypes.func.isRequired,
-  moveDoc: PropTypes.func.isRequired,
-
-  // Other
-  filter: PropTypes.string.isRequired,
-  isActive: PropTypes.bool.isRequired,
-  isPinned: PropTypes.bool.isRequired,
-  hotKeyRegistry: PropTypes.object.isRequired,
-
-  // React DnD
-  isDragging: PropTypes.bool,
-  isDraggingOver: PropTypes.bool,
-  connectDragSource: PropTypes.func,
-  connectDropTarget: PropTypes.func,
-
-  // Optional
-  requestGroup: PropTypes.object,
-  request: PropTypes.object, // can be Request or GrpcRequest
-  disableDragAndDrop: PropTypes.bool,
-};
-
 const dragSource = {
-  beginDrag(props) {
-    return { request: props.request };
+  beginDrag(props: Props) {
+    return {
+      request: props.request,
+    };
   },
 };
 
 function isAbove(monitor, component) {
   const hoveredNode = ReactDOM.findDOMNode(component);
-
+  // @ts-expect-error -- TSCONVERSION
   const hoveredTop = hoveredNode.getBoundingClientRect().top;
   const draggedTop = monitor.getSourceClientOffset().y;
-
   return hoveredTop > draggedTop;
 }
 
 const dragTarget = {
   drop(props, monitor, component) {
     const movingDoc = monitor.getItem().requestGroup || monitor.getItem().request;
-
     const parentId = props.requestGroup ? props.requestGroup._id : props.request.parentId;
     const targetId = props.request ? props.request._id : null;
 
@@ -314,7 +335,8 @@ const dragTarget = {
       props.moveDoc(movingDoc, parentId, targetId, -1);
     }
   },
-  hover(props, monitor, component) {
+
+  hover(_, monitor, component) {
     if (isAbove(monitor, component)) {
       component.setDragDirection(1);
     } else {
diff --git a/packages/insomnia-app/app/ui/components/sidebar/sidebar-sort-dropdown.js b/packages/insomnia-app/app/ui/components/sidebar/sidebar-sort-dropdown.js
deleted file mode 100644
index c3e236912b..0000000000
--- a/packages/insomnia-app/app/ui/components/sidebar/sidebar-sort-dropdown.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// @flow
-import * as React from 'react';
-import { SortOrder, sortOrderName, SORT_ORDERS } from '../../../common/constants';
-import { Dropdown, DropdownButton, DropdownItem } from '../base/dropdown';
-
-type Props = {
-  handleSort: (sortOrder: SortOrder) => void,
-};
-
-const SidebarSortDropdown = (props: Props) => {
-  const { handleSort } = props;
-
-  return (
-    <Dropdown>
-      <DropdownButton className="btn btn--compact">
-        <i className="fa fa-sort" />
-      </DropdownButton>
-      {SORT_ORDERS.map(order => (
-        <DropdownItem onClick={() => handleSort(order)} key={order}>
-          {sortOrderName[order]}
-        </DropdownItem>
-      ))}
-    </Dropdown>
-  );
-};
-
-export default SidebarSortDropdown;
diff --git a/packages/insomnia-app/app/ui/components/sidebar/sidebar-sort-dropdown.tsx b/packages/insomnia-app/app/ui/components/sidebar/sidebar-sort-dropdown.tsx
new file mode 100644
index 0000000000..e304572529
--- /dev/null
+++ b/packages/insomnia-app/app/ui/components/sidebar/sidebar-sort-dropdown.tsx
@@ -0,0 +1,22 @@
+import React, { FunctionComponent } from 'react';
+import { SortOrder, sortOrderName, SORT_ORDERS } from '../../../common/constants';
+import { Dropdown, DropdownButton, DropdownItem } from '../base/dropdown';
+
+interface Props {
+  handleSort: (sortOrder: SortOrder) => void;
+}
+
+const SidebarSortDropdown: FunctionComponent<Props> = ({ handleSort }) => (
+  <Dropdown>
+    <DropdownButton className="btn btn--compact">
+      <i className="fa fa-sort" />
+    </DropdownButton>
+    {SORT_ORDERS.map(order => (
+      <DropdownItem onClick={() => handleSort(order)} key={order}>
+        {sortOrderName[order]}
+      </DropdownItem>
+    ))}
+  </Dropdown>
+);
+
+export default SidebarSortDropdown;
diff --git a/packages/insomnia-app/app/ui/components/sidebar/sidebar.js b/packages/insomnia-app/app/ui/components/sidebar/sidebar.tsx
similarity index 66%
rename from packages/insomnia-app/app/ui/components/sidebar/sidebar.js
rename to packages/insomnia-app/app/ui/components/sidebar/sidebar.tsx
index f642d91cf9..82587b4cc5 100644
--- a/packages/insomnia-app/app/ui/components/sidebar/sidebar.js
+++ b/packages/insomnia-app/app/ui/components/sidebar/sidebar.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import type { HotKeyRegistry } from '../../../common/hotkeys';
 import type { Workspace } from '../../../models/workspace';
@@ -11,23 +10,23 @@ import {
   AUTOBIND_CFG,
 } from '../../../common/constants';
 
-type Props = {|
-  activeEnvironment: Environment | null,
-  children: React.Node,
-  environmentHighlightColorStyle: string,
-  handleSetActiveEnvironment: Function,
-  handleSetActiveWorkspace: Function,
-  hidden: boolean,
-  hotKeyRegistry: HotKeyRegistry,
-  isLoading: boolean,
-  showEnvironmentsModal: Function,
-  unseenWorkspaces: Array<Workspace>,
-  width: number,
-  workspaces: Array<Workspace>,
-|};
+interface Props {
+  activeEnvironment: Environment | null;
+  children: ReactNode;
+  environmentHighlightColorStyle: string;
+  handleSetActiveEnvironment: (...args: Array<any>) => any;
+  handleSetActiveWorkspace: (...args: Array<any>) => any;
+  hidden: boolean;
+  hotKeyRegistry: HotKeyRegistry;
+  isLoading: boolean;
+  showEnvironmentsModal: (...args: Array<any>) => any;
+  unseenWorkspaces: Array<Workspace>;
+  width: number;
+  workspaces: Array<Workspace>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Sidebar extends React.PureComponent<Props> {
+class Sidebar extends PureComponent<Props> {
   render() {
     const {
       activeEnvironment,
@@ -36,7 +35,6 @@ class Sidebar extends React.PureComponent<Props> {
       hidden,
       width,
     } = this.props;
-
     return (
       <aside
         className={classnames('sidebar', 'theme--sidebar', {
@@ -50,7 +48,7 @@ class Sidebar extends React.PureComponent<Props> {
             activeEnvironment.color &&
             environmentHighlightColorStyle === 'sidebar-edge'
               ? '5px solid ' + activeEnvironment.color
-              : null,
+              : undefined,
         }}>
         {children}
       </aside>
diff --git a/packages/insomnia-app/app/ui/components/spec-editor/spec-editor-sidebar.js b/packages/insomnia-app/app/ui/components/spec-editor/spec-editor-sidebar.tsx
similarity index 76%
rename from packages/insomnia-app/app/ui/components/spec-editor/spec-editor-sidebar.js
rename to packages/insomnia-app/app/ui/components/spec-editor/spec-editor-sidebar.tsx
index 5b1601e761..6c06794e6c 100644
--- a/packages/insomnia-app/app/ui/components/spec-editor/spec-editor-sidebar.js
+++ b/packages/insomnia-app/app/ui/components/spec-editor/spec-editor-sidebar.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Component } from 'react';
 import styled from 'styled-components';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
@@ -9,37 +8,40 @@ import { Sidebar } from 'insomnia-components';
 import type { ApiSpec } from '../../../models/api-spec';
 import { trackEvent } from '../../../common/analytics';
 
-type Props = {|
-  apiSpec: ApiSpec,
-  handleSetSelection: (chStart: number, chEnd: number, lineStart: number, lineEnd: number) => void,
-|};
+interface Props {
+  apiSpec: ApiSpec;
+  handleSetSelection: (chStart: number, chEnd: number, lineStart: number, lineEnd: number) => void;
+}
 
-type State = {|
-  error: string,
-|};
+interface State {
+  error: string;
+  specContentJSON: boolean;
+}
 
-const StyledSpecEditorSidebar: React.ComponentType<{}> = styled.div`
+const StyledSpecEditorSidebar = styled.div`
   overflow: hidden;
   overflow-y: auto;
 `;
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SpecEditorSidebar extends React.Component<Props, State> {
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      error: '',
-      specContentJSON: false,
-    };
+class SpecEditorSidebar extends Component<Props, State> {
+  state: State = {
+    error: '',
+    specContentJSON: false,
   }
 
   _handleScrollEditor(pos: {
-    start: { line: number, col: number },
-    end: { line: number, col: number },
+    start: {
+      line: number;
+      col: number;
+    };
+    end: {
+      line: number;
+      col: number;
+    };
   }) {
     trackEvent('Spec Sidebar', 'Navigate');
     const { handleSetSelection } = this.props;
-
     // NOTE: We're subtracting 1 from everything because YAML CST uses
     //   1-based indexing and we use 0-based.
     handleSetSelection(pos.start.col - 1, pos.end.col - 1, pos.start.line - 1, pos.end.line - 1);
@@ -58,17 +60,25 @@ class SpecEditorSidebar extends React.Component<Props, State> {
         col: 200,
       },
     };
+
     // Account for JSON (as string) line number shift
     if (this.state.specContentJSON) {
       scrollPosition.start.line = 1;
     }
-    const specMap = sourceMap.index(YAML.parseDocument(contents, { keepCstNodes: true }));
+
+    const specMap = sourceMap.index(
+      YAML.parseDocument(contents, {
+        keepCstNodes: true,
+      }),
+    );
     const itemMappedPosition = sourceMap.lookup(itemPath, specMap);
     const isServersSection = itemPath[0] === 'servers';
     scrollPosition.start.line += itemMappedPosition.start.line;
+
     if (!isServersSection) {
       scrollPosition.start.line -= 1;
     }
+
     scrollPosition.end.line = scrollPosition.start.line;
 
     this._handleScrollEditor(scrollPosition);
@@ -80,23 +90,29 @@ class SpecEditorSidebar extends React.Component<Props, State> {
 
   componentDidMount() {
     const { contents } = this.props.apiSpec;
+
     try {
       JSON.parse(contents);
     } catch (e) {
-      this.setState({ specContentJSON: false });
+      this.setState({
+        specContentJSON: false,
+      });
       return;
     }
-    this.setState({ specContentJSON: true });
+
+    this.setState({
+      specContentJSON: true,
+    });
   }
 
   render() {
     const { error } = this.state;
+
     if (error) {
       return <p className="notice error margin-sm">{error}</p>;
     }
 
     const specJSON = YAML.parse(this.props.apiSpec.contents);
-
     return (
       <StyledSpecEditorSidebar>
         <Sidebar jsonData={specJSON} onClick={this._handleItemClick} />
diff --git a/packages/insomnia-app/app/ui/components/sync-pull-button.js b/packages/insomnia-app/app/ui/components/sync-pull-button.tsx
similarity index 74%
rename from packages/insomnia-app/app/ui/components/sync-pull-button.js
rename to packages/insomnia-app/app/ui/components/sync-pull-button.tsx
index 14a388a1a7..da2a19b64f 100644
--- a/packages/insomnia-app/app/ui/components/sync-pull-button.js
+++ b/packages/insomnia-app/app/ui/components/sync-pull-button.tsx
@@ -1,38 +1,39 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../common/constants';
 import VCS from '../../sync/vcs';
 import { showError } from './modals';
 
-type Props = {
-  vcs: VCS,
-  branch: string,
-  onPull: Function,
-  disabled?: boolean,
-  className?: string,
-  children?: React.Node,
-};
+interface Props {
+  vcs: VCS;
+  branch: string;
+  onPull: (...args: Array<any>) => any;
+  disabled?: boolean;
+  className?: string;
+  children?: ReactNode;
+}
 
-type State = {
-  loading: boolean,
-};
+interface State {
+  loading: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class SyncPullButton extends React.PureComponent<Props, State> {
-  _timeout: TimeoutID;
-  state = {
+class SyncPullButton extends PureComponent<Props, State> {
+  _timeout: NodeJS.Timeout | null = null;
+
+  state: State = {
     loading: false,
   };
 
   async _handleClick() {
     const { vcs, onPull, branch } = this.props;
-
-    this.setState({ loading: true });
+    this.setState({
+      loading: true,
+    });
     const newVCS = vcs.newInstance();
     const oldBranch = await newVCS.getBranch();
-
     let failed = false;
+
     try {
       // Clone old VCS so we don't mess anything up while working on other projects
       await newVCS.checkout([], branch);
@@ -53,7 +54,9 @@ class SyncPullButton extends React.PureComponent<Props, State> {
 
     // Do this a bit later so the loading doesn't seem to stop too early
     this._timeout = setTimeout(() => {
-      this.setState({ loading: false });
+      this.setState({
+        loading: false,
+      });
     }, 400);
 
     if (!failed) {
@@ -62,7 +65,9 @@ class SyncPullButton extends React.PureComponent<Props, State> {
   }
 
   componentWillUnmount() {
-    clearTimeout(this._timeout);
+    if (this._timeout !== null) {
+      clearTimeout(this._timeout);
+    }
   }
 
   render() {
diff --git a/packages/insomnia-app/app/ui/components/tags/grpc-method-tag.js b/packages/insomnia-app/app/ui/components/tags/grpc-method-tag.tsx
similarity index 75%
rename from packages/insomnia-app/app/ui/components/tags/grpc-method-tag.js
rename to packages/insomnia-app/app/ui/components/tags/grpc-method-tag.tsx
index 686b8653e1..ef61c39fdf 100644
--- a/packages/insomnia-app/app/ui/components/tags/grpc-method-tag.js
+++ b/packages/insomnia-app/app/ui/components/tags/grpc-method-tag.tsx
@@ -1,21 +1,19 @@
-// @flow
-import React from 'react';
+import React, { FunctionComponent } from 'react';
 import { Tooltip } from 'insomnia-components';
-
 import type { GrpcMethodType } from '../../../network/grpc/method';
 import { GrpcMethodTypeAcronym, GrpcMethodTypeName } from '../../../network/grpc/method';
 import styled from 'styled-components';
 
-type Props = {
-  methodType: GrpcMethodType,
-};
+interface Props {
+  methodType: GrpcMethodType;
+}
 
 const StyledTag = styled.div`
   width: 1.5em;
   text-align: right;
 `;
 
-const GrpcMethodTag = ({ methodType }: Props) => (
+const GrpcMethodTag: FunctionComponent<Props> = ({ methodType }) => (
   <Tooltip message={GrpcMethodTypeName[methodType]} position="left" delay={500}>
     <StyledTag>
       <em>{GrpcMethodTypeAcronym[methodType]}</em>
diff --git a/packages/insomnia-app/app/ui/components/tags/grpc-status-tag.js b/packages/insomnia-app/app/ui/components/tags/grpc-status-tag.js
deleted file mode 100644
index 4395d49b8d..0000000000
--- a/packages/insomnia-app/app/ui/components/tags/grpc-status-tag.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// @flow
-import * as React from 'react';
-import classnames from 'classnames';
-import Tooltip from '../tooltip';
-import { GrpcStatusEnum } from '../../../network/grpc/service-error';
-
-type Props = {
-  statusCode: number,
-
-  // Optional
-  small?: boolean,
-  statusMessage?: string,
-  tooltipDelay?: number,
-};
-
-class GrpcStatusTag extends React.PureComponent<Props> {
-  render() {
-    const { statusMessage, statusCode, small, tooltipDelay } = this.props;
-
-    const colorClass = statusCode === GrpcStatusEnum.OK ? 'bg-success' : 'bg-danger';
-    const message = statusCode === GrpcStatusEnum.OK ? 'OK' : statusMessage;
-
-    return (
-      <div className={classnames('tag', colorClass, { 'tag--small': small })}>
-        <Tooltip message={message} position="bottom" delay={tooltipDelay}>
-          <strong>{statusCode} </strong>
-          {message}
-        </Tooltip>
-      </div>
-    );
-  }
-}
-
-export default GrpcStatusTag;
diff --git a/packages/insomnia-app/app/ui/components/tags/grpc-status-tag.tsx b/packages/insomnia-app/app/ui/components/tags/grpc-status-tag.tsx
new file mode 100644
index 0000000000..75efb41c62
--- /dev/null
+++ b/packages/insomnia-app/app/ui/components/tags/grpc-status-tag.tsx
@@ -0,0 +1,32 @@
+import React, { PureComponent } from 'react';
+import classnames from 'classnames';
+import Tooltip from '../tooltip';
+import { status } from '@grpc/grpc-js';
+
+interface Props {
+  statusCode?: number;
+  small?: boolean;
+  statusMessage?: string;
+  tooltipDelay?: number;
+}
+
+class GrpcStatusTag extends PureComponent<Props> {
+  render() {
+    const { statusMessage, statusCode, small, tooltipDelay } = this.props;
+    const colorClass = statusCode === status.OK ? 'bg-success' : 'bg-danger';
+    const message = statusCode === status.OK ? 'OK' : statusMessage;
+    return (
+      <div
+        className={classnames('tag', colorClass, {
+          'tag--small': small,
+        })}>
+        <Tooltip message={message} position="bottom" delay={tooltipDelay}>
+          <strong>{statusCode} </strong>
+          {message}
+        </Tooltip>
+      </div>
+    );
+  }
+}
+
+export default GrpcStatusTag;
diff --git a/packages/insomnia-app/app/ui/components/tags/grpc-tag.js b/packages/insomnia-app/app/ui/components/tags/grpc-tag.tsx
similarity index 78%
rename from packages/insomnia-app/app/ui/components/tags/grpc-tag.js
rename to packages/insomnia-app/app/ui/components/tags/grpc-tag.tsx
index bb4b89aab1..13012bc937 100644
--- a/packages/insomnia-app/app/ui/components/tags/grpc-tag.js
+++ b/packages/insomnia-app/app/ui/components/tags/grpc-tag.tsx
@@ -1,7 +1,10 @@
 import React from 'react';
 
 const GrpcTag = () => (
-  <div style={{ position: 'relative' }}>
+  <div
+    style={{
+      position: 'relative',
+    }}>
     <div className="tag tag--no-bg tag--small method-grpc">
       <span className="tag__inner">gRPC</span>
     </div>
diff --git a/packages/insomnia-app/app/ui/components/tags/method-tag.js b/packages/insomnia-app/app/ui/components/tags/method-tag.tsx
similarity index 75%
rename from packages/insomnia-app/app/ui/components/tags/method-tag.js
rename to packages/insomnia-app/app/ui/components/tags/method-tag.tsx
index c8a3aa06eb..918e40ea29 100644
--- a/packages/insomnia-app/app/ui/components/tags/method-tag.js
+++ b/packages/insomnia-app/app/ui/components/tags/method-tag.tsx
@@ -1,11 +1,15 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import * as util from '../../../common/misc';
 
-class MethodTag extends PureComponent {
+interface Props {
+  method: string;
+  override?: string | null;
+  fullNames?: boolean;
+}
+
+class MethodTag extends PureComponent<Props> {
   render() {
     const { method, override, fullNames } = this.props;
-
     let methodName = method;
     let overrideName = override;
 
@@ -15,7 +19,10 @@ class MethodTag extends PureComponent {
     }
 
     return (
-      <div style={{ position: 'relative' }}>
+      <div
+        style={{
+          position: 'relative',
+        }}>
         {overrideName && (
           <div className={'tag tag--no-bg tag--superscript http-method-' + method}>
             <span>{methodName}</span>
@@ -30,12 +37,4 @@ class MethodTag extends PureComponent {
   }
 }
 
-MethodTag.propTypes = {
-  method: PropTypes.string.isRequired,
-
-  // Optional
-  override: PropTypes.string,
-  fullNames: PropTypes.bool,
-};
-
 export default MethodTag;
diff --git a/packages/insomnia-app/app/ui/components/tags/size-tag.js b/packages/insomnia-app/app/ui/components/tags/size-tag.tsx
similarity index 75%
rename from packages/insomnia-app/app/ui/components/tags/size-tag.js
rename to packages/insomnia-app/app/ui/components/tags/size-tag.tsx
index 437b6d1ee2..4478eb1653 100644
--- a/packages/insomnia-app/app/ui/components/tags/size-tag.js
+++ b/packages/insomnia-app/app/ui/components/tags/size-tag.tsx
@@ -1,28 +1,22 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import * as misc from '../../../common/misc';
 import Tooltip from '../tooltip';
 
-type Props = {
-  bytesRead: number,
-  bytesContent: number,
+interface Props {
+  bytesRead: number;
+  bytesContent: number;
+  small?: boolean;
+  className?: string;
+  tooltipDelay?: number;
+}
 
-  // Optional
-  small?: boolean,
-  className?: string,
-  tooltipDelay?: number,
-};
-
-class SizeTag extends React.PureComponent<Props> {
+class SizeTag extends PureComponent<Props> {
   render() {
     const { bytesRead, bytesContent, small, className, tooltipDelay } = this.props;
-
     const responseSizeReadStringShort = misc.describeByteSize(bytesRead);
-
     const responseSizeReadString = misc.describeByteSize(bytesRead, true);
     const responseSizeRawString = misc.describeByteSize(bytesContent, true);
-
     const message = (
       <table>
         <tbody>
@@ -40,7 +34,14 @@ class SizeTag extends React.PureComponent<Props> {
       </table>
     );
     return (
-      <div className={classnames('tag', { 'tag--small': small }, className)}>
+      <div
+        className={classnames(
+          'tag',
+          {
+            'tag--small': small,
+          },
+          className,
+        )}>
         <Tooltip message={message} position="bottom" delay={tooltipDelay}>
           {responseSizeReadStringShort}
         </Tooltip>
diff --git a/packages/insomnia-app/app/ui/components/tags/status-tag.js b/packages/insomnia-app/app/ui/components/tags/status-tag.tsx
similarity index 77%
rename from packages/insomnia-app/app/ui/components/tags/status-tag.js
rename to packages/insomnia-app/app/ui/components/tags/status-tag.tsx
index 84d522bd24..fbc4ce5e63 100644
--- a/packages/insomnia-app/app/ui/components/tags/status-tag.js
+++ b/packages/insomnia-app/app/ui/components/tags/status-tag.tsx
@@ -1,46 +1,48 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import { RESPONSE_CODE_DESCRIPTIONS, RESPONSE_CODE_REASONS } from '../../../common/constants';
 import Tooltip from '../tooltip';
 
-type Props = {
-  statusCode: number,
+interface Props {
+  statusCode: number;
+  small?: boolean;
+  statusMessage?: string;
+  tooltipDelay?: number;
+}
 
-  // Optional
-  small?: boolean,
-  statusMessage?: string,
-  tooltipDelay?: number,
-};
-
-class StatusTag extends React.PureComponent<Props> {
+class StatusTag extends PureComponent<Props> {
   render() {
     const { statusMessage, statusCode, small, tooltipDelay } = this.props;
-
     let colorClass;
-    let statusCodeToDisplay = statusCode;
-
+    let statusCodeToDisplay: string | number = statusCode;
     const firstChar = (statusCode + '')[0] || '';
+
     switch (firstChar) {
       case '1':
         colorClass = 'bg-info';
         break;
+
       case '2':
         colorClass = 'bg-success';
         break;
+
       case '3':
         colorClass = 'bg-surprise';
         break;
+
       case '4':
         colorClass = 'bg-warning';
         break;
+
       case '5':
         colorClass = 'bg-danger';
         break;
+
       case '0':
         colorClass = 'bg-danger';
         statusCodeToDisplay = '';
         break;
+
       default:
         colorClass = 'bg-surprise';
         statusCodeToDisplay = '';
@@ -48,9 +50,11 @@ class StatusTag extends React.PureComponent<Props> {
     }
 
     const description = RESPONSE_CODE_DESCRIPTIONS[statusCode] || 'Unknown Response Code';
-
     return (
-      <div className={classnames('tag', colorClass, { 'tag--small': small })}>
+      <div
+        className={classnames('tag', colorClass, {
+          'tag--small': small,
+        })}>
         <Tooltip message={description} position="bottom" delay={tooltipDelay}>
           <strong>{statusCodeToDisplay}</strong>{' '}
           {statusMessage || RESPONSE_CODE_REASONS[statusCode]}
diff --git a/packages/insomnia-app/app/ui/components/tags/time-tag.js b/packages/insomnia-app/app/ui/components/tags/time-tag.tsx
similarity index 72%
rename from packages/insomnia-app/app/ui/components/tags/time-tag.js
rename to packages/insomnia-app/app/ui/components/tags/time-tag.tsx
index bc25c57b7c..e6b1145c52 100644
--- a/packages/insomnia-app/app/ui/components/tags/time-tag.js
+++ b/packages/insomnia-app/app/ui/components/tags/time-tag.tsx
@@ -1,21 +1,17 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import Tooltip from '../tooltip';
 
-type Props = {
-  milliseconds: number,
+interface Props {
+  milliseconds: number;
+  small?: boolean;
+  className?: string;
+  tooltipDelay?: number;
+}
 
-  // Optional
-  small?: boolean,
-  className?: string,
-  tooltipDelay?: number,
-};
-
-class TimeTag extends React.PureComponent<Props> {
+class TimeTag extends PureComponent<Props> {
   render() {
     const { milliseconds, small, className, tooltipDelay } = this.props;
-
     let unit = 'ms';
     let number = milliseconds;
 
@@ -38,7 +34,14 @@ class TimeTag extends React.PureComponent<Props> {
 
     const description = `${milliseconds.toFixed(3)} milliseconds`;
     return (
-      <div className={classnames('tag', { 'tag--small': small }, className)}>
+      <div
+        className={classnames(
+          'tag',
+          {
+            'tag--small': small,
+          },
+          className,
+        )}>
         <Tooltip message={description} position="bottom" delay={tooltipDelay}>
           {number}&nbsp;{unit}
         </Tooltip>
diff --git a/packages/insomnia-app/app/ui/components/tags/url-tag.js b/packages/insomnia-app/app/ui/components/tags/url-tag.tsx
similarity index 57%
rename from packages/insomnia-app/app/ui/components/tags/url-tag.js
rename to packages/insomnia-app/app/ui/components/tags/url-tag.tsx
index 2aea953b6e..e5de5b59fa 100644
--- a/packages/insomnia-app/app/ui/components/tags/url-tag.js
+++ b/packages/insomnia-app/app/ui/components/tags/url-tag.tsx
@@ -1,23 +1,19 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import classnames from 'classnames';
 import Tooltip from '../tooltip';
 
-type Props = {
-  url: string,
+interface Props {
+  url: string;
+  small?: boolean;
+  className?: string;
+  maxLength?: number;
+  method?: string;
+  tooltipDelay?: number;
+}
 
-  // Optional
-  small?: boolean,
-  className?: string,
-  maxLength?: number,
-  method?: string,
-  tooltipDelay?: number,
-};
-
-class URLTag extends React.PureComponent<Props> {
+class URLTag extends PureComponent<Props> {
   render() {
     const { url, small, className, maxLength, method, tooltipDelay } = this.props;
-
     const max = maxLength || 30;
     let shortUrl = url;
 
@@ -26,7 +22,14 @@ class URLTag extends React.PureComponent<Props> {
     }
 
     return (
-      <div className={classnames('tag', { 'tag--small': small }, className)}>
+      <div
+        className={classnames(
+          'tag',
+          {
+            'tag--small': small,
+          },
+          className,
+        )}>
         <Tooltip wide message={url} position="bottom" delay={tooltipDelay}>
           <strong>{method || 'URL'}</strong> {shortUrl}
         </Tooltip>
diff --git a/packages/insomnia-app/app/ui/components/templating/tag-editor.js b/packages/insomnia-app/app/ui/components/templating/tag-editor.tsx
similarity index 88%
rename from packages/insomnia-app/app/ui/components/templating/tag-editor.js
rename to packages/insomnia-app/app/ui/components/templating/tag-editor.tsx
index 2c0d2c35c5..b4017313c3 100644
--- a/packages/insomnia-app/app/ui/components/templating/tag-editor.js
+++ b/packages/insomnia-app/app/ui/components/templating/tag-editor.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import classnames from 'classnames';
@@ -11,7 +10,7 @@ import type {
   NunjucksParsedTagArg,
 } from '../../../templating/utils';
 import * as templateUtils from '../../../templating/utils';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import * as models from '../../../models';
 import HelpTooltip from '../help-tooltip';
 import { delay, fnOrString } from '../../../common/misc';
@@ -26,50 +25,49 @@ import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base
 import FileInputButton from '../base/file-input-button';
 import { getTemplateTags } from '../../../plugins';
 import * as pluginContexts from '../../../plugins/context';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
 
-type Props = {
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  defaultValue: string,
-  onChange: Function,
-  workspace: Workspace,
-};
+interface Props {
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  defaultValue: string;
+  onChange: (...args: Array<any>) => any;
+  workspace: Workspace;
+}
 
-type State = {
-  activeTagData: NunjucksParsedTag | null,
-  activeTagDefinition: NunjucksParsedTag | null,
-  tagDefinitions: Array<Object>,
-  loadingDocs: boolean,
-  allDocs: { [string]: Array<BaseModel> },
-  rendering: boolean,
-  preview: string,
-  error: string,
-  variables: Array<{ name: string, value: string }>,
-};
+interface State {
+  activeTagData: NunjucksParsedTag | null;
+  activeTagDefinition: NunjucksParsedTag | null;
+  tagDefinitions: Array<NunjucksParsedTag>;
+  loadingDocs: boolean;
+  allDocs: Record<string, Array<BaseModel>>;
+  rendering: boolean;
+  preview: string;
+  error: string;
+  variables: Array<{
+    name: string;
+    value: string;
+  }>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class TagEditor extends React.PureComponent<Props, State> {
-  _select: ?HTMLSelectElement;
+class TagEditor extends PureComponent<Props, State> {
+  _select: HTMLSelectElement | null = null;
 
-  constructor(props: Props) {
-    super(props);
-
-    this.state = {
-      activeTagData: null,
-      activeTagDefinition: null,
-      tagDefinitions: [],
-      loadingDocs: false,
-      allDocs: {},
-      rendering: true,
-      preview: '',
-      error: '',
-      variables: [],
-    };
+  state: State = {
+    activeTagData: null,
+    activeTagDefinition: null,
+    tagDefinitions: [],
+    loadingDocs: false,
+    allDocs: {},
+    rendering: true,
+    preview: '',
+    error: '',
+    variables: [],
   }
 
   async load() {
     const activeTagData = templateUtils.tokenizeTag(this.props.defaultValue);
-
     const tagDefinitions = await templating.getTagDefinitions();
     const activeTagDefinition: NunjucksParsedTag | null =
       tagDefinitions.find(d => d.name === activeTagData.name) || null;
@@ -88,7 +86,9 @@ class TagEditor extends React.PureComponent<Props, State> {
   async loadVariables() {
     const context = await this.props.handleGetRenderContext();
     const variables = context.keys;
-    this.setState({ variables });
+    this.setState({
+      variables,
+    });
   }
 
   componentDidMount() {
@@ -115,23 +115,25 @@ class TagEditor extends React.PureComponent<Props, State> {
   }
 
   _sortRequests(_models: Array<Request | RequestGroup>, parentId: string) {
-    let sortedModels = [];
+    let sortedModels: Array<Request | RequestGroup> = [];
+
     _models
       .filter(model => model.parentId === parentId)
       .sort(metaSortKeySort)
       .forEach(model => {
         if (isRequest(model)) sortedModels.push(model);
-        if (isRequestGroup(model))
-          sortedModels = sortedModels.concat(this._sortRequests(_models, model._id));
+        if (isRequestGroup(model)) { sortedModels = sortedModels.concat(this._sortRequests(_models, model._id)); }
       });
 
     return sortedModels;
   }
 
   async _refreshModels(workspace: Workspace) {
-    this.setState({ loadingDocs: true });
-
+    this.setState({
+      loadingDocs: true,
+    });
     const allDocs = {};
+
     for (const type of models.types()) {
       allDocs[type] = [];
     }
@@ -142,7 +144,9 @@ class TagEditor extends React.PureComponent<Props, State> {
 
     const requests = allDocs[models.request.type] || [];
     const requestGroups = allDocs[models.requestGroup.type] || [];
+
     const sortedReqs = this._sortRequests(requests.concat(requestGroups), this.props.workspace._id);
+
     allDocs[models.request.type] = sortedReqs;
     this.setState({
       allDocs,
@@ -154,17 +158,21 @@ class TagEditor extends React.PureComponent<Props, State> {
     argValue: string | number | boolean,
     argIndex: number,
     forceNewType: string | null = null,
-    patch: Object = {},
+    patch: Record<string, any> = {},
   ) {
     const { tagDefinitions, activeTagData, activeTagDefinition } = this.state;
 
     if (!activeTagData) {
-      console.warn('No active tag data to update', { state: this.state });
+      console.warn('No active tag data to update', {
+        state: this.state,
+      });
       return;
     }
 
     if (!activeTagDefinition) {
-      console.warn('No active tag definition to update', { state: this.state });
+      console.warn('No active tag definition to update', {
+        state: this.state,
+      });
       return;
     }
 
@@ -175,10 +183,12 @@ class TagEditor extends React.PureComponent<Props, State> {
 
     // Ensure all arguments exist
     const defaultArgs = TagEditor._getDefaultTagData(activeTagDefinition).args;
+
     for (let i = 0; i < defaultArgs.length; i++) {
       if (activeTagData.args[i]) {
         continue;
       }
+
       activeTagData.args[i] = defaultArgs[i];
     }
 
@@ -200,18 +210,26 @@ class TagEditor extends React.PureComponent<Props, State> {
     // Update type if we need to
     if (forceNewType) {
       // Ugh, what a hack (because it's enum)
-      Object.assign((argData: any), { type: forceNewType }, patch);
+      Object.assign(
+        argData as any,
+        {
+          type: forceNewType,
+        },
+        patch,
+      );
     }
 
     await this._update(tagDefinitions, activeTagDefinition, tagData, false);
   }
 
-  async _handleChangeArgVariable(options: { argIndex: number, variable: boolean }) {
+  async _handleChangeArgVariable(options: { argIndex: number; variable: boolean }) {
     const { variable, argIndex } = options;
     const { activeTagData, activeTagDefinition, variables } = this.state;
 
     if (!activeTagData || !activeTagDefinition) {
-      console.warn('Failed to change arg variable', { state: this.state });
+      console.warn('Failed to change arg variable', {
+        state: this.state,
+      });
       return;
     }
 
@@ -228,7 +246,9 @@ class TagEditor extends React.PureComponent<Props, State> {
       const initialType = argDef ? argDef.type : 'string';
       const variable = variables.find(v => v.name === existingValue);
       const value = variable ? variable.value : '';
-      return this._updateArg(value, argIndex, initialType, { quotedBy: "'" });
+      return this._updateArg(value, argIndex, initialType, {
+        quotedBy: "'",
+      });
     }
   }
 
@@ -236,9 +256,10 @@ class TagEditor extends React.PureComponent<Props, State> {
     return this._updateArg(path, argIndex);
   }
 
-  _handleChange(e: SyntheticEvent<HTMLInputElement>) {
+  _handleChange(e: React.SyntheticEvent<HTMLInputElement | HTMLSelectElement>) {
     const parent = e.currentTarget.parentNode;
     let argIndex = -1;
+
     if (parent instanceof HTMLElement) {
       const index = parent && parent.getAttribute('data-arg-index');
       argIndex = typeof index === 'string' ? parseInt(index, 10) : -1;
@@ -256,15 +277,15 @@ class TagEditor extends React.PureComponent<Props, State> {
     if (e.currentTarget.type === 'number') {
       return this._updateArg(parseFloat(e.currentTarget.value), argIndex);
     } else if (e.currentTarget.type === 'checkbox') {
+      // @ts-expect-error -- TSCONVERSION .checked doesn't exist on HTMLSelectElement
       return this._updateArg(e.currentTarget.checked, argIndex);
     } else {
       return this._updateArg(e.currentTarget.value, argIndex);
     }
   }
 
-  _handleChangeCustomArg(e: SyntheticEvent<HTMLInputElement>) {
+  _handleChangeCustomArg(e: React.SyntheticEvent<HTMLInputElement>) {
     const { tagDefinitions, activeTagData, activeTagDefinition } = this.state;
-
     const tagData: NunjucksParsedTag | null = clone(activeTagData);
 
     if (tagData) {
@@ -274,30 +295,27 @@ class TagEditor extends React.PureComponent<Props, State> {
     this._update(tagDefinitions, activeTagDefinition, tagData, false);
   }
 
-  async _handleChangeTag(e: SyntheticEvent<HTMLInputElement>) {
+  async _handleChangeTag(e: React.SyntheticEvent<HTMLInputElement | HTMLSelectElement>) {
     const name = e.currentTarget.value;
     const tagDefinitions = await templating.getTagDefinitions();
     const tagDefinition = tagDefinitions.find(d => d.name === name) || null;
+
     this._update(this.state.tagDefinitions, tagDefinition, null, false);
   }
 
   async _handleActionClick(action: NunjucksActionTag) {
     const templateTags = await getTemplateTags();
     const activeTemplateTag = templateTags.find(({ templateTag }) => {
-      return templateTag.name === this.state.activeTagData.name;
+      return templateTag.name === this.state.activeTagData?.name;
     });
-
-    const helperContext = {
-      ...pluginContexts.store.init(activeTemplateTag.plugin),
-    };
-
+    // @ts-expect-error -- TSCONVERSION activeTemplateTag can be undefined
+    const helperContext: pluginContexts.PluginStore = { ...pluginContexts.store.init(activeTemplateTag.plugin) };
     await action.run(helperContext);
     return this._handleRefresh();
   }
 
-  _setSelectRef(n: ?HTMLSelectElement) {
+  _setSelectRef(n: HTMLSelectElement) {
     this._select = n;
-
     // Let it render, then focus the input
     setTimeout(() => {
       if (this._select instanceof HTMLSelectElement) {
@@ -311,7 +329,6 @@ class TagEditor extends React.PureComponent<Props, State> {
       tagDefinition.name,
       tagDefinition.args,
     );
-
     return templateUtils.tokenizeTag(defaultFill);
   }
 
@@ -319,19 +336,21 @@ class TagEditor extends React.PureComponent<Props, State> {
     tagDefinitions: Array<NunjucksParsedTag>,
     tagDefinition: NunjucksParsedTag | null,
     tagData: NunjucksParsedTag | null,
-    noCallback: boolean = false,
+    noCallback = false,
   ) {
     const { handleRender } = this.props;
-    this.setState({ rendering: true });
-
+    this.setState({
+      rendering: true,
+    });
     // Start render loader
     const start = Date.now();
-    this.setState({ rendering: true });
-
+    this.setState({
+      rendering: true,
+    });
     let preview = '';
     let error = '';
-
     let activeTagData: NunjucksParsedTag | null = tagData;
+
     if (!activeTagData && tagDefinition) {
       activeTagData = TagEditor._getDefaultTagData(tagDefinition);
     } else if (!activeTagData && !tagDefinition && this.state.activeTagData) {
@@ -344,6 +363,7 @@ class TagEditor extends React.PureComponent<Props, State> {
     }
 
     let template;
+
     if (activeTagData) {
       try {
         template =
@@ -431,7 +451,7 @@ class TagEditor extends React.PureComponent<Props, State> {
   renderArgFile(
     value: string,
     argIndex: number,
-    itemTypes?: Array<string>,
+    itemTypes?: Array<'file' | 'directory'>,
     extensions?: Array<string>,
   ) {
     return (
@@ -449,8 +469,8 @@ class TagEditor extends React.PureComponent<Props, State> {
 
   renderArgEnum(value: string, options: Array<PluginArgumentEnumOption>) {
     const argDatas = this.state.activeTagData ? this.state.activeTagData.args : [];
+    let unsetOption: ReactNode = null;
 
-    let unsetOption = null;
     if (!options.find(o => o.value === value)) {
       unsetOption = <option value="">-- Select Option --</option>;
     }
@@ -461,6 +481,7 @@ class TagEditor extends React.PureComponent<Props, State> {
         {options.map(option => {
           let label: string;
           const { description } = option;
+
           if (description) {
             label = `${fnOrString(option.displayName, argDatas)} – ${description}`;
           } else {
@@ -468,6 +489,7 @@ class TagEditor extends React.PureComponent<Props, State> {
           }
 
           return (
+            // @ts-expect-error -- TSCONVERSION boolean not accepted by option
             <option key={option.value.toString()} value={option.value}>
               {label}
             </option>
@@ -477,16 +499,18 @@ class TagEditor extends React.PureComponent<Props, State> {
     );
   }
 
-  resolveRequestGroupPrefix(requestGroupId: string, allRequestGroups: Array<any>): string {
+  resolveRequestGroupPrefix(requestGroupId: string, allRequestGroups: Array<any>) {
     let prefix = '';
     let reqGroup: any;
 
     do {
       // Get prefix from inner most request group.
       reqGroup = allRequestGroups.find(rg => rg._id === requestGroupId);
+
       if (reqGroup == null) {
         break;
       }
+
       const name = typeof reqGroup.name === 'string' ? reqGroup.name : '';
       prefix = `[${name}] ` + prefix;
       requestGroupId = reqGroup.parentId;
@@ -512,7 +536,7 @@ class TagEditor extends React.PureComponent<Props, State> {
       <select value={id} onChange={this._handleChange}>
         <option value="n/a">-- Select Item --</option>
         {docs.map((doc: any) => {
-          let namePrefix = null;
+          let namePrefix: string | null = null;
 
           // Show paren't folder with name if it's a request
           if (doc.type === models.request.type) {
@@ -548,10 +572,12 @@ class TagEditor extends React.PureComponent<Props, State> {
     }
 
     let argData: NunjucksParsedTagArg;
+
     if (argIndex < argDatas.length) {
       argData = argDatas[argIndex];
     } else if (this.state.activeTagDefinition) {
       const defaultTagData = TagEditor._getDefaultTagData(this.state.activeTagDefinition);
+
       argData = defaultTagData.args[argIndex];
     } else {
       return null;
@@ -569,9 +595,9 @@ class TagEditor extends React.PureComponent<Props, State> {
     const strValue = templateUtils.decodeEncoding(argData.value.toString());
     const isVariable = argData.type === 'variable';
     const argInputVariable = isVariable ? this.renderArgVariable(strValue) : null;
-
     let argInput;
     let isVariableAllowed = true;
+
     if (argDefinition.type === 'string') {
       const placeholder =
         typeof argDefinition.placeholder === 'string' ? argDefinition.placeholder : '';
@@ -606,15 +632,14 @@ class TagEditor extends React.PureComponent<Props, State> {
       typeof argDefinition.help === 'string' || typeof argDefinition.help === 'function'
         ? fnOrString(argDefinition.help, argDatas)
         : '';
-
     const displayName =
       typeof argDefinition.displayName === 'string' ||
       typeof argDefinition.displayName === 'function'
         ? fnOrString(argDefinition.displayName, argDatas)
         : '';
-
     let validationError = '';
     const canValidate = argDefinition.type === 'string' || argDefinition.type === 'number';
+
     if (canValidate && typeof argDefinition.validate === 'function') {
       validationError = argDefinition.validate(strValue) || '';
     }
@@ -624,7 +649,6 @@ class TagEditor extends React.PureComponent<Props, State> {
       'form-control--thin': argDefinition.type === 'boolean',
       'form-control--outlined': argDefinition.type !== 'boolean',
     });
-
     return (
       <div key={argIndex} className="form-row">
         <div className={formControlClasses}>
@@ -669,7 +693,7 @@ class TagEditor extends React.PureComponent<Props, State> {
     );
   }
 
-  renderActions(actions = []) {
+  renderActions(actions: Array<NunjucksActionTag> = []) {
     return (
       <div className="form-row">
         <div className="form-control">
@@ -680,10 +704,9 @@ class TagEditor extends React.PureComponent<Props, State> {
     );
   }
 
-  renderAction(action: NunjucksActionTag, index: number) {
+  renderAction(action: NunjucksActionTag) {
     const name = action.name;
     const icon = action.icon ? <i className={action.icon} /> : undefined;
-
     return (
       <button
         key={name}
@@ -704,6 +727,7 @@ class TagEditor extends React.PureComponent<Props, State> {
     }
 
     let finalPreview = preview;
+
     if (activeTagDefinition && activeTagDefinition.disablePreview) {
       finalPreview = activeTagDefinition.disablePreview(activeTagData.args)
         ? preview.replace(/./g, '*')
@@ -711,6 +735,7 @@ class TagEditor extends React.PureComponent<Props, State> {
     }
 
     let previewElement;
+
     if (error) {
       previewElement = <textarea className="danger" value={error || 'Error'} readOnly rows={5} />;
     } else if (rendering) {
diff --git a/packages/insomnia-app/app/ui/components/templating/variable-editor.js b/packages/insomnia-app/app/ui/components/templating/variable-editor.tsx
similarity index 77%
rename from packages/insomnia-app/app/ui/components/templating/variable-editor.js
rename to packages/insomnia-app/app/ui/components/templating/variable-editor.tsx
index e29fe49c86..49d21f2805 100644
--- a/packages/insomnia-app/app/ui/components/templating/variable-editor.js
+++ b/packages/insomnia-app/app/ui/components/templating/variable-editor.tsx
@@ -1,25 +1,43 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { createRef, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
+
+interface Props {
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  defaultValue: string;
+  onChange: Function;
+}
+
+interface State {
+  variables: Array<any>;
+  value: string;
+  preview: string;
+  error: string;
+  variableSource: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class VariableEditor extends PureComponent {
-  constructor(props) {
-    super(props);
-    this.textAreaRef = React.createRef();
-    const inner = props.defaultValue.replace(/\s*}}$/, '').replace(/^{{\s*/, '');
+class VariableEditor extends PureComponent<Props, State> {
+  textAreaRef = createRef<HTMLTextAreaElement>();
+  _select: HTMLSelectElement | null = null;
 
+  constructor(props: Props) {
+    super(props);
+    const inner = props.defaultValue.replace(/\s*}}$/, '').replace(/^{{\s*/, '');
     this.state = {
       variables: [],
       value: `{{ ${inner} }}`,
       preview: '',
       error: '',
+      variableSource: '',
     };
   }
 
   componentDidMount() {
     this._update(this.state.value, true);
+
     this._resize();
   }
 
@@ -29,23 +47,25 @@ class VariableEditor extends PureComponent {
 
   _handleChange(e) {
     const name = e.target.value;
+
     this._update(name);
   }
 
   _resize() {
     setTimeout(() => {
       const element = this.textAreaRef.current;
+      // @ts-expect-error -- TSCONVERSION null coalesce
       element.style.cssText = 'height:auto';
+      // @ts-expect-error -- TSCONVERSION null coalesce
       element.style.cssText = `height:${element.scrollHeight}px;overflow:hidden`;
     }, 200);
   }
 
-  _setSelectRef(n) {
+  _setSelectRef(n: HTMLSelectElement) {
     this._select = n;
-
     // Let it render, then focus the input
     setTimeout(() => {
-      this._select && this._select.focus();
+      this._select?.focus();
     }, 100);
   }
 
@@ -69,9 +89,16 @@ class VariableEditor extends PureComponent {
     const context = await this.props.handleGetRenderContext();
     const variables = context.keys.sort((a, b) => (a.name < b.name ? -1 : 1));
     const variableSource = context.context.getKeysContext().keyContext[cleanedValue] || '';
+
     // Hack to skip updating if we unmounted for some reason
     if (this._select) {
-      this.setState({ preview, error, variables, value, variableSource });
+      this.setState({
+        preview,
+        error,
+        variables,
+        value,
+        variableSource,
+      });
     }
 
     // Call the callback if we need to
@@ -118,11 +145,4 @@ class VariableEditor extends PureComponent {
   }
 }
 
-VariableEditor.propTypes = {
-  handleRender: PropTypes.func.isRequired,
-  handleGetRenderContext: PropTypes.func.isRequired,
-  defaultValue: PropTypes.string.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
-
 export default VariableEditor;
diff --git a/packages/insomnia-app/app/ui/components/time-from-now.js b/packages/insomnia-app/app/ui/components/time-from-now.tsx
similarity index 69%
rename from packages/insomnia-app/app/ui/components/time-from-now.js
rename to packages/insomnia-app/app/ui/components/time-from-now.tsx
index a10f49f275..e92807b70a 100644
--- a/packages/insomnia-app/app/ui/components/time-from-now.js
+++ b/packages/insomnia-app/app/ui/components/time-from-now.tsx
@@ -1,35 +1,29 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../common/constants';
 import moment from 'moment';
 
-type Props = {
-  timestamp: number | Date | string,
-  intervalSeconds?: number,
-  className?: string,
-  capitalize?: boolean,
-};
+interface Props {
+  timestamp: number | Date | string;
+  intervalSeconds?: number;
+  className?: string;
+  capitalize?: boolean;
+}
 
-type State = {
-  text: string,
-};
+interface State {
+  text: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class TimeFromNow extends React.PureComponent<Props, State> {
-  _interval: any;
+class TimeFromNow extends PureComponent<Props, State> {
+  _interval: NodeJS.Timeout | null = null;
 
-  constructor(props: any) {
-    super(props);
-    this._interval = null;
-    this.state = {
-      text: '',
-    };
+  state: State = {
+    text: '',
   }
 
   _update() {
     const { timestamp, capitalize } = this.props;
-
     let text = moment(timestamp).fromNow();
 
     // Shorten default case
@@ -44,23 +38,27 @@ class TimeFromNow extends React.PureComponent<Props, State> {
       });
     }
 
-    this.setState({ text });
+    this.setState({
+      text,
+    });
   }
 
   componentDidMount() {
     const intervalSeconds = this.props.intervalSeconds || 5;
     this._interval = setInterval(this._update, intervalSeconds * 1000);
+
     this._update();
   }
 
   componentWillUnmount() {
-    clearInterval(this._interval);
+    if (this._interval !== null) {
+      clearInterval(this._interval);
+    }
   }
 
   render() {
     const { className, timestamp } = this.props;
     const { text } = this.state;
-
     return (
       <span title={moment(timestamp).toString()} className={className}>
         {text}
diff --git a/packages/insomnia-app/app/ui/components/toast.js b/packages/insomnia-app/app/ui/components/toast.tsx
similarity index 78%
rename from packages/insomnia-app/app/ui/components/toast.js
rename to packages/insomnia-app/app/ui/components/toast.tsx
index dbc17af6ff..1a51a59f18 100644
--- a/packages/insomnia-app/app/ui/components/toast.js
+++ b/packages/insomnia-app/app/ui/components/toast.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import * as electron from 'electron';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import styled from 'styled-components';
@@ -17,24 +16,22 @@ import {
 import * as session from '../../account/session';
 import * as fetch from '../../account/fetch';
 import imgSrcCore from '../images/insomnia-core-logo.png';
-
 const LOCALSTORAGE_KEY = 'insomnia::notifications::seen';
 
-export type ToastNotification = {
-  key: string,
-  url: string,
-  cta: string,
-  message: string,
-};
+export interface ToastNotification {
+  key: string;
+  url: string;
+  cta: string;
+  message: string;
+}
 
-type Props = {};
+interface State {
+  notification: ToastNotification | null;
+  visible: boolean;
+  appName: string;
+}
 
-type State = {
-  notification: ToastNotification | null,
-  visible: boolean,
-};
-
-const StyledLogo: React.ComponentType<{}> = styled.div`
+const StyledLogo = styled.div`
   margin: var(--padding-xs) var(--padding-sm) var(--padding-xs) var(--padding-xs);
   display: flex;
   align-items: center;
@@ -43,8 +40,7 @@ const StyledLogo: React.ComponentType<{}> = styled.div`
     max-width: 5rem;
   }
 `;
-
-const StyledContent: React.ComponentType<{}> = styled.div`
+const StyledContent = styled.div`
   display: flex;
   align-items: center;
   justify-content: center;
@@ -52,8 +48,7 @@ const StyledContent: React.ComponentType<{}> = styled.div`
   padding: 0 var(--padding-xs) 0 var(--padding-xs);
   max-width: 20rem;
 `;
-
-const StyledFooter: React.ComponentType<{}> = styled.footer`
+const StyledFooter = styled.footer`
   padding-top: var(--padding-sm);
   display: flex;
   flex-direction: row;
@@ -62,20 +57,18 @@ const StyledFooter: React.ComponentType<{}> = styled.footer`
 `;
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Toast extends React.PureComponent<Props, State> {
-  _interval: any;
+class Toast extends PureComponent<{}, State> {
+  _interval: NodeJS.Timeout | null = null;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      notification: null,
-      visible: false,
-      appName: getAppName(),
-    };
+  state: State = {
+    notification: null,
+    visible: false,
+    appName: getAppName(),
   }
 
   _handlePostCTACleanup() {
     const { notification } = this.state;
+
     if (!notification) {
       return;
     }
@@ -85,6 +78,7 @@ class Toast extends React.PureComponent<Props, State> {
 
   _handleCancelClick() {
     const { notification } = this.state;
+
     if (!notification) {
       return;
     }
@@ -94,6 +88,7 @@ class Toast extends React.PureComponent<Props, State> {
 
   _hasSeenNotification(notification: ToastNotification) {
     const seenNotifications = this._loadSeen();
+
     return seenNotifications[notification.key];
   }
 
@@ -105,14 +100,15 @@ class Toast extends React.PureComponent<Props, State> {
 
     const stats = await models.stats.get();
     const settings = await models.settings.getOrCreate();
-
     let notification: ToastNotification;
 
     // Try fetching user notification
     try {
       const data = {
-        firstLaunch: stats.created, // Used for account verification notifications
-        launches: stats.launches, // Used for CTAs / Informational notifications
+        firstLaunch: stats.created,
+        // Used for account verification notifications
+        launches: stats.launches,
+        // Used for CTAs / Informational notifications
         platform: getAppPlatform(),
         app: getAppId(),
         version: getAppVersion(),
@@ -121,16 +117,16 @@ class Toast extends React.PureComponent<Props, State> {
         disableUpdateNotification: settings.disableUpdateNotification,
         updateChannel: settings.updateChannel,
       };
-
       notification = await fetch.post('/notification', data, session.getCurrentSessionId());
     } catch (err) {
       console.warn('[toast] Failed to fetch user notifications', err);
     }
 
+    // @ts-expect-error -- TSCONVERSION
     this._handleNotification(notification);
   }
 
-  _handleNotification(notification: ?ToastNotification) {
+  _handleNotification(notification: ToastNotification | null | undefined) {
     // No new notifications
     if (!notification || this._hasSeenNotification(notification)) {
       return;
@@ -138,19 +134,28 @@ class Toast extends React.PureComponent<Props, State> {
 
     // Remember that we've seen it
     const seenNotifications = this._loadSeen();
+
     seenNotifications[notification.key] = true;
     const obj = JSON.stringify(seenNotifications, null, 2);
     window.localStorage.setItem(LOCALSTORAGE_KEY, obj);
-
     // Show the notification
-    this.setState({ notification, visible: false });
-
+    this.setState({
+      notification,
+      visible: false,
+    });
     // Fade the notification in
-    setTimeout(() => this.setState({ visible: true }), 1000);
+    setTimeout(
+      () =>
+        this.setState({
+          visible: true,
+        }),
+      1000,
+    );
   }
 
   _loadSeen() {
     try {
+      // @ts-expect-error -- TSCONVERSION
       return JSON.parse(window.localStorage.getItem(LOCALSTORAGE_KEY)) || {};
     } catch (e) {
       return {};
@@ -159,23 +164,31 @@ class Toast extends React.PureComponent<Props, State> {
 
   _dismissNotification() {
     const { notification } = this.state;
+
     if (!notification) {
       return;
     }
 
     // Hide the currently showing notification
-    this.setState({ visible: false });
-
+    this.setState({
+      visible: false,
+    });
     // Give time for toast to fade out, then remove it
     setTimeout(() => {
-      this.setState({ notification: null }, async () => {
-        await this._checkForNotifications();
-      });
+      this.setState(
+        {
+          notification: null,
+        },
+        async () => {
+          await this._checkForNotifications();
+        },
+      );
     }, 1000);
   }
 
-  _listenerShowNotification(e: any, notification: ToastNotification) {
+  _listenerShowNotification(_e, notification: ToastNotification) {
     console.log('[toast] Received notification ' + notification.key);
+
     this._handleNotification(notification);
   }
 
@@ -186,7 +199,9 @@ class Toast extends React.PureComponent<Props, State> {
   }
 
   componentWillUnmount() {
-    clearInterval(this._interval);
+    if (this._interval !== null) {
+      clearInterval(this._interval);
+    }
     electron.ipcRenderer.removeListener('show-notification', this._listenerShowNotification);
   }
 
diff --git a/packages/insomnia-app/app/ui/components/tooltip.stories.js b/packages/insomnia-app/app/ui/components/tooltip.stories.tsx
similarity index 91%
rename from packages/insomnia-app/app/ui/components/tooltip.stories.js
rename to packages/insomnia-app/app/ui/components/tooltip.stories.tsx
index 01ec9ce60a..3839d98054 100644
--- a/packages/insomnia-app/app/ui/components/tooltip.stories.js
+++ b/packages/insomnia-app/app/ui/components/tooltip.stories.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import Tooltip from './tooltip';
 import '../../../.storybook/index.less';
-
-export default { title: 'Tooltip' };
-
+export default {
+  title: 'Tooltip',
+};
 export const onTop = () => (
   <p className="text-center">
     <Tooltip message="Here is some extra info on top" position="top">
@@ -11,7 +11,6 @@ export const onTop = () => (
     </Tooltip>
   </p>
 );
-
 export const onRight = () => (
   <p className="text-center">
     <Tooltip message="Here is some extra info on the right" position="right">
@@ -19,7 +18,6 @@ export const onRight = () => (
     </Tooltip>
   </p>
 );
-
 export const onLeft = () => (
   <p className="text-center">
     <Tooltip message="Here is some extra info on the left" position="left">
@@ -27,7 +25,6 @@ export const onLeft = () => (
     </Tooltip>
   </p>
 );
-
 export const withDelay = () => (
   <p className="text-center">
     <Tooltip message="This tooltip had a 900ms delay" delay={900}>
@@ -35,18 +32,16 @@ export const withDelay = () => (
     </Tooltip>
   </p>
 );
-
 export const withChildren = () => {
   const message = (
-    <React.Fragment>
+    <Fragment>
       This is a{' '}
       <a href="#" onClick={e => e.preventDefault()}>
         Link
       </a>
       .
-    </React.Fragment>
+    </Fragment>
   );
-
   return (
     <p className="text-center">
       <Tooltip message={message}>
diff --git a/packages/insomnia-app/app/ui/components/tooltip.js b/packages/insomnia-app/app/ui/components/tooltip.tsx
similarity index 69%
rename from packages/insomnia-app/app/ui/components/tooltip.js
rename to packages/insomnia-app/app/ui/components/tooltip.tsx
index 9b38184868..e39c82ce92 100644
--- a/packages/insomnia-app/app/ui/components/tooltip.js
+++ b/packages/insomnia-app/app/ui/components/tooltip.tsx
@@ -1,67 +1,67 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../common/constants';
 import classnames from 'classnames';
 import ReactDOM from 'react-dom';
 
-type Props = {
-  children: React.Node,
-  message: React.Node,
-  position?: 'bottom' | 'top' | 'right' | 'left',
+interface Props {
+  children: ReactNode;
+  message: ReactNode;
+  position?: 'bottom' | 'top' | 'right' | 'left';
+  className?: string;
+  delay?: number;
+  selectable?: boolean;
+  wide?: boolean;
+}
 
-  // Optional
-  className?: string,
-  delay?: number,
-  selectable?: boolean,
-  wide?: boolean,
-};
-
-type State = {
-  visible: boolean,
-};
+interface State {
+  left: number | null,
+  top: number | null,
+  bottom: number | null,
+  right: number | null,
+  maxWidth: number | null,
+  maxHeight: number | null,
+  visible: boolean;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Tooltip extends React.PureComponent<Props, State> {
-  _showTimeout: TimeoutID;
-  _hideTimeout: TimeoutID;
+class Tooltip extends PureComponent<Props, State> {
+  _showTimeout: NodeJS.Timeout | null = null;
+  _hideTimeout: NodeJS.Timeout | null = null;
+  _tooltip: HTMLDivElement | null = null;
+  _bubble: HTMLDivElement | null = null;
+  _id = String(Math.random());
 
-  // TODO: Figure out what type these should be
-  _tooltip: ?HTMLDivElement;
-  _bubble: ?HTMLDivElement;
-  _id: string;
-
-  constructor(props: any) {
-    super(props);
-
-    this.state = {
-      left: null,
-      top: null,
-      bottom: null,
-      right: null,
-      maxWidth: null,
-      maxHeight: null,
-      visible: false,
-    };
-
-    this._id = Math.random() + '';
+  state: State = {
+    left: null,
+    top: null,
+    bottom: null,
+    right: null,
+    maxWidth: null,
+    maxHeight: null,
+    visible: false,
   }
 
-  _setTooltipRef(n: ?HTMLDivElement) {
+  _setTooltipRef(n: HTMLDivElement) {
     this._tooltip = n;
   }
 
-  _setBubbleRef(n: ?HTMLDivElement) {
+  _setBubbleRef(n: HTMLDivElement) {
     this._bubble = n;
   }
 
-  _handleStopClick(e: MouseEvent): void {
-    e.stopPropagation();
+  _handleStopClick(event: React.MouseEvent<HTMLDivElement>) {
+    event.stopPropagation();
   }
 
-  _handleMouseEnter(e: MouseEvent): void {
-    clearTimeout(this._showTimeout);
-    clearTimeout(this._hideTimeout);
+  _handleMouseEnter() {
+    if (this._showTimeout !== null) {
+      clearTimeout(this._showTimeout);
+    }
+    if (this._hideTimeout !== null) {
+      clearTimeout(this._hideTimeout);
+    }
+
     this._showTimeout = setTimeout((): void => {
       const tooltip = this._tooltip;
       const bubble = this._bubble;
@@ -77,9 +77,9 @@ class Tooltip extends React.PureComponent<Props, State> {
       const tooltipRect = tooltip.getBoundingClientRect();
       const bubbleRect = bubble.getBoundingClientRect();
       const margin = 3;
-
       let left = 0;
       let top = 0;
+
       switch (this.props.position) {
         case 'right':
           top = tooltipRect.top - bubbleRect.height / 2 + tooltipRect.height / 2;
@@ -105,18 +105,25 @@ class Tooltip extends React.PureComponent<Props, State> {
 
       bubble.style.left = `${Math.max(0, left)}px`;
       bubble.style.top = `${Math.max(0, top)}px`;
-
-      this.setState({ visible: true });
+      this.setState({
+        visible: true,
+      });
     }, this.props.delay || 400);
   }
 
-  _handleMouseLeave(): void {
-    clearTimeout(this._showTimeout);
-    clearTimeout(this._hideTimeout);
+  _handleMouseLeave() {
+    if (this._showTimeout !== null) {
+      clearTimeout(this._showTimeout);
+    }
+    if (this._hideTimeout !== null) {
+      clearTimeout(this._hideTimeout);
+    }
     this._hideTimeout = setTimeout(() => {
-      this.setState({ visible: false });
-
+      this.setState({
+        visible: false,
+      });
       const bubble = this._bubble;
+
       if (!bubble) {
         return;
       }
@@ -131,15 +138,18 @@ class Tooltip extends React.PureComponent<Props, State> {
 
   _getContainer(): HTMLElement {
     let container = document.querySelector('#tooltips-container');
+
     if (!container) {
       container = document.createElement('div');
       container.id = 'tooltips-container';
+      // @ts-expect-error -- TSCONVERSION
       container.style.zIndex = '1000000';
+      // @ts-expect-error -- TSCONVERSION
       container.style.position = 'relative';
-
       document.body && document.body.appendChild(container);
     }
 
+    // @ts-expect-error -- TSCONVERSION
     return container;
   }
 
@@ -173,7 +183,6 @@ class Tooltip extends React.PureComponent<Props, State> {
       'tooltip__bubble--wide': wide,
       selectable: selectable,
     });
-
     return (
       <div
         className={tooltipClasses}
diff --git a/packages/insomnia-app/app/ui/components/unit-test-editable.js b/packages/insomnia-app/app/ui/components/unit-test-editable.js
deleted file mode 100644
index 7af08329f0..0000000000
--- a/packages/insomnia-app/app/ui/components/unit-test-editable.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// @flow
-import React from 'react';
-import Editable from './base/editable';
-
-type Props = {
-  onSubmit: () => void,
-  value: string,
-};
-
-export default function UnitTestEditable({ onSubmit, value }: Props) {
-  return <Editable singleClick onSubmit={onSubmit} value={value} />;
-}
diff --git a/packages/insomnia-app/app/ui/components/unit-test-editable.tsx b/packages/insomnia-app/app/ui/components/unit-test-editable.tsx
new file mode 100644
index 0000000000..022efb58e1
--- /dev/null
+++ b/packages/insomnia-app/app/ui/components/unit-test-editable.tsx
@@ -0,0 +1,13 @@
+import React, { FunctionComponent } from 'react';
+import Editable from './base/editable';
+
+interface Props {
+  onSubmit: () => void;
+  value: string;
+}
+
+const UnitTestEditable: FunctionComponent<Props> = ({ onSubmit, value }) => {
+  return <Editable singleClick onSubmit={onSubmit} value={value} />;
+};
+
+export default UnitTestEditable;
diff --git a/packages/insomnia-app/app/ui/components/viewers/grpc-tabbed-messages.js b/packages/insomnia-app/app/ui/components/viewers/grpc-tabbed-messages.tsx
similarity index 76%
rename from packages/insomnia-app/app/ui/components/viewers/grpc-tabbed-messages.js
rename to packages/insomnia-app/app/ui/components/viewers/grpc-tabbed-messages.tsx
index 9249780cdc..d3ac2c5d12 100644
--- a/packages/insomnia-app/app/ui/components/viewers/grpc-tabbed-messages.js
+++ b/packages/insomnia-app/app/ui/components/viewers/grpc-tabbed-messages.tsx
@@ -1,34 +1,33 @@
-// @flow
-import React from 'react';
+import React, { FunctionComponent } from 'react';
 import { Tab, TabList, TabPanel, Tabs } from 'react-tabs';
 import classnames from 'classnames';
 import GRPCEditor from '../editors/grpc-editor';
 import Button from '../base/button';
+import { HandleGetRenderContext, HandleRender } from '../../../common/render';
+import { Settings } from '../../../models/settings';
 
-type Message = {
-  id: string,
-  created: number,
-  text: string,
-};
+interface Message {
+  id: string;
+  created: number;
+  text: string;
+}
 
-type Props = {
-  settings: Settings,
-  messages: ?Array<Message>,
-  tabNamePrefix: 'Stream' | 'Response',
-  bodyText: string,
-  uniquenessKey: string,
+interface Props {
+  settings: Settings;
+  messages?: Array<Message>;
+  tabNamePrefix: 'Stream' | 'Response';
+  bodyText?: string;
+  uniquenessKey: string;
+  handleBodyChange?: (arg0: string) => Promise<void>;
+  handleStream?: () => void;
+  handleCommit?: () => void;
+  showActions?: boolean;
+  handleRender?: HandleRender;
+  isVariableUncovered?: boolean;
+  handleGetRenderContext?: HandleGetRenderContext;
+}
 
-  handleBodyChange?: string => Promise<void>,
-  handleStream?: () => void,
-  handleCommit?: () => void,
-  showActions?: boolean,
-
-  handleRender: string => Promise<string>,
-  isVariableUncovered: boolean,
-  handleGetRenderContext: Function,
-};
-
-const GrpcTabbedMessages = ({
+const GrpcTabbedMessages: FunctionComponent<Props> = ({
   settings,
   showActions,
   bodyText,
@@ -41,11 +40,9 @@ const GrpcTabbedMessages = ({
   handleRender,
   isVariableUncovered,
   handleGetRenderContext,
-}: Props) => {
+}) => {
   const shouldShowBody = !!handleBodyChange;
-
   const orderedMessages = messages?.sort((a, b) => a.created - b.created) || [];
-
   return (
     <Tabs key={uniquenessKey} className={classnames('react-tabs', 'react-tabs--nested')}>
       <div className="tab-action-wrapper">
diff --git a/packages/insomnia-app/app/ui/components/viewers/response-cookies-viewer.js b/packages/insomnia-app/app/ui/components/viewers/response-cookies-viewer.tsx
similarity index 81%
rename from packages/insomnia-app/app/ui/components/viewers/response-cookies-viewer.js
rename to packages/insomnia-app/app/ui/components/viewers/response-cookies-viewer.tsx
index 6f8575c501..cb6edce219 100644
--- a/packages/insomnia-app/app/ui/components/viewers/response-cookies-viewer.js
+++ b/packages/insomnia-app/app/ui/components/viewers/response-cookies-viewer.tsx
@@ -1,13 +1,21 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import { Cookie } from 'tough-cookie';
 
+interface Props {
+  showCookiesModal: Function;
+  cookiesSent?: boolean | null;
+  cookiesStored?: boolean | null;
+  headers: Array<any>;
+  handleShowRequestSettings: Function;
+}
+
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class ResponseCookiesViewer extends PureComponent {
+class ResponseCookiesViewer extends PureComponent<Props> {
   renderRow(h, i) {
-    let cookie = null;
+    let cookie: Cookie | undefined | null = null;
+
     try {
       cookie = h ? Cookie.parse(h.value || '') : null;
     } catch (err) {
@@ -25,10 +33,9 @@ class ResponseCookiesViewer extends PureComponent {
 
   render() {
     const { headers, showCookiesModal, cookiesSent, cookiesStored } = this.props;
-
     const notifyNotStored = !cookiesStored && headers.length;
+    let noticeMessage: string | null = null;
 
-    let noticeMessage = null;
     if (!cookiesSent && notifyNotStored) {
       noticeMessage = 'sending and storing';
     } else if (!cookiesSent) {
@@ -57,7 +64,7 @@ class ResponseCookiesViewer extends PureComponent {
           <tbody>{!headers.length ? this.renderRow(null, -1) : headers.map(this.renderRow)}</tbody>
         </table>
         <p className="pad-top">
-          <button className="pull-right btn btn--clicky" onClick={e => showCookiesModal()}>
+          <button className="pull-right btn btn--clicky" onClick={() => showCookiesModal()}>
             Manage Cookies
           </button>
         </p>
@@ -66,12 +73,4 @@ class ResponseCookiesViewer extends PureComponent {
   }
 }
 
-ResponseCookiesViewer.propTypes = {
-  showCookiesModal: PropTypes.func.isRequired,
-  cookiesSent: PropTypes.bool.isRequired,
-  cookiesStored: PropTypes.bool.isRequired,
-  headers: PropTypes.array.isRequired,
-  handleShowRequestSettings: PropTypes.func.isRequired,
-};
-
 export default ResponseCookiesViewer;
diff --git a/packages/insomnia-app/app/ui/components/viewers/response-csv-viewer.js b/packages/insomnia-app/app/ui/components/viewers/response-csv-viewer.tsx
similarity index 71%
rename from packages/insomnia-app/app/ui/components/viewers/response-csv-viewer.js
rename to packages/insomnia-app/app/ui/components/viewers/response-csv-viewer.tsx
index e092e53283..834220d7d8 100644
--- a/packages/insomnia-app/app/ui/components/viewers/response-csv-viewer.js
+++ b/packages/insomnia-app/app/ui/components/viewers/response-csv-viewer.tsx
@@ -1,33 +1,29 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import Papa from 'papaparse';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 
-type Props = {
-  body: Buffer,
-};
+interface Props {
+  body: Buffer;
+}
 
-type State = {
-  result: null | { data: Array<Array<string>> },
-};
+interface State {
+  result: null | {
+    data: Array<Array<string>>;
+  };
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class ResponseCSVViewer extends React.PureComponent<Props, State> {
-  currentHash: string;
-
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      result: null,
-    };
-    this.currentHash = '';
+class ResponseCSVViewer extends PureComponent<Props, State> {
+  state: State = {
+    result: null,
   }
 
+  currentHash = '';
+
   update(body: Buffer) {
     const csv = body.toString('utf8');
-
-    Papa.parse(csv, {
+    Papa.parse<Array<string>>(csv, {
       skipEmptyLines: true,
       complete: result => {
         this.setState({ result });
@@ -40,7 +36,7 @@ class ResponseCSVViewer extends React.PureComponent<Props, State> {
   }
 
   // eslint-disable-next-line camelcase
-  UNSAFE_componentWillUpdate(nextProps: Props, nextState: State) {
+  UNSAFE_componentWillUpdate(nextProps: Props) {
     if (this.props.body === nextProps.body) {
       return;
     }
@@ -50,6 +46,7 @@ class ResponseCSVViewer extends React.PureComponent<Props, State> {
 
   render() {
     const { result } = this.state;
+
     if (!result) {
       return 'Parsing CSV...';
     }
diff --git a/packages/insomnia-app/app/ui/components/viewers/response-error.js b/packages/insomnia-app/app/ui/components/viewers/response-error.tsx
similarity index 79%
rename from packages/insomnia-app/app/ui/components/viewers/response-error.js
rename to packages/insomnia-app/app/ui/components/viewers/response-error.tsx
index 2bd4a345ae..7f415a9cd3 100644
--- a/packages/insomnia-app/app/ui/components/viewers/response-error.js
+++ b/packages/insomnia-app/app/ui/components/viewers/response-error.tsx
@@ -1,14 +1,18 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import Link from '../base/link';
 import { showModal } from '../modals/index';
 import SettingsModal from '../modals/settings-modal';
 
-class ResponseError extends PureComponent {
+interface Props {
+  error: string,
+  url: string,
+  fontSize: number,
+}
+class ResponseError extends PureComponent<Props> {
   render() {
     const { error, fontSize } = this.props;
+    let msg: React.ReactNode = null;
 
-    let msg = null;
     if (error && error.toLowerCase().indexOf('certificate') !== -1) {
       msg = (
         <button className="btn btn--clicky" onClick={() => showModal(SettingsModal)}>
@@ -31,7 +35,11 @@ class ResponseError extends PureComponent {
 
     return (
       <div>
-        <pre className="selectable pad force-pre-wrap" style={{ fontSize: `${fontSize}px` }}>
+        <pre
+          className="selectable pad force-pre-wrap"
+          style={{
+            fontSize: `${fontSize}px`,
+          }}>
           {error}
         </pre>
         <hr />
@@ -51,11 +59,4 @@ class ResponseError extends PureComponent {
   }
 }
 
-ResponseError.propTypes = {
-  // Required
-  error: PropTypes.string.isRequired,
-  url: PropTypes.string.isRequired,
-  fontSize: PropTypes.number.isRequired,
-};
-
 export default ResponseError;
diff --git a/packages/insomnia-app/app/ui/components/viewers/response-headers-viewer.js b/packages/insomnia-app/app/ui/components/viewers/response-headers-viewer.tsx
similarity index 69%
rename from packages/insomnia-app/app/ui/components/viewers/response-headers-viewer.js
rename to packages/insomnia-app/app/ui/components/viewers/response-headers-viewer.tsx
index 6c4e154d44..74bedd706b 100644
--- a/packages/insomnia-app/app/ui/components/viewers/response-headers-viewer.js
+++ b/packages/insomnia-app/app/ui/components/viewers/response-headers-viewer.tsx
@@ -1,14 +1,12 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import CopyButton from '../base/copy-button';
 import type { ResponseHeader } from '../../../models/response';
 import Link from '../base/link';
+import { URL } from 'url';
 
-const { URL } = require('url');
-
-type Props = {
-  headers: Array<ResponseHeader>,
-};
+interface Props {
+  headers: Array<ResponseHeader>;
+}
 
 function validateURL(urlString) {
   try {
@@ -20,14 +18,12 @@ function validateURL(urlString) {
   }
 }
 
-class ResponseHeadersViewer extends React.PureComponent<Props> {
+class ResponseHeadersViewer extends PureComponent<Props> {
   render() {
     const { headers } = this.props;
-
     const headersString = headers.map(h => `${h.name}: ${h.value}`).join('\n');
-
     return (
-      <React.Fragment>
+      <Fragment>
         <table className="table--fancy table--striped table--compact">
           <thead>
             <tr>
@@ -38,10 +34,18 @@ class ResponseHeadersViewer extends React.PureComponent<Props> {
           <tbody>
             {headers.map((h, i) => (
               <tr className="selectable" key={i}>
-                <td style={{ width: '50%' }} className="force-wrap">
+                <td
+                  style={{
+                    width: '50%',
+                  }}
+                  className="force-wrap">
                   {h.name}
                 </td>
-                <td style={{ width: '50%' }} className="force-wrap">
+                <td
+                  style={{
+                    width: '50%',
+                  }}
+                  className="force-wrap">
                   {validateURL(h.value) ? <Link href={h.value}>{h.value}</Link> : h.value}
                 </td>
               </tr>
@@ -51,7 +55,7 @@ class ResponseHeadersViewer extends React.PureComponent<Props> {
         <p key="copy" className="pad-top">
           <CopyButton className="pull-right" content={headersString} />
         </p>
-      </React.Fragment>
+      </Fragment>
     );
   }
 }
diff --git a/packages/insomnia-app/app/ui/components/viewers/response-multipart.js b/packages/insomnia-app/app/ui/components/viewers/response-multipart.tsx
similarity index 80%
rename from packages/insomnia-app/app/ui/components/viewers/response-multipart.js
rename to packages/insomnia-app/app/ui/components/viewers/response-multipart.tsx
index 2eff0e4ad1..249b4673b6 100644
--- a/packages/insomnia-app/app/ui/components/viewers/response-multipart.js
+++ b/packages/insomnia-app/app/ui/components/viewers/response-multipart.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import * as electron from 'electron';
 import mimes from 'mime-types';
 import fs from 'fs';
@@ -20,45 +19,42 @@ import WrapperModal from '../modals/wrapper-modal';
 import { showModal } from '../modals/index';
 import ResponseHeadersViewer from './response-headers-viewer';
 
-type Part = {
-  name: string,
-  bytes: number,
-  value: Buffer,
-  filename: string | null,
-  headers: Array<ResponseHeader>,
-};
+interface Part {
+  name: string;
+  bytes: number;
+  value: Buffer;
+  filename: string | null;
+  headers: Array<ResponseHeader>;
+}
 
-type Props = {
-  download: Function,
-  responseId: string,
-  bodyBuffer: Buffer | null,
-  contentType: string,
-  disableHtmlPreviewJs: boolean,
-  disablePreviewLinks: boolean,
-  filter: string,
-  filterHistory: Array<string>,
-  editorFontSize: number,
-  editorIndentSize: number,
-  editorKeyMap: string,
-  editorLineWrapping: boolean,
-  url: string,
-};
+interface Props {
+  download: (...args: Array<any>) => any;
+  responseId: string;
+  bodyBuffer: Buffer | null;
+  contentType: string;
+  disableHtmlPreviewJs: boolean;
+  disablePreviewLinks: boolean;
+  filter: string;
+  filterHistory: Array<string>;
+  editorFontSize: number;
+  editorIndentSize: number;
+  editorKeyMap: string;
+  editorLineWrapping: boolean;
+  url: string;
+}
 
-type State = {
-  activePart: number,
-  parts: Array<Part>,
-  error: string | null,
-};
+interface State {
+  activePart: number;
+  parts: Array<Part>;
+  error: string | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class ResponseMultipart extends React.PureComponent<Props, State> {
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      activePart: -1,
-      parts: [],
-      error: null,
-    };
+class ResponseMultipart extends PureComponent<Props, State> {
+  state: State = {
+    activePart: -1,
+    parts: [],
+    error: null,
   }
 
   componentDidMount() {
@@ -68,14 +64,21 @@ class ResponseMultipart extends React.PureComponent<Props, State> {
   async _setParts() {
     try {
       const parts = await this._getParts();
-      this.setState({ parts, activePart: 0, error: null });
+      this.setState({
+        parts,
+        activePart: 0,
+        error: null,
+      });
     } catch (err) {
-      this.setState({ error: err.message });
+      this.setState({
+        error: err.message,
+      });
     }
   }
 
   _describePart(part: Part) {
     const segments = [part.name];
+
     if (part.filename) {
       segments.push(`(${part.filename})`);
     }
@@ -84,7 +87,9 @@ class ResponseMultipart extends React.PureComponent<Props, State> {
   }
 
   async _handleSelectPart(index: number) {
-    this.setState({ activePart: index });
+    this.setState({
+      activePart: index,
+    });
   }
 
   _getBody() {
@@ -125,7 +130,6 @@ class ResponseMultipart extends React.PureComponent<Props, State> {
     }
 
     const contentType = getContentTypeFromHeaders(part.headers, 'text/plain');
-
     const extension = mimes.extension(contentType) || '.txt';
     const lastDir = window.localStorage.getItem('insomnia.lastExportPath');
     const dir = lastDir || electron.remote.app.getPath('desktop');
@@ -142,8 +146,8 @@ class ResponseMultipart extends React.PureComponent<Props, State> {
         },
       ],
     };
-
     const { canceled, filePath } = await electron.remote.dialog.showSaveDialog(options);
+
     if (canceled) {
       return;
     }
@@ -153,6 +157,7 @@ class ResponseMultipart extends React.PureComponent<Props, State> {
 
     // Save the file
     try {
+      // @ts-expect-error -- TSCONVERSION if filePath is undefined, don't try to write anything
       await fs.promises.writeFile(filePath, part.value);
     } catch (err) {
       console.warn('Failed to save multipart to file', err);
@@ -162,28 +167,26 @@ class ResponseMultipart extends React.PureComponent<Props, State> {
   _getParts(): Promise<Array<Part>> {
     return new Promise((resolve, reject) => {
       const { bodyBuffer, contentType } = this.props;
-      const parts = [];
+      const parts: Array<Part> = [];
 
       if (!bodyBuffer) {
         return resolve(parts);
       }
 
       const fakeReq = new PassThrough();
-      (fakeReq: Object).headers = {
+      // @ts-expect-error -- TSCONVERSION investigate `stream` types
+      fakeReq.headers = {
         'content-type': contentType,
       };
-
       const form = new multiparty.Form();
       form.on('part', part => {
-        const dataBuffers = [];
+        const dataBuffers: Array<any> = [];
         part.on('data', data => {
           dataBuffers.push(data);
         });
-
         part.on('error', err => {
           reject(new Error(`Failed to parse part: ${err.message}`));
         });
-
         part.on('end', () => {
           parts.push({
             value: Buffer.concat(dataBuffers),
@@ -197,17 +200,14 @@ class ResponseMultipart extends React.PureComponent<Props, State> {
           });
         });
       });
-
       form.on('error', err => {
         reject(err);
       });
-
       form.on('close', () => {
         resolve(parts);
       });
-
+      // @ts-expect-error -- TSCONVERSION
       form.parse(fakeReq);
-
       fakeReq.write(bodyBuffer);
       fakeReq.end();
     });
@@ -227,23 +227,28 @@ class ResponseMultipart extends React.PureComponent<Props, State> {
       responseId,
       url,
     } = this.props;
-
     const { activePart, parts, error } = this.state;
 
     if (error) {
       return (
-        <div className="pad monospace" style={{ fontSize: editorFontSize }}>
+        <div
+          className="pad monospace"
+          style={{
+            fontSize: editorFontSize,
+          }}>
           Failed to parse multipart response: {error}
         </div>
       );
     }
 
     const selectedPart = parts[activePart];
-
     return (
       <div
         className="pad-sm tall wide"
-        style={{ display: 'grid', gridTemplateRows: 'auto minmax(0, 1fr)' }}>
+        style={{
+          display: 'grid',
+          gridTemplateRows: 'auto minmax(0, 1fr)',
+        }}>
         <div
           className="pad-bottom-sm"
           style={{
@@ -253,7 +258,11 @@ class ResponseMultipart extends React.PureComponent<Props, State> {
           <div>
             <Dropdown wide>
               <DropdownButton className="btn btn--clicky">
-                <div style={{ minWidth: '200px', display: 'inline-block' }}>
+                <div
+                  style={{
+                    minWidth: '200px',
+                    display: 'inline-block',
+                  }}>
                   {selectedPart ? this._describePart(selectedPart) : 'Unknown'}
                 </div>
                 <i className="fa fa-caret-down fa--skinny space-left" />
@@ -297,7 +306,6 @@ class ResponseMultipart extends React.PureComponent<Props, State> {
               key={`${responseId}::${activePart}`}
               previewMode={PREVIEW_MODE_FRIENDLY}
               responseId={`${responseId}[${activePart}]`}
-              updateFilter={null}
               url={url}
             />
           </div>
diff --git a/packages/insomnia-app/app/ui/components/viewers/response-pdf-viewer.js b/packages/insomnia-app/app/ui/components/viewers/response-pdf-viewer.tsx
similarity index 77%
rename from packages/insomnia-app/app/ui/components/viewers/response-pdf-viewer.js
rename to packages/insomnia-app/app/ui/components/viewers/response-pdf-viewer.tsx
index 864313dcd5..b3e6094853 100644
--- a/packages/insomnia-app/app/ui/components/viewers/response-pdf-viewer.js
+++ b/packages/insomnia-app/app/ui/components/viewers/response-pdf-viewer.tsx
@@ -1,29 +1,30 @@
-// @flow
-import * as React from 'react';
+import React, { CSSProperties, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import * as PDF from 'pdfjs-dist/webpack';
 
-type Props = {
-  body: Buffer,
-  uniqueKey: string,
-};
+interface Props {
+  body: Buffer;
+  uniqueKey: string;
+}
 
-type State = {
-  numPages: number | null,
-};
+interface State {
+  numPages: number | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class ResponsePDFViewer extends React.PureComponent<Props, State> {
-  container: ?HTMLDivElement;
-  debounceTimeout: any;
+class ResponsePDFViewer extends PureComponent<Props, State> {
+  container: HTMLDivElement | null = null;
+  debounceTimeout: NodeJS.Timeout | null = null;
 
-  setRef(n: ?HTMLDivElement) {
+  setRef(n: HTMLDivElement) {
     this.container = n;
   }
 
   loadPDF() {
-    clearTimeout(this.debounceTimeout);
+    if (this.debounceTimeout !== null) {
+      clearTimeout(this.debounceTimeout);
+    }
     this.debounceTimeout = setTimeout(async () => {
       // get node for this react component
       const container = this.container;
@@ -33,7 +34,6 @@ class ResponsePDFViewer extends React.PureComponent<Props, State> {
       }
 
       container.innerHTML = '';
-
       const containerWidth = container.clientWidth;
       const pdf = await PDF.getDocument({
         data: this.props.body.toString('binary'),
@@ -42,23 +42,22 @@ class ResponsePDFViewer extends React.PureComponent<Props, State> {
       for (let i = 1; i <= pdf.numPages; i++) {
         const page = await pdf.getPage(i);
         const density = window.devicePixelRatio || 1;
-
-        const { width: pdfWidth, height: pdfHeight } = page.getViewport({ scale: 1 });
+        const { width: pdfWidth, height: pdfHeight } = page.getViewport({
+          scale: 1,
+        });
         const ratio = pdfHeight / pdfWidth;
         const scale = containerWidth / pdfWidth;
-        const viewport = page.getViewport({ scale: scale * density });
-
+        const viewport = page.getViewport({
+          scale: scale * density,
+        });
         // set canvas for page
         const canvas = document.createElement('canvas');
-
         canvas.width = containerWidth * density;
         // canvas.height = containerWidth * (viewport.height / viewport.width);
         canvas.height = containerWidth * ratio * density;
         canvas.style.width = `${containerWidth}px`;
         canvas.style.height = `${containerWidth * ratio}px`;
-
         container.appendChild(canvas);
-
         // get context and render page
         const context = canvas.getContext('2d');
         const renderContext = {
@@ -66,18 +65,19 @@ class ResponsePDFViewer extends React.PureComponent<Props, State> {
           canvasContext: context,
           viewport: viewport,
         };
-
         await page.render(renderContext).promise;
       }
     }, 100);
   }
 
-  handleResize(e: SyntheticEvent<HTMLDivElement>) {
+  handleResize() {
     if (!this.container) {
       return;
     }
 
-    clearTimeout(this.debounceTimeout);
+    if (this.debounceTimeout !== null) {
+      clearTimeout(this.debounceTimeout);
+    }
     this.debounceTimeout = setTimeout(this.loadPDF, 300);
   }
 
@@ -95,14 +95,13 @@ class ResponsePDFViewer extends React.PureComponent<Props, State> {
   }
 
   render() {
-    const styles = {
+    const styles: CSSProperties = {
       width: '100%',
       height: '100%',
       overflowX: 'hidden',
       overflowY: 'scroll',
       padding: '0px',
     };
-
     return (
       <div className="S-PDF-ID" ref={this.setRef} style={styles}>
         <div className="faded text-center vertically-center tall">Loading PDF...</div>
diff --git a/packages/insomnia-app/app/ui/components/viewers/response-raw.js b/packages/insomnia-app/app/ui/components/viewers/response-raw.tsx
similarity index 83%
rename from packages/insomnia-app/app/ui/components/viewers/response-raw.js
rename to packages/insomnia-app/app/ui/components/viewers/response-raw.tsx
index 8446bc67ad..d7dc250af8 100644
--- a/packages/insomnia-app/app/ui/components/viewers/response-raw.js
+++ b/packages/insomnia-app/app/ui/components/viewers/response-raw.tsx
@@ -1,12 +1,18 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import CodeEditor from '../codemirror/code-editor';
 
+interface Props {
+  value: string,
+  fontSize?: number,
+  responseId?: string,
+}
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class ResponseRaw extends PureComponent {
-  _setCodeEditorRef(n) {
+class ResponseRaw extends PureComponent<Props> {
+  private _codeEditor?: CodeEditor;
+
+  _setCodeEditorRef(n: CodeEditor) {
     this._codeEditor = n;
   }
 
@@ -54,10 +60,4 @@ class ResponseRaw extends PureComponent {
   }
 }
 
-ResponseRaw.propTypes = {
-  value: PropTypes.string.isRequired,
-  fontSize: PropTypes.number,
-  responseId: PropTypes.string,
-};
-
 export default ResponseRaw;
diff --git a/packages/insomnia-app/app/ui/components/viewers/response-timeline-viewer.js b/packages/insomnia-app/app/ui/components/viewers/response-timeline-viewer.tsx
similarity index 86%
rename from packages/insomnia-app/app/ui/components/viewers/response-timeline-viewer.js
rename to packages/insomnia-app/app/ui/components/viewers/response-timeline-viewer.tsx
index aff31a6b9a..3b2a0abfa9 100644
--- a/packages/insomnia-app/app/ui/components/viewers/response-timeline-viewer.js
+++ b/packages/insomnia-app/app/ui/components/viewers/response-timeline-viewer.tsx
@@ -1,11 +1,23 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { shell } from 'electron';
 import CodeEditor from '../codemirror/code-editor';
 import * as models from '../../../models';
+import { Response } from '../../../models/response';
 
-class ResponseTimelineViewer extends PureComponent {
-  state = {
+interface Props {
+  response: Response,
+  editorFontSize: number,
+  editorIndentSize: number,
+  editorLineWrapping: boolean,
+}
+
+interface State {
+  timeline: Array<any>;
+  timelineKey: string;
+}
+
+class ResponseTimelineViewer extends PureComponent<Props, State> {
+  state: State = {
     timeline: [],
     timelineKey: '',
   };
@@ -20,6 +32,7 @@ class ResponseTimelineViewer extends PureComponent {
 
   componentDidUpdate(prevProps) {
     const { response } = this.props;
+
     if (response._id !== prevProps.response._id) {
       this.refreshTimeline();
     }
@@ -37,27 +50,33 @@ class ResponseTimelineViewer extends PureComponent {
   renderRow(row, i, all) {
     const { name, value } = row;
     const previousName = i > 0 ? all[i - 1].name : '';
+    let prefix: string | null = null;
 
-    let prefix = null;
     switch (name) {
       case 'HEADER_IN':
         prefix = '< ';
         break;
+
       case 'DATA_IN':
         prefix = '| ';
         break;
+
       case 'SSL_DATA_IN':
         prefix = '<< ';
         break;
+
       case 'HEADER_OUT':
         prefix = '> ';
         break;
+
       case 'DATA_OUT':
         prefix = '| ';
         break;
+
       case 'SSL_DATA_OUT':
         prefix = '>> ';
         break;
+
       case 'TEXT':
         prefix = '* ';
         break;
@@ -69,7 +88,6 @@ class ResponseTimelineViewer extends PureComponent {
 
     const lines = (value + '').replace(/\n$/, '').split('\n');
     const newLines = lines.filter(l => !l.match(/^\s*$/)).map(l => `${prefix}${l}`);
-
     let leadingSpace = '';
 
     // Prefix each section with a newline to separate them
@@ -89,7 +107,6 @@ class ResponseTimelineViewer extends PureComponent {
       .filter(r => r !== null)
       .join('\n')
       .trim();
-
     return (
       <CodeEditor
         key={timelineKey}
@@ -107,11 +124,4 @@ class ResponseTimelineViewer extends PureComponent {
   }
 }
 
-ResponseTimelineViewer.propTypes = {
-  response: PropTypes.object.isRequired,
-  editorFontSize: PropTypes.number.isRequired,
-  editorIndentSize: PropTypes.number.isRequired,
-  editorLineWrapping: PropTypes.bool.isRequired,
-};
-
 export default ResponseTimelineViewer;
diff --git a/packages/insomnia-app/app/ui/components/viewers/response-viewer.js b/packages/insomnia-app/app/ui/components/viewers/response-viewer.tsx
similarity index 87%
rename from packages/insomnia-app/app/ui/components/viewers/response-viewer.js
rename to packages/insomnia-app/app/ui/components/viewers/response-viewer.tsx
index 344a79b62a..b97e90ce71 100644
--- a/packages/insomnia-app/app/ui/components/viewers/response-viewer.js
+++ b/packages/insomnia-app/app/ui/components/viewers/response-viewer.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Component, Fragment } from 'react';
 import iconv from 'iconv-lite';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import {
@@ -17,61 +16,57 @@ import ResponseWebView from './response-web-view';
 import MultipartViewer from './response-multipart';
 import ResponseRaw from './response-raw';
 import ResponseError from './response-error';
-
 import KeydownBinder from '../keydown-binder';
 import { executeHotKey } from '../../../common/hotkeys-listener';
 import { hotKeyRefs } from '../../../common/hotkeys';
 
 let alwaysShowLargeResponses = false;
 
-type Props = {
-  bytes: number,
-  contentType: string,
-  disableHtmlPreviewJs: boolean,
-  disablePreviewLinks: boolean,
-  download: Function,
-  editorFontSize: number,
-  editorIndentSize: number,
-  editorKeyMap: string,
-  editorLineWrapping: boolean,
-  filter: string,
-  filterHistory: Array<string>,
-  getBody: Function,
-  previewMode: string,
-  responseId: string,
-  url: string,
+interface Props {
+  bytes: number;
+  contentType: string;
+  disableHtmlPreviewJs: boolean;
+  disablePreviewLinks: boolean;
+  download: (...args: Array<any>) => any;
+  editorFontSize: number;
+  editorIndentSize: number;
+  editorKeyMap: string;
+  editorLineWrapping: boolean;
+  filter: string;
+  filterHistory: Array<string>;
+  getBody: (...args: Array<any>) => any;
+  previewMode: string;
+  responseId: string;
+  url: string;
+  updateFilter?: (filter: string) => void;
+  error?: string | null;
+}
 
-  // Optional
-  updateFilter: Function | null,
-  error: string | null,
-};
-
-type State = {
-  blockingBecauseTooLarge: boolean,
-  bodyBuffer: Buffer | null,
-  error: string,
-};
+interface State {
+  blockingBecauseTooLarge: boolean;
+  bodyBuffer: Buffer | null;
+  error: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class ResponseViewer extends React.Component<Props, State> {
-  _selectableView: any;
+class ResponseViewer extends Component<Props, State> {
+  _selectableView: ResponseRaw | CodeEditor | null;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      blockingBecauseTooLarge: false,
-      bodyBuffer: null,
-      error: '',
-    };
+  state: State = {
+    blockingBecauseTooLarge: false,
+    bodyBuffer: null,
+    error: '',
   }
 
   refresh() {
+    // @ts-expect-error -- TSCONVERSION refresh only exists on a code-editor, not response-raw
     if (this._selectableView != null && typeof this._selectableView.refresh === 'function') {
+      // @ts-expect-error -- TSCONVERSION refresh only exists on a code-editor, not response-raw
       this._selectableView.refresh();
     }
   }
 
-  _decodeIconv(bodyBuffer: Buffer, charset: string): string {
+  _decodeIconv(bodyBuffer: Buffer, charset: string) {
     try {
       return iconv.decode(bodyBuffer, charset);
     } catch (err) {
@@ -85,20 +80,27 @@ class ResponseViewer extends React.Component<Props, State> {
   }
 
   _handleDismissBlocker() {
-    this.setState({ blockingBecauseTooLarge: false });
+    this.setState({
+      blockingBecauseTooLarge: false,
+    });
+
     this._maybeLoadResponseBody(this.props, true);
   }
 
   _handleDisableBlocker() {
     alwaysShowLargeResponses = true;
+
     this._handleDismissBlocker();
   }
 
   _maybeLoadResponseBody(props: Props, forceShow?: boolean) {
     // Block the response if it's too large
     const responseIsTooLarge = props.bytes > LARGE_RESPONSE_MB * 1024 * 1024;
+
     if (!forceShow && !alwaysShowLargeResponses && responseIsTooLarge) {
-      this.setState({ blockingBecauseTooLarge: true });
+      this.setState({
+        blockingBecauseTooLarge: true,
+      });
     } else {
       try {
         const bodyBuffer = props.getBody();
@@ -128,6 +130,7 @@ class ResponseViewer extends React.Component<Props, State> {
     for (const k of Object.keys(nextProps)) {
       const next = nextProps[k];
       const current = this.props[k];
+
       if (typeof next === 'function') {
         continue;
       }
@@ -169,7 +172,7 @@ class ResponseViewer extends React.Component<Props, State> {
     return false;
   }
 
-  _setSelectableViewRef(n: any) {
+  _setSelectableViewRef<T extends ResponseRaw | CodeEditor | null>(n: T) {
     this._selectableView = n;
   }
 
@@ -191,8 +194,9 @@ class ResponseViewer extends React.Component<Props, State> {
         return;
       }
 
-      this._selectableView.focus();
-      this._selectableView.selectAll();
+      this._selectableView?.focus();
+
+      this._selectableView?.selectAll();
     });
   }
 
@@ -215,9 +219,7 @@ class ResponseViewer extends React.Component<Props, State> {
       url,
     } = this.props;
     let contentType = this.props.contentType;
-
     const { bodyBuffer, error: parseError } = this.state;
-
     const error = responseError || parseError;
 
     if (error) {
@@ -230,18 +232,19 @@ class ResponseViewer extends React.Component<Props, State> {
 
     const wayTooLarge = bytes > HUGE_RESPONSE_MB * 1024 * 1024;
     const { blockingBecauseTooLarge } = this.state;
+
     if (blockingBecauseTooLarge) {
       return (
         <div className="response-pane__notify">
           {wayTooLarge ? (
-            <React.Fragment>
+            <Fragment>
               <p className="pad faint">Responses over {HUGE_RESPONSE_MB}MB cannot be shown</p>
               <button onClick={download} className="inline-block btn btn--clicky">
                 Save Response To File
               </button>
-            </React.Fragment>
+            </Fragment>
           ) : (
-            <React.Fragment>
+            <Fragment>
               <p className="pad faint">
                 Response over {LARGE_RESPONSE_MB}MB hidden for performance reasons
               </p>
@@ -263,7 +266,7 @@ class ResponseViewer extends React.Component<Props, State> {
                   Always Show
                 </button>
               </div>
-            </React.Fragment>
+            </Fragment>
           )}
         </div>
       );
@@ -295,6 +298,7 @@ class ResponseViewer extends React.Component<Props, State> {
         .toString()
         .trim()
         .match(/^<!doctype html.*>/i);
+
       if (contentType.indexOf('text/html') !== 0 && isProbablyHTML) {
         contentType = 'text/html';
       }
@@ -303,6 +307,7 @@ class ResponseViewer extends React.Component<Props, State> {
     }
 
     const ct = contentType.toLowerCase();
+
     if (previewMode === PREVIEW_MODE_FRIENDLY && ct.indexOf('image/') === 0) {
       const justContentType = contentType.split(';')[0];
       const base64Body = bodyBuffer.toString('base64');
@@ -312,7 +317,11 @@ class ResponseViewer extends React.Component<Props, State> {
             <img
               src={`data:${justContentType};base64,${base64Body}`}
               className="pad block"
-              style={{ maxWidth: '100%', maxHeight: '100%', margin: 'auto' }}
+              style={{
+                maxWidth: '100%',
+                maxHeight: '100%',
+                margin: 'auto',
+              }}
             />
           </div>
         </div>
@@ -392,6 +401,7 @@ class ResponseViewer extends React.Component<Props, State> {
 
       // Try to detect content-types if there isn't one
       let mode;
+
       if (!mode && body.match(/^\s*<\?xml [^?]*\?>/)) {
         mode = 'application/xml';
       } else {
@@ -412,7 +422,7 @@ class ResponseViewer extends React.Component<Props, State> {
           lineWrapping={editorLineWrapping}
           mode={mode}
           noMatchBrackets
-          onClickLink={disablePreviewLinks ? null : this._handleOpenLink}
+          onClickLink={disablePreviewLinks ? undefined : this._handleOpenLink}
           placeholder="..."
           readOnly
           uniquenessKey={responseId}
diff --git a/packages/insomnia-app/app/ui/components/viewers/response-web-view.js b/packages/insomnia-app/app/ui/components/viewers/response-web-view.tsx
similarity index 76%
rename from packages/insomnia-app/app/ui/components/viewers/response-web-view.js
rename to packages/insomnia-app/app/ui/components/viewers/response-web-view.tsx
index b1fd5314d7..8505cf91ef 100644
--- a/packages/insomnia-app/app/ui/components/viewers/response-web-view.js
+++ b/packages/insomnia-app/app/ui/components/viewers/response-web-view.tsx
@@ -1,22 +1,21 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { EventEmitter } from 'events';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG } from '../../../common/constants';
 import contextMenu from 'electron-context-menu';
 
-type Props = {
-  body: string,
-  contentType: string,
-  url: string,
-  webpreferences: string,
-};
+interface Props {
+  body: string;
+  contentType: string;
+  url: string;
+  webpreferences: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class ResponseWebView extends React.PureComponent<Props> {
-  _webview: ?HTMLElement;
+class ResponseWebView extends PureComponent<Props> {
+  _webview: HTMLElement | null = null;
 
-  _handleSetWebViewRef(n: ?HTMLElement) {
+  _handleSetWebViewRef(n: HTMLElement) {
     this._webview = n;
 
     if (this._webview) {
@@ -30,12 +29,17 @@ class ResponseWebView extends React.PureComponent<Props> {
     }
 
     this._webview.removeEventListener('dom-ready', this._handleDOMReady);
-    contextMenu({ window: this._webview });
+
+    contextMenu({
+      // @ts-expect-error -- TSCONVERSION type mismatch
+      window: this._webview,
+    });
+
     this._setBody();
   }
 
   _setBody() {
-    const webview: Object = this._webview;
+    const webview = this._webview;
 
     if (!webview) {
       return;
@@ -43,8 +47,8 @@ class ResponseWebView extends React.PureComponent<Props> {
 
     const { body, contentType, url } = this.props;
     const bodyWithBase = body.replace('<head>', `<head><base href="${url}">`);
+    // @ts-expect-error -- TSCONVERSION type mismatch
     webview.loadURL(`data:${contentType},${encodeURIComponent(bodyWithBase)}`);
-
     // NOTE: We *should* be setting the base URL by specifying the baseURLForDataURL
     // option, but there is a bug in baseURLForDataURL since Electron 6 (still exists
     // in 9) that makes it impossible.
@@ -57,10 +61,11 @@ class ResponseWebView extends React.PureComponent<Props> {
     // webview.loadURL(`data:${contentType},${encodeURIComponent(body)}`, {
     //   baseURLForDataURL: url,
     // });
-
     // This is kind of hacky but electron-context-menu fails to save images if
     // this isn't here.
+    // @ts-expect-error -- TSCONVERSION type mismatch
     webview.webContents = webview;
+    // @ts-expect-error -- TSCONVERSION type mismatch
     webview.webContents.session = new EventEmitter();
   }
 
@@ -70,7 +75,6 @@ class ResponseWebView extends React.PureComponent<Props> {
 
   render() {
     const { webpreferences } = this.props;
-
     return (
       <webview ref={this._handleSetWebViewRef} src="about:blank" webpreferences={webpreferences} />
     );
diff --git a/packages/insomnia-app/app/ui/components/workspace-page-header.js b/packages/insomnia-app/app/ui/components/workspace-page-header.tsx
similarity index 79%
rename from packages/insomnia-app/app/ui/components/workspace-page-header.js
rename to packages/insomnia-app/app/ui/components/workspace-page-header.tsx
index 485cfc655e..098584cf3d 100644
--- a/packages/insomnia-app/app/ui/components/workspace-page-header.js
+++ b/packages/insomnia-app/app/ui/components/workspace-page-header.tsx
@@ -1,7 +1,5 @@
-// @flow
-
-import React from 'react';
-import { ACTIVITY_HOME } from '../../common/constants';
+import React, { Fragment, FunctionComponent, ReactNode, useCallback } from 'react';
+import { ACTIVITY_HOME, GlobalActivity } from '../../common/constants';
 import coreLogo from '../images/insomnia-core-logo.png';
 import { strings } from '../../common/strings';
 import WorkspaceDropdown from './dropdowns/workspace-dropdown';
@@ -12,13 +10,13 @@ import AccountDropdown from './dropdowns/account-dropdown';
 import SettingsButton from './buttons/settings-button';
 import { isCollection, isDesign } from '../../models/helpers/is-model';
 
-type Props = {
-  wrapperProps: WrapperProps,
-  handleActivityChange: (workspaceId: string, activity: GlobalActivity) => Promise<void>,
-  gridRight: React.Node,
-};
+interface Props {
+  wrapperProps: WrapperProps;
+  handleActivityChange: (workspaceId: string, activity: GlobalActivity) => Promise<void>;
+  gridRight: ReactNode;
+}
 
-const WorkspacePageHeader = ({
+const WorkspacePageHeader: FunctionComponent<Props> = ({
   gridRight,
   handleActivityChange,
   wrapperProps: {
@@ -29,15 +27,13 @@ const WorkspacePageHeader = ({
     activity,
     isLoading,
   },
-}: Props) => {
+}) => {
   const collection = isCollection(activeWorkspace);
   const design = isDesign(activeWorkspace);
-
-  const homeCallback = React.useCallback(
+  const homeCallback = useCallback(
     () => handleActivityChange(activeWorkspace._id, ACTIVITY_HOME),
     [activeWorkspace._id, handleActivityChange],
   );
-
   const workspace = (
     <WorkspaceDropdown
       displayName={collection ? activeWorkspace.name : activeApiSpec.fileName}
@@ -48,19 +44,19 @@ const WorkspacePageHeader = ({
       isLoading={isLoading}
     />
   );
-
   return (
     <Header
       className="app-header theme--app-header"
       gridLeft={
-        <React.Fragment>
+        <Fragment>
           <img src={coreLogo} alt="Insomnia" width="24" height="24" />
           <Breadcrumb
             className="breadcrumb"
-            crumbs={[strings.home, <React.Fragment key="workspace-dd">{workspace}</React.Fragment>]}
+            // @ts-expect-error -- TSCONVERSION
+            crumbs={[strings.home, <Fragment key="workspace-dd">{workspace}</Fragment>]}
             onClick={homeCallback}
           />
-        </React.Fragment>
+        </Fragment>
       }
       gridCenter={
         design && (
diff --git a/packages/insomnia-app/app/ui/components/wrapper-analytics.js b/packages/insomnia-app/app/ui/components/wrapper-analytics.tsx
similarity index 76%
rename from packages/insomnia-app/app/ui/components/wrapper-analytics.js
rename to packages/insomnia-app/app/ui/components/wrapper-analytics.tsx
index 8b283c5c12..74df83db1a 100644
--- a/packages/insomnia-app/app/ui/components/wrapper-analytics.js
+++ b/packages/insomnia-app/app/ui/components/wrapper-analytics.tsx
@@ -1,6 +1,4 @@
-// @flow
-
-import * as React from 'react';
+import React, { FunctionComponent, useCallback } from 'react';
 import type { WrapperProps } from './wrapper';
 import OnboardingContainer from './onboarding-container';
 import Analytics from './analytics';
@@ -8,16 +6,15 @@ import { useDispatch } from 'react-redux';
 import { setActiveActivity } from '../redux/modules/global';
 import { getAppLongName, getAppSynopsis, ACTIVITY_HOME } from '../../common/constants';
 
-type Props = {|
-  wrapperProps: WrapperProps,
-|};
+interface Props {
+  wrapperProps: WrapperProps;
+}
 
-const WrapperAnalytics = ({ wrapperProps }: Props) => {
+const WrapperAnalytics: FunctionComponent<Props> = ({ wrapperProps }) => {
   const reduxDispatch = useDispatch();
-  const navigateHome = React.useCallback(() => {
+  const navigateHome = useCallback(() => {
     reduxDispatch(setActiveActivity(ACTIVITY_HOME));
   }, [reduxDispatch]);
-
   return (
     <OnboardingContainer
       wrapperProps={wrapperProps}
diff --git a/packages/insomnia-app/app/ui/components/wrapper-debug.js b/packages/insomnia-app/app/ui/components/wrapper-debug.tsx
similarity index 82%
rename from packages/insomnia-app/app/ui/components/wrapper-debug.js
rename to packages/insomnia-app/app/ui/components/wrapper-debug.tsx
index 108d5c6054..d7c70004c1 100644
--- a/packages/insomnia-app/app/ui/components/wrapper-debug.js
+++ b/packages/insomnia-app/app/ui/components/wrapper-debug.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import PageLayout from './page-layout';
 import type { HandleImportFileCallback, WrapperProps } from './wrapper';
@@ -9,7 +8,7 @@ import ResponsePane from './panes/response-pane';
 import SidebarChildren from './sidebar/sidebar-children';
 import SidebarFilter from './sidebar/sidebar-filter';
 import EnvironmentsDropdown from './dropdowns/environments-dropdown';
-import { AUTOBIND_CFG } from '../../common/constants';
+import { AUTOBIND_CFG, GlobalActivity, SortOrder } from '../../common/constants';
 import { isCollection, isDesign, isGrpcRequest } from '../../models/helpers/is-model';
 import GrpcRequestPane from './panes/grpc-request-pane';
 import GrpcResponsePane from './panes/grpc-response-pane';
@@ -19,61 +18,59 @@ import SyncDropdown from './dropdowns/sync-dropdown';
 import { Button } from 'insomnia-components';
 import { showSyncShareModal } from './modals/sync-share-modal';
 import * as session from '../../account/session';
+import { Settings } from '../../models/settings';
+import { Request, RequestAuthentication, RequestBody, RequestHeader, RequestParameter } from '../../models/request';
 
-type Props = {
-  forceRefreshKey: string,
-  gitSyncDropdown: React.Node,
-  handleActivityChange: (workspaceId: string, activity: GlobalActivity) => Promise<void>,
-  handleChangeEnvironment: Function,
-  handleDeleteResponse: Function,
-  handleDeleteResponses: Function,
-  handleForceUpdateRequest: Function,
-  handleForceUpdateRequestHeaders: Function,
-  handleImport: Function,
-  handleImportFile: HandleImportFileCallback,
-  handleRequestCreate: Function,
-  handleRequestGroupCreate: Function,
-  handleSendAndDownloadRequestWithActiveEnvironment: Function,
-  handleSendRequestWithActiveEnvironment: Function,
-  handleSetActiveResponse: Function,
-  handleSetPreviewMode: Function,
-  handleSetResponseFilter: Function,
-  handleShowCookiesModal: Function,
-  handleShowRequestSettingsModal: Function,
-  handleSidebarSort: (sortOrder: SortOrder) => void,
-  handleUpdateRequestAuthentication: Function,
-  handleUpdateRequestBody: Function,
-  handleUpdateRequestHeaders: Function,
-  handleUpdateRequestMethod: Function,
-  handleUpdateRequestParameters: Function,
-  handleUpdateRequestUrl: Function,
-  handleUpdateSettingsShowPasswords: Function,
-  handleUpdateSettingsUseBulkHeaderEditor: Function,
-  wrapperProps: WrapperProps,
-};
+interface Props {
+  forceRefreshKey: number;
+  gitSyncDropdown: ReactNode;
+  handleActivityChange: (workspaceId: string, activity: GlobalActivity) => Promise<void>;
+  handleChangeEnvironment: Function;
+  handleDeleteResponse: Function;
+  handleDeleteResponses: Function;
+  handleForceUpdateRequest: (r: Request, patch: Partial<Request>) => Promise<Request>;
+  handleForceUpdateRequestHeaders: (r: Request, headers: Array<RequestHeader>) => Promise<Request>;
+  handleImport: Function;
+  handleImportFile: HandleImportFileCallback;
+  handleRequestCreate: () => void;
+  handleRequestGroupCreate: () => void;
+  handleSendAndDownloadRequestWithActiveEnvironment: (filepath?: string) => Promise<void>;
+  handleSendRequestWithActiveEnvironment: () => void;
+  handleSetActiveResponse: Function;
+  handleSetPreviewMode: Function;
+  handleSetResponseFilter: (filter: string) => void;
+  handleShowCookiesModal: Function;
+  handleShowRequestSettingsModal: Function;
+  handleSidebarSort: (sortOrder: SortOrder) => void;
+  handleUpdateRequestAuthentication: (r: Request, auth: RequestAuthentication) => Promise<Request>;
+  handleUpdateRequestBody: (r: Request, body: RequestBody) => Promise<Request>;
+  handleUpdateRequestHeaders: (r: Request, headers: Array<RequestHeader>) => Promise<Request>;
+  handleUpdateRequestMethod: (r: Request, method: string) => Promise<Request>;
+  handleUpdateRequestParameters: (r: Request, params: Array<RequestParameter>) => Promise<Request>;
+  handleUpdateRequestUrl: (r: Request, url: string) => Promise<Request>;
+  handleUpdateSettingsShowPasswords: (showPasswords: boolean) => Promise<Settings>;
+  handleUpdateSettingsUseBulkHeaderEditor: Function;
+  handleUpdateSettingsUseBulkParametersEditor: (useBulkParametersEditor: boolean) => Promise<Settings>;
+  wrapperProps: WrapperProps;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class WrapperDebug extends React.PureComponent<Props> {
+class WrapperDebug extends PureComponent<Props> {
   _renderPageHeader() {
     const { wrapperProps, gitSyncDropdown, handleActivityChange } = this.props;
     const { vcs, activeWorkspace, syncItems } = this.props.wrapperProps;
-
     const collection = isCollection(activeWorkspace);
     const design = isDesign(activeWorkspace);
-
     const share = session.isLoggedIn() && collection && (
       <Button variant="contained" onClick={showSyncShareModal}>
         <i className="fa fa-globe pad-right-sm" /> Share
       </Button>
     );
-
     const betaSync = collection && vcs && isLoggedIn() && (
       <SyncDropdown workspace={activeWorkspace} vcs={vcs} syncItems={syncItems} />
     );
-
     const gitSync = design && gitSyncDropdown;
     const sync = betaSync || gitSync;
-
     return (
       <WorkspacePageHeader
         wrapperProps={wrapperProps}
@@ -96,7 +93,6 @@ class WrapperDebug extends React.PureComponent<Props> {
       handleShowCookiesModal,
       handleSidebarSort,
     } = this.props;
-
     const {
       activeEnvironment,
       activeRequest,
@@ -121,9 +117,8 @@ class WrapperDebug extends React.PureComponent<Props> {
       sidebarHidden,
       sidebarWidth,
     } = this.props.wrapperProps;
-
     return (
-      <React.Fragment>
+      <Fragment>
         <div className="sidebar__menu">
           <EnvironmentsDropdown
             handleChangeEnvironment={handleChangeEnvironment}
@@ -133,6 +128,7 @@ class WrapperDebug extends React.PureComponent<Props> {
             environmentHighlightColorStyle={settings.environmentHighlightColorStyle}
             hotKeyRegistry={settings.hotKeyRegistry}
           />
+          {/* @ts-expect-error -- TSCONVERSION onClick event doesn't matter */}
           <button className="btn btn--super-compact" onClick={handleShowCookiesModal}>
             <div className="sidebar__menu__thing">
               <span>Cookies</span>
@@ -164,6 +160,7 @@ class WrapperDebug extends React.PureComponent<Props> {
           handleCopyAsCurl={handleCopyAsCurl}
           handleRender={handleRender}
           moveDoc={handleMoveDoc}
+          // @ts-expect-error -- TSCONVERSION this prop isn't sent
           hidden={sidebarHidden}
           width={sidebarWidth}
           workspace={activeWorkspace}
@@ -172,7 +169,7 @@ class WrapperDebug extends React.PureComponent<Props> {
           hotKeyRegistry={settings.hotKeyRegistry}
           activeEnvironment={activeEnvironment}
         />
-      </React.Fragment>
+      </Fragment>
     );
   }
 
@@ -195,11 +192,9 @@ class WrapperDebug extends React.PureComponent<Props> {
       handleUpdateSettingsUseBulkHeaderEditor,
       handleUpdateSettingsUseBulkParametersEditor,
     } = this.props;
-
     const {
       activeEnvironment,
       activeRequest,
-      activeUnitTest,
       activeWorkspace,
       handleCreateRequestForWorkspace,
       handleGenerateCodeForActiveRequest,
@@ -223,7 +218,7 @@ class WrapperDebug extends React.PureComponent<Props> {
             activeRequest={activeRequest}
             environmentId={activeEnvironment ? activeEnvironment._id : ''}
             workspaceId={activeWorkspace._id}
-            forceRefreshCounter={forceRefreshKey}
+            forceRefreshKey={forceRefreshKey}
             settings={settings}
             handleRender={handleRender}
             isVariableUncovered={isVariableUncovered}
@@ -252,10 +247,8 @@ class WrapperDebug extends React.PureComponent<Props> {
           handleUpdateDownloadPath={handleUpdateDownloadPath}
           headerEditorKey={headerEditorKey}
           isVariableUncovered={isVariableUncovered}
-          nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
           oAuth2Token={oAuth2Token}
           request={activeRequest}
-          unitTest={activeUnitTest}
           settings={settings}
           updateRequestAuthentication={handleUpdateRequestAuthentication}
           updateRequestBody={handleUpdateRequestBody}
@@ -284,7 +277,6 @@ class WrapperDebug extends React.PureComponent<Props> {
       handleShowCookiesModal,
       handleShowRequestSettingsModal,
     } = this.props;
-
     const {
       activeEnvironment,
       activeRequest,
@@ -306,7 +298,7 @@ class WrapperDebug extends React.PureComponent<Props> {
         <ErrorBoundary showAlert>
           <GrpcResponsePane
             activeRequest={activeRequest}
-            forceRefreshCounter={forceRefreshKey}
+            forceRefreshKey={forceRefreshKey}
             settings={settings}
           />
         </ErrorBoundary>
diff --git a/packages/insomnia-app/app/ui/components/wrapper-design.js b/packages/insomnia-app/app/ui/components/wrapper-design.tsx
similarity index 89%
rename from packages/insomnia-app/app/ui/components/wrapper-design.js
rename to packages/insomnia-app/app/ui/components/wrapper-design.tsx
index bd55d96d82..80bba94661 100644
--- a/packages/insomnia-app/app/ui/components/wrapper-design.js
+++ b/packages/insomnia-app/app/ui/components/wrapper-design.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import type { WrapperProps } from './wrapper';
 import PageLayout from './page-layout';
@@ -19,30 +18,29 @@ import WorkspacePageHeader from './workspace-page-header';
 
 const spectral = new Spectral();
 
-type Props = {|
-  gitSyncDropdown: React.Node,
-  handleActivityChange: (workspaceId: string, activity: GlobalActivity) => Promise<void>,
-  handleUpdateApiSpec: (s: ApiSpec) => Promise<void>,
-  wrapperProps: WrapperProps,
-|};
+interface Props {
+  gitSyncDropdown: ReactNode;
+  handleActivityChange: (workspaceId: string, activity: GlobalActivity) => Promise<void>;
+  handleUpdateApiSpec: (s: ApiSpec) => Promise<void>;
+  wrapperProps: WrapperProps;
+}
 
-type State = {|
-  previewHidden: boolean,
+interface State {
+  previewHidden: boolean;
   lintMessages: Array<{
-    message: string,
-    line: number,
-    type: 'error' | 'warning',
-  }>,
-|};
+    message: string;
+    line: number;
+    type: 'error' | 'warning';
+  }>;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class WrapperDesign extends React.PureComponent<Props, State> {
-  editor: ?CodeEditor;
-  debounceTimeout: IntervalID;
+class WrapperDesign extends PureComponent<Props, State> {
+  editor: CodeEditor | null = null;
+  debounceTimeout: NodeJS.Timeout | null = null;
 
   constructor(props: Props) {
     super(props);
-
     this.state = {
       previewHidden: props.wrapperProps.activeWorkspaceMeta.previewHidden || false,
       lintMessages: [],
@@ -55,17 +53,21 @@ class WrapperDesign extends React.PureComponent<Props, State> {
     delay: 1000,
   };
 
-  _setEditorRef(n: ?CodeEditor) {
+  _setEditorRef(n: CodeEditor) {
     this.editor = n;
   }
 
   async _handleTogglePreview() {
     await this.setState(
-      prevState => ({ previewHidden: !prevState.previewHidden }),
+      prevState => ({
+        previewHidden: !prevState.previewHidden,
+      }),
       async () => {
         const workspaceId = this.props.wrapperProps.activeWorkspace._id;
         const previewHidden = this.state.previewHidden;
-        await models.workspaceMeta.updateByParentId(workspaceId, { previewHidden });
+        await models.workspaceMeta.updateByParentId(workspaceId, {
+          previewHidden,
+        });
       },
     );
   }
@@ -75,9 +77,11 @@ class WrapperDesign extends React.PureComponent<Props, State> {
       wrapperProps: { activeApiSpec },
       handleUpdateApiSpec,
     } = this.props;
-
     // Debounce the update because these specs can get pretty large
-    clearTimeout(this.debounceTimeout);
+    if (this.debounceTimeout !== null) {
+      clearTimeout(this.debounceTimeout);
+    }
+
     this.debounceTimeout = setTimeout(async () => {
       await handleUpdateApiSpec({ ...activeApiSpec, contents: v });
     }, 500);
@@ -93,9 +97,10 @@ class WrapperDesign extends React.PureComponent<Props, State> {
     editor.scrollToSelection(chStart, chEnd, lineStart, lineEnd);
   }
 
-  _handleLintClick(notice: {}) {
+  _handleLintClick(notice) {
     // TODO: Export Notice from insomnia-components and use here, instead of {}
     const { start, end } = notice._range;
+
     this._handleSetSelection(start.character, end.character, start.line, end.line);
   }
 
@@ -110,7 +115,6 @@ class WrapperDesign extends React.PureComponent<Props, State> {
           type: r.severity === 0 ? 'error' : 'warning',
           message: `${r.code} ${r.message}`,
           line: r.range.start.line,
-
           // Attach range that will be returned to our click handler
           _range: r.range,
         })),
@@ -139,10 +143,9 @@ class WrapperDesign extends React.PureComponent<Props, State> {
     }
   }
 
-  _renderEditor(): React.Node {
+  _renderEditor() {
     const { activeApiSpec, settings } = this.props.wrapperProps;
     const { lintMessages } = this.state;
-
     return (
       <div className="column tall theme--pane__body">
         <div className="tall">
@@ -167,7 +170,7 @@ class WrapperDesign extends React.PureComponent<Props, State> {
     );
   }
 
-  _renderPreview(): React.Node {
+  _renderPreview() {
     const { activeApiSpec } = this.props.wrapperProps;
     const { previewHidden } = this.state;
 
@@ -176,6 +179,7 @@ class WrapperDesign extends React.PureComponent<Props, State> {
     }
 
     let swaggerUiSpec;
+
     try {
       swaggerUiSpec = parseApiSpec(activeApiSpec.contents).contents;
     } catch (err) {}
@@ -218,19 +222,18 @@ class WrapperDesign extends React.PureComponent<Props, State> {
   _renderPageHeader() {
     const { wrapperProps, gitSyncDropdown, handleActivityChange } = this.props;
     const { previewHidden } = this.state;
-
     return (
       <WorkspacePageHeader
         wrapperProps={wrapperProps}
         handleActivityChange={handleActivityChange}
         gridRight={
-          <React.Fragment>
+          <Fragment>
             <Button variant="contained" onClick={this._handleTogglePreview}>
               <img src={previewIcon} alt="Preview" width="15" />
               &nbsp; {previewHidden ? 'Preview: Off' : 'Preview: On'}
             </Button>
             {gitSyncDropdown}
-          </React.Fragment>
+          </Fragment>
         }
       />
     );
@@ -238,7 +241,6 @@ class WrapperDesign extends React.PureComponent<Props, State> {
 
   _renderPageSidebar() {
     const { activeApiSpec } = this.props.wrapperProps;
-
     return (
       <ErrorBoundary
         invalidationKey={activeApiSpec.contents}
diff --git a/packages/insomnia-app/app/ui/components/wrapper-home.js b/packages/insomnia-app/app/ui/components/wrapper-home.tsx
similarity index 80%
rename from packages/insomnia-app/app/ui/components/wrapper-home.js
rename to packages/insomnia-app/app/ui/components/wrapper-home.tsx
index 52a6195e45..08c50740dd 100644
--- a/packages/insomnia-app/app/ui/components/wrapper-home.js
+++ b/packages/insomnia-app/app/ui/components/wrapper-home.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import type { GlobalActivity } from '../../common/constants';
 import {
@@ -31,7 +30,6 @@ import { showPrompt } from './modals';
 import * as models from '../../models';
 import TimeFromNow from './time-from-now';
 import Highlight from './base/highlight';
-
 import { fuzzyMatchAll, isNotNullOrUndefined, pluralize } from '../../common/misc';
 import type {
   HandleImportClipboardCallback,
@@ -43,7 +41,7 @@ import Notice from './notice';
 import PageLayout from './page-layout';
 import { ForceToWorkspaceKeys } from '../redux/modules/helpers';
 import coreLogo from '../images/insomnia-core-logo.png';
-import { parseApiSpec } from '../../common/api-specs';
+import { parseApiSpec, ParsedApiSpec } from '../../common/api-specs';
 import RemoteWorkspacesDropdown from './dropdowns/remote-workspaces-dropdown';
 import SettingsButton from './buttons/settings-button';
 import AccountDropdown from './dropdowns/account-dropdown';
@@ -53,52 +51,66 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import * as workspaceActions from '../redux/modules/workspace';
 import * as gitActions from '../redux/modules/git';
-import { GitCloneWorkspaceCallback } from '../redux/modules/workspace';
 import { MemClient } from '../../sync/git/mem-client';
 
-type Props = {|
-  wrapperProps: WrapperProps,
-  handleImportFile: HandleImportFileCallback,
-  handleImportUri: HandleImportUriCallback,
-  handleImportClipboard: HandleImportClipboardCallback,
-  handleCreateWorkspace: CreateWorkspaceCallback,
-  handleGitCloneWorkspace: GitCloneWorkspaceCallback,
-|};
+interface RenderedCard {
+  card: ReactNode;
+  lastModifiedTimestamp?: number | null;
+}
 
-type State = {|
-  filter: string,
-|};
+interface Props {
+  wrapperProps: WrapperProps;
+  handleImportFile: HandleImportFileCallback;
+  handleImportUri: HandleImportUriCallback;
+  handleImportClipboard: HandleImportClipboardCallback;
+  handleCreateWorkspace: workspaceActions.CreateWorkspaceCallback;
+  handleGitCloneWorkspace: Function;
+}
+
+interface State {
+  filter: string;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class WrapperHome extends React.PureComponent<Props, State> {
-  state = {
+class WrapperHome extends PureComponent<Props, State> {
+  state: State = {
     filter: '',
   };
 
-  _filterInput: ?HTMLInputElement;
+  _filterInput: HTMLInputElement | null = null;
 
-  _setFilterInputRef(n: ?HTMLInputElement) {
+  _setFilterInputRef(n: HTMLInputElement) {
     this._filterInput = n;
   }
 
-  _handleFilterChange(e: SyntheticEvent<HTMLInputElement>) {
-    this.setState({ filter: e.currentTarget.value });
+  _handleFilterChange(e: React.SyntheticEvent<HTMLInputElement>) {
+    this.setState({
+      filter: e.currentTarget.value,
+    });
   }
 
   _handleDocumentCreate() {
-    this.props.handleCreateWorkspace({ scope: WorkspaceScopeKeys.design });
+    this.props.handleCreateWorkspace({
+      scope: WorkspaceScopeKeys.design,
+    });
   }
 
   _handleCollectionCreate() {
-    this.props.handleCreateWorkspace({ scope: WorkspaceScopeKeys.collection });
+    this.props.handleCreateWorkspace({
+      scope: WorkspaceScopeKeys.collection,
+    });
   }
 
   _handleImportFile() {
-    this.props.handleImportFile({ forceToWorkspace: ForceToWorkspaceKeys.new });
+    this.props.handleImportFile({
+      forceToWorkspace: ForceToWorkspaceKeys.new,
+    });
   }
 
   _handleImportClipBoard() {
-    this.props.handleImportClipboard({ forceToWorkspace: ForceToWorkspaceKeys.new });
+    this.props.handleImportClipboard({
+      forceToWorkspace: ForceToWorkspaceKeys.new,
+    });
   }
 
   _handleImportUri() {
@@ -108,13 +120,17 @@ class WrapperHome extends React.PureComponent<Props, State> {
       label: 'URL',
       placeholder: 'https://website.com/insomnia-import.json',
       onComplete: uri => {
-        this.props.handleImportUri(uri, { forceToWorkspace: ForceToWorkspaceKeys.new });
+        this.props.handleImportUri(uri, {
+          forceToWorkspace: ForceToWorkspaceKeys.new,
+        });
       },
     });
   }
 
   _handleWorkspaceClone() {
-    this.props.handleGitCloneWorkspace({ createFsClient: MemClient.createClient });
+    this.props.handleGitCloneWorkspace({
+      createFsClient: MemClient.createClient,
+    });
   }
 
   _handleKeyDown(e) {
@@ -127,7 +143,6 @@ class WrapperHome extends React.PureComponent<Props, State> {
 
   async _handleClickCard(id: string, defaultActivity: GlobalActivity) {
     const { handleSetActiveWorkspace, handleSetActiveActivity } = this.props.wrapperProps;
-
     const { activeActivity } = await models.workspaceMeta.getOrCreateByParentId(id);
 
     if (!activeActivity || !isWorkspaceActivity(activeActivity)) {
@@ -135,25 +150,25 @@ class WrapperHome extends React.PureComponent<Props, State> {
     } else {
       handleSetActiveActivity(activeActivity);
     }
+
     handleSetActiveWorkspace(id);
   }
 
-  renderCard(workspace: Workspace): { card: React.Node, lastModifiedTimestamp: number } {
+  renderCard(workspace: Workspace) {
     const {
       apiSpecs,
       handleSetActiveWorkspace,
       workspaceMetas,
       workspaces,
     } = this.props.wrapperProps;
-
     const { filter } = this.state;
-
     const apiSpec = apiSpecs.find(s => s.parentId === workspace._id);
+    let spec: ParsedApiSpec['contents'] = null;
+    let specFormat: ParsedApiSpec['format'] = null;
+    let specFormatVersion: ParsedApiSpec['formatVersion'] = null;
 
-    let spec = null;
-    let specFormat = null;
-    let specFormatVersion = null;
     try {
+      // @ts-expect-error -- TSCONVERSION appears to be genuine
       const result = parseApiSpec(apiSpec.contents);
       spec = result.contents;
       specFormat = result.format;
@@ -164,18 +179,16 @@ class WrapperHome extends React.PureComponent<Props, State> {
     }
 
     // Get cached branch from WorkspaceMeta
-    const workspaceMeta = workspaceMetas.find(wm => wm.parentId === workspace._id);
+    const workspaceMeta = workspaceMetas?.find(wm => wm.parentId === workspace._id);
     const lastActiveBranch = workspaceMeta ? workspaceMeta.cachedGitRepositoryBranch : null;
     const lastCommitAuthor = workspaceMeta ? workspaceMeta.cachedGitLastAuthor : null;
     const lastCommitTime = workspaceMeta ? workspaceMeta.cachedGitLastCommitTime : null;
-
     // WorkspaceMeta is a good proxy for last modified time
     const workspaceModified = workspaceMeta ? workspaceMeta.modified : workspace.modified;
     const modifiedLocally =
       apiSpec && workspace.scope === WorkspaceScopeKeys.design
         ? apiSpec.modified
         : workspaceModified;
-
     // Span spec, workspace and sync related timestamps for card last modified label and sort order
     const lastModifiedFrom = [
       workspace?.modified,
@@ -186,29 +199,31 @@ class WrapperHome extends React.PureComponent<Props, State> {
     const lastModifiedTimestamp = lastModifiedFrom
       .filter(isNotNullOrUndefined)
       .sort(descendingNumberSort)[0];
-
+    // @ts-expect-error -- TSCONVERSION appears to be genuine
     let log = <TimeFromNow timestamp={lastModifiedTimestamp} />;
     let branch = lastActiveBranch;
+
     if (
       workspace.scope === WorkspaceScopeKeys.design &&
       lastCommitTime &&
+      // @ts-expect-error -- TSCONVERSION appears to be genuine
       apiSpec?.modified > lastCommitTime
     ) {
       // Show locally unsaved changes for spec
       // NOTE: this doesn't work for non-spec workspaces
       branch = lastActiveBranch + '*';
       log = (
-        <React.Fragment>
+        <Fragment>
           <TimeFromNow className="text-danger" timestamp={modifiedLocally} /> (unsaved)
-        </React.Fragment>
+        </Fragment>
       );
     } else if (lastCommitTime) {
       // Show last commit time and author
       branch = lastActiveBranch;
       log = (
-        <React.Fragment>
+        <Fragment>
           <TimeFromNow timestamp={lastCommitTime} /> {lastCommitAuthor && `by ${lastCommitAuthor}`}
-        </React.Fragment>
+        </Fragment>
       );
     }
 
@@ -223,7 +238,7 @@ class WrapperHome extends React.PureComponent<Props, State> {
     );
     const version = spec?.info?.version || '';
     let label: string = strings.collection;
-    let format: string = '';
+    let format = '';
     let labelIcon = <i className="fa fa-bars" />;
     let defaultActivity = ACTIVITY_DEBUG;
     let title = workspace.name;
@@ -231,6 +246,7 @@ class WrapperHome extends React.PureComponent<Props, State> {
     if (workspace.scope === WorkspaceScopeKeys.design) {
       label = strings.document;
       labelIcon = <i className="fa fa-file-o" />;
+
       if (specFormat === 'openapi') {
         format = `OpenAPI ${specFormatVersion}`;
       } else if (specFormat === 'swagger') {
@@ -239,7 +255,7 @@ class WrapperHome extends React.PureComponent<Props, State> {
       }
 
       defaultActivity = ACTIVITY_SPEC;
-      title = apiSpec.fileName || title;
+      title = apiSpec?.fileName || title;
     }
 
     // Filter the card by multiple different properties
@@ -255,17 +271,17 @@ class WrapperHome extends React.PureComponent<Props, State> {
 
     const card = (
       <Card
-        key={apiSpec._id}
-        docBranch={branch && <Highlight search={filter} text={branch} />}
-        docTitle={title && <Highlight search={filter} text={title} />}
-        docVersion={version && <Highlight search={filter} text={`v${version}`} />}
+        key={apiSpec?._id}
+        docBranch={branch ? <Highlight search={filter} text={branch} /> : undefined}
+        docTitle={title ? <Highlight search={filter} text={title} /> : undefined}
+        docVersion={version ? <Highlight search={filter} text={`v${version}`} /> : undefined}
         tagLabel={
-          label && (
+          label ? (
             <>
               <span className="margin-right-xs">{labelIcon}</span>
               <Highlight search={filter} text={label} />
             </>
-          )
+          ) : undefined
         }
         docLog={log}
         docMenu={docMenu}
@@ -273,11 +289,11 @@ class WrapperHome extends React.PureComponent<Props, State> {
         onClick={() => this._handleClickCard(workspace._id, defaultActivity)}
       />
     );
-
-    return {
+    const renderedCard: RenderedCard = {
       card,
       lastModifiedTimestamp,
     };
+    return renderedCard;
   }
 
   renderCreateMenu() {
@@ -287,7 +303,6 @@ class WrapperHome extends React.PureComponent<Props, State> {
         <i className="fa fa-caret-down pad-left-sm" />
       </Button>
     );
-
     return (
       <Dropdown renderButton={button}>
         <DropdownDivider>New</DropdownDivider>
@@ -322,7 +337,9 @@ class WrapperHome extends React.PureComponent<Props, State> {
       <div className="row row--right pad-left wide">
         <div
           className="form-control form-control--outlined no-margin"
-          style={{ maxWidth: '400px' }}>
+          style={{
+            maxWidth: '400px',
+          }}>
           <KeydownBinder onKeydown={this._handleKeyDown}>
             <input
               ref={this._setFilterInputRef}
@@ -343,16 +360,14 @@ class WrapperHome extends React.PureComponent<Props, State> {
   render() {
     const { workspaces, isLoading } = this.props.wrapperProps;
     const { filter } = this.state;
-
     // Render each card, removing all the ones that don't match the filter
     const cards = workspaces
       .map(this.renderCard)
       .filter(isNotNullOrUndefined)
-      .sort((a, b) => descendingNumberSort(a.lastModifiedTimestamp, b.lastModifiedTimestamp))
-      .map(c => c.card);
-
+      // @ts-expect-error -- TSCONVERSION appears to be a genuine error
+      .sort((a: RenderedCard, b: RenderedCard) => descendingNumberSort(a.lastModifiedTimestamp, b.lastModifiedTimestamp))
+      .map(c => c?.card);
     const countLabel = cards.length > 1 ? pluralize(strings.document) : strings.document;
-
     return (
       <PageLayout
         wrapperProps={this.props.wrapperProps}
@@ -360,11 +375,11 @@ class WrapperHome extends React.PureComponent<Props, State> {
           <Header
             className="app-header theme--app-header"
             gridLeft={
-              <React.Fragment>
+              <Fragment>
                 <img src={coreLogo} alt="Insomnia" width="24" height="24" />
                 <Breadcrumb className="breadcrumb" crumbs={[getAppName()]} />
                 {isLoading ? <i className="fa fa-refresh fa-spin space-left" /> : null}
-              </React.Fragment>
+              </Fragment>
             }
             gridRight={
               <>
diff --git a/packages/insomnia-app/app/ui/components/wrapper-migration.js b/packages/insomnia-app/app/ui/components/wrapper-migration.tsx
similarity index 77%
rename from packages/insomnia-app/app/ui/components/wrapper-migration.js
rename to packages/insomnia-app/app/ui/components/wrapper-migration.tsx
index 65856675e7..a22a222d3d 100644
--- a/packages/insomnia-app/app/ui/components/wrapper-migration.js
+++ b/packages/insomnia-app/app/ui/components/wrapper-migration.tsx
@@ -1,6 +1,4 @@
-// @flow
-
-import * as React from 'react';
+import React, { FunctionComponent, useCallback, useMemo, useState } from 'react';
 import type { WrapperProps } from './wrapper';
 import { ToggleSwitch, Button } from 'insomnia-components';
 import type { MigrationOptions } from '../../common/migrate-from-designer';
@@ -8,7 +6,7 @@ import migrateFromDesigner, {
   existsAndIsDirectory,
   restartApp,
 } from '../../common/migrate-from-designer';
-import { getDataDirectory, getDesignerDataDir } from '../../common/misc';
+import { getDataDirectory, getDesignerDataDir } from '../../common/electron-helpers';
 import { useDispatch } from 'react-redux';
 import OnboardingContainer from './onboarding-container';
 import { goToNextActivity } from '../redux/modules/global';
@@ -17,31 +15,32 @@ import { trackEvent } from '../../common/analytics';
 
 type Step = 'options' | 'migrating' | 'results';
 
-type SettingProps = {
-  label: string,
-  name: $Keys<MigrationOptions>,
-  options: MigrationOptions,
-};
+interface SettingProps {
+  label: string;
+  name: keyof MigrationOptions;
+  options: MigrationOptions;
+}
 
 type TextSettingProps = SettingProps & {
-  handleChange: (SyntheticEvent<HTMLInputElement>) => void,
-  errorMessage?: string,
+  handleChange: (arg0: React.SyntheticEvent<HTMLInputElement>) => void;
+  errorMessage?: string;
 };
-const TextSetting = ({ handleChange, label, name, options, errorMessage }: TextSettingProps) => {
+
+const TextSetting: FunctionComponent<TextSettingProps> = ({ handleChange, label, name, options, errorMessage }) => {
   if (!options.hasOwnProperty(name)) {
     throw new Error(`Invalid text setting name ${name}`);
   }
 
   const hasError = !!errorMessage;
-
   return (
     <div className="form-control form-control--outlined margin-bottom">
       <label>
         {label}
         <input
-          className={hasError && 'input--error'}
+          className={hasError ? 'input--error' : ''}
           type="text"
           name={name}
+          // @ts-expect-error -- TSCONVERSION this is a genuine error.  booleans shoudl not be allowed here
           defaultValue={options[name]}
           onBlur={handleChange}
         />
@@ -52,15 +51,16 @@ const TextSetting = ({ handleChange, label, name, options, errorMessage }: TextS
 };
 
 type BooleanSettingProps = SettingProps & {
-  handleChange: (boolean, Object, string) => void,
-  help?: string,
+  handleChange: (arg0: boolean, arg1: Record<string, any>, arg2: string) => void;
+  help?: string;
 };
+
 const BooleanSetting = ({ handleChange, label, name, options, help }: BooleanSettingProps) => {
   if (!options.hasOwnProperty(name)) {
     throw new Error(`Invalid text setting name ${name}`);
   }
 
-  const labelNode = React.useMemo(
+  const labelNode = useMemo(
     () => (
       <>
         {label}
@@ -69,11 +69,11 @@ const BooleanSetting = ({ handleChange, label, name, options, help }: BooleanSet
     ),
     [help, label],
   );
-
   return (
     <ToggleSwitch
       labelClassName="row margin-bottom wide"
-      checked={options[name]}
+      checked={Boolean(options[name])}
+      // @ts-expect-error -- TSCONVERSION
       id={name}
       label={labelNode}
       onChange={handleChange}
@@ -81,25 +81,29 @@ const BooleanSetting = ({ handleChange, label, name, options, help }: BooleanSet
   );
 };
 
-type OptionsProps = { start: MigrationOptions => void, cancel: () => void };
+interface OptionsProps {
+  start: (arg0: MigrationOptions) => void;
+  cancel: () => void;
+}
+
 const Options = ({ start, cancel }: OptionsProps) => {
-  const [options, setOptions] = React.useState<MigrationOptions>(() => ({
+  const [options, setOptions] = useState<MigrationOptions>(() => ({
     useDesignerSettings: false,
     copyWorkspaces: false,
     copyPlugins: false,
     designerDataDir: getDesignerDataDir(),
     coreDataDir: getDataDirectory(),
   }));
-
-  const handleInputChange = React.useCallback((e: SyntheticEvent<HTMLInputElement>) => {
+  const handleInputChange = useCallback((e: React.SyntheticEvent<HTMLInputElement>) => {
     const { name, value } = e.currentTarget;
     setOptions(prevOpts => ({ ...prevOpts, [name]: value }));
   }, []);
-
-  const handleSwitchChange = React.useCallback((checked: boolean, event: Object, id: string) => {
-    setOptions(prevOpts => ({ ...prevOpts, [id]: checked }));
-  }, []);
-
+  const handleSwitchChange = useCallback(
+    (checked: boolean, _event, id: string) => {
+      setOptions(prevOpts => ({ ...prevOpts, [id]: checked }));
+    },
+    [],
+  );
   const {
     coreDataDir,
     designerDataDir,
@@ -107,17 +111,13 @@ const Options = ({ start, cancel }: OptionsProps) => {
     copyWorkspaces,
     copyPlugins,
   } = options;
-
-  const coreExists = React.useMemo(() => existsAndIsDirectory(coreDataDir), [coreDataDir]);
-
-  const designerExists = React.useMemo(() => existsAndIsDirectory(designerDataDir), [
+  const coreExists = useMemo(() => existsAndIsDirectory(coreDataDir), [coreDataDir]);
+  const designerExists = useMemo(() => existsAndIsDirectory(designerDataDir), [
     designerDataDir,
   ]);
-
   const hasSomethingToMigrate = useDesignerSettings || copyWorkspaces || copyPlugins;
   const dirsExist = coreExists && designerExists;
   const canStart = hasSomethingToMigrate && dirsExist;
-
   return (
     <>
       <p>
@@ -156,14 +156,14 @@ const Options = ({ start, cancel }: OptionsProps) => {
             name="designerDataDir"
             options={options}
             handleChange={handleInputChange}
-            errorMessage={!designerExists && 'Directory does not exist'}
+            errorMessage={designerExists ? undefined : 'Directory does not exist'}
           />
           <TextSetting
             label="Insomnia Data Directory"
             name="coreDataDir"
             options={options}
             handleChange={handleInputChange}
-            errorMessage={!coreExists && 'Directory does not exist'}
+            errorMessage={coreExists ? undefined : 'Directory does not exist'}
           />
         </details>
       </div>
@@ -221,9 +221,10 @@ const Success = () => (
   </>
 );
 
-type FailProps = {
-  error: Error,
-};
+interface FailProps {
+  error: Error;
+}
+
 const Fail = ({ error }: FailProps) => (
   <>
     <p>
@@ -257,20 +258,21 @@ const Fail = ({ error }: FailProps) => (
 
 const MigrationBody = () => {
   // The migration step does not need to be in redux, but a loading state does need to exist there.
-  const [step, setStep] = React.useState<Step>('options');
-  const [error, setError] = React.useState<Error>(null);
-
-  const start = React.useCallback(async (options: MigrationOptions) => {
+  const [step, setStep] = useState<Step>('options');
+  const [error, setError] = useState<Error | null>(null);
+  const start = useCallback(async (options: MigrationOptions) => {
     setStep('migrating');
     const { error } = await migrateFromDesigner(options);
+
     if (error) {
       setError(error);
     }
+
     setStep('results');
   }, []);
 
   const reduxDispatch = useDispatch();
-  const cancel = React.useCallback(() => {
+  const cancel = useCallback(() => {
     trackEvent('Data', 'Migration', 'Skip');
     reduxDispatch(goToNextActivity());
   }, [reduxDispatch]);
@@ -278,20 +280,23 @@ const MigrationBody = () => {
   switch (step) {
     case 'options':
       return <Options start={start} cancel={cancel} />;
+
     case 'migrating':
       return <Migrating />;
+
     case 'results':
       return error ? <Fail error={error} /> : <Success />;
+
     default:
-      throw new Error(`${this.state.step} is not recognized as a migration step.`);
+      throw new Error(`${step} is not recognized as a migration step.`);
   }
 };
 
-type Props = {|
-  wrapperProps: WrapperProps,
-|};
+interface Props {
+  wrapperProps: WrapperProps;
+}
 
-const WrapperMigration = ({ wrapperProps }: Props) => (
+const WrapperMigration: FunctionComponent<Props> = ({ wrapperProps }) => (
   <OnboardingContainer
     wrapperProps={wrapperProps}
     header="Migrate from Insomnia Designer"
diff --git a/packages/insomnia-app/app/ui/components/wrapper-onboarding.js b/packages/insomnia-app/app/ui/components/wrapper-onboarding.tsx
similarity index 86%
rename from packages/insomnia-app/app/ui/components/wrapper-onboarding.js
rename to packages/insomnia-app/app/ui/components/wrapper-onboarding.tsx
index 2e2cee9266..76043c0787 100644
--- a/packages/insomnia-app/app/ui/components/wrapper-onboarding.js
+++ b/packages/insomnia-app/app/ui/components/wrapper-onboarding.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import 'swagger-ui-react/swagger-ui.css';
 import { showPrompt } from './modals';
@@ -7,27 +6,25 @@ import type { BaseModel } from '../../models';
 import * as models from '../../models';
 import { AUTOBIND_CFG, getAppLongName, getAppName, getAppSynopsis } from '../../common/constants';
 import type { HandleImportFileCallback, HandleImportUriCallback, WrapperProps } from './wrapper';
-import * as db from '../../common/database';
+import { database as db } from '../../common/database';
 import { ForceToWorkspaceKeys } from '../redux/modules/helpers';
 import OnboardingContainer from './onboarding-container';
 import { WorkspaceScopeKeys } from '../../models/workspace';
 import Analytics from './analytics';
 
-type Props = {|
-  wrapperProps: WrapperProps,
-  handleImportFile: HandleImportFileCallback,
-  handleImportUri: HandleImportUriCallback,
-  header: string,
-  subHeader: string,
-|};
+interface Props {
+  wrapperProps: WrapperProps;
+  handleImportFile: HandleImportFileCallback;
+  handleImportUri: HandleImportUriCallback;
+}
 
-type State = {|
-  step: number,
-|};
+interface State {
+  step: number;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class WrapperOnboarding extends React.PureComponent<Props, State> {
-  state = {
+class WrapperOnboarding extends PureComponent<Props, State> {
+  state: State = {
     step: 1,
   };
 
@@ -54,14 +51,17 @@ class WrapperOnboarding extends React.PureComponent<Props, State> {
     this._nextActivity();
   }
 
-  _handleBackStep(e: SyntheticEvent<HTMLAnchorElement>) {
+  _handleBackStep(e: React.SyntheticEvent<HTMLAnchorElement>) {
     e.preventDefault();
-
-    this.setState(state => ({ step: state.step - 1 }));
+    this.setState(state => ({
+      step: state.step - 1,
+    }));
   }
 
   async _handleCompleteAnalyticsStep() {
-    this.setState(state => ({ step: state.step + 1 }));
+    this.setState(state => ({
+      step: state.step + 1,
+    }));
   }
 
   _handleImportFile() {
@@ -74,7 +74,6 @@ class WrapperOnboarding extends React.PureComponent<Props, State> {
 
   _handleImportUri(defaultValue: string) {
     const { handleImportUri } = this.props;
-
     showPrompt({
       title: 'Import From URI',
       defaultValue: typeof defaultValue === 'string' ? defaultValue : '',
@@ -118,7 +117,7 @@ class WrapperOnboarding extends React.PureComponent<Props, State> {
       settings: { enableAnalytics },
     } = this.props.wrapperProps;
     return (
-      <React.Fragment>
+      <Fragment>
         <p className="notice success text-left margin-top margin-bottom">
           <a href="#" className="pull-right" onClick={this._handleBackStep}>
             Back
@@ -137,14 +136,14 @@ class WrapperOnboarding extends React.PureComponent<Props, State> {
         <button key="skip" className="btn btn--super-compact" onClick={this._handleSkipImport}>
           Skip
         </button>
-      </React.Fragment>
+      </Fragment>
     );
   }
 
   render() {
     const { step } = this.state;
-
     let stepBody;
+
     if (step === 1) {
       stepBody = this.renderStep1();
     } else {
diff --git a/packages/insomnia-app/app/ui/components/wrapper-unit-test.js b/packages/insomnia-app/app/ui/components/wrapper-unit-test.tsx
similarity index 82%
rename from packages/insomnia-app/app/ui/components/wrapper-unit-test.js
rename to packages/insomnia-app/app/ui/components/wrapper-unit-test.tsx
index f518da21e7..7ce1a8aa8b 100644
--- a/packages/insomnia-app/app/ui/components/wrapper-unit-test.js
+++ b/packages/insomnia-app/app/ui/components/wrapper-unit-test.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import { AUTOBIND_CFG, ACTIVITY_HOME } from '../../common/constants';
 import classnames from 'classnames';
@@ -18,7 +17,7 @@ import CodeEditor from './codemirror/code-editor';
 import type { WrapperProps } from './wrapper';
 import * as models from '../../models';
 import type { UnitTest } from '../../models/unit-test';
-import { generate, runTests } from 'insomnia-testing';
+import { generate, runTests, Test } from 'insomnia-testing';
 import { showAlert, showModal, showPrompt } from './modals';
 import Editable from './base/editable';
 import type { SidebarChildObjects } from './sidebar/sidebar-children';
@@ -29,21 +28,21 @@ import type { GlobalActivity } from '../../common/constants';
 import WorkspacePageHeader from './workspace-page-header';
 import { trackSegmentEvent } from '../../common/analytics';
 
-type Props = {|
-  children: SidebarChildObjects,
-  gitSyncDropdown: React.Node,
-  handleActivityChange: (workspaceId: string, activity: GlobalActivity) => Promise<void>,
-  wrapperProps: WrapperProps,
-|};
+interface Props {
+  children: SidebarChildObjects;
+  gitSyncDropdown: ReactNode;
+  handleActivityChange: (workspaceId: string, activity: GlobalActivity) => Promise<void>;
+  wrapperProps: WrapperProps;
+}
 
-type State = {|
-  testsRunning: Array<UnitTest> | null,
-  resultsError: string | null,
-|};
+interface State {
+  testsRunning: Array<UnitTest> | null;
+  resultsError: string | null;
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class WrapperUnitTest extends React.PureComponent<Props, State> {
-  state = {
+class WrapperUnitTest extends PureComponent<Props, State> {
+  state: State = {
     testsRunning: null,
     resultsError: null,
   };
@@ -58,13 +57,16 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
       chai: true,
       debugger: true,
     },
-    asi: true, // Don't require semicolons
-    undef: true, // Prevent undefined usages
-    node: true, // Enable NodeJS globals
+    asi: true,
+    // Don't require semicolons
+    undef: true,
+    // Prevent undefined usages
+    node: true,
+    // Enable NodeJS globals
     esversion: 8, // ES8 syntax (async/await, etc)
   };
 
-  generateSendReqSnippet(existingCode: string, requestId: string): string {
+  generateSendReqSnippet(existingCode: string, requestId: string) {
     let variableName = 'response';
 
     for (let i = 1; i < 100; i++) {
@@ -85,7 +87,7 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
     );
   }
 
-  autocompleteSnippets(unitTest: UnitTest): Array<{ name: string, value: () => Promise<string> }> {
+  autocompleteSnippets(unitTest: UnitTest) {
     return [
       {
         name: 'Send Current Request',
@@ -102,10 +104,14 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
               message: 'Select a request to fill',
               value: '__NULL__',
               options: [
-                { name: '-- Select Request --', value: '__NULL__' },
+                {
+                  name: '-- Select Request --',
+                  value: '__NULL__',
+                },
                 ...this.buildSelectableRequests().map(({ name, request }) => ({
                   name: name,
                   displayValue: '',
+                  // @ts-expect-error -- TSCONVERSION
                   value: this.generateSendReqSnippet(unitTest.code, `'${request._id}'`),
                 })),
               ],
@@ -117,7 +123,7 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
     ];
   }
 
-  async _handleCreateTestSuite(): Promise<void> {
+  async _handleCreateTestSuite() {
     const { activeWorkspace } = this.props.wrapperProps;
     showPrompt({
       title: 'New Test Suite',
@@ -136,7 +142,7 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
     });
   }
 
-  async _handleCreateTest(): Promise<void> {
+  async _handleCreateTest() {
     const { activeUnitTestSuite } = this.props.wrapperProps;
     showPrompt({
       title: 'New Test',
@@ -146,7 +152,7 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
       selectText: true,
       onComplete: async name => {
         await models.unitTest.create({
-          parentId: activeUnitTestSuite._id,
+          parentId: activeUnitTestSuite?._id,
           code: this.generateSendReqSnippet('', ''),
           name,
         });
@@ -155,11 +161,13 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
     });
   }
 
-  async _handleUnitTestCodeChange(unitTest: UnitTest, v: string): Promise<void> {
-    await models.unitTest.update(unitTest, { code: v });
+  async _handleUnitTestCodeChange(unitTest: UnitTest, v: string) {
+    await models.unitTest.update(unitTest, {
+      code: v,
+    });
   }
 
-  async _handleBreadcrumb(): void {
+  async _handleBreadcrumb() {
     const {
       handleActivityChange,
       wrapperProps: { activeWorkspace },
@@ -167,18 +175,18 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
     await handleActivityChange(activeWorkspace._id, ACTIVITY_HOME);
   }
 
-  async _handleRunTests(): Promise<void> {
+  async _handleRunTests() {
     const { activeUnitTests } = this.props.wrapperProps;
     await this._runTests(activeUnitTests);
     trackSegmentEvent('Ran All Unit Tests');
   }
 
-  async _handleRunTest(unitTest: UnitTest): Promise<void> {
+  async _handleRunTest(unitTest: UnitTest) {
     await this._runTests([unitTest]);
     trackSegmentEvent('Ran Individual Unit Test');
   }
 
-  async _handleDeleteTest(unitTest: UnitTest): Promise<void> {
+  async _handleDeleteTest(unitTest: UnitTest) {
     showAlert({
       title: `Delete ${unitTest.name}`,
       message: (
@@ -196,13 +204,15 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
 
   async _handleSetActiveRequest(
     unitTest: UnitTest,
-    e: SyntheticEvent<HTMLSelectElement>,
-  ): Promise<void> {
+    e: React.SyntheticEvent<HTMLSelectElement>,
+  ) {
     const requestId = e.currentTarget.value === '__NULL__' ? null : e.currentTarget.value;
-    await models.unitTest.update(unitTest, { requestId });
+    await models.unitTest.update(unitTest, {
+      requestId,
+    });
   }
 
-  async _handleDeleteUnitTestSuite(unitTestSuite: UnitTestSuite): Promise<void> {
+  async _handleDeleteUnitTestSuite(unitTestSuite: UnitTestSuite) {
     showAlert({
       title: `Delete ${unitTestSuite.name}`,
       message: (
@@ -218,28 +228,35 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
     });
   }
 
-  async _handleSetActiveUnitTestSuite(unitTestSuite: UnitTestSuite): Promise<void> {
+  async _handleSetActiveUnitTestSuite(unitTestSuite: UnitTestSuite) {
     const { activeWorkspace } = this.props.wrapperProps;
     await models.workspaceMeta.updateByParentId(activeWorkspace._id, {
       activeUnitTestSuiteId: unitTestSuite._id,
     });
   }
 
-  async _handleChangeTestName(unitTest: UnitTest, name: string): Promise<void> {
-    await models.unitTest.update(unitTest, { name });
+  async _handleChangeTestName(unitTest: UnitTest, name: string) {
+    await models.unitTest.update(unitTest, {
+      name,
+    });
   }
 
-  async _handleChangeActiveSuiteName(name: string): Promise<void> {
+  async _handleChangeActiveSuiteName(name: string) {
     const { activeUnitTestSuite } = this.props.wrapperProps;
-    await models.unitTestSuite.update(activeUnitTestSuite, { name });
+    // @ts-expect-error -- TSCONVERSION
+    await models.unitTestSuite.update(activeUnitTestSuite, {
+      name,
+    });
   }
 
-  async _runTests(unitTests: Array<UnitTest>): Promise<void> {
+  async _runTests(unitTests: Array<UnitTest>) {
     const { requests, activeWorkspace, activeEnvironment } = this.props.wrapperProps;
+    this.setState({
+      testsRunning: unitTests,
+      resultsError: null,
+    });
+    const tests: Array<Test> = [];
 
-    this.setState({ testsRunning: unitTests, resultsError: null });
-
-    const tests = [];
     for (const t of unitTests) {
       tests.push({
         name: t.name,
@@ -248,28 +265,51 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
       });
     }
 
-    const src = await generate([{ name: 'My Suite', suites: [], tests }]);
+    const src = await generate([
+      {
+        name: 'My Suite',
+        suites: [],
+        tests,
+      },
+    ]);
     const sendRequest = getSendRequestCallback(activeEnvironment ? activeEnvironment._id : null);
-
     let results;
+
     try {
-      results = await runTests(src, { requests, sendRequest });
+      results = await runTests(src, {
+        requests,
+        // @ts-expect-error -- TSCONVERSION
+        sendRequest,
+      });
     } catch (err) {
       // Set the state after a timeout so the user still sees the loading state
       setTimeout(() => {
-        this.setState({ resultsError: err.message, testsRunning: null });
+        this.setState({
+          resultsError: err.message,
+          testsRunning: null,
+        });
       }, 400);
       return;
     }
 
-    await models.unitTestResult.create({ results, parentId: activeWorkspace._id });
-
-    this.setState({ testsRunning: null });
+    await models.unitTestResult.create({
+      results,
+      parentId: activeWorkspace._id,
+    });
+    this.setState({
+      testsRunning: null,
+    });
   }
 
-  buildSelectableRequests(): Array<{ name: string, request: Request }> {
+  buildSelectableRequests(): Array<{
+    name: string;
+    request: Request;
+  }> {
     const { children } = this.props;
-    const selectableRequests: Array<{ name: string, request: Request }> = [];
+    const selectableRequests: Array<{
+      name: string;
+      request: Request;
+    }> = [];
 
     const next = (p, children) => {
       for (const c of children) {
@@ -285,11 +325,10 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
     };
 
     next('', children.all);
-
     return selectableRequests;
   }
 
-  _renderResults(): React.Node {
+  _renderResults() {
     const { activeUnitTestResult } = this.props.wrapperProps;
     const { testsRunning, resultsError } = this.state;
 
@@ -351,6 +390,7 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
         </div>
       );
     }
+
     return (
       <div className="unit-tests">
         <div className="unit-tests__top-header">
@@ -360,11 +400,10 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
     );
   }
 
-  renderUnitTest(unitTest: UnitTest): React.Node {
+  renderUnitTest(unitTest: UnitTest) {
     const { settings } = this.props.wrapperProps;
     const { testsRunning } = this.state;
     const selectableRequests = this.buildSelectableRequests();
-
     return (
       <UnitTestItem
         item={unitTest}
@@ -372,8 +411,10 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
         onSetActiveRequest={this._handleSetActiveRequest.bind(this, unitTest)}
         onDeleteTest={this._handleDeleteTest.bind(this, unitTest)}
         onRunTest={this._handleRunTest.bind(this, unitTest)}
+
         testsRunning={testsRunning}
         selectedRequestId={unitTest.requestId}
+        // @ts-expect-error -- TSCONVERSION
         selectableRequests={selectableRequests}
         testNameEditable={
           <UnitTestEditable
@@ -393,6 +434,7 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
           lintOptions={WrapperUnitTest.lintOptions}
           onChange={this._handleUnitTestCodeChange.bind(this, unitTest)}
           nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
+          // @ts-expect-error -- TSCONVERSION
           isVariableUncovered={settings.isVariableUncovered}
           mode="javascript"
           lineWrapping={settings.editorLineWrapping}
@@ -402,7 +444,7 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
     );
   }
 
-  _renderTestSuite(): React.Node {
+  _renderTestSuite() {
     const { activeUnitTests, activeUnitTestSuite } = this.props.wrapperProps;
     const { testsRunning } = this.state;
 
@@ -428,7 +470,9 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
             bg="surprise"
             onClick={this._handleRunTests}
             size="default"
-            disabled={testsRunning}>
+            // @ts-expect-error -- TSCONVERSION
+            disabled={testsRunning}
+          >
             {testsRunning ? 'Running... ' : 'Run Tests'}
             <i className="fa fa-play space-left"></i>
           </Button>
@@ -438,11 +482,10 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
     );
   }
 
-  _renderPageSidebar(): React.Node {
+  _renderPageSidebar() {
     const { activeUnitTestSuites, activeUnitTestSuite } = this.props.wrapperProps;
     const { testsRunning } = this.state;
     const activeId = activeUnitTestSuite ? activeUnitTestSuite._id : 'n/a';
-
     return (
       <ErrorBoundary showAlert>
         <div className="unit-tests__sidebar">
@@ -453,7 +496,11 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
           </div>
           <ul>
             {activeUnitTestSuites.map(s => (
-              <li key={s._id} className={classnames({ active: s._id === activeId })}>
+              <li
+                key={s._id}
+                className={classnames({
+                  active: s._id === activeId,
+                })}>
                 <button key={s._id} onClick={this._handleSetActiveUnitTestSuite.bind(this, s)}>
                   {s.name}
                 </button>
@@ -467,6 +514,7 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
                   <DropdownItem
                     stayOpenAfterClick
                     onClick={this._handleRunTests}
+                    // @ts-expect-error -- TSCONVERSION
                     disabled={testsRunning}>
                     {testsRunning ? 'Running... ' : 'Run Tests'}
                   </DropdownItem>
@@ -484,7 +532,6 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
 
   _renderPageHeader() {
     const { wrapperProps, gitSyncDropdown, handleActivityChange } = this.props;
-
     return (
       <WorkspacePageHeader
         wrapperProps={wrapperProps}
diff --git a/packages/insomnia-app/app/ui/components/wrapper.js b/packages/insomnia-app/app/ui/components/wrapper.tsx
similarity index 79%
rename from packages/insomnia-app/app/ui/components/wrapper.js
rename to packages/insomnia-app/app/ui/components/wrapper.tsx
index ca5dc3c80d..5342d8b86e 100644
--- a/packages/insomnia-app/app/ui/components/wrapper.js
+++ b/packages/insomnia-app/app/ui/components/wrapper.tsx
@@ -1,4 +1,3 @@
-// @flow
 import type { Settings } from '../../models/settings';
 import type { Response } from '../../models/response';
 import type { OAuth2Token } from '../../models/o-auth-2-token';
@@ -12,7 +11,7 @@ import type {
   RequestParameter,
 } from '../../models/request';
 import type { SidebarChildObjects } from './sidebar/sidebar-children';
-import * as React from 'react';
+import React, { Fragment, PureComponent } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import {
   AUTOBIND_CFG,
@@ -61,7 +60,7 @@ import RequestRenderErrorModal from './modals/request-render-error-modal';
 import WorkspaceEnvironmentsEditModal from './modals/workspace-environments-edit-modal';
 import WorkspaceSettingsModal from './modals/workspace-settings-modal';
 import CodePromptModal from './modals/code-prompt-modal';
-import * as db from '../../common/database';
+import { database as db } from '../../common/database';
 import * as models from '../../models/index';
 import * as importers from 'insomnia-importers';
 import type { CookieJar } from '../../models/cookie-jar';
@@ -97,191 +96,196 @@ import { GrpcDispatchModalWrapper } from '../context/grpc';
 import WrapperMigration from './wrapper-migration';
 import type { ImportOptions } from '../redux/modules/global';
 import WrapperAnalytics from './wrapper-analytics';
+import { HandleGetRenderContext, HandleRender } from '../../common/render';
+import { RequestGroup } from '../../models/request-group';
 
 const spectral = new Spectral();
 
-export type WrapperProps = {
+export interface WrapperProps {
   // Helper Functions
-  handleActivateRequest: Function,
-  handleSetSidebarFilter: Function,
-  handleToggleMenuBar: Function,
-  handleImportFileToWorkspace: (workspaceId: string, options?: ImportOptions) => void,
-  handleImportClipBoardToWorkspace: (workspaceId: string, options?: ImportOptions) => void,
-  handleImportUriToWorkspace: (workspaceId: string, uri: string, options?: ImportOptions) => void,
-  handleInitializeEntities: () => Promise<void>,
-  handleExportFile: Function,
-  handleShowExportRequestsModal: Function,
-  handleShowSettingsModal: Function,
-  handleExportRequestsToFile: Function,
-  handleSetActiveWorkspace: (workspaceId: string | null) => void,
-  handleSetActiveEnvironment: Function,
-  handleMoveDoc: Function,
-  handleCreateRequest: Function,
-  handleDuplicateRequest: Function,
-  handleDuplicateRequestGroup: Function,
-  handleMoveRequestGroup: Function,
-  handleDuplicateWorkspace: Function,
-  handleCreateRequestGroup: Function,
-  handleGenerateCodeForActiveRequest: Function,
-  handleGenerateCode: Function,
-  handleCopyAsCurl: Function,
-  handleCreateRequestForWorkspace: Function,
-  handleSetRequestPaneRef: Function,
-  handleSetResponsePaneRef: Function,
-  handleSetResponsePreviewMode: Function,
-  handleRender: Function,
-  handleGetRenderContext: Function,
-  handleSetResponseFilter: Function,
-  handleSetActiveResponse: Function,
-  handleSetSidebarRef: Function,
-  handleSidebarSort: (sortOrder: SortOrder) => void,
-  handleStartDragSidebar: Function,
-  handleResetDragSidebar: Function,
-  handleStartDragPaneHorizontal: Function,
-  handleStartDragPaneVertical: Function,
-  handleResetDragPaneHorizontal: Function,
-  handleResetDragPaneVertical: Function,
-  handleSetRequestGroupCollapsed: Function,
-  handleSetRequestPinned: Function,
-  handleSendRequestWithEnvironment: Function,
-  handleSendAndDownloadRequestWithEnvironment: Function,
-  handleUpdateRequestMimeType: Function,
-  handleUpdateDownloadPath: Function,
-  handleSetActiveActivity: (activity: GlobalActivity) => void,
-  handleGoToNextActivity: () => void,
-
+  handleActivateRequest: (activeRequestId: string) => void;
+  handleSetSidebarFilter: (value: string) => Promise<void>;
+  handleToggleMenuBar: Function;
+  handleImportFileToWorkspace: (workspaceId: string, options?: ImportOptions) => void;
+  handleImportClipBoardToWorkspace: (workspaceId: string, options?: ImportOptions) => void;
+  handleImportUriToWorkspace: (workspaceId: string, uri: string, options?: ImportOptions) => void;
+  handleInitializeEntities: () => Promise<void>;
+  handleExportFile: Function;
+  handleShowExportRequestsModal: Function;
+  handleShowSettingsModal: Function;
+  handleExportRequestsToFile: Function;
+  handleSetActiveWorkspace: (workspaceId: string | null) => void;
+  handleSetActiveEnvironment: (environmentId: string | null) => Promise<void>;
+  handleMoveDoc: Function;
+  handleCreateRequest: (id: string) => any;
+  handleDuplicateRequest: Function;
+  handleDuplicateRequestGroup: (requestGroup: RequestGroup) => void;
+  handleMoveRequestGroup: (requestGroup: RequestGroup) => Promise<void>;
+  handleDuplicateWorkspace: Function;
+  handleCreateRequestGroup: (parentId: string) => void;
+  handleGenerateCodeForActiveRequest: Function;
+  handleGenerateCode: Function;
+  handleCopyAsCurl: Function;
+  handleCreateRequestForWorkspace: () => void;
+  handleSetRequestPaneRef: Function;
+  handleSetResponsePaneRef: Function;
+  handleSetResponsePreviewMode: Function;
+  handleRender: HandleRender;
+  handleGetRenderContext: HandleGetRenderContext;
+  handleSetResponseFilter: Function;
+  handleSetActiveResponse: Function;
+  handleSetSidebarRef: Function;
+  handleSidebarSort: (sortOrder: SortOrder) => void;
+  handleStartDragSidebar: React.MouseEventHandler;
+  handleResetDragSidebar: React.MouseEventHandler;
+  handleStartDragPaneHorizontal: React.MouseEventHandler;
+  handleStartDragPaneVertical: React.MouseEventHandler;
+  handleResetDragPaneHorizontal: React.MouseEventHandler;
+  handleResetDragPaneVertical: React.MouseEventHandler;
+  handleSetRequestGroupCollapsed: Function;
+  handleSetRequestPinned: Function;
+  handleSendRequestWithEnvironment: Function;
+  handleSendAndDownloadRequestWithEnvironment: Function;
+  handleUpdateRequestMimeType: (mimeType: string) => Promise<Request | null>;
+  handleUpdateDownloadPath: Function;
+  handleSetActiveActivity: (activity: GlobalActivity) => void;
+  handleGoToNextActivity: () => void;
   // Properties
-  activity: GlobalActivity,
-  apiSpecs: Array<ApiSpec>,
-  loadStartTime: number,
-  isLoading: boolean,
-  paneWidth: number,
-  paneHeight: number,
-  responsePreviewMode: string,
-  responseFilter: string,
-  responseFilterHistory: Array<string>,
-  responseDownloadPath: string | null,
-  sidebarWidth: number,
-  sidebarHidden: boolean,
-  sidebarFilter: string,
-  sidebarChildren: SidebarChildObjects,
-  settings: Settings,
-  workspaces: Array<Workspace>,
-  requestMetas: Array<RequestMeta>,
-  requests: Array<Request>,
-  requestVersions: Array<RequestVersion>,
-  unseenWorkspaces: Array<Workspace>,
-  workspaceChildren: Array<Object>,
-  activeWorkspaceMeta: WorkspaceMeta,
-  environments: Array<Object>,
-  activeApiSpec: ApiSpec,
-  activeRequestResponses: Array<Response>,
-  activeWorkspace: Workspace,
-  activeCookieJar: CookieJar,
-  activeEnvironment: Environment | null,
-  activeGitRepository: GitRepository | null,
-  activeUnitTestResult: UnitTestResult | null,
-  activeUnitTestSuites: Array<UnitTestSuite>,
-  activeUnitTests: Array<UnitTest>,
-  activeWorkspaceClientCertificates: Array<ClientCertificate>,
-  headerEditorKey: string,
-  isVariableUncovered: boolean,
-  vcs: VCS | null,
-  gitVCS: GitVCS | null,
-  gitRepositories: Array<GitRepository>,
-  syncItems: Array<StatusCandidate>,
-
-  // Optional
-  oAuth2Token: OAuth2Token | null,
-  activeRequest: Request | null,
-  activeResponse: Response | null,
-};
+  activity: GlobalActivity;
+  apiSpecs: Array<ApiSpec>;
+  loadStartTime: number;
+  isLoading: boolean;
+  paneWidth: number;
+  paneHeight: number;
+  responsePreviewMode: string;
+  responseFilter: string;
+  responseFilterHistory: Array<string>;
+  responseDownloadPath: string | null;
+  sidebarWidth: number;
+  sidebarHidden: boolean;
+  sidebarFilter: string;
+  sidebarChildren: SidebarChildObjects;
+  settings: Settings;
+  workspaces: Array<Workspace>;
+  requestMetas: Array<RequestMeta>;
+  requests: Array<Request>;
+  requestVersions: Array<RequestVersion>;
+  unseenWorkspaces: Array<Workspace>;
+  workspaceChildren: Array<Request | RequestGroup>;
+  activeWorkspaceMeta: WorkspaceMeta;
+  environments: Array<Environment>;
+  activeApiSpec: ApiSpec;
+  activeUnitTestSuite: UnitTestSuite | null;
+  activeRequestResponses: Array<Response>;
+  activeWorkspace: Workspace;
+  activeCookieJar: CookieJar;
+  activeEnvironment: Environment | null;
+  activeGitRepository: GitRepository | null;
+  activeUnitTestResult: UnitTestResult | null;
+  activeUnitTestSuites: Array<UnitTestSuite>;
+  activeUnitTests: Array<UnitTest>;
+  activeWorkspaceClientCertificates: Array<ClientCertificate>;
+  headerEditorKey: string;
+  isVariableUncovered: boolean;
+  vcs: VCS | null;
+  gitVCS: GitVCS | null;
+  gitRepositories: Array<GitRepository>;
+  syncItems: Array<StatusCandidate>;
+  oAuth2Token?: OAuth2Token | null;
+  activeRequest?: Request | null;
+  activeResponse?: Response | null;
+  workspaceMetas?: Array<WorkspaceMeta>;
+}
 
 export type HandleImportFileCallback = (options?: ImportOptions) => void;
 export type HandleImportClipboardCallback = (options?: ImportOptions) => void;
 export type HandleImportUriCallback = (uri: string, options?: ImportOptions) => void;
 
-type State = {
-  forceRefreshKey: number,
-  activeGitBranch: string,
-};
+interface State {
+  forceRefreshKey: number;
+  activeGitBranch: string;
+}
 
-const rUpdate = (request, ...args) => {
+const rUpdate = (request, ...args: Array<Partial<Request>>) => {
   if (!request) {
     throw new Error('Tried to update null request');
   }
 
+  // @ts-expect-error -- TSCONVERSION
   return models.request.update(request, ...args);
 };
 
 const sUpdate = models.settings.update;
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class Wrapper extends React.PureComponent<WrapperProps, State> {
-  constructor(props: any) {
-    super(props);
-    this.state = {
-      forceRefreshKey: Date.now(),
-      activeGitBranch: 'no-vcs',
-    };
+class Wrapper extends PureComponent<WrapperProps, State> {
+  state: State = {
+    forceRefreshKey: Date.now(),
+    activeGitBranch: 'no-vcs',
   }
 
   // Request updaters
-  async _handleForceUpdateRequest(r: Request, patch: Object): Promise<Request> {
+  async _handleForceUpdateRequest(r: Request, patch: Partial<Request>) {
     const newRequest = await rUpdate(r, patch);
-
     // Give it a second for the app to render first. If we don't wait, it will refresh
     // on the old request and won't catch the newest one.
     // TODO: Move this refresh key into redux store so we don't need timeout
     window.setTimeout(this._forceRequestPaneRefresh, 100);
-
     return newRequest;
   }
 
-  _handleForceUpdateRequestHeaders(r: Request, headers: Array<RequestHeader>): Promise<Request> {
-    return this._handleForceUpdateRequest(r, { headers });
+  _handleForceUpdateRequestHeaders(r: Request, headers: Array<RequestHeader>) {
+    return this._handleForceUpdateRequest(r, {
+      headers,
+    });
   }
 
-  async _handleUpdateApiSpec(s: ApiSpec): Promise<void> {
+  async _handleUpdateApiSpec(s: ApiSpec) {
     await models.apiSpec.update(s);
   }
 
-  static _handleUpdateRequestBody(r: Request, body: RequestBody): Promise<Request> {
-    return rUpdate(r, { body });
+  static _handleUpdateRequestBody(r: Request, body: RequestBody) {
+    return rUpdate(r, {
+      body,
+    });
   }
 
-  static _handleUpdateRequestParameters(
-    r: Request,
-    parameters: Array<RequestParameter>,
-  ): Promise<Request> {
-    return rUpdate(r, { parameters });
+  static _handleUpdateRequestParameters(r: Request, parameters: Array<RequestParameter>) {
+    return rUpdate(r, {
+      parameters,
+    });
   }
 
-  static _handleUpdateRequestAuthentication(
-    r: Request,
-    authentication: RequestAuthentication,
-  ): Promise<Request> {
-    return rUpdate(r, { authentication });
+  static _handleUpdateRequestAuthentication(r: Request, authentication: RequestAuthentication) {
+    return rUpdate(r, {
+      authentication,
+    });
   }
 
-  static _handleUpdateRequestHeaders(r: Request, headers: Array<RequestHeader>): Promise<Request> {
-    return rUpdate(r, { headers });
+  static _handleUpdateRequestHeaders(r: Request, headers: Array<RequestHeader>) {
+    return rUpdate(r, {
+      headers,
+    });
   }
 
-  static _handleUpdateRequestMethod(r: Request, method: string): Promise<Request> {
-    return rUpdate(r, { method });
+  static _handleUpdateRequestMethod(r: Request, method: string) {
+    return rUpdate(r, {
+      method,
+    });
   }
 
-  static _handleUpdateRequestUrl(r: Request, url: string): Promise<Request> {
+  static _handleUpdateRequestUrl(r: Request, url: string) {
     // Don't update if we don't need to
     if (r.url === url) {
       return Promise.resolve(r);
     }
 
-    return rUpdate(r, { url });
+    return rUpdate(r, {
+      url,
+    });
   }
 
-  async _handleImport(text: string): Promise<Request | null> {
+  async _handleImport(text: string) {
     // Allow user to paste any import file into the url. If it results in
     // only one item, it will overwrite the current request.
     try {
@@ -295,8 +299,10 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
           url: r.url,
           method: r.method,
           headers: r.headers,
+          // @ts-expect-error -- TSCONVERSION
           body: r.body,
           authentication: r.authentication,
+          // @ts-expect-error -- TSCONVERSION
           parameters: r.parameters,
         });
       }
@@ -312,10 +318,13 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
 
     // Remember last activity on workspace for later, but only if it isn't HOME
     if (nextActivity !== ACTIVITY_HOME) {
-      await models.workspaceMeta.updateByParentId(workspaceId, { activeActivity: nextActivity });
+      await models.workspaceMeta.updateByParentId(workspaceId, {
+        activeActivity: nextActivity,
+      });
     }
 
     const notEditingASpec = activity !== ACTIVITY_SPEC;
+
     if (notEditingASpec) {
       handleSetActiveActivity(nextActivity);
       return;
@@ -323,9 +332,9 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
 
     // Handle switching away from the spec design activity. For this, we want to generate
     // requests that can be accessed from debug or test.
-
     // If there are errors in the spec, show the user a warning first
     const results = await spectral.run(activeApiSpec.contents);
+
     if (activeApiSpec.contents && results && results.length) {
       showModal(AlertModal, {
         title: 'Error Generating Configuration',
@@ -356,33 +365,37 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
   }
 
   // Settings updaters
-  _handleUpdateSettingsShowPasswords(showPasswords: boolean): Promise<Settings> {
-    return sUpdate(this.props.settings, { showPasswords });
+  _handleUpdateSettingsShowPasswords(showPasswords: boolean) {
+    return sUpdate(this.props.settings, {
+      showPasswords,
+    });
   }
 
-  _handleUpdateSettingsUseBulkHeaderEditor(useBulkHeaderEditor: boolean): Promise<Settings> {
-    return sUpdate(this.props.settings, { useBulkHeaderEditor });
+  _handleUpdateSettingsUseBulkHeaderEditor(useBulkHeaderEditor: boolean) {
+    return sUpdate(this.props.settings, {
+      useBulkHeaderEditor,
+    });
   }
 
-  _handleUpdateSettingsUseBulkParametersEditor(
-    useBulkParametersEditor: boolean,
-  ): Promise<Settings> {
-    return sUpdate(this.props.settings, { useBulkParametersEditor });
+  _handleUpdateSettingsUseBulkParametersEditor(useBulkParametersEditor: boolean) {
+    return sUpdate(this.props.settings, {
+      useBulkParametersEditor,
+    });
   }
 
-  _handleImportFile(options?: ImportOptions): void {
+  _handleImportFile(options?: ImportOptions) {
     this.props.handleImportFileToWorkspace(this.props.activeWorkspace._id, options);
   }
 
-  _handleImportUri(uri: string, options?: ImportOptions): void {
+  _handleImportUri(uri: string, options?: ImportOptions) {
     this.props.handleImportUriToWorkspace(this.props.activeWorkspace._id, uri, options);
   }
 
-  _handleImportClipBoard(options?: ImportOptions): void {
+  _handleImportClipBoard(options?: ImportOptions) {
     this.props.handleImportClipBoardToWorkspace(this.props.activeWorkspace._id, options);
   }
 
-  _handleSetActiveResponse(responseId: string | null): void {
+  _handleSetActiveResponse(responseId: string | null) {
     if (!this.props.activeRequest) {
       console.warn('Tried to set active response when request not active');
       return;
@@ -391,25 +404,26 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
     this.props.handleSetActiveResponse(this.props.activeRequest._id, responseId);
   }
 
-  _handleShowEnvironmentsModal(): void {
+  _handleShowEnvironmentsModal() {
     showModal(WorkspaceEnvironmentsEditModal, this.props.activeWorkspace);
   }
 
-  _handleShowCookiesModal(): void {
+  _handleShowCookiesModal() {
     showModal(CookiesModal, this.props.activeWorkspace);
   }
 
-  static _handleShowModifyCookieModal(cookie: Object): void {
+  static _handleShowModifyCookieModal(cookie: Record<string, any>) {
     showModal(CookieModifyModal, cookie);
   }
 
-  _handleShowRequestSettingsModal(): void {
-    showModal(RequestSettingsModal, { request: this.props.activeRequest });
+  _handleShowRequestSettingsModal() {
+    showModal(RequestSettingsModal, {
+      request: this.props.activeRequest,
+    });
   }
 
-  async _handleDeleteResponses(requestId: string, environmentId: string | null): Promise<void> {
+  async _handleDeleteResponses(requestId: string, environmentId: string | null) {
     const { handleSetActiveResponse, activeRequest } = this.props;
-
     await models.response.removeForRequest(requestId, environmentId);
 
     if (activeRequest && activeRequest._id === requestId) {
@@ -417,7 +431,7 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
     }
   }
 
-  async _handleDeleteResponse(response: Response): Promise<void> {
+  async _handleDeleteResponse(response: Response) {
     if (response) {
       await models.response.remove(response);
     }
@@ -428,48 +442,49 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
     }
   }
 
-  async _handleRemoveActiveWorkspace(): Promise<void> {
+  async _handleRemoveActiveWorkspace() {
     const { workspaces, activeWorkspace } = this.props;
+
     if (workspaces.length <= 1) {
       showModal(AlertModal, {
         title: 'Deleting Last Workspace',
         message: 'Since you deleted your only workspace, a new one has been created for you.',
         onConfirm: async () => {
           await models.stats.incrementDeletedRequestsForDescendents(activeWorkspace);
-
-          await models.workspace.create({ name: getAppName() });
+          await models.workspace.create({
+            name: getAppName(),
+          });
           await models.workspace.remove(activeWorkspace);
         },
       });
     } else {
       await models.stats.incrementDeletedRequestsForDescendents(activeWorkspace);
-
       await models.workspace.remove(activeWorkspace);
     }
   }
 
-  async _handleActiveWorkspaceClearAllResponses(): Promise<void> {
+  async _handleActiveWorkspaceClearAllResponses() {
     const docs = await db.withDescendants(this.props.activeWorkspace, models.request.type);
     const requests = docs.filter(doc => doc.type === models.request.type);
+
     for (const req of requests) {
       await models.response.removeForRequest(req._id);
     }
   }
 
-  _handleSendRequestWithActiveEnvironment(): void {
+  _handleSendRequestWithActiveEnvironment() {
     const { activeRequest, activeEnvironment, handleSendRequestWithEnvironment } = this.props;
     const activeRequestId = activeRequest ? activeRequest._id : 'n/a';
     const activeEnvironmentId = activeEnvironment ? activeEnvironment._id : 'n/a';
     handleSendRequestWithEnvironment(activeRequestId, activeEnvironmentId);
   }
 
-  async _handleSendAndDownloadRequestWithActiveEnvironment(filename?: string): Promise<void> {
+  async _handleSendAndDownloadRequestWithActiveEnvironment(filename?: string) {
     const {
       activeRequest,
       activeEnvironment,
       handleSendAndDownloadRequestWithEnvironment,
     } = this.props;
-
     const activeRequestId = activeRequest ? activeRequest._id : 'n/a';
     const activeEnvironmentId = activeEnvironment ? activeEnvironment._id : 'n/a';
     await handleSendAndDownloadRequestWithEnvironment(
@@ -479,13 +494,13 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
     );
   }
 
-  _handleSetPreviewMode(previewMode: string): void {
+  _handleSetPreviewMode(previewMode: string) {
     const activeRequest = this.props.activeRequest;
     const activeRequestId = activeRequest ? activeRequest._id : 'n/a';
     this.props.handleSetResponsePreviewMode(activeRequestId, previewMode);
   }
 
-  _handleSetResponseFilter(filter: string): void {
+  _handleSetResponseFilter(filter: string) {
     const activeRequest = this.props.activeRequest;
     const activeRequestId = activeRequest ? activeRequest._id : 'n/a';
     this.props.handleSetResponseFilter(activeRequestId, filter);
@@ -506,12 +521,16 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
     handleSetActiveEnvironment(id);
   }
 
-  _forceRequestPaneRefresh(): void {
-    this.setState({ forceRefreshKey: Date.now() });
+  _forceRequestPaneRefresh() {
+    this.setState({
+      forceRefreshKey: Date.now(),
+    });
   }
 
   _handleGitBranchChanged(branch) {
-    this.setState({ activeGitBranch: branch || 'no-vcs' });
+    this.setState({
+      activeGitBranch: branch || 'no-vcs',
+    });
   }
 
   componentDidMount() {
@@ -519,10 +538,11 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
     trackPageView(`/${activity || ''}`);
   }
 
-  componentDidUpdate(prevProps: Props) {
+  componentDidUpdate(prevProps: WrapperProps) {
     // We're using activities as page views so here we monitor
     // for a change in activity and send it as a pageview.
     const { activity } = this.props;
+
     if (prevProps.activity !== activity) {
       trackPageView(`/${activity || ''}`);
     }
@@ -559,14 +579,15 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
       workspaceChildren,
       workspaces,
     } = this.props;
-
     // Setup git sync dropdown for use in Design/Debug pages
-    let gitSyncDropdown = null;
+    let gitSyncDropdown: JSX.Element | null = null;
+
     if (gitVCS) {
       gitSyncDropdown = (
         <GitSyncDropdown
           className="margin-left"
           workspace={activeWorkspace}
+          // @ts-expect-error -- TSCONVERSION this prop is unused
           dropdownButtonClassName="btn--clicky-small btn-sync btn-utility"
           gitRepository={activeGitRepository}
           vcs={gitVCS}
@@ -582,7 +603,7 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
     }
 
     return (
-      <React.Fragment>
+      <Fragment>
         <div key="modals" className="modals">
           <ErrorBoundary showAlert>
             <AlertModal ref={registerModal} />
@@ -629,11 +650,9 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
               <CookiesModal
                 handleShowModifyCookieModal={Wrapper._handleShowModifyCookieModal}
                 handleRender={handleRender}
-                nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
                 ref={registerModal}
                 workspace={activeWorkspace}
                 cookieJar={activeCookieJar}
-                isVariableUncovered={isVariableUncovered}
               />
             ) : null}
 
@@ -725,7 +744,7 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
             />
 
             {gitVCS && (
-              <React.Fragment>
+              <Fragment>
                 <GitStagingModal ref={registerModal} workspace={activeWorkspace} vcs={gitVCS} />
                 <GitLogModal ref={registerModal} vcs={gitVCS} />
                 <GitRepositorySettingsModal ref={registerModal} />
@@ -738,11 +757,11 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
                     handleGitBranchChanged={this._handleGitBranchChanged}
                   />
                 )}
-              </React.Fragment>
+              </Fragment>
             )}
 
             {vcs && (
-              <React.Fragment>
+              <Fragment>
                 <SyncStagingModal
                   ref={registerModal}
                   workspace={activeWorkspace}
@@ -764,7 +783,7 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
                 <SyncDeleteModal ref={registerModal} workspace={activeWorkspace} vcs={vcs} />
                 <SyncHistoryModal ref={registerModal} workspace={activeWorkspace} vcs={vcs} />
                 <SyncShareModal ref={registerModal} workspace={activeWorkspace} vcs={vcs} />
-              </React.Fragment>
+              </Fragment>
             )}
 
             <WorkspaceEnvironmentsEditModal
@@ -799,7 +818,7 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
             </GrpcDispatchModalWrapper>
           </ErrorBoundary>
         </div>
-        <React.Fragment key={`views::${this.state.activeGitBranch}`}>
+        <Fragment key={`views::${this.state.activeGitBranch}`}>
           {activity === ACTIVITY_HOME && (
             <WrapperHome
               wrapperProps={this.props}
@@ -879,8 +898,8 @@ class Wrapper extends React.PureComponent<WrapperProps, State> {
               handleImportUri={this._handleImportUri}
             />
           )}
-        </React.Fragment>
-      </React.Fragment>
+        </Fragment>
+      </Fragment>
     );
   }
 }
diff --git a/packages/insomnia-app/app/ui/containers/app.js b/packages/insomnia-app/app/ui/containers/app.tsx
similarity index 75%
rename from packages/insomnia-app/app/ui/containers/app.js
rename to packages/insomnia-app/app/ui/containers/app.tsx
index 17220090c3..0baa49c8cf 100644
--- a/packages/insomnia-app/app/ui/containers/app.js
+++ b/packages/insomnia-app/app/ui/containers/app.tsx
@@ -1,5 +1,4 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { PureComponent, RefObject } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import {
   AUTOBIND_CFG,
@@ -17,9 +16,11 @@ import {
   MIN_SIDEBAR_REMS,
   PREVIEW_MODE_SOURCE,
   ACTIVITY_MIGRATION,
+  SortOrder,
+  GlobalActivity,
 } from '../../common/constants';
 import fs from 'fs';
-import { clipboard, ipcRenderer, remote } from 'electron';
+import { clipboard, ipcRenderer, remote, SaveDialogOptions } from 'electron';
 import { parse as urlParse } from 'url';
 import HTTPSnippet from 'httpsnippet';
 import ReactDOM from 'react-dom';
@@ -31,10 +32,9 @@ import Toast from '../components/toast';
 import CookiesModal from '../components/modals/cookies-modal';
 import RequestSwitcherModal from '../components/modals/request-switcher-modal';
 import SettingsModal, { TAB_INDEX_SHORTCUTS } from '../components/modals/settings-modal';
-
 import * as globalActions from '../redux/modules/global';
 import * as entitiesActions from '../redux/modules/entities';
-import * as db from '../../common/database';
+import { database as db } from '../../common/database';
 import * as models from '../../models';
 import {
   selectActiveCookieJar,
@@ -67,8 +67,8 @@ import {
   debounce,
   generateId,
   getContentDispositionHeader,
-  getDataDirectory,
 } from '../../common/misc';
+import { getDataDirectory } from '../../common/electron-helpers';
 import * as mime from 'mime-types';
 import * as path from 'path';
 import * as render from '../../common/render';
@@ -83,7 +83,7 @@ import * as plugins from '../../plugins';
 import * as templating from '../../templating/index';
 import { NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME } from '../../templating/index';
 import AskModal from '../components/modals/ask-modal';
-import { updateMimeType } from '../../models/request';
+import { Request, updateMimeType } from '../../models/request';
 import MoveRequestGroupModal from '../components/modals/move-request-group-modal';
 import * as themes from '../../plugins/misc';
 import ExportRequestsModal from '../components/modals/export-requests-modal';
@@ -108,12 +108,80 @@ import withDragDropContext from '../context/app/drag-drop-context';
 import { trackSegmentEvent } from '../../common/analytics';
 import getWorkspaceName from '../../models/helpers/get-workspace-name';
 import * as workspaceOperations from '../../models/helpers/workspace-operations';
+import { Settings } from '../../models/settings';
+import { Workspace } from '../../models/workspace';
+import { GrpcRequest } from '../../models/grpc-request';
+import { Environment } from '../../models/environment';
+import { GrpcRequestMeta } from '../../models/grpc-request-meta';
+import { RequestMeta } from '../../models/request-meta';
+import { RequestGroup } from '../../models/request-group';
+import { ApiSpec } from '../../models/api-spec';
+import { WorkspaceMeta } from '../../models/workspace-meta';
+import { GitRepository } from '../../models/git-repository';
+import { CookieJar } from '../../models/cookie-jar';
+import { Response } from '../../models/response';
+import { RenderContextAndKeys } from '../../common/render';
+
+interface Props {
+  sidebarWidth: number,
+  paneWidth: number,
+  paneHeight: number,
+  handleCommand: Function,
+  settings: Settings,
+  isLoggedIn: boolean,
+  activeWorkspace: Workspace,
+  handleSetActiveActivity: Function,
+  handleGoToNextActivity: Function,
+  handleSetActiveWorkspace: Function,
+  activeRequest?: Request | GrpcRequest,
+  activeApiSpec: ApiSpec,
+  activity: GlobalActivity,
+  activeEnvironment?: Environment,
+  isVariableUncovered: boolean,
+  sidebarHidden: boolean,
+  workspaces: Array<Workspace>,
+  apiSpecs: Array<ApiSpec>,
+  activeWorkspaceMeta: WorkspaceMeta,
+  activeGitRepository: GitRepository,
+  activeCookieJar: CookieJar,
+  environments: Array<Environment>,
+  handleStartLoading: Function,
+  handleStopLoading: Function
+  handleImportUriToWorkspace: Function,
+}
+
+interface State {
+  showDragOverlay: boolean,
+  draggingSidebar: boolean,
+  draggingPaneHorizontal: boolean,
+  draggingPaneVertical: boolean,
+  sidebarWidth: number,
+  paneWidth: number,
+  paneHeight: number,
+  isVariableUncovered: boolean,
+  vcs: VCS | null,
+  gitVCS: GitVCS | null,
+  forceRefreshCounter: number,
+  forceRefreshHeaderCounter: number,
+  isMigratingChildren: boolean,
+}
 
 @autoBindMethodsForReact(AUTOBIND_CFG)
-class App extends PureComponent {
-  constructor(props) {
-    super(props);
+class App extends PureComponent<Props, State> {
+  private _getRenderContextPromiseCache: Object;
+  private _savePaneWidth: (paneWidth: number) => void;
+  private _savePaneHeight: (paneWidth: number) => void;
+  private _saveSidebarWidth: (paneWidth: number) => void;
+  private _globalKeyMap: any;
+  private _updateVCSLock: any;
+  private _requestPane: RefObject<any>;
+  private _responsePane: RefObject<any>;
+  private _sidebar: RefObject<any>;
+  private _wrapper: Wrapper | null = null;
+  private _responseFilterHistorySaveTimeout: NodeJS.Timeout | null = null;
 
+  constructor(props: Props) {
+    super(props);
     this.state = {
       showDragOverlay: false,
       draggingSidebar: false,
@@ -131,15 +199,22 @@ class App extends PureComponent {
     };
 
     this._getRenderContextPromiseCache = {};
-
-    this._savePaneWidth = debounce(paneWidth => this._updateActiveWorkspaceMeta({ paneWidth }));
-    this._savePaneHeight = debounce(paneHeight => this._updateActiveWorkspaceMeta({ paneHeight }));
-    this._saveSidebarWidth = debounce(sidebarWidth =>
-      this._updateActiveWorkspaceMeta({ sidebarWidth }),
+    this._savePaneWidth = debounce(paneWidth =>
+      this._updateActiveWorkspaceMeta({
+        paneWidth,
+      }),
+    );
+    this._savePaneHeight = debounce(paneHeight =>
+      this._updateActiveWorkspaceMeta({
+        paneHeight,
+      }),
+    );
+    this._saveSidebarWidth = debounce(sidebarWidth =>
+      this._updateActiveWorkspaceMeta({
+        sidebarWidth,
+      }),
     );
-
     this._globalKeyMap = null;
-
     this._updateVCSLock = null;
   }
 
@@ -167,7 +242,6 @@ class App extends PureComponent {
             selectOnKeyup: true,
             title: 'Recent Requests',
             hideNeverActiveRequests: true,
-
             // Add an open delay so the dialog won't show for quick presses
             openDelay: 150,
           });
@@ -216,7 +290,10 @@ class App extends PureComponent {
         async () => {
           const { activeRequest, activeWorkspace } = this.props;
           const parentId = activeRequest ? activeRequest.parentId : activeWorkspace._id;
-          const request = await models.request.create({ parentId, name: 'New Request' });
+          const request = await models.request.create({
+            parentId,
+            name: 'New Request',
+          });
           await this._handleSetActiveRequest(request._id);
           models.stats.incrementCreatedRequests();
           trackSegmentEvent('Request Created');
@@ -227,6 +304,7 @@ class App extends PureComponent {
         () => {
           const { activeRequest, activeWorkspace } = this.props;
           const parentId = activeRequest ? activeRequest.parentId : activeWorkspace._id;
+
           this._requestCreate(parentId);
         },
       ],
@@ -246,6 +324,7 @@ class App extends PureComponent {
               if (!confirmed) {
                 return;
               }
+
               await requestOperations.remove(activeRequest);
               models.stats.incrementDeletedRequests();
             },
@@ -257,6 +336,7 @@ class App extends PureComponent {
         () => {
           const { activeRequest, activeWorkspace } = this.props;
           const parentId = activeRequest ? activeRequest.parentId : activeWorkspace._id;
+
           this._requestGroupCreate(parentId);
         },
       ],
@@ -275,7 +355,9 @@ class App extends PureComponent {
       [
         hotKeyRefs.REQUEST_TOGGLE_PIN,
         async () => {
+          // @ts-expect-error -- TSCONVERSION apparently entities doesn't exist on props
           const { activeRequest, entities } = this.props;
+
           if (!activeRequest) {
             return;
           }
@@ -283,9 +365,7 @@ class App extends PureComponent {
           const entitiesToCheck = isGrpcRequest(activeRequest)
             ? entities.grpcRequestMetas
             : entities.requestMetas;
-
-          const meta = Object.values(entitiesToCheck).find(m => m.parentId === activeRequest._id);
-
+          const meta = Object.values<GrpcRequestMeta | RequestMeta>(entitiesToCheck).find(m => m.parentId === activeRequest._id);
           await this._handleSetRequestPinned(this.props.activeRequest, !meta?.pinned);
         },
       ],
@@ -313,19 +393,19 @@ class App extends PureComponent {
     );
   }
 
-  _setRequestPaneRef(n) {
+  _setRequestPaneRef(n: RefObject<any>) {
     this._requestPane = n;
   }
 
-  _setResponsePaneRef(n) {
+  _setResponsePaneRef(n: RefObject<any>) {
     this._responsePane = n;
   }
 
-  _setSidebarRef(n) {
+  _setSidebarRef(n: RefObject<any>) {
     this._sidebar = n;
   }
 
-  _requestGroupCreate(parentId) {
+  _requestGroupCreate(parentId: string) {
     showPrompt({
       title: 'New Folder',
       defaultValue: 'My Folder',
@@ -345,27 +425,33 @@ class App extends PureComponent {
     });
   }
 
-  _requestCreate(parentId) {
+  _requestCreate(parentId: string) {
     showModal(RequestCreateModal, {
       parentId,
-      onComplete: requestId => {
+      onComplete: (requestId: string) => {
         this._handleSetActiveRequest(requestId);
+
         models.stats.incrementCreatedRequests();
         trackSegmentEvent('Request Created');
       },
     });
   }
 
-  async _recalculateMetaSortKey(docs) {
+  async _recalculateMetaSortKey(docs: Array<RequestGroup | Request | GrpcRequest>) {
     function __updateDoc(doc, metaSortKey) {
-      return models.getModel(doc.type).update(doc, { metaSortKey });
+      // @ts-expect-error -- TSCONVERSION the fetched model will only ever be a RequestGroup, Request, or GrpcRequest
+      // Which all have the .update method. How do we better filter types?
+      return models.getModel(doc.type)?.update(doc, {
+        metaSortKey,
+      });
     }
 
     return Promise.all(docs.map((doc, i) => __updateDoc(doc, i * 100)));
   }
 
-  async _sortSidebar(order, parentId) {
-    let flushId;
+  async _sortSidebar(order: SortOrder, parentId?: string) {
+    let flushId: number | undefined;
+
     if (!parentId) {
       parentId = this.props.activeWorkspace._id;
       flushId = await db.bufferChanges();
@@ -377,7 +463,6 @@ class App extends PureComponent {
       ...(await models.grpcRequest.findByParentId(parentId)),
     ].sort(sortMethodMap[order]);
     await this._recalculateMetaSortKey(docs);
-
     // sort RequestGroups recursively
     await Promise.all(docs.filter(isRequestGroup).map(g => this._sortSidebar(order, g._id)));
 
@@ -386,26 +471,29 @@ class App extends PureComponent {
     }
   }
 
-  static async _requestGroupDuplicate(requestGroup) {
+  static async _requestGroupDuplicate(requestGroup: RequestGroup) {
     showPrompt({
       title: 'Duplicate Folder',
       defaultValue: requestGroup.name,
       submitName: 'Create',
       label: 'New Name',
       selectText: true,
-      onComplete: async name => {
-        const newRequestGroup = await models.requestGroup.duplicate(requestGroup, { name });
-
+      onComplete: async (name: string) => {
+        const newRequestGroup = await models.requestGroup.duplicate(requestGroup, {
+          name,
+        });
         models.stats.incrementCreatedRequestsForDescendents(newRequestGroup);
       },
     });
   }
 
-  static async _requestGroupMove(requestGroup) {
-    showModal(MoveRequestGroupModal, { requestGroup });
+  static async _requestGroupMove(requestGroup: RequestGroup) {
+    showModal(MoveRequestGroupModal, {
+      requestGroup,
+    });
   }
 
-  _requestDuplicate(request) {
+  _requestDuplicate(request?: Request | GrpcRequest) {
     if (!request) {
       return;
     }
@@ -416,54 +504,59 @@ class App extends PureComponent {
       submitName: 'Create',
       label: 'New Name',
       selectText: true,
-      onComplete: async name => {
-        const newRequest = await requestOperations.duplicate(request, { name });
+      onComplete: async (name: string) => {
+        const newRequest = await requestOperations.duplicate(request, {
+          name,
+        });
         await this._handleSetActiveRequest(newRequest._id);
         models.stats.incrementCreatedRequests();
       },
     });
   }
 
-  _workspaceDuplicateById(callback, workspaceId) {
+  _workspaceDuplicateById(callback: () => void, workspaceId: string) {
     const workspace = this.props.workspaces.find(w => w._id === workspaceId);
     const apiSpec = this.props.apiSpecs.find(s => s.parentId === workspaceId);
-
     showPrompt({
+      // @ts-expect-error -- TSCONVERSION workspace can be null
       title: `Duplicate ${getWorkspaceLabel(workspace)}`,
+      // @ts-expect-error -- TSCONVERSION workspace can be null
       defaultValue: getWorkspaceName(workspace, apiSpec),
       submitName: 'Create',
       selectText: true,
       label: 'New Name',
       onComplete: async name => {
+        // @ts-expect-error -- TSCONVERSION workspace can be null
         const newWorkspace = await workspaceOperations.duplicate(workspace, name);
-
         await this.props.handleSetActiveWorkspace(newWorkspace._id);
         callback();
       },
     });
   }
 
-  _workspaceDuplicate(callback) {
+  _workspaceDuplicate(callback: () => void) {
     this._workspaceDuplicateById(callback, this.props.activeWorkspace._id);
   }
 
   async _fetchRenderContext() {
     const { activeEnvironment, activeRequest, activeWorkspace } = this.props;
     const environmentId = activeEnvironment ? activeEnvironment._id : null;
-
     const ancestors = await db.withAncestors(activeRequest || activeWorkspace, [
       models.request.type,
       models.requestGroup.type,
       models.workspace.type,
     ]);
-
+    // @ts-expect-error -- TSCONVERSION null vs undefined :(
     return render.getRenderContext(activeRequest, environmentId, ancestors);
   }
 
-  async _handleGetRenderContext() {
+  async _handleGetRenderContext(): Promise<RenderContextAndKeys> {
     const context = await this._fetchRenderContext();
     const keys = getKeys(context, NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME);
-    return { context, keys };
+    return {
+      context,
+      keys,
+    };
   }
 
   /**
@@ -474,28 +567,32 @@ class App extends PureComponent {
    * @returns {Promise}
    * @private
    */
-  async _handleRenderText(text, contextCacheKey = null) {
+  async _handleRenderText<T>(obj: T, contextCacheKey = null) {
+    // @ts-expect-error -- TSCONVERSION contextCacheKey being null used as object index
     if (!contextCacheKey || !this._getRenderContextPromiseCache[contextCacheKey]) {
       // NOTE: We're caching promises here to avoid race conditions
+      // @ts-expect-error -- TSCONVERSION contextCacheKey being null used as object index
       this._getRenderContextPromiseCache[contextCacheKey] = this._fetchRenderContext();
     }
 
     // Set timeout to delete the key eventually
+    // @ts-expect-error -- TSCONVERSION contextCacheKey being null used as object index
     setTimeout(() => delete this._getRenderContextPromiseCache[contextCacheKey], 5000);
-
+    // @ts-expect-error -- TSCONVERSION contextCacheKey being null used as object index
     const context = await this._getRenderContextPromiseCache[contextCacheKey];
-    return render.render(text, context);
+    return render.render(obj, context);
   }
 
   _handleGenerateCodeForActiveRequest() {
+    // @ts-expect-error -- TSCONVERSION should skip this if active request is grpc request
     App._handleGenerateCode(this.props.activeRequest);
   }
 
-  static _handleGenerateCode(request) {
+  static _handleGenerateCode(request: Request) {
     showModal(GenerateCodeModal, request);
   }
 
-  async _handleCopyAsCurl(request) {
+  async _handleCopyAsCurl(request: Request) {
     const { activeEnvironment } = this.props;
     const environmentId = activeEnvironment ? activeEnvironment._id : 'n/a';
     const har = await exportHarRequest(request._id, environmentId);
@@ -506,15 +603,21 @@ class App extends PureComponent {
 
   static async _updateRequestGroupMetaByParentId(requestGroupId, patch) {
     const requestGroupMeta = await models.requestGroupMeta.getByParentId(requestGroupId);
+
     if (requestGroupMeta) {
       await models.requestGroupMeta.update(requestGroupMeta, patch);
     } else {
-      const newPatch = Object.assign({ parentId: requestGroupId }, patch);
+      const newPatch = Object.assign(
+        {
+          parentId: requestGroupId,
+        },
+        patch,
+      );
       await models.requestGroupMeta.create(newPatch);
     }
   }
 
-  async _updateActiveWorkspaceMeta(patch) {
+  async _updateActiveWorkspaceMeta(patch: Partial<WorkspaceMeta>) {
     const { activeWorkspaceMeta } = this.props;
     return models.workspaceMeta.update(activeWorkspaceMeta, patch);
   }
@@ -530,68 +633,101 @@ class App extends PureComponent {
   }
 
   _updateIsVariableUncovered() {
-    this.setState({ isVariableUncovered: !this.state.isVariableUncovered });
+    this.setState({
+      isVariableUncovered: !this.state.isVariableUncovered,
+    });
   }
 
-  _handleSetPaneWidth(paneWidth) {
-    this.setState({ paneWidth });
+  _handleSetPaneWidth(paneWidth: number) {
+    this.setState({
+      paneWidth,
+    });
+
     this._savePaneWidth(paneWidth);
   }
 
-  _handleSetPaneHeight(paneHeight) {
-    this.setState({ paneHeight });
+  _handleSetPaneHeight(paneHeight: number) {
+    this.setState({
+      paneHeight,
+    });
+
     this._savePaneHeight(paneHeight);
   }
 
-  async _handleSetActiveRequest(activeRequestId) {
-    await this._updateActiveWorkspaceMeta({ activeRequestId });
-    await App._updateRequestMetaByParentId(activeRequestId, { lastActive: Date.now() });
+  async _handleSetActiveRequest(activeRequestId: string) {
+    await this._updateActiveWorkspaceMeta({
+      activeRequestId,
+    });
+    await App._updateRequestMetaByParentId(activeRequestId, {
+      lastActive: Date.now(),
+    });
   }
 
-  async _handleSetActiveEnvironment(activeEnvironmentId) {
-    await this._updateActiveWorkspaceMeta({ activeEnvironmentId });
-
+  async _handleSetActiveEnvironment(activeEnvironmentId: string) {
+    await this._updateActiveWorkspaceMeta({
+      activeEnvironmentId,
+    });
     // Give it time to update and re-render
     setTimeout(() => {
       this._wrapper && this._wrapper._forceRequestPaneRefresh();
     }, 300);
   }
 
-  _handleSetSidebarWidth(sidebarWidth) {
-    this.setState({ sidebarWidth });
+  _handleSetSidebarWidth(sidebarWidth: number) {
+    this.setState({
+      sidebarWidth,
+    });
+
     this._saveSidebarWidth(sidebarWidth);
   }
 
-  async _handleSetSidebarHidden(sidebarHidden) {
-    await this._updateActiveWorkspaceMeta({ sidebarHidden });
+  async _handleSetSidebarHidden(sidebarHidden: boolean) {
+    await this._updateActiveWorkspaceMeta({
+      sidebarHidden,
+    });
   }
 
-  async _handleSetSidebarFilter(sidebarFilter) {
-    await this._updateActiveWorkspaceMeta({ sidebarFilter });
+  async _handleSetSidebarFilter(sidebarFilter: string) {
+    await this._updateActiveWorkspaceMeta({
+      sidebarFilter,
+    });
   }
 
-  _handleSetRequestGroupCollapsed(requestGroupId, collapsed) {
-    App._updateRequestGroupMetaByParentId(requestGroupId, { collapsed });
+  _handleSetRequestGroupCollapsed(requestGroupId: string, collapsed: boolean) {
+    App._updateRequestGroupMetaByParentId(requestGroupId, {
+      collapsed,
+    });
   }
 
   async _handleSetRequestPinned(request, pinned) {
-    App._updateRequestMetaByParentId(request._id, { pinned });
+    App._updateRequestMetaByParentId(request._id, {
+      pinned,
+    });
   }
 
   _handleSetResponsePreviewMode(requestId, previewMode) {
-    App._updateRequestMetaByParentId(requestId, { previewMode });
+    App._updateRequestMetaByParentId(requestId, {
+      previewMode,
+    });
   }
 
   _handleUpdateDownloadPath(requestId, downloadPath) {
-    App._updateRequestMetaByParentId(requestId, { downloadPath });
+    App._updateRequestMetaByParentId(requestId, {
+      downloadPath,
+    });
   }
 
   async _handleSetResponseFilter(requestId, responseFilter) {
-    await App._updateRequestMetaByParentId(requestId, { responseFilter });
+    await App._updateRequestMetaByParentId(requestId, {
+      responseFilter,
+    });
 
-    clearTimeout(this._responseFilterHistorySaveTimeout);
+    if (this._responseFilterHistorySaveTimeout !== null) {
+      clearTimeout(this._responseFilterHistorySaveTimeout);
+    }
     this._responseFilterHistorySaveTimeout = setTimeout(async () => {
       const meta = await models.requestMeta.getByParentId(requestId);
+      // @ts-expect-error -- TSCONVERSION meta can be null
       const responseFilterHistory = meta.responseFilterHistory.slice(0, 10);
 
       // Already in history?
@@ -611,7 +747,7 @@ class App extends PureComponent {
     }, 2000);
   }
 
-  async _handleUpdateRequestMimeType(mimeType) {
+  async _handleUpdateRequestMimeType(mimeType: string | null): Promise<Request | null> {
     if (!this.props.activeRequest) {
       console.warn('Tried to update request mime-type when no active request');
       return null;
@@ -621,48 +757,48 @@ class App extends PureComponent {
       this.props.activeRequest._id,
     );
     const savedBody = requestMeta.savedRequestBody;
-
     const saveValue =
       typeof mimeType !== 'string' // Switched to No body
         ? this.props.activeRequest.body
-        : {}; // Clear saved value in requestMeta
-
+        : {};
+    // Clear saved value in requestMeta
     await models.requestMeta.update(requestMeta, {
       savedRequestBody: saveValue,
     });
-
+    // @ts-expect-error -- TSCONVERSION should skip this if active request is grpc request
     const newRequest = await updateMimeType(this.props.activeRequest, mimeType, false, savedBody);
-
     // Force it to update, because other editor components (header editor)
     // needs to change. Need to wait a delay so the next render can finish
     setTimeout(() => {
-      this.setState({ forceRefreshHeaderCounter: this.state.forceRefreshHeaderCounter + 1 });
+      this.setState({
+        forceRefreshHeaderCounter: this.state.forceRefreshHeaderCounter + 1,
+      });
     }, 500);
-
     return newRequest;
   }
 
   async _getDownloadLocation() {
-    const options = {
+    const options: SaveDialogOptions = {
       title: 'Select Download Location',
       buttonLabel: 'Save',
     };
-
     const defaultPath = window.localStorage.getItem('insomnia.sendAndDownloadLocation');
+
     if (defaultPath) {
       // NOTE: An error will be thrown if defaultPath is supplied but not a String
       options.defaultPath = defaultPath;
     }
 
     const { filePath } = await remote.dialog.showSaveDialog(options);
+    // @ts-expect-error -- TSCONVERSION don't set item if filePath is undefined
     window.localStorage.setItem('insomnia.sendAndDownloadLocation', filePath);
     return filePath || null;
   }
 
-  async _handleSendAndDownloadRequestWithEnvironment(requestId, environmentId, dir) {
+  async _handleSendAndDownloadRequestWithEnvironment(requestId: string, environmentId: string, dir: string) {
     const { settings, handleStartLoading, handleStopLoading } = this.props;
-
     const request = await models.request.getById(requestId);
+
     if (!request) {
       return;
     }
@@ -670,7 +806,6 @@ class App extends PureComponent {
     // Update request stats
     models.stats.incrementExecutedRequests();
     trackSegmentEvent('Request Executed');
-
     // Start loading
     handleStartLoading(requestId);
 
@@ -682,14 +817,16 @@ class App extends PureComponent {
 
       if (
         responsePatch.bodyPath &&
+        responsePatch.statusCode &&
         responsePatch.statusCode >= 200 &&
         responsePatch.statusCode < 300
       ) {
+        // @ts-expect-error -- TSCONVERSION contentType can be undefined
         const extension = mime.extension(responsePatch.contentType) || 'unknown';
         const name =
           nameFromHeader || `${request.name.replace(/\s/g, '-').toLowerCase()}.${extension}`;
-
         let filename;
+
         if (dir) {
           filename = path.join(dir, name);
         } else {
@@ -701,6 +838,7 @@ class App extends PureComponent {
         }
 
         const to = fs.createWriteStream(filename);
+        // @ts-expect-error -- TSCONVERSION
         const readStream = models.response.getBodyStream(responsePatch);
 
         if (!readStream) {
@@ -739,7 +877,6 @@ class App extends PureComponent {
       await App._updateRequestMetaByParentId(requestId, {
         activeResponseId: null,
       });
-
       // Stop loading
       handleStopLoading(requestId);
     }
@@ -748,6 +885,7 @@ class App extends PureComponent {
   async _handleSendRequestWithEnvironment(requestId, environmentId) {
     const { handleStartLoading, handleStopLoading, settings } = this.props;
     const request = await models.request.getById(requestId);
+
     if (!request) {
       return;
     }
@@ -755,7 +893,6 @@ class App extends PureComponent {
     // Update request stats
     models.stats.incrementExecutedRequests();
     trackSegmentEvent('Request Executed');
-
     handleStartLoading(requestId);
 
     try {
@@ -763,7 +900,10 @@ class App extends PureComponent {
       await models.response.create(responsePatch, settings.maxHistoryResponses);
     } catch (err) {
       if (err.type === 'render') {
-        showModal(RequestRenderErrorModal, { request, error: err });
+        showModal(RequestRenderErrorModal, {
+          request,
+          error: err,
+        });
       } else {
         showAlert({
           title: 'Unexpected Request Failure',
@@ -783,31 +923,36 @@ class App extends PureComponent {
     await App._updateRequestMetaByParentId(requestId, {
       activeResponseId: null,
     });
-
     // Stop loading
     handleStopLoading(requestId);
   }
 
-  async _handleSetActiveResponse(requestId, activeResponse = null) {
+  async _handleSetActiveResponse(requestId: string, activeResponse: Response | null = null) {
     const { activeEnvironment } = this.props;
     const activeResponseId = activeResponse ? activeResponse._id : null;
-    await App._updateRequestMetaByParentId(requestId, { activeResponseId });
+    await App._updateRequestMetaByParentId(requestId, {
+      activeResponseId,
+    });
+
+    let response: Response;
 
-    let response;
     if (activeResponseId) {
+      // @ts-expect-error -- TSCONVERSION can return null if not found
       response = await models.response.getById(activeResponseId);
     } else {
       const environmentId = activeEnvironment ? activeEnvironment._id : null;
+      // @ts-expect-error -- TSCONVERSION can return null if not found
       response = await models.response.getLatestForRequest(requestId, environmentId);
     }
 
     const requestVersionId = response ? response.requestVersionId : 'n/a';
+    // @ts-expect-error -- TSCONVERSION the above line should be response?.requestVersionId ?? 'n/a'
     const request = await models.requestVersion.restore(requestVersionId);
 
     if (request) {
       // Refresh app to reflect changes. Using timeout because we need to
       // wait for the request update to propagate.
-      setTimeout(() => this._wrapper._forceRequestPaneRefresh(), 500);
+      setTimeout(() => this._wrapper?._forceRequestPaneRefresh(), 500);
     } else {
       // Couldn't restore request. That's okay
     }
@@ -818,7 +963,9 @@ class App extends PureComponent {
   }
 
   _startDragSidebar() {
-    this.setState({ draggingSidebar: true });
+    this.setState({
+      draggingSidebar: true,
+    });
   }
 
   _resetDragSidebar() {
@@ -827,11 +974,15 @@ class App extends PureComponent {
   }
 
   _startDragPaneHorizontal() {
-    this.setState({ draggingPaneHorizontal: true });
+    this.setState({
+      draggingPaneHorizontal: true,
+    });
   }
 
   _startDragPaneVertical() {
-    this.setState({ draggingPaneVertical: true });
+    this.setState({
+      draggingPaneVertical: true,
+    });
   }
 
   _resetDragPaneHorizontal() {
@@ -848,16 +999,26 @@ class App extends PureComponent {
     if (this.state.draggingPaneHorizontal) {
       // Only pop the overlay after we've moved it a bit (so we don't block doubleclick);
       const distance = this.props.paneWidth - this.state.paneWidth;
-      if (!this.state.showDragOverlay && Math.abs(distance) > 0.02 /* % */) {
-        this.setState({ showDragOverlay: true });
+
+      if (
+        !this.state.showDragOverlay &&
+        Math.abs(distance) > 0.02
+        /* % */
+      ) {
+        this.setState({
+          showDragOverlay: true,
+        });
       }
 
+      // @ts-expect-error -- TSCONVERSION
       const requestPane = ReactDOM.findDOMNode(this._requestPane);
+      // @ts-expect-error -- TSCONVERSION
       const responsePane = ReactDOM.findDOMNode(this._responsePane);
-
+      // @ts-expect-error -- TSCONVERSION
       const requestPaneWidth = requestPane.offsetWidth;
+      // @ts-expect-error -- TSCONVERSION
       const responsePaneWidth = responsePane.offsetWidth;
-
+      // @ts-expect-error -- TSCONVERSION
       const pixelOffset = e.clientX - requestPane.offsetLeft;
       let paneWidth = pixelOffset / (requestPaneWidth + responsePaneWidth);
       paneWidth = Math.min(Math.max(paneWidth, MIN_PANE_WIDTH), MAX_PANE_WIDTH);
@@ -866,16 +1027,26 @@ class App extends PureComponent {
     } else if (this.state.draggingPaneVertical) {
       // Only pop the overlay after we've moved it a bit (so we don't block doubleclick);
       const distance = this.props.paneHeight - this.state.paneHeight;
-      if (!this.state.showDragOverlay && Math.abs(distance) > 0.02 /* % */) {
-        this.setState({ showDragOverlay: true });
+
+      if (
+        !this.state.showDragOverlay &&
+        Math.abs(distance) > 0.02
+        /* % */
+      ) {
+        this.setState({
+          showDragOverlay: true,
+        });
       }
 
+      // @ts-expect-error -- TSCONVERSION
       const requestPane = ReactDOM.findDOMNode(this._requestPane);
+      // @ts-expect-error -- TSCONVERSION
       const responsePane = ReactDOM.findDOMNode(this._responsePane);
-
+      // @ts-expect-error -- TSCONVERSION
       const requestPaneHeight = requestPane.offsetHeight;
+      // @ts-expect-error -- TSCONVERSION
       const responsePaneHeight = responsePane.offsetHeight;
-
+      // @ts-expect-error -- TSCONVERSION
       const pixelOffset = e.clientY - requestPane.offsetTop;
       let paneHeight = pixelOffset / (requestPaneHeight + responsePaneHeight);
       paneHeight = Math.min(Math.max(paneHeight, MIN_PANE_HEIGHT), MAX_PANE_HEIGHT);
@@ -884,15 +1055,24 @@ class App extends PureComponent {
     } else if (this.state.draggingSidebar) {
       // Only pop the overlay after we've moved it a bit (so we don't block doubleclick);
       const distance = this.props.sidebarWidth - this.state.sidebarWidth;
-      if (!this.state.showDragOverlay && Math.abs(distance) > 2 /* ems */) {
-        this.setState({ showDragOverlay: true });
+
+      if (
+        !this.state.showDragOverlay &&
+        Math.abs(distance) > 2
+        /* ems */
+      ) {
+        this.setState({
+          showDragOverlay: true,
+        });
       }
 
+      // @ts-expect-error -- TSCONVERSION
       const sidebar = ReactDOM.findDOMNode(this._sidebar);
+      // @ts-expect-error -- TSCONVERSION
       const currentPixelWidth = sidebar.offsetWidth;
+      // @ts-expect-error -- TSCONVERSION
       const ratio = (e.clientX - sidebar.offsetLeft) / currentPixelWidth;
       const width = this.state.sidebarWidth * ratio;
-
       let sidebarWidth = Math.min(width, MAX_SIDEBAR_REMS);
 
       if (sidebarWidth < COLLAPSE_SIDEBAR_REMS) {
@@ -905,15 +1085,24 @@ class App extends PureComponent {
 
   _handleMouseUp() {
     if (this.state.draggingSidebar) {
-      this.setState({ draggingSidebar: false, showDragOverlay: false });
+      this.setState({
+        draggingSidebar: false,
+        showDragOverlay: false,
+      });
     }
 
     if (this.state.draggingPaneHorizontal) {
-      this.setState({ draggingPaneHorizontal: false, showDragOverlay: false });
+      this.setState({
+        draggingPaneHorizontal: false,
+        showDragOverlay: false,
+      });
     }
 
     if (this.state.draggingPaneVertical) {
-      this.setState({ draggingPaneVertical: false, showDragOverlay: false });
+      this.setState({
+        draggingPaneVertical: false,
+        showDragOverlay: false,
+      });
     }
   }
 
@@ -941,11 +1130,11 @@ class App extends PureComponent {
     showModal(ExportRequestsModal);
   }
 
-  static _handleShowSettingsModal(tabIndex) {
+  static _handleShowSettingsModal(tabIndex?: number) {
     showModal(SettingsModal, tabIndex);
   }
 
-  _setWrapperRef(n) {
+  _setWrapperRef(n: Wrapper) {
     this._wrapper = n;
   }
 
@@ -969,16 +1158,17 @@ class App extends PureComponent {
       activeRequest,
       activity,
     } = this.props;
-
     let title;
 
     if (activity === ACTIVITY_HOME || activity === ACTIVITY_MIGRATION) {
       title = getAppName();
     } else {
       title = isCollection(activeWorkspace) ? activeWorkspace.name : activeApiSpec.fileName;
+
       if (activeEnvironment) {
         title += ` (${activeEnvironment.name})`;
       }
+
       if (activeRequest) {
         title += ` – ${activeRequest.name}`;
       }
@@ -989,6 +1179,7 @@ class App extends PureComponent {
 
   componentDidUpdate(prevProps) {
     this._updateDocumentTitle();
+
     this._ensureWorkspaceChildren();
 
     // Force app refresh if login state changes
@@ -1010,6 +1201,7 @@ class App extends PureComponent {
     // Update Git VCS if needed
     const thisGit = activeGitRepository || {};
     const nextGit = prevProps.activeGitRepository || {};
+
     if (changingWorkspace || thisGit._id !== nextGit._id) {
       this._updateGitVCS();
     }
@@ -1019,7 +1211,9 @@ class App extends PureComponent {
     const { activeGitRepository, activeWorkspace } = this.props;
     // Get the vcs and set it to null in the state while we update it
     let gitVCS = this.state.gitVCS;
-    this.setState({ gitVCS: null });
+    this.setState({
+      gitVCS: null,
+    });
 
     if (!gitVCS) {
       gitVCS = new GitVCS();
@@ -1046,11 +1240,13 @@ class App extends PureComponent {
         [GIT_INSOMNIA_DIR]: neDbClient,
         [GIT_INTERNAL_DIR]: gitDataClient,
       });
-
       // Init VCS
       const { credentials, uri } = activeGitRepository;
+
       if (activeGitRepository.needsFullClone) {
-        await models.gitRepository.update(activeGitRepository, { needsFullClone: false });
+        await models.gitRepository.update(activeGitRepository, {
+          needsFullClone: false,
+        });
         await gitVCS.initFromClone({
           url: uri,
           gitCredentials: credentials,
@@ -1075,22 +1271,28 @@ class App extends PureComponent {
       gitVCS = new GitVCS();
     }
 
-    this.setState({ gitVCS });
+    this.setState({
+      gitVCS,
+    });
   }
 
   async _updateVCS() {
     const lock = generateId();
     this._updateVCSLock = lock;
-
     const { activeWorkspace } = this.props;
-
     // Get the vcs and set it to null in the state while we update it
     let vcs = this.state.vcs;
-    this.setState({ vcs: null });
+    this.setState({
+      vcs: null,
+    });
 
     if (!vcs) {
       const directory = path.join(getDataDirectory(), 'version-control');
-      const driver = new FileSystemDriver({ directory });
+      const driver = new FileSystemDriver({
+        directory,
+      });
+
+      // @ts-expect-error -- TSCONVERSION
       vcs = new VCS(driver, async conflicts => {
         return new Promise(resolve => {
           showModal(SyncMergeModal, {
@@ -1105,7 +1307,9 @@ class App extends PureComponent {
 
     // Prevent a potential race-condition when _updateVCS() gets called for different workspaces in rapid succession
     if (this._updateVCSLock === lock) {
-      this.setState({ vcs });
+      this.setState({
+        vcs,
+      });
     }
   }
 
@@ -1114,7 +1318,6 @@ class App extends PureComponent {
 
     for (const change of changes) {
       const [type, doc, fromSync] = change;
-
       const { vcs } = this.state;
       const { activeRequest } = this.props;
 
@@ -1139,7 +1342,7 @@ class App extends PureComponent {
 
     if (needsRefresh) {
       setTimeout(() => {
-        this._wrapper && this._wrapper._forceRequestPaneRefresh();
+        this._wrapper?._forceRequestPaneRefresh();
       }, 300);
     }
   }
@@ -1148,6 +1351,7 @@ class App extends PureComponent {
     // Bind mouse and key handlers
     document.addEventListener('mouseup', this._handleMouseUp);
     document.addEventListener('mousemove', this._handleMouseMove);
+
     this._setGlobalKeyMap();
 
     // Update title
@@ -1155,30 +1359,22 @@ class App extends PureComponent {
 
     // Update VCS
     await this._updateVCS();
-    await this._updateGitVCS(this.props.activeWorkspace);
-
+    await this._updateGitVCS();
     db.onChange(this._handleDbChange);
-
     ipcRenderer.on('toggle-preferences', () => {
       App._handleShowSettingsModal();
     });
-
     ipcRenderer.on('reload-plugins', this._handleReloadPlugins);
-
     ipcRenderer.on('toggle-preferences-shortcuts', () => {
       App._handleShowSettingsModal(TAB_INDEX_SHORTCUTS);
     });
-
-    ipcRenderer.on('run-command', (e, commandUri) => {
+    ipcRenderer.on('run-command', (_, commandUri) => {
       const parsed = urlParse(commandUri, true);
-
       const command = `${parsed.hostname}${parsed.pathname}`;
       const args = JSON.parse(JSON.stringify(parsed.query));
       args.workspaceId = args.workspaceId || this.props.activeWorkspace._id;
-
       this.props.handleCommand(command, args);
     });
-
     // NOTE: This is required for "drop" event to trigger.
     document.addEventListener(
       'dragover',
@@ -1187,25 +1383,26 @@ class App extends PureComponent {
       },
       false,
     );
-
     document.addEventListener(
       'drop',
       async e => {
         e.preventDefault();
         const { activeWorkspace, handleImportUriToWorkspace } = this.props;
+
         if (!activeWorkspace) {
           return;
         }
 
+        // @ts-expect-error -- TSCONVERSION
         if (e.dataTransfer.files.length === 0) {
           console.log('[drag] Ignored drop event because no files present');
           return;
         }
 
+        // @ts-expect-error -- TSCONVERSION
         const file = e.dataTransfer.files[0];
         const { path } = file;
         const uri = `file://${path}`;
-
         await showAlert({
           title: 'Confirm Data Import',
           message: (
@@ -1215,12 +1412,10 @@ class App extends PureComponent {
           ),
           addCancel: true,
         });
-
         handleImportUriToWorkspace(activeWorkspace._id, uri);
       },
       false,
     );
-
     ipcRenderer.on('toggle-sidebar', this._handleToggleSidebar);
 
     // handle this
@@ -1228,7 +1423,6 @@ class App extends PureComponent {
 
     // Give it a bit before letting the backend know it's ready
     setTimeout(() => ipcRenderer.send('window-ready'), 500);
-
     window
       .matchMedia('(prefers-color-scheme: dark)')
       .addListener(async () => themes.applyColorScheme(this.props.settings));
@@ -1262,24 +1456,32 @@ class App extends PureComponent {
     }
 
     // Prevent rendering of everything
-    this.setState({ isMigratingChildren: true }, async () => {
-      const flushId = await db.bufferChanges();
-      await models.environment.getOrCreateForWorkspace(activeWorkspace);
-      await models.cookieJar.getOrCreateForParentId(activeWorkspace._id);
-      await models.workspaceMeta.getOrCreateByParentId(activeWorkspace._id);
-      await db.flushChanges(flushId);
-
-      this.setState({ isMigratingChildren: false });
-    });
+    this.setState(
+      {
+        isMigratingChildren: true,
+      },
+      async () => {
+        const flushId = await db.bufferChanges();
+        await models.environment.getOrCreateForWorkspace(activeWorkspace);
+        await models.cookieJar.getOrCreateForParentId(activeWorkspace._id);
+        await models.workspaceMeta.getOrCreateByParentId(activeWorkspace._id);
+        await db.flushChanges(flushId);
+        this.setState({
+          isMigratingChildren: false,
+        });
+      },
+    );
   }
 
   // eslint-disable-next-line camelcase
-  UNSAFE_componentWillReceiveProps(nextProps) {
+  UNSAFE_componentWillReceiveProps(nextProps: Props) {
+    // @ts-expect-error -- TSCONVERSION this function doesn't even accept props but should it?
     this._ensureWorkspaceChildren(nextProps);
   }
 
   // eslint-disable-next-line camelcase
   UNSAFE_componentWillMount() {
+    // @ts-expect-error -- TSCONVERSION this function doesn't even accept props but should it?
     this._ensureWorkspaceChildren(this.props);
   }
 
@@ -1290,7 +1492,6 @@ class App extends PureComponent {
     }
 
     const { activeWorkspace } = this.props;
-
     const {
       paneWidth,
       paneHeight,
@@ -1301,14 +1502,13 @@ class App extends PureComponent {
       forceRefreshCounter,
       forceRefreshHeaderCounter,
     } = this.state;
-
     const uniquenessKey = `${forceRefreshCounter}::${activeWorkspace._id}`;
-
     return (
       <KeydownBinder onKeydown={this._handleKeyDown}>
         <GrpcProvider>
           <div className="app" key={uniquenessKey}>
             <ErrorBoundary showAlert>
+              {/* @ts-expect-error -- TSCONVERSION expected props are not recieved likely because of the this.props expansion */}
               <Wrapper
                 {...this.props}
                 ref={this._setWrapperRef}
@@ -1346,7 +1546,6 @@ class App extends PureComponent {
                   this._handleSendAndDownloadRequestWithEnvironment
                 }
                 handleSetActiveResponse={this._handleSetActiveResponse}
-                handleSetActiveRequest={this._handleSetActiveRequest}
                 handleSetActiveEnvironment={this._handleSetActiveEnvironment}
                 handleSetSidebarFilter={this._handleSetSidebarFilter}
                 handleToggleMenuBar={this._handleToggleMenuBar}
@@ -1375,102 +1574,94 @@ class App extends PureComponent {
   }
 }
 
-App.propTypes = {
-  // Required
-  sidebarWidth: PropTypes.number.isRequired,
-  paneWidth: PropTypes.number.isRequired,
-  paneHeight: PropTypes.number.isRequired,
-  handleCommand: PropTypes.func.isRequired,
-  settings: PropTypes.object.isRequired,
-  isLoggedIn: PropTypes.bool.isRequired,
-  activeWorkspace: PropTypes.shape({
-    _id: PropTypes.string.isRequired,
-  }).isRequired,
-  handleSetActiveActivity: PropTypes.func.isRequired,
-  handleGoToNextActivity: PropTypes.func.isRequired,
-  handleSetActiveWorkspace: PropTypes.func.isRequired,
-
-  // Optional
-  activeRequest: PropTypes.object,
-  activeEnvironment: PropTypes.shape({
-    _id: PropTypes.string.isRequired,
-  }),
-};
-
 function mapStateToProps(state, props) {
   const { entities, global } = state;
-
   const { activeActivity, isLoading, loadingRequestIds, isLoggedIn } = global;
-
   // Entities
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const entitiesLists = selectEntitiesLists(state, props);
   const {
+    // @ts-expect-error -- TSCONVERSION
     apiSpecs,
+    // @ts-expect-error -- TSCONVERSION
     environments,
+    // @ts-expect-error -- TSCONVERSION
     gitRepositories,
+    // @ts-expect-error -- TSCONVERSION
     requestGroups,
+    // @ts-expect-error -- TSCONVERSION
     requestMetas,
+    // @ts-expect-error -- TSCONVERSION
     requestVersions,
+    // @ts-expect-error -- TSCONVERSION
     requests,
+    // @ts-expect-error -- TSCONVERSION
     workspaceMetas,
+    // @ts-expect-error -- TSCONVERSION
     workspaces,
   } = entitiesLists;
-
+  // @ts-expect-error -- TSCONVERSION
   const settings = entitiesLists.settings[0];
-
   // Workspace stuff
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const activeWorkspaceMeta = selectActiveWorkspaceMeta(state, props);
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const activeWorkspace = selectActiveWorkspace(state, props);
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const activeWorkspaceClientCertificates = selectActiveWorkspaceClientCertificates(state, props);
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const activeGitRepository = selectActiveGitRepository(state, props);
-
   const safeMeta = activeWorkspaceMeta || {};
   const sidebarHidden = safeMeta.sidebarHidden || false;
   const sidebarFilter = safeMeta.sidebarFilter || '';
   const sidebarWidth = safeMeta.sidebarWidth || DEFAULT_SIDEBAR_WIDTH;
   const paneWidth = safeMeta.paneWidth || DEFAULT_PANE_WIDTH;
   const paneHeight = safeMeta.paneHeight || DEFAULT_PANE_HEIGHT;
-
   // Request stuff
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const requestMeta = selectActiveRequestMeta(state, props) || {};
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const activeRequest = selectActiveRequest(state, props);
   const responsePreviewMode = requestMeta.previewMode || PREVIEW_MODE_SOURCE;
   const responseFilter = requestMeta.responseFilter || '';
   const responseFilterHistory = requestMeta.responseFilterHistory || [];
   const responseDownloadPath = requestMeta.downloadPath || null;
-
   // Cookie Jar
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const activeCookieJar = selectActiveCookieJar(state, props);
-
   // Response stuff
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const activeRequestResponses = selectActiveRequestResponses(state, props) || [];
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const activeResponse = selectActiveResponse(state, props) || null;
-
   // Environment stuff
   const activeEnvironmentId = safeMeta.activeEnvironmentId;
   const activeEnvironment = entities.environments[activeEnvironmentId];
-
   // OAuth2Token stuff
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const oAuth2Token = selectActiveOAuth2Token(state, props);
-
   // Find other meta things
   const loadStartTime = loadingRequestIds[activeRequest ? activeRequest._id : 'n/a'] || -1;
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const sidebarChildren = selectSidebarChildren(state, props);
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const workspaceChildren = selectWorkspaceRequestsAndRequestGroups(state, props);
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const unseenWorkspaces = selectUnseenWorkspaces(state, props);
-
   // Sync stuff
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const syncItems = selectSyncItems(state, props);
-
   // Api spec stuff
   const activeApiSpec = apiSpecs.find(s => s.parentId === activeWorkspace._id);
-
   // Test stuff
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const activeUnitTests = selectActiveUnitTests(state, props);
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const activeUnitTestSuite = selectActiveUnitTestSuite(state, props);
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const activeUnitTestSuites = selectActiveUnitTestSuites(state, props);
+  // @ts-expect-error -- TSCONVERSION https://github.com/reduxjs/reselect#accessing-react-props-in-selectors
   const activeUnitTestResult = selectActiveUnitTestResult(state, props);
-
   return Object.assign({}, state, {
     activity: activeActivity,
     activeApiSpec,
@@ -1518,13 +1709,12 @@ function mapStateToProps(state, props) {
 }
 
 function mapDispatchToProps(dispatch) {
-  const global = bindActionCreators(globalActions, dispatch);
+  // @ts-expect-error -- TSCONVERSION
+  const global: any = bindActionCreators(globalActions, dispatch);
   const entities = bindActionCreators(entitiesActions, dispatch);
-
   return {
     handleStartLoading: global.loadRequestStart,
     handleStopLoading: global.loadRequestStop,
-
     handleSetActiveActivity: global.setActiveActivity,
     handleGoToNextActivity: global.goToNextActivity,
     handleSetActiveWorkspace: global.setActiveWorkspace,
@@ -1548,6 +1738,7 @@ async function _moveDoc(docToMove, parentId, targetId, targetOffset) {
   // Don't allow dragging things into itself or children. This will disconnect
   // the node from the tree and cause the item to no longer show in the UI.
   const descendents = await db.withDescendants(docToMove);
+
   for (const doc of descendents) {
     if (doc._id === parentId) {
       return;
@@ -1555,12 +1746,15 @@ async function _moveDoc(docToMove, parentId, targetId, targetOffset) {
   }
 
   function __updateDoc(doc, patch) {
+    // @ts-expect-error -- TSCONVERSION
     return models.getModel(docToMove.type).update(doc, patch);
   }
 
   if (targetId === null) {
     // We are moving to an empty area. No sorting required
-    await __updateDoc(docToMove, { parentId });
+    await __updateDoc(docToMove, {
+      parentId,
+    });
     return;
   }
 
@@ -1577,6 +1771,7 @@ async function _moveDoc(docToMove, parentId, targetId, targetOffset) {
 
     if (doc._id === targetId) {
       let before, after;
+
       if (targetOffset < 0) {
         // We're moving to below
         before = docs[i];
@@ -1595,12 +1790,20 @@ async function _moveDoc(docToMove, parentId, targetId, targetOffset) {
         // not performant at all (need to update all siblings in DB), but it is extremely rare
         // anyway
         console.log(`[app] Recreating Sort Keys ${beforeKey} ${afterKey}`);
-
         await db.bufferChanges(300);
-        docs.map((r, i) => __updateDoc(r, { metaSortKey: i * 100, parentId }));
+        docs.map((r, i) =>
+          __updateDoc(r, {
+            metaSortKey: i * 100,
+            parentId,
+          }),
+        );
       } else {
         const metaSortKey = afterKey - (afterKey - beforeKey) / 2;
-        __updateDoc(docToMove, { metaSortKey, parentId });
+
+        __updateDoc(docToMove, {
+          metaSortKey,
+          parentId,
+        });
       }
 
       break;
diff --git a/packages/insomnia-app/app/ui/context/app/drag-drop-context.js b/packages/insomnia-app/app/ui/context/app/drag-drop-context.ts
similarity index 78%
rename from packages/insomnia-app/app/ui/context/app/drag-drop-context.js
rename to packages/insomnia-app/app/ui/context/app/drag-drop-context.ts
index ee9a271ddc..cc60c199de 100644
--- a/packages/insomnia-app/app/ui/context/app/drag-drop-context.js
+++ b/packages/insomnia-app/app/ui/context/app/drag-drop-context.ts
@@ -1,4 +1,4 @@
 import { DragDropContext } from 'react-dnd';
 import DNDBackend from '../../dnd-backend';
-
+// @ts-expect-error -- TSCONVERSION
 export default DragDropContext(DNDBackend);
diff --git a/packages/insomnia-app/app/ui/context/grpc/__mocks__/grpc-actions.js b/packages/insomnia-app/app/ui/context/grpc/__mocks__/grpc-actions.ts
similarity index 73%
rename from packages/insomnia-app/app/ui/context/grpc/__mocks__/grpc-actions.js
rename to packages/insomnia-app/app/ui/context/grpc/__mocks__/grpc-actions.ts
index e016ea7128..9fe8757833 100644
--- a/packages/insomnia-app/app/ui/context/grpc/__mocks__/grpc-actions.js
+++ b/packages/insomnia-app/app/ui/context/grpc/__mocks__/grpc-actions.ts
@@ -1,3 +1,4 @@
+// WARNING: changing this to `export default` will break the mock and be incredibly hard to debug. Ask me how I know.
 module.exports = {
   grpcActions: {
     reset: jest.fn(),
diff --git a/packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-message-schema.js b/packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-message-schema.ts
similarity index 86%
rename from packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-message-schema.js
rename to packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-message-schema.ts
index 8fee07130c..6042fa808c 100644
--- a/packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-message-schema.js
+++ b/packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-message-schema.ts
@@ -1,8 +1,8 @@
-// @flow
 import type { Schema } from '@develohpanda/fluent-builder';
 import type { GrpcMessage } from '../grpc-actions';
 
 export const grpcMessageSchema: Schema<GrpcMessage> = {
+  // @ts-expect-error -- TSCONVERSION
   id: () => Math.random(),
   text: () => '{}',
   created: () => Date.now(),
diff --git a/packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-method-definition-schema.js b/packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-method-definition-schema.ts
similarity index 89%
rename from packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-method-definition-schema.js
rename to packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-method-definition-schema.ts
index 87d0b79a23..87654ceacc 100644
--- a/packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-method-definition-schema.js
+++ b/packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-method-definition-schema.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { Schema } from '@develohpanda/fluent-builder';
 import type { GrpcMethodDefinition } from '../../../../network/grpc/method';
 
@@ -7,6 +6,7 @@ export const grpcMethodDefinitionSchema: Schema<GrpcMethodDefinition> = {
   originalName: () => 'method',
   responseStream: () => false,
   requestStream: () => true,
+  // @ts-expect-error -- TSCONVERSION unexpected return type
   requestSerialize: () => () => {}, // not using jest.fn to avoid the overhead
   responseDeserialize: () => () => {}, // not using jest.fn to avoid the overhead
 };
diff --git a/packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-status-object-schema.js b/packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-status-object-schema.js
deleted file mode 100644
index b58055a7f8..0000000000
--- a/packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-status-object-schema.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// @flow
-import type { Schema } from '@develohpanda/fluent-builder';
-import { GrpcStatusEnum } from '../../../../network/grpc/service-error';
-
-export const grpcStatusObjectSchema: Schema<GrpcStatusObject> = {
-  code: () => GrpcStatusEnum.OK,
-  details: () => 'details',
-  metadata: () => ({}),
-};
diff --git a/packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-status-object-schema.ts b/packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-status-object-schema.ts
new file mode 100644
index 0000000000..6506b2ce47
--- /dev/null
+++ b/packages/insomnia-app/app/ui/context/grpc/__schemas__/grpc-status-object-schema.ts
@@ -0,0 +1,9 @@
+import type { Schema } from '@develohpanda/fluent-builder';
+import { StatusObject, status } from '@grpc/grpc-js';
+
+export const grpcStatusObjectSchema: Schema<StatusObject> = {
+  code: () => status.OK,
+  details: () => 'details',
+  // @ts-expect-error -- TSCONVERSION need a schema for metadata
+  metadata: () => ({}),
+};
diff --git a/packages/insomnia-app/app/ui/context/grpc/__schemas__/index.js b/packages/insomnia-app/app/ui/context/grpc/__schemas__/index.ts
similarity index 100%
rename from packages/insomnia-app/app/ui/context/grpc/__schemas__/index.js
rename to packages/insomnia-app/app/ui/context/grpc/__schemas__/index.ts
diff --git a/packages/insomnia-app/app/ui/context/grpc/__schemas__/request-state-schema.js b/packages/insomnia-app/app/ui/context/grpc/__schemas__/request-state-schema.ts
similarity index 97%
rename from packages/insomnia-app/app/ui/context/grpc/__schemas__/request-state-schema.js
rename to packages/insomnia-app/app/ui/context/grpc/__schemas__/request-state-schema.ts
index b360b61f9d..3ee85d69a3 100644
--- a/packages/insomnia-app/app/ui/context/grpc/__schemas__/request-state-schema.js
+++ b/packages/insomnia-app/app/ui/context/grpc/__schemas__/request-state-schema.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type { Schema } from '@develohpanda/fluent-builder';
 import type { GrpcRequestState } from '../grpc-reducer';
 
diff --git a/packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-context.test.js b/packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-context.test.tsx
similarity index 97%
rename from packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-context.test.js
rename to packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-context.test.tsx
index 1f3ada756b..65acb45b03 100644
--- a/packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-context.test.js
+++ b/packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-context.test.tsx
@@ -1,8 +1,6 @@
-// @flow
 import React from 'react';
 import { render } from '@testing-library/react';
 import { GrpcProvider } from '../grpc-context';
-
 import { grpcIpcRenderer } from '../grpc-ipc-renderer';
 
 jest.mock('../grpc-ipc-renderer', () => ({
@@ -15,11 +13,8 @@ jest.mock('../grpc-ipc-renderer', () => ({
 describe('<GrpcProvider />', () => {
   it('should initialize and destroy grpc-ipc-renderer', async () => {
     const { unmount } = render(<GrpcProvider>test</GrpcProvider>);
-
     expect(grpcIpcRenderer.init).toHaveBeenCalledTimes(1);
-
     unmount();
-
     expect(grpcIpcRenderer.destroy).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-ipc-renderer.test.js b/packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-ipc-renderer.test.ts
similarity index 98%
rename from packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-ipc-renderer.test.js
rename to packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-ipc-renderer.test.ts
index 490df12a2e..9f413da721 100644
--- a/packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-ipc-renderer.test.js
+++ b/packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-ipc-renderer.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { ipcRenderer } from 'electron';
 import { GrpcRequestEventEnum, GrpcResponseEventEnum } from '../../../../common/grpc-events';
 import { grpcStatusObjectSchema } from '../__schemas__';
@@ -21,7 +19,6 @@ describe('init', () => {
   const e = {};
   const id = 'abc';
   const dispatch = jest.fn();
-
   beforeEach(() => {
     grpcIpcRenderer.init(dispatch);
   });
@@ -32,9 +29,7 @@ describe('init', () => {
 
   it('should attach listener for start', () => {
     const [channel, listener] = ipcRenderer.on.mock.calls[0];
-
     expect(channel).toBe(GrpcResponseEventEnum.start);
-
     // Execute the callback, and make sure the correct grpc action is called
     listener(e, id);
     expect(grpcActions.start).toHaveBeenCalledWith(id);
@@ -43,9 +38,7 @@ describe('init', () => {
 
   it('should attach listener for end', () => {
     const [channel, listener] = ipcRenderer.on.mock.calls[1];
-
     expect(channel).toBe(GrpcResponseEventEnum.end);
-
     // Execute the callback, and make sure the correct grpc action is called
     listener(e, id);
     expect(grpcActions.stop).toHaveBeenCalledWith(id);
@@ -54,10 +47,10 @@ describe('init', () => {
 
   it('should attach listener for data', () => {
     const [channel, listener] = ipcRenderer.on.mock.calls[2];
-    const val = { a: true };
-
+    const val = {
+      a: true,
+    };
     expect(channel).toBe(GrpcResponseEventEnum.data);
-
     // Execute the callback, and make sure the correct grpc action is called
     listener(e, id, val);
     expect(grpcActions.responseMessage).toHaveBeenCalledWith(id, val);
@@ -67,9 +60,7 @@ describe('init', () => {
   it('should attach listener for error', () => {
     const [channel, listener] = ipcRenderer.on.mock.calls[3];
     const err = new Error('error');
-
     expect(channel).toBe(GrpcResponseEventEnum.error);
-
     // Execute the callback, and make sure the correct grpc action is called
     listener(e, id, err);
     expect(grpcActions.error).toHaveBeenCalledWith(id, err);
@@ -79,9 +70,7 @@ describe('init', () => {
   it('should attach listener for status', () => {
     const [channel, listener] = ipcRenderer.on.mock.calls[4];
     const status = createBuilder(grpcStatusObjectSchema).build();
-
     expect(channel).toBe(GrpcResponseEventEnum.status);
-
     // Execute the callback, and make sure the correct grpc action is called
     listener(e, id, status);
     expect(grpcActions.status).toHaveBeenCalledWith(id, status);
@@ -105,14 +94,12 @@ describe('sendGrpcIpcMultiple', () => {
   it('should send requestIds on channel', () => {
     const requestIds = ['abc', '123'];
     sendGrpcIpcMultiple(channel, requestIds);
-
     expect(ipcRenderer.send).toHaveBeenCalledTimes(1);
     expect(ipcRenderer.send).toHaveBeenCalledWith(channel, requestIds);
   });
 
   it('should not send on channel when request ids is empty', () => {
     sendGrpcIpcMultiple(channel, []);
-
     expect(ipcRenderer.send).not.toHaveBeenCalled();
   });
 
@@ -120,7 +107,6 @@ describe('sendGrpcIpcMultiple', () => {
     sendGrpcIpcMultiple(channel, undefined);
     sendGrpcIpcMultiple(channel, null);
     sendGrpcIpcMultiple(channel);
-
     expect(ipcRenderer.send).not.toHaveBeenCalled();
   });
 });
diff --git a/packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-reducer.test.js b/packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-reducer.test.ts
similarity index 83%
rename from packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-reducer.test.js
rename to packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-reducer.test.ts
index 8a51de017d..cd0ef7fe10 100644
--- a/packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-reducer.test.js
+++ b/packages/insomnia-app/app/ui/context/grpc/__tests__/grpc-reducer.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { findGrpcRequestState, grpcReducer } from '../grpc-reducer';
 import type { GrpcRequestState, GrpcState } from '../grpc-reducer';
 import { createBuilder } from '@develohpanda/fluent-builder';
@@ -19,7 +18,6 @@ const messageBuilder = createBuilder(grpcMessageSchema);
 const requestStateBuilder = createBuilder(requestStateSchema);
 const statusBuilder = createBuilder(grpcStatusObjectSchema);
 const methodBuilder = createBuilder(grpcMethodDefinitionSchema);
-
 const expectedInitialState: GrpcRequestState = {
   running: false,
   requestMessages: [],
@@ -49,10 +47,10 @@ describe('findGrpcRequestState', () => {
 describe('grpcReducer actions', () => {
   const mockDateNowResult = 1234;
   const _originalDateNow = Date.now;
-
   beforeEach(() => {
     Date.now = jest.fn().mockReturnValue(mockDateNowResult);
   });
+
   afterEach(() => {
     Date.now = _originalDateNow;
   });
@@ -68,9 +66,7 @@ describe('grpcReducer actions', () => {
           .build(),
       };
       const newState = grpcReducer(state, grpcActions.reset('b'));
-
       const expectedRequestState = expectedInitialState;
-
       expect(newState).toStrictEqual({
         a: state.a,
         b: expectedRequestState,
@@ -82,15 +78,10 @@ describe('grpcReducer actions', () => {
     it('should set running to true', () => {
       const state: GrpcState = {
         a: requestStateBuilder.reset().build(),
-        b: requestStateBuilder
-          .reset()
-          .running(false)
-          .build(),
+        b: requestStateBuilder.reset().running(false).build(),
       };
       const newState = grpcReducer(state, grpcActions.start('b'));
-
       const expectedRequestState = { ...state.b, running: true };
-
       expect(newState).toStrictEqual({
         a: state.a,
         b: expectedRequestState,
@@ -102,15 +93,10 @@ describe('grpcReducer actions', () => {
     it('should set running to false', () => {
       const state: GrpcState = {
         a: requestStateBuilder.reset().build(),
-        b: requestStateBuilder
-          .reset()
-          .running(true)
-          .build(),
+        b: requestStateBuilder.reset().running(true).build(),
       };
       const newState = grpcReducer(state, grpcActions.stop('b'));
-
       const expectedRequestState = { ...state.b, running: false };
-
       expect(newState).toStrictEqual({
         a: state.a,
         b: expectedRequestState,
@@ -123,26 +109,19 @@ describe('grpcReducer actions', () => {
       const existingMessage = messageBuilder.reset().build();
       const state: GrpcState = {
         a: requestStateBuilder.reset().build(),
-        b: requestStateBuilder
-          .reset()
-          .requestMessages([existingMessage])
-          .build(),
+        b: requestStateBuilder.reset().requestMessages([existingMessage]).build(),
       };
-
       const newMessage = '{"prop":"anything"}';
       const newState = grpcReducer(state, grpcActions.requestMessage('b', newMessage));
-
       const expectedMessage = expect.objectContaining({
         id: expect.stringMatching(/^[a-z0-9]{32}$/),
         text: newMessage,
         created: mockDateNowResult,
       });
-
       const expectedRequestState = {
         ...state.b,
         requestMessages: [existingMessage, expectedMessage],
       };
-
       expect(newState).toStrictEqual({
         a: state.a,
         b: expectedRequestState,
@@ -155,26 +134,21 @@ describe('grpcReducer actions', () => {
       const existingMessage = messageBuilder.reset().build();
       const state: GrpcState = {
         a: requestStateBuilder.reset().build(),
-        b: requestStateBuilder
-          .reset()
-          .responseMessages([existingMessage])
-          .build(),
+        b: requestStateBuilder.reset().responseMessages([existingMessage]).build(),
+      };
+      const newMessage = {
+        prop: 'anything',
       };
-
-      const newMessage = { prop: 'anything' };
       const newState = grpcReducer(state, grpcActions.responseMessage('b', newMessage));
-
       const expectedMessage = expect.objectContaining({
         id: expect.stringMatching(/^[a-z0-9]{32}$/),
         text: '{"prop":"anything"}',
         created: mockDateNowResult,
       });
-
       const expectedRequestState = {
         ...state.b,
         responseMessages: [existingMessage, expectedMessage],
       };
-
       expect(newState).toStrictEqual({
         a: state.a,
         b: expectedRequestState,
@@ -188,12 +162,9 @@ describe('grpcReducer actions', () => {
         a: requestStateBuilder.reset().build(),
         b: requestStateBuilder.reset().build(),
       };
-
       const error = new Error('this is an error');
       const newState = grpcReducer(state, grpcActions.error('b', error));
-
       const expectedRequestState = { ...state.b, error };
-
       expect(newState).toStrictEqual({
         a: state.a,
         b: expectedRequestState,
@@ -207,12 +178,9 @@ describe('grpcReducer actions', () => {
         a: requestStateBuilder.reset().build(),
         b: requestStateBuilder.reset().build(),
       };
-
       const status = statusBuilder.reset().build();
       const newState = grpcReducer(state, grpcActions.status('b', status));
-
       const expectedRequestState = { ...state.b, status };
-
       expect(newState).toStrictEqual({
         a: state.a,
         b: expectedRequestState,
@@ -223,21 +191,11 @@ describe('grpcReducer actions', () => {
   describe('invalidate', () => {
     it('should set reloadMethods to true', () => {
       const state: GrpcState = {
-        a: requestStateBuilder
-          .reset()
-          .reloadMethods(false)
-          .methods([])
-          .build(),
-        b: requestStateBuilder
-          .reset()
-          .reloadMethods(false)
-          .build(),
+        a: requestStateBuilder.reset().reloadMethods(false).methods([]).build(),
+        b: requestStateBuilder.reset().reloadMethods(false).build(),
       };
-
       const newState = grpcReducer(state, grpcActions.invalidate('b'));
-
       const expectedRequestState = { ...state.b, reloadMethods: true };
-
       expect(newState).toStrictEqual({
         a: state.a,
         b: expectedRequestState,
@@ -252,42 +210,39 @@ describe('grpcReducer actions', () => {
 
     it('should set reloadMethods to true only for requests that refer to the updated proto file', async () => {
       const parentId = 'wrk_1';
-
       // Create 3 requests, two of them referencing the protofile in question
-      const pf = await models.protoFile.create({ parentId });
-
+      const pf = await models.protoFile.create({
+        parentId,
+      });
       const r1 = 'r1';
       const r2 = 'r2';
       const r3 = 'r3';
-
-      await models.grpcRequest.create({ parentId, _id: r1 });
-      await models.grpcRequest.create({ parentId, _id: r2, protoFileId: pf._id });
-      await models.grpcRequest.create({ parentId, _id: r3, protoFileId: pf._id });
-
+      await models.grpcRequest.create({
+        parentId,
+        _id: r1,
+      });
+      await models.grpcRequest.create({
+        parentId,
+        _id: r2,
+        protoFileId: pf._id,
+      });
+      await models.grpcRequest.create({
+        parentId,
+        _id: r3,
+        protoFileId: pf._id,
+      });
       // Setup original state for each request
       const originalState: GrpcState = {
-        [r1]: requestStateBuilder
-          .reset()
-          .reloadMethods(false)
-          .build(),
-        [r2]: requestStateBuilder
-          .reset()
-          .reloadMethods(false)
-          .build(),
-        [r3]: requestStateBuilder
-          .reset()
-          .reloadMethods(false)
-          .build(),
+        [r1]: requestStateBuilder.reset().reloadMethods(false).build(),
+        [r2]: requestStateBuilder.reset().reloadMethods(false).build(),
+        [r3]: requestStateBuilder.reset().reloadMethods(false).build(),
       };
-
       // Dispatch an invalidateMany action, with the modified protofile id as an argument
       const newState = grpcReducer(originalState, await grpcActions.invalidateMany(pf._id));
-
       // Expect r1 to remain unchanged, while r2 and r3 have reloadMethods set to true
       const r1Expected = originalState[r1];
       const r2Expected = { ...originalState[r2], reloadMethods: true };
       const r3Expected = { ...originalState[r3], reloadMethods: true };
-
       expect(newState).toStrictEqual({
         [r1]: r1Expected,
         [r2]: r2Expected,
@@ -297,24 +252,21 @@ describe('grpcReducer actions', () => {
 
     it('should do nothing if no requests found for the proto file', async () => {
       const parentId = 'wrk_1';
-
       // Create a request not linked to the proto file
-      const pf = await models.protoFile.create({ parentId });
-
+      const pf = await models.protoFile.create({
+        parentId,
+      });
       const r1 = 'r1';
-      await models.grpcRequest.create({ parentId, _id: r1 });
-
+      await models.grpcRequest.create({
+        parentId,
+        _id: r1,
+      });
       // Setup original state
       const originalState: GrpcState = {
-        [r1]: requestStateBuilder
-          .reset()
-          .reloadMethods(false)
-          .build(),
+        [r1]: requestStateBuilder.reset().reloadMethods(false).build(),
       };
-
       // Dispatch an invalidateMany action, with the modified proto file id as an argument
       const newState = grpcReducer(originalState, await grpcActions.invalidateMany(pf._id));
-
       // Expect no state change
       expect(newState).toStrictEqual(originalState);
     });
@@ -323,10 +275,7 @@ describe('grpcReducer actions', () => {
   describe('clear', () => {
     it('should clear per-run state', () => {
       const state: GrpcState = {
-        a: requestStateBuilder
-          .reset()
-          .running(true)
-          .build(),
+        a: requestStateBuilder.reset().running(true).build(),
         b: requestStateBuilder
           .reset()
           .reloadMethods(true)
@@ -338,9 +287,7 @@ describe('grpcReducer actions', () => {
           .error(new Error('error'))
           .build(),
       };
-
       const newState = grpcReducer(state, grpcActions.clear('b'));
-
       const expectedRequestState = {
         ...state.b,
         requestMessages: [],
@@ -348,7 +295,6 @@ describe('grpcReducer actions', () => {
         status: undefined,
         error: undefined,
       };
-
       expect(newState).toStrictEqual({
         a: state.a,
         b: expectedRequestState,
@@ -363,28 +309,21 @@ describe('grpcReducer actions', () => {
 
     it('should store methods after they are loaded', async () => {
       const state: GrpcState = {
-        a: requestStateBuilder
-          .reset()
-          .running(true)
-          .build(),
+        a: requestStateBuilder.reset().running(true).build(),
         b: requestStateBuilder
           .reset()
           .methods([methodBuilder.reset().build()])
           .reloadMethods(true)
           .build(),
       };
-
       const newMethods = [methodBuilder.reset().build()];
       protoLoader.loadMethods.mockResolvedValue(newMethods);
-
       const newState = grpcReducer(state, await grpcActions.loadMethods('b', 'pfid'));
-
       const expectedRequestState: GrpcRequestState = {
         ...state.b,
         reloadMethods: false,
         methods: newMethods,
       };
-
       expect(newState).toStrictEqual({
         a: state.a,
         b: expectedRequestState,
@@ -393,9 +332,15 @@ describe('grpcReducer actions', () => {
   });
 
   it('should throw error if action not found', () => {
-    expect(() => grpcReducer({}, { requestId: 'abc', type: 'not-found' })).toThrowError(
-      'Unhandled single request action type: not-found',
-    );
+    expect(() =>
+      grpcReducer(
+        {},
+        {
+          requestId: 'abc',
+          type: 'not-found',
+        },
+      ),
+    ).toThrowError('Unhandled single request action type: not-found');
   });
 
   it.each([null, undefined])('should do nothing if action is falsey', action => {
diff --git a/packages/insomnia-app/app/ui/context/grpc/grpc-actions.js b/packages/insomnia-app/app/ui/context/grpc/grpc-actions.ts
similarity index 58%
rename from packages/insomnia-app/app/ui/context/grpc/grpc-actions.js
rename to packages/insomnia-app/app/ui/context/grpc/grpc-actions.ts
index 544e81cc7a..16f2b4127a 100644
--- a/packages/insomnia-app/app/ui/context/grpc/grpc-actions.js
+++ b/packages/insomnia-app/app/ui/context/grpc/grpc-actions.ts
@@ -1,16 +1,15 @@
-// @flow
-
-import type { GrpcStatusObject, ServiceError } from '../../../network/grpc/service-error';
 import { generateId } from '../../../common/misc';
 import type { GrpcMethodDefinition } from '../../../network/grpc/method';
 import * as models from '../../../models';
 import * as protoLoader from '../../../network/grpc/proto-loader';
+import { ValueOf } from 'type-fest';
+import { ServiceError, StatusObject } from '@grpc/grpc-js';
 
-export type GrpcMessage = {
-  id: string,
-  text: string,
-  created: number,
-};
+export interface GrpcMessage {
+  id: string;
+  text: string;
+  created: number;
+}
 
 export const GrpcActionTypeEnum = {
   reset: 'reset',
@@ -23,36 +22,48 @@ export const GrpcActionTypeEnum = {
   invalidate: 'invalidate',
   invalidateMany: 'invalidateMany',
   loadMethods: 'loadMethods',
-};
-type GrpcActionType = $Values<typeof GrpcActionTypeEnum>;
+  status: 'status',
+} as const;
 
-type Action<T: GrpcActionType> = {
-  type: T,
-  requestId: string,
-};
+type GrpcActionType = ValueOf<typeof GrpcActionTypeEnum>;
 
-type ActionMany<T: GrpcActionType> = {
-  type: T,
-  requestIds: Array<string>,
-};
+interface Action<T extends GrpcActionType> {
+  type: T;
+  requestId: string;
+}
 
-type Payload<T> = {
-  payload: T,
-};
+interface ActionMany<T extends GrpcActionType> {
+  type: T;
+  requestIds: Array<string>;
+}
 
-type ResetAction = Action<GrpcActionTypeEnum.reset>;
-type ClearAction = Action<GrpcActionTypeEnum.clear>;
-type StartAction = Action<GrpcActionTypeEnum.start>;
-type StopAction = Action<GrpcActionTypeEnum.stop>;
-type InvalidateAction = Action<GrpcActionTypeEnum.invalidate>;
-export type RequestMessageAction = Action<GrpcActionTypeEnum.requestMessage> & Payload<GrpcMessage>;
-export type ResponseMessageAction = Action<GrpcActionTypeEnum.responseMessage> &
+interface Payload<T> {
+  payload: T;
+}
+
+type ResetAction = Action<typeof GrpcActionTypeEnum.reset>;
+
+type ClearAction = Action<typeof GrpcActionTypeEnum.clear>;
+
+type StartAction = Action<typeof GrpcActionTypeEnum.start>;
+
+type StopAction = Action<typeof GrpcActionTypeEnum.stop>;
+
+type InvalidateAction = Action<typeof GrpcActionTypeEnum.invalidate>;
+
+export type RequestMessageAction = Action<typeof GrpcActionTypeEnum.requestMessage> & Payload<GrpcMessage>;
+
+export type ResponseMessageAction = Action<typeof GrpcActionTypeEnum.responseMessage> &
   Payload<GrpcMessage>;
-export type ErrorAction = Action<GrpcActionTypeEnum.error> & Payload<ServiceError>;
-export type StatusAction = Action<GrpcActionTypeEnum.status> & Payload<GrpcStatusObject>;
-export type LoadMethodsAction = Action<GrpcActionTypeEnum.loadMethods> &
+
+export type ErrorAction = Action<typeof GrpcActionTypeEnum.error> & Payload<ServiceError>;
+
+export type StatusAction = Action<typeof GrpcActionTypeEnum.status> & Payload<StatusObject>;
+
+export type LoadMethodsAction = Action<typeof GrpcActionTypeEnum.loadMethods> &
   Payload<Array<GrpcMethodDefinition>>;
-type InvalidateManyAction = ActionMany<GrpcActionTypeEnum.invalidateMany>;
+
+type InvalidateManyAction = ActionMany<typeof GrpcActionTypeEnum.invalidateMany>;
 
 export type GrpcAction =
   | ClearAction
@@ -69,7 +80,7 @@ export type GrpcAction =
 
 export type GrpcActionMany = InvalidateManyAction;
 
-export type GrpcDispatch = (action: GrpcAction) => void;
+export type GrpcDispatch = (action?: GrpcAction) => void;
 
 const reset = (requestId: string): ResetAction => ({
   type: GrpcActionTypeEnum.reset,
@@ -86,16 +97,24 @@ const stop = (requestId: string): StopAction => ({
   requestId,
 });
 
-const responseMessage = (requestId: string, value: Object): ResponseMessageAction => ({
+const responseMessage = (requestId: string, value: Record<string, any>): ResponseMessageAction => ({
   type: GrpcActionTypeEnum.responseMessage,
   requestId,
-  payload: { id: generateId(), text: JSON.stringify(value), created: Date.now() },
+  payload: {
+    id: generateId(),
+    text: JSON.stringify(value),
+    created: Date.now(),
+  },
 });
 
 const requestMessage = (requestId: string, text: string): RequestMessageAction => ({
   type: GrpcActionTypeEnum.requestMessage,
   requestId,
-  payload: { id: generateId(), text, created: Date.now() },
+  payload: {
+    id: generateId(),
+    text,
+    created: Date.now(),
+  },
 });
 
 const error = (requestId: string, error: ServiceError): ErrorAction => ({
@@ -104,7 +123,7 @@ const error = (requestId: string, error: ServiceError): ErrorAction => ({
   payload: error,
 });
 
-const status = (requestId: string, status: GrpcStatusObject): ErrorAction => ({
+const status = (requestId: string, status: StatusObject): StatusAction => ({
   type: GrpcActionTypeEnum.status,
   requestId,
   payload: status,
@@ -120,21 +139,21 @@ const invalidate = (requestId: string): InvalidateAction => ({
   requestId,
 });
 
-const invalidateMany = async (protoFileId: string): Promise<InvalidateManyAction | undefined> => {
+const invalidateMany = async (protoFileId: string) => {
   const impacted = await models.grpcRequest.findByProtoFileId(protoFileId);
 
   // skip invalidation if no requests are linked to the proto file
-  if (!impacted.length) {
+  if (!impacted?.length) {
     return undefined;
   }
 
   return {
     type: GrpcActionTypeEnum.invalidateMany,
     requestIds: impacted.map(g => g._id),
-  };
+  } as InvalidateManyAction;
 };
 
-const loadMethods = async (requestId: string, protoFileId: string): Promise<LoadMethodsAction> => {
+const loadMethods = async (requestId: string, protoFileId: string) => {
   console.log(`[gRPC] loading proto file methods pf=${protoFileId}`);
   const protoFile = await models.protoFile.getById(protoFileId);
   const methods = await protoLoader.loadMethods(protoFile);
@@ -143,7 +162,7 @@ const loadMethods = async (requestId: string, protoFileId: string): Promise<Load
     type: GrpcActionTypeEnum.loadMethods,
     requestId,
     payload: methods,
-  };
+  } as LoadMethodsAction;
 };
 
 export const grpcActions = {
diff --git a/packages/insomnia-app/app/ui/context/grpc/grpc-context.js b/packages/insomnia-app/app/ui/context/grpc/grpc-context.tsx
similarity index 67%
rename from packages/insomnia-app/app/ui/context/grpc/grpc-context.js
rename to packages/insomnia-app/app/ui/context/grpc/grpc-context.tsx
index d47a67760f..84a242a7b4 100644
--- a/packages/insomnia-app/app/ui/context/grpc/grpc-context.js
+++ b/packages/insomnia-app/app/ui/context/grpc/grpc-context.tsx
@@ -1,25 +1,24 @@
-// @flow
-import React from 'react';
+import React, { createContext, FunctionComponent, ReactNode, useContext, useEffect, useReducer } from 'react';
 import { grpcIpcRenderer } from './grpc-ipc-renderer';
 import { findGrpcRequestState, grpcReducer } from './grpc-reducer';
 import type { GrpcDispatch } from './grpc-actions';
 import type { GrpcRequestState, GrpcState } from './grpc-reducer';
 
-type Props = { children: React.ReactNode };
+interface Props {
+  children: ReactNode;
+}
 
 // These should not be exported, so that they are only accessed in a controlled manner
-const GrpcStateContext = React.createContext<GrpcState | undefined>();
-const GrpcDispatchContext = React.createContext<GrpcDispatch | undefined>();
-
-export const GrpcProvider = ({ children }: Props) => {
-  const [state, dispatch] = React.useReducer(grpcReducer, {});
+const GrpcStateContext = createContext<GrpcState | undefined>(undefined);
+const GrpcDispatchContext = createContext<GrpcDispatch | undefined>(undefined);
 
+export const GrpcProvider: FunctionComponent<Props> = ({ children }) => {
+  const [state, dispatch] = useReducer(grpcReducer, {});
   // Only add listeners on mount
-  React.useEffect(() => {
+  useEffect(() => {
     grpcIpcRenderer.init(dispatch);
     return grpcIpcRenderer.destroy;
   }, []);
-
   return (
     <GrpcStateContext.Provider value={state}>
       <GrpcDispatchContext.Provider value={dispatch}>{children}</GrpcDispatchContext.Provider>
@@ -28,7 +27,7 @@ export const GrpcProvider = ({ children }: Props) => {
 };
 
 export const useGrpcRequestState = (requestId: string): GrpcRequestState => {
-  const context = React.useContext(GrpcStateContext);
+  const context = useContext(GrpcStateContext);
 
   if (context === undefined) {
     throw new Error('useGrpcRequestState must be used within a GrpcProvider');
@@ -42,7 +41,7 @@ export const useGrpcRequestState = (requestId: string): GrpcRequestState => {
 };
 
 export const useGrpcDispatch = (): GrpcDispatch => {
-  const context = React.useContext(GrpcDispatchContext);
+  const context = useContext(GrpcDispatchContext);
 
   if (context === undefined) {
     throw new Error('useGrpcDispatch must be used within a GrpcProvider');
@@ -56,12 +55,11 @@ export const useGrpc = (requestId: string): [GrpcRequestState, GrpcDispatch] =>
   useGrpcDispatch(),
 ];
 
-type GrpcContextModalWrapperProps = {|
-  children: (dispatch: GrpcDispatch) => React.Node,
-|};
+interface GrpcContextModalWrapperProps {
+  children: (dispatch: GrpcDispatch) => ReactNode;
+}
 
 export const GrpcDispatchModalWrapper = ({ children }: GrpcContextModalWrapperProps) => {
   const dispatch = useGrpcDispatch();
-
-  return children(dispatch);
+  return <>{children(dispatch)}</>;
 };
diff --git a/packages/insomnia-app/app/ui/context/grpc/grpc-ipc-renderer.js b/packages/insomnia-app/app/ui/context/grpc/grpc-ipc-renderer.ts
similarity index 99%
rename from packages/insomnia-app/app/ui/context/grpc/grpc-ipc-renderer.js
rename to packages/insomnia-app/app/ui/context/grpc/grpc-ipc-renderer.ts
index e3b7cf5ab4..5b9b6752f4 100644
--- a/packages/insomnia-app/app/ui/context/grpc/grpc-ipc-renderer.js
+++ b/packages/insomnia-app/app/ui/context/grpc/grpc-ipc-renderer.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ipcRenderer } from 'electron';
 import { GrpcResponseEventEnum } from '../../../common/grpc-events';
 import { grpcActions } from './grpc-actions';
@@ -55,7 +54,6 @@ export const grpcIpcRenderer = {
   init,
   destroy,
 };
-
 export const sendGrpcIpcMultiple = (channel: GrpcRequestEvent, requestIds?: Array<string>) => {
   if (requestIds?.length) {
     ipcRenderer.send(channel, requestIds);
diff --git a/packages/insomnia-app/app/ui/context/grpc/grpc-reducer.js b/packages/insomnia-app/app/ui/context/grpc/grpc-reducer.ts
similarity index 77%
rename from packages/insomnia-app/app/ui/context/grpc/grpc-reducer.js
rename to packages/insomnia-app/app/ui/context/grpc/grpc-reducer.ts
index c9401cf391..f79098df3d 100644
--- a/packages/insomnia-app/app/ui/context/grpc/grpc-reducer.js
+++ b/packages/insomnia-app/app/ui/context/grpc/grpc-reducer.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type {
   ErrorAction,
   GrpcAction,
@@ -11,21 +9,21 @@ import type {
   StatusAction,
 } from './grpc-actions';
 import { GrpcActionTypeEnum } from './grpc-actions';
-import type { GrpcStatusObject, ServiceError } from '../../../network/grpc/service-error';
 import type { GrpcMethodDefinition } from '../../../network/grpc/method';
+import { ServiceError, StatusObject } from '@grpc/grpc-js';
 
-export type GrpcRequestState = {
-  running: boolean,
-  requestMessages: Array<GrpcMessage>,
-  responseMessages: Array<GrpcMessage>,
-  status?: GrpcStatusObject,
-  error: ServiceError,
-  methods: Array<GrpcMethodDefinition>,
-  reloadMethods: boolean,
-};
+export interface GrpcRequestState {
+  running: boolean;
+  requestMessages: Array<GrpcMessage>;
+  responseMessages: Array<GrpcMessage>;
+  status?: StatusObject;
+  error?: ServiceError;
+  methods: Array<GrpcMethodDefinition>;
+  reloadMethods: boolean;
+}
 
 // TODO: delete from here when deleting a request - INS-288
-export type GrpcState = { [requestId: string]: GrpcRequestState };
+export type GrpcState = Record<string, GrpcRequestState>;
 
 const INITIAL_GRPC_REQUEST_STATE: GrpcRequestState = {
   running: false,
@@ -37,14 +35,14 @@ const INITIAL_GRPC_REQUEST_STATE: GrpcRequestState = {
   reloadMethods: true,
 };
 
-const CLEAR_GRPC_REQUEST_STATE: Shape<GrpcRequestState> = {
+const CLEAR_GRPC_REQUEST_STATE: Partial<GrpcRequestState> = {
   requestMessages: [],
   responseMessages: [],
   status: undefined,
   error: undefined,
 };
 
-const _patch = (state: GrpcState, requestId: string, requestState: GrpcRequestState): State => ({
+const _patch = (state: GrpcState, requestId: string, requestState: GrpcRequestState): GrpcState => ({
   ...state,
   [requestId]: requestState,
 });
@@ -66,6 +64,7 @@ const multiRequestReducer = (state: GrpcState, action: GrpcActionMany): GrpcStat
       });
       return { ...state, ...newStates };
     }
+
     default: {
       throw new Error(`Unhandled multi request action type: ${action.type}`);
     }
@@ -73,6 +72,7 @@ const multiRequestReducer = (state: GrpcState, action: GrpcActionMany): GrpcStat
 };
 
 const singleRequestReducer = (state: GrpcState, action: GrpcAction): GrpcState => {
+  // @ts-expect-error -- TSCONVERSION
   const requestId = action.requestId;
   const oldState = findGrpcRequestState(state, requestId);
 
@@ -80,15 +80,15 @@ const singleRequestReducer = (state: GrpcState, action: GrpcAction): GrpcState =
     case GrpcActionTypeEnum.reset: {
       return _patch(state, requestId, INITIAL_GRPC_REQUEST_STATE);
     }
+
     case GrpcActionTypeEnum.start: {
-      return _patch(state, requestId, {
-        ...oldState,
-        running: true,
-      });
+      return _patch(state, requestId, { ...oldState, running: true });
     }
+
     case GrpcActionTypeEnum.stop: {
       return _patch(state, requestId, { ...oldState, running: false });
     }
+
     case GrpcActionTypeEnum.requestMessage: {
       const { payload }: RequestMessageAction = action;
       return _patch(state, requestId, {
@@ -96,6 +96,7 @@ const singleRequestReducer = (state: GrpcState, action: GrpcAction): GrpcState =
         requestMessages: [...oldState.requestMessages, payload],
       });
     }
+
     case GrpcActionTypeEnum.responseMessage: {
       const { payload }: ResponseMessageAction = action;
       return _patch(state, requestId, {
@@ -103,34 +104,30 @@ const singleRequestReducer = (state: GrpcState, action: GrpcAction): GrpcState =
         responseMessages: [...oldState.responseMessages, payload],
       });
     }
+
     case GrpcActionTypeEnum.error: {
       const { payload }: ErrorAction = action;
       return _patch(state, requestId, { ...oldState, error: payload });
     }
+
     case GrpcActionTypeEnum.status: {
       const { payload }: StatusAction = action;
       return _patch(state, requestId, { ...oldState, status: payload });
     }
+
     case GrpcActionTypeEnum.clear: {
-      return _patch(state, requestId, {
-        ...oldState,
-        ...CLEAR_GRPC_REQUEST_STATE,
-      });
+      return _patch(state, requestId, { ...oldState, ...CLEAR_GRPC_REQUEST_STATE });
     }
+
     case GrpcActionTypeEnum.loadMethods: {
       const { payload }: LoadMethodsAction = action;
-      return _patch(state, requestId, {
-        ...oldState,
-        methods: payload,
-        reloadMethods: false,
-      });
+      return _patch(state, requestId, { ...oldState, methods: payload, reloadMethods: false });
     }
+
     case GrpcActionTypeEnum.invalidate: {
-      return _patch(state, requestId, {
-        ...oldState,
-        reloadMethods: true,
-      });
+      return _patch(state, requestId, { ...oldState, reloadMethods: true });
     }
+
     default: {
       throw new Error(`Unhandled single request action type: ${action.type}`);
     }
@@ -139,13 +136,15 @@ const singleRequestReducer = (state: GrpcState, action: GrpcAction): GrpcState =
 
 export const grpcReducer = (
   state: GrpcState,
-  action: GrpcAction | GrpcActionMany | undefined,
+  action?: GrpcAction | GrpcActionMany,
 ): GrpcState => {
   if (!action) {
     return state;
   }
 
+  // @ts-expect-error -- TSCONVERSION
   return action.requestIds
+    // @ts-expect-error -- TSCONVERSION
     ? multiRequestReducer(state, action)
     : singleRequestReducer(state, action);
 };
diff --git a/packages/insomnia-app/app/ui/context/grpc/index.js b/packages/insomnia-app/app/ui/context/grpc/index.ts
similarity index 97%
rename from packages/insomnia-app/app/ui/context/grpc/index.js
rename to packages/insomnia-app/app/ui/context/grpc/index.ts
index cef83a7149..85e2416744 100644
--- a/packages/insomnia-app/app/ui/context/grpc/index.js
+++ b/packages/insomnia-app/app/ui/context/grpc/index.ts
@@ -1,7 +1,5 @@
-// @flow
 export type { GrpcRequestState } from './grpc-reducer';
 export type { GrpcDispatch } from './grpc-actions';
-
 export { grpcActions } from './grpc-actions';
 export {
   useGrpc,
diff --git a/packages/insomnia-app/app/ui/dnd-backend.js b/packages/insomnia-app/app/ui/dnd-backend.js
deleted file mode 100644
index 27d4ed45b7..0000000000
--- a/packages/insomnia-app/app/ui/dnd-backend.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import HTML5Backend from 'react-dnd-html5-backend';
-
-class DNDBackend extends HTML5Backend {
-  handleTopDragEndCapture(e) {
-    if (this.isDraggingNativeItem()) {
-      setTimeout(() => {
-        this.actions.endDrag();
-      });
-      return;
-    }
-
-    super.handleTopDragEndCapture(e);
-  }
-
-  handleTopDragOver(e) {
-    if (this.isDraggingNativeItem()) return;
-    super.handleTopDragOver(e);
-  }
-
-  handleTopDragLeaveCapture(e) {
-    if (this.isDraggingNativeItem()) return;
-    super.handleTopDragLeaveCapture(e);
-  }
-
-  handleTopDropCapture(e) {
-    if (this.isDraggingNativeItem()) return;
-    super.handleTopDropCapture(e);
-  }
-
-  handleTopDrop(e) {
-    if (!this.monitor.isDragging() || this.isDraggingNativeItem()) return;
-    super.handleTopDrop(e);
-  }
-}
-
-export default function(manager) {
-  return new DNDBackend(manager);
-}
diff --git a/packages/insomnia-app/app/ui/dnd-backend.ts b/packages/insomnia-app/app/ui/dnd-backend.ts
new file mode 100644
index 0000000000..796b220d94
--- /dev/null
+++ b/packages/insomnia-app/app/ui/dnd-backend.ts
@@ -0,0 +1,46 @@
+import HTML5Backend from 'react-dnd-html5-backend';
+
+// @ts-expect-error -- TSCONVERSION ignoring until we can update react-dnd-html5-backend to get accurate upstream types
+class DNDBackend extends HTML5Backend {
+  handleTopDragEndCapture(e) {
+    // @ts-expect-error -- TSCONVERSION ignoring until we can update react-dnd-html5-backend to get accurate upstream types
+    if (this.isDraggingNativeItem()) {
+      setTimeout(() => {
+        // @ts-expect-error -- TSCONVERSION ignoring until we can update react-dnd-html5-backend to get accurate upstream types
+        this.actions.endDrag();
+      });
+      return;
+    }
+
+    super.handleTopDragEndCapture(e);
+  }
+
+  handleTopDragOver(e) {
+    // @ts-expect-error -- TSCONVERSION ignoring until we can update react-dnd-html5-backend to get accurate upstream types
+    if (this.isDraggingNativeItem()) return;
+    super.handleTopDragOver(e);
+  }
+
+  handleTopDragLeaveCapture(e) {
+    // @ts-expect-error -- TSCONVERSION ignoring until we can update react-dnd-html5-backend to get accurate upstream types
+    if (this.isDraggingNativeItem()) return;
+    super.handleTopDragLeaveCapture(e);
+  }
+
+  handleTopDropCapture(e) {
+    // @ts-expect-error -- TSCONVERSION ignoring until we can update react-dnd-html5-backend to get accurate upstream types
+    if (this.isDraggingNativeItem()) return;
+    super.handleTopDropCapture(e);
+  }
+
+  handleTopDrop(e) {
+    // @ts-expect-error -- TSCONVERSION ignoring until we can update react-dnd-html5-backend to get accurate upstream types
+    if (!this.monitor.isDragging() || this.isDraggingNativeItem()) return;
+    super.handleTopDrop(e);
+  }
+}
+
+export default function(manager) {
+  // @ts-expect-error -- TSCONVERSION ignoring until we can update react-dnd-html5-backend to get accurate upstream types
+  return new DNDBackend(manager);
+}
diff --git a/packages/insomnia-app/app/ui/index.js b/packages/insomnia-app/app/ui/index.tsx
similarity index 90%
rename from packages/insomnia-app/app/ui/index.js
rename to packages/insomnia-app/app/ui/index.tsx
index 81cdf564b3..f478b6f022 100644
--- a/packages/insomnia-app/app/ui/index.js
+++ b/packages/insomnia-app/app/ui/index.tsx
@@ -1,10 +1,10 @@
 import { hot } from 'react-hot-loader';
-import * as React from 'react';
+import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
 import App from './containers/app';
 import * as models from '../models';
-import * as db from '../common/database';
+import { database as db } from '../common/database';
 import { init as initStore } from './redux/modules';
 import { init as initPlugins } from '../plugins';
 import './css/index.less';
@@ -14,9 +14,9 @@ import { trackEvent } from '../common/analytics';
 import * as styledComponents from 'styled-components';
 import { initNewOAuthSession } from '../network/o-auth-2/misc';
 import { initializeLogging } from '../common/log';
+import { ipcRenderer } from 'electron';
 
 initializeLogging();
-
 // Handy little helper
 document.body.setAttribute('data-platform', process.platform);
 document.title = getAppLongName();
@@ -24,14 +24,14 @@ document.title = getAppLongName();
 (async function() {
   await db.initClient();
   await initPlugins();
-
   const settings = await models.settings.getOrCreate();
+
   if (settings.clearOAuth2SessionOnRestart) {
     initNewOAuthSession();
   }
+
   await applyColorScheme(settings);
   await setFont(settings);
-
   // Create Redux store
   const store = await initStore();
 
@@ -50,7 +50,9 @@ document.title = getAppLongName();
 
 // Export some useful things for dev
 if (isDevelopment()) {
+  // @ts-expect-error -- TSCONVERSION needs window augmentation
   window.models = models;
+  // @ts-expect-error -- TSCONVERSION needs window augmentation
   window.db = db;
 }
 
@@ -66,7 +68,6 @@ if (window && !isDevelopment()) {
     console.error('Uncaught Error', e);
     trackEvent('Error', 'Uncaught Error');
   });
-
   window.addEventListener('unhandledrejection', e => {
     console.error('Unhandled Promise', e);
     trackEvent('Error', 'Uncaught Promise');
@@ -75,16 +76,15 @@ if (window && !isDevelopment()) {
 
 function showUpdateNotification() {
   console.log('[app] Update Available');
-
   // eslint-disable-next-line no-new
   new window.Notification('Insomnia Update Ready', {
     body: 'Relaunch the app for it to take effect',
     silent: true,
+    // @ts-expect-error -- TSCONVERSION
     sticky: true,
   });
 }
 
-const { ipcRenderer } = require('electron');
 ipcRenderer.on('update-available', () => {
   // Give it a few seconds before showing this. Sometimes, when
   // you relaunch too soon it doesn't work the first time.
diff --git a/packages/insomnia-app/app/ui/redux/__tests__/proto-selectors.test.js b/packages/insomnia-app/app/ui/redux/__tests__/proto-selectors.test.ts
similarity index 68%
rename from packages/insomnia-app/app/ui/redux/__tests__/proto-selectors.test.js
rename to packages/insomnia-app/app/ui/redux/__tests__/proto-selectors.test.ts
index 58aac939e8..75f9a84407 100644
--- a/packages/insomnia-app/app/ui/redux/__tests__/proto-selectors.test.js
+++ b/packages/insomnia-app/app/ui/redux/__tests__/proto-selectors.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { globalBeforeEach } from '../../../__jest__/before-each';
 import { selectExpandedActiveProtoDirectories } from '../proto-selectors';
 import * as models from '../../../models';
@@ -11,11 +9,9 @@ describe('selectExpandedActiveProtoDirectories', () => {
   it('should return empty array if no proto files or directories exist', async () => {
     // Arrange
     const w = await models.workspace.create();
-
     // Act
     const state = await reduxStateForTest(w._id);
     const expandedDirs = selectExpandedActiveProtoDirectories(state);
-
     // Assert
     expect(expandedDirs).toHaveLength(0);
   });
@@ -23,18 +19,25 @@ describe('selectExpandedActiveProtoDirectories', () => {
   it('should return empty array if active workspace is empty', async () => {
     // Arrange workspace
     const w1 = await models.workspace.create();
-    const pd1 = await models.protoDirectory.create({ parentId: w1._id });
-    const pd2 = await models.protoDirectory.create({ parentId: pd1._id });
-    await models.protoFile.create({ parentId: pd1._id });
-    await models.protoFile.create({ parentId: pd2._id });
-    await models.protoFile.create({ parentId: w1._id });
-
+    const pd1 = await models.protoDirectory.create({
+      parentId: w1._id,
+    });
+    const pd2 = await models.protoDirectory.create({
+      parentId: pd1._id,
+    });
+    await models.protoFile.create({
+      parentId: pd1._id,
+    });
+    await models.protoFile.create({
+      parentId: pd2._id,
+    });
+    await models.protoFile.create({
+      parentId: w1._id,
+    });
     const w2 = await models.workspace.create();
-
     // Act
     const state = await reduxStateForTest(w2._id);
     const expandedDirs = selectExpandedActiveProtoDirectories(state);
-
     // Assert
     expect(expandedDirs).toHaveLength(0);
   });
@@ -42,13 +45,15 @@ describe('selectExpandedActiveProtoDirectories', () => {
   it('should return only directories if no proto files exist', async () => {
     // Arrange workspace 1
     const w = await models.workspace.create();
-    const pd1 = await models.protoDirectory.create({ parentId: w._id });
-    const pd2 = await models.protoDirectory.create({ parentId: pd1._id });
-
+    const pd1 = await models.protoDirectory.create({
+      parentId: w._id,
+    });
+    const pd2 = await models.protoDirectory.create({
+      parentId: pd1._id,
+    });
     // Act
     const state = await reduxStateForTest(w._id);
     const expandedDirs = selectExpandedActiveProtoDirectories(state);
-
     // Assert
     expect(expandedDirs).toHaveLength(1);
     expect(expandedDirs).toStrictEqual([
@@ -69,13 +74,15 @@ describe('selectExpandedActiveProtoDirectories', () => {
   it('should return individual files in a null expanded dir', async () => {
     // Arrange
     const w = await models.workspace.create();
-    const pf1 = await models.protoFile.create({ parentId: w._id });
-    const pf2 = await models.protoFile.create({ parentId: w._id });
-
+    const pf1 = await models.protoFile.create({
+      parentId: w._id,
+    });
+    const pf2 = await models.protoFile.create({
+      parentId: w._id,
+    });
     // Act
     const state = await reduxStateForTest(w._id);
     const expandedDirs = selectExpandedActiveProtoDirectories(state);
-
     // Assert
     expect(expandedDirs).toHaveLength(1);
     expect(expandedDirs).toStrictEqual([
@@ -90,15 +97,21 @@ describe('selectExpandedActiveProtoDirectories', () => {
   it('should expand root directories', async () => {
     // Arrange
     const w = await models.workspace.create();
-    const pd1 = await models.protoDirectory.create({ parentId: w._id });
-    const pd2 = await models.protoDirectory.create({ parentId: w._id });
-    const pf1 = await models.protoFile.create({ parentId: pd1._id });
-    const pf2 = await models.protoFile.create({ parentId: pd2._id });
-
+    const pd1 = await models.protoDirectory.create({
+      parentId: w._id,
+    });
+    const pd2 = await models.protoDirectory.create({
+      parentId: w._id,
+    });
+    const pf1 = await models.protoFile.create({
+      parentId: pd1._id,
+    });
+    const pf2 = await models.protoFile.create({
+      parentId: pd2._id,
+    });
     // Act
     const state = await reduxStateForTest(w._id);
     const expandedDirs = selectExpandedActiveProtoDirectories(state);
-
     // Assert
     expect(expandedDirs).toHaveLength(2);
     expect(expandedDirs).toStrictEqual(
@@ -120,15 +133,21 @@ describe('selectExpandedActiveProtoDirectories', () => {
   it('should expand nested directories', async () => {
     // Arrange
     const w = await models.workspace.create();
-    const pd1 = await models.protoDirectory.create({ parentId: w._id });
-    const pd2 = await models.protoDirectory.create({ parentId: pd1._id });
-    const pf1 = await models.protoFile.create({ parentId: pd1._id });
-    const pf2 = await models.protoFile.create({ parentId: pd2._id });
-
+    const pd1 = await models.protoDirectory.create({
+      parentId: w._id,
+    });
+    const pd2 = await models.protoDirectory.create({
+      parentId: pd1._id,
+    });
+    const pf1 = await models.protoFile.create({
+      parentId: pd1._id,
+    });
+    const pf2 = await models.protoFile.create({
+      parentId: pd2._id,
+    });
     // Act
     const state = await reduxStateForTest(w._id);
     const expandedDirs = selectExpandedActiveProtoDirectories(state);
-
     // Assert
     expect(expandedDirs).toHaveLength(1);
     expect(expandedDirs).toStrictEqual([
@@ -149,16 +168,24 @@ describe('selectExpandedActiveProtoDirectories', () => {
   it('should include all individual files and nested directories', async () => {
     // Arrange workspace 1
     const w = await models.workspace.create();
-    const pd1 = await models.protoDirectory.create({ parentId: w._id });
-    const pd2 = await models.protoDirectory.create({ parentId: pd1._id });
-    const pf1 = await models.protoFile.create({ parentId: pd1._id });
-    const pf2 = await models.protoFile.create({ parentId: pd2._id });
-    const pf3 = await models.protoFile.create({ parentId: w._id });
-
+    const pd1 = await models.protoDirectory.create({
+      parentId: w._id,
+    });
+    const pd2 = await models.protoDirectory.create({
+      parentId: pd1._id,
+    });
+    const pf1 = await models.protoFile.create({
+      parentId: pd1._id,
+    });
+    const pf2 = await models.protoFile.create({
+      parentId: pd2._id,
+    });
+    const pf3 = await models.protoFile.create({
+      parentId: w._id,
+    });
     // Act
     const state = await reduxStateForTest(w._id);
     const expandedDirs = selectExpandedActiveProtoDirectories(state);
-
     // Assert
     expect(expandedDirs).toHaveLength(2);
     expect(expandedDirs).toStrictEqual([
diff --git a/packages/insomnia-app/app/ui/redux/__tests__/sidebar-selectors.test.js b/packages/insomnia-app/app/ui/redux/__tests__/sidebar-selectors.test.ts
similarity index 66%
rename from packages/insomnia-app/app/ui/redux/__tests__/sidebar-selectors.test.js
rename to packages/insomnia-app/app/ui/redux/__tests__/sidebar-selectors.test.ts
index f022b53d76..7cccbf62d4 100644
--- a/packages/insomnia-app/app/ui/redux/__tests__/sidebar-selectors.test.js
+++ b/packages/insomnia-app/app/ui/redux/__tests__/sidebar-selectors.test.ts
@@ -12,35 +12,61 @@ describe('shouldShowInSidebar', () => {
   const unsupported = difference(allTypes, supported);
 
   it.each(supported)('should show %s in sidebar', type => {
-    expect(shouldShowInSidebar({ type })).toBe(true);
+    expect(
+      shouldShowInSidebar({
+        type,
+      }),
+    ).toBe(true);
   });
 
   it.each(unsupported)('should not show %s in sidebar', type => {
-    expect(shouldShowInSidebar({ type })).toBe(false);
+    expect(
+      shouldShowInSidebar({
+        type,
+      }),
+    ).toBe(false);
   });
 });
 
 describe('shouldIgnoreChildrenOf', () => {
   it.each([models.request.type, models.grpcRequest.type])('should ignore children of %s', type => {
-    expect(shouldIgnoreChildrenOf({ type })).toBe(true);
+    expect(
+      shouldIgnoreChildrenOf({
+        type,
+      }),
+    ).toBe(true);
   });
 
   it.each([models.requestGroup.type])('should not ignore children of', type => {
-    expect(shouldIgnoreChildrenOf({ type })).toBe(false);
+    expect(
+      shouldIgnoreChildrenOf({
+        type,
+      }),
+    ).toBe(false);
   });
 });
 
 describe('sortByMetaKeyOrId', () => {
   it('sort by _id if meta keys are identical', () => {
-    const a = { _id: 'a', metaSortKey: '1' };
-    const b = { _id: 'b', metaSortKey: '1' };
+    const a = {
+      _id: 'a',
+      metaSortKey: '1',
+    };
+    const b = {
+      _id: 'b',
+      metaSortKey: '1',
+    };
     expect(sortByMetaKeyOrId(a, b)).toBe(1);
     expect(sortByMetaKeyOrId(b, a)).toBe(-1);
   });
 
   it('sort by meta keys', () => {
-    const a = { metaSortKey: '1' };
-    const b = { metaSortKey: '2' };
+    const a = {
+      metaSortKey: '1',
+    };
+    const b = {
+      metaSortKey: '2',
+    };
     expect(sortByMetaKeyOrId(a, b)).toBe(-1);
     expect(sortByMetaKeyOrId(b, a)).toBe(1);
   });
diff --git a/packages/insomnia-app/app/ui/redux/create.js b/packages/insomnia-app/app/ui/redux/create.ts
similarity index 74%
rename from packages/insomnia-app/app/ui/redux/create.js
rename to packages/insomnia-app/app/ui/redux/create.ts
index f7b1560c70..4659fa8fd3 100644
--- a/packages/insomnia-app/app/ui/redux/create.js
+++ b/packages/insomnia-app/app/ui/redux/create.ts
@@ -1,3 +1,4 @@
+/// <reference types="webpack-env" />
 import { createStore, applyMiddleware, compose } from 'redux';
 import thunkMiddleware from 'redux-thunk';
 import { reducer } from './modules';
@@ -6,15 +7,15 @@ export default function() {
   const composeEnhancers =
     typeof window === 'object' && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
       ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({
-          // Specify extension’s options like name, actionsBlacklist, actionsCreators, serialize...
-        })
+        // Specify extension’s options like name, actionsBlacklist, actionsCreators, serialize...
+      })
       : compose;
   const middleware = [thunkMiddleware];
   const enhancer = composeEnhancers(
-    applyMiddleware(...middleware),
-    // other store enhancers if any
+    applyMiddleware(...middleware), // other store enhancers if any
   );
   const store = createStore(reducer, enhancer);
+
   if (__DEV__ && module.hot) {
     module.hot.accept('./modules/index', () => {
       store.replaceReducer(reducer);
diff --git a/packages/insomnia-app/app/ui/redux/modules/__tests__/git.test.js b/packages/insomnia-app/app/ui/redux/modules/__tests__/git.test.tsx
similarity index 80%
rename from packages/insomnia-app/app/ui/redux/modules/__tests__/git.test.js
rename to packages/insomnia-app/app/ui/redux/modules/__tests__/git.test.tsx
index 51443ff09f..aa38b8c669 100644
--- a/packages/insomnia-app/app/ui/redux/modules/__tests__/git.test.js
+++ b/packages/insomnia-app/app/ui/redux/modules/__tests__/git.test.tsx
@@ -1,8 +1,7 @@
-// @flow
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { globalBeforeEach } from '../../../../__jest__/before-each';
-import { WorkspaceScopeKeys } from '../../../../models/workspace';
+import { Workspace, WorkspaceScopeKeys } from '../../../../models/workspace';
 import * as models from '../../../../models';
 import { trackEvent, trackSegmentEvent } from '../../../../common/analytics';
 import { ACTIVITY_SPEC } from '../../../../common/constants';
@@ -11,7 +10,7 @@ import { MemClient } from '../../../../sync/git/mem-client';
 import { generateId } from '../../../../common/misc';
 import { GIT_INSOMNIA_DIR } from '../../../../sync/git/git-vcs';
 import path from 'path';
-import * as React from 'react';
+import React, { Fragment } from 'react';
 import { cloneGitRepository, setupGitRepository } from '../git';
 import {
   getAndClearShowAlertMockArgs,
@@ -34,15 +33,12 @@ describe('git', () => {
     await globalBeforeEach();
     store = mockStore();
   });
-
   // Check loading events
   afterEach(() => {
     const actions = store.getActions();
-
     // Should always contain one LOAD_START and one LOAD_END
     expect(actions.filter(({ type }) => type === LOAD_START)).toHaveLength(1);
     expect(actions.filter(({ type }) => type === LOAD_STOP)).toHaveLength(1);
-
     // LOAD_START should never be before LOAD_STOP
     const startActionIndex = actions.findIndex(({ type }) => type === LOAD_START);
     const stopActionIndex = actions.findIndex(({ type }) => type === LOAD_STOP);
@@ -50,13 +46,15 @@ describe('git', () => {
   });
 
   describe('cloneGitRepository', () => {
-    const dispatchCloneAndSubmitSettings = async (memClient: Object, uri?: string) => {
+    const dispatchCloneAndSubmitSettings = async (memClient: Record<string, any>, uri?: string) => {
       const createFsClientMock = jest.fn().mockReturnValue(memClient);
       // dispatch clone action
-      store.dispatch(cloneGitRepository({ createFsClient: createFsClientMock }));
-
+      store.dispatch(
+        cloneGitRepository({
+          createFsClient: createFsClientMock,
+        }),
+      );
       const { onSubmitEdits } = getAndClearShowModalMockArgs();
-
       // Submit GitRepositorySettingsModal with repo settings
       const repoSettings = models.gitRepository.init();
       repoSettings._id = generateId(models.gitRepository.prefix);
@@ -66,14 +64,15 @@ describe('git', () => {
       }
 
       await onSubmitEdits(repoSettings);
-      return { repoSettings, createFsClientMock };
+      return {
+        repoSettings,
+        createFsClientMock,
+      };
     };
 
     const shouldPromptToCreateWorkspace = async memClient => {
       const { repoSettings } = await dispatchCloneAndSubmitSettings(memClient);
-
       expect(trackEvent).toHaveBeenCalledWith('Git', 'Clone');
-
       // show alert asking to create a document
       const alertArgs = getAndClearShowAlertMockArgs();
       expect(alertArgs.title).toBe('No document found');
@@ -82,51 +81,52 @@ describe('git', () => {
       expect(alertArgs.message).toBe(
         'No document found in the repository for import. Would you like to create a new one?',
       );
-
       // Confirm
       await alertArgs.onConfirm();
-
       // Should show new design doc prompt
       const promptArgs = getAndClearShowPromptMockArgs();
       expect(promptArgs.title).toBe('Create New Design Document');
-
       // Submit new design doc name
       await promptArgs.onComplete('name');
-
       // Ensure workspace created
       const workspaces = await models.workspace.all();
       expect(workspaces).toHaveLength(1);
       const workspace = workspaces[0];
       expect(workspace.name).toBe('name');
       expect(workspace.scope).toBe(WorkspaceScopeKeys.design);
-
       // Ensure git repo is linked
       const meta = await models.workspaceMeta.getByParentId(workspace._id);
       expect(meta.gitRepositoryId).toBe(repoSettings._id);
-
       // Ensure tracking events
       expect(trackSegmentEvent).toHaveBeenCalledWith('Document Created');
       expect(trackEvent).toHaveBeenCalledWith('Workspace', 'Create');
-
       // Ensure activity is activated
       expect(store.getActions()).toEqual([
-        { type: LOAD_START },
-        { type: LOAD_STOP },
-        { type: SET_ACTIVE_WORKSPACE, workspaceId: workspace._id },
-        { type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_SPEC },
+        {
+          type: LOAD_START,
+        },
+        {
+          type: LOAD_STOP,
+        },
+        {
+          type: SET_ACTIVE_WORKSPACE,
+          workspaceId: workspace._id,
+        },
+        {
+          type: SET_ACTIVE_ACTIVITY,
+          activity: ACTIVITY_SPEC,
+        },
       ]);
     };
 
     it('should prompt to create workspace if no GIT_INSOMNIA_DIR found', async () => {
       const memClient = MemClient.createClient();
-
       await shouldPromptToCreateWorkspace(memClient);
     });
 
     it('should prompt to create workspace if no GIT_INSOMNIA_DIR/workspace found', async () => {
       const memClient = MemClient.createClient();
       await memClient.promises.mkdir(GIT_INSOMNIA_DIR);
-
       await shouldPromptToCreateWorkspace(memClient);
     });
 
@@ -134,87 +134,90 @@ describe('git', () => {
       const memClient = MemClient.createClient();
       await memClient.promises.mkdir(GIT_INSOMNIA_DIR);
       await memClient.promises.mkdir(path.join(GIT_INSOMNIA_DIR, models.workspace.type));
-
       await shouldPromptToCreateWorkspace(memClient);
     });
 
     it('should fail if multiple workspaces found', async () => {
       const memClient = MemClient.createClient();
-
       await memClient.promises.mkdir(GIT_INSOMNIA_DIR);
       await memClient.promises.mkdir(path.join(GIT_INSOMNIA_DIR, models.workspace.type));
-
       const wrk1Json = path.join(GIT_INSOMNIA_DIR, models.workspace.type, 'wrk_1.json');
       const wrk2Json = path.join(GIT_INSOMNIA_DIR, models.workspace.type, 'wrk_2.json');
-
       await memClient.promises.writeFile(wrk1Json, '{}');
       await memClient.promises.writeFile(wrk2Json, '{}');
-
       await dispatchCloneAndSubmitSettings(memClient);
-
       const alertArgs = getAndClearShowAlertMockArgs();
       expect(alertArgs.title).toBe('Clone Problem');
       expect(alertArgs.message).toBe('Multiple workspaces found in repository; expected one.');
-
       // Ensure activity is activated
-      expect(store.getActions()).toEqual([{ type: LOAD_START }, { type: LOAD_STOP }]);
+      expect(store.getActions()).toEqual([
+        {
+          type: LOAD_START,
+        },
+        {
+          type: LOAD_STOP,
+        },
+      ]);
     });
 
     it('should fail if workspace already exists', async () => {
       const memClient = MemClient.createClient();
-
       await memClient.promises.mkdir(GIT_INSOMNIA_DIR);
       await memClient.promises.mkdir(path.join(GIT_INSOMNIA_DIR, models.workspace.type));
-
       const workspace = await models.workspace.create();
       const workspaceJson = path.join(
         GIT_INSOMNIA_DIR,
         models.workspace.type,
         `${workspace._id}.json`,
       );
-
       await memClient.promises.writeFile(workspaceJson, JSON.stringify(workspace));
       await dispatchCloneAndSubmitSettings(memClient);
-
       const alertArgs = getAndClearShowAlertMockArgs();
       expect(alertArgs.title).toBe('Clone Problem');
       expect(alertArgs.message).toStrictEqual(
-        <React.Fragment>
+        <Fragment>
           Workspace <strong>New Collection</strong> already exists. Please delete it before cloning.
-        </React.Fragment>,
+        </Fragment>,
       );
-
       // Ensure activity is activated
-      expect(store.getActions()).toEqual([{ type: LOAD_START }, { type: LOAD_STOP }]);
+      expect(store.getActions()).toEqual([
+        {
+          type: LOAD_START,
+        },
+        {
+          type: LOAD_STOP,
+        },
+      ]);
     });
 
     it('should fail if exception during clone and not try again if uri ends with .git', async () => {
       const memClient = MemClient.createClient();
       const err = new Error('some error');
-      (shallowClone: JestMockFn).mockRejectedValue(err);
-
+      (shallowClone as jest.Mock).mockRejectedValue(err);
       await dispatchCloneAndSubmitSettings(memClient, 'https://git.com.git');
-
       const alertArgs = getAndClearShowAlertMockArgs();
       expect(alertArgs.title).toBe('Error Cloning Repository');
       expect(alertArgs.message).toBe(err.message);
-
-      expect(store.getActions()).toEqual([{ type: LOAD_START }, { type: LOAD_STOP }]);
+      expect(store.getActions()).toEqual([
+        {
+          type: LOAD_START,
+        },
+        {
+          type: LOAD_STOP,
+        },
+      ]);
       expect(shallowClone).toHaveBeenCalledTimes(1);
     });
 
     it('should show combined error if clone with and without .git suffix fails', async () => {
       const memClient = MemClient.createClient();
       const firstError = new Error('first error');
-      (shallowClone: JestMockFn).mockRejectedValueOnce(firstError);
+      (shallowClone as jest.Mock).mockRejectedValueOnce(firstError);
       const secondError = new Error('second error');
-      (shallowClone: JestMockFn).mockRejectedValueOnce(secondError);
-
+      (shallowClone as jest.Mock).mockRejectedValueOnce(secondError);
       const uri = 'https://git.com';
       const dotGitUri = `${uri}.git`;
-
       await dispatchCloneAndSubmitSettings(memClient, uri);
-
       const alertArgs = getAndClearShowAlertMockArgs();
       expect(alertArgs.title).toBe(
         'Error Cloning Repository: failed to clone with and without `.git` suffix',
@@ -222,8 +225,14 @@ describe('git', () => {
       expect(alertArgs.message).toBe(
         `Failed to clone with original url (${uri}): ${firstError.message};\n\nAlso failed to clone with \`.git\` suffix added (${dotGitUri}): ${secondError.message}`,
       );
-
-      expect(store.getActions()).toEqual([{ type: LOAD_START }, { type: LOAD_STOP }]);
+      expect(store.getActions()).toEqual([
+        {
+          type: LOAD_START,
+        },
+        {
+          type: LOAD_STOP,
+        },
+      ]);
       expect(shallowClone).toHaveBeenCalledTimes(2);
     });
 
@@ -232,9 +241,10 @@ describe('git', () => {
       await memClient.promises.mkdir(GIT_INSOMNIA_DIR);
       await memClient.promises.mkdir(path.join(GIT_INSOMNIA_DIR, models.workspace.type));
       await memClient.promises.mkdir(path.join(GIT_INSOMNIA_DIR, models.apiSpec.type));
-
       // Write workspace file
-      const workspace = await models.workspace.create({ scope: WorkspaceScopeKeys.design });
+      const workspace = await models.workspace.create({
+        scope: WorkspaceScopeKeys.design,
+      });
       const workspaceJson = path.join(
         GIT_INSOMNIA_DIR,
         models.workspace.type,
@@ -242,13 +252,15 @@ describe('git', () => {
       );
       await models.workspace.remove(workspace);
       await memClient.promises.writeFile(workspaceJson, JSON.stringify(workspace));
-
       // Write ApiSpec file
       const apiSpec = await models.apiSpec.getOrCreateForParentId(workspace._id);
       const apiSpecJson = path.join(GIT_INSOMNIA_DIR, models.apiSpec.type, `${apiSpec._id}.json`);
       await models.apiSpec.removeWhere(workspace._id);
       await memClient.promises.writeFile(apiSpecJson, JSON.stringify(apiSpec));
-      return { workspace, apiSpec };
+      return {
+        workspace,
+        apiSpec,
+      };
     };
 
     const confirmImport = async workspace => {
@@ -256,34 +268,29 @@ describe('git', () => {
       expect(alertArgs.title).toBe('Project Found');
       expect(alertArgs.okLabel).toBe('Import');
       expect(alertArgs.message).toStrictEqual(
-        <React.Fragment>
+        <Fragment>
           Workspace <strong>{workspace.name}</strong> found in repository. Would you like to import
           it?
-        </React.Fragment>,
+        </Fragment>,
       );
-
       await alertArgs.onConfirm();
     };
 
     it('should retry clone with .git suffix and succeed', async () => {
       const memClient = MemClient.createClient();
       const { workspace } = await createValidRepoFiles(memClient);
-
       // Mock clone
       const err = new Error('some error');
-      (shallowClone: JestMockFn).mockRejectedValueOnce(err);
-      (shallowClone: JestMockFn).mockResolvedValueOnce();
-
+      (shallowClone as jest.Mock).mockRejectedValueOnce(err);
+      (shallowClone as jest.Mock).mockResolvedValueOnce();
       // Dispatch
       const uri = 'https://git.com/abc/def';
       const { createFsClientMock, repoSettings } = await dispatchCloneAndSubmitSettings(
         memClient,
         uri,
       );
-
       // Show confirmation
       await confirmImport(workspace);
-
       // Expect clone called twice
       expect(createFsClientMock).toHaveBeenCalledTimes(2);
       expect(shallowClone).toHaveBeenCalledTimes(2);
@@ -305,7 +312,6 @@ describe('git', () => {
           }),
         }),
       );
-
       // Because second clone succeeds, store the updated URL
       const createdRepo = await models.gitRepository.getById(repoSettings._id);
       expect(createdRepo.needsFullClone).toBe(true);
@@ -315,48 +321,54 @@ describe('git', () => {
     it('should import workspace and apiSpec', async () => {
       const memClient = MemClient.createClient();
       const { workspace, apiSpec } = await createValidRepoFiles(memClient);
-
       // Clone
       const { repoSettings } = await dispatchCloneAndSubmitSettings(memClient);
-
       // Show confirmation
       await confirmImport(workspace);
-
       // Ensure workspace imported
       const workspaces = await models.workspace.all();
       expect(workspaces).toHaveLength(1);
       const clonedWorkspace = workspaces[0];
       expect(clonedWorkspace).toStrictEqual(workspace);
-
       // Ensure ApiSpec imported
       const apiSpecs = await models.apiSpec.all();
       expect(apiSpecs).toHaveLength(1);
       const clonedApiSpec = apiSpecs[0];
       expect(clonedApiSpec).toStrictEqual(apiSpec);
-
       // Ensure git repo is linked
       const meta = await models.workspaceMeta.getByParentId(workspace._id);
       expect(meta.gitRepositoryId).toBe(repoSettings._id);
-
       const createdRepo = await models.gitRepository.getById(repoSettings._id);
       expect(createdRepo.needsFullClone).toBe(true);
-
       // Ensure workspace is enabled
       expect(store.getActions()).toEqual([
-        { type: LOAD_START },
-        { type: SET_ACTIVE_WORKSPACE, workspaceId: workspace._id },
-        { type: LOAD_STOP },
+        {
+          type: LOAD_START,
+        },
+        {
+          type: SET_ACTIVE_WORKSPACE,
+          workspaceId: workspace._id,
+        },
+        {
+          type: LOAD_STOP,
+        },
       ]);
     });
   });
 
   describe('setupGitRepository', () => {
-    const dispatchSetupAndSubmitSettings = async (memClient: Object, workspace: Workspace) => {
+    const dispatchSetupAndSubmitSettings = async (
+      memClient: Record<string, any>,
+      workspace: Workspace,
+    ) => {
       // dispatch clone action
-      store.dispatch(setupGitRepository({ createFsClient: () => memClient, workspace }));
-
+      store.dispatch(
+        setupGitRepository({
+          createFsClient: () => memClient,
+          workspace,
+        }),
+      );
       const { onSubmitEdits } = getAndClearShowModalMockArgs();
-
       // Submit GitRepositorySettingsModal with repo settings
       const repoSettings = models.gitRepository.init();
       repoSettings._id = generateId(models.gitRepository.prefix);
@@ -366,98 +378,119 @@ describe('git', () => {
 
     it('should fail if exception during clone', async () => {
       const memClient = MemClient.createClient();
-      const workspace = await models.workspace.create({ scope: WorkspaceScopeKeys.design });
-
+      const workspace = await models.workspace.create({
+        scope: WorkspaceScopeKeys.design,
+      });
       const err = new Error('some error');
-      (shallowClone: JestMockFn).mockRejectedValue(err);
-
+      (shallowClone as jest.Mock).mockRejectedValue(err);
       await dispatchSetupAndSubmitSettings(memClient, workspace);
       const errorArgs = getAndClearShowErrorMockArgs();
-
       expect(errorArgs.title).toBe('Error Cloning Repository');
       expect(errorArgs.message).toBe(err.message);
       expect(errorArgs.error).toBe(err);
-
       // Ensure activity is activated
-      expect(store.getActions()).toEqual([{ type: LOAD_START }, { type: LOAD_STOP }]);
+      expect(store.getActions()).toEqual([
+        {
+          type: LOAD_START,
+        },
+        {
+          type: LOAD_STOP,
+        },
+      ]);
     });
 
     it('should fail if workspace is found', async () => {
       const memClient = MemClient.createClient();
-      const workspace = await models.workspace.create({ scope: WorkspaceScopeKeys.design });
-
+      const workspace = await models.workspace.create({
+        scope: WorkspaceScopeKeys.design,
+      });
       await memClient.promises.mkdir(GIT_INSOMNIA_DIR);
       await memClient.promises.mkdir(path.join(GIT_INSOMNIA_DIR, models.workspace.type));
-
       const wrk1Json = path.join(GIT_INSOMNIA_DIR, models.workspace.type, 'wrk_1.json');
       const wrk2Json = path.join(GIT_INSOMNIA_DIR, models.workspace.type, 'wrk_2.json');
-
       await memClient.promises.writeFile(wrk1Json, '{}');
       await memClient.promises.writeFile(wrk2Json, '{}');
-
       await dispatchSetupAndSubmitSettings(memClient, workspace);
-
       const alertArgs = getAndClearShowAlertMockArgs();
       expect(alertArgs.title).toBe('Setup Problem');
       expect(alertArgs.message).toBe(
         'This repository already contains a workspace; create a fresh clone from the dashboard.',
       );
-
       // Ensure activity is activated
-      expect(store.getActions()).toEqual([{ type: LOAD_START }, { type: LOAD_STOP }]);
+      expect(store.getActions()).toEqual([
+        {
+          type: LOAD_START,
+        },
+        {
+          type: LOAD_STOP,
+        },
+      ]);
     });
 
     it('should setup if no .insomnia directory is found', async () => {
       const memClient = MemClient.createClient();
-      const workspace = await models.workspace.create({ scope: WorkspaceScopeKeys.design });
-
+      const workspace = await models.workspace.create({
+        scope: WorkspaceScopeKeys.design,
+      });
       const repo = await dispatchSetupAndSubmitSettings(memClient, workspace);
-
       const wMeta = await models.workspaceMeta.getByParentId(workspace._id);
       expect(wMeta.gitRepositoryId).toBe(repo._id);
-
       const createdRepo = await models.gitRepository.getById(repo._id);
       expect(createdRepo.needsFullClone).toBe(true);
-
       // Ensure activity is activated
-      expect(store.getActions()).toEqual([{ type: LOAD_START }, { type: LOAD_STOP }]);
+      expect(store.getActions()).toEqual([
+        {
+          type: LOAD_START,
+        },
+        {
+          type: LOAD_STOP,
+        },
+      ]);
     });
 
     it('should setup if empty .insomnia directory is found', async () => {
       const memClient = MemClient.createClient();
-      const workspace = await models.workspace.create({ scope: WorkspaceScopeKeys.design });
-
+      const workspace = await models.workspace.create({
+        scope: WorkspaceScopeKeys.design,
+      });
       await memClient.promises.mkdir(GIT_INSOMNIA_DIR);
-
       const repo = await dispatchSetupAndSubmitSettings(memClient, workspace);
-
       const wMeta = await models.workspaceMeta.getByParentId(workspace._id);
       expect(wMeta.gitRepositoryId).toBe(repo._id);
-
       const createdRepo = await models.gitRepository.getById(repo._id);
       expect(createdRepo.needsFullClone).toBe(true);
-
       // Ensure activity is activated
-      expect(store.getActions()).toEqual([{ type: LOAD_START }, { type: LOAD_STOP }]);
+      expect(store.getActions()).toEqual([
+        {
+          type: LOAD_START,
+        },
+        {
+          type: LOAD_STOP,
+        },
+      ]);
     });
 
     it('should setup if empty .insomnia/workspace directory is found', async () => {
       const memClient = MemClient.createClient();
-      const workspace = await models.workspace.create({ scope: WorkspaceScopeKeys.design });
-
+      const workspace = await models.workspace.create({
+        scope: WorkspaceScopeKeys.design,
+      });
       await memClient.promises.mkdir(GIT_INSOMNIA_DIR);
       await memClient.promises.mkdir(path.join(GIT_INSOMNIA_DIR, models.workspace.type));
-
       const repo = await dispatchSetupAndSubmitSettings(memClient, workspace);
-
       const wMeta = await models.workspaceMeta.getByParentId(workspace._id);
       expect(wMeta.gitRepositoryId).toBe(repo._id);
-
       const createdRepo = await models.gitRepository.getById(repo._id);
       expect(createdRepo.needsFullClone).toBe(true);
-
       // Ensure activity is activated
-      expect(store.getActions()).toEqual([{ type: LOAD_START }, { type: LOAD_STOP }]);
+      expect(store.getActions()).toEqual([
+        {
+          type: LOAD_START,
+        },
+        {
+          type: LOAD_STOP,
+        },
+      ]);
     });
   });
 });
diff --git a/packages/insomnia-app/app/ui/redux/modules/__tests__/global.test.js b/packages/insomnia-app/app/ui/redux/modules/__tests__/global.test.ts
similarity index 70%
rename from packages/insomnia-app/app/ui/redux/modules/__tests__/global.test.js
rename to packages/insomnia-app/app/ui/redux/modules/__tests__/global.test.ts
index 178393d410..da04224fa7 100644
--- a/packages/insomnia-app/app/ui/redux/modules/__tests__/global.test.js
+++ b/packages/insomnia-app/app/ui/redux/modules/__tests__/global.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { globalBeforeEach } from '../../../../__jest__/before-each';
@@ -24,10 +23,9 @@ import {
   setActiveActivity,
   setActiveWorkspace,
 } from '../global';
-
 import * as models from '../../../../models';
 import fs from 'fs';
-import { getDesignerDataDir } from '../../../../common/misc';
+import { getDesignerDataDir } from '../../../../common/electron-helpers';
 
 jest.mock('../../../../common/analytics');
 
@@ -48,7 +46,6 @@ const createSettings = (
 
 describe('global', () => {
   let fsExistsSyncSpy;
-
   beforeEach(async () => {
     await globalBeforeEach();
     jest.resetAllMocks();
@@ -65,8 +62,10 @@ describe('global', () => {
       ACTIVITY_ONBOARDING,
       ACTIVITY_MIGRATION,
     ])('should update local storage and track event: %s', (activity: GlobalActivity) => {
-      const expectedEvent = { type: SET_ACTIVE_ACTIVITY, activity };
-
+      const expectedEvent = {
+        type: SET_ACTIVE_ACTIVITY,
+        activity,
+      };
       expect(setActiveActivity(activity)).toStrictEqual(expectedEvent);
       expect(trackEvent).toHaveBeenCalledWith('Activity', 'Change', activity);
       expect(global.localStorage.getItem(`${LOCALSTORAGE_PREFIX}::activity`)).toBe(
@@ -79,9 +78,7 @@ describe('global', () => {
         hasPromptedToMigrateFromDesigner: false,
         hasPromptedOnboarding: false,
       });
-
       setActiveActivity(ACTIVITY_ONBOARDING);
-
       // We don't await the settings update in the action creator
       // so wait for it to update before checking
       await new Promise(resolve => setTimeout(resolve, 10));
@@ -95,9 +92,7 @@ describe('global', () => {
         hasPromptedToMigrateFromDesigner: false,
         hasPromptedOnboarding: false,
       });
-
       setActiveActivity(ACTIVITY_MIGRATION);
-
       // We don't await the settings update in the action creator
       // so wait for it to update before checking
       await new Promise(resolve => setTimeout(resolve, 10));
@@ -110,8 +105,10 @@ describe('global', () => {
   describe('setActiveWorkspace', () => {
     it('should update local storage', () => {
       const workspaceId = 'id';
-      const expectedEvent = { type: SET_ACTIVE_WORKSPACE, workspaceId };
-
+      const expectedEvent = {
+        type: SET_ACTIVE_WORKSPACE,
+        workspaceId,
+      };
       expect(setActiveWorkspace(workspaceId)).toStrictEqual(expectedEvent);
       expect(global.localStorage.getItem(`${LOCALSTORAGE_PREFIX}::activeWorkspaceId`)).toBe(
         JSON.stringify(workspaceId),
@@ -122,55 +119,96 @@ describe('global', () => {
   describe('goToNextActivity', () => {
     it('should go from onboarding to home', async () => {
       const settings = createSettings(false, false, true);
-
       const activeActivity = ACTIVITY_ONBOARDING;
-      const store = mockStore({ global: { activeActivity }, entities: { settings: [settings] } });
-
+      const store = mockStore({
+        global: {
+          activeActivity,
+        },
+        entities: {
+          settings: [settings],
+        },
+      });
       await store.dispatch(goToNextActivity());
-      expect(store.getActions()).toEqual([{ type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_HOME }]);
+      expect(store.getActions()).toEqual([
+        {
+          type: SET_ACTIVE_ACTIVITY,
+          activity: ACTIVITY_HOME,
+        },
+      ]);
     });
 
     it('should go from migration to onboarding', async () => {
       const settings = createSettings(false, false, true);
-
       const activeActivity = ACTIVITY_MIGRATION;
-      const store = mockStore({ global: { activeActivity }, entities: { settings: [settings] } });
-
+      const store = mockStore({
+        global: {
+          activeActivity,
+        },
+        entities: {
+          settings: [settings],
+        },
+      });
       await store.dispatch(goToNextActivity());
       expect(store.getActions()).toEqual([
-        { type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_ONBOARDING },
+        {
+          type: SET_ACTIVE_ACTIVITY,
+          activity: ACTIVITY_ONBOARDING,
+        },
       ]);
     });
 
     it('should go from migration to analytics', async () => {
       const settings = createSettings(false, true, false);
-
       const activeActivity = ACTIVITY_MIGRATION;
-      const store = mockStore({ global: { activeActivity }, entities: { settings: [settings] } });
-
+      const store = mockStore({
+        global: {
+          activeActivity,
+        },
+        entities: {
+          settings: [settings],
+        },
+      });
       await store.dispatch(goToNextActivity());
       expect(store.getActions()).toEqual([
-        { type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_ANALYTICS },
+        {
+          type: SET_ACTIVE_ACTIVITY,
+          activity: ACTIVITY_ANALYTICS,
+        },
       ]);
     });
 
     it('should go from migration to home', async () => {
       const settings = createSettings(true, true, true);
-
       const activeActivity = ACTIVITY_MIGRATION;
-      const store = mockStore({ global: { activeActivity }, entities: { settings: [settings] } });
-
+      const store = mockStore({
+        global: {
+          activeActivity,
+        },
+        entities: {
+          settings: [settings],
+        },
+      });
       await store.dispatch(goToNextActivity());
-      expect(store.getActions()).toEqual([{ type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_HOME }]);
+      expect(store.getActions()).toEqual([
+        {
+          type: SET_ACTIVE_ACTIVITY,
+          activity: ACTIVITY_HOME,
+        },
+      ]);
     });
 
     it.each([ACTIVITY_SPEC, ACTIVITY_DEBUG, ACTIVITY_UNIT_TEST, ACTIVITY_HOME])(
       'should not change activity from: %s',
       async (activeActivity: GlobalActivity) => {
         const settings = createSettings(false, true, true);
-
-        const store = mockStore({ global: { activeActivity }, entities: { settings: [settings] } });
-
+        const store = mockStore({
+          global: {
+            activeActivity,
+          },
+          entities: {
+            settings: [settings],
+          },
+        });
         await store.dispatch(goToNextActivity());
         expect(store.getActions()).toEqual([]);
       },
@@ -184,8 +222,10 @@ describe('global', () => {
         `${LOCALSTORAGE_PREFIX}::activeWorkspaceId`,
         JSON.stringify(workspaceId),
       );
-      const expectedEvent = { type: SET_ACTIVE_WORKSPACE, workspaceId };
-
+      const expectedEvent = {
+        type: SET_ACTIVE_WORKSPACE,
+        workspaceId,
+      };
       expect(initActiveWorkspace()).toStrictEqual(expectedEvent);
     });
   });
@@ -200,38 +240,53 @@ describe('global', () => {
       ACTIVITY_ANALYTICS,
     ])('should initialize %s from local storage', async activity => {
       const settings = createSettings(true, true, true);
-
-      const store = mockStore({ global: {}, entities: { settings: [settings] } });
-
+      const store = mockStore({
+        global: {},
+        entities: {
+          settings: [settings],
+        },
+      });
       global.localStorage.setItem(`${LOCALSTORAGE_PREFIX}::activity`, JSON.stringify(activity));
-      const expectedEvent = { type: SET_ACTIVE_ACTIVITY, activity };
-
+      const expectedEvent = {
+        type: SET_ACTIVE_ACTIVITY,
+        activity,
+      };
       await store.dispatch(initActiveActivity());
       expect(store.getActions()).toEqual([expectedEvent]);
     });
 
     it('should initialize from local storage and migrate deprecated activity', async () => {
       const settings = createSettings(true, true, true);
-
-      const store = mockStore({ global: {}, entities: { settings: [settings] } });
-
+      const store = mockStore({
+        global: {},
+        entities: {
+          settings: [settings],
+        },
+      });
       const activity = DEPRECATED_ACTIVITY_INSOMNIA;
       global.localStorage.setItem(`${LOCALSTORAGE_PREFIX}::activity`, JSON.stringify(activity));
-      const expectedEvent = { type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_DEBUG };
-
+      const expectedEvent = {
+        type: SET_ACTIVE_ACTIVITY,
+        activity: ACTIVITY_DEBUG,
+      };
       await store.dispatch(initActiveActivity());
       expect(store.getActions()).toEqual([expectedEvent]);
     });
 
     it('should go to onboarding if initialized at migration', async () => {
       const settings = createSettings(true, false, true);
-
-      const store = mockStore({ global: {}, entities: { settings: [settings] } });
-
+      const store = mockStore({
+        global: {},
+        entities: {
+          settings: [settings],
+        },
+      });
       const activity = ACTIVITY_MIGRATION;
       global.localStorage.setItem(`${LOCALSTORAGE_PREFIX}::activity`, JSON.stringify(activity));
-      const expectedEvent = { type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_ONBOARDING };
-
+      const expectedEvent = {
+        type: SET_ACTIVE_ACTIVITY,
+        activity: ACTIVITY_ONBOARDING,
+      };
       await store.dispatch(initActiveActivity());
       expect(store.getActions()).toEqual([expectedEvent]);
     });
@@ -242,36 +297,51 @@ describe('global', () => {
       undefined,
     )('should go to home if initialized with an unsupported value: %s', async activity => {
       const settings = createSettings(true, true, true);
-
-      const store = mockStore({ global: {}, entities: { settings: [settings] } });
-
+      const store = mockStore({
+        global: {},
+        entities: {
+          settings: [settings],
+        },
+      });
       global.localStorage.setItem(`${LOCALSTORAGE_PREFIX}::activity`, JSON.stringify(activity));
-      const expectedEvent = { type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_HOME };
-
+      const expectedEvent = {
+        type: SET_ACTIVE_ACTIVITY,
+        activity: ACTIVITY_HOME,
+      };
       await store.dispatch(initActiveActivity());
       expect(store.getActions()).toEqual([expectedEvent]);
     });
 
     it('should go to home if local storage key not found', async () => {
       const settings = createSettings(true, true, true);
-
-      const store = mockStore({ global: {}, entities: { settings: [settings] } });
-
-      const expectedEvent = { type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_HOME };
-
+      const store = mockStore({
+        global: {},
+        entities: {
+          settings: [settings],
+        },
+      });
+      const expectedEvent = {
+        type: SET_ACTIVE_ACTIVITY,
+        activity: ACTIVITY_HOME,
+      };
       await store.dispatch(initActiveActivity());
       expect(store.getActions()).toEqual([expectedEvent]);
     });
 
     it('should go to home if initialized at migration and onboarding seen', async () => {
       const settings = createSettings(true, true, true);
-
-      const store = mockStore({ global: {}, entities: { settings: [settings] } });
-
+      const store = mockStore({
+        global: {},
+        entities: {
+          settings: [settings],
+        },
+      });
       const activity = ACTIVITY_MIGRATION;
       global.localStorage.setItem(`${LOCALSTORAGE_PREFIX}::activity`, JSON.stringify(activity));
-      const expectedEvent = { type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_HOME };
-
+      const expectedEvent = {
+        type: SET_ACTIVE_ACTIVITY,
+        activity: ACTIVITY_HOME,
+      };
       await store.dispatch(initActiveActivity());
       expect(store.getActions()).toEqual([expectedEvent]);
     });
@@ -279,13 +349,18 @@ describe('global', () => {
     it('should prompt to migrate', async () => {
       const settings = createSettings(false, true, true);
       fsExistsSyncSpy.mockReturnValue(true);
-
-      const store = mockStore({ global: {}, entities: { settings: [settings] } });
-
+      const store = mockStore({
+        global: {},
+        entities: {
+          settings: [settings],
+        },
+      });
       const activity = ACTIVITY_HOME;
       global.localStorage.setItem(`${LOCALSTORAGE_PREFIX}::activity`, JSON.stringify(activity));
-      const expectedEvent = { type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_MIGRATION };
-
+      const expectedEvent = {
+        type: SET_ACTIVE_ACTIVITY,
+        activity: ACTIVITY_MIGRATION,
+      };
       await store.dispatch(initActiveActivity());
       expect(store.getActions()).toEqual([expectedEvent]);
       expect(fsExistsSyncSpy).toHaveBeenCalledWith(getDesignerDataDir());
@@ -294,13 +369,18 @@ describe('global', () => {
     it('should not prompt to migrate if default directory not found', async () => {
       const settings = createSettings(false, true, true);
       fsExistsSyncSpy.mockReturnValue(false);
-
-      const store = mockStore({ global: {}, entities: { settings: [settings] } });
-
+      const store = mockStore({
+        global: {},
+        entities: {
+          settings: [settings],
+        },
+      });
       const activity = ACTIVITY_HOME;
       global.localStorage.setItem(`${LOCALSTORAGE_PREFIX}::activity`, JSON.stringify(activity));
-      const expectedEvent = { type: SET_ACTIVE_ACTIVITY, activity };
-
+      const expectedEvent = {
+        type: SET_ACTIVE_ACTIVITY,
+        activity,
+      };
       await store.dispatch(initActiveActivity());
       expect(store.getActions()).toEqual([expectedEvent]);
       expect(fsExistsSyncSpy).toHaveBeenCalledWith(getDesignerDataDir());
@@ -308,26 +388,36 @@ describe('global', () => {
 
     it('should prompt to onboard', async () => {
       const settings = createSettings(true, false, true);
-
-      const store = mockStore({ global: {}, entities: { settings: [settings] } });
-
+      const store = mockStore({
+        global: {},
+        entities: {
+          settings: [settings],
+        },
+      });
       const activity = ACTIVITY_HOME;
       global.localStorage.setItem(`${LOCALSTORAGE_PREFIX}::activity`, JSON.stringify(activity));
-      const expectedEvent = { type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_ONBOARDING };
-
+      const expectedEvent = {
+        type: SET_ACTIVE_ACTIVITY,
+        activity: ACTIVITY_ONBOARDING,
+      };
       await store.dispatch(initActiveActivity());
       expect(store.getActions()).toEqual([expectedEvent]);
     });
 
     it('should prompt to change analytics settings', async () => {
       const settings = createSettings(true, true, false);
-
-      const store = mockStore({ global: {}, entities: { settings: [settings] } });
-
+      const store = mockStore({
+        global: {},
+        entities: {
+          settings: [settings],
+        },
+      });
       const activity = ACTIVITY_HOME;
       global.localStorage.setItem(`${LOCALSTORAGE_PREFIX}::activity`, JSON.stringify(activity));
-      const expectedEvent = { type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_ANALYTICS };
-
+      const expectedEvent = {
+        type: SET_ACTIVE_ACTIVITY,
+        activity: ACTIVITY_ANALYTICS,
+      };
       await store.dispatch(initActiveActivity());
       expect(store.getActions()).toEqual([expectedEvent]);
     });
diff --git a/packages/insomnia-app/app/ui/redux/modules/__tests__/helpers.test.js b/packages/insomnia-app/app/ui/redux/modules/__tests__/helpers.test.ts
similarity index 98%
rename from packages/insomnia-app/app/ui/redux/modules/__tests__/helpers.test.js
rename to packages/insomnia-app/app/ui/redux/modules/__tests__/helpers.test.ts
index c56907a521..0d4962363b 100644
--- a/packages/insomnia-app/app/ui/redux/modules/__tests__/helpers.test.js
+++ b/packages/insomnia-app/app/ui/redux/modules/__tests__/helpers.test.ts
@@ -1,28 +1,22 @@
-// @flow
-
 import { askToImportIntoWorkspace, ForceToWorkspaceKeys } from '../helpers';
 import * as modals from '../../../components/modals';
 
 describe('askToImportIntoWorkspace', () => {
   it('should return null if forcing to a new workspace', () => {
     const func = askToImportIntoWorkspace('id', ForceToWorkspaceKeys.new);
-
     expect(func()).toBeNull();
   });
 
   it('should return id if forcing to a current workspace', () => {
     const currentWorkspaceId = 'currentId';
     const func = askToImportIntoWorkspace(currentWorkspaceId, ForceToWorkspaceKeys.current);
-
     expect(func()).toBe(currentWorkspaceId);
   });
 
   it('should prompt the user if not forcing', () => {
     modals.showModal = jest.fn();
-
     const currentWorkspaceId = 'current';
     const func = askToImportIntoWorkspace(currentWorkspaceId);
-
     func();
     expect(modals.showModal).toHaveBeenCalledTimes(1);
   });
diff --git a/packages/insomnia-app/app/ui/redux/modules/__tests__/workspace.test.js b/packages/insomnia-app/app/ui/redux/modules/__tests__/workspace.test.ts
similarity index 80%
rename from packages/insomnia-app/app/ui/redux/modules/__tests__/workspace.test.js
rename to packages/insomnia-app/app/ui/redux/modules/__tests__/workspace.test.ts
index 6896dfa977..6a2b1b8f57 100644
--- a/packages/insomnia-app/app/ui/redux/modules/__tests__/workspace.test.js
+++ b/packages/insomnia-app/app/ui/redux/modules/__tests__/workspace.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { globalBeforeEach } from '../../../../__jest__/before-each';
@@ -18,61 +17,68 @@ const mockStore = configureMockStore(middlewares);
 
 describe('workspace', () => {
   beforeEach(globalBeforeEach);
-
   describe('createWorkspace', () => {
     it('should create document', async () => {
       const store = mockStore();
-
-      store.dispatch(createWorkspace({ scope: WorkspaceScopeKeys.design }));
-
+      store.dispatch(
+        createWorkspace({
+          scope: WorkspaceScopeKeys.design,
+        }),
+      );
       const { title, submitName, defaultValue, onComplete } = getAndClearShowPromptMockArgs();
       expect(title).toBe('Create New Design Document');
       expect(submitName).toBe('Create');
       expect(defaultValue).toBe('my-spec.yaml');
-
       const workspaceName = 'name';
       await onComplete(workspaceName);
-
       const workspaces = await models.workspace.all();
       expect(workspaces).toHaveLength(1);
       const workspace = workspaces[0];
       expect(workspace.name).toBe(workspaceName);
       expect(workspace.scope).toBe(WorkspaceScopeKeys.design);
-
       expect(trackSegmentEvent).toHaveBeenCalledWith('Document Created');
       expect(trackEvent).toHaveBeenCalledWith('Workspace', 'Create');
-
       expect(store.getActions()).toEqual([
-        { type: SET_ACTIVE_WORKSPACE, workspaceId: workspace._id },
-        { type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_SPEC },
+        {
+          type: SET_ACTIVE_WORKSPACE,
+          workspaceId: workspace._id,
+        },
+        {
+          type: SET_ACTIVE_ACTIVITY,
+          activity: ACTIVITY_SPEC,
+        },
       ]);
     });
 
     it('should create collection', async () => {
       const store = mockStore();
-
-      store.dispatch(createWorkspace({ scope: WorkspaceScopeKeys.collection }));
-
+      store.dispatch(
+        createWorkspace({
+          scope: WorkspaceScopeKeys.collection,
+        }),
+      );
       const { title, submitName, defaultValue, onComplete } = getAndClearShowPromptMockArgs();
       expect(title).toBe('Create New Request Collection');
       expect(submitName).toBe('Create');
       expect(defaultValue).toBe('My Collection');
-
       const workspaceName = 'name';
       await onComplete(workspaceName);
-
       const workspaces = await models.workspace.all();
       expect(workspaces).toHaveLength(1);
       const workspace = workspaces[0];
       expect(workspace.name).toBe(workspaceName);
       expect(workspace.scope).toBe(WorkspaceScopeKeys.collection);
-
       expect(trackSegmentEvent).toHaveBeenCalledWith('Collection Created');
       expect(trackEvent).toHaveBeenCalledWith('Workspace', 'Create');
-
       expect(store.getActions()).toEqual([
-        { type: SET_ACTIVE_WORKSPACE, workspaceId: workspace._id },
-        { type: SET_ACTIVE_ACTIVITY, activity: ACTIVITY_DEBUG },
+        {
+          type: SET_ACTIVE_WORKSPACE,
+          workspaceId: workspace._id,
+        },
+        {
+          type: SET_ACTIVE_ACTIVITY,
+          activity: ACTIVITY_DEBUG,
+        },
       ]);
     });
   });
diff --git a/packages/insomnia-app/app/ui/redux/modules/entities.js b/packages/insomnia-app/app/ui/redux/modules/entities.ts
similarity index 94%
rename from packages/insomnia-app/app/ui/redux/modules/entities.js
rename to packages/insomnia-app/app/ui/redux/modules/entities.ts
index 62903462d4..6a93964e96 100644
--- a/packages/insomnia-app/app/ui/redux/modules/entities.js
+++ b/packages/insomnia-app/app/ui/redux/modules/entities.ts
@@ -1,19 +1,16 @@
 import clone from 'clone';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import * as models from '../../../models';
 import { pluralize } from '../../../common/misc';
-
 const ENTITY_CHANGES = 'entities/changes';
 const ENTITY_INITIALIZE = 'entities/initialize';
 
 // ~~~~~~~~ //
 // Reducers //
 // ~~~~~~~~ //
-
 function getReducerName(type) {
   // Lowercase first letter (camel case)
   const lowerFirstLetter = `${type.slice(0, 1).toLowerCase()}${type.slice(1)}`;
-
   return pluralize(lowerFirstLetter);
 }
 
@@ -28,11 +25,14 @@ export function reducer(state = initialState, action) {
     case ENTITY_INITIALIZE:
       const freshState = clone(initialState);
       const { docs } = action;
+
       for (const doc of docs) {
         const referenceName = getReducerName(doc.type);
         freshState[referenceName][doc._id] = doc;
       }
+
       return freshState;
+
     case ENTITY_CHANGES:
       // NOTE: We hade clone(state) here before but it has a huge perf impact
       //   and it's not actually necessary.
@@ -58,30 +58,32 @@ export function reducer(state = initialState, action) {
       }
 
       return newState;
+
     default:
       return state;
   }
 }
-
 // ~~~~~~~ //
 // Actions //
 // ~~~~~~~ //
-
 export function addChanges(changes) {
-  return { type: ENTITY_CHANGES, changes };
+  return {
+    type: ENTITY_CHANGES,
+    changes,
+  };
 }
-
 export function initialize() {
   return async dispatch => {
     const docs = await allDocs();
     dispatch(initializeWith(docs));
   };
 }
-
 export function initializeWith(docs) {
-  return { type: ENTITY_INITIALIZE, docs };
+  return {
+    type: ENTITY_INITIALIZE,
+    docs,
+  };
 }
-
 export async function allDocs() {
   // NOTE: This list should be from most to least specific (ie. parents above children)
   return [
diff --git a/packages/insomnia-app/app/ui/redux/modules/git.js b/packages/insomnia-app/app/ui/redux/modules/git.tsx
similarity index 88%
rename from packages/insomnia-app/app/ui/redux/modules/git.js
rename to packages/insomnia-app/app/ui/redux/modules/git.tsx
index b0f488aea7..dd0a3321ba 100644
--- a/packages/insomnia-app/app/ui/redux/modules/git.js
+++ b/packages/insomnia-app/app/ui/redux/modules/git.tsx
@@ -1,6 +1,4 @@
-// @flow
-
-import * as React from 'react';
+import React, { ReactNode } from 'react';
 import type { GitRepository } from '../../../models/git-repository';
 import { showAlert, showError, showModal } from '../../components/modals';
 import GitRepositorySettingsModal from '../../components/modals/git-repository-settings-modal';
@@ -15,13 +13,12 @@ import { createGitRepository } from '../../../models/helpers/git-repository-oper
 import { strings } from '../../../common/strings';
 import { trackEvent } from '../../../common/analytics';
 import YAML from 'yaml';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import { createWorkspace } from './workspace';
 import { addDotGit, translateSSHtoHTTP } from '../../../sync/git/utils';
+import * as git from 'isomorphic-git';
 
-export type UpdateGitRepositoryCallback = ({
-  gitRepository: GitRepository,
-}) => void;
+export type UpdateGitRepositoryCallback = (arg0: { gitRepository: GitRepository }) => void;
 
 /**
  * Update git repository settings
@@ -36,10 +33,9 @@ export const updateGitRepository: UpdateGitRepositoryCallback = ({ gitRepository
     });
   };
 };
-
-export type SetupGitRepositoryCallback = ({
-  createFsClient: () => Object,
-  workspace: Workspace,
+export type SetupGitRepositoryCallback = (arg0: {
+  createFsClient: () => git.PromiseFsClient;
+  workspace: Workspace;
 }) => void;
 
 /**
@@ -51,15 +47,22 @@ export const setupGitRepository: SetupGitRepositoryCallback = ({ createFsClient,
       gitRepository: null,
       onSubmitEdits: async gitRepoPatch => {
         dispatch(loadStart());
+
         try {
           gitRepoPatch.needsFullClone = true;
-
           const fsClient = createFsClient();
 
           try {
-            await shallowClone({ fsClient, gitRepository: gitRepoPatch });
+            await shallowClone({
+              fsClient,
+              gitRepository: gitRepoPatch,
+            });
           } catch (err) {
-            showError({ title: 'Error Cloning Repository', message: err.message, error: err });
+            showError({
+              title: 'Error Cloning Repository',
+              message: err.message,
+              error: err,
+            });
             return;
           }
 
@@ -87,15 +90,16 @@ export const setupGitRepository: SetupGitRepositoryCallback = ({ createFsClient,
   };
 };
 
-const containsInsomniaDir = async (fsClient: Object): Promise<boolean> => {
+const containsInsomniaDir = async (fsClient: Record<string, any>): Promise<boolean> => {
   const rootDirs: Array<string> = await fsClient.promises.readdir(GIT_CLONE_DIR);
   return rootDirs.includes(GIT_INSOMNIA_DIR_NAME);
 };
 
-const containsInsomniaWorkspaceDir = async (fsClient: Object): Promise<boolean> => {
+const containsInsomniaWorkspaceDir = async (fsClient: Record<string, any>): Promise<boolean> => {
   if (!(await containsInsomniaDir(fsClient))) {
     return false;
   }
+
   const rootDirs: Array<string> = await fsClient.promises.readdir(GIT_INSOMNIA_DIR);
   return rootDirs.includes(models.workspace.type);
 };
@@ -112,7 +116,7 @@ const createWorkspaceWithGitRepo = (gitRepo: GitRepository) => {
     );
 };
 
-const cloneProblem = (message: React.Node) => {
+const cloneProblem = (message: ReactNode) => {
   showAlert({
     title: 'Clone Problem',
     message,
@@ -131,7 +135,9 @@ const noDocumentFound = (gitRepo: GitRepository) => {
   };
 };
 
-export type CloneGitRepositoryCallback = ({ createFsClient: () => Object }) => void;
+export type CloneGitRepositoryCallback = (arg0: {
+  createFsClient: () => git.PromiseFsClient;
+}) => void;
 
 /**
  * Clone a git repository
@@ -144,12 +150,14 @@ export const cloneGitRepository: CloneGitRepositoryCallback = ({ createFsClient
         dispatch(loadStart());
         repoSettingsPatch.needsFullClone = true;
         repoSettingsPatch.uri = translateSSHtoHTTP(repoSettingsPatch.uri);
-
         trackEvent('Git', 'Clone');
-
         let fsClient = createFsClient();
+
         try {
-          await shallowClone({ fsClient, gitRepository: { ...repoSettingsPatch } });
+          await shallowClone({
+            fsClient,
+            gitRepository: { ...repoSettingsPatch },
+          });
         } catch (originalUriError) {
           if (repoSettingsPatch.uri.endsWith('.git')) {
             showAlert({
@@ -161,13 +169,13 @@ export const cloneGitRepository: CloneGitRepositoryCallback = ({ createFsClient
           }
 
           const dotGitUri = addDotGit(repoSettingsPatch.uri);
+
           try {
             fsClient = createFsClient();
             await shallowClone({
               fsClient,
               gitRepository: { ...repoSettingsPatch, uri: dotGitUri },
             });
-
             // by this point the clone was successful, so update with this syntax
             repoSettingsPatch.uri = dotGitUri;
           } catch (dotGitError) {
@@ -206,7 +214,6 @@ export const cloneGitRepository: CloneGitRepositoryCallback = ({ createFsClient
         const workspacePath = path.join(workspaceBase, workspaces[0]);
         const workspaceJson = await fsClient.promises.readFile(workspacePath);
         const workspace = YAML.parse(workspaceJson.toString());
-
         // Check if the workspace already exists
         const existingWorkspace = await models.workspace.getById(workspace._id);
 
@@ -231,7 +238,6 @@ export const cloneGitRepository: CloneGitRepositoryCallback = ({ createFsClient
               import it?
             </>
           ),
-
           // Import all docs to the DB
           onConfirm: async () => {
             // Stop the DB from pushing updates to the UI temporarily
@@ -252,10 +258,8 @@ export const cloneGitRepository: CloneGitRepositoryCallback = ({ createFsClient
 
             // Store GitRepository settings and set it as active
             await createGitRepository(workspace._id, repoSettingsPatch);
-
             // Activate the workspace after importing everything
             dispatch(setActiveWorkspace(workspace._id));
-
             // Flush DB changes
             await db.flushChanges(bufferId);
             dispatch(loadStop());
diff --git a/packages/insomnia-app/app/ui/redux/modules/global.js b/packages/insomnia-app/app/ui/redux/modules/global.tsx
similarity index 86%
rename from packages/insomnia-app/app/ui/redux/modules/global.js
rename to packages/insomnia-app/app/ui/redux/modules/global.tsx
index 9d80119991..7a11321ef2 100644
--- a/packages/insomnia-app/app/ui/redux/modules/global.js
+++ b/packages/insomnia-app/app/ui/redux/modules/global.tsx
@@ -1,12 +1,10 @@
-// @flow
-import electron from 'electron';
-import * as React from 'react';
+import electron, { OpenDialogOptions, SaveDialogOptions } from 'electron';
+import React, { Fragment } from 'react';
 import { combineReducers } from 'redux';
 import fs from 'fs';
 import path from 'path';
 import AskModal from '../../../ui/components/modals/ask-modal';
-import * as moment from 'moment';
-
+import moment from 'moment';
 import type { ImportRawConfig, ImportResult } from '../../../common/import';
 import * as importUtils from '../../../common/import';
 import AlertModal from '../../components/modals/alert-modal';
@@ -16,7 +14,7 @@ import * as models from '../../../models';
 import * as requestOperations from '../../../models/helpers/request-operations';
 import SelectModal from '../../components/modals/select-modal';
 import { showError, showModal } from '../../components/modals/index';
-import * as db from '../../../common/database';
+import { database } from '../../../common/database';
 import { trackEvent } from '../../../common/analytics';
 import SettingsModal, {
   TAB_INDEX_PLUGINS,
@@ -40,10 +38,13 @@ import {
   isValidActivity,
 } from '../../../common/constants';
 import { selectSettings } from '../selectors';
-import { getDesignerDataDir } from '../../../common/misc';
+import { getDesignerDataDir } from '../../../common/electron-helpers';
+import { Settings } from '../../../models/settings';
+import { GrpcRequest } from '../../../models/grpc-request';
+import { Request } from '../../../models/request';
+import { Environment } from '../../../models/environment';
 
 export const LOCALSTORAGE_PREFIX = 'insomnia::meta';
-
 const LOGIN_STATE_CHANGE = 'global/login-state-change';
 export const LOAD_START = 'global/load-start';
 export const LOAD_STOP = 'global/load-stop';
@@ -61,11 +62,11 @@ const COMMAND_PLUGIN_THEME = 'plugins/theme';
 // ~~~~~~~~ //
 // REDUCERS //
 // ~~~~~~~~ //
-
 function activeActivityReducer(state = null, action) {
   switch (action.type) {
     case SET_ACTIVE_ACTIVITY:
       return action.activity;
+
     default:
       return state;
   }
@@ -75,6 +76,7 @@ function activeWorkspaceReducer(state = null, action) {
   switch (action.type) {
     case SET_ACTIVE_WORKSPACE:
       return action.workspaceId;
+
     default:
       return state;
   }
@@ -84,8 +86,10 @@ function loadingReducer(state = false, action) {
   switch (action.type) {
     case LOAD_START:
       return true;
+
     case LOAD_STOP:
       return false;
+
     default:
       return state;
   }
@@ -94,9 +98,15 @@ function loadingReducer(state = false, action) {
 function loadingRequestsReducer(state = {}, action) {
   switch (action.type) {
     case LOAD_REQUEST_START:
-      return Object.assign({}, state, { [action.requestId]: action.time });
+      return Object.assign({}, state, {
+        [action.requestId]: action.time,
+      });
+
     case LOAD_REQUEST_STOP:
-      return Object.assign({}, state, { [action.requestId]: -1 });
+      return Object.assign({}, state, {
+        [action.requestId]: -1,
+      });
+
     default:
       return state;
   }
@@ -106,6 +116,7 @@ function loginStateChangeReducer(state = false, action) {
   switch (action.type) {
     case LOGIN_STATE_CHANGE:
       return action.loggedIn;
+
     default:
       return state;
   }
@@ -118,23 +129,30 @@ export const reducer = combineReducers({
   activeActivity: activeActivityReducer,
   isLoggedIn: loginStateChangeReducer,
 });
-
 // ~~~~~~~ //
 // ACTIONS //
 // ~~~~~~~ //
-
 export function newCommand(command, args) {
   return async dispatch => {
     switch (command) {
       case COMMAND_ALERT:
-        showModal(AlertModal, { title: args.title, message: args.message });
+        showModal(AlertModal, {
+          title: args.title,
+          message: args.message,
+        });
         break;
+
       case COMMAND_LOGIN:
-        showModal(LoginModal, { title: args.title, message: args.message });
+        showModal(LoginModal, {
+          title: args.title,
+          message: args.message,
+        });
         break;
+
       case COMMAND_TRIAL_END:
         showModal(PaymentNotificationModal);
         break;
+
       case COMMAND_IMPORT_URI:
         await showModal(AlertModal, {
           title: 'Confirm Data Import',
@@ -147,13 +165,14 @@ export function newCommand(command, args) {
         });
         dispatch(importUri(args.workspaceId, args.uri));
         break;
+
       case COMMAND_PLUGIN_INSTALL:
         showModal(AskModal, {
           title: 'Plugin Install',
           message: (
-            <React.Fragment>
+            <Fragment>
               Do you want to install <code>{args.name}</code>?
-            </React.Fragment>
+            </Fragment>
           ),
           yesText: 'Install',
           noText: 'Cancel',
@@ -175,14 +194,15 @@ export function newCommand(command, args) {
           },
         });
         break;
+
       case COMMAND_PLUGIN_THEME:
         const parsedTheme = JSON.parse(decodeURIComponent(args.theme));
         showModal(AskModal, {
           title: 'Install Theme',
           message: (
-            <React.Fragment>
+            <Fragment>
               Do you want to install <code>{parsedTheme.displayName}</code>?
-            </React.Fragment>
+            </Fragment>
           ),
           yesText: 'Install',
           noText: 'Cancel',
@@ -196,41 +216,50 @@ export function newCommand(command, args) {
               null,
               2,
             )}];`;
-
             await createPlugin(`theme-${parsedTheme.name}`, '0.0.1', mainJsContent);
-
             const settings = await models.settings.getOrCreate();
-            await models.settings.update(settings, { theme: parsedTheme.name });
-            await reloadPlugins(true);
+            await models.settings.update(settings, {
+              theme: parsedTheme.name,
+            });
+            await reloadPlugins();
             await setTheme(parsedTheme.name);
             showModal(SettingsModal, TAB_INDEX_THEMES);
           },
         });
         break;
-      default:
-      // Nothing
+
+      default: // Nothing
     }
   };
 }
-
 export function loadStart() {
-  return { type: LOAD_START };
+  return {
+    type: LOAD_START,
+  };
 }
-
 export function loadStop() {
-  return { type: LOAD_STOP };
+  return {
+    type: LOAD_STOP,
+  };
 }
-
 export function loadRequestStart(requestId) {
-  return { type: LOAD_REQUEST_START, requestId, time: Date.now() };
+  return {
+    type: LOAD_REQUEST_START,
+    requestId,
+    time: Date.now(),
+  };
 }
-
 export function loginStateChange(loggedIn) {
-  return { type: LOGIN_STATE_CHANGE, loggedIn };
+  return {
+    type: LOGIN_STATE_CHANGE,
+    loggedIn,
+  };
 }
-
 export function loadRequestStop(requestId) {
-  return { type: LOAD_REQUEST_STOP, requestId };
+  return {
+    type: LOAD_REQUEST_STOP,
+    requestId,
+  };
 }
 
 function _getNextActivity(settings: Settings, currentActivity: GlobalActivity): GlobalActivity {
@@ -248,9 +277,11 @@ function _getNextActivity(settings: Settings, currentActivity: GlobalActivity):
 
       // Otherwise, go to home
       return ACTIVITY_HOME;
+
     case ACTIVITY_ONBOARDING:
       // Always go to home after onboarding
       return ACTIVITY_HOME;
+
     default:
       return currentActivity;
   }
@@ -263,7 +294,6 @@ export function goToNextActivity() {
   return function(dispatch, getState) {
     const state = getState();
     const { activeActivity } = state.global;
-
     const settings = selectSettings(state);
 
     const nextActivity = _getNextActivity(settings, activeActivity);
@@ -284,8 +314,11 @@ export function setActiveActivity(activity: GlobalActivity) {
   switch (activity) {
     case ACTIVITY_MIGRATION:
       trackEvent('Data', 'Migration', 'Manual');
-      models.settings.patch({ hasPromptedToMigrateFromDesigner: true });
+      models.settings.patch({
+        hasPromptedToMigrateFromDesigner: true,
+      });
       break;
+
     case ACTIVITY_ONBOARDING:
       models.settings.patch({
         hasPromptedOnboarding: true,
@@ -293,37 +326,43 @@ export function setActiveActivity(activity: GlobalActivity) {
         hasPromptedAnalytics: true,
       });
       break;
+
     case ACTIVITY_ANALYTICS:
-      models.settings.patch({ hasPromptedAnalytics: true });
+      models.settings.patch({
+        hasPromptedAnalytics: true,
+      });
       break;
+
     default:
       break;
   }
 
   window.localStorage.setItem(`${LOCALSTORAGE_PREFIX}::activity`, JSON.stringify(activity));
   trackEvent('Activity', 'Change', activity);
-  return { type: SET_ACTIVE_ACTIVITY, activity };
+  return {
+    type: SET_ACTIVE_ACTIVITY,
+    activity,
+  };
 }
-
-export function setActiveWorkspace(workspaceId: string) {
+export function setActiveWorkspace(workspaceId: string | null) {
   const key = `${LOCALSTORAGE_PREFIX}::activeWorkspaceId`;
   window.localStorage.setItem(key, JSON.stringify(workspaceId));
-  return { type: SET_ACTIVE_WORKSPACE, workspaceId };
+  return {
+    type: SET_ACTIVE_WORKSPACE,
+    workspaceId,
+  };
+}
+export interface ImportOptions {
+  forceToWorkspace?: ForceToWorkspace;
+  forceToScope?: WorkspaceScope;
 }
-
-export type ImportOptions = {
-  forceToWorkspace?: ForceToWorkspace,
-  forceToScope?: WorkspaceScope,
-};
-
 export function importFile(
   workspaceId: string,
   { forceToScope, forceToWorkspace }: ImportOptions = {},
 ) {
   return async dispatch => {
     dispatch(loadStart());
-
-    const options = {
+    const options: OpenDialogOptions = {
       title: 'Import Insomnia Data',
       buttonLabel: 'Import',
       properties: ['openFile'],
@@ -346,8 +385,8 @@ export function importFile(
         },
       ],
     };
-
     const { canceled, filePaths: paths } = await electron.remote.dialog.showOpenDialog(options);
+
     if (canceled) {
       // It was cancelled, so let's bail out
       dispatch(loadStop());
@@ -358,7 +397,6 @@ export function importFile(
     for (const p of paths) {
       try {
         const uri = `file://${p}`;
-
         const options: ImportRawConfig = {
           getWorkspaceScope: askToSetWorkspaceScope(forceToScope),
           getWorkspaceId: askToImportIntoWorkspace(workspaceId, forceToWorkspace),
@@ -366,7 +404,10 @@ export function importFile(
         const result = await importUtils.importUri(uri, options);
         handleImportResult(result, 'The file does not contain a valid specification.');
       } catch (err) {
-        showModal(AlertModal, { title: 'Import Failed', message: err + '' });
+        showModal(AlertModal, {
+          title: 'Import Failed',
+          message: err + '',
+        });
       } finally {
         dispatch(loadStop());
       }
@@ -378,14 +419,20 @@ function handleImportResult(result: ImportResult, errorMessage: string): Array<W
   const { error, summary } = result;
 
   if (error) {
-    showError({ title: 'Import Failed', message: errorMessage, error });
+    showError({
+      title: 'Import Failed',
+      message: errorMessage,
+      error,
+    });
     return [];
   }
 
   const createdRequests =
     summary[models.request.type].length + summary[models.grpcRequest.type].length;
-  models.stats.incrementRequestStats({ createdRequests: createdRequests });
-
+  models.stats.incrementRequestStats({
+    createdRequests: createdRequests,
+  });
+  // @ts-expect-error -- TSCONVERSION
   return summary[models.workspace.type] || [];
 }
 
@@ -396,6 +443,7 @@ export function importClipBoard(
   return async dispatch => {
     dispatch(loadStart());
     const schema = electron.clipboard.readText();
+
     if (!schema) {
       showModal(AlertModal, {
         title: 'Import Failed',
@@ -403,6 +451,7 @@ export function importClipBoard(
       });
       return;
     }
+
     // Let's import all the paths!
     try {
       const options: ImportRawConfig = {
@@ -421,7 +470,6 @@ export function importClipBoard(
     }
   };
 }
-
 export function importUri(
   workspaceId: string,
   uri: string,
@@ -438,20 +486,21 @@ export function importUri(
       const result = await importUtils.importUri(uri, options);
       handleImportResult(result, 'The URI does not contain a valid specification.');
     } catch (err) {
-      showModal(AlertModal, { title: 'Import Failed', message: err + '' });
+      showModal(AlertModal, {
+        title: 'Import Failed',
+        message: err + '',
+      });
     } finally {
       dispatch(loadStop());
     }
   };
 }
-
 const VALUE_JSON = 'json';
 const VALUE_YAML = 'yaml';
 const VALUE_HAR = 'har';
 
 function showSelectExportTypeModal(onCancel, onDone) {
   const lastFormat = window.localStorage.getItem('insomnia.lastExportFormat');
-
   showModal(SelectModal, {
     title: 'Select Export Type',
     value: lastFormat,
@@ -464,7 +513,10 @@ function showSelectExportTypeModal(onCancel, onDone) {
         name: 'Insomnia v4 (YAML)',
         value: VALUE_YAML,
       },
-      { name: 'HAR – HTTP Archive Format', value: VALUE_HAR },
+      {
+        name: 'HAR – HTTP Archive Format',
+        value: VALUE_HAR,
+      },
     ],
     message: 'Which format would you like to export as?',
     onCancel: onCancel,
@@ -487,8 +539,7 @@ async function showSaveExportedFileDialog(exportedFileNamePrefix, selectedFormat
   const name = exportedFileNamePrefix.replace(/ /g, '-');
   const lastDir = window.localStorage.getItem('insomnia.lastExportPath');
   const dir = lastDir || electron.remote.app.getPath('desktop');
-
-  const options = {
+  const options: SaveDialogOptions = {
     title: 'Export Insomnia Data',
     buttonLabel: 'Export',
     defaultPath: path.join(dir, `${name}_${date}`),
@@ -503,9 +554,19 @@ async function showSaveExportedFileDialog(exportedFileNamePrefix, selectedFormat
       },
     ];
   } else if (selectedFormat === VALUE_YAML) {
-    options.filters = [{ name: 'Insomnia Export', extensions: ['yaml'] }];
+    options.filters = [
+      {
+        name: 'Insomnia Export',
+        extensions: ['yaml'],
+      },
+    ];
   } else {
-    options.filters = [{ name: 'Insomnia Export', extensions: ['json'] }];
+    options.filters = [
+      {
+        name: 'Insomnia Export',
+        extensions: ['json'],
+      },
+    ];
   }
 
   const { filePath } = await electron.remote.dialog.showSaveDialog(options);
@@ -518,26 +579,26 @@ function writeExportedFileToFileSystem(filename, jsonData, onDone) {
   fs.writeFile(filename, jsonData, {}, onDone);
 }
 
-export function exportWorkspacesToFile(workspaceId = null) {
+export function exportWorkspacesToFile(workspaceId: string | undefined = undefined) {
   return async dispatch => {
     dispatch(loadStart());
-
     showSelectExportTypeModal(
       () => dispatch(loadStop()),
       async selectedFormat => {
         const workspace = await models.workspace.getById(workspaceId);
-
         // Check if we want to export private environments.
         let environments;
+
         if (workspace) {
           const parentEnv = await models.environment.getOrCreateForWorkspace(workspace);
-          environments = [parentEnv, ...(await models.environment.findByParentId(parentEnv._id))];
+          environments = [parentEnv, ...(await models.environment.findByParentId(parentEnv._id) || [])];
         } else {
           environments = await models.environment.all();
         }
 
         let exportPrivateEnvironments = false;
         const privateEnvironments = environments.filter(e => e.isPrivate);
+
         if (privateEnvironments.length) {
           const names = privateEnvironments.map(e => e.name).join(', ');
           exportPrivateEnvironments = await showExportPrivateEnvironmentsModal(names);
@@ -545,6 +606,7 @@ export function exportWorkspacesToFile(workspaceId = null) {
 
         const fileNamePrefix = (workspace ? workspace.name : 'Insomnia All').replace(/ /g, '-');
         const fileName = await showSaveExportedFileDialog(fileNamePrefix, selectedFormat);
+
         if (!fileName) {
           // Cancelled.
           dispatch(loadStop());
@@ -552,6 +614,7 @@ export function exportWorkspacesToFile(workspaceId = null) {
         }
 
         let stringifiedExport;
+
         try {
           if (selectedFormat === VALUE_HAR) {
             stringifiedExport = await importUtils.exportWorkspacesHAR(
@@ -585,41 +648,43 @@ export function exportWorkspacesToFile(workspaceId = null) {
           if (err) {
             console.warn('Export failed', err);
           }
+
           dispatch(loadStop());
         });
       },
     );
   };
 }
-
 export function exportRequestsToFile(requestIds) {
   return async dispatch => {
     dispatch(loadStart());
-
     showSelectExportTypeModal(
       () => dispatch(loadStop()),
       async selectedFormat => {
-        const requests = [];
-        const privateEnvironments = [];
+        const requests: Array<GrpcRequest | Request> = [];
+        const privateEnvironments: Array<Environment> = [];
         const workspaceLookup = {};
+
         for (const requestId of requestIds) {
           const request = await requestOperations.getById(requestId);
+
           if (request == null) {
             continue;
           }
-          requests.push(request);
 
-          const ancestors = await db.withAncestors(request, [
+          requests.push(request);
+          const ancestors = await database.withAncestors(request, [
             models.workspace.type,
             models.requestGroup.type,
           ]);
           const workspace = ancestors.find(ancestor => ancestor.type === models.workspace.type);
+
           if (workspace == null || workspaceLookup.hasOwnProperty(workspace._id)) {
             continue;
           }
-          workspaceLookup[workspace._id] = true;
 
-          const descendants = await db.withDescendants(workspace);
+          workspaceLookup[workspace._id] = true;
+          const descendants = await database.withDescendants(workspace);
           const privateEnvs = descendants.filter(
             descendant => descendant.type === models.environment.type && descendant.isPrivate,
           );
@@ -627,6 +692,7 @@ export function exportRequestsToFile(requestIds) {
         }
 
         let exportPrivateEnvironments = false;
+
         if (privateEnvironments.length) {
           const names = privateEnvironments.map(e => e.name).join(', ');
           exportPrivateEnvironments = await showExportPrivateEnvironmentsModal(names);
@@ -634,6 +700,7 @@ export function exportRequestsToFile(requestIds) {
 
         const fileNamePrefix = 'Insomnia';
         const fileName = await showSaveExportedFileDialog(fileNamePrefix, selectedFormat);
+
         if (!fileName) {
           // Cancelled.
           dispatch(loadStop());
@@ -641,6 +708,7 @@ export function exportRequestsToFile(requestIds) {
         }
 
         let stringifiedExport;
+
         try {
           if (selectedFormat === VALUE_HAR) {
             stringifiedExport = await importUtils.exportRequestsHAR(
@@ -674,18 +742,20 @@ export function exportRequestsToFile(requestIds) {
           if (err) {
             console.warn('Export failed', err);
           }
+
           dispatch(loadStop());
         });
       },
     );
   };
 }
-
 export function initActiveWorkspace() {
-  let workspaceId = null;
+  let workspaceId: string | null = null;
+
   try {
     const key = `${LOCALSTORAGE_PREFIX}::activeWorkspaceId`;
     const item = window.localStorage.getItem(key);
+    // @ts-expect-error -- TSCONVERSION don't parse item if it's null
     workspaceId = JSON.parse(item);
   } catch (e) {
     // Nothing here...
@@ -695,6 +765,7 @@ export function initActiveWorkspace() {
 }
 
 function _migrateDeprecatedActivity(activity: GlobalActivity): GlobalActivity {
+  // @ts-expect-error -- TSCONVERSION
   return activity === DEPRECATED_ACTIVITY_INSOMNIA ? ACTIVITY_DEBUG : activity;
 }
 
@@ -718,27 +789,28 @@ export function initActiveActivity() {
   return function(dispatch, getState) {
     const state = getState();
     const settings = selectSettings(state);
-
     // Default to home
     let activeActivity = ACTIVITY_HOME;
 
     try {
       const key = `${LOCALSTORAGE_PREFIX}::activity`;
       const item = window.localStorage.getItem(key);
+      // @ts-expect-error -- TSCONVERSION don't parse item if it's null
       activeActivity = JSON.parse(item);
     } catch (e) {
       // Nothing here...
     }
 
     activeActivity = _normalizeActivity(activeActivity);
+    let overrideActivity: GlobalActivity | null = null;
 
-    let overrideActivity = null;
     switch (activeActivity) {
       // If relaunched after a migration, go to the next activity
       // Don't need to do this for onboarding because that doesn't require a restart
       case ACTIVITY_MIGRATION:
         overrideActivity = _getNextActivity(settings, activeActivity);
         break;
+
       // Always check if user has been prompted to migrate or onboard
       default:
         if (!settings.hasPromptedToMigrateFromDesigner && fs.existsSync(getDesignerDataDir())) {
@@ -749,6 +821,7 @@ export function initActiveActivity() {
         } else if (!settings.hasPromptedAnalytics) {
           overrideActivity = ACTIVITY_ANALYTICS;
         }
+
         break;
     }
 
@@ -756,7 +829,6 @@ export function initActiveActivity() {
     dispatch(setActiveActivity(initializeToActivity));
   };
 }
-
 export function init() {
   return [initActiveWorkspace(), initActiveActivity()];
 }
diff --git a/packages/insomnia-app/app/ui/redux/modules/helpers.js b/packages/insomnia-app/app/ui/redux/modules/helpers.ts
similarity index 72%
rename from packages/insomnia-app/app/ui/redux/modules/helpers.js
rename to packages/insomnia-app/app/ui/redux/modules/helpers.ts
index 1f1fa39dc6..f76102adec 100644
--- a/packages/insomnia-app/app/ui/redux/modules/helpers.js
+++ b/packages/insomnia-app/app/ui/redux/modules/helpers.ts
@@ -1,22 +1,25 @@
-// @flow
 import { showModal } from '../../components/modals';
 import AskModal from '../../components/modals/ask-modal';
-import { WorkspaceScopeKeys } from '../../../models/workspace';
+import { WorkspaceScope, WorkspaceScopeKeys } from '../../../models/workspace';
+import { ValueOf } from 'type-fest';
 
 export const ForceToWorkspaceKeys = {
   new: 'new',
   current: 'current',
-};
+} as const;
 
-export type ForceToWorkspace = $Keys<typeof ForceToWorkspaceKeys>;
+export type ForceToWorkspace = ValueOf<typeof ForceToWorkspaceKeys>;
 
-export function askToImportIntoWorkspace(workspaceId: string, forceToWorkspace?: ForceToWorkspace) {
+export type ImportToWorkspacePrompt = () => null | string | Promise<null | string>;
+export function askToImportIntoWorkspace(workspaceId: string, forceToWorkspace?: ForceToWorkspace): ImportToWorkspacePrompt {
   return function() {
     switch (forceToWorkspace) {
       case ForceToWorkspaceKeys.new:
         return null;
+
       case ForceToWorkspaceKeys.current:
         return workspaceId;
+
       default:
         return new Promise(resolve => {
           showModal(AskModal, {
@@ -33,12 +36,14 @@ export function askToImportIntoWorkspace(workspaceId: string, forceToWorkspace?:
   };
 }
 
-export function askToSetWorkspaceScope(scope?: WorkspaceScope) {
+export type SetWorkspaceScopePrompt = (name: string) => WorkspaceScope | Promise<WorkspaceScope>;
+export function askToSetWorkspaceScope(scope?: WorkspaceScope): SetWorkspaceScopePrompt {
   return function(name: string) {
     switch (scope) {
       case WorkspaceScopeKeys.collection:
       case WorkspaceScopeKeys.design:
         return scope;
+
       default:
         return new Promise(resolve => {
           showModal(AskModal, {
diff --git a/packages/insomnia-app/app/ui/redux/modules/index.js b/packages/insomnia-app/app/ui/redux/modules/index.ts
similarity index 90%
rename from packages/insomnia-app/app/ui/redux/modules/index.js
rename to packages/insomnia-app/app/ui/redux/modules/index.ts
index 192e13f6c0..e0fe27abf4 100644
--- a/packages/insomnia-app/app/ui/redux/modules/index.js
+++ b/packages/insomnia-app/app/ui/redux/modules/index.ts
@@ -2,41 +2,38 @@ import { bindActionCreators, combineReducers } from 'redux';
 import * as entities from './entities';
 import configureStore from '../create';
 import * as global from './global';
-import * as db from '../../../common/database';
+import { database as db } from '../../../common/database';
 import { API_BASE_URL, getClientString } from '../../../common/constants';
 import { isLoggedIn, onLoginLogout } from '../../../account/session';
 import * as fetch from '../../../account/fetch';
 
 export async function init() {
   const store = configureStore();
-
   // Do things that must happen before initial render
   const { addChanges, initializeWith: initEntities } = bindActionCreators(entities, store.dispatch);
-  const { newCommand, loginStateChange } = bindActionCreators(global, store.dispatch);
 
+  // @ts-expect-error -- TSCONVERSION
+  const { newCommand, loginStateChange } = bindActionCreators(global, store.dispatch);
   // Link DB changes to entities reducer/actions
   const docs = await entities.allDocs();
   initEntities(docs);
-
   db.onChange(addChanges);
-
   // Initialize login state
   loginStateChange(isLoggedIn());
   onLoginLogout(loggedIn => {
     loginStateChange(loggedIn);
   });
-
   // Bind to fetch commands
   fetch.setup(getClientString(), API_BASE_URL);
   fetch.onCommand(newCommand);
 
   for (const action of global.init()) {
+    // @ts-expect-error -- TSCONVERSION
     store.dispatch(action);
   }
 
   return store;
 }
-
 export const reducer = combineReducers({
   entities: entities.reducer,
   global: global.reducer,
diff --git a/packages/insomnia-app/app/ui/redux/modules/workspace.js b/packages/insomnia-app/app/ui/redux/modules/workspace.ts
similarity index 73%
rename from packages/insomnia-app/app/ui/redux/modules/workspace.js
rename to packages/insomnia-app/app/ui/redux/modules/workspace.ts
index e2154d36a6..01e836b0fe 100644
--- a/packages/insomnia-app/app/ui/redux/modules/workspace.js
+++ b/packages/insomnia-app/app/ui/redux/modules/workspace.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type { Workspace, WorkspaceScope } from '../../../models/workspace';
 import * as models from '../../../models';
 import { ACTIVITY_DEBUG, ACTIVITY_SPEC } from '../../../common/constants';
@@ -8,9 +6,9 @@ import { isDesign } from '../../../models/helpers/is-model';
 import { showPrompt } from '../../components/modals';
 import { setActiveActivity, setActiveWorkspace } from './global';
 
-type OnWorkspaceCreateCallback = Workspace => Promise<void> | void;
+type OnWorkspaceCreateCallback = (arg0: Workspace) => Promise<void> | void;
 
-const actuallyCreate = (patch: $Shape<Workspace>, onCreate?: OnWorkspaceCreateCallback) => {
+const actuallyCreate = (patch: Partial<Workspace>, onCreate?: OnWorkspaceCreateCallback) => {
   return async dispatch => {
     const workspace = await models.workspace.create(patch);
 
@@ -24,19 +22,19 @@ const actuallyCreate = (patch: $Shape<Workspace>, onCreate?: OnWorkspaceCreateCa
   };
 };
 
-export type CreateWorkspaceCallback = ({
-  scope: WorkspaceScope,
-  onCreate: OnWorkspaceCreateCallback,
+export type CreateWorkspaceCallback = (arg0: {
+  scope: WorkspaceScope;
+  onCreate?: OnWorkspaceCreateCallback;
 }) => void;
 
 export const createWorkspace: CreateWorkspaceCallback = ({ scope, onCreate }) => {
   return dispatch => {
-    const design = isDesign({ scope });
-
+    const design = isDesign({
+      scope,
+    });
     const title = design ? 'Design Document' : 'Request Collection';
     const defaultValue = design ? 'my-spec.yaml' : 'My Collection';
     const segmentEvent = design ? 'Document Created' : 'Collection Created';
-
     showPrompt({
       title: `Create New ${title}`,
       submitName: 'Create',
@@ -44,7 +42,15 @@ export const createWorkspace: CreateWorkspaceCallback = ({ scope, onCreate }) =>
       defaultValue,
       selectText: true,
       onComplete: async name => {
-        await dispatch(actuallyCreate({ name, scope }, onCreate));
+        await dispatch(
+          actuallyCreate(
+            {
+              name,
+              scope,
+            },
+            onCreate,
+          ),
+        );
         trackSegmentEvent(segmentEvent);
       },
     });
diff --git a/packages/insomnia-app/app/ui/redux/proto-selectors.js b/packages/insomnia-app/app/ui/redux/proto-selectors.ts
similarity index 77%
rename from packages/insomnia-app/app/ui/redux/proto-selectors.js
rename to packages/insomnia-app/app/ui/redux/proto-selectors.ts
index 3665bd237f..c739680086 100644
--- a/packages/insomnia-app/app/ui/redux/proto-selectors.js
+++ b/packages/insomnia-app/app/ui/redux/proto-selectors.ts
@@ -1,23 +1,23 @@
-// @flow
-
 import { createSelector } from 'reselect';
 import { selectActiveWorkspace, selectEntitiesLists } from './selectors';
 import type { ProtoDirectory } from '../../models/proto-directory';
 import type { ProtoFile } from '../../models/proto-file';
 
-export type ExpandedProtoDirectory = {
-  files: Array<ProtoFile>,
-  dir: ProtoDirectory | null,
-  subDirs: Array<ExpandedProtoDirectory>,
-};
+export interface ExpandedProtoDirectory {
+  files: Array<ProtoFile>;
+  dir: ProtoDirectory | null;
+  subDirs: Array<ExpandedProtoDirectory>;
+}
 
 const selectAllProtoFiles = createSelector(
   selectEntitiesLists,
+    // @ts-expect-error -- TSCONVERSION
   entities => entities.protoFiles || [],
 );
 
 const selectAllProtoDirectories = createSelector(
   selectEntitiesLists,
+    // @ts-expect-error -- TSCONVERSION
   entities => entities.protoDirectories || [],
 );
 
@@ -28,15 +28,20 @@ export const selectExpandedActiveProtoDirectories = createSelector(
   (workspace, allFiles, allDirs): Array<ExpandedProtoDirectory> => {
     // Get files where the parent is the workspace
     const individualFiles = allFiles.filter(pf => pf.parentId === workspace._id);
-
     // Get directories where the parent is the workspace
     const rootDirs = allDirs.filter(pd => pd.parentId === workspace._id);
-
     // Expand each directory
     const expandedDirs = rootDirs.map(dir => expandDir(dir, allFiles, allDirs));
 
     if (individualFiles.length) {
-      return [{ files: individualFiles, dir: null, subDirs: [] }, ...expandedDirs];
+      return [
+        {
+          files: individualFiles,
+          dir: null,
+          subDirs: [],
+        },
+        ...expandedDirs,
+      ];
     }
 
     return expandedDirs;
@@ -50,9 +55,11 @@ const expandDir = (
 ): ExpandedProtoDirectory => {
   const filesInDir = allFiles.filter(pf => pf.parentId === dir._id);
   const subDirs = allDirs.filter(pd => pd.parentId === dir._id);
-
   // Expand sub directories
   const expandedSubDirs = subDirs.map(subDir => expandDir(subDir, allFiles, allDirs));
-
-  return { dir, files: filesInDir, subDirs: expandedSubDirs };
+  return {
+    dir,
+    files: filesInDir,
+    subDirs: expandedSubDirs,
+  };
 };
diff --git a/packages/insomnia-app/app/ui/redux/selectors.js b/packages/insomnia-app/app/ui/redux/selectors.ts
similarity index 88%
rename from packages/insomnia-app/app/ui/redux/selectors.js
rename to packages/insomnia-app/app/ui/redux/selectors.ts
index 3ba303ffef..d037617ee5 100644
--- a/packages/insomnia-app/app/ui/redux/selectors.js
+++ b/packages/insomnia-app/app/ui/redux/selectors.ts
@@ -1,11 +1,11 @@
 import { createSelector } from 'reselect';
 import * as models from '../../models';
-
+import { UnitTestResult } from '../../models/unit-test-result';
 // ~~~~~~~~~ //
 // Selectors //
 // ~~~~~~~~~ //
-
 export const selectEntitiesLists = createSelector(
+    // @ts-expect-error -- TSCONVERSION
   state => state.entities,
   entities => {
     const entitiesLists = {};
@@ -18,9 +18,9 @@ export const selectEntitiesLists = createSelector(
     return entitiesLists;
   },
 );
-
 export const selectEntitiesChildrenMap = createSelector(selectEntitiesLists, entities => {
   const parentLookupMap = {};
+
   for (const k of Object.keys(entities)) {
     for (const e of entities[k]) {
       if (!e.parentId) {
@@ -37,29 +37,30 @@ export const selectEntitiesChildrenMap = createSelector(selectEntitiesLists, ent
 
   return parentLookupMap;
 });
-
 export const selectSettings = createSelector(selectEntitiesLists, entities => {
+    // @ts-expect-error -- TSCONVERSION
   return entities.settings[0] || models.settings.init();
 });
-
 export const selectActiveWorkspace = createSelector(
+    // @ts-expect-error -- TSCONVERSION
   state => selectEntitiesLists(state).workspaces,
+    // @ts-expect-error -- TSCONVERSION
   state => state.entities,
+    // @ts-expect-error -- TSCONVERSION
   state => state.global.activeWorkspaceId,
   (workspaces, entities, activeWorkspaceId) => {
     return entities.workspaces[activeWorkspaceId] || workspaces[0];
   },
 );
-
 export const selectActiveWorkspaceMeta = createSelector(
   selectActiveWorkspace,
   selectEntitiesLists,
   (activeWorkspace, entities) => {
     const id = activeWorkspace ? activeWorkspace._id : 'n/a';
+    // @ts-expect-error -- TSCONVERSION
     return entities.workspaceMetas.find(m => m.parentId === id);
   },
 );
-
 export const selectActiveEnvironment = createSelector(
   selectActiveWorkspaceMeta,
   selectEntitiesLists,
@@ -68,18 +69,18 @@ export const selectActiveEnvironment = createSelector(
       return null;
     }
 
+    // @ts-expect-error -- TSCONVERSION
     return entities.environments.find(e => e._id === meta.activeEnvironmentId) || null;
   },
 );
-
 export const selectActiveWorkspaceClientCertificates = createSelector(
   selectEntitiesLists,
   selectActiveWorkspace,
   (entities, activeWorkspace) => {
+    // @ts-expect-error -- TSCONVERSION
     return entities.clientCertificates.filter(c => c.parentId === activeWorkspace._id);
   },
 );
-
 export const selectActiveGitRepository = createSelector(
   selectEntitiesLists,
   selectActiveWorkspaceMeta,
@@ -89,32 +90,35 @@ export const selectActiveGitRepository = createSelector(
     }
 
     const id = activeWorkspaceMeta ? activeWorkspaceMeta.gitRepositoryId : 'n/a';
+    // @ts-expect-error -- TSCONVERSION
     const repo = entities.gitRepositories.find(r => r._id === id);
     return repo || null;
   },
 );
-
 export const selectCollapsedRequestGroups = createSelector(selectEntitiesLists, entities => {
   const collapsed = {};
 
   // Default all to collapsed
+    // @ts-expect-error -- TSCONVERSION
   for (const requestGroup of entities.requestGroups) {
     collapsed[requestGroup._id] = true;
   }
 
   // Update those that have metadata (not all do)
+    // @ts-expect-error -- TSCONVERSION
   for (const meta of entities.requestGroupMetas) {
     collapsed[meta.parentId] = meta.collapsed;
   }
 
   return collapsed;
 });
-
 export const selectActiveWorkspaceEntities = createSelector(
   selectActiveWorkspace,
   selectEntitiesChildrenMap,
   (activeWorkspace, childrenMap) => {
     const descendants = [activeWorkspace];
+
+    // @ts-expect-error -- TSCONVERSION
     const addChildrenOf = parent => {
       // Don't add children of requests (eg. auth requests)
       if (parent.type === models.request.type) {
@@ -122,6 +126,7 @@ export const selectActiveWorkspaceEntities = createSelector(
       }
 
       const children = childrenMap[parent._id] || [];
+
       for (const child of children) {
         descendants.push(child);
         addChildrenOf(child);
@@ -130,15 +135,14 @@ export const selectActiveWorkspaceEntities = createSelector(
 
     // Kick off the recursion
     addChildrenOf(activeWorkspace);
-
     return descendants;
   },
 );
-
 export const selectPinnedRequests = createSelector(selectEntitiesLists, entities => {
   const pinned = {};
-
+    // @ts-expect-error -- TSCONVERSION
   const requests = [...entities.requests, ...entities.grpcRequests];
+    // @ts-expect-error -- TSCONVERSION
   const requestMetas = [...entities.requestMetas, ...entities.grpcRequestMetas];
 
   // Default all to unpinned
@@ -153,7 +157,6 @@ export const selectPinnedRequests = createSelector(selectEntitiesLists, entities
 
   return pinned;
 });
-
 export const selectWorkspaceRequestsAndRequestGroups = createSelector(
   selectActiveWorkspaceEntities,
   entities => {
@@ -162,8 +165,8 @@ export const selectWorkspaceRequestsAndRequestGroups = createSelector(
     );
   },
 );
-
 export const selectActiveRequest = createSelector(
+    // @ts-expect-error -- TSCONVERSION
   state => state.entities,
   selectActiveWorkspaceMeta,
   (entities, workspaceMeta) => {
@@ -171,42 +174,41 @@ export const selectActiveRequest = createSelector(
     return entities.requests[id] || entities.grpcRequests[id] || null;
   },
 );
-
 export const selectActiveCookieJar = createSelector(
   selectEntitiesLists,
   selectActiveWorkspace,
   (entities, workspace) => {
+    // @ts-expect-error -- TSCONVERSION
     const cookieJar = entities.cookieJars.find(cj => cj.parentId === workspace._id);
     return cookieJar || null;
   },
 );
-
 export const selectActiveOAuth2Token = createSelector(
   selectEntitiesLists,
   selectActiveWorkspaceMeta,
   (entities, workspaceMeta) => {
     const id = workspaceMeta ? workspaceMeta.activeRequestId : 'n/a';
+    // @ts-expect-error -- TSCONVERSION
     return entities.oAuth2Tokens.find(t => t.parentId === id);
   },
 );
-
 export const selectUnseenWorkspaces = createSelector(selectEntitiesLists, entities => {
+    // @ts-expect-error -- TSCONVERSION
   const { workspaces, workspaceMetas } = entities;
   return workspaces.filter(workspace => {
     const meta = workspaceMetas.find(m => m.parentId === workspace._id);
     return !!(meta && !meta.hasSeen);
   });
 });
-
 export const selectActiveRequestMeta = createSelector(
   selectActiveRequest,
   selectEntitiesLists,
   (activeRequest, entities) => {
     const id = activeRequest ? activeRequest._id : 'n/a';
+    // @ts-expect-error -- TSCONVERSION
     return entities.requestMetas.find(m => m.parentId === id);
   },
 );
-
 export const selectActiveRequestResponses = createSelector(
   selectActiveRequest,
   selectEntitiesLists,
@@ -214,8 +216,8 @@ export const selectActiveRequestResponses = createSelector(
   selectSettings,
   (activeRequest, entities, activeEnvironment, settings) => {
     const requestId = activeRequest ? activeRequest._id : 'n/a';
-
     // Filter responses down if the setting is enabled
+    // @ts-expect-error -- TSCONVERSION
     return entities.responses
       .filter(response => {
         const requestMatches = requestId === response.parentId;
@@ -231,7 +233,6 @@ export const selectActiveRequestResponses = createSelector(
       .sort((a, b) => (a.created > b.created ? -1 : 1));
   },
 );
-
 export const selectActiveResponse = createSelector(
   selectActiveRequestMeta,
   selectActiveRequestResponses,
@@ -246,12 +247,13 @@ export const selectActiveResponse = createSelector(
     return responses[0] || null;
   },
 );
-
 export const selectActiveUnitTestResult = createSelector(
   selectEntitiesLists,
   selectActiveWorkspace,
   (entities, activeWorkspace) => {
-    let recentResult = null;
+    let recentResult: UnitTestResult | null = null;
+
+    // @ts-expect-error -- TSCONVERSION
     for (const r of entities.unitTestResults) {
       if (r.parentId !== activeWorkspace._id) {
         continue;
@@ -270,7 +272,6 @@ export const selectActiveUnitTestResult = createSelector(
     return recentResult;
   },
 );
-
 export const selectActiveUnitTestSuite = createSelector(
   selectEntitiesLists,
   selectActiveWorkspaceMeta,
@@ -280,10 +281,10 @@ export const selectActiveUnitTestSuite = createSelector(
     }
 
     const id = activeWorkspaceMeta.activeUnitTestSuiteId;
+    // @ts-expect-error -- TSCONVERSION
     return entities.unitTestSuites.find(s => s._id === id) || null;
   },
 );
-
 export const selectActiveUnitTests = createSelector(
   selectEntitiesLists,
   selectActiveUnitTestSuite,
@@ -292,18 +293,18 @@ export const selectActiveUnitTests = createSelector(
       return [];
     }
 
+    // @ts-expect-error -- TSCONVERSION
     return entities.unitTests.filter(s => s.parentId === activeUnitTestSuite._id);
   },
 );
-
 export const selectActiveUnitTestSuites = createSelector(
   selectEntitiesLists,
   selectActiveWorkspace,
   (entities, activeWorkspace) => {
+    // @ts-expect-error -- TSCONVERSION
     return entities.unitTestSuites.filter(s => s.parentId === activeWorkspace._id);
   },
 );
-
 export const selectSyncItems = createSelector(selectActiveWorkspaceEntities, workspaceEntities =>
   workspaceEntities.filter(models.canSync).map(doc => ({
     key: doc._id,
diff --git a/packages/insomnia-app/app/ui/redux/sidebar-selectors.js b/packages/insomnia-app/app/ui/redux/sidebar-selectors.ts
similarity index 94%
rename from packages/insomnia-app/app/ui/redux/sidebar-selectors.js
rename to packages/insomnia-app/app/ui/redux/sidebar-selectors.ts
index 00f9aae79d..1f3bc14c05 100644
--- a/packages/insomnia-app/app/ui/redux/sidebar-selectors.js
+++ b/packages/insomnia-app/app/ui/redux/sidebar-selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { BaseModel } from '../../models';
 import type { Request } from '../../models/request';
 import type { GrpcRequest } from '../../models/grpc-request';
@@ -58,8 +57,8 @@ export const selectSidebarChildren = createSelector(
           }
 
           // Don't add children of requests
+          // @ts-expect-error -- TSCONVERSION
           child.children = shouldIgnoreChildrenOf(c) ? [] : next(c._id, pinnedChildren);
-
           return child;
         });
       } else {
@@ -67,7 +66,7 @@ export const selectSidebarChildren = createSelector(
       }
     }
 
-    function matchChildren(children, parentNames = []) {
+    function matchChildren(children, parentNames: Array<string> = []) {
       // Bail early if no filter defined
       if (!sidebarFilter) {
         return children;
@@ -76,17 +75,13 @@ export const selectSidebarChildren = createSelector(
       for (const child of children) {
         // Gather all parents so we can match them too
         matchChildren(child.children, [...parentNames, child.doc.name]);
-
         const hasMatchedChildren = child.children.find(c => c.hidden === false);
-
         // Try to match request attributes
         const name = child.doc.name;
         const method = isGrpcRequest(child.doc) ? 'gRPC' : child.doc.method;
-
         const match = fuzzyMatchAll(sidebarFilter, [name, method, ...parentNames], {
           splitSpace: true,
         });
-
         // Update hidden state depending on whether it matched
         const matched = hasMatchedChildren || match;
         child.hidden = !matched;
@@ -98,7 +93,9 @@ export const selectSidebarChildren = createSelector(
     const pinnedChildren = [];
     const childrenTree = next(activeWorkspace._id, pinnedChildren);
     const matchedChildren = matchChildren(childrenTree);
-
-    return { pinned: pinnedChildren, all: matchedChildren };
+    return {
+      pinned: pinnedChildren,
+      all: matchedChildren,
+    };
   },
 );
diff --git a/packages/insomnia-app/bin/yarn-standalone.js b/packages/insomnia-app/bin/yarn-standalone.js
index d0937678db..0ecfb34cdd 100644
--- a/packages/insomnia-app/bin/yarn-standalone.js
+++ b/packages/insomnia-app/bin/yarn-standalone.js
@@ -99578,7 +99578,7 @@ module.exports = !$assign || __webpack_require__(104)(function () {
   A[S] = 7;
   K.split('').forEach(function (k) { B[k] = k; });
   return $assign({}, A)[S] != 7 || Object.keys($assign({}, B)).join('') != K;
-}) ? function assign(target, source) { // eslint-disable-line no-unused-vars
+}) ? function assign(target, source) { // eslint-disable-line @typescript-eslint/no-unused-vars
   var T = toObject(target);
   var aLen = arguments.length;
   var index = 1;
diff --git a/packages/insomnia-app/config/index.js b/packages/insomnia-app/config/index.js
deleted file mode 100644
index c8bc6d29f3..0000000000
--- a/packages/insomnia-app/config/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * This file contains a helper to get the configuration for the app
- * NOTE: This is used during build scripts so can't reference any of the app code
- */
-
-const config = require('./config.json');
-
-module.exports.appConfig = function() {
-  return config;
-};
diff --git a/packages/insomnia-app/flow-typed/anybase.js b/packages/insomnia-app/flow-typed/anybase.js
deleted file mode 100644
index a6a5980c41..0000000000
--- a/packages/insomnia-app/flow-typed/anybase.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'any-base' {
-  declare module.exports: (srcAlphabet: string, dstAlphabet: string) => string => string;
-}
diff --git a/packages/insomnia-app/flow-typed/autobind-decorator.js b/packages/insomnia-app/flow-typed/autobind-decorator.js
deleted file mode 100644
index b29d11d9e0..0000000000
--- a/packages/insomnia-app/flow-typed/autobind-decorator.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'autobind-decorator' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-app/flow-typed/aws4.js b/packages/insomnia-app/flow-typed/aws4.js
deleted file mode 100644
index c450b2ba07..0000000000
--- a/packages/insomnia-app/flow-typed/aws4.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// @flow
-
-declare module 'aws4' {
-  declare module.exports: {
-    sign: (options: Object, credentials: Object) => { headers: { [string]: string } },
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/classnames.js b/packages/insomnia-app/flow-typed/classnames.js
deleted file mode 100644
index b7dcf6b772..0000000000
--- a/packages/insomnia-app/flow-typed/classnames.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'classnames' {
-  declare module.exports: (...args: Array<any>) => Object;
-}
diff --git a/packages/insomnia-app/flow-typed/clone.js b/packages/insomnia-app/flow-typed/clone.js
deleted file mode 100644
index c022a420c5..0000000000
--- a/packages/insomnia-app/flow-typed/clone.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'clone' {
-  declare module.exports: <T>(value: T) => T;
-}
diff --git a/packages/insomnia-app/flow-typed/codemirror.js b/packages/insomnia-app/flow-typed/codemirror.js
deleted file mode 100644
index e073054588..0000000000
--- a/packages/insomnia-app/flow-typed/codemirror.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// @flow
-
-declare module 'codemirror' {
-  declare class TextMarker {
-    __isFold: boolean;
-    clear(): void;
-    find(): { from: Pos, to: Pos };
-  }
-  declare class Doc {
-    markText(
-      from: { line: number, ch: number },
-      to: { line: number, ch: number },
-      options?: {|
-        inclusiveLeft?: boolean,
-        className?: string,
-        color?: string,
-      |},
-    ): TextMarker;
-  }
-  declare class Pos {
-    ch: number;
-    line: number;
-    sticky: string;
-    xRel: number;
-  }
-  declare class CodeMirror {
-    doc: Doc;
-    getCursor(): Pos;
-    getValue(): string;
-    setValue(string): void;
-    hasFocus(): boolean;
-    indexFromPos(pos: Pos): number;
-    getAllMarks(): Array<TextMarker>;
-  }
-}
diff --git a/packages/insomnia-app/flow-typed/color.js b/packages/insomnia-app/flow-typed/color.js
deleted file mode 100644
index 61ffadd2cd..0000000000
--- a/packages/insomnia-app/flow-typed/color.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// @flow
-
-declare class Color {
-  constructor(cssColor: string): Color;
-  rgb(): Object;
-}
-
-declare module 'color' {
-  declare module.exports: (cssColor: string) => {
-    rgb: () => {
-      array: () => Array<number>,
-      string: () => string,
-    },
-  }
-}
diff --git a/packages/insomnia-app/flow-typed/deep-equal.js b/packages/insomnia-app/flow-typed/deep-equal.js
deleted file mode 100644
index 3642d53d21..0000000000
--- a/packages/insomnia-app/flow-typed/deep-equal.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'deep-equal' {
-  declare module.exports: (any, any) => boolean;
-}
diff --git a/packages/insomnia-app/flow-typed/electron-context-menu.js b/packages/insomnia-app/flow-typed/electron-context-menu.js
deleted file mode 100644
index 36f993502c..0000000000
--- a/packages/insomnia-app/flow-typed/electron-context-menu.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'electron-context-menu' {
-  declare module.exports: ({ window: Window }) => void;
-}
diff --git a/packages/insomnia-app/flow-typed/electron-squirrel-startup.js b/packages/insomnia-app/flow-typed/electron-squirrel-startup.js
deleted file mode 100644
index c76eea5a6f..0000000000
--- a/packages/insomnia-app/flow-typed/electron-squirrel-startup.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'electron-squirrel-startup' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-app/flow-typed/electron-updater.js b/packages/insomnia-app/flow-typed/electron-updater.js
deleted file mode 100644
index c6dd4fa788..0000000000
--- a/packages/insomnia-app/flow-typed/electron-updater.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// @flow
-
-declare module 'electron-updater' {
-  declare module.exports: {
-    autoUpdater: {
-      requestHeaders: Object,
-      checkForUpdatesAndNotify: () => void,
-    },
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/electron.js b/packages/insomnia-app/flow-typed/electron.js
deleted file mode 100644
index cc11ebdeac..0000000000
--- a/packages/insomnia-app/flow-typed/electron.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// @flow
-
-declare module 'electron' {
-  declare module.exports: {
-    remote: {
-      shell: Object,
-      app: Object,
-      BrowserWindow: Object,
-      ipcMain: Object,
-      session: Object,
-      net: Object,
-      dialog: Object,
-      screen: Object,
-    },
-    shell: Object,
-    app: Object,
-    BrowserWindow: Object,
-    ipcRenderer: Object,
-    ipcMain: Object,
-    session: Object,
-    net: Object,
-    dialog: Object,
-    clipboard: Object,
-    screen: Object,
-    autoUpdater: Object,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/events.js b/packages/insomnia-app/flow-typed/events.js
deleted file mode 100644
index 78ab67c052..0000000000
--- a/packages/insomnia-app/flow-typed/events.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'events' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-app/flow-typed/font-scanner.js b/packages/insomnia-app/flow-typed/font-scanner.js
deleted file mode 100644
index 26d251512e..0000000000
--- a/packages/insomnia-app/flow-typed/font-scanner.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'font-scanner' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-app/flow-typed/fs-extra.js b/packages/insomnia-app/flow-typed/fs-extra.js
deleted file mode 100644
index 03e4008d20..0000000000
--- a/packages/insomnia-app/flow-typed/fs-extra.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// @flow
-
-declare module 'fs-extra' {
-  declare module.exports: {
-    moveSync: (src: string, dest: string, options?: { overwrite?: boolean }) => void,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/fuzzysort.js b/packages/insomnia-app/flow-typed/fuzzysort.js
deleted file mode 100644
index e20a72ac50..0000000000
--- a/packages/insomnia-app/flow-typed/fuzzysort.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// @flow
-
-declare module 'fuzzysort' {
-  declare module.exports: {
-    highlight: Function,
-    single: Function,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/hawk.js b/packages/insomnia-app/flow-typed/hawk.js
deleted file mode 100644
index dca1d8b62a..0000000000
--- a/packages/insomnia-app/flow-typed/hawk.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'hawk' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-app/flow-typed/iconv-lite.js b/packages/insomnia-app/flow-typed/iconv-lite.js
deleted file mode 100644
index 8b0bb3cd8d..0000000000
--- a/packages/insomnia-app/flow-typed/iconv-lite.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'iconv-lite' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-app/flow-typed/insomnia-cookies.js b/packages/insomnia-app/flow-typed/insomnia-cookies.js
deleted file mode 100644
index 7e7697b87b..0000000000
--- a/packages/insomnia-app/flow-typed/insomnia-cookies.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// @flow
-
-declare module 'insomnia-cookies' {
-  declare module.exports: {
-    cookieToString: Function,
-    jarFromCookies: Function,
-    cookiesFromJar: Function,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/insomnia-importers.js b/packages/insomnia-app/flow-typed/insomnia-importers.js
deleted file mode 100644
index d1b3bd974e..0000000000
--- a/packages/insomnia-app/flow-typed/insomnia-importers.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// @flow
-
-declare module 'insomnia-importers' {
-  declare module.exports: {
-    convert: (
-      data: string,
-    ) => Promise<{
-      type: {
-        id: string,
-        name: string,
-        description: string,
-      },
-      data: {
-        resources: Array<Object>,
-      },
-    }>,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/insomnia-plugin-hash.js b/packages/insomnia-app/flow-typed/insomnia-plugin-hash.js
deleted file mode 100644
index 9c20a97124..0000000000
--- a/packages/insomnia-app/flow-typed/insomnia-plugin-hash.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// @flow
-
-import type { PluginTemplateTag } from '../app/templating/extensions/index';
-
-declare module 'insomnia-plugin-hash' {
-  declare module.exports: {
-    templateTags: Array<PluginTemplateTag>,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/insomnia-prettify.js b/packages/insomnia-app/flow-typed/insomnia-prettify.js
deleted file mode 100644
index 86ba1a5cd3..0000000000
--- a/packages/insomnia-app/flow-typed/insomnia-prettify.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// @flow
-
-declare module 'insomnia-prettify' {
-  declare module.exports: {
-    json: Function,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/insomnia-url.js b/packages/insomnia-app/flow-typed/insomnia-url.js
deleted file mode 100644
index 28043115b0..0000000000
--- a/packages/insomnia-app/flow-typed/insomnia-url.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// @flow
-
-declare module 'insomnia-url' {
-  declare module.exports: {
-    setDefaultProtocol: Function,
-    smartEncodeUrl: Function,
-    joinUrlAndQueryString: Function,
-    deconstructQueryStringToParams: Function,
-    extractQueryStringFromUrl: Function,
-    buildQueryParameter: Function,
-    buildQueryStringFromParams: Function,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/isomorphic-git.js b/packages/insomnia-app/flow-typed/isomorphic-git.js
deleted file mode 100644
index c33f481f5a..0000000000
--- a/packages/insomnia-app/flow-typed/isomorphic-git.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'isomorphic-git' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-app/flow-typed/jest.js b/packages/insomnia-app/flow-typed/jest.js
deleted file mode 100644
index 2ad13d02b9..0000000000
--- a/packages/insomnia-app/flow-typed/jest.js
+++ /dev/null
@@ -1,1186 +0,0 @@
-type JestMockFn<TArguments: $ReadOnlyArray<*>, TReturn> = {
-  (...args: TArguments): TReturn,
-  /**
-   * An object for introspecting mock calls
-   */
-  mock: {
-    /**
-     * An array that represents all calls that have been made into this mock
-     * function. Each call is represented by an array of arguments that were
-     * passed during the call.
-     */
-    calls: Array<TArguments>,
-    /**
-     * An array that contains all the object instances that have been
-     * instantiated from this mock function.
-     */
-    instances: Array<TReturn>,
-    /**
-     * An array that contains all the object results that have been
-     * returned by this mock function call
-     */
-    results: Array<{
-      isThrow: boolean,
-      value: TReturn,
-      ...
-    }>,
-    ...
-  },
-  /**
-   * Resets all information stored in the mockFn.mock.calls and
-   * mockFn.mock.instances arrays. Often this is useful when you want to clean
-   * up a mock's usage data between two assertions.
-   */
-  mockClear(): void,
-  /**
-   * Resets all information stored in the mock. This is useful when you want to
-   * completely restore a mock back to its initial state.
-   */
-  mockReset(): void,
-  /**
-   * Removes the mock and restores the initial implementation. This is useful
-   * when you want to mock functions in certain test cases and restore the
-   * original implementation in others. Beware that mockFn.mockRestore only
-   * works when mock was created with jest.spyOn. Thus you have to take care of
-   * restoration yourself when manually assigning jest.fn().
-   */
-  mockRestore(): void,
-  /**
-   * Accepts a function that should be used as the implementation of the mock.
-   * The mock itself will still record all calls that go into and instances
-   * that come from itself -- the only difference is that the implementation
-   * will also be executed when the mock is called.
-   */
-  mockImplementation(fn: (...args: TArguments) => TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Accepts a function that will be used as an implementation of the mock for
-   * one call to the mocked function. Can be chained so that multiple function
-   * calls produce different results.
-   */
-  mockImplementationOnce(fn: (...args: TArguments) => TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Accepts a string to use in test result output in place of "jest.fn()" to
-   * indicate which mock function is being referenced.
-   */
-  mockName(name: string): JestMockFn<TArguments, TReturn>,
-  /**
-   * Just a simple sugar function for returning `this`
-   */
-  mockReturnThis(): void,
-  /**
-   * Accepts a value that will be returned whenever the mock function is called.
-   */
-  mockReturnValue(value: TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Sugar for only returning a value once inside your mock
-   */
-  mockReturnValueOnce(value: TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Sugar for jest.fn().mockImplementation(() => Promise.resolve(value))
-   */
-  mockResolvedValue(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
-  /**
-   * Sugar for jest.fn().mockImplementationOnce(() => Promise.resolve(value))
-   */
-  mockResolvedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
-  /**
-   * Sugar for jest.fn().mockImplementation(() => Promise.reject(value))
-   */
-  mockRejectedValue(value: TReturn): JestMockFn<TArguments, Promise<any>>,
-  /**
-   * Sugar for jest.fn().mockImplementationOnce(() => Promise.reject(value))
-   */
-  mockRejectedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<any>>,
-  ...
-};
-
-type JestAsymmetricEqualityType = {
-  /**
-   * A custom Jasmine equality tester
-   */
-  asymmetricMatch(value: mixed): boolean,
-  ...
-};
-
-type JestCallsType = {
-  allArgs(): mixed,
-  all(): mixed,
-  any(): boolean,
-  count(): number,
-  first(): mixed,
-  mostRecent(): mixed,
-  reset(): void,
-  ...
-};
-
-type JestClockType = {
-  install(): void,
-  mockDate(date: Date): void,
-  tick(milliseconds?: number): void,
-  uninstall(): void,
-  ...
-};
-
-type JestMatcherResult = {
-  message?: string | (() => string),
-  pass: boolean,
-  ...
-};
-
-type JestMatcher = (
-  received: any,
-  ...actual: Array<any>
-) => JestMatcherResult | Promise<JestMatcherResult>;
-
-type JestPromiseType = {
-  /**
-   * Use rejects to unwrap the reason of a rejected promise so any other
-   * matcher can be chained. If the promise is fulfilled the assertion fails.
-   */
-  rejects: JestExpectType,
-  /**
-   * Use resolves to unwrap the value of a fulfilled promise so any other
-   * matcher can be chained. If the promise is rejected the assertion fails.
-   */
-  resolves: JestExpectType,
-  ...
-};
-
-/**
- * Jest allows functions and classes to be used as test names in test() and
- * describe()
- */
-type JestTestName = string | Function;
-
-/**
- *  Plugin: jest-styled-components
- */
-
-type JestStyledComponentsMatcherValue =
-  | string
-  | JestAsymmetricEqualityType
-  | RegExp
-  | typeof undefined;
-
-type JestStyledComponentsMatcherOptions = {
-  media?: string,
-  modifier?: string,
-  supports?: string,
-  ...
-};
-
-type JestStyledComponentsMatchersType = {
-  toHaveStyleRule(
-    property: string,
-    value: JestStyledComponentsMatcherValue,
-    options?: JestStyledComponentsMatcherOptions,
-  ): void,
-  ...
-};
-
-/**
- *  Plugin: jest-enzyme
- */
-type EnzymeMatchersType = {
-  // 5.x
-  toBeEmpty(): void,
-  toBePresent(): void,
-  // 6.x
-  toBeChecked(): void,
-  toBeDisabled(): void,
-  toBeEmptyRender(): void,
-  toContainMatchingElement(selector: string): void,
-  toContainMatchingElements(n: number, selector: string): void,
-  toContainExactlyOneMatchingElement(selector: string): void,
-  toContainReact(element: React$Element<any>): void,
-  toExist(): void,
-  toHaveClassName(className: string): void,
-  toHaveHTML(html: string): void,
-  toHaveProp: ((propKey: string, propValue?: any) => void) & ((props: { ... }) => void),
-  toHaveRef(refName: string): void,
-  toHaveState: ((stateKey: string, stateValue?: any) => void) & ((state: { ... }) => void),
-  toHaveStyle: ((styleKey: string, styleValue?: any) => void) & ((style: { ... }) => void),
-  toHaveTagName(tagName: string): void,
-  toHaveText(text: string): void,
-  toHaveValue(value: any): void,
-  toIncludeText(text: string): void,
-  toMatchElement(
-    element: React$Element<any>,
-    options?: {| ignoreProps?: boolean, verbose?: boolean |},
-  ): void,
-  toMatchSelector(selector: string): void,
-  // 7.x
-  toHaveDisplayName(name: string): void,
-  ...
-};
-
-// DOM testing library extensions (jest-dom)
-// https://github.com/testing-library/jest-dom
-type DomTestingLibraryType = {
-  /**
-   * @deprecated
-   */
-  toBeInTheDOM(container?: HTMLElement): void,
-  toBeInTheDocument(): void,
-  toBeVisible(): void,
-  toBeEmpty(): void,
-  toBeDisabled(): void,
-  toBeEnabled(): void,
-  toBeInvalid(): void,
-  toBeRequired(): void,
-  toBeValid(): void,
-  toContainElement(element: HTMLElement | null): void,
-  toContainHTML(htmlText: string): void,
-  toHaveAttribute(attr: string, value?: any): void,
-  toHaveClass(...classNames: string[]): void,
-  toHaveFocus(): void,
-  toHaveFormValues(expectedValues: { [name: string]: any, ... }): void,
-  toHaveStyle(css: string): void,
-  toHaveTextContent(text: string | RegExp, options?: { normalizeWhitespace: boolean, ... }): void,
-  toHaveValue(value?: string | string[] | number): void,
-  ...
-};
-
-// Jest JQuery Matchers: https://github.com/unindented/custom-jquery-matchers
-type JestJQueryMatchersType = {
-  toExist(): void,
-  toHaveLength(len: number): void,
-  toHaveId(id: string): void,
-  toHaveClass(className: string): void,
-  toHaveTag(tag: string): void,
-  toHaveAttr(key: string, val?: any): void,
-  toHaveProp(key: string, val?: any): void,
-  toHaveText(text: string | RegExp): void,
-  toHaveData(key: string, val?: any): void,
-  toHaveValue(val: any): void,
-  toHaveCss(css: { [key: string]: any, ... }): void,
-  toBeChecked(): void,
-  toBeDisabled(): void,
-  toBeEmpty(): void,
-  toBeHidden(): void,
-  toBeSelected(): void,
-  toBeVisible(): void,
-  toBeFocused(): void,
-  toBeInDom(): void,
-  toBeMatchedBy(sel: string): void,
-  toHaveDescendant(sel: string): void,
-  toHaveDescendantWithText(sel: string, text: string | RegExp): void,
-  ...
-};
-
-// Jest Extended Matchers: https://github.com/jest-community/jest-extended
-type JestExtendedMatchersType = {
-  /**
-   * Note: Currently unimplemented
-   * Passing assertion
-   *
-   * @param {String} message
-   */
-  //  pass(message: string): void;
-
-  /**
-   * Note: Currently unimplemented
-   * Failing assertion
-   *
-   * @param {String} message
-   */
-  //  fail(message: string): void;
-
-  /**
-   * Use .toBeEmpty when checking if a String '', Array [] or Object {} is empty.
-   */
-  toBeEmpty(): void,
-  /**
-   * Use .toBeOneOf when checking if a value is a member of a given Array.
-   * @param {Array.<*>} members
-   */
-  toBeOneOf(members: any[]): void,
-  /**
-   * Use `.toBeNil` when checking a value is `null` or `undefined`.
-   */
-  toBeNil(): void,
-  /**
-   * Use `.toSatisfy` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean`.
-   * @param {Function} predicate
-   */
-  toSatisfy(predicate: (n: any) => boolean): void,
-  /**
-   * Use `.toBeArray` when checking if a value is an `Array`.
-   */
-  toBeArray(): void,
-  /**
-   * Use `.toBeArrayOfSize` when checking if a value is an `Array` of size x.
-   * @param {Number} x
-   */
-  toBeArrayOfSize(x: number): void,
-  /**
-   * Use `.toIncludeAllMembers` when checking if an `Array` contains all of the same members of a given set.
-   * @param {Array.<*>} members
-   */
-  toIncludeAllMembers(members: any[]): void,
-  /**
-   * Use `.toIncludeAnyMembers` when checking if an `Array` contains any of the members of a given set.
-   * @param {Array.<*>} members
-   */
-  toIncludeAnyMembers(members: any[]): void,
-  /**
-   * Use `.toSatisfyAll` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean` for all values in an array.
-   * @param {Function} predicate
-   */
-  toSatisfyAll(predicate: (n: any) => boolean): void,
-  /**
-   * Use `.toBeBoolean` when checking if a value is a `Boolean`.
-   */
-  toBeBoolean(): void,
-  /**
-   * Use `.toBeTrue` when checking a value is equal (===) to `true`.
-   */
-  toBeTrue(): void,
-  /**
-   * Use `.toBeFalse` when checking a value is equal (===) to `false`.
-   */
-  toBeFalse(): void,
-  /**
-   * Use .toBeDate when checking if a value is a Date.
-   */
-  toBeDate(): void,
-  /**
-   * Use `.toBeFunction` when checking if a value is a `Function`.
-   */
-  toBeFunction(): void,
-  /**
-   * Use `.toHaveBeenCalledBefore` when checking if a `Mock` was called before another `Mock`.
-   *
-   * Note: Required Jest version >22
-   * Note: Your mock functions will have to be asynchronous to cause the timestamps inside of Jest to occur in a differentJS event loop, otherwise the mock timestamps will all be the same
-   *
-   * @param {Mock} mock
-   */
-  toHaveBeenCalledBefore(mock: JestMockFn<any, any>): void,
-  /**
-   * Use `.toBeNumber` when checking if a value is a `Number`.
-   */
-  toBeNumber(): void,
-  /**
-   * Use `.toBeNaN` when checking a value is `NaN`.
-   */
-  toBeNaN(): void,
-  /**
-   * Use `.toBeFinite` when checking if a value is a `Number`, not `NaN` or `Infinity`.
-   */
-  toBeFinite(): void,
-  /**
-   * Use `.toBePositive` when checking if a value is a positive `Number`.
-   */
-  toBePositive(): void,
-  /**
-   * Use `.toBeNegative` when checking if a value is a negative `Number`.
-   */
-  toBeNegative(): void,
-  /**
-   * Use `.toBeEven` when checking if a value is an even `Number`.
-   */
-  toBeEven(): void,
-  /**
-   * Use `.toBeOdd` when checking if a value is an odd `Number`.
-   */
-  toBeOdd(): void,
-  /**
-   * Use `.toBeWithin` when checking if a number is in between the given bounds of: start (inclusive) and end (exclusive).
-   *
-   * @param {Number} start
-   * @param {Number} end
-   */
-  toBeWithin(start: number, end: number): void,
-  /**
-   * Use `.toBeObject` when checking if a value is an `Object`.
-   */
-  toBeObject(): void,
-  /**
-   * Use `.toContainKey` when checking if an object contains the provided key.
-   *
-   * @param {String} key
-   */
-  toContainKey(key: string): void,
-  /**
-   * Use `.toContainKeys` when checking if an object has all of the provided keys.
-   *
-   * @param {Array.<String>} keys
-   */
-  toContainKeys(keys: string[]): void,
-  /**
-   * Use `.toContainAllKeys` when checking if an object only contains all of the provided keys.
-   *
-   * @param {Array.<String>} keys
-   */
-  toContainAllKeys(keys: string[]): void,
-  /**
-   * Use `.toContainAnyKeys` when checking if an object contains at least one of the provided keys.
-   *
-   * @param {Array.<String>} keys
-   */
-  toContainAnyKeys(keys: string[]): void,
-  /**
-   * Use `.toContainValue` when checking if an object contains the provided value.
-   *
-   * @param {*} value
-   */
-  toContainValue(value: any): void,
-  /**
-   * Use `.toContainValues` when checking if an object contains all of the provided values.
-   *
-   * @param {Array.<*>} values
-   */
-  toContainValues(values: any[]): void,
-  /**
-   * Use `.toContainAllValues` when checking if an object only contains all of the provided values.
-   *
-   * @param {Array.<*>} values
-   */
-  toContainAllValues(values: any[]): void,
-  /**
-   * Use `.toContainAnyValues` when checking if an object contains at least one of the provided values.
-   *
-   * @param {Array.<*>} values
-   */
-  toContainAnyValues(values: any[]): void,
-  /**
-   * Use `.toContainEntry` when checking if an object contains the provided entry.
-   *
-   * @param {Array.<String, String>} entry
-   */
-  toContainEntry(entry: [string, string]): void,
-  /**
-   * Use `.toContainEntries` when checking if an object contains all of the provided entries.
-   *
-   * @param {Array.<Array.<String, String>>} entries
-   */
-  toContainEntries(entries: [string, string][]): void,
-  /**
-   * Use `.toContainAllEntries` when checking if an object only contains all of the provided entries.
-   *
-   * @param {Array.<Array.<String, String>>} entries
-   */
-  toContainAllEntries(entries: [string, string][]): void,
-  /**
-   * Use `.toContainAnyEntries` when checking if an object contains at least one of the provided entries.
-   *
-   * @param {Array.<Array.<String, String>>} entries
-   */
-  toContainAnyEntries(entries: [string, string][]): void,
-  /**
-   * Use `.toBeExtensible` when checking if an object is extensible.
-   */
-  toBeExtensible(): void,
-  /**
-   * Use `.toBeFrozen` when checking if an object is frozen.
-   */
-  toBeFrozen(): void,
-  /**
-   * Use `.toBeSealed` when checking if an object is sealed.
-   */
-  toBeSealed(): void,
-  /**
-   * Use `.toBeString` when checking if a value is a `String`.
-   */
-  toBeString(): void,
-  /**
-   * Use `.toEqualCaseInsensitive` when checking if a string is equal (===) to another ignoring the casing of both strings.
-   *
-   * @param {String} string
-   */
-  toEqualCaseInsensitive(string: string): void,
-  /**
-   * Use `.toStartWith` when checking if a `String` starts with a given `String` prefix.
-   *
-   * @param {String} prefix
-   */
-  toStartWith(prefix: string): void,
-  /**
-   * Use `.toEndWith` when checking if a `String` ends with a given `String` suffix.
-   *
-   * @param {String} suffix
-   */
-  toEndWith(suffix: string): void,
-  /**
-   * Use `.toInclude` when checking if a `String` includes the given `String` substring.
-   *
-   * @param {String} substring
-   */
-  toInclude(substring: string): void,
-  /**
-   * Use `.toIncludeRepeated` when checking if a `String` includes the given `String` substring the correct number of times.
-   *
-   * @param {String} substring
-   * @param {Number} times
-   */
-  toIncludeRepeated(substring: string, times: number): void,
-  /**
-   * Use `.toIncludeMultiple` when checking if a `String` includes all of the given substrings.
-   *
-   * @param {Array.<String>} substring
-   */
-  toIncludeMultiple(substring: string[]): void,
-  ...
-};
-
-interface JestExpectType {
-  not: JestExpectType &
-    EnzymeMatchersType &
-    DomTestingLibraryType &
-    JestJQueryMatchersType &
-    JestStyledComponentsMatchersType &
-    JestExtendedMatchersType;
-
-  /**
-   * If you have a mock function, you can use .lastCalledWith to test what
-   * arguments it was last called with.
-   */
-  lastCalledWith(...args: Array<any>): void;
-
-  /**
-   * toBe just checks that a value is what you expect. It uses === to check
-   * strict equality.
-   */
-  toBe(value: any): void;
-
-  /**
-   * Use .toBeCalledWith to ensure that a mock function was called with
-   * specific arguments.
-   */
-  toBeCalledWith(...args: Array<any>): void;
-
-  /**
-   * Using exact equality with floating point numbers is a bad idea. Rounding
-   * means that intuitive things fail.
-   */
-  toBeCloseTo(num: number, delta: any): void;
-
-  /**
-   * Use .toBeDefined to check that a variable is not undefined.
-   */
-  toBeDefined(): void;
-
-  /**
-   * Use .toBeFalsy when you don't care what a value is, you just want to
-   * ensure a value is false in a boolean context.
-   */
-  toBeFalsy(): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeGreaterThan.
-   */
-  toBeGreaterThan(number: number): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeGreaterThanOrEqual.
-   */
-  toBeGreaterThanOrEqual(number: number): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeLessThan.
-   */
-  toBeLessThan(number: number): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeLessThanOrEqual.
-   */
-  toBeLessThanOrEqual(number: number): void;
-
-  /**
-   * Use .toBeInstanceOf(Class) to check that an object is an instance of a
-   * class.
-   */
-  toBeInstanceOf(cls: Class<*>): void;
-
-  /**
-   * .toBeNull() is the same as .toBe(null) but the error messages are a bit
-   * nicer.
-   */
-  toBeNull(): void;
-
-  /**
-   * Use .toBeTruthy when you don't care what a value is, you just want to
-   * ensure a value is true in a boolean context.
-   */
-  toBeTruthy(): void;
-
-  /**
-   * Use .toBeUndefined to check that a variable is undefined.
-   */
-  toBeUndefined(): void;
-
-  /**
-   * Use .toContain when you want to check that an item is in a list. For
-   * testing the items in the list, this uses ===, a strict equality check.
-   */
-  toContain(item: any): void;
-
-  /**
-   * Use .toContainEqual when you want to check that an item is in a list. For
-   * testing the items in the list, this matcher recursively checks the
-   * equality of all fields, rather than checking for object identity.
-   */
-  toContainEqual(item: any): void;
-
-  /**
-   * Use .toEqual when you want to check that two objects have the same value.
-   * This matcher recursively checks the equality of all fields, rather than
-   * checking for object identity.
-   */
-  toEqual(value: any): void;
-
-  /**
-   * Use .toHaveBeenCalled to ensure that a mock function got called.
-   */
-  toHaveBeenCalled(): void;
-
-  toBeCalled(): void;
-
-  /**
-   * Use .toHaveBeenCalledTimes to ensure that a mock function got called exact
-   * number of times.
-   */
-  toHaveBeenCalledTimes(number: number): void;
-
-  toBeCalledTimes(number: number): void;
-
-  /**
-   *
-   */
-  toHaveBeenNthCalledWith(nthCall: number, ...args: Array<any>): void;
-
-  nthCalledWith(nthCall: number, ...args: Array<any>): void;
-
-  /**
-   *
-   */
-  toHaveReturned(): void;
-
-  toReturn(): void;
-
-  /**
-   *
-   */
-  toHaveReturnedTimes(number: number): void;
-
-  toReturnTimes(number: number): void;
-
-  /**
-   *
-   */
-  toHaveReturnedWith(value: any): void;
-
-  toReturnWith(value: any): void;
-
-  /**
-   *
-   */
-  toHaveLastReturnedWith(value: any): void;
-
-  lastReturnedWith(value: any): void;
-
-  /**
-   *
-   */
-  toHaveNthReturnedWith(nthCall: number, value: any): void;
-
-  nthReturnedWith(nthCall: number, value: any): void;
-
-  /**
-   * Use .toHaveBeenCalledWith to ensure that a mock function was called with
-   * specific arguments.
-   */
-  toHaveBeenCalledWith(...args: Array<any>): void;
-
-  toBeCalledWith(...args: Array<any>): void;
-
-  /**
-   * Use .toHaveBeenLastCalledWith to ensure that a mock function was last called
-   * with specific arguments.
-   */
-  toHaveBeenLastCalledWith(...args: Array<any>): void;
-
-  lastCalledWith(...args: Array<any>): void;
-
-  /**
-   * Check that an object has a .length property and it is set to a certain
-   * numeric value.
-   */
-  toHaveLength(number: number): void;
-
-  /**
-   *
-   */
-  toHaveProperty(propPath: string | $ReadOnlyArray<string>, value?: any): void;
-
-  /**
-   * Use .toMatch to check that a string matches a regular expression or string.
-   */
-  toMatch(regexpOrString: RegExp | string): void;
-
-  /**
-   * Use .toMatchObject to check that a javascript object matches a subset of the properties of an object.
-   */
-  toMatchObject(object: Object | Array<Object>): void;
-
-  /**
-   * Use .toStrictEqual to check that a javascript object matches a subset of the properties of an object.
-   */
-  toStrictEqual(value: any): void;
-
-  /**
-   * This ensures that an Object matches the most recent snapshot.
-   */
-  toMatchSnapshot(propertyMatchers?: any, name?: string): void;
-
-  /**
-   * This ensures that an Object matches the most recent snapshot.
-   */
-  toMatchSnapshot(name: string): void;
-
-  toMatchInlineSnapshot(snapshot?: string): void;
-
-  toMatchInlineSnapshot(propertyMatchers?: any, snapshot?: string): void;
-
-  /**
-   * Use .toThrow to test that a function throws when it is called.
-   * If you want to test that a specific error gets thrown, you can provide an
-   * argument to toThrow. The argument can be a string for the error message,
-   * a class for the error, or a regex that should match the error.
-   *
-   * Alias: .toThrowError
-   */
-  toThrow(message?: string | Error | Class<Error> | RegExp): void;
-
-  toThrowError(message?: string | Error | Class<Error> | RegExp): void;
-
-  /**
-   * Use .toThrowErrorMatchingSnapshot to test that a function throws a error
-   * matching the most recent snapshot when it is called.
-   */
-  toThrowErrorMatchingSnapshot(): void;
-
-  toThrowErrorMatchingInlineSnapshot(snapshot?: string): void;
-}
-
-type JestObjectType = {
-  /**
-   *  Disables automatic mocking in the module loader.
-   *
-   *  After this method is called, all `require()`s will return the real
-   *  versions of each module (rather than a mocked version).
-   */
-  disableAutomock(): JestObjectType,
-  /**
-   * An un-hoisted version of disableAutomock
-   */
-  autoMockOff(): JestObjectType,
-  /**
-   * Enables automatic mocking in the module loader.
-   */
-  enableAutomock(): JestObjectType,
-  /**
-   * An un-hoisted version of enableAutomock
-   */
-  autoMockOn(): JestObjectType,
-  /**
-   * Clears the mock.calls and mock.instances properties of all mocks.
-   * Equivalent to calling .mockClear() on every mocked function.
-   */
-  clearAllMocks(): JestObjectType,
-  /**
-   * Resets the state of all mocks. Equivalent to calling .mockReset() on every
-   * mocked function.
-   */
-  resetAllMocks(): JestObjectType,
-  /**
-   * Restores all mocks back to their original value.
-   */
-  restoreAllMocks(): JestObjectType,
-  /**
-   * Removes any pending timers from the timer system.
-   */
-  clearAllTimers(): void,
-  /**
-   * Returns the number of fake timers still left to run.
-   */
-  getTimerCount(): number,
-  /**
-   * The same as `mock` but not moved to the top of the expectation by
-   * babel-jest.
-   */
-  doMock(moduleName: string, moduleFactory?: any): JestObjectType,
-  /**
-   * The same as `unmock` but not moved to the top of the expectation by
-   * babel-jest.
-   */
-  dontMock(moduleName: string): JestObjectType,
-  /**
-   * Returns a new, unused mock function. Optionally takes a mock
-   * implementation.
-   */
-  fn<TArguments: $ReadOnlyArray<*>, TReturn>(
-    implementation?: (...args: TArguments) => TReturn,
-  ): JestMockFn<TArguments, TReturn>,
-  /**
-   * Determines if the given function is a mocked function.
-   */
-  isMockFunction(fn: Function): boolean,
-  /**
-   * Given the name of a module, use the automatic mocking system to generate a
-   * mocked version of the module for you.
-   */
-  genMockFromModule(moduleName: string): any,
-  /**
-   * Mocks a module with an auto-mocked version when it is being required.
-   *
-   * The second argument can be used to specify an explicit module factory that
-   * is being run instead of using Jest's automocking feature.
-   *
-   * The third argument can be used to create virtual mocks -- mocks of modules
-   * that don't exist anywhere in the system.
-   */
-  mock(moduleName: string, moduleFactory?: any, options?: Object): JestObjectType,
-  /**
-   * Returns the actual module instead of a mock, bypassing all checks on
-   * whether the module should receive a mock implementation or not.
-   */
-  requireActual(moduleName: string): any,
-  /**
-   * Returns a mock module instead of the actual module, bypassing all checks
-   * on whether the module should be required normally or not.
-   */
-  requireMock(moduleName: string): any,
-  /**
-   * Resets the module registry - the cache of all required modules. This is
-   * useful to isolate modules where local state might conflict between tests.
-   */
-  resetModules(): JestObjectType,
-  /**
-   * Creates a sandbox registry for the modules that are loaded inside the
-   * callback function. This is useful to isolate specific modules for every
-   * test so that local module state doesn't conflict between tests.
-   */
-  isolateModules(fn: () => void): JestObjectType,
-  /**
-   * Exhausts the micro-task queue (usually interfaced in node via
-   * process.nextTick).
-   */
-  runAllTicks(): void,
-  /**
-   * Exhausts the macro-task queue (i.e., all tasks queued by setTimeout(),
-   * setInterval(), and setImmediate()).
-   */
-  runAllTimers(): void,
-  /**
-   * Exhausts all tasks queued by setImmediate().
-   */
-  runAllImmediates(): void,
-  /**
-   * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-   * or setInterval() and setImmediate()).
-   */
-  advanceTimersByTime(msToRun: number): void,
-  /**
-   * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-   * or setInterval() and setImmediate()).
-   *
-   * Renamed to `advanceTimersByTime`.
-   */
-  runTimersToTime(msToRun: number): void,
-  /**
-   * Executes only the macro-tasks that are currently pending (i.e., only the
-   * tasks that have been queued by setTimeout() or setInterval() up to this
-   * point)
-   */
-  runOnlyPendingTimers(): void,
-  /**
-   * Explicitly supplies the mock object that the module system should return
-   * for the specified module. Note: It is recommended to use jest.mock()
-   * instead.
-   */
-  setMock(moduleName: string, moduleExports: any): JestObjectType,
-  /**
-   * Indicates that the module system should never return a mocked version of
-   * the specified module from require() (e.g. that it should always return the
-   * real module).
-   */
-  unmock(moduleName: string): JestObjectType,
-  /**
-   * Instructs Jest to use fake versions of the standard timer functions
-   * (setTimeout, setInterval, clearTimeout, clearInterval, nextTick,
-   * setImmediate and clearImmediate).
-   */
-  useFakeTimers(): JestObjectType,
-  /**
-   * Instructs Jest to use the real versions of the standard timer functions.
-   */
-  useRealTimers(): JestObjectType,
-  /**
-   * Creates a mock function similar to jest.fn but also tracks calls to
-   * object[methodName].
-   */
-  spyOn(object: Object, methodName: string, accessType?: 'get' | 'set'): JestMockFn<any, any>,
-  /**
-   * Set the default timeout interval for tests and before/after hooks in milliseconds.
-   * Note: The default timeout interval is 5 seconds if this method is not called.
-   */
-  setTimeout(timeout: number): JestObjectType,
-  ...
-};
-
-type JestSpyType = { calls: JestCallsType, ... };
-
-type JestDoneFn = {|
-  (): void,
-  fail: (error: Error) => void,
-|};
-
-/** Runs this function after every test inside this context */
-declare function afterEach(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** Runs this function before every test inside this context */
-declare function beforeEach(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** Runs this function after all tests have finished inside this context */
-declare function afterAll(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** Runs this function before any tests have started inside this context */
-declare function beforeAll(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** A context for grouping tests together */
-declare var describe: {
-  /**
-   * Creates a block that groups together several related tests in one "test suite"
-   */
-  (name: JestTestName, fn: () => void): void,
-  /**
-   * Only run this describe block
-   */
-  only(name: JestTestName, fn: () => void): void,
-  /**
-   * Skip running this describe block
-   */
-  skip(name: JestTestName, fn: () => void): void,
-  /**
-   * each runs this test against array of argument arrays per each run
-   *
-   * @param {table} table of Test
-   */
-  each(
-    ...table: Array<Array<mixed> | mixed> | [Array<string>, string]
-  ): (name: JestTestName, fn?: (...args: Array<any>) => ?Promise<mixed>, timeout?: number) => void,
-  ...
-};
-
-/** An individual test unit */
-declare var it: {
-  /**
-   * An individual test unit
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  (name: JestTestName, fn?: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void,
-  /**
-   * Only run this test
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  only: {|
-    (name: JestTestName, fn?: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void,
-    each(
-      ...table: Array<Array<mixed> | mixed> | [Array<string>, string]
-    ): (
-      name: JestTestName,
-      fn?: (...args: Array<any>) => ?Promise<mixed>,
-      timeout?: number,
-    ) => void,
-  |},
-  /**
-   * Skip running this test
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  skip(name: JestTestName, fn?: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void,
-  /**
-   * Highlight planned tests in the summary output
-   *
-   * @param {String} Name of Test to do
-   */
-  todo(name: string): void,
-  /**
-   * Run the test concurrently
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  concurrent(
-    name: JestTestName,
-    fn?: (done: JestDoneFn) => ?Promise<mixed>,
-    timeout?: number,
-  ): void,
-  /**
-   * each runs this test against array of argument arrays per each run
-   *
-   * @param {table} table of Test
-   */
-  each(
-    ...table: Array<Array<mixed> | mixed> | [Array<string>, string]
-  ): (name: JestTestName, fn?: (...args: Array<any>) => ?Promise<mixed>, timeout?: number) => void,
-  ...
-};
-
-declare function fit(
-  name: JestTestName,
-  fn: (done: JestDoneFn) => ?Promise<mixed>,
-  timeout?: number,
-): void;
-
-/** An individual test unit */
-declare var test: typeof it;
-/** A disabled group of tests */
-declare var xdescribe: typeof describe;
-/** A focused group of tests */
-declare var fdescribe: typeof describe;
-/** A disabled individual test */
-declare var xit: typeof it;
-/** A disabled individual test */
-declare var xtest: typeof it;
-
-type JestPrettyFormatColors = {
-  comment: {
-    close: string,
-    open: string,
-    ...
-  },
-  content: {
-    close: string,
-    open: string,
-    ...
-  },
-  prop: {
-    close: string,
-    open: string,
-    ...
-  },
-  tag: {
-    close: string,
-    open: string,
-    ...
-  },
-  value: {
-    close: string,
-    open: string,
-    ...
-  },
-  ...
-};
-
-type JestPrettyFormatIndent = string => string;
-type JestPrettyFormatRefs = Array<any>;
-type JestPrettyFormatPrint = any => string;
-type JestPrettyFormatStringOrNull = string | null;
-
-type JestPrettyFormatOptions = {|
-  callToJSON: boolean,
-  edgeSpacing: string,
-  escapeRegex: boolean,
-  highlight: boolean,
-  indent: number,
-  maxDepth: number,
-  min: boolean,
-  plugins: JestPrettyFormatPlugins,
-  printFunctionName: boolean,
-  spacing: string,
-  theme: {|
-    comment: string,
-    content: string,
-    prop: string,
-    tag: string,
-    value: string,
-  |},
-|};
-
-type JestPrettyFormatPlugin = {
-  print: (
-    val: any,
-    serialize: JestPrettyFormatPrint,
-    indent: JestPrettyFormatIndent,
-    opts: JestPrettyFormatOptions,
-    colors: JestPrettyFormatColors,
-  ) => string,
-  test: any => boolean,
-  ...
-};
-
-type JestPrettyFormatPlugins = Array<JestPrettyFormatPlugin>;
-
-/** The expect function is used every time you want to test a value */
-declare var expect: {
-  /** The object that you want to make assertions against */
-  (
-    value: any,
-  ): JestExpectType &
-    JestPromiseType &
-    EnzymeMatchersType &
-    DomTestingLibraryType &
-    JestJQueryMatchersType &
-    JestStyledComponentsMatchersType &
-    JestExtendedMatchersType,
-  /** Add additional Jasmine matchers to Jest's roster */
-  extend(matchers: { [name: string]: JestMatcher, ... }): void,
-  /** Add a module that formats application-specific data structures. */
-  addSnapshotSerializer(pluginModule: JestPrettyFormatPlugin): void,
-  assertions(expectedAssertions: number): void,
-  hasAssertions(): void,
-  any(value: mixed): JestAsymmetricEqualityType,
-  anything(): any,
-  arrayContaining(value: Array<mixed>): Array<mixed>,
-  objectContaining(value: Object): Object,
-  /** Matches any received string that contains the exact expected string. */
-  stringContaining(value: string): string,
-  stringMatching(value: string | RegExp): string,
-  not: {
-    arrayContaining: (value: $ReadOnlyArray<mixed>) => Array<mixed>,
-    objectContaining: (value: { ... }) => Object,
-    stringContaining: (value: string) => string,
-    stringMatching: (value: string | RegExp) => string,
-    ...
-  },
-  ...
-};
-
-// TODO handle return type
-// http://jasmine.github.io/2.4/introduction.html#section-Spies
-declare function spyOn(value: mixed, method: string): Object;
-
-/** Holds all functions related to manipulating test runner */
-declare var jest: JestObjectType;
-
-/**
- * The global Jasmine object, this is generally not exposed as the public API,
- * using features inside here could break in later versions of Jest.
- */
-declare var jasmine: {
-  DEFAULT_TIMEOUT_INTERVAL: number,
-  any(value: mixed): JestAsymmetricEqualityType,
-  anything(): any,
-  arrayContaining(value: Array<mixed>): Array<mixed>,
-  clock(): JestClockType,
-  createSpy(name: string): JestSpyType,
-  createSpyObj(
-    baseName: string,
-    methodNames: Array<string>,
-  ): { [methodName: string]: JestSpyType, ... },
-  objectContaining(value: Object): Object,
-  stringMatching(value: string): string,
-  ...
-};
diff --git a/packages/insomnia-app/flow-typed/json-order.js b/packages/insomnia-app/flow-typed/json-order.js
deleted file mode 100644
index 031b25d8c1..0000000000
--- a/packages/insomnia-app/flow-typed/json-order.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// @flow
-
-declare module 'json-order' {
-  declare type OrderedParseResult = {
-    object: Object,
-    map: { [key: string]: Array<string> },
-  };
-
-  declare type orderedJSON = {
-    parse: (jsonString: string, prefix?: string, separator?: string) => OrderedParseResult,
-    stringify: (
-      sourceObject: Object,
-      map: { [key: string]: Array<string> } | null,
-      separator?: string,
-      space?: number | void,
-    ) => string,
-    order: (
-      sourceObject: Object,
-      map: { [key: string]: Array<string> } | null,
-      separator?: string,
-    ) => Object,
-  };
-
-  declare module.exports: orderedJSON;
-}
diff --git a/packages/insomnia-app/flow-typed/jsonpath.js b/packages/insomnia-app/flow-typed/jsonpath.js
deleted file mode 100644
index bc15f89164..0000000000
--- a/packages/insomnia-app/flow-typed/jsonpath.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// @flow
-
-declare module 'jsonpath' {
-  declare module.exports: {
-    query: Function,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/jwt-authentication.js b/packages/insomnia-app/flow-typed/jwt-authentication.js
deleted file mode 100644
index 21484b56b5..0000000000
--- a/packages/insomnia-app/flow-typed/jwt-authentication.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'jwt-authentication' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-app/flow-typed/mime-types.js b/packages/insomnia-app/flow-typed/mime-types.js
deleted file mode 100644
index d0f52a9e72..0000000000
--- a/packages/insomnia-app/flow-typed/mime-types.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// @flow
-
-declare module 'mime-types' {
-  declare module.exports: {
-    lookup: (fileName: string) => string,
-    extension: (mimeType: string) => string,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/mkdirp.js b/packages/insomnia-app/flow-typed/mkdirp.js
deleted file mode 100644
index 92b7dbbfcb..0000000000
--- a/packages/insomnia-app/flow-typed/mkdirp.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// @flow
-
-declare module 'mkdirp' {
-  declare module.exports: {
-    sync: (path: string) => string | null,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/moment.js b/packages/insomnia-app/flow-typed/moment.js
deleted file mode 100644
index 21b08df985..0000000000
--- a/packages/insomnia-app/flow-typed/moment.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// @flow
-
-declare type moment = {
-  fromNow: () => string,
-  format: (fmt: string) => string,
-  diff: (date: any, fmt?: string, floating?: boolean) => number,
-  isSame: (date?: any, units?: ?string) => boolean,
-};
-
-declare module 'moment' {
-  declare module.exports: (date?: any) => moment;
-}
diff --git a/packages/insomnia-app/flow-typed/multiparty.js b/packages/insomnia-app/flow-typed/multiparty.js
deleted file mode 100644
index 6a9b8f7215..0000000000
--- a/packages/insomnia-app/flow-typed/multiparty.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'multiparty' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-app/flow-typed/nedb.js b/packages/insomnia-app/flow-typed/nedb.js
deleted file mode 100644
index 42b0d69e04..0000000000
--- a/packages/insomnia-app/flow-typed/nedb.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// @flow
-
-declare class NeDB {
-  constructor(config: Object): NeDB;
-  persistence: {
-    setAutocompactionInterval: (millis: number) => void,
-  };
-}
-
-declare module 'nedb' {
-  declare module.exports: typeof NeDB;
-}
diff --git a/packages/insomnia-app/flow-typed/node-libcurl.js b/packages/insomnia-app/flow-typed/node-libcurl.js
deleted file mode 100644
index f6e0a69939..0000000000
--- a/packages/insomnia-app/flow-typed/node-libcurl.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// @flow
-
-declare class Curl {
-  constructor(config: Object): Curl;
-  enable(number): void;
-  perform(): void;
-  close(): void;
-  setOpt(number, any): void;
-  on(string, Function): void;
-  getInfo(number): any;
-  static getVersion(): string;
-  static option: {
-    [string]: number,
-  };
-  static info: {
-    SIZE_DOWNLOAD: number,
-    TOTAL_TIME: number,
-    EFFECTIVE_URL: number,
-  };
-}
-
-declare module 'node-libcurl' {
-  declare module .exports: {
-    Curl: typeof Curl;
-    CurlAuth: {|
-      Any: number,
-      Basic: number,
-      Digest: number,
-      None: number,
-      Ntlm: number,
-    |};
-    CurlCode: {|
-      CURLE_ABORTED_BY_CALLBACK: number,
-    |};
-    CurlHttpVersion: {|
-      None: number,
-      V1_0: number,
-      V1_1: number,
-      V2PriorKnowledge: number,
-      V2Tls: number,
-      V2_0: number,
-      v3: number,
-    |};
-    CurlInfoDebug: {|
-      Text: number,
-      HeaderIn: number,
-      HeaderOut: number,
-      DataIn: number,
-      DataOut: number,
-      SslDataIn: number,
-      SslDataOut: number,
-    |};
-    CurlFeature: {|
-      Raw: number,
-    |};
-    CurlNetrc: {|
-      Ignored: number,
-      Optional: number,
-      Required: number,
-    |};
-  }
-}
diff --git a/packages/insomnia-app/flow-typed/nunjucks.js b/packages/insomnia-app/flow-typed/nunjucks.js
deleted file mode 100644
index 747cb0049d..0000000000
--- a/packages/insomnia-app/flow-typed/nunjucks.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// @flow
-
-type NunjucksConfig = {
-  autoescape: boolean,
-  throwOnUndefined: boolean,
-  tags: {
-    blockStart: string,
-    blockEnd: string,
-    variableStart: string,
-    variableEnd: string,
-    commentStart: string,
-    commentEnd: string,
-  },
-};
-
-declare class Nunjucks<T> {
-  extensions: { [string]: T };
-  addExtension: (name: string, ext: T) => void;
-  addFilter: (name: string, ext: Function) => void;
-  renderString: (text: string, context: Object, callback: Function) => void;
-}
-
-declare module 'nunjucks' {
-  declare module.exports: {
-    configure: <T>(config: NunjucksConfig) => Nunjucks<T>,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/oauth-1.0a.js b/packages/insomnia-app/flow-typed/oauth-1.0a.js
deleted file mode 100644
index b048e9efb5..0000000000
--- a/packages/insomnia-app/flow-typed/oauth-1.0a.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// @flow
-
-type SignatureMethod = 'HMAC-SHA1' | 'RSA-SHA1' | 'PLAINTEXT';
-type Token = { key: string, secret?: string };
-type RequestData = {
-  url: string,
-  method: string,
-  data?: { [string]: string },
-};
-
-type OAuth1Config = {
-  consumer: {
-    key: string,
-    secret: string,
-  },
-  signature_method: 'HMAC-SHA1' | 'RSA-SHA1' | 'PLAINTEXT',
-  version: '1.0',
-  hash_function: (signatureMethod: SignatureMethod, key: string) => string,
-};
-
-declare class OAuth1 {
-  constructor(config: OAuth1Config): OAuth1;
-  authorize: (data: RequestData, token: Token | null) => RequestData;
-  toHeader: (data: RequestData) => { Authorization: string };
-  getSigningKey: (tokenSecret: string) => string;
-}
-
-declare module 'oauth-1.0a' {
-  declare module.exports: typeof OAuth1;
-}
diff --git a/packages/insomnia-app/flow-typed/objectpath.js b/packages/insomnia-app/flow-typed/objectpath.js
deleted file mode 100644
index 8d3847ddde..0000000000
--- a/packages/insomnia-app/flow-typed/objectpath.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'objectpath' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-app/flow-typed/openapi-2-kong.js b/packages/insomnia-app/flow-typed/openapi-2-kong.js
deleted file mode 100644
index 1c6574f86e..0000000000
--- a/packages/insomnia-app/flow-typed/openapi-2-kong.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// @flow
-
-declare module 'openapi-2-kong' {
-  declare module.exports: {
-    generateFromString: (spec: string, tags: Array<string>) => Promise<Object>,
-    generateFromSpec: (spec: Object, tags: Array<string>) => Promise<Object>,
-    generate: (filename: string, tags: Array<string>) => Promise<Object>,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/papaparse.js b/packages/insomnia-app/flow-typed/papaparse.js
deleted file mode 100644
index ad7d3a975d..0000000000
--- a/packages/insomnia-app/flow-typed/papaparse.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// @flow
-
-declare module 'papaparse' {
-  declare module.exports: {
-    parse: Function,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/pdfjs-dist.js b/packages/insomnia-app/flow-typed/pdfjs-dist.js
deleted file mode 100644
index f102e0ba28..0000000000
--- a/packages/insomnia-app/flow-typed/pdfjs-dist.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'pdfjs-dist/webpack' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-app/flow-typed/react-dom.js b/packages/insomnia-app/flow-typed/react-dom.js
deleted file mode 100644
index bb5f4aa82c..0000000000
--- a/packages/insomnia-app/flow-typed/react-dom.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// @flow
-
-import * as React from 'react';
-
-declare module 'react-dom' {
-  declare module.exports: {
-    findDOMNode: React.Node => HTMLElement,
-    render: (React.Node, HTMLElement) => void,
-    createPortal: (React.Node, HTMLElement) => React.Node,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/react-sortable-hoc.js b/packages/insomnia-app/flow-typed/react-sortable-hoc.js
deleted file mode 100644
index 14d152fcbf..0000000000
--- a/packages/insomnia-app/flow-typed/react-sortable-hoc.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// @flow
-
-import * as React from 'react';
-
-declare module 'react-sortable-hoc/dist/es6' {
-  declare module.exports: {
-    SortableContainer: ((Object) => React.Node) => React.Component,
-    SortableElement: ((Object) => React.Node) => React.Component,
-    arrayMove: <T>(Array<T>, oldIndex: number, newIndex: number) => Array<T>,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/react-tabs.js b/packages/insomnia-app/flow-typed/react-tabs.js
deleted file mode 100644
index 339efb7eeb..0000000000
--- a/packages/insomnia-app/flow-typed/react-tabs.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// @flow
-
-import * as React from 'react';
-
-declare module 'react-tabs' {
-  declare module.exports: {
-    Tab: React.Element<*>,
-    TabList: React.Element<*>,
-    TabPanel: React.Element<*>,
-    Tabs: React.Element<*>,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/reselect.js b/packages/insomnia-app/flow-typed/reselect.js
deleted file mode 100644
index 02e085b853..0000000000
--- a/packages/insomnia-app/flow-typed/reselect.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// @flow
-
-declare module 'reselect' {
-  declare module.exports: {
-    createSelector: Function,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/rimraf.js b/packages/insomnia-app/flow-typed/rimraf.js
deleted file mode 100644
index 2e03048b9f..0000000000
--- a/packages/insomnia-app/flow-typed/rimraf.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// @flow
-
-declare module 'rimraf' {
-  declare module.exports: {
-    sync: (path: string) => string | null,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/styled-components.js b/packages/insomnia-app/flow-typed/styled-components.js
deleted file mode 100644
index ace81963cb..0000000000
--- a/packages/insomnia-app/flow-typed/styled-components.js
+++ /dev/null
@@ -1,432 +0,0 @@
-// flow-typed signature: 2326ecddadf3dc85a1fe1dd91ba9a93c
-// flow-typed version: bac16db19f/styled-components_v4.x.x/flow_>=v0.104.x
-
-// @flow
-
-declare module 'styled-components' {
-  declare class InterpolatableComponent<P> extends React$Component<P> {
-    static +styledComponentId: string;
-  }
-
-  declare export type Interpolation<P> =
-    | ((executionContext: P) =>
-      | ((executionContext: P) => InterpolationBase)
-      | InterpolationBase
-    )
-    | Class<InterpolatableComponent<any>>
-    | InterpolationBase
-
-  declare export type InterpolationBase =
-    | CSSRules
-    | KeyFrames
-    | string
-    | number
-    | false // falsy values are OK, true is the only one not allowed, because it renders as "true"
-    | null
-    | void
-    | {[ruleOrSelector: string]: string | number, ...} // CSS-in-JS object returned by polished are also supported
-
-  declare export type TaggedTemplateLiteral<I, R> = (strings: string[], ...interpolations: Interpolation<I>[]) => R
-
-  // Should this be `mixed` perhaps?
-  declare export type CSSRules = Interpolation<any>[] // eslint-disable-line flowtype/no-weak-types
-
-  declare export type CSSConstructor = TaggedTemplateLiteral<any, CSSRules> // eslint-disable-line flowtype/no-weak-types
-  declare export type KeyFramesConstructor = TaggedTemplateLiteral<any, KeyFrames> // eslint-disable-line flowtype/no-weak-types
-  declare export type CreateGlobalStyleConstructor = TaggedTemplateLiteral<any, React$ComponentType<*>> // eslint-disable-line flowtype/no-weak-types
-
-  declare interface Tag<T> {
-    styleTag: HTMLStyleElement | null;
-    getIds(): string[];
-    hasNameForId(id: string, name: string): boolean;
-    insertMarker(id: string): T;
-    insertRules(id: string, cssRules: string[], name: ?string): void;
-    removeRules(id: string): void;
-    css(): string;
-    toHTML(additionalAttrs: ?string): string;
-    toElement(): React$Element<*>;
-    clone(): Tag<T>;
-    sealed: boolean;
-  }
-
-  // The `any`/weak types in here all come from `styled-components` directly, since those definitions were just copied over
-  declare export class StyleSheet {
-    static get master() : StyleSheet;
-    static get instance() : StyleSheet;
-    static reset(forceServer? : boolean) : void;
-
-    id : number;
-    forceServer : boolean;
-    target : ?HTMLElement;
-    tagMap : { [string]: Tag<any>, ... }; // eslint-disable-line flowtype/no-weak-types
-    deferred: { [string]: string[] | void, ... };
-    rehydratedNames: { [string]: boolean, ... };
-    ignoreRehydratedNames: { [string]: boolean, ... };
-    tags: Tag<any>[]; // eslint-disable-line flowtype/no-weak-types
-    importRuleTag: Tag<any>; // eslint-disable-line flowtype/no-weak-types
-    capacity: number;
-    clones: StyleSheet[];
-
-    constructor(?HTMLElement) : this;
-    rehydrate() : this;
-    clone() : StyleSheet;
-    sealAllTags() : void;
-    makeTag(tag : ?Tag<any>) : Tag<any>; // eslint-disable-line flowtype/no-weak-types
-    getImportRuleTag() : Tag<any>; // eslint-disable-line flowtype/no-weak-types
-    getTagForId(id : string): Tag<any>; // eslint-disable-line flowtype/no-weak-types
-    hasId(id: string) : boolean;
-    hasNameForId(id: string, name: string) : boolean;
-    deferredInject(id : string, cssRules : string[]) : void;
-    inject(id: string, cssRules : string[], name? : string) : void;
-    remove(id : string) : void;
-    toHtml() : string;
-    toReactElements() : React$ElementType[];
-  }
-
-  declare export function isStyledComponent(target: any): boolean;
-
-  declare type SCMProps = {
-    children?: React$Element<any>,
-    sheet?: StyleSheet,
-    target?: HTMLElement,
-    ...
-  }
-
-  declare export var StyleSheetContext: React$Context<StyleSheet>;
-  declare export var StyleSheetConsumer : React$ComponentType<{|
-    children: (value: StyleSheet) => ?React$Node
-  |}>
-  declare var StyleSheetProvider: React$ComponentType<{|
-    children?: React$Node,
-    value: StyleSheet,
-  |}>
-
-  declare export class StyleSheetManager extends React$Component<SCMProps> {
-    getContext(sheet: ?StyleSheet, target: ?HTMLElement): StyleSheet;
-    render(): React$Element<typeof(StyleSheetProvider)>
-  }
-
-  declare export class ServerStyleSheet {
-    instance: StyleSheet;
-    masterSheet: StyleSheet;
-    sealed: boolean;
-
-    seal(): void;
-    collectStyles(children: any): React$Element<StyleSheetManager>;
-    getStyleTags(): string;
-    toReactElements(): React$ElementType[];
-    // This seems to be use a port of node streams in the Browsers. Not gonna type this for now
-    // eslint-disable-next-line flowtype/no-weak-types
-    interleaveWithNodeStream(stream: any): any;
-  }
-
-  declare export class KeyFrames {
-    id : string;
-    name : string;
-    rules : string[];
-
-    constructor(name : string, rules : string[]) : this;
-    inject(StyleSheet) : void;
-    toString() : string;
-    getName() : string;
-  }
-
-  // I think any is appropriate here?
-  // eslint-disable-next-line flowtype/no-weak-types
-  declare export var css : CSSConstructor;
-  declare export var keyframes : KeyFramesConstructor;
-  declare export var createGlobalStyle : CreateGlobalStyleConstructor
-  declare export var ThemeConsumer : React$ComponentType<{|
-    children: (value: mixed) => ?React$Node
-  |}>
-  declare export var ThemeProvider: React$ComponentType<{|
-    children?: ?React$Node,
-    theme: mixed | (mixed) => mixed,
-  |}>
-
-  /**
-    Any because the intended use-case is for users to do:
-
-        import {ThemeContext} from 'styled-components';
-        ...
-        const theme = React.useContext<MyTheme>(ThemeContext);
-
-    If they want DRY-er code, they could declare their own version of this via something like
-
-        import { ThemeContext as SCThemeContext } from 'styled-components';
-        export const ThemeContext: React$Context<MyTheme> = SCThemeContext;
-
-    and then
-
-        import {ThemeContext} from './theme';
-  */
-  // eslint-disable-next-line flowtype/no-weak-types
-  declare export var ThemeContext: React$Context<any>;
-
-  declare export type ThemeProps<T> = {|
-    theme: T
-  |}
-
-  declare export type PropsWithTheme<Props, T> = {|
-    ...ThemeProps<T>,
-    ...$Exact<Props>
-  |}
-
-  declare export function withTheme<Theme, Config: {...}, Instance>(Component: React$AbstractComponent<Config, Instance>): React$AbstractComponent<$Diff<Config, ThemeProps<Theme | void>>, Instance>
-
-  declare export type StyledComponent<Props, Theme, Instance> = React$AbstractComponent<Props, Instance> & Class<InterpolatableComponent<Props>>
-
-  declare export type StyledFactory<StyleProps, Theme, Instance> = {|
-    [[call]]: TaggedTemplateLiteral<PropsWithTheme<StyleProps, Theme>, StyledComponent<StyleProps, Theme, Instance>>;
-    +attrs: <A: {...}>(((StyleProps) => A) | A) => TaggedTemplateLiteral<
-      PropsWithTheme<{|...$Exact<StyleProps>, ...$Exact<A>|}, Theme>,
-      StyledComponent<React$Config<{|...$Exact<StyleProps>, ...$Exact<A>|}, $Exact<A>>, Theme, Instance>
-    >;
-  |}
-
-  declare export type StyledShorthandFactory<V> = {|
-    [[call]]: <StyleProps, Theme>(string[], ...Interpolation<PropsWithTheme<StyleProps, Theme>>[]) => StyledComponent<StyleProps, Theme, V>;
-    +attrs: <A: {...}, StyleProps = {||}, Theme = {||}>(((StyleProps) => A) | A) => TaggedTemplateLiteral<
-      PropsWithTheme<{|...$Exact<StyleProps>, ...$Exact<A>|}, Theme>,
-      StyledComponent<React$Config<{|...$Exact<StyleProps>, ...$Exact<A>|}, $Exact<A>>, Theme, V>
-    >;
-  |}
-
-
-  declare type BuiltinElementInstances = {
-    a: React$ElementRef<'a'>,
-    abbr: React$ElementRef<'abbr'>,
-    address: React$ElementRef<'address'>,
-    area: React$ElementRef<'area'>,
-    article: React$ElementRef<'article'>,
-    aside: React$ElementRef<'aside'>,
-    audio: React$ElementRef<'audio'>,
-    b: React$ElementRef<'b'>,
-    base: React$ElementRef<'base'>,
-    bdi: React$ElementRef<'bdi'>,
-    bdo: React$ElementRef<'bdo'>,
-    big: React$ElementRef<'big'>,
-    blockquote: React$ElementRef<'blockquote'>,
-    body: React$ElementRef<'body'>,
-    br: React$ElementRef<'br'>,
-    button: React$ElementRef<'button'>,
-    canvas: React$ElementRef<'canvas'>,
-    caption: React$ElementRef<'caption'>,
-    cite: React$ElementRef<'cite'>,
-    code: React$ElementRef<'code'>,
-    col: React$ElementRef<'col'>,
-    colgroup: React$ElementRef<'colgroup'>,
-    data: React$ElementRef<'data'>,
-    datalist: React$ElementRef<'datalist'>,
-    dd: React$ElementRef<'dd'>,
-    del: React$ElementRef<'del'>,
-    details: React$ElementRef<'details'>,
-    dfn: React$ElementRef<'dfn'>,
-    dialog: React$ElementRef<'dialog'>,
-    div: React$ElementRef<'div'>,
-    dl: React$ElementRef<'dl'>,
-    dt: React$ElementRef<'dt'>,
-    em: React$ElementRef<'em'>,
-    embed: React$ElementRef<'embed'>,
-    fieldset: React$ElementRef<'fieldset'>,
-    figcaption: React$ElementRef<'figcaption'>,
-    figure: React$ElementRef<'figure'>,
-    footer: React$ElementRef<'footer'>,
-    form: React$ElementRef<'form'>,
-    h1: React$ElementRef<'h1'>,
-    h2: React$ElementRef<'h2'>,
-    h3: React$ElementRef<'h3'>,
-    h4: React$ElementRef<'h4'>,
-    h5: React$ElementRef<'h5'>,
-    h6: React$ElementRef<'h6'>,
-    head: React$ElementRef<'head'>,
-    header: React$ElementRef<'header'>,
-    hgroup: React$ElementRef<'hgroup'>,
-    hr: React$ElementRef<'hr'>,
-    html: React$ElementRef<'html'>,
-    i: React$ElementRef<'i'>,
-    iframe: React$ElementRef<'iframe'>,
-    img: React$ElementRef<'img'>,
-    input: React$ElementRef<'input'>,
-    ins: React$ElementRef<'ins'>,
-    kbd: React$ElementRef<'kbd'>,
-    label: React$ElementRef<'label'>,
-    legend: React$ElementRef<'legend'>,
-    li: React$ElementRef<'li'>,
-    link: React$ElementRef<'link'>,
-    main: React$ElementRef<'main'>,
-    map: React$ElementRef<'map'>,
-    mark: React$ElementRef<'mark'>,
-    menu: React$ElementRef<'menu'>,
-    meta: React$ElementRef<'meta'>,
-    meter: React$ElementRef<'meter'>,
-    nav: React$ElementRef<'nav'>,
-    noscript: React$ElementRef<'noscript'>,
-    object: React$ElementRef<'object'>,
-    ol: React$ElementRef<'ol'>,
-    optgroup: React$ElementRef<'optgroup'>,
-    option: React$ElementRef<'option'>,
-    output: React$ElementRef<'output'>,
-    p: React$ElementRef<'p'>,
-    param: React$ElementRef<'param'>,
-    picture: React$ElementRef<'picture'>,
-    pre: React$ElementRef<'pre'>,
-    progress: React$ElementRef<'progress'>,
-    q: React$ElementRef<'q'>,
-    rp: React$ElementRef<'rp'>,
-    rt: React$ElementRef<'rt'>,
-    ruby: React$ElementRef<'ruby'>,
-    s: React$ElementRef<'s'>,
-    samp: React$ElementRef<'samp'>,
-    script: React$ElementRef<'script'>,
-    section: React$ElementRef<'section'>,
-    select: React$ElementRef<'select'>,
-    small: React$ElementRef<'small'>,
-    source: React$ElementRef<'source'>,
-    span: React$ElementRef<'span'>,
-    strong: React$ElementRef<'strong'>,
-    style: React$ElementRef<'style'>,
-    sub: React$ElementRef<'sub'>,
-    summary: React$ElementRef<'summary'>,
-    sup: React$ElementRef<'sup'>,
-    table: React$ElementRef<'table'>,
-    tbody: React$ElementRef<'tbody'>,
-    td: React$ElementRef<'td'>,
-    textarea: React$ElementRef<'textarea'>,
-    tfoot: React$ElementRef<'tfoot'>,
-    th: React$ElementRef<'th'>,
-    thead: React$ElementRef<'thead'>,
-    time: React$ElementRef<'time'>,
-    title: React$ElementRef<'title'>,
-    tr: React$ElementRef<'tr'>,
-    track: React$ElementRef<'track'>,
-    u: React$ElementRef<'u'>,
-    ul: React$ElementRef<'ul'>,
-    var: React$ElementRef<'var'>,
-    video: React$ElementRef<'video'>,
-    wbr: React$ElementRef<'wbr'>,
-    // SVG
-    circle: React$ElementRef<'circle'>,
-    clipPath: React$ElementRef<'clipPath'>,
-    defs: React$ElementRef<'defs'>,
-    ellipse: React$ElementRef<'ellipse'>,
-    g: React$ElementRef<'g'>,
-    image: React$ElementRef<'image'>,
-    line: React$ElementRef<'line'>,
-    linearGradient: React$ElementRef<'linearGradient'>,
-    mask: React$ElementRef<'mask'>,
-    path: React$ElementRef<'path'>,
-    pattern: React$ElementRef<'pattern'>,
-    polygon: React$ElementRef<'polygon'>,
-    polyline: React$ElementRef<'polyline'>,
-    radialGradient: React$ElementRef<'radialGradient'>,
-    rect: React$ElementRef<'rect'>,
-    stop: React$ElementRef<'stop'>,
-    svg: React$ElementRef<'svg'>,
-    text: React$ElementRef<'text'>,
-    tspan: React$ElementRef<'tspan'>,
-    // Deprecated, should be HTMLUnknownElement, but Flow doesn't support it
-    keygen: React$ElementRef<'keygen'>,
-    menuitem: React$ElementRef<'menuitem'>,
-    ...
-  }
-
-  declare type BuiltinElementType<ElementName: string> = $ElementType<BuiltinElementInstances, ElementName>
-
-  declare type ConvenientShorthands = $ObjMap<
-    BuiltinElementInstances,
-    <V>(V) => StyledShorthandFactory<V>
-  >
-
-  declare interface Styled {
-    <StyleProps, Theme, ElementName: $Keys<BuiltinElementInstances>>(ElementName): StyledFactory<StyleProps, Theme, BuiltinElementType<ElementName>>;
-    <Comp: React$ComponentType<any>, Theme, OwnProps = React$ElementConfig<Comp>>(Comp): StyledFactory<{|...$Exact<OwnProps>|}, Theme, Comp>;
-  }
-
-  declare export default Styled & ConvenientShorthands
-}
-
-
-declare module 'styled-components/native' {
-  import type {
-    CSSRules,
-    CSSConstructor,
-    KeyFramesConstructor,
-    CreateGlobalStyleConstructor,
-    StyledComponent,
-    Interpolation,
-
-    // "private" types
-    TaggedTemplateLiteral,
-    StyledFactory,
-    StyledShorthandFactory,
-    ThemeProps,
-    PropsWithTheme,
-  } from 'styled-components';
-
-  declare type BuiltinElementInstances = {
-    ActivityIndicator:             React$ComponentType<{...}>,
-    ActivityIndicatorIOS:          React$ComponentType<{...}>,
-    ART:                           React$ComponentType<{...}>,
-    Button:                        React$ComponentType<{...}>,
-    DatePickerIOS:                 React$ComponentType<{...}>,
-    DrawerLayoutAndroid:           React$ComponentType<{...}>,
-    Image:                         React$ComponentType<{...}>,
-    ImageBackground:               React$ComponentType<{...}>,
-    ImageEditor:                   React$ComponentType<{...}>,
-    ImageStore:                    React$ComponentType<{...}>,
-    KeyboardAvoidingView:          React$ComponentType<{...}>,
-    ListView:                      React$ComponentType<{...}>,
-    MapView:                       React$ComponentType<{...}>,
-    Modal:                         React$ComponentType<{...}>,
-    NavigatorIOS:                  React$ComponentType<{...}>,
-    Picker:                        React$ComponentType<{...}>,
-    PickerIOS:                     React$ComponentType<{...}>,
-    ProgressBarAndroid:            React$ComponentType<{...}>,
-    ProgressViewIOS:               React$ComponentType<{...}>,
-    ScrollView:                    React$ComponentType<{...}>,
-    SegmentedControlIOS:           React$ComponentType<{...}>,
-    Slider:                        React$ComponentType<{...}>,
-    SliderIOS:                     React$ComponentType<{...}>,
-    SnapshotViewIOS:               React$ComponentType<{...}>,
-    Switch:                        React$ComponentType<{...}>,
-    RecyclerViewBackedScrollView:  React$ComponentType<{...}>,
-    RefreshControl:                React$ComponentType<{...}>,
-    SafeAreaView:                  React$ComponentType<{...}>,
-    StatusBar:                     React$ComponentType<{...}>,
-    SwipeableListView:             React$ComponentType<{...}>,
-    SwitchAndroid:                 React$ComponentType<{...}>,
-    SwitchIOS:                     React$ComponentType<{...}>,
-    TabBarIOS:                     React$ComponentType<{...}>,
-    Text:                          React$ComponentType<{...}>,
-    TextInput:                     React$ComponentType<{...}>,
-    ToastAndroid:                  React$ComponentType<{...}>,
-    ToolbarAndroid:                React$ComponentType<{...}>,
-    Touchable:                     React$ComponentType<{...}>,
-    TouchableHighlight:            React$ComponentType<{...}>,
-    TouchableNativeFeedback:       React$ComponentType<{...}>,
-    TouchableOpacity:              React$ComponentType<{...}>,
-    TouchableWithoutFeedback:      React$ComponentType<{...}>,
-    View:                          React$ComponentType<{...}>,
-    ViewPagerAndroid:              React$ComponentType<{...}>,
-    WebView:                       React$ComponentType<{...}>,
-    FlatList:                      React$ComponentType<{...}>,
-    SectionList:                   React$ComponentType<{...}>,
-    VirtualizedList:               React$ComponentType<{...}>,
-    ...
-  }
-
-  declare type BuiltinElementType<ElementName: string> = $ElementType<BuiltinElementInstances, ElementName>
-
-  declare type ConvenientShorthands = $ObjMap<
-    BuiltinElementInstances,
-    <V>(V) => StyledShorthandFactory<V>
-  >
-
-  declare interface Styled {
-    <StyleProps, Theme, ElementName: $Keys<BuiltinElementInstances>>(ElementName): StyledFactory<StyleProps, Theme, BuiltinElementType<ElementName>>;
-    <Comp: React$ComponentType<any>, Theme, OwnProps = React$ElementConfig<Comp>>(Comp): StyledFactory<{|...$Exact<OwnProps>|}, Theme, Comp>;
-  }
-
-  declare export default Styled & ConvenientShorthands
-}
diff --git a/packages/insomnia-app/flow-typed/swagger-ui-react.js b/packages/insomnia-app/flow-typed/swagger-ui-react.js
deleted file mode 100644
index 9475190041..0000000000
--- a/packages/insomnia-app/flow-typed/swagger-ui-react.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'swagger-ui-react' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-app/flow-typed/tough-cookie.js b/packages/insomnia-app/flow-typed/tough-cookie.js
deleted file mode 100644
index 6d7d22a190..0000000000
--- a/packages/insomnia-app/flow-typed/tough-cookie.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'tough-cookie' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-app/flow-typed/url-join.js b/packages/insomnia-app/flow-typed/url-join.js
deleted file mode 100644
index 1b9a82cf3c..0000000000
--- a/packages/insomnia-app/flow-typed/url-join.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'url-join' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-app/flow-typed/uuid.js b/packages/insomnia-app/flow-typed/uuid.js
deleted file mode 100644
index b1aba6877f..0000000000
--- a/packages/insomnia-app/flow-typed/uuid.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// @flow
-
-declare module 'uuid' {
-  declare module.exports: {
-    v4: () => string,
-    v1: () => string,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/xmldom.js b/packages/insomnia-app/flow-typed/xmldom.js
deleted file mode 100644
index e91197008d..0000000000
--- a/packages/insomnia-app/flow-typed/xmldom.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// @flow
-
-declare module 'xmldom' {
-  declare module.exports: {
-    DOMParser: Function,
-  };
-}
diff --git a/packages/insomnia-app/flow-typed/yaml.js b/packages/insomnia-app/flow-typed/yaml.js
deleted file mode 100644
index 119502e9ea..0000000000
--- a/packages/insomnia-app/flow-typed/yaml.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// @flow
-
-declare module 'yaml' {
-  declare module.exports: {
-    stringify: Object => string,
-    parse: string => Object,
-    parseCST: string => Object,
-  };
-}
diff --git a/packages/insomnia-app/jest.config.js b/packages/insomnia-app/jest.config.js
new file mode 100644
index 0000000000..0a5900f4e6
--- /dev/null
+++ b/packages/insomnia-app/jest.config.js
@@ -0,0 +1,35 @@
+/** @type { import('@jest/types').Config.InitialOptions } */
+module.exports = {
+  globals: {
+    'ts-jest': {
+      isolatedModules: true,
+    },
+  },
+  testEnvironment: 'jsdom',
+  cache: false,
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+  verbose: true,
+  resetMocks: true,
+  resetModules: true,
+  testRegex: ['.+\\.test\\.tsx?$'],
+  collectCoverage: false,
+  collectCoverageFrom: ['app/**/*.{js,jsx,ts,tsx}'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  coverageReporters: ['text-summary', 'lcov'],
+  setupFiles: [
+    './__jest__/setup.ts',
+  ],
+  setupFilesAfterEnv: [
+    './__jest__/setup-after-env.ts',
+  ],
+  moduleNameMapper: {
+    '\\.(css|less|png)$': '<rootDir>/__mocks__/dummy.ts',
+    '^worker-loader!': '<rootDir>/__mocks__/dummy.ts',
+  },
+  modulePathIgnorePatterns: [
+    '<rootDir>/network/.*/__mocks__',
+  ],
+  rootDir: 'app',
+};
diff --git a/packages/insomnia-app/package-lock.json b/packages/insomnia-app/package-lock.json
index 7b504c7983..87438bb1b6 100644
--- a/packages/insomnia-app/package-lock.json
+++ b/packages/insomnia-app/package-lock.json
@@ -1607,6 +1607,21 @@
 				"protobufjs": "^6.8.6"
 			}
 		},
+		"@hapi/boom": {
+			"version": "9.1.2",
+			"resolved": "https://registry.npmjs.org/@hapi/boom/-/boom-9.1.2.tgz",
+			"integrity": "sha512-uJEJtiNHzKw80JpngDGBCGAmWjBtzxDCz17A9NO2zCi8LLBlb5Frpq4pXwyN+2JQMod4pKz5BALwyneCgDg89Q==",
+			"dev": true,
+			"requires": {
+				"@hapi/hoek": "9.x.x"
+			}
+		},
+		"@hapi/hoek": {
+			"version": "9.2.0",
+			"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.0.tgz",
+			"integrity": "sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==",
+			"dev": true
+		},
 		"@hot-loader/react-dom": {
 			"version": "16.13.0",
 			"resolved": "https://registry.npmjs.org/@hot-loader/react-dom/-/react-dom-16.13.0.tgz",
@@ -3749,19 +3764,19 @@
 			}
 		},
 		"@testing-library/react": {
-			"version": "11.1.1",
-			"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.1.1.tgz",
-			"integrity": "sha512-DT/P2opE9o4NWCd/oIL73b6VF/Xk9AY8iYSstKfz9cXw0XYPQ5IhA/cuYfoN9nU+mAynW8DpAVfEWdM6e7zF6g==",
+			"version": "11.2.6",
+			"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.6.tgz",
+			"integrity": "sha512-TXMCg0jT8xmuU8BkKMtp8l7Z50Ykew5WNX8UoIKTaLFwKkP2+1YDhOLA2Ga3wY4x29jyntk7EWfum0kjlYiSjQ==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.12.1",
-				"@testing-library/dom": "^7.26.4"
+				"@babel/runtime": "^7.12.5",
+				"@testing-library/dom": "^7.28.1"
 			},
 			"dependencies": {
 				"@babel/runtime": {
-					"version": "7.12.5",
-					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
-					"integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
+					"version": "7.14.0",
+					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+					"integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
 					"dev": true,
 					"requires": {
 						"regenerator-runtime": "^0.13.4"
@@ -3770,15 +3785,36 @@
 			}
 		},
 		"@testing-library/react-hooks": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/@testing-library/react-hooks/-/react-hooks-3.4.2.tgz",
-			"integrity": "sha512-RfPG0ckOzUIVeIqlOc1YztKgFW+ON8Y5xaSPbiBkfj9nMkkiLhLeBXT5icfPX65oJV/zCZu4z8EVnUc6GY9C5A==",
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/@testing-library/react-hooks/-/react-hooks-5.1.2.tgz",
+			"integrity": "sha512-jwhtDYZ5gQUIX8cmVCVdtwNvuF5EiCOWjokRlTV+o/V0GdtRZDykUllL1OXq5PS4+J33wGLNQeeWzEHcWrH7tg==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.5.4",
-				"@types/testing-library__react-hooks": "^3.4.0"
+				"@babel/runtime": "^7.12.5",
+				"@types/react": ">=16.9.0",
+				"@types/react-dom": ">=16.9.0",
+				"@types/react-test-renderer": ">=16.9.0",
+				"filter-console": "^0.1.1",
+				"react-error-boundary": "^3.1.0"
+			},
+			"dependencies": {
+				"@babel/runtime": {
+					"version": "7.14.0",
+					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+					"integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+					"dev": true,
+					"requires": {
+						"regenerator-runtime": "^0.13.4"
+					}
+				}
 			}
 		},
+		"@types/analytics-node": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/@types/analytics-node/-/analytics-node-3.1.4.tgz",
+			"integrity": "sha512-i6cqjFotMq1dEwXxyXRqnzp/HmWPCskptrVUQ1UzRIGs/zICFWM2bIJyLt6f9A9/+qE98wls1AHWPQ4WXYS0HA==",
+			"dev": true
+		},
 		"@types/anymatch": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",
@@ -3791,6 +3827,12 @@
 			"integrity": "sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A==",
 			"dev": true
 		},
+		"@types/aws4": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/@types/aws4/-/aws4-1.5.1.tgz",
+			"integrity": "sha1-Nh+tqxmKAwqzmCaRg64/qG6Vjtk=",
+			"dev": true
+		},
 		"@types/babel__core": {
 			"version": "7.1.12",
 			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.12.tgz",
@@ -3832,6 +3874,16 @@
 				"@babel/types": "^7.3.0"
 			}
 		},
+		"@types/body-parser": {
+			"version": "1.19.0",
+			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz",
+			"integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==",
+			"dev": true,
+			"requires": {
+				"@types/connect": "*",
+				"@types/node": "*"
+			}
+		},
 		"@types/cacheable-request": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz",
@@ -3844,21 +3896,180 @@
 				"@types/responselike": "*"
 			}
 		},
+		"@types/caseless": {
+			"version": "0.12.2",
+			"resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
+			"integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==",
+			"dev": true
+		},
+		"@types/clone": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/@types/clone/-/clone-2.1.0.tgz",
+			"integrity": "sha512-d/aS/lPOnUSruPhgNtT8jW39fHRVTLQy9sodysP1kkG8EdAtdZu1vt8NJaYA8w/6Z9j8izkAsx1A/yJhcYR1CA==",
+			"dev": true
+		},
+		"@types/codemirror": {
+			"version": "0.0.109",
+			"resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-0.0.109.tgz",
+			"integrity": "sha512-cSdiHeeLjvGn649lRTNeYrVCDOgDrtP+bDDSFDd1TF+i0jKGPDRozno2NOJ9lTniso+taiv4kiVS8dgM8Jm5lg==",
+			"dev": true,
+			"requires": {
+				"@types/tern": "*"
+			}
+		},
+		"@types/color": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@types/color/-/color-3.0.1.tgz",
+			"integrity": "sha512-oeUWVaAwI+xINDUx+3F2vJkl/vVB03VChFF/Gl3iQCdbcakjuoJyMOba+3BXRtnBhxZ7uBYqQBi9EpLnvSoztA==",
+			"dev": true,
+			"requires": {
+				"@types/color-convert": "*"
+			}
+		},
+		"@types/color-convert": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@types/color-convert/-/color-convert-2.0.0.tgz",
+			"integrity": "sha512-m7GG7IKKGuJUXvkZ1qqG3ChccdIM/qBBo913z+Xft0nKCX4hAU/IxKwZBU4cpRZ7GS5kV4vOblUkILtSShCPXQ==",
+			"dev": true,
+			"requires": {
+				"@types/color-name": "*"
+			}
+		},
 		"@types/color-name": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
 			"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
 		},
+		"@types/concurrently": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/@types/concurrently/-/concurrently-6.0.1.tgz",
+			"integrity": "sha512-44I9tMSrgX7g39Ie7V/8N0OWG6696UtzPlv2ROsnQWyfyRVUp2Ue8ewxZkHopmX4Zyj6hiPgY1r14FqHsgfO4Q==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
+		"@types/connect": {
+			"version": "3.4.34",
+			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz",
+			"integrity": "sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
+		"@types/connect-history-api-fallback": {
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.4.tgz",
+			"integrity": "sha512-Kf8v0wljR5GSCOCF/VQWdV3ZhKOVA73drXtY3geMTQgHy9dgqQ0dLrf31M0hcuWkhFzK5sP0kkS3mJzcKVtZbw==",
+			"dev": true,
+			"requires": {
+				"@types/express-serve-static-core": "*",
+				"@types/node": "*"
+			}
+		},
+		"@types/crypto-js": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.0.1.tgz",
+			"integrity": "sha512-6+OPzqhKX/cx5xh+yO8Cqg3u3alrkhoxhE5ZOdSEv0DOzJ13lwJ6laqGU0Kv6+XDMFmlnGId04LtY22PsFLQUw==",
+			"dev": true
+		},
 		"@types/debug": {
 			"version": "4.1.5",
 			"resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz",
 			"integrity": "sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==",
 			"dev": true
 		},
+		"@types/deep-equal": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@types/deep-equal/-/deep-equal-1.0.1.tgz",
+			"integrity": "sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg==",
+			"dev": true
+		},
+		"@types/eslint": {
+			"version": "7.2.10",
+			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz",
+			"integrity": "sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==",
+			"dev": true,
+			"requires": {
+				"@types/estree": "*",
+				"@types/json-schema": "*"
+			}
+		},
+		"@types/eslint-scope": {
+			"version": "3.7.0",
+			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
+			"integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
+			"dev": true,
+			"requires": {
+				"@types/eslint": "*",
+				"@types/estree": "*"
+			}
+		},
+		"@types/estree": {
+			"version": "0.0.47",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz",
+			"integrity": "sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==",
+			"dev": true
+		},
+		"@types/events": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
+			"integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==",
+			"dev": true
+		},
+		"@types/express": {
+			"version": "4.17.11",
+			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz",
+			"integrity": "sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==",
+			"dev": true,
+			"requires": {
+				"@types/body-parser": "*",
+				"@types/express-serve-static-core": "^4.17.18",
+				"@types/qs": "*",
+				"@types/serve-static": "*"
+			}
+		},
+		"@types/express-serve-static-core": {
+			"version": "4.17.19",
+			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz",
+			"integrity": "sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"@types/qs": "*",
+				"@types/range-parser": "*"
+			}
+		},
+		"@types/file-loader": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/@types/file-loader/-/file-loader-5.0.0.tgz",
+			"integrity": "sha512-evodFzM0PLOXmMZy8DhPN+toP6QgJiIteF6e8iD9T0xGBUllQA/DAb1nZwCIoNh7vuLvqCGPUdsLf3GSbcHd4g==",
+			"dev": true,
+			"requires": {
+				"@types/webpack": "^4"
+			},
+			"dependencies": {
+				"@types/webpack": {
+					"version": "4.41.27",
+					"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.27.tgz",
+					"integrity": "sha512-wK/oi5gcHi72VMTbOaQ70VcDxSQ1uX8S2tukBK9ARuGXrYM/+u4ou73roc7trXDNmCxCoerE8zruQqX/wuHszA==",
+					"dev": true,
+					"requires": {
+						"@types/anymatch": "*",
+						"@types/node": "*",
+						"@types/tapable": "^1",
+						"@types/uglify-js": "*",
+						"@types/webpack-sources": "*",
+						"source-map": "^0.6.0"
+					}
+				}
+			}
+		},
 		"@types/fs-extra": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.1.tgz",
-			"integrity": "sha512-B42Sxuaz09MhC3DDeW5kubRcQ5by4iuVQ0cRRWM2lggLzAa/KVom0Aft/208NgMvNQQZ86s5rVcqDdn/SH0/mg==",
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.1.0.tgz",
+			"integrity": "sha512-AInn5+UBFIK9FK5xc9yP5e3TQSPNNgjHByqYcj9g5elVBnDQcQL7PlO1CIRy2gWlbwK7UPYqi7vRvFA44dCmYQ==",
 			"dev": true,
 			"requires": {
 				"@types/node": "*"
@@ -3883,6 +4094,18 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/hawk": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/@types/hawk/-/hawk-9.0.0.tgz",
+			"integrity": "sha512-/+HsOUvPGLnJce9STpUMGznm0sH2J7HZzxT8lQdQdY107S0rZn3Vbv8XUSjDMjR35PCKyr692uJJ9xHOOfVfUA==",
+			"dev": true,
+			"requires": {
+				"@hapi/boom": "^9.0.0",
+				"@types/crypto-js": "*",
+				"@types/node": "*",
+				"@types/request": "*"
+			}
+		},
 		"@types/history": {
 			"version": "4.7.6",
 			"resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.6.tgz",
@@ -3910,6 +4133,15 @@
 			"integrity": "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==",
 			"dev": true
 		},
+		"@types/http-proxy": {
+			"version": "1.17.5",
+			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.5.tgz",
+			"integrity": "sha512-GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
 		"@types/is-function": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/@types/is-function/-/is-function-1.0.0.tgz",
@@ -3950,11 +4182,29 @@
 				"pretty-format": "^26.0.0"
 			}
 		},
+		"@types/js-yaml": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.1.tgz",
+			"integrity": "sha512-xdOvNmXmrZqqPy3kuCQ+fz6wA0xU5pji9cd1nDrflWaAWtYLLGk5ykW0H6yg5TVyehHP1pfmuuSaZkhP+kspVA==",
+			"dev": true
+		},
 		"@types/json-schema": {
 			"version": "7.0.5",
 			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz",
 			"integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="
 		},
+		"@types/json5": {
+			"version": "0.0.29",
+			"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+			"integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+			"dev": true
+		},
+		"@types/jsonpath": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/@types/jsonpath/-/jsonpath-0.2.0.tgz",
+			"integrity": "sha512-v7qlPA0VpKUlEdhghbDqRoKMxFB3h3Ch688TApBJ6v+XLDdvWCGLJIYiPKGZnS6MAOie+IorCfNYVHOPIHSWwQ==",
+			"dev": true
+		},
 		"@types/keyv": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz",
@@ -3964,23 +4214,98 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/less": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/@types/less/-/less-3.0.2.tgz",
+			"integrity": "sha512-62vfe65cMSzYaWmpmhqCMMNl0khen89w57mByPi1OseGfcV/LV03fO8YVrNj7rFQsRWNJo650WWyh6m7p8vZmA==",
+			"dev": true
+		},
+		"@types/license-checker": {
+			"version": "25.0.1",
+			"resolved": "https://registry.npmjs.org/@types/license-checker/-/license-checker-25.0.1.tgz",
+			"integrity": "sha512-M6bhv9CmxG/BAX7fH24lhKjK7oBG/fHDkGf2HYEnIA906mtYA4Oa4Hb3Vgz7Ijni5sdz2sbWuTY5x8JeTxuK6w==",
+			"dev": true
+		},
 		"@types/long": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
 			"integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==",
 			"dev": true
 		},
+		"@types/marked": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/@types/marked/-/marked-2.0.2.tgz",
+			"integrity": "sha512-P4zanhCQKs4tiWPPBGpB7lHflgFCP9DFGNI5YtpW9MALKoy2qs9rHNWJ+z55cegD9uCfnmsKuaosq9FNvbxrOw==",
+			"dev": true
+		},
+		"@types/mime": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
+			"integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
+			"dev": true
+		},
+		"@types/mime-types": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz",
+			"integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=",
+			"dev": true
+		},
 		"@types/minimatch": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
 			"integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
 			"dev": true
 		},
+		"@types/mkdirp": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz",
+			"integrity": "sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
+		"@types/multiparty": {
+			"version": "0.0.32",
+			"resolved": "https://registry.npmjs.org/@types/multiparty/-/multiparty-0.0.32.tgz",
+			"integrity": "sha512-zuQEcL9pHiW3u1fgkOWE6T/RwskrFZ3W63aKQPDs7EokIjtbsGL7aVlI4tI86qjL4B3hcFxDRtIGxwRwMTS2Dw==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
+		"@types/ncp": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@types/ncp/-/ncp-2.0.4.tgz",
+			"integrity": "sha512-erpimpT1pH8QfeNg77ypnjwz6CGMqrnL4DewVbqFzD9FXzSULjmG3KzjZnLNe7bzTSZm2W9DpkHyqop1g1KmgQ==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
+		"@types/nedb": {
+			"version": "1.8.11",
+			"resolved": "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.11.tgz",
+			"integrity": "sha512-qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
 		"@types/node": {
 			"version": "14.0.26",
 			"resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.26.tgz",
 			"integrity": "sha512-W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA=="
 		},
+		"@types/node-forge": {
+			"version": "0.9.7",
+			"resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-0.9.7.tgz",
+			"integrity": "sha512-AX7Mqk5ztzSvxqsA/q8y0k0/znJpW6QAqnoLQMEi7A3tio+laRmC/8Q3gbATHT4kZnvhnDmGAy1CpWFzlzCfeA==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
 		"@types/normalize-package-data": {
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
@@ -3993,6 +4318,21 @@
 			"integrity": "sha512-4QQmOF5KlwfxJ5IGXFIudkeLCdMABz03RcUXu+LCb24zmln8QW6aDjuGl4d4XPVLf2j+FnjelHTP7dvceAFbhA==",
 			"dev": true
 		},
+		"@types/nunjucks": {
+			"version": "3.1.4",
+			"resolved": "https://registry.npmjs.org/@types/nunjucks/-/nunjucks-3.1.4.tgz",
+			"integrity": "sha512-cR65PLlHKW/qxxj840dbNb3ICO+iAVQzaNKJ8TcKOVKFi+QcAkhw9SCY8VFAyU41SmJMs+2nrIN2JGhX+jYb7A==",
+			"dev": true
+		},
+		"@types/papaparse": {
+			"version": "5.2.5",
+			"resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.2.5.tgz",
+			"integrity": "sha512-TlqGskBad6skAgx2ifQmkO/FwiwObuWltBvX2bDceQhXh9IyZ7jYCK7qwhjB67kxw+0LJDXXM4jN3lcGqm1g5w==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
 		"@types/parse-json": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
@@ -4025,6 +4365,18 @@
 			"integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
 			"dev": true
 		},
+		"@types/qs": {
+			"version": "6.9.6",
+			"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz",
+			"integrity": "sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==",
+			"dev": true
+		},
+		"@types/range-parser": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
+			"integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==",
+			"dev": true
+		},
 		"@types/reach__router": {
 			"version": "1.3.5",
 			"resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.5.tgz",
@@ -4036,12 +4388,50 @@
 			}
 		},
 		"@types/react": {
-			"version": "16.9.43",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.43.tgz",
-			"integrity": "sha512-PxshAFcnJqIWYpJbLPriClH53Z2WlJcVZE+NP2etUtWQs2s7yIMj3/LDKZT/5CHJ/F62iyjVCDu2H3jHEXIxSg==",
+			"version": "16.14.5",
+			"resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.5.tgz",
+			"integrity": "sha512-YRRv9DNZhaVTVRh9Wmmit7Y0UFhEVqXqCSw3uazRWMxa2x85hWQZ5BN24i7GXZbaclaLXEcodEeIHsjBA8eAMw==",
 			"requires": {
 				"@types/prop-types": "*",
-				"csstype": "^2.2.0"
+				"@types/scheduler": "*",
+				"csstype": "^3.0.2"
+			},
+			"dependencies": {
+				"csstype": {
+					"version": "3.0.8",
+					"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
+					"integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="
+				}
+			}
+		},
+		"@types/react-dom": {
+			"version": "16.9.12",
+			"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.12.tgz",
+			"integrity": "sha512-i7NPZZpPte3jtVOoW+eLB7G/jsX5OM6GqQnH+lC0nq0rqwlK0x8WcMEvYDgFWqWhWMlTltTimzdMax6wYfZssA==",
+			"dev": true,
+			"requires": {
+				"@types/react": "^16"
+			}
+		},
+		"@types/react-native": {
+			"version": "0.64.5",
+			"resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.64.5.tgz",
+			"integrity": "sha512-k0r8MnQX7UFboZDvMKLov26gFLXKrNgLhCfSVhjaZ6wMUofKijxvee7/wgfAqtT2zS5FR4an4+qn0r72SCbw3g==",
+			"dev": true,
+			"requires": {
+				"@types/react": "*"
+			}
+		},
+		"@types/react-redux": {
+			"version": "7.1.16",
+			"resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.16.tgz",
+			"integrity": "sha512-f/FKzIrZwZk7YEO9E1yoxIuDNRiDducxkFlkw/GNMGEnK9n4K8wJzlJBghpSuOVDgEUHoDkDF7Gi9lHNQR4siw==",
+			"dev": true,
+			"requires": {
+				"@types/hoist-non-react-statics": "^3.3.0",
+				"@types/react": "*",
+				"hoist-non-react-statics": "^3.3.0",
+				"redux": "^4.0.0"
 			}
 		},
 		"@types/react-syntax-highlighter": {
@@ -4053,15 +4443,24 @@
 				"@types/react": "*"
 			}
 		},
-		"@types/react-test-renderer": {
-			"version": "16.9.3",
-			"resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-16.9.3.tgz",
-			"integrity": "sha512-wJ7IlN5NI82XMLOyHSa+cNN4Z0I+8/YaLl04uDgcZ+W+ExWCmCiVTLT/7fRNqzy4OhStZcUwIqLNF7q+AdW43Q==",
+		"@types/react-tabs": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/@types/react-tabs/-/react-tabs-2.3.2.tgz",
+			"integrity": "sha512-QfMelaJSdMcp+CenKhATp12XFFqqUcLXILgwpX3dgWfVYNZPtsLXZDDCRsVn+kwmBOWB+DFPKpQorxbUhnXINw==",
 			"dev": true,
 			"requires": {
 				"@types/react": "*"
 			}
 		},
+		"@types/react-test-renderer": {
+			"version": "16.9.5",
+			"resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-16.9.5.tgz",
+			"integrity": "sha512-C4cN7C2uSSGOYelp2XfdtJb5TsCP+QiZ+0Bm4U3ZfUswN8oN9O/l86XO/OvBSFCmWY7w75fzsQvZ50eGkFN34A==",
+			"dev": true,
+			"requires": {
+				"@types/react": "^16"
+			}
+		},
 		"@types/react-textarea-autosize": {
 			"version": "4.3.5",
 			"resolved": "https://registry.npmjs.org/@types/react-textarea-autosize/-/react-textarea-autosize-4.3.5.tgz",
@@ -4071,6 +4470,40 @@
 				"@types/react": "*"
 			}
 		},
+		"@types/redux-mock-store": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@types/redux-mock-store/-/redux-mock-store-1.0.2.tgz",
+			"integrity": "sha512-6LBtAQBN34i7SI5X+Qs4zpTEZO1tTDZ6sZ9fzFjYwTl3nLQXaBtwYdoV44CzNnyKu438xJ1lSIYyw0YMvunESw==",
+			"dev": true,
+			"requires": {
+				"redux": "^4.0.5"
+			}
+		},
+		"@types/request": {
+			"version": "2.48.5",
+			"resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz",
+			"integrity": "sha512-/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ==",
+			"dev": true,
+			"requires": {
+				"@types/caseless": "*",
+				"@types/node": "*",
+				"@types/tough-cookie": "*",
+				"form-data": "^2.5.0"
+			},
+			"dependencies": {
+				"form-data": {
+					"version": "2.5.1",
+					"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+					"integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+					"dev": true,
+					"requires": {
+						"asynckit": "^0.4.0",
+						"combined-stream": "^1.0.6",
+						"mime-types": "^2.1.12"
+					}
+				}
+			}
+		},
 		"@types/responselike": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
@@ -4080,6 +4513,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/scheduler": {
+			"version": "0.16.1",
+			"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.1.tgz",
+			"integrity": "sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA=="
+		},
 		"@types/semver": {
 			"version": "7.3.1",
 			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.1.tgz",
@@ -4088,6 +4526,16 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/serve-static": {
+			"version": "1.13.9",
+			"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz",
+			"integrity": "sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==",
+			"dev": true,
+			"requires": {
+				"@types/mime": "^1",
+				"@types/node": "*"
+			}
+		},
 		"@types/source-list-map": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
@@ -4100,12 +4548,53 @@
 			"integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
 			"dev": true
 		},
+		"@types/storybook__addon-info": {
+			"version": "5.2.3",
+			"resolved": "https://registry.npmjs.org/@types/storybook__addon-info/-/storybook__addon-info-5.2.3.tgz",
+			"integrity": "sha512-3Q98gW7kvjRhN8sfriIW+ArVRQElvN0a4+GlbZABuuRMEW9N9lXKsuX01IRjkpWplk+gY5VUFLY67urwCn539w==",
+			"dev": true,
+			"requires": {
+				"@storybook/addons": "^5.2.0",
+				"@storybook/react": "^5.2.0",
+				"@types/react": "*"
+			}
+		},
+		"@types/styled-components": {
+			"version": "4.4.3",
+			"resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-4.4.3.tgz",
+			"integrity": "sha512-U0udeNOZBfUkJycmGJwmzun0FBt11rZy08weVQmE2xfUNAbX8AGOEWxWna2d+qAUKxKgMlcG+TZT0+K2FfDcnQ==",
+			"dev": true,
+			"requires": {
+				"@types/hoist-non-react-statics": "*",
+				"@types/react": "*",
+				"@types/react-native": "*",
+				"csstype": "^2.2.0"
+			}
+		},
+		"@types/swagger-ui-react": {
+			"version": "3.35.0",
+			"resolved": "https://registry.npmjs.org/@types/swagger-ui-react/-/swagger-ui-react-3.35.0.tgz",
+			"integrity": "sha512-3whipjQ7aRMv+N7XAi9vy1n2CtSrcGkFKMvuYM16rimMFwyJ5Uro1e1oPrSVn3GOkYZokyozOkRR3sTt3CBaxQ==",
+			"dev": true,
+			"requires": {
+				"@types/react": "*"
+			}
+		},
 		"@types/tapable": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz",
 			"integrity": "sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==",
 			"dev": true
 		},
+		"@types/tern": {
+			"version": "0.23.3",
+			"resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.3.tgz",
+			"integrity": "sha512-imDtS4TAoTcXk0g7u4kkWqedB3E4qpjXzCpD2LU5M5NAXHzCDsypyvXSaG7mM8DKYkCRa7tFp4tS/lp/Wo7Q3w==",
+			"dev": true,
+			"requires": {
+				"@types/estree": "*"
+			}
+		},
 		"@types/testing-library__jest-dom": {
 			"version": "5.9.5",
 			"resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.5.tgz",
@@ -4116,18 +4605,24 @@
 			}
 		},
 		"@types/testing-library__react-hooks": {
-			"version": "3.4.1",
-			"resolved": "https://registry.npmjs.org/@types/testing-library__react-hooks/-/testing-library__react-hooks-3.4.1.tgz",
-			"integrity": "sha512-G4JdzEcq61fUyV6wVW9ebHWEiLK2iQvaBuCHHn9eMSbZzVh4Z4wHnUGIvQOYCCYeu5DnUtFyNYuAAgbSaO/43Q==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/@types/testing-library__react-hooks/-/testing-library__react-hooks-4.0.0.tgz",
+			"integrity": "sha512-UzZUXthQtVjDruR2YA+hqg9ux5AfmZ8Kaw+QDungax+T7wb/5NC4x7YOpIqRx7oY3KksGQ69bzNE/xwzb5NslQ==",
 			"dev": true,
 			"requires": {
-				"@types/react-test-renderer": "*"
+				"@testing-library/react-hooks": "*"
 			}
 		},
+		"@types/tough-cookie": {
+			"version": "2.3.7",
+			"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.7.tgz",
+			"integrity": "sha512-rMQbgMGxnLsdn8e9aPVyuN+zMQLrZ2QW8xlv7eWS1mydfGXN+tsTKffcIzd8rGCcLdmi3xvQw2MDaZI1bBNTaw==",
+			"dev": true
+		},
 		"@types/uglify-js": {
-			"version": "3.9.3",
-			"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.3.tgz",
-			"integrity": "sha512-KswB5C7Kwduwjj04Ykz+AjvPcfgv/37Za24O2EDzYNbwyzOo8+ydtvzUfZ5UMguiVu29Gx44l1A6VsPPcmYu9w==",
+			"version": "3.13.0",
+			"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.0.tgz",
+			"integrity": "sha512-EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q==",
 			"dev": true,
 			"requires": {
 				"source-map": "^0.6.1"
@@ -4138,18 +4633,479 @@
 			"resolved": "https://registry.npmjs.org/@types/urijs/-/urijs-1.19.9.tgz",
 			"integrity": "sha512-/tiJyrc0GPcsReHzgC0SXwOmoPjLqYe01W7dLYB0yasQXMbcRee+ZIk+g8MIQhoBS8fPoBQO3Y93+aeBrI93Ug=="
 		},
+		"@types/url-join": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/@types/url-join/-/url-join-4.0.0.tgz",
+			"integrity": "sha512-awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw==",
+			"dev": true
+		},
+		"@types/uuid": {
+			"version": "3.4.9",
+			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.9.tgz",
+			"integrity": "sha512-XDwyIlt/47l2kWLTzw/mtrpLdB+GPSskR2n/PIcPn+VYhVO77rGhRncIR5GPU0KRzXuqkDO+J5qqrG0Y8P6jzQ==",
+			"dev": true
+		},
+		"@types/vkbeautify": {
+			"version": "0.99.2",
+			"resolved": "https://registry.npmjs.org/@types/vkbeautify/-/vkbeautify-0.99.2.tgz",
+			"integrity": "sha512-zbBKJTu2GRURMTj0vFSYRTnOB7Fz7uDZEFKLEkF1tbALUWHSPE84/VwCeJtM1YFOavtbp6xylFkLt6OxT6IG9A==",
+			"dev": true
+		},
 		"@types/webpack": {
-			"version": "4.41.21",
-			"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.21.tgz",
-			"integrity": "sha512-2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA==",
+			"version": "5.28.0",
+			"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz",
+			"integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==",
 			"dev": true,
 			"requires": {
-				"@types/anymatch": "*",
 				"@types/node": "*",
-				"@types/tapable": "*",
-				"@types/uglify-js": "*",
-				"@types/webpack-sources": "*",
-				"source-map": "^0.6.0"
+				"tapable": "^2.2.0",
+				"webpack": "^5"
+			},
+			"dependencies": {
+				"@types/json-schema": {
+					"version": "7.0.7",
+					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
+					"integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
+					"dev": true
+				},
+				"@webassemblyjs/ast": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz",
+					"integrity": "sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==",
+					"dev": true,
+					"requires": {
+						"@webassemblyjs/helper-numbers": "1.11.0",
+						"@webassemblyjs/helper-wasm-bytecode": "1.11.0"
+					}
+				},
+				"@webassemblyjs/helper-api-error": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz",
+					"integrity": "sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==",
+					"dev": true
+				},
+				"@webassemblyjs/helper-buffer": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz",
+					"integrity": "sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==",
+					"dev": true
+				},
+				"@webassemblyjs/helper-wasm-bytecode": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz",
+					"integrity": "sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==",
+					"dev": true
+				},
+				"@webassemblyjs/helper-wasm-section": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz",
+					"integrity": "sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==",
+					"dev": true,
+					"requires": {
+						"@webassemblyjs/ast": "1.11.0",
+						"@webassemblyjs/helper-buffer": "1.11.0",
+						"@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+						"@webassemblyjs/wasm-gen": "1.11.0"
+					}
+				},
+				"@webassemblyjs/ieee754": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz",
+					"integrity": "sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==",
+					"dev": true,
+					"requires": {
+						"@xtuc/ieee754": "^1.2.0"
+					}
+				},
+				"@webassemblyjs/leb128": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz",
+					"integrity": "sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==",
+					"dev": true,
+					"requires": {
+						"@xtuc/long": "4.2.2"
+					}
+				},
+				"@webassemblyjs/utf8": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz",
+					"integrity": "sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==",
+					"dev": true
+				},
+				"@webassemblyjs/wasm-edit": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz",
+					"integrity": "sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==",
+					"dev": true,
+					"requires": {
+						"@webassemblyjs/ast": "1.11.0",
+						"@webassemblyjs/helper-buffer": "1.11.0",
+						"@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+						"@webassemblyjs/helper-wasm-section": "1.11.0",
+						"@webassemblyjs/wasm-gen": "1.11.0",
+						"@webassemblyjs/wasm-opt": "1.11.0",
+						"@webassemblyjs/wasm-parser": "1.11.0",
+						"@webassemblyjs/wast-printer": "1.11.0"
+					}
+				},
+				"@webassemblyjs/wasm-gen": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz",
+					"integrity": "sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==",
+					"dev": true,
+					"requires": {
+						"@webassemblyjs/ast": "1.11.0",
+						"@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+						"@webassemblyjs/ieee754": "1.11.0",
+						"@webassemblyjs/leb128": "1.11.0",
+						"@webassemblyjs/utf8": "1.11.0"
+					}
+				},
+				"@webassemblyjs/wasm-opt": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz",
+					"integrity": "sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==",
+					"dev": true,
+					"requires": {
+						"@webassemblyjs/ast": "1.11.0",
+						"@webassemblyjs/helper-buffer": "1.11.0",
+						"@webassemblyjs/wasm-gen": "1.11.0",
+						"@webassemblyjs/wasm-parser": "1.11.0"
+					}
+				},
+				"@webassemblyjs/wasm-parser": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz",
+					"integrity": "sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==",
+					"dev": true,
+					"requires": {
+						"@webassemblyjs/ast": "1.11.0",
+						"@webassemblyjs/helper-api-error": "1.11.0",
+						"@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+						"@webassemblyjs/ieee754": "1.11.0",
+						"@webassemblyjs/leb128": "1.11.0",
+						"@webassemblyjs/utf8": "1.11.0"
+					}
+				},
+				"@webassemblyjs/wast-printer": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz",
+					"integrity": "sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==",
+					"dev": true,
+					"requires": {
+						"@webassemblyjs/ast": "1.11.0",
+						"@xtuc/long": "4.2.2"
+					}
+				},
+				"acorn": {
+					"version": "8.2.2",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.2.tgz",
+					"integrity": "sha512-VrMS8kxT0e7J1EX0p6rI/E0FbfOVcvBpbIqHThFv+f8YrZIlMfVotYcXKVPmTvPW8sW5miJzfUFrrvthUZg8VQ==",
+					"dev": true
+				},
+				"ajv": {
+					"version": "6.12.6",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+					"dev": true,
+					"requires": {
+						"fast-deep-equal": "^3.1.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
+				},
+				"ajv-keywords": {
+					"version": "3.5.2",
+					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+					"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+					"dev": true
+				},
+				"browserslist": {
+					"version": "4.16.5",
+					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.5.tgz",
+					"integrity": "sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==",
+					"dev": true,
+					"requires": {
+						"caniuse-lite": "^1.0.30001214",
+						"colorette": "^1.2.2",
+						"electron-to-chromium": "^1.3.719",
+						"escalade": "^3.1.1",
+						"node-releases": "^1.1.71"
+					}
+				},
+				"caniuse-lite": {
+					"version": "1.0.30001219",
+					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz",
+					"integrity": "sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ==",
+					"dev": true
+				},
+				"colorette": {
+					"version": "1.2.2",
+					"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+					"integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+					"dev": true
+				},
+				"electron-to-chromium": {
+					"version": "1.3.723",
+					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.723.tgz",
+					"integrity": "sha512-L+WXyXI7c7+G1V8ANzRsPI5giiimLAUDC6Zs1ojHHPhYXb3k/iTABFmWjivEtsWrRQymjnO66/rO2ZTABGdmWg==",
+					"dev": true
+				},
+				"enhanced-resolve": {
+					"version": "5.8.0",
+					"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz",
+					"integrity": "sha512-Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ==",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "^4.2.4",
+						"tapable": "^2.2.0"
+					}
+				},
+				"escalade": {
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+					"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+					"dev": true
+				},
+				"eslint-scope": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+					"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+					"dev": true,
+					"requires": {
+						"esrecurse": "^4.3.0",
+						"estraverse": "^4.1.1"
+					}
+				},
+				"esrecurse": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+					"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+					"dev": true,
+					"requires": {
+						"estraverse": "^5.2.0"
+					},
+					"dependencies": {
+						"estraverse": {
+							"version": "5.2.0",
+							"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+							"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+							"dev": true
+						}
+					}
+				},
+				"glob-to-regexp": {
+					"version": "0.4.1",
+					"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+					"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"jest-worker": {
+					"version": "26.6.2",
+					"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+					"integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+					"dev": true,
+					"requires": {
+						"@types/node": "*",
+						"merge-stream": "^2.0.0",
+						"supports-color": "^7.0.0"
+					}
+				},
+				"loader-runner": {
+					"version": "4.2.0",
+					"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
+					"integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
+					"dev": true
+				},
+				"node-releases": {
+					"version": "1.1.71",
+					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
+					"integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+					"dev": true
+				},
+				"p-limit": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+					"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+					"dev": true,
+					"requires": {
+						"yocto-queue": "^0.1.0"
+					}
+				},
+				"schema-utils": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+					"integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+					"dev": true,
+					"requires": {
+						"@types/json-schema": "^7.0.6",
+						"ajv": "^6.12.5",
+						"ajv-keywords": "^3.5.2"
+					}
+				},
+				"serialize-javascript": {
+					"version": "5.0.1",
+					"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+					"integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+					"dev": true,
+					"requires": {
+						"randombytes": "^2.1.0"
+					}
+				},
+				"supports-color": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				},
+				"tapable": {
+					"version": "2.2.0",
+					"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
+					"integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
+					"dev": true
+				},
+				"terser": {
+					"version": "5.7.0",
+					"resolved": "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz",
+					"integrity": "sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==",
+					"dev": true,
+					"requires": {
+						"commander": "^2.20.0",
+						"source-map": "~0.7.2",
+						"source-map-support": "~0.5.19"
+					},
+					"dependencies": {
+						"source-map": {
+							"version": "0.7.3",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+							"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+							"dev": true
+						}
+					}
+				},
+				"terser-webpack-plugin": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz",
+					"integrity": "sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q==",
+					"dev": true,
+					"requires": {
+						"jest-worker": "^26.6.2",
+						"p-limit": "^3.1.0",
+						"schema-utils": "^3.0.0",
+						"serialize-javascript": "^5.0.1",
+						"source-map": "^0.6.1",
+						"terser": "^5.5.1"
+					}
+				},
+				"watchpack": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz",
+					"integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
+					"dev": true,
+					"requires": {
+						"glob-to-regexp": "^0.4.1",
+						"graceful-fs": "^4.1.2"
+					}
+				},
+				"webpack": {
+					"version": "5.36.1",
+					"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.36.1.tgz",
+					"integrity": "sha512-2u25a82T+6quAxSlzEpN/R/RICwt20ONU3z3Ko05S8KVH9FXILcBYb2hD/rQtZT5y7lRAIsIIs05pdndY7ourQ==",
+					"dev": true,
+					"requires": {
+						"@types/eslint-scope": "^3.7.0",
+						"@types/estree": "^0.0.47",
+						"@webassemblyjs/ast": "1.11.0",
+						"@webassemblyjs/wasm-edit": "1.11.0",
+						"@webassemblyjs/wasm-parser": "1.11.0",
+						"acorn": "^8.2.1",
+						"browserslist": "^4.14.5",
+						"chrome-trace-event": "^1.0.2",
+						"enhanced-resolve": "^5.8.0",
+						"es-module-lexer": "^0.4.0",
+						"eslint-scope": "^5.1.1",
+						"events": "^3.2.0",
+						"glob-to-regexp": "^0.4.1",
+						"graceful-fs": "^4.2.4",
+						"json-parse-better-errors": "^1.0.2",
+						"loader-runner": "^4.2.0",
+						"mime-types": "^2.1.27",
+						"neo-async": "^2.6.2",
+						"schema-utils": "^3.0.0",
+						"tapable": "^2.1.1",
+						"terser-webpack-plugin": "^5.1.1",
+						"watchpack": "^2.0.0",
+						"webpack-sources": "^2.1.1"
+					}
+				},
+				"webpack-sources": {
+					"version": "2.2.0",
+					"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz",
+					"integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==",
+					"dev": true,
+					"requires": {
+						"source-list-map": "^2.0.1",
+						"source-map": "^0.6.1"
+					}
+				}
+			}
+		},
+		"@types/webpack-dev-server": {
+			"version": "3.11.3",
+			"resolved": "https://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz",
+			"integrity": "sha512-p9B/QClflreKDeamKhBwuo5zqtI++wwb9QNG/CdIZUFtHvtaq0dWVgbtV7iMl4Sr4vWzEFj0rn16pgUFANjLPA==",
+			"dev": true,
+			"requires": {
+				"@types/connect-history-api-fallback": "*",
+				"@types/express": "*",
+				"@types/serve-static": "*",
+				"@types/webpack": "^4",
+				"http-proxy-middleware": "^1.0.0"
+			},
+			"dependencies": {
+				"@types/webpack": {
+					"version": "4.41.27",
+					"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.27.tgz",
+					"integrity": "sha512-wK/oi5gcHi72VMTbOaQ70VcDxSQ1uX8S2tukBK9ARuGXrYM/+u4ou73roc7trXDNmCxCoerE8zruQqX/wuHszA==",
+					"dev": true,
+					"requires": {
+						"@types/anymatch": "*",
+						"@types/node": "*",
+						"@types/tapable": "^1",
+						"@types/uglify-js": "*",
+						"@types/webpack-sources": "*",
+						"source-map": "^0.6.0"
+					}
+				},
+				"http-proxy-middleware": {
+					"version": "1.3.1",
+					"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz",
+					"integrity": "sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==",
+					"dev": true,
+					"requires": {
+						"@types/http-proxy": "^1.17.5",
+						"http-proxy": "^1.18.1",
+						"is-glob": "^4.0.1",
+						"is-plain-obj": "^3.0.0",
+						"micromatch": "^4.0.2"
+					}
+				},
+				"is-plain-obj": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+					"integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+					"dev": true
+				}
 			}
 		},
 		"@types/webpack-env": {
@@ -4159,9 +5115,9 @@
 			"dev": true
 		},
 		"@types/webpack-sources": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.1.tgz",
-			"integrity": "sha512-B/RJcbpMp1/od7KADJlW/jeXTEau6NYmhWo+hB29cEfRriYK9SRlH8sY4hI9Au7nrP95Z5MumGvIEiEBHMxoWA==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.0.tgz",
+			"integrity": "sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==",
 			"dev": true,
 			"requires": {
 				"@types/node": "*",
@@ -4177,6 +5133,15 @@
 				}
 			}
 		},
+		"@types/yaml": {
+			"version": "1.9.7",
+			"resolved": "https://registry.npmjs.org/@types/yaml/-/yaml-1.9.7.tgz",
+			"integrity": "sha512-8WMXRDD1D+wCohjfslHDgICd2JtMATZU8CkhH8LVJqcJs6dyYj5TGptzP8wApbmEullGBSsCEzzap73DQ1HJaA==",
+			"dev": true,
+			"requires": {
+				"yaml": "*"
+			}
+		},
 		"@types/yargs": {
 			"version": "15.0.5",
 			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
@@ -4369,6 +5334,31 @@
 				"@webassemblyjs/ast": "1.9.0"
 			}
 		},
+		"@webassemblyjs/helper-numbers": {
+			"version": "1.11.0",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz",
+			"integrity": "sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==",
+			"dev": true,
+			"requires": {
+				"@webassemblyjs/floating-point-hex-parser": "1.11.0",
+				"@webassemblyjs/helper-api-error": "1.11.0",
+				"@xtuc/long": "4.2.2"
+			},
+			"dependencies": {
+				"@webassemblyjs/floating-point-hex-parser": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz",
+					"integrity": "sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==",
+					"dev": true
+				},
+				"@webassemblyjs/helper-api-error": {
+					"version": "1.11.0",
+					"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz",
+					"integrity": "sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==",
+					"dev": true
+				}
+			}
+		},
 		"@webassemblyjs/helper-wasm-bytecode": {
 			"version": "1.9.0",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
@@ -4977,6 +5967,12 @@
 				"readable-stream": "^2.0.6"
 			}
 		},
+		"arg": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+			"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+			"dev": true
+		},
 		"argparse": {
 			"version": "1.0.10",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -5639,9 +6635,9 @@
 			}
 		},
 		"babel-plugin-styled-components": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz",
-			"integrity": "sha512-YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA==",
+			"version": "1.12.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz",
+			"integrity": "sha512-FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA==",
 			"requires": {
 				"@babel/helper-annotate-as-pure": "^7.0.0",
 				"@babel/helper-module-imports": "^7.0.0",
@@ -6234,6 +7230,12 @@
 					"requires": {
 						"has-flag": "^4.0.0"
 					}
+				},
+				"type-fest": {
+					"version": "0.8.1",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+					"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+					"dev": true
 				}
 			}
 		},
@@ -6468,6 +7470,15 @@
 				"temp-file": "^3.3.7"
 			},
 			"dependencies": {
+				"@types/fs-extra": {
+					"version": "9.0.11",
+					"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.11.tgz",
+					"integrity": "sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==",
+					"dev": true,
+					"requires": {
+						"@types/node": "*"
+					}
+				},
 				"ansi-styles": {
 					"version": "4.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -6983,9 +7994,9 @@
 			}
 		},
 		"classnames": {
-			"version": "2.2.6",
-			"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
-			"integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
+			"integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
 		},
 		"clean-css": {
 			"version": "4.2.3",
@@ -7755,6 +8766,12 @@
 				"warning": "^4.0.3"
 			}
 		},
+		"create-require": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+			"integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+			"dev": true
+		},
 		"cross-env": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-2.0.1.tgz",
@@ -8516,6 +9533,12 @@
 				"wrappy": "1"
 			}
 		},
+		"diff": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+			"dev": true
+		},
 		"diff-sequences": {
 			"version": "26.6.2",
 			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
@@ -9204,6 +10227,15 @@
 						"temp-file": "^3.3.7"
 					},
 					"dependencies": {
+						"@types/fs-extra": {
+							"version": "9.0.11",
+							"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.11.tgz",
+							"integrity": "sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==",
+							"dev": true,
+							"requires": {
+								"@types/node": "*"
+							}
+						},
 						"js-yaml": {
 							"version": "3.14.1",
 							"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
@@ -9274,6 +10306,17 @@
 						"fs-extra": "^9.0.1",
 						"lazy-val": "^1.0.4",
 						"mime": "^2.4.6"
+					},
+					"dependencies": {
+						"@types/fs-extra": {
+							"version": "9.0.11",
+							"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.11.tgz",
+							"integrity": "sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==",
+							"dev": true,
+							"requires": {
+								"@types/node": "*"
+							}
+						}
 					}
 				},
 				"esprima": {
@@ -9458,6 +10501,15 @@
 				"mime": "^2.4.5"
 			},
 			"dependencies": {
+				"@types/fs-extra": {
+					"version": "9.0.11",
+					"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.11.tgz",
+					"integrity": "sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==",
+					"dev": true,
+					"requires": {
+						"@types/node": "*"
+					}
+				},
 				"ansi-styles": {
 					"version": "4.2.1",
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -9800,6 +10852,12 @@
 				}
 			}
 		},
+		"es-module-lexer": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz",
+			"integrity": "sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==",
+			"dev": true
+		},
 		"es-to-primitive": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -10688,6 +11746,12 @@
 				"to-regex-range": "^5.0.1"
 			}
 		},
+		"filter-console": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/filter-console/-/filter-console-0.1.1.tgz",
+			"integrity": "sha512-zrXoV1Uaz52DqPs+qEwNJWJFAWZpYJ47UNmpN9q4j+/EYsz85uV0DC9k8tRND5kYmoVzL0W+Y75q4Rg8sRJCdg==",
+			"dev": true
+		},
 		"finalhandler": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
@@ -12009,6 +13073,12 @@
 					"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
 					"dev": true
 				},
+				"slash": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+					"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+					"dev": true
+				},
 				"to-regex-range": {
 					"version": "2.1.1",
 					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
@@ -12588,6 +13658,22 @@
 				"pretty-error": "^2.1.1",
 				"tapable": "^1.1.3",
 				"util.promisify": "1.0.0"
+			},
+			"dependencies": {
+				"@types/webpack": {
+					"version": "4.41.27",
+					"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.27.tgz",
+					"integrity": "sha512-wK/oi5gcHi72VMTbOaQ70VcDxSQ1uX8S2tukBK9ARuGXrYM/+u4ou73roc7trXDNmCxCoerE8zruQqX/wuHszA==",
+					"dev": true,
+					"requires": {
+						"@types/anymatch": "*",
+						"@types/node": "*",
+						"@types/tapable": "^1",
+						"@types/uglify-js": "*",
+						"@types/webpack-sources": "*",
+						"source-map": "^0.6.0"
+					}
+				}
 			}
 		},
 		"htmlparser2": {
@@ -13642,9 +14728,9 @@
 			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
 		},
 		"is-what": {
-			"version": "3.10.0",
-			"resolved": "https://registry.npmjs.org/is-what/-/is-what-3.10.0.tgz",
-			"integrity": "sha512-U4RYCXNOmATQHlOPlOCHCfXyKEFIPqvyaKDqYRuLbD6EYKcTTfc3YXkAYjzOVxO3zt34L+Wh2feIyWrYiZ7kng=="
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
+			"integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA=="
 		},
 		"is-window": {
 			"version": "1.0.2",
@@ -14895,6 +15981,14 @@
 						"find-up": "^4.1.0",
 						"read-pkg": "^5.2.0",
 						"type-fest": "^0.8.1"
+					},
+					"dependencies": {
+						"type-fest": {
+							"version": "0.8.1",
+							"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+							"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+							"dev": true
+						}
 					}
 				},
 				"resolve": {
@@ -16575,6 +17669,12 @@
 				}
 			}
 		},
+		"make-error": {
+			"version": "1.3.6",
+			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+			"dev": true
+		},
 		"makeerror": {
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
@@ -16736,9 +17836,9 @@
 			"dev": true
 		},
 		"memoize-one": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.1.1.tgz",
-			"integrity": "sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA=="
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
+			"integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
 		},
 		"memoizee": {
 			"version": "0.4.14",
@@ -19912,6 +21012,26 @@
 				}
 			}
 		},
+		"react-error-boundary": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-3.1.3.tgz",
+			"integrity": "sha512-A+F9HHy9fvt9t8SNDlonq01prnU8AmkjvGKV4kk8seB9kU3xMEO8J/PQlLVmoOIDODl5U2kufSBs4vrWIqhsAA==",
+			"dev": true,
+			"requires": {
+				"@babel/runtime": "^7.12.5"
+			},
+			"dependencies": {
+				"@babel/runtime": {
+					"version": "7.14.0",
+					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+					"integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+					"dev": true,
+					"requires": {
+						"regenerator-runtime": "^0.13.4"
+					}
+				}
+			}
+		},
 		"react-error-overlay": {
 			"version": "6.0.7",
 			"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz",
@@ -20140,18 +21260,6 @@
 				"prop-types": "^15.5.0"
 			}
 		},
-		"react-test-renderer": {
-			"version": "16.14.0",
-			"resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.14.0.tgz",
-			"integrity": "sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==",
-			"dev": true,
-			"requires": {
-				"object-assign": "^4.1.1",
-				"prop-types": "^15.6.2",
-				"react-is": "^16.8.6",
-				"scheduler": "^0.19.1"
-			}
-		},
 		"react-textarea-autosize": {
 			"version": "7.1.2",
 			"resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-7.1.2.tgz",
@@ -21639,12 +22747,6 @@
 			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
 			"dev": true
 		},
-		"slash": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-			"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-			"dev": true
-		},
 		"slice-ansi": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
@@ -23299,12 +24401,148 @@
 			"integrity": "sha512-UGTRZu1evMw4uTPyYF66/KFd22XiU+jMaIuHrkIHQ2GivAXVlLV0v/vHrpOuTRf9BmpNHi/SO7Vd0rLu0y57jg==",
 			"dev": true
 		},
+		"ts-loader": {
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.2.0.tgz",
+			"integrity": "sha512-ebXBFrNyMSmbWgjnb3WBloUBK+VSx1xckaXsMXxlZRDqce/OPdYBVN5efB0W3V0defq0Gcy4YuzvPGqRgjj85A==",
+			"dev": true,
+			"requires": {
+				"chalk": "^4.1.0",
+				"enhanced-resolve": "^4.0.0",
+				"loader-utils": "^2.0.0",
+				"micromatch": "^4.0.0",
+				"semver": "^7.3.4"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^2.0.1"
+					}
+				},
+				"chalk": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+					"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^4.1.0",
+						"supports-color": "^7.1.0"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"dev": true,
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"color-name": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"loader-utils": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+					"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+					"dev": true,
+					"requires": {
+						"big.js": "^5.2.2",
+						"emojis-list": "^3.0.0",
+						"json5": "^2.1.2"
+					}
+				},
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				},
+				"supports-color": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
+				}
+			}
+		},
+		"ts-node": {
+			"version": "9.1.1",
+			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz",
+			"integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==",
+			"dev": true,
+			"requires": {
+				"arg": "^4.1.0",
+				"create-require": "^1.1.0",
+				"diff": "^4.0.1",
+				"make-error": "^1.1.1",
+				"source-map-support": "^0.5.17",
+				"yn": "3.1.1"
+			}
+		},
 		"ts-pnp": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
 			"integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
 			"dev": true
 		},
+		"tsconfig-paths": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
+			"integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+			"dev": true,
+			"requires": {
+				"@types/json5": "^0.0.29",
+				"json5": "^1.0.1",
+				"minimist": "^1.2.0",
+				"strip-bom": "^3.0.0"
+			},
+			"dependencies": {
+				"json5": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+					"dev": true,
+					"requires": {
+						"minimist": "^1.2.0"
+					}
+				}
+			}
+		},
 		"tslib": {
 			"version": "1.13.0",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
@@ -23356,9 +24594,9 @@
 			"dev": true
 		},
 		"type-fest": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.0.2.tgz",
+			"integrity": "sha512-a720oz3Kjbp3ll0zkeN9qjRhO7I34MKMhPGQiQJAmaZQZQ1lo+NWThK322f7sXV+kTg9B1Ybt16KgBXWgteT8w==",
 			"dev": true
 		},
 		"type-is": {
@@ -23393,9 +24631,10 @@
 			}
 		},
 		"typescript": {
-			"version": "3.9.7",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
-			"integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz",
+			"integrity": "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==",
+			"dev": true
 		},
 		"typescript-json-schema": {
 			"version": "0.40.0",
@@ -23407,6 +24646,13 @@
 				"json-stable-stringify": "^1.0.1",
 				"typescript": "^3.5.3",
 				"yargs": "^14.0.0"
+			},
+			"dependencies": {
+				"typescript": {
+					"version": "3.9.9",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.9.tgz",
+					"integrity": "sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w=="
+				}
 			}
 		},
 		"ua-parser-js": {
@@ -26418,6 +27664,18 @@
 				"fd-slicer": "~1.1.0"
 			}
 		},
+		"yn": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+			"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+			"dev": true
+		},
+		"yocto-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+			"dev": true
+		},
 		"zenscroll": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/zenscroll/-/zenscroll-4.0.2.tgz",
diff --git a/packages/insomnia-app/package.json b/packages/insomnia-app/package.json
index c81046f8e2..0e5d563feb 100644
--- a/packages/insomnia-app/package.json
+++ b/packages/insomnia-app/package.json
@@ -8,59 +8,27 @@
   "license": "MIT",
   "main": "app/main.min.js",
   "scripts": {
-    "typecheck": "flow check",
+    "clean": "tsc --build tsconfig.webpack.json --clean && tsc --build tsconfig.build.json --clean",
     "test": "npm run test:jest",
     "test:jest": "cross-env NODE_ENV=test jest --silent",
     "test-appveyor": "npm run test -- --maxWorkers 1",
-    "start:electron": "cross-env NODE_ENV=development webpack --config ./webpack/webpack.config.electron.babel.js && electron .",
-    "start:dev-server": "webpack-dev-server --config ./webpack/webpack.config.development.babel.js",
+    "start:electron": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" cross-env NODE_ENV=development webpack --config webpack/webpack.config.electron.ts && electron .",
+    "start:dev-server": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack-dev-server --config webpack/webpack.config.development.ts",
     "start": "concurrently -n dev,app --kill-others \"npm run start:dev-server\" \"npm run start:electron\"",
     "storybook": "start-storybook --port 3222",
-    "build": "node ./scripts/build.js",
-    "build:sr": "webpack --config send-request/webpack.config.babel.js",
-    "package": "node ./scripts/package.js",
-    "release": "node ./scripts/release.js",
-    "bootstrap": "rimraf node_modules/graphql-language-service-interface/dist/*.flow && npm run build:sr"
+    "prebuild": "npm run clean",
+    "build": "npm run build:sr && npm run build:app",
+    "build:app": "ts-node ./scripts/build.ts --noErrorTruncation",
+    "build:sr": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack --config webpack/webpack.config.sr.ts",
+    "package": "ts-node scripts/package.ts",
+    "release": "ts-node scripts/release.ts",
+    "lint": "eslint . --ext .js,.ts,.tsx",
+    "lint:fix": "npm run lint -- --fix",
+    "bootstrap": "npm run build:sr"
   },
   "dev": {
     "dev-server-port": 3334
   },
-  "jest": {
-    "setupFiles": [
-      "./__jest__/setup.js"
-    ],
-    "setupFilesAfterEnv": [
-      "./__jest__/setup-after-env.js"
-    ],
-    "moduleNameMapper": {
-      "\\.(css|less|png)$": "<rootDir>/__mocks__/dummy.js",
-      "^worker-loader!": "<rootDir>/__mocks__/dummy.js"
-    },
-    "modulePathIgnorePatterns": [
-      "<rootDir>/network/.*/__mocks__"
-    ],
-    "testMatch": [
-      "**/__tests__/**/*.test.js?(x)"
-    ],
-    "rootDir": "app",
-    "verbose": false,
-    "resetMocks": true,
-    "resetModules": true,
-    "collectCoverage": false,
-    "collectCoverageFrom": [
-      "**/*.js",
-      "!**/*.min.js",
-      "!**/main.development.js",
-      "!**/static/**",
-      "!**/ui/components/**",
-      "!**/__fixtures__/**",
-      "!**/__schemas__/**",
-      "!**/__tests__/**",
-      "!**/__jest__/**",
-      "!**/__mocks__/**",
-      "!**/node_modules/**"
-    ]
-  },
   "packedDependencies": [
     "class-autobind-decorator",
     "classnames",
@@ -79,7 +47,6 @@
     "moment",
     "objectpath",
     "pdfjs-dist",
-    "prop-types",
     "react",
     "react-animated-tree",
     "react-dnd",
@@ -104,7 +71,7 @@
     "aws4": "^1.9.0",
     "axios": "^0.21.1",
     "class-autobind-decorator": "^3.0.1",
-    "classnames": "^2.2.5",
+    "classnames": "^2.3.1",
     "clone": "^2.1.0",
     "codemirror": "^5.50.0",
     "codemirror-graphql": "^0.11.3",
@@ -165,8 +132,7 @@
     "openapi-2-kong": "2.2.35",
     "papaparse": "^5.2.0",
     "pdfjs-dist": "^2.5.207",
-    "prop-types": "^15.6.1",
-    "react": "^16.8.6",
+    "react": "^16.8.3",
     "react-animated-tree": "^1.0.10",
     "react-dnd": "^7.4.5",
     "react-dnd-html5-backend": "^7.4.4",
@@ -189,8 +155,6 @@
     "zprint-clj": "0.2.0"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.4.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.9.0",
     "@develohpanda/fluent-builder": "^2.1.2",
     "@grpc/grpc-js": "^1.1.8",
     "@grpc/proto-loader": "^0.5.5",
@@ -199,8 +163,50 @@
     "@storybook/react": "^5.2.6",
     "@testing-library/dom": "^7.28.1",
     "@testing-library/jest-dom": "^5.11.5",
-    "@testing-library/react": "^11.1.1",
-    "@testing-library/react-hooks": "^3.4.2",
+    "@testing-library/react": "^11.2.6",
+    "@testing-library/react-hooks": "^5.1.2",
+    "@types/analytics-node": "^3.1.4",
+    "@types/aws4": "^1.5.1",
+    "@types/clone": "^2.1.0",
+    "@types/codemirror": "^0.0.109",
+    "@types/color": "^3.0.1",
+    "@types/concurrently": "^6.0.1",
+    "@types/deep-equal": "^1.0.1",
+    "@types/events": "^1.2.0",
+    "@types/file-loader": "^5.0.0",
+    "@types/fs-extra": "^5.1.0",
+    "@types/hawk": "^9.0.0",
+    "@types/js-yaml": "^4.0.1",
+    "@types/jsonpath": "^0.2.0",
+    "@types/less": "^3.0.2",
+    "@types/license-checker": "^25.0.1",
+    "@types/marked": "^2.0.2",
+    "@types/mime-types": "^2.1.0",
+    "@types/mkdirp": "^0.5.2",
+    "@types/multiparty": "^0.0.32",
+    "@types/ncp": "^2.0.4",
+    "@types/nedb": "^1.8.11",
+    "@types/node-forge": "^0.9.7",
+    "@types/nunjucks": "^3.1.4",
+    "@types/papaparse": "^5.2.5",
+    "@types/prop-types": "^15.7.3",
+    "@types/react": "^16.14.5",
+    "@types/react-dom": "^16.9.12",
+    "@types/react-redux": "^7.1.16",
+    "@types/react-tabs": "^2.3.2",
+    "@types/redux-mock-store": "^1.0.2",
+    "@types/storybook__addon-info": "^5.2.3",
+    "@types/styled-components": "^4.4.3",
+    "@types/swagger-ui-react": "^3.35.0",
+    "@types/testing-library__jest-dom": "^5.9.5",
+    "@types/testing-library__react-hooks": "^4.0.0",
+    "@types/tough-cookie": "^2.3.7",
+    "@types/url-join": "^4.0.0",
+    "@types/uuid": "^3.4.9",
+    "@types/vkbeautify": "^0.99.2",
+    "@types/webpack": "^5.28.0",
+    "@types/webpack-dev-server": "^3.11.3",
+    "@types/yaml": "^1.9.7",
     "concurrently": "^3.5.0",
     "cross-env": "^2.0.0",
     "css-loader": "^2.1.1",
@@ -210,18 +216,22 @@
     "electron-notarize": "^0.3.0",
     "fast-glob": "^3.1.0",
     "file-loader": "^3.0.1",
-    "jest": "^26.0.1",
+    "jest": "^26.6.3",
     "less": "^3.8.1",
     "less-loader": "^4.1.0",
     "license-checker": "^25.0.1",
     "ncp": "^2.0.0",
     "prompt-run": "^1.4.5",
     "react-hot-loader": "^4.13.0",
-    "react-test-renderer": "^16.14.0",
     "redux-mock-store": "^1.5.4",
     "source-map-loader": "^1.0.0",
     "spectron": "^11.1.0",
     "style-loader": "^0.23.1",
+    "ts-loader": "^8.2.0",
+    "ts-node": "^9.1.1",
+    "tsconfig-paths": "^3.9.0",
+    "type-fest": "^1.0.2",
+    "typescript": "4.2.3",
     "url-loader": "^1.1.2",
     "val-loader": "^2.1.2",
     "webpack": "^4.44.1",
diff --git a/packages/insomnia-app/scripts/afterSignHook.js b/packages/insomnia-app/scripts/afterSignHook.js
index 23cf6e3c1d..3a9179f038 100644
--- a/packages/insomnia-app/scripts/afterSignHook.js
+++ b/packages/insomnia-app/scripts/afterSignHook.js
@@ -1,7 +1,8 @@
+// TODO(TSCONVERSION) not entirely sure if this can be in TypeScript or not.  If so, need to convert.
 const fs = require('fs');
 const path = require('path');
 const electronNotarize = require('electron-notarize');
-const appConfig = require('../config').appConfig();
+const appConfig = require('../config/config.json');
 
 // See: https://medium.com/@TwitterArchiveEraser/notarize-electron-apps-7a5f988406db
 module.exports = async function(params) {
@@ -19,13 +20,6 @@ module.exports = async function(params) {
     throw new Error(`Cannot find application at: ${appName}`);
   }
 
-  const args = {
-    appBundleId: appId,
-    appPath: appPath,
-    appleId: process.env.APPLE_ID,
-    appleIdPassword: process.env.APPLE_ID_PASSWORD,
-  };
-
   if (!process.env.APPLE_ID) {
     console.log('[aftersign] APPLE_ID env variable not set. Skipping notarization');
     return;
@@ -36,6 +30,13 @@ module.exports = async function(params) {
     return;
   }
 
+  const args = {
+    appBundleId: appId,
+    appPath: appPath,
+    appleId: process.env.APPLE_ID,
+    appleIdPassword: process.env.APPLE_ID_PASSWORD,
+  };
+
   console.log(`[afterSign] Notarizing ${appName} (${appId})`);
 
   try {
diff --git a/packages/insomnia-app/scripts/build.js b/packages/insomnia-app/scripts/build.js
deleted file mode 100644
index bbf0d8766d..0000000000
--- a/packages/insomnia-app/scripts/build.js
+++ /dev/null
@@ -1,247 +0,0 @@
-const { appConfig } = require('../config');
-const childProcess = require('child_process');
-const webpack = require('webpack');
-const licenseChecker = require('license-checker');
-const rimraf = require('rimraf');
-const ncp = require('ncp').ncp;
-const path = require('path');
-const mkdirp = require('mkdirp');
-const fs = require('fs');
-const { getBuildContext } = require('./getBuildContext');
-
-// Start build if ran from CLI
-if (require.main === module) {
-  process.nextTick(async () => {
-    await module.exports.start(false);
-  });
-}
-
-module.exports.start = async function(forceFromGitRef) {
-  const buildContext = getBuildContext(forceFromGitRef);
-  if (!buildContext.smokeTest && !buildContext.version) {
-    console.log(`[build] Skipping build for ref "${buildContext.gitRef}"`);
-    process.exit(0);
-  }
-
-  if (!buildContext.smokeTest && appConfig().version !== buildContext.version) {
-    console.log(
-      `[build] App version mismatch with Git tag ${appConfig().version} != ${buildContext.version}`,
-    );
-    process.exit(1);
-  }
-
-  // These must be required after APP_ID environment variable is set above
-  const configRenderer = require('../webpack/webpack.config.production.babel');
-  const configMain = require('../webpack/webpack.config.electron.babel');
-  const buildFolder = path.join('../build');
-
-  if (buildContext.smokeTest) {
-    console.log('[build] Starting build to smoke test');
-  } else {
-    console.log(`[build] Starting build for ref "${buildContext.gitRef}"`);
-  }
-  console.log(`[build] npm: ${childProcess.spawnSync('npm', ['--version']).stdout}`.trim());
-  console.log(`[build] node: ${childProcess.spawnSync('node', ['--version']).stdout}`.trim());
-
-  if (process.version.indexOf('v12.') !== 0) {
-    console.log('[build] Node v12.x.x is required to build');
-    process.exit(1);
-  }
-
-  // Remove folders first
-  console.log('[build] Removing existing directories');
-  await emptyDir(buildFolder);
-
-  // Build the things
-  console.log('[build] Building license list');
-  await buildLicenseList('../', path.join(buildFolder, 'opensource-licenses.txt'));
-  console.log('[build] Building Webpack renderer');
-  await buildWebpack(configRenderer);
-  console.log('[build] Building Webpack main');
-  await buildWebpack(configMain);
-
-  // Copy necessary files
-  console.log('[build] Copying files');
-  await copyFiles('../bin', buildFolder);
-  await copyFiles('../app/static', path.join(buildFolder, 'static'));
-  await copyFiles('../app/icons', buildFolder);
-
-  // Generate necessary files needed by `electron-builder`
-  await generatePackageJson('../package.json', path.join(buildFolder, 'package.json'));
-
-  // Install Node modules
-  console.log('[build] Installing dependencies');
-  await install(buildFolder);
-
-  console.log('[build] Complete!');
-  return buildContext;
-};
-
-async function buildWebpack(config) {
-  return new Promise((resolve, reject) => {
-    const compiler = webpack(config);
-    compiler.run((err, stats) => {
-      if (err) {
-        reject(err);
-      } else if (stats.hasErrors()) {
-        reject(new Error('Failed to build webpack'));
-        console.log(stats.toJson().errors);
-      } else {
-        resolve();
-      }
-    });
-  });
-}
-
-async function emptyDir(relPath) {
-  return new Promise((resolve, reject) => {
-    const dir = path.resolve(__dirname, relPath);
-    rimraf(dir, err => {
-      if (err) {
-        reject(err);
-      } else {
-        mkdirp.sync(dir);
-        resolve();
-      }
-    });
-  });
-}
-
-async function copyFiles(relSource, relDest) {
-  return new Promise((resolve, reject) => {
-    const source = path.resolve(__dirname, relSource);
-    const dest = path.resolve(__dirname, relDest);
-    console.log(`[build] copy "${relSource}" to "${relDest}"`);
-    ncp(source, dest, err => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve();
-      }
-    });
-  });
-}
-
-async function buildLicenseList(relSource, relDest) {
-  return new Promise((resolve, reject) => {
-    const source = path.resolve(__dirname, relSource);
-    const dest = path.resolve(__dirname, relDest);
-    mkdirp.sync(path.dirname(dest));
-
-    licenseChecker.init(
-      {
-        start: source,
-        production: true,
-      },
-      (err, packages) => {
-        if (err) {
-          return reject(err);
-        }
-
-        const out = [];
-        for (const pkgName of Object.keys(packages)) {
-          const { licenses, repository, publisher, email, licenseFile: lf } = packages[pkgName];
-          const licenseFile = (lf || '').includes('README') ? null : lf;
-          const txt = licenseFile ? fs.readFileSync(licenseFile) : '[no license file]';
-          const body = [
-            '-------------------------------------------------------------------------',
-            '',
-            `PACKAGE: ${pkgName}`,
-            licenses ? `LICENSES: ${licenses}` : null,
-            repository ? `REPOSITORY: ${repository}` : null,
-            publisher ? `PUBLISHER: ${publisher}` : null,
-            email ? `EMAIL: ${email}` : null,
-            '\n' + txt,
-          ]
-            .filter(v => v !== null)
-            .join('\n');
-
-          out.push(`${body}\n\n`);
-        }
-
-        const header = [
-          'This application bundles the following third-party packages in ',
-          'accordance with the following licenses:',
-          '-------------------------------------------------------------------------',
-          '',
-          '',
-        ].join('\n');
-
-        fs.writeFileSync(dest, header + out.join('\n\n'));
-        resolve();
-      },
-    );
-  });
-}
-
-async function install(relDir) {
-  return new Promise(resolve => {
-    const prefix = path.resolve(__dirname, relDir);
-
-    const p = childProcess.spawn('npm', ['install', '--production', '--no-optional'], {
-      cwd: prefix,
-      shell: true,
-    });
-
-    p.stdout.on('data', data => {
-      console.log(data.toString());
-    });
-
-    p.stderr.on('data', data => {
-      console.log(data.toString());
-    });
-
-    p.on('exit', code => {
-      console.log('child process exited with code ' + code.toString());
-      resolve();
-    });
-  });
-}
-
-function generatePackageJson(relBasePkg, relOutPkg) {
-  // Read package.json's
-  const basePath = path.resolve(__dirname, relBasePkg);
-  const outPath = path.resolve(__dirname, relOutPkg);
-
-  const basePkg = JSON.parse(fs.readFileSync(basePath));
-
-  const app = appConfig();
-  const appPkg = {
-    name: app.name,
-    version: app.version,
-    productName: app.productName,
-    longName: app.longName,
-    description: basePkg.description,
-    license: basePkg.license,
-    homepage: basePkg.homepage,
-    author: basePkg.author,
-    copyright: `Copyright © ${new Date().getFullYear()} ${basePkg.author}`,
-    main: 'main.min.js',
-    dependencies: {},
-  };
-
-  console.log(`[build] Generated build config for ${appPkg.name} ${appPkg.version}`);
-
-  for (const key of Object.keys(appPkg)) {
-    if (key === undefined) {
-      throw new Error(`[build] missing "app.${key}" from package.json`);
-    }
-  }
-
-  // Figure out which dependencies to pack
-  const allDependencies = Object.keys(basePkg.dependencies);
-  const packedDependencies = basePkg.packedDependencies;
-  const unpackedDependencies = allDependencies.filter(name => !packedDependencies.includes(name));
-
-  // Add dependencies
-  console.log(`[build] Adding ${unpackedDependencies.length} node dependencies`);
-  for (const name of unpackedDependencies) {
-    const version = basePkg.dependencies[name];
-    if (!version) {
-      throw new Error(`Failed to find packed dep "${name}" in dependencies`);
-    }
-    appPkg.dependencies[name] = version;
-  }
-
-  fs.writeFileSync(outPath, JSON.stringify(appPkg, null, 2));
-}
diff --git a/packages/insomnia-app/scripts/build.ts b/packages/insomnia-app/scripts/build.ts
new file mode 100644
index 0000000000..c24a4eb3c2
--- /dev/null
+++ b/packages/insomnia-app/scripts/build.ts
@@ -0,0 +1,247 @@
+import appConfig from '../config/config.json';
+import childProcess from 'child_process';
+import webpack from 'webpack';
+import licenseChecker from 'license-checker';
+import rimraf from 'rimraf';
+import { ncp } from 'ncp';
+import path from 'path';
+import mkdirp from 'mkdirp';
+import { readFileSync, writeFileSync, promises } from 'fs';
+import { getBuildContext } from './getBuildContext';
+import productionWebpackConfig from '../webpack/webpack.config.production';
+import electronWebpackConfig from '../webpack/webpack.config.electron';
+
+const { readFile, writeFile } = promises;
+
+// Start build if ran from CLI
+if (require.main === module) {
+  process.nextTick(async () => {
+    await module.exports.start(false);
+  });
+}
+
+const buildWebpack = (config: webpack.Configuration) => new Promise<void>((resolve, reject) => {
+  webpack(config).run((err, stats) => {
+    if (err) {
+      reject(err);
+      return;
+    }
+
+    if (stats?.hasErrors()) {
+      reject(new Error('Failed to build webpack'));
+      console.log(stats.toJson().errors);
+      return;
+    }
+
+    resolve();
+  });
+});
+
+const emptyDir = (relPath: string) => new Promise<void>((resolve, reject) => {
+  const dir = path.resolve(__dirname, relPath);
+  rimraf(dir, err => {
+    if (err) {
+      reject(err);
+    } else {
+      mkdirp.sync(dir);
+      resolve();
+    }
+  });
+});
+
+const copyFiles = (relSource: string, relDest: string) => new Promise<void>((resolve, reject) => {
+  const source = path.resolve(__dirname, relSource);
+  const dest = path.resolve(__dirname, relDest);
+  console.log(`[build] copy "${relSource}" to "${relDest}"`);
+  ncp(source, dest, err => {
+    if (err) {
+      reject(err);
+    } else {
+      resolve();
+    }
+  });
+});
+
+const buildLicenseList = (relSource: string, relDest: string) => new Promise<void>((resolve, reject) => {
+  const source = path.resolve(__dirname, relSource);
+  const dest = path.resolve(__dirname, relDest);
+  mkdirp.sync(path.dirname(dest));
+
+  licenseChecker.init(
+    {
+      start: source,
+      production: true,
+    },
+    (err, packages) => {
+      if (err) {
+        return reject(err);
+      }
+
+      const header = [
+        'This application bundles the following third-party packages in ',
+        'accordance with the following licenses:',
+        '-------------------------------------------------------------------------',
+        '',
+        '',
+      ].join('\n');
+
+      const out = Object.keys(packages).sort().map(packageName => {
+        const { licenses, repository, publisher, email, licenseFile: lf } = packages[packageName];
+        const licenseFile = (lf || '').includes('README') ? null : lf;
+        return [
+          '-------------------------------------------------------------------------',
+          '',
+          `PACKAGE: ${packageName}`,
+          licenses ? `LICENSES: ${licenses}` : null,
+          repository ? `REPOSITORY: ${repository}` : null,
+          publisher ? `PUBLISHER: ${publisher}` : null,
+          email ? `EMAIL: ${email}` : null,
+          '',
+          licenseFile ? readFileSync(licenseFile) : '[no license file]',
+          '',
+          '',
+        ].filter(v => v !== null).join('\n');
+      }).join('\n');
+
+      writeFileSync(dest, `${header}${out}`);
+      resolve();
+    },
+  );
+});
+
+const install = (relDir: string) => new Promise<void>(resolve => {
+  const prefix = path.resolve(__dirname, relDir);
+
+  const p = childProcess.spawn('npm', ['install', '--production', '--no-optional'], {
+    cwd: prefix,
+    shell: true,
+  });
+
+  p.stdout.on('data', data => {
+    console.log(data.toString());
+  });
+
+  p.stderr.on('data', data => {
+    console.log(data.toString());
+  });
+
+  p.on('exit', code => {
+    console.log(`child process exited with code ${code}`);
+    resolve();
+  });
+});
+
+const generatePackageJson = async (relBasePkg: string, relOutPkg: string) => {
+  // Read package.json's
+  const basePath = path.resolve(__dirname, relBasePkg);
+  const outPath = path.resolve(__dirname, relOutPkg);
+
+  const inputFile = String(await readFile(basePath));
+  const basePkg = JSON.parse(inputFile);
+
+  const appPkg = {
+    name: appConfig.name,
+    version: appConfig.version,
+    productName: appConfig.productName,
+    longName: appConfig.longName,
+    description: basePkg.description,
+    license: basePkg.license,
+    homepage: basePkg.homepage,
+    author: basePkg.author,
+    copyright: `Copyright © ${new Date().getFullYear()} ${basePkg.author}`,
+    main: 'main.min.js',
+    dependencies: {},
+  };
+
+  console.log(`[build] Generated build config for ${appPkg.name} ${appPkg.version}`);
+
+  for (const key of Object.keys(appPkg)) {
+    if (key === undefined) {
+      throw new Error(`[build] missing "app.${key}" from package.json`);
+    }
+  }
+
+  // Figure out which dependencies to pack
+  const allDependencies = Object.keys(basePkg.dependencies);
+  const packedDependencies = basePkg.packedDependencies;
+  const unpackedDependencies = allDependencies.filter(name => !packedDependencies.includes(name));
+
+  // Add dependencies
+  console.log(`[build] Adding ${unpackedDependencies.length} node dependencies`);
+  for (const name of unpackedDependencies) {
+    const version = basePkg.dependencies[name];
+    if (!version) {
+      throw new Error(`Failed to find packed dep "${name}" in dependencies`);
+    }
+    appPkg.dependencies[name] = version;
+  }
+
+  const outputFile = JSON.stringify(appPkg, null, 2);
+  await writeFile(outPath, outputFile);
+};
+
+export const start = async ({ forceFromGitRef }: { forceFromGitRef: boolean }) => {
+  const buildContext = getBuildContext(forceFromGitRef);
+  const { gitRef, smokeTest, version } = buildContext;
+
+  if (smokeTest) {
+    console.log('[build] Starting build to smoke test');
+  } else {
+    if (!version) {
+      if (!gitRef) {
+        console.log('[build] No git ref found. Check for the presence of a `GIT_TAG`, `GITHUB_REF`, `TRAVIS_TAG`, or `TRAVIS_CURRENT_BRANCH` environment variable');
+      } else {
+        console.log(`[build] git ref \`${gitRef}\` found`);
+      }
+      console.log('[build] Skipping build because no version was found (the version is derived from the git ref)');
+      process.exit(0);
+    }
+
+    if (appConfig.version !== version) {
+      const tags = `${appConfig.version} != ${version}`;
+      console.log(`[build] App version mismatch with Git tag ${tags}`);
+      process.exit(1);
+    }
+    console.log(`[build] Starting build for ref "${gitRef}"`);
+  }
+
+  console.log(`[build] npm: ${childProcess.spawnSync('npm', ['--version']).stdout}`.trim());
+  console.log(`[build] node: ${childProcess.spawnSync('node', ['--version']).stdout}`.trim());
+
+  if (process.version.indexOf('v12.') !== 0) {
+    console.log('[build] Node v12.x.x is required to build');
+    process.exit(1);
+  }
+
+  const buildFolder = path.join('../build');
+
+  // Remove folders first
+  console.log('[build] Removing existing directories');
+  await emptyDir(buildFolder);
+
+  // Build the things
+  console.log('[build] Building license list');
+  await buildLicenseList('../', path.join(buildFolder, 'opensource-licenses.txt'));
+
+  console.log('[build] Building Webpack renderer');
+  await buildWebpack(productionWebpackConfig as webpack.Configuration);
+
+  console.log('[build] Building Webpack main');
+  await buildWebpack(electronWebpackConfig as webpack.Configuration);
+
+  // Copy necessary files
+  console.log('[build] Copying files');
+  await copyFiles('../bin', buildFolder);
+  await copyFiles('../app/static', path.join(buildFolder, 'static'));
+  await copyFiles('../app/icons', buildFolder);
+
+  // Generate necessary files needed by `electron-builder`
+  await generatePackageJson('../package.json', path.join(buildFolder, 'package.json'));
+
+  // Install Node modules
+  console.log('[build] Installing dependencies');
+  await install(buildFolder);
+
+  console.log('[build] Complete!');
+  return buildContext;
+};
diff --git a/packages/insomnia-app/scripts/getBuildContext.js b/packages/insomnia-app/scripts/getBuildContext.ts
similarity index 64%
rename from packages/insomnia-app/scripts/getBuildContext.js
rename to packages/insomnia-app/scripts/getBuildContext.ts
index 75741ee0e7..6d9dcabb0f 100644
--- a/packages/insomnia-app/scripts/getBuildContext.js
+++ b/packages/insomnia-app/scripts/getBuildContext.ts
@@ -1,25 +1,13 @@
-module.exports.getBuildContext = forceFromGitRef => {
-  if (forceFromGitRef) {
-    return fromGitRef();
-  }
-
-  return fromSmokeTest() || fromGitRef();
-};
-
-function fromSmokeTest() {
-  const { SMOKE_TEST } = process.env;
-
-  if (SMOKE_TEST) {
-    return {
-      smokeTest: true,
-      version: '0.0.1',
-    };
-  }
-
-  return null;
+export interface BuildContext {
+  app?: string | null;
+  channel?: string | null;
+  gitCommit?: string | null;
+  gitRef?: string | null;
+  smokeTest: boolean;
+  version: string | null;
 }
 
-function fromGitRef() {
+const fromGitRef = (): BuildContext => {
   const {
     GIT_TAG,
     GITHUB_REF,
@@ -40,8 +28,24 @@ function fromGitRef() {
   return {
     app,
     channel,
-    version,
-    gitRef,
     gitCommit,
+    gitRef,
+    smokeTest: false,
+    version,
   };
-}
+};
+
+export const getBuildContext = (forceFromGitRef: boolean) => {
+  if (forceFromGitRef) {
+    return fromGitRef();
+  }
+
+  if (process.env.SMOKE_TEST) {
+    return {
+      smokeTest: true,
+      version: '0.0.1',
+    } as const;
+  }
+
+  return fromGitRef();
+};
diff --git a/packages/insomnia-app/scripts/package.js b/packages/insomnia-app/scripts/package.js
deleted file mode 100644
index ee42bff827..0000000000
--- a/packages/insomnia-app/scripts/package.js
+++ /dev/null
@@ -1,77 +0,0 @@
-const { appConfig } = require('../config');
-const electronBuilderConfig = require('../config/electronbuilder.json');
-const electronBuilder = require('electron-builder');
-const path = require('path');
-const rimraf = require('rimraf');
-const buildTask = require('./build');
-
-const PLATFORM_MAP = {
-  darwin: 'mac',
-  linux: 'linux',
-  win32: 'win',
-};
-
-// Start package if ran from CLI
-if (require.main === module) {
-  process.nextTick(async () => {
-    try {
-      await buildTask.start(false);
-      await module.exports.start();
-    } catch (err) {
-      console.log('[package] ERROR:', err);
-      process.exit(1);
-    }
-  });
-}
-
-module.exports.start = async function() {
-  console.log('[package] Removing existing directories');
-
-  if (process.env.KEEP_DIST_FOLDER !== 'yes') {
-    await emptyDir(path.join('..', 'dist', '*'));
-  }
-
-  console.log('[package] Packaging app');
-  await pkg();
-
-  console.log('[package] Complete!');
-};
-
-async function pkg() {
-  const app = appConfig();
-
-  // Replace some things
-  const rawConfig = JSON.stringify(electronBuilderConfig, null, 2)
-    .replace(/__APP_ID__/g, app.appId)
-    .replace(/__BINARY_PREFIX__/g, app.binaryPrefix)
-    .replace(/__EXECUTABLE_NAME__/g, app.executableName)
-    .replace(/__GITHUB_OWNER__/g, app.githubOrg)
-    .replace(/__GITHUB_REPO__/g, app.githubRepo)
-    .replace(/__ICON_URL__/g, app.icon)
-    .replace(/__SYNOPSIS__/g, app.synopsis);
-
-  const config = JSON.parse(rawConfig);
-  const targetPlatform = PLATFORM_MAP[process.platform];
-
-  const target = process.env.BUILD_TARGETS
-    ? process.env.BUILD_TARGETS.split(',')
-    : config[targetPlatform].target;
-
-  return electronBuilder.build({
-    config,
-    [targetPlatform]: target,
-  });
-}
-
-async function emptyDir(relPath) {
-  return new Promise((resolve, reject) => {
-    const dir = path.resolve(__dirname, relPath);
-    rimraf(dir, err => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve();
-      }
-    });
-  });
-}
diff --git a/packages/insomnia-app/scripts/package.ts b/packages/insomnia-app/scripts/package.ts
new file mode 100644
index 0000000000..ae93b86d57
--- /dev/null
+++ b/packages/insomnia-app/scripts/package.ts
@@ -0,0 +1,82 @@
+import appConfig from '../config/config.json';
+import electronBuilderConfig from '../config/electronbuilder.json';
+import * as electronBuilder from 'electron-builder';
+import path from 'path';
+import rimraf from 'rimraf';
+import { start as build } from './build';
+
+const PLATFORM_MAP = {
+  darwin: 'mac',
+  linux: 'linux',
+  win32: 'win',
+} as const;
+
+// Start package if ran from CLI
+if (require.main === module) {
+  process.nextTick(async () => {
+    try {
+      await build({ forceFromGitRef: false });
+      await module.exports.start();
+    } catch (err) {
+      console.log('[package] ERROR:', err);
+      process.exit(1);
+    }
+  });
+}
+
+const pkg = () => {
+  const { BUILD_TARGETS } = process.env;
+  const {
+    appId,
+    binaryPrefix,
+    executableName,
+    githubOrg,
+    githubRepo,
+    icon,
+    synopsis,
+  } = appConfig;
+
+  // Replace some things
+  const rawConfig = JSON.stringify(electronBuilderConfig, null, 2)
+    .replace(/__APP_ID__/g, appId)
+    .replace(/__BINARY_PREFIX__/g, binaryPrefix)
+    .replace(/__EXECUTABLE_NAME__/g, executableName)
+    .replace(/__GITHUB_OWNER__/g, githubOrg)
+    .replace(/__GITHUB_REPO__/g, githubRepo)
+    .replace(/__ICON_URL__/g, icon)
+    .replace(/__SYNOPSIS__/g, synopsis);
+
+  const config = JSON.parse(rawConfig);
+  const targetPlatform = PLATFORM_MAP[process.platform];
+
+  const target = BUILD_TARGETS?.split(',') ?? config[targetPlatform].target;
+
+  return electronBuilder.build({
+    config,
+    [targetPlatform]: target,
+  });
+};
+
+const emptyDir = (relPath: string) => new Promise<void>((resolve, reject) => {
+  const dir = path.resolve(__dirname, relPath);
+  rimraf(dir, err => {
+    if (err) {
+      reject(err);
+    } else {
+      resolve();
+    }
+  });
+});
+
+export const start = async () => {
+  console.log('[package] Removing existing directories');
+
+  if (process.env.KEEP_DIST_FOLDER !== 'yes') {
+    await emptyDir(path.join('..', 'dist', '*'));
+  }
+
+  console.log('[package] Packaging app');
+  await pkg();
+
+  console.log('[package] Complete!');
+};
diff --git a/packages/insomnia-app/scripts/release.js b/packages/insomnia-app/scripts/release.js
deleted file mode 100644
index 1d9d341f05..0000000000
--- a/packages/insomnia-app/scripts/release.js
+++ /dev/null
@@ -1,93 +0,0 @@
-const { appConfig } = require('../config');
-const glob = require('fast-glob');
-const fs = require('fs');
-const path = require('path');
-const packageTask = require('./package');
-const buildTask = require('./build');
-const { Octokit } = require('@octokit/rest');
-
-// Configure Octokit
-const octokit = new Octokit({
-  auth: process.env.GH_TOKEN,
-});
-
-// Start package if ran from CLI
-if (require.main === module) {
-  process.nextTick(async () => {
-    try {
-      const buildContext = await buildTask.start(true);
-      await packageTask.start();
-      await start(buildContext.app, buildContext.version);
-    } catch (err) {
-      console.log('[release] ERROR:', err);
-      process.exit(1);
-    }
-  });
-}
-
-async function start(app, version) {
-  console.log(`[release] Creating release for ${app} ${version}`);
-
-  // globs should only use forward slash, so force use of path.posix
-  const distGlob = ext => path.posix.join('dist', '**', `*${ext}`);
-  const assetGlobs = {
-    darwin: [distGlob('.zip'), distGlob('.dmg')],
-    win32: [path.posix.join('dist', 'squirrel-windows', '*'), path.posix.join('dist', '*.exe')],
-    linux: [
-      distGlob('.snap'),
-      distGlob('.rpm'),
-      distGlob('.deb'),
-      distGlob('.AppImage'),
-      distGlob('.tar.gz'),
-    ],
-  };
-
-  const paths = await glob(assetGlobs[process.platform]);
-
-  const { data } = await getOrCreateRelease(app, version);
-
-  for (const p of paths) {
-    const name = path.basename(p);
-
-    console.log(`[release] Uploading ${name}`);
-    await octokit.request({
-      method: 'POST',
-      url: 'https://uploads.github.com/repos/:owner/:repo/releases/:id/assets{?name,label}"',
-      id: data.id,
-      name: name,
-      owner: appConfig().githubOrg,
-      repo: appConfig().githubRepo,
-      headers: {
-        'Content-Type': 'application/octet-stream',
-      },
-      data: fs.readFileSync(p),
-    });
-  }
-
-  console.log(`[release] Release created ${data.url}`);
-}
-
-async function getOrCreateRelease(app, version) {
-  const tag = `${app}@${version}`;
-  const releaseName = `${appConfig().productName} ${version} 📦`;
-
-  try {
-    return await octokit.repos.getReleaseByTag({
-      owner: appConfig().githubOrg,
-      repo: appConfig().githubRepo,
-      tag,
-    });
-  } catch (err) {
-    // Doesn't exist
-  }
-
-  return octokit.repos.createRelease({
-    owner: appConfig().githubOrg,
-    repo: appConfig().githubRepo,
-    tag_name: tag,
-    name: releaseName,
-    body: `Full changelog ⇒ ${appConfig().changelogUrl}`,
-    draft: false,
-    prerelease: true,
-  });
-}
diff --git a/packages/insomnia-app/scripts/release.ts b/packages/insomnia-app/scripts/release.ts
new file mode 100644
index 0000000000..e29079bcea
--- /dev/null
+++ b/packages/insomnia-app/scripts/release.ts
@@ -0,0 +1,103 @@
+import appConfig from '../config/config.json';
+import glob from 'fast-glob';
+import { promises } from 'fs';
+import { basename, posix } from 'path';
+import { start as packageApp } from './package';
+import { start as build } from './build';
+import { Octokit } from '@octokit/rest';
+const { readFile } = promises;
+
+// Configure Octokit
+const octokit = new Octokit({
+  auth: process.env.GH_TOKEN,
+});
+
+const getOrCreateRelease = (app: string, version: string) => {
+  const tag = `${app}@${version}`;
+  const releaseName = `${appConfig.productName} ${version} 📦`;
+
+  try {
+    return octokit.repos.getReleaseByTag({
+      owner: appConfig.githubOrg,
+      repo: appConfig.githubRepo,
+      tag,
+    });
+  } catch (err) {
+    // Doesn't exist
+  }
+
+  return octokit.repos.createRelease({
+    owner: appConfig.githubOrg,
+    repo: appConfig.githubRepo,
+    // eslint-disable-next-line camelcase -- part of the octokit API
+    tag_name: tag,
+    name: releaseName,
+    body: `Full changelog ⇒ ${appConfig.changelogUrl}`,
+    draft: false,
+    prerelease: true,
+  });
+};
+
+const start = async (app?: string | null, version?: string | null) => {
+  if (app === null || app === undefined || app === '') {
+    console.log('[release] app not found. Cannot create a release.');
+    process.exit(0);
+  }
+  if (version === null || version === undefined || version === '') {
+    console.log('[release] version not found. Cannot create a release.');
+    process.exit(0);
+  }
+
+  console.log(`[release] Creating release for ${app} ${version}`);
+
+  // globs should only use forward slash, so force use of posix
+  const distGlob = (ext: string) => posix.join('dist', '**', `*${ext}`);
+  const assetGlobs = {
+    darwin: [distGlob('.zip'), distGlob('.dmg')],
+    win32: [posix.join('dist', 'squirrel-windows', '*'), posix.join('dist', '*.exe')],
+    linux: [
+      distGlob('.snap'),
+      distGlob('.rpm'),
+      distGlob('.deb'),
+      distGlob('.AppImage'),
+      distGlob('.tar.gz'),
+    ],
+  };
+
+  const { data } = await getOrCreateRelease(app, version);
+
+  const paths = await glob(assetGlobs[process.platform]);
+  for (const path of paths) {
+    const name = basename(path);
+
+    console.log(`[release] Uploading ${name}`);
+    await octokit.request({
+      method: 'POST',
+      url: 'https://uploads.github.com/repos/:owner/:repo/releases/:id/assets{?name,label}"',
+      id: data.id,
+      name,
+      owner: appConfig.githubOrg,
+      repo: appConfig.githubRepo,
+      headers: {
+        'Content-Type': 'application/octet-stream',
+      },
+      data: await readFile(path),
+    });
+  }
+
+  console.log(`[release] Release created ${data.url}`);
+};
+
+// Start package if run from CLI
+if (require.main === module) {
+  process.nextTick(async () => {
+    try {
+      const { app, version } = await build({ forceFromGitRef: true });
+      await packageApp();
+      await start(app, version);
+    } catch (err) {
+      console.log('[release] ERROR:', err);
+      process.exit(1);
+    }
+  });
+}
diff --git a/packages/insomnia-inso/src/__fixtures__/.insorc-blank.yaml b/packages/insomnia-app/scripts/startDevServer.ts
similarity index 100%
rename from packages/insomnia-inso/src/__fixtures__/.insorc-blank.yaml
rename to packages/insomnia-app/scripts/startDevServer.ts
diff --git a/packages/insomnia-app/send-request/index.js b/packages/insomnia-app/send-request/index.ts
similarity index 100%
rename from packages/insomnia-app/send-request/index.js
rename to packages/insomnia-app/send-request/index.ts
diff --git a/packages/insomnia-app/tsconfig.build.json b/packages/insomnia-app/tsconfig.build.json
new file mode 100644
index 0000000000..3861e9270d
--- /dev/null
+++ b/packages/insomnia-app/tsconfig.build.json
@@ -0,0 +1,35 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./build",
+    "rootDir": ".",
+    "resolveJsonModule": true,
+    "strict": false,
+    "strictNullChecks": true,
+    "jsx": "react",
+    "experimentalDecorators": true
+  },
+  "include": [
+    "**/*.d.ts",
+    "app",
+    "package.json"
+  ],
+  "exclude": [
+    "**/*.test.ts",
+    "**/*.test.tsx",
+    "**/@types/mocha",
+    "**/__jest__",
+    "**/__mocks__",
+    "**/__snapshots__",
+    "**/__tests__",
+    "**/main.min.js",
+    "__jest__",
+    "assets",
+    "bin",
+    "config",
+    "jest.config.js",
+    "node_modules",
+    "scripts",
+    "webpack"
+  ]
+}
diff --git a/packages/insomnia-app/tsconfig.build.sr.json b/packages/insomnia-app/tsconfig.build.sr.json
new file mode 100644
index 0000000000..ae76ac2b35
--- /dev/null
+++ b/packages/insomnia-app/tsconfig.build.sr.json
@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.build.json",
+  "compilerOptions": {
+    "outDir": "../insomnia-send-request/dist"
+  },
+  "include": [
+    "**/*.d.ts",
+    "package.json",
+    "send-request"
+  ]
+}
diff --git a/packages/insomnia-app/tsconfig.json b/packages/insomnia-app/tsconfig.json
new file mode 100644
index 0000000000..3a41d42839
--- /dev/null
+++ b/packages/insomnia-app/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "extends": "./tsconfig.build.json",
+  "include": [
+    ".eslintrc.js",
+    "app",
+    "config",
+    "jest.config.js",
+    "package.json",
+    "scripts",
+    "send-request",
+    "webpack"
+  ],
+  "exclude": [
+    "**/@types/mocha",
+    "**/main.min.js",
+    "bin",
+    "config",
+    "node_modules"
+  ]
+}
diff --git a/packages/insomnia-app/tsconfig.webpack.json b/packages/insomnia-app/tsconfig.webpack.json
new file mode 100644
index 0000000000..a81448801e
--- /dev/null
+++ b/packages/insomnia-app/tsconfig.webpack.json
@@ -0,0 +1,19 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": ".",
+    "rootDir": ".",
+    "resolveJsonModule": true,
+    "strict": false,
+    "module": "CommonJS",
+    "target": "ES5",
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "strictNullChecks": true,
+  },
+  "include": [
+    "package.json",
+    "webpack"
+  ],
+  "exclude": []
+}
diff --git a/packages/insomnia-app/webpack/webpack.config.base.babel.js b/packages/insomnia-app/webpack/webpack.config.base.ts
similarity index 69%
rename from packages/insomnia-app/webpack/webpack.config.base.babel.js
rename to packages/insomnia-app/webpack/webpack.config.base.ts
index db3085084e..7be6572176 100644
--- a/packages/insomnia-app/webpack/webpack.config.base.babel.js
+++ b/packages/insomnia-app/webpack/webpack.config.base.ts
@@ -1,11 +1,15 @@
-const webpack = require('webpack');
-const path = require('path');
-const pkg = require('../package.json');
+import { Configuration, DefinePlugin, optimize } from 'webpack';
+import path from 'path';
+import pkg from '../package.json';
 
-module.exports = {
+// recommended by the docs: https://webpack.js.org/configuration/configuration-languages/
+// just in case you run into any typescript error when configuring `devServer`
+import 'webpack-dev-server';
+
+const configuration: Configuration = {
   devtool: 'source-map',
   context: path.join(__dirname, '../app'),
-  entry: ['./renderer.js', './renderer.html'],
+  entry: ['./renderer.ts', './renderer.html'],
   output: {
     path: path.join(__dirname, '../build'),
     filename: 'bundle.js',
@@ -14,9 +18,12 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.(js)$/,
-        use: ['babel-loader'],
-        exclude: [/node_modules/, /__fixtures__/, /__tests__/],
+        test: /\.tsx?$/,
+        loader: 'ts-loader',
+        exclude: [/node_modules/],
+        options: {
+          configFile: 'tsconfig.build.json',
+        },
       },
       {
         test: /\.(less|css)$/,
@@ -52,11 +59,11 @@ module.exports = {
       // Create aliases for react-hot-loader
       // https://github.com/gaearon/react-hot-loader/tree/92961be0b44260d3d3f1b8864aa699766572a67c#linking
       'react-hot-loader': path.resolve(path.join(__dirname, '../node_modules/react-hot-loader')),
-      'react': path.resolve(path.join(__dirname, '../node_modules/react')),
+      react: path.resolve(path.join(__dirname, '../node_modules/react')),
       'styled-components': path.resolve(path.join(__dirname, '../node_modules/styled-components')),
       'react-dom': path.resolve(path.join(__dirname, '../node_modules/@hot-loader/react-dom')),
     },
-    extensions: ['.js', '.json'],
+    extensions: ['.js', '.json', '.ts', '.tsx'],
     mainFields: ['webpack', 'browser', 'web', 'browserify', ['jam', 'main'], 'main'],
   },
   node: {
@@ -71,10 +78,12 @@ module.exports = {
     'system',
   ],
   plugins: [
-    new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }),
-    new webpack.DefinePlugin({
+    new optimize.LimitChunkCountPlugin({ maxChunks: 1 }),
+    new DefinePlugin({
       'process.env.RELEASE_DATE': JSON.stringify(new Date()),
     }),
   ],
   target: 'electron-renderer',
 };
+
+export default configuration;
diff --git a/packages/insomnia-app/webpack/webpack.config.development.babel.js b/packages/insomnia-app/webpack/webpack.config.development.babel.js
deleted file mode 100644
index 5ac5e4b2f4..0000000000
--- a/packages/insomnia-app/webpack/webpack.config.development.babel.js
+++ /dev/null
@@ -1,55 +0,0 @@
-const webpack = require('webpack');
-const baseConfig = require('./webpack.config.base.babel');
-const pkg = require('../package.json');
-
-const PORT = pkg.dev['dev-server-port'];
-
-module.exports = {
-  ...baseConfig,
-  devtool: 'eval-source-map',
-  mode: 'development',
-  entry: [
-    `webpack-dev-server/client?http://localhost:${PORT}`,
-    'webpack/hot/only-dev-server',
-    ...baseConfig.entry,
-  ],
-  module: {
-    ...baseConfig.module,
-    rules: [
-      ...baseConfig.module.rules,
-      {
-        test: /\.js$/,
-        enforce: 'pre',
-        use: ['source-map-loader'],
-        include: [/insomnia-components/],
-      },
-    ],
-  },
-  output: {
-    ...baseConfig.output,
-    publicPath: '/',
-  },
-  devServer: {
-    host: 'localhost',
-    port: PORT,
-    publicPath: '/',
-    hot: true,
-    disableHostCheck: true,
-
-    // This is needed for source-maps to resolve correctly
-    contentBase: '/',
-  },
-  optimization: {
-    noEmitOnErrors: true
-  },
-  plugins: [
-    ...baseConfig.plugins,
-    new webpack.LoaderOptionsPlugin({ debug: true }), // Legacy global loader option
-    new webpack.HotModuleReplacementPlugin(),
-    new webpack.DefinePlugin({
-      __DEV__: true,
-      'process.env.NODE_ENV': JSON.stringify('development'),
-      'process.env.INSOMNIA_ENV': JSON.stringify('development'),
-    }),
-  ],
-};
diff --git a/packages/insomnia-app/webpack/webpack.config.development.ts b/packages/insomnia-app/webpack/webpack.config.development.ts
new file mode 100644
index 0000000000..83b0f998a9
--- /dev/null
+++ b/packages/insomnia-app/webpack/webpack.config.development.ts
@@ -0,0 +1,58 @@
+import { Configuration, DefinePlugin, HotModuleReplacementPlugin, LoaderOptionsPlugin } from 'webpack';
+import baseConfig from './webpack.config.base';
+import packageJSON from '../package.json';
+
+const PORT = packageJSON.dev['dev-server-port'];
+
+const configuration: Configuration = {
+  ...baseConfig,
+  devtool: 'eval-source-map',
+  mode: 'development',
+  entry: [
+    `webpack-dev-server/client?http://localhost:${PORT}`,
+    'webpack/hot/only-dev-server',
+    ...(Array.isArray(baseConfig.entry) ? baseConfig.entry : []),
+  ],
+  module: {
+    ...baseConfig.module,
+    rules: [
+      ...(baseConfig.module?.rules || []),
+      {
+        test: /\.js$/,
+        enforce: 'pre',
+        use: ['source-map-loader'],
+        include: [/insomnia-components/],
+      },
+    ],
+  },
+  output: {
+    ...baseConfig.output,
+    publicPath: '/',
+  },
+  // @ts-expect-error -- TSCONVERSION I'm not convinced it's correct that for webpack v4 this isn't supposed to be here, although the types do include something similar for WebpackOptionsNormalized which is the options property of Compiler. gonna leave it here until compelled to do otherwise. we can check back later.
+  devServer: {
+    host: 'localhost',
+    port: PORT,
+    publicPath: '/',
+    hot: true,
+    disableHostCheck: true,
+
+    // This is needed for source-maps to resolve correctly
+    contentBase: '/',
+  },
+  optimization: {
+    noEmitOnErrors: true,
+  },
+  plugins: [
+    ...(baseConfig.plugins || []),
+    new LoaderOptionsPlugin({ debug: true }), // Legacy global loader option
+    new HotModuleReplacementPlugin(),
+    new DefinePlugin({
+      __DEV__: true,
+      'process.env.NODE_ENV': JSON.stringify('development'),
+      'process.env.INSOMNIA_ENV': JSON.stringify('development'),
+    }),
+  ],
+};
+
+export default configuration;
diff --git a/packages/insomnia-app/webpack/webpack.config.electron.babel.js b/packages/insomnia-app/webpack/webpack.config.electron.ts
similarity index 59%
rename from packages/insomnia-app/webpack/webpack.config.electron.babel.js
rename to packages/insomnia-app/webpack/webpack.config.electron.ts
index 827e87eb4f..242c36d753 100644
--- a/packages/insomnia-app/webpack/webpack.config.electron.babel.js
+++ b/packages/insomnia-app/webpack/webpack.config.electron.ts
@@ -1,13 +1,13 @@
-const webpack = require('webpack');
-const path = require('path');
-const productionConfig = require('./webpack.config.production.babel');
-const pkg = require('../package.json');
+import { Configuration, DefinePlugin } from 'webpack';
+import path from 'path';
+import productionConfig from './webpack.config.production';
+import packageJSON from '../package.json';
 
-const PORT = pkg.dev['dev-server-port'];
+const PORT = packageJSON.dev['dev-server-port'];
 
-let devtool;
-let plugins;
-const output = {
+let devtool: Configuration['devtool'];
+let plugins: Configuration['plugins'] = [];
+const output: Configuration['output'] = {
   libraryTarget: 'commonjs2',
   filename: 'main.min.js',
 };
@@ -16,7 +16,7 @@ if (process.env.NODE_ENV === 'development') {
   output.path = path.join(__dirname, '../app');
   devtool = 'eval-source-map';
   plugins = [
-    new webpack.DefinePlugin({
+    new DefinePlugin({
       'process.env.APP_RENDER_URL': JSON.stringify(`http://localhost:${PORT}/renderer.html`),
       'process.env.NODE_ENV': JSON.stringify('development'),
       'process.env.INSOMNIA_ENV': JSON.stringify('development'),
@@ -29,14 +29,16 @@ if (process.env.NODE_ENV === 'development') {
   plugins = productionConfig.plugins;
 }
 
-module.exports = {
+const configuration: Configuration = {
   ...productionConfig,
-  devtool: devtool,
-  entry: ['./main.development.js'],
-  output: output,
+  devtool,
+  entry: ['./main.development.ts'],
+  output,
   node: {
     __dirname: false, // Use node.js __dirname
   },
   target: 'electron-main',
-  plugins: plugins,
+  plugins,
 };
+
+export default configuration;
diff --git a/packages/insomnia-app/webpack/webpack.config.production.babel.js b/packages/insomnia-app/webpack/webpack.config.production.ts
similarity index 61%
rename from packages/insomnia-app/webpack/webpack.config.production.babel.js
rename to packages/insomnia-app/webpack/webpack.config.production.ts
index 1bd88d6e04..b2b8db25a4 100644
--- a/packages/insomnia-app/webpack/webpack.config.production.babel.js
+++ b/packages/insomnia-app/webpack/webpack.config.production.ts
@@ -1,7 +1,7 @@
-const webpack = require('webpack');
-const baseConfig = require('./webpack.config.base.babel');
+import { Configuration, DefinePlugin } from 'webpack';
+import baseConfig from './webpack.config.base';
 
-module.exports = {
+const configuration: Configuration = {
   ...baseConfig,
   devtool: false,
   mode: 'production',
@@ -11,11 +11,13 @@ module.exports = {
     minimize: false,
   },
   plugins: [
-    ...baseConfig.plugins,
-    new webpack.DefinePlugin({
+    ...(baseConfig.plugins || []),
+    new DefinePlugin({
       __DEV__: false,
       'process.env.NODE_ENV': JSON.stringify('production'),
       'process.env.HOT': JSON.stringify(null),
     }),
   ],
 };
+
+export default configuration;
diff --git a/packages/insomnia-app/send-request/webpack.config.babel.js b/packages/insomnia-app/webpack/webpack.config.sr.ts
similarity index 58%
rename from packages/insomnia-app/send-request/webpack.config.babel.js
rename to packages/insomnia-app/webpack/webpack.config.sr.ts
index fc736c9708..57ce8e40b7 100644
--- a/packages/insomnia-app/send-request/webpack.config.babel.js
+++ b/packages/insomnia-app/webpack/webpack.config.sr.ts
@@ -1,11 +1,11 @@
-const path = require('path');
-const webpack = require('webpack');
-const pkg = require('../package.json');
+import { Configuration, ProvidePlugin } from 'webpack';
+import path from 'path';
+import pkg from '../package.json';
 
-module.exports = {
-  context: __dirname,
+const configuration: Configuration = {
+  context: path.join(__dirname, '../send-request'),
   entry: {
-    index: './index.js',
+    index: './index.ts',
   },
   target: 'node',
   mode: 'production',
@@ -14,7 +14,7 @@ module.exports = {
     minimize: false,
   },
   output: {
-    filename: 'index.js',
+    filename: '[name].js',
     library: 'insomniasendrequest',
     libraryTarget: 'commonjs2',
 
@@ -24,10 +24,11 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.js$/,
-        exclude: /node_modules/,
-        use: {
-          loader: 'babel-loader',
+        test: /\.tsx?$/,
+        loader: 'ts-loader',
+        exclude: [/node_modules/],
+        options: {
+          configFile: 'tsconfig.build.sr.json',
         },
       },
       {
@@ -48,10 +49,13 @@ module.exports = {
     alias: {
       // Replace electron with a minimal polyfill that contains just enough to get
       // the things in this bundle working
-      electron: path.resolve(path.join(__dirname, './electron')),
+      electron: path.resolve(path.join(__dirname, '../send-request/electron')),
     },
+    extensions: ['.js', '.json', '.ts', '.tsx'],
   },
   plugins: [
-    new webpack.ProvidePlugin({ window: path.resolve(path.join(__dirname, './window-shim')) }),
+    new ProvidePlugin({ window: path.resolve(path.join(__dirname, '../send-request/window-shim')) }),
   ],
 };
+
+export default configuration;
diff --git a/packages/insomnia-components/.babelrc b/packages/insomnia-components/.babelrc
deleted file mode 100644
index 684867fce3..0000000000
--- a/packages/insomnia-components/.babelrc
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "plugins": [
-    "babel-plugin-styled-components",
-    "babel-plugin-inline-react-svg",
-    ["@babel/plugin-proposal-decorators", {"legacy": true}],
-    "@babel/plugin-proposal-class-properties",
-    "@babel/plugin-proposal-optional-chaining",
-    "@babel/plugin-transform-runtime"
-  ],
-  "presets": [
-    "@babel/preset-flow",
-    "@babel/preset-react",
-    [
-      "@babel/preset-env",
-      {
-        "targets": "> 0.25%, not dead"
-      }
-    ]
-  ]
-}
diff --git a/packages/insomnia-components/.eslintignore b/packages/insomnia-components/.eslintignore
new file mode 100644
index 0000000000..60ff59ddd3
--- /dev/null
+++ b/packages/insomnia-components/.eslintignore
@@ -0,0 +1,2 @@
+dist
+storybook-static
\ No newline at end of file
diff --git a/packages/insomnia-components/.eslintrc.js b/packages/insomnia-components/.eslintrc.js
new file mode 100644
index 0000000000..7c80e06543
--- /dev/null
+++ b/packages/insomnia-components/.eslintrc.js
@@ -0,0 +1,7 @@
+/** @type { import('eslint').Linter.Config } */
+module.exports = {
+  extends: '../../.eslintrc.js',
+  rules: {
+    '@typescript-eslint/no-explicit-any': 'off', // TSCONVERSION
+  },
+};
diff --git a/packages/insomnia-components/.flowconfig b/packages/insomnia-components/.flowconfig
deleted file mode 100644
index 7d7c70ba0d..0000000000
--- a/packages/insomnia-components/.flowconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-[ignore]
-.*/node_modules/.*
-./.cache
-./dist
-./storybook-static
-
-[include]
-
-[libs]
-./flow-typed
-
-[options]
-esproposal.decorators=ignore
-esproposal.optional_chaining=enable
-
-[lints]
diff --git a/packages/insomnia-components/.gitignore b/packages/insomnia-components/.gitignore
index 8c64f102d6..209ec1610b 100644
--- a/packages/insomnia-components/.gitignore
+++ b/packages/insomnia-components/.gitignore
@@ -1,4 +1,4 @@
 .cache
 storybook-static
-assets/svgr
+src/assets/svgr
 dist
diff --git a/packages/insomnia-components/.storybook/configs/contexts.js b/packages/insomnia-components/.storybook/configs/contexts.js
index b38f16beb2..0320af9142 100644
--- a/packages/insomnia-components/.storybook/configs/contexts.js
+++ b/packages/insomnia-components/.storybook/configs/contexts.js
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 
 const ThemeProvider = props => {
   // Apply theme later because storybook adds its own `<body theme="...">` attribute too.
diff --git a/packages/insomnia-components/.storybook/main.js b/packages/insomnia-components/.storybook/main.js
index 32ae9fbf70..0fe8aac169 100644
--- a/packages/insomnia-components/.storybook/main.js
+++ b/packages/insomnia-components/.storybook/main.js
@@ -4,4 +4,13 @@ module.exports = {
     '@storybook/addon-contexts/register',
     'storybook-addon-designs/register',
   ],
+  typescript: {
+    check: false,
+    checkOptions: {},
+    reactDocgen: 'react-docgen-typescript',
+    reactDocgenTypescriptOptions: {
+      shouldExtractLiteralValuesFromEnum: true,
+      propFilter: (prop) => (prop.parent ? !/node_modules/.test(prop.parent.fileName) : true),
+    },
+  },
 };
diff --git a/packages/insomnia-components/.storybook/manager.js b/packages/insomnia-components/.storybook/manager.js
index 4ae3072a6b..432445c1e1 100644
--- a/packages/insomnia-components/.storybook/manager.js
+++ b/packages/insomnia-components/.storybook/manager.js
@@ -1,64 +1,8 @@
 import { addons } from '@storybook/addons';
 import { create } from '@storybook/theming/create';
 
-
 // brandImage fix for known SB webpack issue where SVGs aren't served locally when imported.
-const logoAsPath = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTkwIiBoZWlnaHQ9IjMyIiB2aWV3Qm94PSIwIDAgMTkwIDMy\
-IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMTYgMzEuMTg2NEMyNC4zODczIDMxLj\
-E4NjQgMzEuMTg2NSAyNC4zODcyIDMxLjE4NjUgMTZDMzEuMTg2NSA3LjYxMjc2IDI0LjM4NzMgMC44MTM1NiAxNiAwLjgxMzU2QzcuNjEyOCAw\
-LjgxMzU2IDAuODEzNTk5IDcuNjEyNzYgMC44MTM1OTkgMTZDMC44MTM1OTkgMjQuMzg3MiA3LjYxMjggMzEuMTg2NCAxNiAzMS4xODY0WiIgZm\
-lsbD0id2hpdGUiLz4KPHBhdGggZD0iTTE2IDBDNy4xNjM0NCAwIDAgNy4xNjM0NCAwIDE2QzAgMjQuODM2NiA3LjE2MzQ0IDMyIDE2IDMyQzI0\
-LjgzNjYgMzIgMzIgMjQuODM2NiAzMiAxNkMzMiA3LjE2MzQ0IDI0LjgzNjYgMCAxNiAwWk0xNiAxLjYyNzEyQzIzLjkzNzkgMS42MjcxMiAzMC\
-4zNzI5IDguMDYyMDggMzAuMzcyOSAxNkMzMC4zNzI5IDIzLjkzNzkgMjMuOTM3OSAzMC4zNzI5IDE2IDMwLjM3MjlDOC4wNjIwOCAzMC4zNzI5\
-IDEuNjI3MTIgMjMuOTM3OSAxLjYyNzEyIDE2QzEuNjI3MTIgOC4wNjIwOCA4LjA2MjA4IDEuNjI3MTIgMTYgMS42MjcxMloiIGZpbGw9IiM0MD\
-AwQkYiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xNi4xODA3IDQuNjEwMTdDMjIuNDcxMiA0\
-LjYxMDE3IDI3LjU3MDYgOS43MDk1NyAyNy41NzA2IDE2QzI3LjU3MDYgMjIuMjkwNCAyMi40NzEyIDI3LjM4OTggMTYuMTgwNyAyNy4zODk4Qz\
-kuODkwMjkgMjcuMzg5OCA0Ljc5MDg5IDIyLjI5MDQgNC43OTA4OSAxNkM0Ljc5MDg5IDE0LjQ2MjcgNS4wOTU0NyAxMi45OTY1IDUuNjQ3NTgg\
-MTEuNjU4NEM2LjQ1MzczIDEyLjc1NjIgNy43NTM3NyAxMy40Njg5IDkuMjIwMjcgMTMuNDY4OUMxMS42NjY2IDEzLjQ2ODkgMTMuNjQ5NiAxMS\
-40ODU4IDEzLjY0OTYgOS4wMzk1NUMxMy42NDk2IDcuNTczMDUgMTIuOTM3IDYuMjczMDEgMTEuODM5MSA1LjQ2Njg3QzEzLjE3NzIgNC45MTQ3\
-NSAxNC42NDM0IDQuNjEwMTcgMTYuMTgwNyA0LjYxMDE3WiIgZmlsbD0idXJsKCNwYWludDBfbGluZWFyKSIvPgo8cGF0aCBkPSJNNDUuNTM1Mi\
-AyNVY2LjY4MDY2SDQyLjI1OThWMjVINDUuNTM1MlpNNDkuNzI0NiAyNUg1Mi44NzNWMTYuOTEzMUM1Mi44NzMgMTQuODMxMSA1NC4wNTM3IDEz\
-LjUyMzQgNTUuOTMyNiAxMy41MjM0QzU3Ljg0OTYgMTMuNTIzNCA1OC43MzgzIDE0LjYwMjUgNTguNzM4MyAxNi43NjA3VjI1SDYxLjg4NjdWMT\
-YuMDI0NEM2MS44ODY3IDEyLjcyMzYgNjAuMTk4MiAxMC44NTc0IDU3LjEwMDYgMTAuODU3NEM1NS4wMzEyIDEwLjg1NzQgNTMuNjM0OCAxMS43\
-OTY5IDUyLjk3NDYgMTMuMzQ1N0g1Mi43NTg4VjExLjEyNEg0OS43MjQ2VjI1Wk02NS4zMDE4IDE1LjA4NUM2NS4zMDE4IDE3LjE2NyA2Ni41NT\
-g2IDE4LjM4NTcgNjkuMjI0NiAxOC45OTUxTDcxLjY4NzUgMTkuNTY2NEM3My4wMDc4IDE5Ljg3MTEgNzMuNjA0NSAyMC4zNzg5IDczLjYwNDUg\
-MjEuMTY2QzczLjYwNDUgMjIuMjE5NyA3Mi41IDIyLjk0MzQgNzAuOTEzMSAyMi45NDM0QzY5LjMzODkgMjIuOTQzNCA2OC4zNjEzIDIyLjMwOD\
-YgNjguMDU2NiAyMS4yODAzSDY0Ljk0NjNDNjUuMTg3NSAyMy43ODEyIDY3LjM3MTEgMjUuMjc5MyA3MC44MzY5IDI1LjI3OTNDNzQuMzAyNyAy\
-NS4yNzkzIDc2Ljc1MjkgMjMuNTE0NiA3Ni43NTI5IDIwLjg2MTNDNzYuNzUyOSAxOC44MTc0IDc1LjUyMTUgMTcuNjg3NSA3Mi44NjgyIDE3Lj\
-A3ODFMNzAuNDE4IDE2LjUzMjJDNjkuMDIxNSAxNi4yMDIxIDY4LjM2MTMgMTUuNzA3IDY4LjM2MTMgMTQuOTE5OUM2OC4zNjEzIDEzLjg5MTYg\
-NjkuNDQwNCAxMy4xOTM0IDcwLjg3NSAxMy4xOTM0QzcyLjM0NzcgMTMuMTkzNCA3My4yNzQ0IDEzLjgyODEgNzMuNTAyOSAxNC44MDU3SDc2Lj\
-Q2MDlDNzYuMjMyNCAxMi4zMDQ3IDc0LjE2MzEgMTAuODU3NCA3MC44NjIzIDEwLjg1NzRDNjcuNTg2OSAxMC44NTc0IDY1LjMwMTggMTIuNTk2\
-NyA2NS4zMDE4IDE1LjA4NVpNODUuOTMxNiAyNS4yNzkzQzkwLjA4MyAyNS4yNzkzIDkyLjYwOTQgMjIuNTYyNSA5Mi42MDk0IDE4LjA1NTdDOT\
-IuNjA5NCAxMy41NzQyIDkwLjA3MDMgMTAuODU3NCA4NS45MzE2IDEwLjg1NzRDODEuODA1NyAxMC44NTc0IDc5LjI1MzkgMTMuNTg2OSA3OS4y\
-NTM5IDE4LjA1NTdDNzkuMjUzOSAyMi41NjI1IDgxLjc2NzYgMjUuMjc5MyA4NS45MzE2IDI1LjI3OTNaTTg1LjkzMTYgMjIuNzAyMUM4My43Mz\
-U0IDIyLjcwMjEgODIuNDc4NSAyMS4wMDEgODIuNDc4NSAxOC4wNjg0QzgyLjQ3ODUgMTUuMTM1NyA4My43MzU0IDEzLjQzNDYgODUuOTMxNiAx\
-My40MzQ2Qzg4LjExNTIgMTMuNDM0NiA4OS4zNzIxIDE1LjEzNTcgODkuMzcyMSAxOC4wNjg0Qzg5LjM3MjEgMjEuMDAxIDg4LjEyNzkgMjIuNz\
-AyMSA4NS45MzE2IDIyLjcwMjFaTTk1Ljc4MzIgMjVIOTguOTMxNlYxNi41NTc2Qzk4LjkzMTYgMTQuODMxMSAxMDAuMDg3IDEzLjUyMzQgMTAx\
-LjY0OCAxMy41MjM0QzEwMy4xOTcgMTMuNTIzNCAxMDQuMTYyIDE0LjQ2MjkgMTA0LjE2MiAxNS45OTlWMjVIMTA3LjIyMlYxNi4zMjkxQzEwNy\
-4yMjIgMTQuNzQyMiAxMDguMzAxIDEzLjUyMzQgMTA5LjkzOCAxMy41MjM0QzExMS42MjcgMTMuNTIzNCAxMTIuNDc4IDE0LjQyNDggMTEyLjQ3\
-OCAxNi4yMjc1VjI1SDExNS42MTNWMTUuNDUzMUMxMTUuNjEzIDEyLjU3MTMgMTEzLjkzOCAxMC44NTc0IDExMS4xNTcgMTAuODU3NEMxMDkuMj\
-I4IDEwLjg1NzQgMTA3LjYyOCAxMS44NDc3IDEwNi45NDIgMTMuMzU4NEgxMDYuNzI3QzEwNi4xNDMgMTEuODIyMyAxMDQuODEgMTAuODU3NCAx\
-MDIuODkzIDEwLjg1NzRDMTAxLjA1MiAxMC44NTc0IDk5LjYyOTkgMTEuNzk2OSA5OS4wMzMyIDEzLjM1ODRIOTguODE3NFYxMS4xMjRIOTUuNz\
-gzMlYyNVpNMTE5LjM0NiAyNUgxMjIuNDk0VjE2LjkxMzFDMTIyLjQ5NCAxNC44MzExIDEyMy42NzUgMTMuNTIzNCAxMjUuNTU0IDEzLjUyMzRD\
-MTI3LjQ3MSAxMy41MjM0IDEyOC4zNTkgMTQuNjAyNSAxMjguMzU5IDE2Ljc2MDdWMjVIMTMxLjUwOFYxNi4wMjQ0QzEzMS41MDggMTIuNzIzNi\
-AxMjkuODE5IDEwLjg1NzQgMTI2LjcyMiAxMC44NTc0QzEyNC42NTIgMTAuODU3NCAxMjMuMjU2IDExLjc5NjkgMTIyLjU5NiAxMy4zNDU3SDEy\
-Mi4zOFYxMS4xMjRIMTE5LjM0NlYyNVpNMTM2Ljg0IDguODAwNzhDMTM3Ljg4MSA4LjgwMDc4IDEzOC43MzEgNy45NzU1OSAxMzguNzMxIDYuOT\
-M0NTdDMTM4LjczMSA1LjkwNjI1IDEzNy44ODEgNS4wNjgzNiAxMzYuODQgNS4wNjgzNkMxMzUuODEyIDUuMDY4MzYgMTM0Ljk2MSA1LjkwNjI1\
-IDEzNC45NjEgNi45MzQ1N0MxMzQuOTYxIDcuOTc1NTkgMTM1LjgxMiA4LjgwMDc4IDEzNi44NCA4LjgwMDc4Wk0xMzUuMjc4IDI1SDEzOC40MT\
-RWMTEuMTI0SDEzNS4yNzhWMjVaTTE0Ni4xNDYgMjUuMjI4NUMxNDcuOTYxIDI1LjIyODUgMTQ5LjQ4NCAyNC40NDE0IDE1MC4yNTkgMjMuMDk1\
-N0gxNTAuNDc1VjI1SDE1My41MDlWMTUuNTE2NkMxNTMuNTA5IDEyLjU4NCAxNTEuNTAzIDEwLjg1NzQgMTQ3LjkzNiAxMC44NTc0QzE0NC42Mz\
-UgMTAuODU3NCAxNDIuMzM3IDEyLjQwNjIgMTQyLjA4MyAxNC44MzExSDE0NS4wNTRDMTQ1LjM0NiAxMy44Nzg5IDE0Ni4zMzYgMTMuMzU4NCAx\
-NDcuNzgzIDEzLjM1ODRDMTQ5LjQ4NCAxMy4zNTg0IDE1MC4zOTggMTQuMTMyOCAxNTAuMzk4IDE1LjUxNjZWMTYuNzFMMTQ2LjgxOCAxNi45Mj\
-U4QzE0My40NDEgMTcuMTE2MiAxNDEuNTUgMTguNTc2MiAxNDEuNTUgMjEuMDY0NUMxNDEuNTUgMjMuNjAzNSAxNDMuNDY3IDI1LjIyODUgMTQ2\
-LjE0NiAyNS4yMjg1Wk0xNDcuMDcyIDIyLjgwMzdDMTQ1LjY3NiAyMi44MDM3IDE0NC42NzMgMjIuMTA1NSAxNDQuNjczIDIwLjkxMjFDMTQ0Lj\
-Y3MyAxOS43NTY4IDE0NS40OTggMTkuMTA5NCAxNDcuMjYzIDE4Ljk5NTFMMTUwLjM5OCAxOC43NzkzVjE5LjkwOTJDMTUwLjM5OCAyMS41NTk2\
-IDE0OC45NzcgMjIuODAzNyAxNDcuMDcyIDIyLjgwMzdaTTE2Ny44MjkgNi42ODA2NkgxNjQuNTU0VjE4LjY5MDRDMTY0LjU1NCAyMi42ODk1ID\
-E2Ny40NDggMjUuNDU3IDE3Mi4wODIgMjUuNDU3QzE3Ni43MTYgMjUuNDU3IDE3OS42MSAyMi42ODk1IDE3OS42MSAxOC42OTA0VjYuNjgwNjZI\
-MTc2LjMzNVYxOC4zOTg0QzE3Ni4zMzUgMjAuODk5NCAxNzQuNzk5IDIyLjYwMDYgMTcyLjA4MiAyMi42MDA2QzE2OS4zNjUgMjIuNjAwNiAxNj\
-cuODI5IDIwLjg5OTQgMTY3LjgyOSAxOC4zOTg0VjYuNjgwNjZaTTE4Ny4zOTMgMjVWNi42ODA2NkgxODQuMTE3VjI1SDE4Ny4zOTNaIiBmaWxs\
-PSJibGFjayIvPgo8ZGVmcz4KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDBfbGluZWFyIiB4MT0iMTYuMTgwNyIgeTE9IjI3LjM4OTgiIHgyPS\
-IxNi4xODA3IiB5Mj0iNC42MTAxNyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgo8c3RvcCBzdG9wLWNvbG9yPSIjNzQwMEUxIi8+\
-CjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzQwMDBCRiIvPgo8L2xpbmVhckdyYWRpZW50Pgo8L2RlZnM+Cjwvc3ZnPgo=';
+const logoAsPath = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTkwIiBoZWlnaHQ9IjMyIiB2aWV3Qm94PSIwIDAgMTkwIDMyIiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMTYgMzEuMTg2NEMyNC4zODczIDMxLjE4NjQgMzEuMTg2NSAyNC4zODcyIDMxLjE4NjUgMTZDMzEuMTg2NSA3LjYxMjc2IDI0LjM4NzMgMC44MTM1NiAxNiAwLjgxMzU2QzcuNjEyOCAwLjgxMzU2IDAuODEzNTk5IDcuNjEyNzYgMC44MTM1OTkgMTZDMC44MTM1OTkgMjQuMzg3MiA3LjYxMjggMzEuMTg2NCAxNiAzMS4xODY0WiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTE2IDBDNy4xNjM0NCAwIDAgNy4xNjM0NCAwIDE2QzAgMjQuODM2NiA3LjE2MzQ0IDMyIDE2IDMyQzI0LjgzNjYgMzIgMzIgMjQuODM2NiAzMiAxNkMzMiA3LjE2MzQ0IDI0LjgzNjYgMCAxNiAwWk0xNiAxLjYyNzEyQzIzLjkzNzkgMS42MjcxMiAzMC4zNzI5IDguMDYyMDggMzAuMzcyOSAxNkMzMC4zNzI5IDIzLjkzNzkgMjMuOTM3OSAzMC4zNzI5IDE2IDMwLjM3MjlDOC4wNjIwOCAzMC4zNzI5IDEuNjI3MTIgMjMuOTM3OSAxLjYyNzEyIDE2QzEuNjI3MTIgOC4wNjIwOCA4LjA2MjA4IDEuNjI3MTIgMTYgMS42MjcxMloiIGZpbGw9IiM0MDAwQkYiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xNi4xODA3IDQuNjEwMTdDMjIuNDcxMiA0LjYxMDE3IDI3LjU3MDYgOS43MDk1NyAyNy41NzA2IDE2QzI3LjU3MDYgMjIuMjkwNCAyMi40NzEyIDI3LjM4OTggMTYuMTgwNyAyNy4zODk4QzkuODkwMjkgMjcuMzg5OCA0Ljc5MDg5IDIyLjI5MDQgNC43OTA4OSAxNkM0Ljc5MDg5IDE0LjQ2MjcgNS4wOTU0NyAxMi45OTY1IDUuNjQ3NTggMTEuNjU4NEM2LjQ1MzczIDEyLjc1NjIgNy43NTM3NyAxMy40Njg5IDkuMjIwMjcgMTMuNDY4OUMxMS42NjY2IDEzLjQ2ODkgMTMuNjQ5NiAxMS40ODU4IDEzLjY0OTYgOS4wMzk1NUMxMy42NDk2IDcuNTczMDUgMTIuOTM3IDYuMjczMDEgMTEuODM5MSA1LjQ2Njg3QzEzLjE3NzIgNC45MTQ3NSAxNC42NDM0IDQuNjEwMTcgMTYuMTgwNyA0LjYxMDE3WiIgZmlsbD0idXJsKCNwYWludDBfbGluZWFyKSIvPgo8cGF0aCBkPSJNNDUuNTM1MiAyNVY2LjY4MDY2SDQyLjI1OThWMjVINDUuNTM1MlpNNDkuNzI0NiAyNUg1Mi44NzNWMTYuOTEzMUM1Mi44NzMgMTQuODMxMSA1NC4wNTM3IDEzLjUyMzQgNTUuOTMyNiAxMy41MjM0QzU3Ljg0OTYgMTMuNTIzNCA1OC43MzgzIDE0LjYwMjUgNTguNzM4MyAxNi43NjA3VjI1SDYxLjg4NjdWMTYuMDI0NEM2MS44ODY3IDEyLjcyMzYgNjAuMTk4MiAxMC44NTc0IDU3LjEwMDYgMTAuODU3NEM1NS4wMzEyIDEwLjg1NzQgNTMuNjM0OCAxMS43OTY5IDUyLjk3NDYgMTMuMzQ1N0g1Mi43NTg4VjExLjEyNEg0OS43MjQ2VjI1Wk02NS4zMDE4IDE1LjA4NUM2NS4zMDE4IDE3LjE2NyA2Ni41NTg2IDE4LjM4NTcgNjkuMjI0NiAxOC45OTUxTDcxLjY4NzUgMTkuNTY2NEM3My4wMDc4IDE5Ljg3MTEgNzMuNjA0NSAyMC4zNzg5IDczLjYwNDUgMjEuMTY2QzczLjYwNDUgMjIuMjE5NyA3Mi41IDIyLjk0MzQgNzAuOTEzMSAyMi45NDM0QzY5LjMzODkgMjIuOTQzNCA2OC4zNjEzIDIyLjMwODYgNjguMDU2NiAyMS4yODAzSDY0Ljk0NjNDNjUuMTg3NSAyMy43ODEyIDY3LjM3MTEgMjUuMjc5MyA3MC44MzY5IDI1LjI3OTNDNzQuMzAyNyAyNS4yNzkzIDc2Ljc1MjkgMjMuNTE0NiA3Ni43NTI5IDIwLjg2MTNDNzYuNzUyOSAxOC44MTc0IDc1LjUyMTUgMTcuNjg3NSA3Mi44NjgyIDE3LjA3ODFMNzAuNDE4IDE2LjUzMjJDNjkuMDIxNSAxNi4yMDIxIDY4LjM2MTMgMTUuNzA3IDY4LjM2MTMgMTQuOTE5OUM2OC4zNjEzIDEzLjg5MTYgNjkuNDQwNCAxMy4xOTM0IDcwLjg3NSAxMy4xOTM0QzcyLjM0NzcgMTMuMTkzNCA3My4yNzQ0IDEzLjgyODEgNzMuNTAyOSAxNC44MDU3SDc2LjQ2MDlDNzYuMjMyNCAxMi4zMDQ3IDc0LjE2MzEgMTAuODU3NCA3MC44NjIzIDEwLjg1NzRDNjcuNTg2OSAxMC44NTc0IDY1LjMwMTggMTIuNTk2NyA2NS4zMDE4IDE1LjA4NVpNODUuOTMxNiAyNS4yNzkzQzkwLjA4MyAyNS4yNzkzIDkyLjYwOTQgMjIuNTYyNSA5Mi42MDk0IDE4LjA1NTdDOTIuNjA5NCAxMy41NzQyIDkwLjA3MDMgMTAuODU3NCA4NS45MzE2IDEwLjg1NzRDODEuODA1NyAxMC44NTc0IDc5LjI1MzkgMTMuNTg2OSA3OS4yNTM5IDE4LjA1NTdDNzkuMjUzOSAyMi41NjI1IDgxLjc2NzYgMjUuMjc5MyA4NS45MzE2IDI1LjI3OTNaTTg1LjkzMTYgMjIuNzAyMUM4My43MzU0IDIyLjcwMjEgODIuNDc4NSAyMS4wMDEgODIuNDc4NSAxOC4wNjg0QzgyLjQ3ODUgMTUuMTM1NyA4My43MzU0IDEzLjQzNDYgODUuOTMxNiAxMy40MzQ2Qzg4LjExNTIgMTMuNDM0NiA4OS4zNzIxIDE1LjEzNTcgODkuMzcyMSAxOC4wNjg0Qzg5LjM3MjEgMjEuMDAxIDg4LjEyNzkgMjIuNzAyMSA4NS45MzE2IDIyLjcwMjFaTTk1Ljc4MzIgMjVIOTguOTMxNlYxNi41NTc2Qzk4LjkzMTYgMTQuODMxMSAxMDAuMDg3IDEzLjUyMzQgMTAxLjY0OCAxMy41MjM0QzEwMy4xOTcgMTMuNTIzNCAxMDQuMTYyIDE0LjQ2MjkgMTA0LjE2MiAxNS45OTlWMjVIMTA3LjIyMlYxNi4zMjkxQzEwNy4yMjIgMTQuNzQyMiAxMDguMzAxIDEzLjUyMzQgMTA5LjkzOCAxMy41MjM0QzExMS42MjcgMTMuNTIzNCAxMTIuNDc4IDE0LjQyNDggMTEyLjQ3OCAxNi4yMjc1VjI1SDExNS42MTNWMTUuNDUzMUMxMTUuNjEzIDEyLjU3MTMgMTEzLjkzOCAxMC44NTc0IDExMS4xNTcgMTAuODU3NEMxMDkuMjI4IDEwLjg1NzQgMTA3LjYyOCAxMS44NDc3IDEwNi45NDIgMTMuMzU4NEgxMDYuNzI3QzEwNi4xNDMgMTEuODIyMyAxMDQuODEgMTAuODU3NCAxMDIuODkzIDEwLjg1NzRDMTAxLjA1MiAxMC44NTc0IDk5LjYyOTkgMTEuNzk2OSA5OS4wMzMyIDEzLjM1ODRIOTguODE3NFYxMS4xMjRIOTUuNzgzMlYyNVpNMTE5LjM0NiAyNUgxMjIuNDk0VjE2LjkxMzFDMTIyLjQ5NCAxNC44MzExIDEyMy42NzUgMTMuNTIzNCAxMjUuNTU0IDEzLjUyMzRDMTI3LjQ3MSAxMy41MjM0IDEyOC4zNTkgMTQuNjAyNSAxMjguMzU5IDE2Ljc2MDdWMjVIMTMxLjUwOFYxNi4wMjQ0QzEzMS41MDggMTIuNzIzNiAxMjkuODE5IDEwLjg1NzQgMTI2LjcyMiAxMC44NTc0QzEyNC42NTIgMTAuODU3NCAxMjMuMjU2IDExLjc5NjkgMTIyLjU5NiAxMy4zNDU3SDEyMi4zOFYxMS4xMjRIMTE5LjM0NlYyNVpNMTM2Ljg0IDguODAwNzhDMTM3Ljg4MSA4LjgwMDc4IDEzOC43MzEgNy45NzU1OSAxMzguNzMxIDYuOTM0NTdDMTM4LjczMSA1LjkwNjI1IDEzNy44ODEgNS4wNjgzNiAxMzYuODQgNS4wNjgzNkMxMzUuODEyIDUuMDY4MzYgMTM0Ljk2MSA1LjkwNjI1IDEzNC45NjEgNi45MzQ1N0MxMzQuOTYxIDcuOTc1NTkgMTM1LjgxMiA4LjgwMDc4IDEzNi44NCA4LjgwMDc4Wk0xMzUuMjc4IDI1SDEzOC40MTRWMTEuMTI0SDEzNS4yNzhWMjVaTTE0Ni4xNDYgMjUuMjI4NUMxNDcuOTYxIDI1LjIyODUgMTQ5LjQ4NCAyNC40NDE0IDE1MC4yNTkgMjMuMDk1N0gxNTAuNDc1VjI1SDE1My41MDlWMTUuNTE2NkMxNTMuNTA5IDEyLjU4NCAxNTEuNTAzIDEwLjg1NzQgMTQ3LjkzNiAxMC44NTc0QzE0NC42MzUgMTAuODU3NCAxNDIuMzM3IDEyLjQwNjIgMTQyLjA4MyAxNC44MzExSDE0NS4wNTRDMTQ1LjM0NiAxMy44Nzg5IDE0Ni4zMzYgMTMuMzU4NCAxNDcuNzgzIDEzLjM1ODRDMTQ5LjQ4NCAxMy4zNTg0IDE1MC4zOTggMTQuMTMyOCAxNTAuMzk4IDE1LjUxNjZWMTYuNzFMMTQ2LjgxOCAxNi45MjU4QzE0My40NDEgMTcuMTE2MiAxNDEuNTUgMTguNTc2MiAxNDEuNTUgMjEuMDY0NUMxNDEuNTUgMjMuNjAzNSAxNDMuNDY3IDI1LjIyODUgMTQ2LjE0NiAyNS4yMjg1Wk0xNDcuMDcyIDIyLjgwMzdDMTQ1LjY3NiAyMi44MDM3IDE0NC42NzMgMjIuMTA1NSAxNDQuNjczIDIwLjkxMjFDMTQ0LjY3MyAxOS43NTY4IDE0NS40OTggMTkuMTA5NCAxNDcuMjYzIDE4Ljk5NTFMMTUwLjM5OCAxOC43NzkzVjE5LjkwOTJDMTUwLjM5OCAyMS41NTk2IDE0OC45NzcgMjIuODAzNyAxNDcuMDcyIDIyLjgwMzdaTTE2Ny44MjkgNi42ODA2NkgxNjQuNTU0VjE4LjY5MDRDMTY0LjU1NCAyMi42ODk1IDE2Ny40NDggMjUuNDU3IDE3Mi4wODIgMjUuNDU3QzE3Ni43MTYgMjUuNDU3IDE3OS42MSAyMi42ODk1IDE3OS42MSAxOC42OTA0VjYuNjgwNjZIMTc2LjMzNVYxOC4zOTg0QzE3Ni4zMzUgMjAuODk5NCAxNzQuNzk5IDIyLjYwMDYgMTcyLjA4MiAyMi42MDA2QzE2OS4zNjUgMjIuNjAwNiAxNjcuODI5IDIwLjg5OTQgMTY3LjgyOSAxOC4zOTg0VjYuNjgwNjZaTTE4Ny4zOTMgMjVWNi42ODA2NkgxODQuMTE3VjI1SDE4Ny4zOTNaIiBmaWxsPSJibGFjayIvPgo8ZGVmcz4KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDBfbGluZWFyIiB4MT0iMTYuMTgwNyIgeTE9IjI3LjM4OTgiIHgyPSIxNi4xODA3IiB5Mj0iNC42MTAxNyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgo8c3RvcCBzdG9wLWNvbG9yPSIjNzQwMEUxIi8+CjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzQwMDBCRiIvPgo8L2xpbmVhckdyYWRpZW50Pgo8L2RlZnM+Cjwvc3ZnPgo=';
 
 addons.setConfig({
   theme: create({
diff --git a/packages/insomnia-components/.storybook/preview.js b/packages/insomnia-components/.storybook/preview.js
index b1a1d5c064..b47dba7be3 100644
--- a/packages/insomnia-components/.storybook/preview.js
+++ b/packages/insomnia-components/.storybook/preview.js
@@ -6,4 +6,4 @@ import { withInfo } from '@storybook/addon-info';
 addDecorator(withContexts(contexts));
 addDecorator(withInfo({ inline: true }));
 
-configure(require.context('../components', true, /\.stories\.js$/), module);
+configure(require.context('../src', true, /\.stories\.tsx?$/), module);
diff --git a/packages/insomnia-components/.svgrrc.json b/packages/insomnia-components/.svgrrc.json
deleted file mode 100644
index ee02cf6e45..0000000000
--- a/packages/insomnia-components/.svgrrc.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "icon": true,
-  "memo": true,
-  "replaceAttrValues": {
-    "#000": "",
-    "#FFF": "currentColor"
-  }
-}
diff --git a/packages/insomnia-components/__mocks__/dummy.js b/packages/insomnia-components/__mocks__/dummy.js
deleted file mode 100644
index f053ebf797..0000000000
--- a/packages/insomnia-components/__mocks__/dummy.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = {};
diff --git a/packages/insomnia-components/components/breadcrumb.stories.js b/packages/insomnia-components/components/breadcrumb.stories.js
deleted file mode 100644
index 2d24768fa3..0000000000
--- a/packages/insomnia-components/components/breadcrumb.stories.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from 'react';
-import Breadcrumb from './breadcrumb';
-
-export default { title: 'Navigation | Breadcrumb' };
-
-export const _default = () => (
-  <Breadcrumb className="breadcrumb" crumbs={['Documents', 'Deployment']} />
-);
diff --git a/packages/insomnia-components/components/button/async-button.js b/packages/insomnia-components/components/button/async-button.js
deleted file mode 100644
index 49945940cd..0000000000
--- a/packages/insomnia-components/components/button/async-button.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// @flow
-import * as React from 'react';
-import { Button } from './button';
-import type { ButtonProps } from './button';
-
-// Taken from https://github.com/then/is-promise
-function isPromise(obj) {
-  return (
-    !!obj &&
-    (typeof obj === 'object' || typeof obj === 'function') &&
-    typeof obj.then === 'function'
-  );
-}
-
-type AsyncButtonProps = ButtonProps & {
-  onClick?: (e: SyntheticEvent<HTMLButtonElement>) => Promise<any>,
-  loadingNode?: React.Node,
-};
-
-export const AsyncButton = ({
-  onClick,
-  disabled,
-  loadingNode,
-  children,
-  ...props
-}: AsyncButtonProps) => {
-  const [loading, setLoading] = React.useState(false);
-
-  const asyncHandler = React.useCallback(
-    async e => {
-      const result = onClick(e);
-      if (isPromise(result)) {
-        try {
-          setLoading(true);
-          await result;
-        } finally {
-          setLoading(false);
-        }
-      }
-    },
-    [onClick],
-  );
-
-  return (
-    <Button {...props} onClick={asyncHandler} disabled={loading || disabled}>
-      {(loading && loadingNode) || children}
-    </Button>
-  );
-};
diff --git a/packages/insomnia-components/components/button/index.js b/packages/insomnia-components/components/button/index.js
deleted file mode 100644
index 28b39ff094..0000000000
--- a/packages/insomnia-components/components/button/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { Button } from './button';
-export { AsyncButton } from './async-button';
-export { CircleButton } from './circle-button';
diff --git a/packages/insomnia-components/components/card-container.js b/packages/insomnia-components/components/card-container.js
deleted file mode 100644
index 1059d179f2..0000000000
--- a/packages/insomnia-components/components/card-container.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// @flow
-import * as React from 'react';
-import styled from 'styled-components';
-
-const Cards: React.ComponentType<{}> = styled.div`
-  display: flex;
-  flex-wrap: wrap;
-  padding-top: var(--padding-md);
-`;
-
-class CardContainer extends React.PureComponent<{}> {
-  render() {
-    return <Cards {...this.props} />;
-  }
-}
-
-export default CardContainer;
diff --git a/packages/insomnia-components/components/header.stories.js b/packages/insomnia-components/components/header.stories.js
deleted file mode 100644
index 97acfdfd4a..0000000000
--- a/packages/insomnia-components/components/header.stories.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import Header from './header';
-import Breadcrumb from './breadcrumb';
-import Switch from './switch';
-
-export default { title: 'Layout | Header' };
-
-export const _default = () => <Header />;
-
-export const _primary = () => (
-  <Header
-    gridLeft={
-      <React.Fragment>
-        <Breadcrumb className="breadcrumb" crumbs={['Documents', 'Deployment']} />
-      </React.Fragment>
-    }
-    gridCenter={<Switch />}
-    gridRight={
-      <React.Fragment>
-        <div>right</div>
-      </React.Fragment>
-    }
-  />
-);
diff --git a/packages/insomnia-components/components/list-group/unit-test-result-badge.js b/packages/insomnia-components/components/list-group/unit-test-result-badge.js
deleted file mode 100644
index afaba05800..0000000000
--- a/packages/insomnia-components/components/list-group/unit-test-result-badge.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// @flow
-import * as React from 'react';
-import styled from 'styled-components';
-
-type Props = {|
-  failed?: boolean,
-|};
-
-const StyledBadge: React.ComponentType<{}> = styled.span`
-  padding: var(--padding-xs) var(--padding-sm);
-  border: 1px solid var(--color-success);
-  background-color: var(--color-bg);
-  color: var(--color-success);
-  font-weight: var(--font-weight-bold);
-  border-radius: var(--radius-sm);
-  flex-basis: 3.5em;
-  flex-shrink: 0;
-  text-align: center;
-  text-transform: capitalize;
-`;
-
-const StyledFailedBadge: React.ComponentType<{}> = styled(StyledBadge)`
-  border-color: var(--color-danger);
-  color: var(--color-danger);
-`;
-
-const StyledPassedBadge: React.ComponentType<{}> = styled(StyledBadge)`
-  border-color: var(--color-success);
-  color: var(--color-success);
-`;
-
-const UnitTestResultBadge = ({ failed }: Props) => {
-  if (failed) {
-    return <StyledFailedBadge>Failed</StyledFailedBadge>;
-  }
-  return <StyledPassedBadge>Passed</StyledPassedBadge>;
-};
-
-export default UnitTestResultBadge;
diff --git a/packages/insomnia-components/components/list-group/unit-test-result-item.js b/packages/insomnia-components/components/list-group/unit-test-result-item.js
deleted file mode 100644
index c23c417ba0..0000000000
--- a/packages/insomnia-components/components/list-group/unit-test-result-item.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// @flow
-import * as React from 'react';
-import styled from 'styled-components';
-import ListGroupItem from './list-group-item';
-import UnitTestResultTimeStamp from './unit-test-result-timestamp';
-import UnitTestResultBadge from './unit-test-result-badge';
-
-type Props = {|
-  item: Object,
-|};
-
-const StyledResultListItem: React.ComponentType<{}> = styled(ListGroupItem)`
-  > div:first-of-type {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-
-    > *:not(:first-child) {
-      margin: var(--padding-xs) 0 var(--padding-xs) var(--padding-sm);
-    }
-  }
-
-  code {
-    background-color: var(--hl-xs);
-    padding: var(--padding-sm) var(--padding-md) var(--padding-sm) var(--padding-md);
-    color: var(--color-danger);
-    display: block;
-    margin: var(--padding-sm) 0 0 0;
-  }
-
-  p {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    flex-grow: 1;
-  }
-`;
-
-const UnitTestResultItem = ({ item }: Props) => {
-  return (
-    <StyledResultListItem>
-      <div>
-        <UnitTestResultBadge failed={!!item.err.message} />
-        <p>{item.title}</p>
-        <UnitTestResultTimeStamp timeMs={item.duration} />
-      </div>
-      {item.err.message && <code>{item.err.message}</code>}
-    </StyledResultListItem>
-  );
-};
-
-export default UnitTestResultItem;
diff --git a/packages/insomnia-components/components/multi-switch.stories.js b/packages/insomnia-components/components/multi-switch.stories.js
deleted file mode 100644
index 637cd94f95..0000000000
--- a/packages/insomnia-components/components/multi-switch.stories.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import * as React from 'react';
-import MultiSwitch from './multi-switch';
-
-export default { title: 'Navigation | Sliding Switch' };
-
-export const _default = () => {
-  const [selectedValue, setSelectedValue] = React.useState('debug');
-  return (
-    <MultiSwitch
-      name="activity"
-      onChange={setSelectedValue}
-      choices={[
-        { label: 'Design', value: 'design' },
-        { label: 'Debug', value: 'debug' },
-        { label: 'Test', value: 'test' },
-      ]}
-      selectedValue={selectedValue}
-    />
-  );
-};
diff --git a/packages/insomnia-components/components/radio-button-group.stories.js b/packages/insomnia-components/components/radio-button-group.stories.js
deleted file mode 100644
index 566ac75d90..0000000000
--- a/packages/insomnia-components/components/radio-button-group.stories.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// @flow
-import * as React from 'react';
-
-import RadioButtonGroup from './radio-button-group';
-
-export default { title: 'Navigation | Radio Button Group' };
-
-export const _default = () => {
-  const [selectedValue, setSelectedValue] = React.useState('scratch');
-  return (
-    <RadioButtonGroup
-      name="dummy"
-      onChange={setSelectedValue}
-      choices={[
-        { label: 'From Scratch', value: 'scratch' },
-        { label: 'From Repository', value: 'repo' },
-        { label: 'From Clipboard', value: 'clip' },
-        { label: 'From Spec', value: 'spec' },
-      ]}
-      selectedValue={selectedValue}
-    />
-  );
-};
diff --git a/packages/insomnia-components/components/sidebar/sidebar-info.js b/packages/insomnia-components/components/sidebar/sidebar-info.js
deleted file mode 100644
index 0962875636..0000000000
--- a/packages/insomnia-components/components/sidebar/sidebar-info.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// @flow
-import * as React from 'react';
-import SidebarPanel from './sidebar-panel';
-import SidebarItem from './sidebar-item';
-import SidebarTextItem from './sidebar-text-item';
-
-type Props = {
-  info: Object,
-  childrenVisible: boolean,
-  onClick: (section: string, ...args: Array<string>) => void,
-};
-
-function SidebarInfo(props: Props) {
-  const { title, description, version, license } = props.info;
-
-  return (
-    <SidebarPanel childrenVisible={props.childrenVisible}>
-      {title && (
-        <SidebarItem onClick={() => props.onClick('info', 'title')}>
-          <SidebarTextItem label={'Title:'} headline={title} />
-        </SidebarItem>
-      )}
-      {description && (
-        <SidebarItem onClick={() => props.onClick('info', 'description')}>
-          <SidebarTextItem label={'Description:'} headline={description} />
-        </SidebarItem>
-      )}
-      {version && (
-        <SidebarItem onClick={() => props.onClick('info', 'version')}>
-          <SidebarTextItem label={'Version:'} headline={version} />
-        </SidebarItem>
-      )}
-      {license && license.name && (
-        <SidebarItem onClick={() => props.onClick('info', 'license')}>
-          <SidebarTextItem label={'License:'} headline={license.name} />
-        </SidebarItem>
-      )}
-    </SidebarPanel>
-  );
-}
-
-export default SidebarInfo;
diff --git a/packages/insomnia-components/components/sidebar/sidebar-invalid-section.js b/packages/insomnia-components/components/sidebar/sidebar-invalid-section.js
deleted file mode 100644
index e671d798ba..0000000000
--- a/packages/insomnia-components/components/sidebar/sidebar-invalid-section.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// @flow
-import * as React from 'react';
-import styled from 'styled-components';
-
-type Props = {
-  name: string,
-};
-
-const StyledInvalidSection: React.ComponentType<{}> = styled.div`
-  padding: var(--padding-xs) var(--padding-xs) var(--padding-md) var(--padding-md);
-  color: var(--color-warning);
-`;
-
-const SidebarInvalidSection = ({ name }: Props) => (
-  <StyledInvalidSection>Error: Invalid {name} specification.</StyledInvalidSection>
-);
-
-export default SidebarInvalidSection;
diff --git a/packages/insomnia-components/components/sidebar/sidebar-panel.js b/packages/insomnia-components/components/sidebar/sidebar-panel.js
deleted file mode 100644
index 245e1e84fa..0000000000
--- a/packages/insomnia-components/components/sidebar/sidebar-panel.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// @flow
-import * as React from 'react';
-import styled from 'styled-components';
-import { motion } from 'framer-motion';
-
-type Props = {
-  children: React.Node,
-  childrenVisible: boolean,
-};
-
-const StyledPanel: React.ComponentType<{}> = styled(motion.div)`
-  height: 0;
-`;
-
-const SidebarPanel = ({ childrenVisible, children }: Props) => (
-  <StyledPanel
-    initial={{ height: childrenVisible ? '100%' : '0px' }}
-    animate={{ height: childrenVisible ? '100%' : '0px' }}
-    transition={{ duration: 0.2, ease: 'easeInOut', delay: 0 }}>
-    {children}
-  </StyledPanel>
-);
-
-export default SidebarPanel;
diff --git a/packages/insomnia-components/components/svg-icon.js b/packages/insomnia-components/components/svg-icon.js
deleted file mode 100644
index 3ff5e923cb..0000000000
--- a/packages/insomnia-components/components/svg-icon.js
+++ /dev/null
@@ -1,221 +0,0 @@
-// @flow
-import * as React from 'react';
-import styled from 'styled-components';
-import MemoSvgIcnArrowRight from '../assets/svgr/IcnArrowRight';
-import MemoSvgIcnChevronDown from '../assets/svgr/IcnChevronDown';
-import MemoSvgIcnChevronUp from '../assets/svgr/IcnChevronUp';
-import MemoSvgIcnClock from '../assets/svgr/IcnClock';
-import MemoSvgIcnEmpty from '../assets/svgr/IcnEmpty';
-import MemoSvgIcnErrors from '../assets/svgr/IcnErrors';
-import MemoSvgIcnGitBranch from '../assets/svgr/IcnGitBranch';
-import MemoSvgIcnGithubLogo from '../assets/svgr/IcnGithubLogo';
-import MemoSvgIcnBitbucketLogo from '../assets/svgr/IcnBitbucketLogo';
-import MemoSvgIcnWarning from '../assets/svgr/IcnWarning';
-import MemoSvgIcnEllipsis from '../assets/svgr/IcnEllipsis';
-import MemoSvgIcnBurgerMenu from '../assets/svgr/IcnBurgerMenu';
-import MemoSvgIcnCheckmark from '../assets/svgr/IcnCheckmark';
-import MemoSvgIcnCookie from '../assets/svgr/IcnCookie';
-import MemoSvgIcnDragGrip from '../assets/svgr/IcnDragGrip';
-import MemoSvgIcnElevator from '../assets/svgr/IcnElevator';
-import MemoSvgIcnEllipsisCircle from '../assets/svgr/IcnEllipsisCircle';
-import MemoSvgIcnFile from '../assets/svgr/IcnFile';
-import MemoSvgIcnFolderOpen from '../assets/svgr/IcnFolderOpen';
-import MemoSvgIcnFolder from '../assets/svgr/IcnFolder';
-import MemoSvgIcnGear from '../assets/svgr/IcnGear';
-import MemoSvgIcnGitlabLogo from '../assets/svgr/IcnGitlabLogo';
-import MemoSvgIcnGUI from '../assets/svgr/IcnGui';
-import MemoSvgIcnIndendation from '../assets/svgr/IcnIndentation';
-import MemoSvgIcnMinusCircleFill from '../assets/svgr/IcnMinusCircleFill';
-import MemoSvgIcnMinusCircle from '../assets/svgr/IcnMinusCircle';
-import MemoSvgIcnPlaceholder from '../assets/svgr/IcnPlaceholder';
-import MemoSvgIcnPlay from '../assets/svgr/IcnPlay';
-import MemoSvgIcnPlus from '../assets/svgr/IcnPlus';
-import MemoSvgIcnProhibited from '../assets/svgr/IcnProhibited';
-import MemoSvgIcnQuestionFill from '../assets/svgr/IcnQuestionFill';
-import MemoSvgIcnQuestion from '../assets/svgr/IcnQuestion';
-import MemoSvgIcnSearch from '../assets/svgr/IcnSearch';
-import MemoSvgIcnSecCert from '../assets/svgr/IcnSecCert';
-import MemoSvgIcnSuccess from '../assets/svgr/IcnSuccess';
-import MemoSvgIcnSync from '../assets/svgr/IcnSync';
-import MemoSvgIcnTrashcan from '../assets/svgr/IcnTrashcan';
-import MemoSvgIcnTriangle from '../assets/svgr/IcnTriangle';
-import MemoSvgIcnUser from '../assets/svgr/IcnUser';
-import MemoSvgIcnWarningCircle from '../assets/svgr/IcnWarningCircle';
-import MemoSvgIcnX from '../assets/svgr/IcnX';
-import MemoSvgIcnInfo from '../assets/svgr/IcnInfo';
-import MemoSvgIcnKey from '../assets/svgr/IcnKey';
-import MemoSvgIcnBrackets from '../assets/svgr/IcnBrackets';
-
-export const ThemeEnum = {
-  default: 'default',
-  highlight: 'highlight',
-
-  // Colors
-  danger: 'danger',
-  info: 'info',
-  notice: 'notice',
-  success: 'success',
-  surprise: 'surprise',
-  warning: 'warning',
-};
-
-type ThemeKeys = $Values<typeof ThemeEnum>;
-
-export const IconEnum = {
-  arrowRight: 'arrow-right',
-  chevronDown: 'chevron-down',
-  chevronUp: 'chevron-up',
-  clock: 'clock',
-  ellipsis: 'ellipsis',
-  error: 'error',
-  gitBranch: 'git-branch',
-  github: 'github',
-  bitbucket: 'bitbucket',
-  info: 'info',
-  search: 'search',
-  warning: 'warning',
-  burgerMenu: 'burger-menu',
-  checkmark: 'checkmark',
-  cookie: 'cookie',
-  dragGrip: 'drag-grip',
-  elevator: 'elevator',
-  ellipsesCircle: 'ellipses-circle',
-  file: 'file',
-  folder: 'folder',
-  folderOpen: 'folder-open',
-  gear: 'gear',
-  gitlabLogo: 'gitlab-logo',
-  gui: 'gui',
-  indentation: 'indentation',
-  minusCircle: 'minus-circle',
-  minusCircleFill: 'minus-circle-fill',
-  placeholder: 'placeholder',
-  play: 'play',
-  plus: 'plus',
-  prohibited: 'prohibited',
-  questionFill: 'question-fill',
-  question: 'question',
-  secCert: 'sec-cert',
-  success: 'success',
-  sync: 'sync',
-  trashcan: 'trashcan',
-  triangle: 'triangle',
-  user: 'user',
-  warningCircle: 'warning-circle',
-  x: 'x',
-  key: 'key',
-  brackets: 'brackets',
-
-  // Blank icon
-  empty: 'empty',
-};
-
-type IconKeys = $Values<typeof IconEnum>;
-
-type Props = {
-  icon: IconKeys,
-  label?: React.Node,
-};
-
-const SvgIconStyled: React.ComponentType<{ theme: ThemeKeys, hasLabel: boolean }> = styled.div`
-  display: inline-flex;
-  align-items: center;
-  white-space: nowrap;
-
-  svg {
-    flex-shrink: 0;
-    user-select: none;
-    ${({ hasLabel }) => (hasLabel ? 'margin-right: var(--padding-xs);' : null)}
-    ${({ theme }) => {
-      switch (theme) {
-        case ThemeEnum.danger:
-        case ThemeEnum.info:
-        case ThemeEnum.notice:
-        case ThemeEnum.success:
-        case ThemeEnum.surprise:
-        case ThemeEnum.warning:
-          return `fill: var(--color-${theme}); color: var(--color-font-${theme});`;
-        case ThemeEnum.highlight:
-          return 'fill: var(--hl); color: var(--color-font-danger);';
-        case ThemeEnum.default:
-        default:
-          return 'fill: var(--color-font); color: var(--color-font);';
-      }
-    }}
-  }
-`;
-
-type IconDictionary = {
-  [IconKeys]: [ThemeKeys, React.ComponentType<any>],
-};
-
-class SvgIcon extends React.Component<Props> {
-  static icons: IconDictionary = {
-    [IconEnum.arrowRight]: [ThemeEnum.highlight, MemoSvgIcnArrowRight],
-    [IconEnum.chevronDown]: [ThemeEnum.default, MemoSvgIcnChevronDown],
-    [IconEnum.chevronUp]: [ThemeEnum.default, MemoSvgIcnChevronUp],
-    [IconEnum.clock]: [ThemeEnum.default, MemoSvgIcnClock],
-    [IconEnum.ellipsis]: [ThemeEnum.default, MemoSvgIcnEllipsis],
-    [IconEnum.empty]: [ThemeEnum.default, MemoSvgIcnEmpty],
-    [IconEnum.error]: [ThemeEnum.danger, MemoSvgIcnErrors],
-    [IconEnum.gitBranch]: [ThemeEnum.default, MemoSvgIcnGitBranch],
-    [IconEnum.github]: [ThemeEnum.default, MemoSvgIcnGithubLogo],
-    [IconEnum.bitbucket]: [ThemeEnum.default, MemoSvgIcnBitbucketLogo],
-    [IconEnum.info]: [ThemeEnum.highlight, MemoSvgIcnInfo],
-    [IconEnum.search]: [ThemeEnum.default, MemoSvgIcnSearch],
-    [IconEnum.warning]: [ThemeEnum.notice, MemoSvgIcnWarning],
-    [IconEnum.burgerMenu]: [ThemeEnum.default, MemoSvgIcnBurgerMenu],
-    [IconEnum.checkmark]: [ThemeEnum.default, MemoSvgIcnCheckmark],
-    [IconEnum.cookie]: [ThemeEnum.default, MemoSvgIcnCookie],
-    [IconEnum.dragGrip]: [ThemeEnum.default, MemoSvgIcnDragGrip],
-    [IconEnum.elevator]: [ThemeEnum.default, MemoSvgIcnElevator],
-    [IconEnum.ellipsesCircle]: [ThemeEnum.default, MemoSvgIcnEllipsisCircle],
-    [IconEnum.elevator]: [ThemeEnum.default, MemoSvgIcnElevator],
-    [IconEnum.file]: [ThemeEnum.default, MemoSvgIcnFile],
-    [IconEnum.folder]: [ThemeEnum.default, MemoSvgIcnFolder],
-    [IconEnum.folderOpen]: [ThemeEnum.default, MemoSvgIcnFolderOpen],
-    [IconEnum.gear]: [ThemeEnum.default, MemoSvgIcnGear],
-    [IconEnum.gitlabLogo]: [ThemeEnum.default, MemoSvgIcnGitlabLogo],
-    [IconEnum.gui]: [ThemeEnum.default, MemoSvgIcnGUI],
-    [IconEnum.indentation]: [ThemeEnum.default, MemoSvgIcnIndendation],
-    [IconEnum.minusCircle]: [ThemeEnum.default, MemoSvgIcnMinusCircle],
-    [IconEnum.minusCircleFill]: [ThemeEnum.default, MemoSvgIcnMinusCircleFill],
-    [IconEnum.placeholder]: [ThemeEnum.default, MemoSvgIcnPlaceholder],
-    [IconEnum.play]: [ThemeEnum.default, MemoSvgIcnPlay],
-    [IconEnum.plus]: [ThemeEnum.default, MemoSvgIcnPlus],
-    [IconEnum.prohibited]: [ThemeEnum.default, MemoSvgIcnProhibited],
-    [IconEnum.question]: [ThemeEnum.default, MemoSvgIcnQuestion],
-    [IconEnum.questionFill]: [ThemeEnum.default, MemoSvgIcnQuestionFill],
-    [IconEnum.secCert]: [ThemeEnum.default, MemoSvgIcnSecCert],
-    [IconEnum.success]: [ThemeEnum.success, MemoSvgIcnSuccess],
-    [IconEnum.sync]: [ThemeEnum.default, MemoSvgIcnSync],
-    [IconEnum.trashcan]: [ThemeEnum.default, MemoSvgIcnTrashcan],
-    [IconEnum.triangle]: [ThemeEnum.default, MemoSvgIcnTriangle],
-    [IconEnum.user]: [ThemeEnum.default, MemoSvgIcnUser],
-    [IconEnum.warningCircle]: [ThemeEnum.default, MemoSvgIcnWarningCircle],
-    [IconEnum.x]: [ThemeEnum.default, MemoSvgIcnX],
-    [IconEnum.key]: [ThemeEnum.default, MemoSvgIcnKey],
-    [IconEnum.brackets]: [ThemeEnum.default, MemoSvgIcnBrackets],
-  };
-
-  render() {
-    const { icon, label } = this.props;
-
-    if (!SvgIcon.icons[icon]) {
-      throw new Error(
-        `Invalid icon "${icon}" used. Must be one of ${Object.values(IconEnum).join('|')}`,
-      );
-    }
-
-    const [theme, Svg] = SvgIcon.icons[icon];
-
-    return (
-      <SvgIconStyled theme={theme} hasLabel={!!label}>
-        <Svg />
-        {label}
-      </SvgIconStyled>
-    );
-  }
-}
-
-export default SvgIcon;
diff --git a/packages/insomnia-components/components/switch.stories.js b/packages/insomnia-components/components/switch.stories.js
deleted file mode 100644
index 9aee9d2055..0000000000
--- a/packages/insomnia-components/components/switch.stories.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react';
-import Switch from './switch';
-
-export default { title: 'Navigation | Sliding Switch' };
-
-export const _design = () => (
-  <Switch
-    optionItems={[
-      { label: 'DESIGN', selected: true },
-      { label: 'DEBUG', selected: false },
-    ]}
-  />
-);
-
-export const _debug = () => (
-  <Switch
-    optionItems={[
-      { label: 'DESIGN', selected: false },
-      { label: 'DEBUG', selected: true },
-    ]}
-  />
-);
diff --git a/packages/insomnia-components/components/table.js b/packages/insomnia-components/components/table.js
deleted file mode 100644
index 1b439988f3..0000000000
--- a/packages/insomnia-components/components/table.js
+++ /dev/null
@@ -1,123 +0,0 @@
-// @flow
-import styled from 'styled-components';
-import * as React from 'react';
-
-/***********/
-/* <table> */
-/***********/
-
-type TableProps = {
-  children: React.Node,
-  striped?: boolean,
-  outlined?: boolean,
-  compact?: boolean,
-  headings?: Array<React.Node>,
-};
-
-const TableStyled: React.ComponentType<{}> = styled.table`
-  width: 100%;
-  border-spacing: 0;
-  border-collapse: collapse;
-
-  td,
-  th {
-    padding: ${({ compact }) => (compact ? 'var(--padding-xs)' : 'var(--padding-sm)')}
-      ${({ compact }) => (compact ? 'var(--padding-sm)' : 'var(--padding-md)')};
-  }
-
-  ${({ striped }) =>
-    striped &&
-    `
-  tbody tr:nth-child(odd) {
-    background: var(--hl-xs);
-  }`}
-
-  ${({ outlined }) =>
-    outlined &&
-    `
-  & {
-    th {
-      background: var(--hl-xxs);
-    }
-
-    &,
-    td {
-      border: 1px solid var(--hl-sm);
-    }
-
-    tr.table--no-outline-row td {
-      border-left: 0;
-      border-right: 0;
-    }
-
-    & {
-      border-radius: 3px;
-      border-collapse: unset;
-    }
-
-    td {
-      border-left: 0;
-      border-bottom: 0;
-
-      &:last-child {
-        border-right: 0;
-      }
-    }
-  }`}
-`;
-const Table = (props: TableProps) => <TableStyled {...props} />;
-
-/********/
-/* <tr> */
-/********/
-
-const TableRowStyled: React.ComponentType<{}> = styled.tr``;
-const TableRow = (props: {}) => <TableRowStyled {...props} />;
-
-/********/
-/* <td> */
-/********/
-
-type TableDataProps = {
-  compact?: boolean,
-  align?: 'center' | 'left',
-};
-const TableDataStyled: React.ComponentType<{
-  compact?: boolean,
-  align?: 'center' | 'left',
-}> = styled.td`
-  vertical-align: top;
-  padding: 0 var(--padding-md);
-  text-align: ${({ align }) => align || 'left'};
-`;
-const TableData = (props: TableDataProps) => <TableDataStyled {...props} />;
-
-/********/
-/* <th> */
-/********/
-type TableHeaderProps = {
-  compact?: boolean,
-  align?: 'center' | 'left',
-};
-const TableHeaderStyled: React.ComponentType<TableHeaderProps> = styled.th`
-  vertical-align: top;
-  padding: 0 var(--padding-md);
-  text-align: ${({ align }) => align || 'left'};
-`;
-const TableHeader = (props: TableHeaderProps) => <TableHeaderStyled {...props} />;
-
-/***********/
-/* <thead> */
-/***********/
-
-const TableHeadStyled: React.ComponentType<{}> = styled.thead``;
-const TableHead = (props: {}) => <TableHeadStyled {...props} />;
-
-/***********/
-/* <tbody> */
-/***********/
-
-const TableBodyStyled: React.ComponentType<{}> = styled.tbody``;
-const TableBody = (props: {}) => <TableBodyStyled {...props} />;
-
-export { Table, TableBody, TableHead, TableHeader, TableRow, TableData };
diff --git a/packages/insomnia-components/flow-typed/@storybook/addon-knobs.js b/packages/insomnia-components/flow-typed/@storybook/addon-knobs.js
deleted file mode 100644
index 946a2cc08b..0000000000
--- a/packages/insomnia-components/flow-typed/@storybook/addon-knobs.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// @flow
-
-declare module '@storybook/addon-knobs' {
-  declare module.exports: {
-    select: (string, Object, ?string) => Object,
-    boolean: (string, boolean) => Object,
-    number: (string, defaultValue: number, options) => number,
-    text: (label: string, defaultValue: string) => Object,
-    withKnobs: Object,
-  }
-}
diff --git a/packages/insomnia-components/flow-typed/@storybook/framer-motion.js b/packages/insomnia-components/flow-typed/@storybook/framer-motion.js
deleted file mode 100644
index 23b1cf374a..0000000000
--- a/packages/insomnia-components/flow-typed/@storybook/framer-motion.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// @flow
-
-declare module 'framer-motion' {
-  declare module.exports: {
-    motion: Object,
-    useCycle: Object,
-    AnimatePresence: Object,
-    withKnobs: Object,
-  }
-}
\ No newline at end of file
diff --git a/packages/insomnia-components/flow-typed/autobind-decorator.js b/packages/insomnia-components/flow-typed/autobind-decorator.js
deleted file mode 100644
index b29d11d9e0..0000000000
--- a/packages/insomnia-components/flow-typed/autobind-decorator.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'autobind-decorator' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-components/flow-typed/class-autobind-decorator.js b/packages/insomnia-components/flow-typed/class-autobind-decorator.js
deleted file mode 100644
index 5b00814db0..0000000000
--- a/packages/insomnia-components/flow-typed/class-autobind-decorator.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'class-autobind-decorator' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-components/flow-typed/md5.js b/packages/insomnia-components/flow-typed/md5.js
deleted file mode 100644
index 1744832ed2..0000000000
--- a/packages/insomnia-components/flow-typed/md5.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'md5' {
-  declare module.exports: (string) => string;
-}
diff --git a/packages/insomnia-components/flow-typed/npm/classnames_v2.x.x.js b/packages/insomnia-components/flow-typed/npm/classnames_v2.x.x.js
deleted file mode 100644
index 27057f0338..0000000000
--- a/packages/insomnia-components/flow-typed/npm/classnames_v2.x.x.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// flow-typed signature: a00cf41b09af4862583460529d5cfcb9
-// flow-typed version: c6154227d1/classnames_v2.x.x/flow_>=v0.104.x
-
-type $npm$classnames$Classes =
-  | string
-  | { [className: string]: *, ... }
-  | false
-  | void
-  | null;
-
-declare module "classnames" {
-  declare module.exports: (
-    ...classes: Array<$npm$classnames$Classes | $npm$classnames$Classes[]>
-  ) => string;
-}
-
-declare module "classnames/bind" {
-  declare module.exports: $Exports<"classnames">;
-}
-
-declare module "classnames/dedupe" {
-  declare module.exports: $Exports<"classnames">;
-}
diff --git a/packages/insomnia-components/flow-typed/npm/styled-components_v4.x.x.js b/packages/insomnia-components/flow-typed/npm/styled-components_v4.x.x.js
deleted file mode 100644
index ace81963cb..0000000000
--- a/packages/insomnia-components/flow-typed/npm/styled-components_v4.x.x.js
+++ /dev/null
@@ -1,432 +0,0 @@
-// flow-typed signature: 2326ecddadf3dc85a1fe1dd91ba9a93c
-// flow-typed version: bac16db19f/styled-components_v4.x.x/flow_>=v0.104.x
-
-// @flow
-
-declare module 'styled-components' {
-  declare class InterpolatableComponent<P> extends React$Component<P> {
-    static +styledComponentId: string;
-  }
-
-  declare export type Interpolation<P> =
-    | ((executionContext: P) =>
-      | ((executionContext: P) => InterpolationBase)
-      | InterpolationBase
-    )
-    | Class<InterpolatableComponent<any>>
-    | InterpolationBase
-
-  declare export type InterpolationBase =
-    | CSSRules
-    | KeyFrames
-    | string
-    | number
-    | false // falsy values are OK, true is the only one not allowed, because it renders as "true"
-    | null
-    | void
-    | {[ruleOrSelector: string]: string | number, ...} // CSS-in-JS object returned by polished are also supported
-
-  declare export type TaggedTemplateLiteral<I, R> = (strings: string[], ...interpolations: Interpolation<I>[]) => R
-
-  // Should this be `mixed` perhaps?
-  declare export type CSSRules = Interpolation<any>[] // eslint-disable-line flowtype/no-weak-types
-
-  declare export type CSSConstructor = TaggedTemplateLiteral<any, CSSRules> // eslint-disable-line flowtype/no-weak-types
-  declare export type KeyFramesConstructor = TaggedTemplateLiteral<any, KeyFrames> // eslint-disable-line flowtype/no-weak-types
-  declare export type CreateGlobalStyleConstructor = TaggedTemplateLiteral<any, React$ComponentType<*>> // eslint-disable-line flowtype/no-weak-types
-
-  declare interface Tag<T> {
-    styleTag: HTMLStyleElement | null;
-    getIds(): string[];
-    hasNameForId(id: string, name: string): boolean;
-    insertMarker(id: string): T;
-    insertRules(id: string, cssRules: string[], name: ?string): void;
-    removeRules(id: string): void;
-    css(): string;
-    toHTML(additionalAttrs: ?string): string;
-    toElement(): React$Element<*>;
-    clone(): Tag<T>;
-    sealed: boolean;
-  }
-
-  // The `any`/weak types in here all come from `styled-components` directly, since those definitions were just copied over
-  declare export class StyleSheet {
-    static get master() : StyleSheet;
-    static get instance() : StyleSheet;
-    static reset(forceServer? : boolean) : void;
-
-    id : number;
-    forceServer : boolean;
-    target : ?HTMLElement;
-    tagMap : { [string]: Tag<any>, ... }; // eslint-disable-line flowtype/no-weak-types
-    deferred: { [string]: string[] | void, ... };
-    rehydratedNames: { [string]: boolean, ... };
-    ignoreRehydratedNames: { [string]: boolean, ... };
-    tags: Tag<any>[]; // eslint-disable-line flowtype/no-weak-types
-    importRuleTag: Tag<any>; // eslint-disable-line flowtype/no-weak-types
-    capacity: number;
-    clones: StyleSheet[];
-
-    constructor(?HTMLElement) : this;
-    rehydrate() : this;
-    clone() : StyleSheet;
-    sealAllTags() : void;
-    makeTag(tag : ?Tag<any>) : Tag<any>; // eslint-disable-line flowtype/no-weak-types
-    getImportRuleTag() : Tag<any>; // eslint-disable-line flowtype/no-weak-types
-    getTagForId(id : string): Tag<any>; // eslint-disable-line flowtype/no-weak-types
-    hasId(id: string) : boolean;
-    hasNameForId(id: string, name: string) : boolean;
-    deferredInject(id : string, cssRules : string[]) : void;
-    inject(id: string, cssRules : string[], name? : string) : void;
-    remove(id : string) : void;
-    toHtml() : string;
-    toReactElements() : React$ElementType[];
-  }
-
-  declare export function isStyledComponent(target: any): boolean;
-
-  declare type SCMProps = {
-    children?: React$Element<any>,
-    sheet?: StyleSheet,
-    target?: HTMLElement,
-    ...
-  }
-
-  declare export var StyleSheetContext: React$Context<StyleSheet>;
-  declare export var StyleSheetConsumer : React$ComponentType<{|
-    children: (value: StyleSheet) => ?React$Node
-  |}>
-  declare var StyleSheetProvider: React$ComponentType<{|
-    children?: React$Node,
-    value: StyleSheet,
-  |}>
-
-  declare export class StyleSheetManager extends React$Component<SCMProps> {
-    getContext(sheet: ?StyleSheet, target: ?HTMLElement): StyleSheet;
-    render(): React$Element<typeof(StyleSheetProvider)>
-  }
-
-  declare export class ServerStyleSheet {
-    instance: StyleSheet;
-    masterSheet: StyleSheet;
-    sealed: boolean;
-
-    seal(): void;
-    collectStyles(children: any): React$Element<StyleSheetManager>;
-    getStyleTags(): string;
-    toReactElements(): React$ElementType[];
-    // This seems to be use a port of node streams in the Browsers. Not gonna type this for now
-    // eslint-disable-next-line flowtype/no-weak-types
-    interleaveWithNodeStream(stream: any): any;
-  }
-
-  declare export class KeyFrames {
-    id : string;
-    name : string;
-    rules : string[];
-
-    constructor(name : string, rules : string[]) : this;
-    inject(StyleSheet) : void;
-    toString() : string;
-    getName() : string;
-  }
-
-  // I think any is appropriate here?
-  // eslint-disable-next-line flowtype/no-weak-types
-  declare export var css : CSSConstructor;
-  declare export var keyframes : KeyFramesConstructor;
-  declare export var createGlobalStyle : CreateGlobalStyleConstructor
-  declare export var ThemeConsumer : React$ComponentType<{|
-    children: (value: mixed) => ?React$Node
-  |}>
-  declare export var ThemeProvider: React$ComponentType<{|
-    children?: ?React$Node,
-    theme: mixed | (mixed) => mixed,
-  |}>
-
-  /**
-    Any because the intended use-case is for users to do:
-
-        import {ThemeContext} from 'styled-components';
-        ...
-        const theme = React.useContext<MyTheme>(ThemeContext);
-
-    If they want DRY-er code, they could declare their own version of this via something like
-
-        import { ThemeContext as SCThemeContext } from 'styled-components';
-        export const ThemeContext: React$Context<MyTheme> = SCThemeContext;
-
-    and then
-
-        import {ThemeContext} from './theme';
-  */
-  // eslint-disable-next-line flowtype/no-weak-types
-  declare export var ThemeContext: React$Context<any>;
-
-  declare export type ThemeProps<T> = {|
-    theme: T
-  |}
-
-  declare export type PropsWithTheme<Props, T> = {|
-    ...ThemeProps<T>,
-    ...$Exact<Props>
-  |}
-
-  declare export function withTheme<Theme, Config: {...}, Instance>(Component: React$AbstractComponent<Config, Instance>): React$AbstractComponent<$Diff<Config, ThemeProps<Theme | void>>, Instance>
-
-  declare export type StyledComponent<Props, Theme, Instance> = React$AbstractComponent<Props, Instance> & Class<InterpolatableComponent<Props>>
-
-  declare export type StyledFactory<StyleProps, Theme, Instance> = {|
-    [[call]]: TaggedTemplateLiteral<PropsWithTheme<StyleProps, Theme>, StyledComponent<StyleProps, Theme, Instance>>;
-    +attrs: <A: {...}>(((StyleProps) => A) | A) => TaggedTemplateLiteral<
-      PropsWithTheme<{|...$Exact<StyleProps>, ...$Exact<A>|}, Theme>,
-      StyledComponent<React$Config<{|...$Exact<StyleProps>, ...$Exact<A>|}, $Exact<A>>, Theme, Instance>
-    >;
-  |}
-
-  declare export type StyledShorthandFactory<V> = {|
-    [[call]]: <StyleProps, Theme>(string[], ...Interpolation<PropsWithTheme<StyleProps, Theme>>[]) => StyledComponent<StyleProps, Theme, V>;
-    +attrs: <A: {...}, StyleProps = {||}, Theme = {||}>(((StyleProps) => A) | A) => TaggedTemplateLiteral<
-      PropsWithTheme<{|...$Exact<StyleProps>, ...$Exact<A>|}, Theme>,
-      StyledComponent<React$Config<{|...$Exact<StyleProps>, ...$Exact<A>|}, $Exact<A>>, Theme, V>
-    >;
-  |}
-
-
-  declare type BuiltinElementInstances = {
-    a: React$ElementRef<'a'>,
-    abbr: React$ElementRef<'abbr'>,
-    address: React$ElementRef<'address'>,
-    area: React$ElementRef<'area'>,
-    article: React$ElementRef<'article'>,
-    aside: React$ElementRef<'aside'>,
-    audio: React$ElementRef<'audio'>,
-    b: React$ElementRef<'b'>,
-    base: React$ElementRef<'base'>,
-    bdi: React$ElementRef<'bdi'>,
-    bdo: React$ElementRef<'bdo'>,
-    big: React$ElementRef<'big'>,
-    blockquote: React$ElementRef<'blockquote'>,
-    body: React$ElementRef<'body'>,
-    br: React$ElementRef<'br'>,
-    button: React$ElementRef<'button'>,
-    canvas: React$ElementRef<'canvas'>,
-    caption: React$ElementRef<'caption'>,
-    cite: React$ElementRef<'cite'>,
-    code: React$ElementRef<'code'>,
-    col: React$ElementRef<'col'>,
-    colgroup: React$ElementRef<'colgroup'>,
-    data: React$ElementRef<'data'>,
-    datalist: React$ElementRef<'datalist'>,
-    dd: React$ElementRef<'dd'>,
-    del: React$ElementRef<'del'>,
-    details: React$ElementRef<'details'>,
-    dfn: React$ElementRef<'dfn'>,
-    dialog: React$ElementRef<'dialog'>,
-    div: React$ElementRef<'div'>,
-    dl: React$ElementRef<'dl'>,
-    dt: React$ElementRef<'dt'>,
-    em: React$ElementRef<'em'>,
-    embed: React$ElementRef<'embed'>,
-    fieldset: React$ElementRef<'fieldset'>,
-    figcaption: React$ElementRef<'figcaption'>,
-    figure: React$ElementRef<'figure'>,
-    footer: React$ElementRef<'footer'>,
-    form: React$ElementRef<'form'>,
-    h1: React$ElementRef<'h1'>,
-    h2: React$ElementRef<'h2'>,
-    h3: React$ElementRef<'h3'>,
-    h4: React$ElementRef<'h4'>,
-    h5: React$ElementRef<'h5'>,
-    h6: React$ElementRef<'h6'>,
-    head: React$ElementRef<'head'>,
-    header: React$ElementRef<'header'>,
-    hgroup: React$ElementRef<'hgroup'>,
-    hr: React$ElementRef<'hr'>,
-    html: React$ElementRef<'html'>,
-    i: React$ElementRef<'i'>,
-    iframe: React$ElementRef<'iframe'>,
-    img: React$ElementRef<'img'>,
-    input: React$ElementRef<'input'>,
-    ins: React$ElementRef<'ins'>,
-    kbd: React$ElementRef<'kbd'>,
-    label: React$ElementRef<'label'>,
-    legend: React$ElementRef<'legend'>,
-    li: React$ElementRef<'li'>,
-    link: React$ElementRef<'link'>,
-    main: React$ElementRef<'main'>,
-    map: React$ElementRef<'map'>,
-    mark: React$ElementRef<'mark'>,
-    menu: React$ElementRef<'menu'>,
-    meta: React$ElementRef<'meta'>,
-    meter: React$ElementRef<'meter'>,
-    nav: React$ElementRef<'nav'>,
-    noscript: React$ElementRef<'noscript'>,
-    object: React$ElementRef<'object'>,
-    ol: React$ElementRef<'ol'>,
-    optgroup: React$ElementRef<'optgroup'>,
-    option: React$ElementRef<'option'>,
-    output: React$ElementRef<'output'>,
-    p: React$ElementRef<'p'>,
-    param: React$ElementRef<'param'>,
-    picture: React$ElementRef<'picture'>,
-    pre: React$ElementRef<'pre'>,
-    progress: React$ElementRef<'progress'>,
-    q: React$ElementRef<'q'>,
-    rp: React$ElementRef<'rp'>,
-    rt: React$ElementRef<'rt'>,
-    ruby: React$ElementRef<'ruby'>,
-    s: React$ElementRef<'s'>,
-    samp: React$ElementRef<'samp'>,
-    script: React$ElementRef<'script'>,
-    section: React$ElementRef<'section'>,
-    select: React$ElementRef<'select'>,
-    small: React$ElementRef<'small'>,
-    source: React$ElementRef<'source'>,
-    span: React$ElementRef<'span'>,
-    strong: React$ElementRef<'strong'>,
-    style: React$ElementRef<'style'>,
-    sub: React$ElementRef<'sub'>,
-    summary: React$ElementRef<'summary'>,
-    sup: React$ElementRef<'sup'>,
-    table: React$ElementRef<'table'>,
-    tbody: React$ElementRef<'tbody'>,
-    td: React$ElementRef<'td'>,
-    textarea: React$ElementRef<'textarea'>,
-    tfoot: React$ElementRef<'tfoot'>,
-    th: React$ElementRef<'th'>,
-    thead: React$ElementRef<'thead'>,
-    time: React$ElementRef<'time'>,
-    title: React$ElementRef<'title'>,
-    tr: React$ElementRef<'tr'>,
-    track: React$ElementRef<'track'>,
-    u: React$ElementRef<'u'>,
-    ul: React$ElementRef<'ul'>,
-    var: React$ElementRef<'var'>,
-    video: React$ElementRef<'video'>,
-    wbr: React$ElementRef<'wbr'>,
-    // SVG
-    circle: React$ElementRef<'circle'>,
-    clipPath: React$ElementRef<'clipPath'>,
-    defs: React$ElementRef<'defs'>,
-    ellipse: React$ElementRef<'ellipse'>,
-    g: React$ElementRef<'g'>,
-    image: React$ElementRef<'image'>,
-    line: React$ElementRef<'line'>,
-    linearGradient: React$ElementRef<'linearGradient'>,
-    mask: React$ElementRef<'mask'>,
-    path: React$ElementRef<'path'>,
-    pattern: React$ElementRef<'pattern'>,
-    polygon: React$ElementRef<'polygon'>,
-    polyline: React$ElementRef<'polyline'>,
-    radialGradient: React$ElementRef<'radialGradient'>,
-    rect: React$ElementRef<'rect'>,
-    stop: React$ElementRef<'stop'>,
-    svg: React$ElementRef<'svg'>,
-    text: React$ElementRef<'text'>,
-    tspan: React$ElementRef<'tspan'>,
-    // Deprecated, should be HTMLUnknownElement, but Flow doesn't support it
-    keygen: React$ElementRef<'keygen'>,
-    menuitem: React$ElementRef<'menuitem'>,
-    ...
-  }
-
-  declare type BuiltinElementType<ElementName: string> = $ElementType<BuiltinElementInstances, ElementName>
-
-  declare type ConvenientShorthands = $ObjMap<
-    BuiltinElementInstances,
-    <V>(V) => StyledShorthandFactory<V>
-  >
-
-  declare interface Styled {
-    <StyleProps, Theme, ElementName: $Keys<BuiltinElementInstances>>(ElementName): StyledFactory<StyleProps, Theme, BuiltinElementType<ElementName>>;
-    <Comp: React$ComponentType<any>, Theme, OwnProps = React$ElementConfig<Comp>>(Comp): StyledFactory<{|...$Exact<OwnProps>|}, Theme, Comp>;
-  }
-
-  declare export default Styled & ConvenientShorthands
-}
-
-
-declare module 'styled-components/native' {
-  import type {
-    CSSRules,
-    CSSConstructor,
-    KeyFramesConstructor,
-    CreateGlobalStyleConstructor,
-    StyledComponent,
-    Interpolation,
-
-    // "private" types
-    TaggedTemplateLiteral,
-    StyledFactory,
-    StyledShorthandFactory,
-    ThemeProps,
-    PropsWithTheme,
-  } from 'styled-components';
-
-  declare type BuiltinElementInstances = {
-    ActivityIndicator:             React$ComponentType<{...}>,
-    ActivityIndicatorIOS:          React$ComponentType<{...}>,
-    ART:                           React$ComponentType<{...}>,
-    Button:                        React$ComponentType<{...}>,
-    DatePickerIOS:                 React$ComponentType<{...}>,
-    DrawerLayoutAndroid:           React$ComponentType<{...}>,
-    Image:                         React$ComponentType<{...}>,
-    ImageBackground:               React$ComponentType<{...}>,
-    ImageEditor:                   React$ComponentType<{...}>,
-    ImageStore:                    React$ComponentType<{...}>,
-    KeyboardAvoidingView:          React$ComponentType<{...}>,
-    ListView:                      React$ComponentType<{...}>,
-    MapView:                       React$ComponentType<{...}>,
-    Modal:                         React$ComponentType<{...}>,
-    NavigatorIOS:                  React$ComponentType<{...}>,
-    Picker:                        React$ComponentType<{...}>,
-    PickerIOS:                     React$ComponentType<{...}>,
-    ProgressBarAndroid:            React$ComponentType<{...}>,
-    ProgressViewIOS:               React$ComponentType<{...}>,
-    ScrollView:                    React$ComponentType<{...}>,
-    SegmentedControlIOS:           React$ComponentType<{...}>,
-    Slider:                        React$ComponentType<{...}>,
-    SliderIOS:                     React$ComponentType<{...}>,
-    SnapshotViewIOS:               React$ComponentType<{...}>,
-    Switch:                        React$ComponentType<{...}>,
-    RecyclerViewBackedScrollView:  React$ComponentType<{...}>,
-    RefreshControl:                React$ComponentType<{...}>,
-    SafeAreaView:                  React$ComponentType<{...}>,
-    StatusBar:                     React$ComponentType<{...}>,
-    SwipeableListView:             React$ComponentType<{...}>,
-    SwitchAndroid:                 React$ComponentType<{...}>,
-    SwitchIOS:                     React$ComponentType<{...}>,
-    TabBarIOS:                     React$ComponentType<{...}>,
-    Text:                          React$ComponentType<{...}>,
-    TextInput:                     React$ComponentType<{...}>,
-    ToastAndroid:                  React$ComponentType<{...}>,
-    ToolbarAndroid:                React$ComponentType<{...}>,
-    Touchable:                     React$ComponentType<{...}>,
-    TouchableHighlight:            React$ComponentType<{...}>,
-    TouchableNativeFeedback:       React$ComponentType<{...}>,
-    TouchableOpacity:              React$ComponentType<{...}>,
-    TouchableWithoutFeedback:      React$ComponentType<{...}>,
-    View:                          React$ComponentType<{...}>,
-    ViewPagerAndroid:              React$ComponentType<{...}>,
-    WebView:                       React$ComponentType<{...}>,
-    FlatList:                      React$ComponentType<{...}>,
-    SectionList:                   React$ComponentType<{...}>,
-    VirtualizedList:               React$ComponentType<{...}>,
-    ...
-  }
-
-  declare type BuiltinElementType<ElementName: string> = $ElementType<BuiltinElementInstances, ElementName>
-
-  declare type ConvenientShorthands = $ObjMap<
-    BuiltinElementInstances,
-    <V>(V) => StyledShorthandFactory<V>
-  >
-
-  declare interface Styled {
-    <StyleProps, Theme, ElementName: $Keys<BuiltinElementInstances>>(ElementName): StyledFactory<StyleProps, Theme, BuiltinElementType<ElementName>>;
-    <Comp: React$ComponentType<any>, Theme, OwnProps = React$ElementConfig<Comp>>(Comp): StyledFactory<{|...$Exact<OwnProps>|}, Theme, Comp>;
-  }
-
-  declare export default Styled & ConvenientShorthands
-}
diff --git a/packages/insomnia-components/flow-typed/react-dom.js b/packages/insomnia-components/flow-typed/react-dom.js
deleted file mode 100644
index 9ae2e40593..0000000000
--- a/packages/insomnia-components/flow-typed/react-dom.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// @flow
-import * as React from 'react';
-
-declare module 'react-dom' {
-  declare module.exports: {
-    findDOMNode: React.Node => HTMLElement,
-    render: (React.Node, HTMLElement) => void,
-    createPortal: (React.Node, HTMLElement) => React.Node,
-  };
-}
diff --git a/packages/insomnia-components/flow-typed/react-switch.js b/packages/insomnia-components/flow-typed/react-switch.js
deleted file mode 100644
index 07db2cbd26..0000000000
--- a/packages/insomnia-components/flow-typed/react-switch.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// @flow
-
-import * as React from 'react';
-
-declare module 'react-switch' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-components/flow-typed/react-use.js b/packages/insomnia-components/flow-typed/react-use.js
deleted file mode 100644
index 1190c691cb..0000000000
--- a/packages/insomnia-components/flow-typed/react-use.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// @flow
-
-import * as React from 'react';
-
-declare module 'react-use' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-components/index.js b/packages/insomnia-components/index.js
deleted file mode 100644
index b8dd61abb9..0000000000
--- a/packages/insomnia-components/index.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import _Breadcrumb from './components/breadcrumb';
-import _Card from './components/card';
-import _CardContainer from './components/card-container';
-import _Dropdown from './components/dropdown/dropdown';
-import _DropdownDivider from './components/dropdown/dropdown-divider';
-import _DropdownItem from './components/dropdown/dropdown-item';
-import _Header from './components/header';
-import _ListGroup from './components/list-group/list-group';
-import _ListGroupItem from './components/list-group/list-group-item';
-import _UnitTestItem from './components/list-group/unit-test-item';
-import _UnitTestResultItem from './components/list-group/unit-test-result-item';
-import _MultiSwitch from './components/multi-switch';
-import _NoticeTable from './components/notice-table';
-import _SvgIcon from './components/svg-icon';
-import _Sidebar from './components/sidebar/';
-import _RadioButtonGroup from './components/radio-button-group';
-import _Switch from './components/switch';
-import _ToggleSwitch from './components/toggle-switch';
-import * as table from './components/table';
-import _Tooltip from './components/tooltip';
-
-export { Button, AsyncButton, CircleButton } from './components/button';
-
-export const Breadcrumb = _Breadcrumb;
-export const Card = _Card;
-export const CardContainer = _CardContainer;
-export const Dropdown = _Dropdown;
-export const DropdownDivider = _DropdownDivider;
-export const DropdownItem = _DropdownItem;
-export const Header = _Header;
-export const ListGroup = _ListGroup;
-export const ListGroupItem = _ListGroupItem;
-export const UnitTestItem = _UnitTestItem;
-export const UnitTestResultItem = _UnitTestResultItem;
-export const MultiSwitch = _MultiSwitch;
-export const NoticeTable = _NoticeTable;
-export const RadioButtonGroup = _RadioButtonGroup;
-export const SvgIcon = _SvgIcon;
-export const Switch = _Switch;
-export const Sidebar = _Sidebar;
-export const Table = table.Table;
-export const TableBody = table.TableBody;
-export const TableData = table.TableData;
-export const TableHead = table.TableHead;
-export const TableHeader = table.TableHeader;
-export const TableRow = table.TableRow;
-export const ToggleSwitch = _ToggleSwitch;
-export const Tooltip = _Tooltip;
diff --git a/packages/insomnia-components/jest.config.js b/packages/insomnia-components/jest.config.js
new file mode 100644
index 0000000000..3401447404
--- /dev/null
+++ b/packages/insomnia-components/jest.config.js
@@ -0,0 +1,21 @@
+/** @type { import('@jest/types').Config.InitialOptions } */
+module.exports = {
+  globals: {
+    'ts-jest': {
+      isolatedModules: true,
+    },
+  },
+  testEnvironment: 'jsdom',
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+  setupFilesAfterEnv: ['./src/jest/setup-after-env.ts'],
+  verbose: false,
+  resetMocks: true,
+  resetModules: true,
+  testRegex: ['.+\\.test\\.tsx?$'],
+  collectCoverage: false,
+  collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  coverageReporters: ['text-summary', 'lcov'],
+};
diff --git a/packages/insomnia-components/package-lock.json b/packages/insomnia-components/package-lock.json
index bda1c42f8e..c4fc599587 100644
--- a/packages/insomnia-components/package-lock.json
+++ b/packages/insomnia-components/package-lock.json
@@ -14,15 +14,10 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
-      "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "semver": "^5.5.0"
-      }
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz",
+      "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==",
+      "dev": true
     },
     "@babel/core": {
       "version": "7.7.7",
@@ -59,159 +54,78 @@
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-      "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz",
+      "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.12.13"
       },
       "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.12.11",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+          "dev": true
+        },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.13.17",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.17.tgz",
+          "integrity": "sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.12.11",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
         }
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
-      "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz",
+      "integrity": "sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-explode-assignable-expression": "^7.12.13",
+        "@babel/types": "^7.12.13"
       },
       "dependencies": {
-        "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
           "dev": true
-        }
-      }
-    },
-    "@babel/helper-builder-react-jsx": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz",
-      "integrity": "sha512-5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      },
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-          "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helper-builder-react-jsx-experimental": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.5.tgz",
-      "integrity": "sha512-Buewnx6M4ttG+NLkKyt7baQn7ScC/Td+e99G914fRU8fGIUivDDgVIQeDHFa5e4CRSJQt58WpNHhsAZgtzVhsg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-module-imports": "^7.10.4",
-        "@babel/types": "^7.10.5"
-      },
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-          "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-module-imports": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-          "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
         }
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
-      "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
+      "version": "7.13.16",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz",
+      "integrity": "sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.10.4",
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
+        "@babel/compat-data": "^7.13.15",
+        "@babel/helper-validator-option": "^7.12.17",
+        "browserslist": "^4.14.5",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
     "@babel/helper-create-class-features-plugin": {
@@ -373,254 +287,200 @@
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
-      "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
+      "version": "7.12.17",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz",
+      "integrity": "sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-regex": "^7.10.4",
-        "regexpu-core": "^4.7.0"
-      },
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-          "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
-        }
+        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "regexpu-core": "^4.7.1"
       }
     },
-    "@babel/helper-define-map": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz",
-      "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==",
+    "@babel/helper-define-polyfill-provider": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz",
+      "integrity": "sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/types": "^7.10.5",
-        "lodash": "^4.17.19"
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
           "dev": true,
           "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.10.4",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz",
-          "integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz",
-      "integrity": "sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==",
-      "dev": true,
-      "requires": {
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
+            "@babel/highlight": "^7.12.13"
           }
         },
         "@babel/generator": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz",
-          "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.0.tgz",
+          "integrity": "sha512-C6u00HbmsrNPug6A+CiNl8rEys7TsdcXwg12BHi2ca5rUfAs3+UwZsuDQSXnc+wCElCXMB8gMaJ3YXDdh8fAlg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.0",
+            "@babel/types": "^7.14.0",
             "jsesc": "^2.5.1",
             "source-map": "^0.5.0"
           }
         },
         "@babel/helper-function-name": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
           "dev": true,
           "requires": {
-            "@babel/helper-get-function-arity": "^7.10.4",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.4"
+            "@babel/types": "^7.12.13"
           }
         },
+        "@babel/helper-module-imports": {
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
+          "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.13.12"
+          }
+        },
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        },
         "@babel/helper-split-export-declaration": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.0"
+            "@babel/types": "^7.12.13"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
         "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           }
         },
         "@babel/parser": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz",
-          "integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
           "dev": true
         },
         "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/traverse": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-          "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
+          "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.11.0",
-            "@babel/helper-function-name": "^7.10.4",
-            "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/parser": "^7.11.0",
-            "@babel/types": "^7.11.0",
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.14.0",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-split-export-declaration": "^7.12.13",
+            "@babel/parser": "^7.14.0",
+            "@babel/types": "^7.14.0",
             "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
+            "globals": "^11.1.0"
           }
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
         },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+        "resolve": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+          "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.2.0",
+            "path-parse": "^1.0.6"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
     },
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz",
+      "integrity": "sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.13.0"
+      },
+      "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/types": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
     "@babel/helper-function-name": {
       "version": "7.7.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz",
@@ -642,58 +502,150 @@
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
-      "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
+      "version": "7.13.16",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz",
+      "integrity": "sha512-1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/traverse": "^7.13.15",
+        "@babel/types": "^7.13.16"
       },
       "dependencies": {
-        "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+        "@babel/code-frame": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
+            "@babel/highlight": "^7.12.13"
           }
         },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+        "@babel/generator": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.0.tgz",
+          "integrity": "sha512-C6u00HbmsrNPug6A+CiNl8rEys7TsdcXwg12BHi2ca5rUfAs3+UwZsuDQSXnc+wCElCXMB8gMaJ3YXDdh8fAlg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.14.0",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
           "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
+          "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.14.0",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-split-export-declaration": "^7.12.13",
+            "@babel/parser": "^7.14.0",
+            "@babel/types": "^7.14.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "to-fast-properties": "^2.0.0"
+          }
         }
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-      "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz",
+      "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.11.0"
+        "@babel/types": "^7.13.12"
       },
       "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
         }
       }
     },
@@ -707,119 +659,165 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-      "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz",
+      "integrity": "sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4",
-        "@babel/helper-simple-access": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.11.0",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.11.0",
-        "lodash": "^4.17.19"
+        "@babel/helper-module-imports": "^7.13.12",
+        "@babel/helper-replace-supers": "^7.13.12",
+        "@babel/helper-simple-access": "^7.13.12",
+        "@babel/helper-split-export-declaration": "^7.12.13",
+        "@babel/helper-validator-identifier": "^7.14.0",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.14.0",
+        "@babel/types": "^7.14.0"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
           "dev": true,
           "requires": {
-            "@babel/highlight": "^7.10.4"
+            "@babel/highlight": "^7.12.13"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.0.tgz",
+          "integrity": "sha512-C6u00HbmsrNPug6A+CiNl8rEys7TsdcXwg12BHi2ca5rUfAs3+UwZsuDQSXnc+wCElCXMB8gMaJ3YXDdh8fAlg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.14.0",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/helper-module-imports": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-          "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
+          "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.4"
+            "@babel/types": "^7.13.12"
           }
         },
         "@babel/helper-split-export-declaration": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.0"
+            "@babel/types": "^7.12.13"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
         "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           }
         },
         "@babel/parser": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz",
-          "integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
           "dev": true
         },
         "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
+          "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.14.0",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-split-export-declaration": "^7.12.13",
+            "@babel/parser": "^7.14.0",
+            "@babel/types": "^7.14.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
           }
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
         }
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
-      "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
+      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.12.13"
       },
       "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
         }
       }
     },
@@ -829,374 +827,209 @@
       "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
       "dev": true
     },
-    "@babel/helper-regex": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
-      "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.19"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
-        }
-      }
-    },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz",
-      "integrity": "sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz",
+      "integrity": "sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-wrap-function": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "@babel/helper-wrap-function": "^7.13.0",
+        "@babel/types": "^7.13.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz",
-          "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.11.0",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-          "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.10.4",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.11.0"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz",
-          "integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==",
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
           "dev": true
         },
-        "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-          "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.11.0",
-            "@babel/helper-function-name": "^7.10.4",
-            "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/parser": "^7.11.0",
-            "@babel/types": "^7.11.0",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
         }
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-      "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz",
+      "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.10.4",
-        "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-member-expression-to-functions": "^7.13.12",
+        "@babel/helper-optimise-call-expression": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.12"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
           "dev": true,
           "requires": {
-            "@babel/highlight": "^7.10.4"
+            "@babel/highlight": "^7.12.13"
           }
         },
         "@babel/generator": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz",
-          "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.0.tgz",
+          "integrity": "sha512-C6u00HbmsrNPug6A+CiNl8rEys7TsdcXwg12BHi2ca5rUfAs3+UwZsuDQSXnc+wCElCXMB8gMaJ3YXDdh8fAlg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.0",
+            "@babel/types": "^7.14.0",
             "jsesc": "^2.5.1",
             "source-map": "^0.5.0"
           }
         },
         "@babel/helper-function-name": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
           "dev": true,
           "requires": {
-            "@babel/helper-get-function-arity": "^7.10.4",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.4"
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/helper-split-export-declaration": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.0"
+            "@babel/types": "^7.12.13"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
         "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           }
         },
         "@babel/parser": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz",
-          "integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
           "dev": true
         },
         "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/traverse": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-          "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
+          "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.11.0",
-            "@babel/helper-function-name": "^7.10.4",
-            "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/parser": "^7.11.0",
-            "@babel/types": "^7.11.0",
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.14.0",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-split-export-declaration": "^7.12.13",
+            "@babel/parser": "^7.14.0",
+            "@babel/types": "^7.14.0",
             "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
+            "globals": "^11.1.0"
           }
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
         }
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-      "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz",
+      "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.13.12"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz",
-          "integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==",
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
           "dev": true
         },
-        "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
         }
       }
     },
     "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
-      "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz",
+      "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.11.0"
+        "@babel/types": "^7.12.1"
       },
       "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
         }
       }
     },
@@ -1215,128 +1048,132 @@
       "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
       "dev": true
     },
+    "@babel/helper-validator-option": {
+      "version": "7.12.17",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
+      "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
+      "dev": true
+    },
     "@babel/helper-wrap-function": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
-      "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz",
+      "integrity": "sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-function-name": "^7.12.13",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.0"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
           "dev": true,
           "requires": {
-            "@babel/highlight": "^7.10.4"
+            "@babel/highlight": "^7.12.13"
           }
         },
         "@babel/generator": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz",
-          "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.0.tgz",
+          "integrity": "sha512-C6u00HbmsrNPug6A+CiNl8rEys7TsdcXwg12BHi2ca5rUfAs3+UwZsuDQSXnc+wCElCXMB8gMaJ3YXDdh8fAlg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.0",
+            "@babel/types": "^7.14.0",
             "jsesc": "^2.5.1",
             "source-map": "^0.5.0"
           }
         },
         "@babel/helper-function-name": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
           "dev": true,
           "requires": {
-            "@babel/helper-get-function-arity": "^7.10.4",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.4"
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/helper-split-export-declaration": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.0"
+            "@babel/types": "^7.12.13"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
         "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           }
         },
         "@babel/parser": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz",
-          "integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
           "dev": true
         },
         "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/traverse": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-          "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
+          "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.11.0",
-            "@babel/helper-function-name": "^7.10.4",
-            "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/parser": "^7.11.0",
-            "@babel/types": "^7.11.0",
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.14.0",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-split-export-declaration": "^7.12.13",
+            "@babel/parser": "^7.14.0",
+            "@babel/types": "^7.14.0",
             "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
+            "globals": "^11.1.0"
           }
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
         }
       }
     },
@@ -1368,136 +1205,183 @@
       "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==",
       "dev": true
     },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
-      "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz",
+      "integrity": "sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.10.4",
-        "@babel/plugin-syntax-async-generators": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
+        "@babel/plugin-proposal-optional-chaining": "^7.13.12"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        },
+        "@babel/plugin-proposal-optional-chaining": {
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz",
+          "integrity": "sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.13.0",
+            "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
+            "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+          }
+        }
+      }
+    },
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.13.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz",
+      "integrity": "sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-remap-async-to-generator": "^7.13.0",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "dependencies": {
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-proposal-class-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz",
-      "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz",
+      "integrity": "sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-create-class-features-plugin": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.13.0"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
           "dev": true,
           "requires": {
-            "@babel/highlight": "^7.10.4"
+            "@babel/highlight": "^7.12.13"
           }
         },
         "@babel/helper-create-class-features-plugin": {
-          "version": "7.10.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz",
-          "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.0.tgz",
+          "integrity": "sha512-6pXDPguA5zC40Y8oI5mqr+jEUpjMJonKvknvA+vD8CYDz5uuXEwWBK8sRAsE/t3gfb1k15AQb9RhwpscC4nUJQ==",
           "dev": true,
           "requires": {
-            "@babel/helper-function-name": "^7.10.4",
-            "@babel/helper-member-expression-to-functions": "^7.10.5",
-            "@babel/helper-optimise-call-expression": "^7.10.4",
-            "@babel/helper-plugin-utils": "^7.10.4",
-            "@babel/helper-replace-supers": "^7.10.4",
-            "@babel/helper-split-export-declaration": "^7.10.4"
+            "@babel/helper-annotate-as-pure": "^7.12.13",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-member-expression-to-functions": "^7.13.12",
+            "@babel/helper-optimise-call-expression": "^7.12.13",
+            "@babel/helper-replace-supers": "^7.13.12",
+            "@babel/helper-split-export-declaration": "^7.12.13"
           }
         },
         "@babel/helper-function-name": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
           "dev": true,
           "requires": {
-            "@babel/helper-get-function-arity": "^7.10.4",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.4"
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         },
         "@babel/helper-split-export-declaration": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.0"
+            "@babel/types": "^7.12.13"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
         "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           }
         },
         "@babel/parser": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz",
-          "integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
           "dev": true
         },
         "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+        }
+      }
+    },
+    "@babel/plugin-proposal-class-static-block": {
+      "version": "7.13.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz",
+      "integrity": "sha512-fJTdFI4bfnMjvxJyNuaf8i9mVcZ0UhetaGEUHaHV9KEnibLugJkZAtXikR8KcYj+NYmI4DZMS8yQAyg+hvfSqg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-class-static-block": "^7.12.13"
+      },
+      "dependencies": {
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
@@ -1522,146 +1406,166 @@
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
-      "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
+      "version": "7.13.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz",
+      "integrity": "sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/plugin-proposal-export-default-from": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.13.tgz",
+      "integrity": "sha512-idIsBT+DGXdOHL82U+8bwX4goHm/z10g8sGGrQroh+HCRcm7mDv/luaGdWJQMTuCX2FsdXS7X0Nyyzp4znAPJA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13",
+        "@babel/plugin-syntax-export-default-from": "^7.12.13"
+      },
+      "dependencies": {
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz",
-      "integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz",
+      "integrity": "sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.12.13",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
-      "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
+      "version": "7.13.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz",
+      "integrity": "sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz",
-      "integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==",
+      "version": "7.13.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz",
+      "integrity": "sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.13.0",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
-      "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
+      "version": "7.13.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz",
+      "integrity": "sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz",
+      "integrity": "sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.12.13",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
-      "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
+      "version": "7.13.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz",
+      "integrity": "sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.10.4"
+        "@babel/compat-data": "^7.13.8",
+        "@babel/helper-compilation-targets": "^7.13.8",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.13.0"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
-      "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
+      "version": "7.13.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz",
+      "integrity": "sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
@@ -1712,134 +1616,249 @@
       }
     },
     "@babel/plugin-proposal-private-methods": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz",
-      "integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz",
+      "integrity": "sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-create-class-features-plugin": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.13.0"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
           "dev": true,
           "requires": {
-            "@babel/highlight": "^7.10.4"
+            "@babel/highlight": "^7.12.13"
           }
         },
         "@babel/helper-create-class-features-plugin": {
-          "version": "7.10.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz",
-          "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.0.tgz",
+          "integrity": "sha512-6pXDPguA5zC40Y8oI5mqr+jEUpjMJonKvknvA+vD8CYDz5uuXEwWBK8sRAsE/t3gfb1k15AQb9RhwpscC4nUJQ==",
           "dev": true,
           "requires": {
-            "@babel/helper-function-name": "^7.10.4",
-            "@babel/helper-member-expression-to-functions": "^7.10.5",
-            "@babel/helper-optimise-call-expression": "^7.10.4",
-            "@babel/helper-plugin-utils": "^7.10.4",
-            "@babel/helper-replace-supers": "^7.10.4",
-            "@babel/helper-split-export-declaration": "^7.10.4"
+            "@babel/helper-annotate-as-pure": "^7.12.13",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-member-expression-to-functions": "^7.13.12",
+            "@babel/helper-optimise-call-expression": "^7.12.13",
+            "@babel/helper-replace-supers": "^7.13.12",
+            "@babel/helper-split-export-declaration": "^7.12.13"
           }
         },
         "@babel/helper-function-name": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
           "dev": true,
           "requires": {
-            "@babel/helper-get-function-arity": "^7.10.4",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.4"
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         },
         "@babel/helper-split-export-declaration": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.0"
+            "@babel/types": "^7.12.13"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
         "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           }
         },
         "@babel/parser": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz",
-          "integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
           "dev": true
         },
         "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
+        }
+      }
+    },
+    "@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz",
+      "integrity": "sha512-59ANdmEwwRUkLjB7CRtwJxxwtjESw+X2IePItA+RGQh+oy5RmpCh/EvVVvh5XQc3yxsm5gtv0+i9oBZhaDNVTg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "@babel/helper-create-class-features-plugin": "^7.14.0",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.0"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.12.13"
+          }
         },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+        "@babel/helper-create-class-features-plugin": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.0.tgz",
+          "integrity": "sha512-6pXDPguA5zC40Y8oI5mqr+jEUpjMJonKvknvA+vD8CYDz5uuXEwWBK8sRAsE/t3gfb1k15AQb9RhwpscC4nUJQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-annotate-as-pure": "^7.12.13",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-member-expression-to-functions": "^7.13.12",
+            "@babel/helper-optimise-call-expression": "^7.12.13",
+            "@babel/helper-replace-supers": "^7.13.12",
+            "@babel/helper-split-export-declaration": "^7.12.13"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/types": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "to-fast-properties": "^2.0.0"
+          }
         }
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
-      "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz",
+      "integrity": "sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
@@ -1895,6 +1914,23 @@
         }
       }
     },
+    "@babel/plugin-syntax-class-static-block": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz",
+      "integrity": "sha512-ZmKQ0ZXR0nYpHZIIuj9zE7oIqCx2hw9TKi+lIo73NNrMPAZGHfS92/VRV0ZmPj6H2ffBgyFHXvJ5NYsNeEaP2A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "dependencies": {
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        }
+      }
+    },
     "@babel/plugin-syntax-decorators": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz",
@@ -1922,9 +1958,26 @@
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/plugin-syntax-export-default-from": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.13.tgz",
+      "integrity": "sha512-gVry0zqoums0hA+EniCYK3gABhjYSLX1dVuwYpPw9DrLNA4/GovXySHVg4FGRsZht09ON/5C2NVx3keq+qqVGQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "dependencies": {
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
@@ -1939,26 +1992,26 @@
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-syntax-flow": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz",
-      "integrity": "sha512-yxQsX1dJixF4qEEdzVbst3SZQ58Nrooz8NV9Z9GL4byTE25BvJgl5lf0RECUf0fh28rZBb/RYTWn/eeKwCMrZQ==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz",
+      "integrity": "sha512-J/RYxnlSLXZLVR7wTRsozxKT8qbsx1mNKJzXEEjQ0Kjx1ZACcyHgbanNWNCFtc36IzuWhYWPpvJFFoexoOWFmA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
@@ -1998,18 +2051,18 @@
       }
     },
     "@babel/plugin-syntax-jsx": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz",
-      "integrity": "sha512-KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz",
+      "integrity": "sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
@@ -2116,6 +2169,23 @@
         }
       }
     },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz",
+      "integrity": "sha512-bda3xF8wGl5/5btF794utNOL0Jw+9jE5C1sLZcoK7c4uonE/y3iQiyG+KbkF3WBV/paX58VCpjhxLPkdj5Fe4w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.13.0"
+      },
+      "dependencies": {
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        }
+      }
+    },
     "@babel/plugin-syntax-top-level-await": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
@@ -2133,823 +2203,761 @@
         }
       }
     },
-    "@babel/plugin-transform-arrow-functions": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
-      "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
+    "@babel/plugin-syntax-typescript": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz",
+      "integrity": "sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz",
+      "integrity": "sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.13.0"
+      },
+      "dependencies": {
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
-      "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz",
+      "integrity": "sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.10.4"
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-remap-async-to-generator": "^7.13.0"
       },
       "dependencies": {
         "@babel/helper-module-imports": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-          "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
+          "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.4"
+            "@babel/types": "^7.13.12"
           }
         },
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
         }
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
-      "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz",
+      "integrity": "sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.5.tgz",
-      "integrity": "sha512-6Ycw3hjpQti0qssQcA6AMSFDHeNJ++R6dIMnpRqUjFeBBTmTDPa8zgF90OVfTvAo11mXZTlVUViY1g8ffrURLg==",
+      "version": "7.13.16",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.13.16.tgz",
+      "integrity": "sha512-ad3PHUxGnfWF4Efd3qFuznEtZKoBp0spS+DgqzVzRPV7urEBvPLue3y2j80w4Jf2YLzZHj8TOv/Lmvdmh3b2xg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.13.0"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
-      "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz",
+      "integrity": "sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-define-map": "^7.10.4",
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.10.4",
+        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "@babel/helper-function-name": "^7.12.13",
+        "@babel/helper-optimise-call-expression": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-replace-supers": "^7.13.0",
+        "@babel/helper-split-export-declaration": "^7.12.13",
         "globals": "^11.1.0"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
           "dev": true,
           "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-          "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
+            "@babel/highlight": "^7.12.13"
           }
         },
         "@babel/helper-function-name": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
           "dev": true,
           "requires": {
-            "@babel/helper-get-function-arity": "^7.10.4",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.4"
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         },
         "@babel/helper-split-export-declaration": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.0"
+            "@babel/types": "^7.12.13"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
         "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           }
         },
         "@babel/parser": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz",
-          "integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
           "dev": true
         },
         "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
         }
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
-      "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz",
+      "integrity": "sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.13.0"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
-      "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
+      "version": "7.13.17",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz",
+      "integrity": "sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.13.0"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
-      "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz",
+      "integrity": "sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
-      "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz",
+      "integrity": "sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
-      "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz",
+      "integrity": "sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-flow-strip-types": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.10.4.tgz",
-      "integrity": "sha512-XTadyuqNst88UWBTdLjM+wEY7BFnY2sYtPyAidfC7M/QaZnSuIZpMvLxqGT7phAcnGyWh/XQFLKcGf04CnvxSQ==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.13.0.tgz",
+      "integrity": "sha512-EXAGFMJgSX8gxWD7PZtW/P6M+z74jpx3wm/+9pn+c2dOawPpBkUX7BrfyPvo6ZpXbgRIEuwgwDb/MGlKvu2pOg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-flow": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-flow": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
-      "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz",
+      "integrity": "sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.13.0"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
-      "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz",
+      "integrity": "sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-function-name": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
           "dev": true,
           "requires": {
-            "@babel/highlight": "^7.10.4"
+            "@babel/highlight": "^7.12.13"
           }
         },
         "@babel/helper-function-name": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
           "dev": true,
           "requires": {
-            "@babel/helper-get-function-arity": "^7.10.4",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.4"
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
           "dev": true
         },
         "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           }
         },
         "@babel/parser": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz",
-          "integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
           "dev": true
         },
         "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
           }
         },
         "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-          "dev": true
         }
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
-      "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz",
+      "integrity": "sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
-      "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz",
+      "integrity": "sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
-      "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.0.tgz",
+      "integrity": "sha512-CF4c5LX4LQ03LebQxJ5JZes2OYjzBuk1TdiF7cG7d5dK4lAdw9NZmaxq5K/mouUdNeqwz3TNjnW6v01UqUNgpQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.14.0",
+        "@babel/helper-plugin-utils": "^7.13.0",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
-      "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz",
+      "integrity": "sha512-EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-simple-access": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.14.0",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-simple-access": "^7.13.12",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
-      "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
+      "version": "7.13.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz",
+      "integrity": "sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.10.4",
-        "@babel/helper-module-transforms": "^7.10.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-hoist-variables": "^7.13.0",
+        "@babel/helper-module-transforms": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-validator-identifier": "^7.12.11",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
-      "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz",
+      "integrity": "sha512-nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-module-transforms": "^7.14.0",
+        "@babel/helper-plugin-utils": "^7.13.0"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
-      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz",
+      "integrity": "sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.12.13"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
-      "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz",
+      "integrity": "sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
-      "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz",
+      "integrity": "sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13",
+        "@babel/helper-replace-supers": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
-      "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz",
+      "integrity": "sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.13.0"
       },
       "dependencies": {
-        "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
-      "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz",
+      "integrity": "sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-react-constant-elements": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.10.4.tgz",
-      "integrity": "sha512-cYmQBW1pXrqBte1raMkAulXmi7rjg3VI6ZLg9QIic8Hq7BtYXaWuZSxsr2siOMI6SWwpxjWfnwhTUrd7JlAV7g==",
+      "version": "7.13.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.13.13.tgz",
+      "integrity": "sha512-SNJU53VM/SjQL0bZhyU+f4kJQz7bQQajnrZRSaU21hruG/NWY41AEM9AWXeXX90pYr/C2yAmTgI6yW3LlLrAUQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.13.0"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-react-display-name": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz",
-      "integrity": "sha512-Zd4X54Mu9SBfPGnEcaGcOrVAYOtjT2on8QZkLKEq1S/tHexG39d9XXGZv19VfRrDjPJzFmPfTAqOQS1pfFOujw==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz",
+      "integrity": "sha512-MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-react-jsx": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz",
-      "integrity": "sha512-L+MfRhWjX0eI7Js093MM6MacKU4M6dnCRa/QPDwYMxjljzSCzzlzKzj9Pk4P3OtrPcxr2N3znR419nr3Xw+65A==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz",
+      "integrity": "sha512-jcEI2UqIcpCqB5U5DRxIl0tQEProI2gcu+g8VTIqxLO5Iidojb4d77q+fwGseCvd8af/lJ9masp4QWzBXFE2xA==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-react-jsx": "^7.10.4",
-        "@babel/helper-builder-react-jsx-experimental": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-jsx": "^7.10.4"
+        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "@babel/helper-module-imports": "^7.13.12",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-jsx": "^7.12.13",
+        "@babel/types": "^7.13.12"
       },
       "dependencies": {
+        "@babel/helper-module-imports": {
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
+          "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.13.12"
+          }
+        },
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/types": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "to-fast-properties": "^2.0.0"
+          }
         }
       }
     },
     "@babel/plugin-transform-react-jsx-development": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.10.4.tgz",
-      "integrity": "sha512-RM3ZAd1sU1iQ7rI2dhrZRZGv0aqzNQMbkIUCS1txYpi9wHQ2ZHNjo5TwX+UD6pvFW4AbWqLVYvKy5qJSAyRGjQ==",
+      "version": "7.12.17",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz",
+      "integrity": "sha512-BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-react-jsx-experimental": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-jsx": "^7.10.4"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/plugin-transform-react-jsx-self": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz",
-      "integrity": "sha512-yOvxY2pDiVJi0axdTWHSMi5T0DILN+H+SaeJeACHKjQLezEzhLx9nEF9xgpBLPtkZsks9cnb5P9iBEi21En3gg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-jsx": "^7.10.4"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/plugin-transform-react-jsx-source": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz",
-      "integrity": "sha512-wTeqHVkN1lfPLubRiZH3o73f4rfon42HpgxUSs86Nc+8QIcm/B9s8NNVXu/gwGcOyd7yDib9ikxoDLxJP0UiDA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-jsx": "^7.10.4"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-          "dev": true
-        }
+        "@babel/plugin-transform-react-jsx": "^7.12.17"
       }
     },
     "@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz",
-      "integrity": "sha512-+njZkqcOuS8RaPakrnR9KvxjoG1ASJWpoIv/doyWngId88JoFlPlISenGXjrVacZUIALGUr6eodRs1vmPnF23A==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz",
+      "integrity": "sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.10.4",
         "@babel/helper-plugin-utils": "^7.10.4"
       },
       "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-          "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
-      "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
+      "version": "7.13.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz",
+      "integrity": "sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==",
       "dev": true,
       "requires": {
         "regenerator-transform": "^0.14.2"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
-      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz",
+      "integrity": "sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
@@ -3000,286 +3008,414 @@
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
-      "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz",
+      "integrity": "sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
-      "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz",
+      "integrity": "sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
-      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz",
+      "integrity": "sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-regex": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
-      "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz",
+      "integrity": "sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.13.0"
       },
       "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-          "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
-      "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz",
+      "integrity": "sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
-    "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz",
-      "integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==",
+    "@babel/plugin-transform-typescript": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz",
+      "integrity": "sha512-elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-create-class-features-plugin": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-typescript": "^7.12.13"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.12.13"
+          }
+        },
+        "@babel/helper-create-class-features-plugin": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.0.tgz",
+          "integrity": "sha512-6pXDPguA5zC40Y8oI5mqr+jEUpjMJonKvknvA+vD8CYDz5uuXEwWBK8sRAsE/t3gfb1k15AQb9RhwpscC4nUJQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-annotate-as-pure": "^7.12.13",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-member-expression-to-functions": "^7.13.12",
+            "@babel/helper-optimise-call-expression": "^7.12.13",
+            "@babel/helper-replace-supers": "^7.13.12",
+            "@babel/helper-split-export-declaration": "^7.12.13"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/types": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/plugin-transform-unicode-escapes": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz",
+      "integrity": "sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
-      "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz",
+      "integrity": "sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.12.13"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/preset-env": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz",
-      "integrity": "sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.0.tgz",
+      "integrity": "sha512-GWRCdBv2whxqqaSi7bo/BEXf070G/fWFMEdCnmoRg2CZJy4GK06ovFuEjJrZhDRXYgBsYtxVbG8GUHvw+UWBkQ==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.11.0",
-        "@babel/helper-compilation-targets": "^7.10.4",
-        "@babel/helper-module-imports": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-proposal-async-generator-functions": "^7.10.4",
-        "@babel/plugin-proposal-class-properties": "^7.10.4",
-        "@babel/plugin-proposal-dynamic-import": "^7.10.4",
-        "@babel/plugin-proposal-export-namespace-from": "^7.10.4",
-        "@babel/plugin-proposal-json-strings": "^7.10.4",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.11.0",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
-        "@babel/plugin-proposal-numeric-separator": "^7.10.4",
-        "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.10.4",
-        "@babel/plugin-proposal-optional-chaining": "^7.11.0",
-        "@babel/plugin-proposal-private-methods": "^7.10.4",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.10.4",
-        "@babel/plugin-syntax-async-generators": "^7.8.0",
-        "@babel/plugin-syntax-class-properties": "^7.10.4",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+        "@babel/compat-data": "^7.14.0",
+        "@babel/helper-compilation-targets": "^7.13.16",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-validator-option": "^7.12.17",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12",
+        "@babel/plugin-proposal-async-generator-functions": "^7.13.15",
+        "@babel/plugin-proposal-class-properties": "^7.13.0",
+        "@babel/plugin-proposal-class-static-block": "^7.13.11",
+        "@babel/plugin-proposal-dynamic-import": "^7.13.8",
+        "@babel/plugin-proposal-export-namespace-from": "^7.12.13",
+        "@babel/plugin-proposal-json-strings": "^7.13.8",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.13.8",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
+        "@babel/plugin-proposal-numeric-separator": "^7.12.13",
+        "@babel/plugin-proposal-object-rest-spread": "^7.13.8",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.13.8",
+        "@babel/plugin-proposal-optional-chaining": "^7.13.12",
+        "@babel/plugin-proposal-private-methods": "^7.13.0",
+        "@babel/plugin-proposal-private-property-in-object": "^7.14.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.12.13",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.12.13",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.0",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-        "@babel/plugin-syntax-top-level-await": "^7.10.4",
-        "@babel/plugin-transform-arrow-functions": "^7.10.4",
-        "@babel/plugin-transform-async-to-generator": "^7.10.4",
-        "@babel/plugin-transform-block-scoped-functions": "^7.10.4",
-        "@babel/plugin-transform-block-scoping": "^7.10.4",
-        "@babel/plugin-transform-classes": "^7.10.4",
-        "@babel/plugin-transform-computed-properties": "^7.10.4",
-        "@babel/plugin-transform-destructuring": "^7.10.4",
-        "@babel/plugin-transform-dotall-regex": "^7.10.4",
-        "@babel/plugin-transform-duplicate-keys": "^7.10.4",
-        "@babel/plugin-transform-exponentiation-operator": "^7.10.4",
-        "@babel/plugin-transform-for-of": "^7.10.4",
-        "@babel/plugin-transform-function-name": "^7.10.4",
-        "@babel/plugin-transform-literals": "^7.10.4",
-        "@babel/plugin-transform-member-expression-literals": "^7.10.4",
-        "@babel/plugin-transform-modules-amd": "^7.10.4",
-        "@babel/plugin-transform-modules-commonjs": "^7.10.4",
-        "@babel/plugin-transform-modules-systemjs": "^7.10.4",
-        "@babel/plugin-transform-modules-umd": "^7.10.4",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4",
-        "@babel/plugin-transform-new-target": "^7.10.4",
-        "@babel/plugin-transform-object-super": "^7.10.4",
-        "@babel/plugin-transform-parameters": "^7.10.4",
-        "@babel/plugin-transform-property-literals": "^7.10.4",
-        "@babel/plugin-transform-regenerator": "^7.10.4",
-        "@babel/plugin-transform-reserved-words": "^7.10.4",
-        "@babel/plugin-transform-shorthand-properties": "^7.10.4",
-        "@babel/plugin-transform-spread": "^7.11.0",
-        "@babel/plugin-transform-sticky-regex": "^7.10.4",
-        "@babel/plugin-transform-template-literals": "^7.10.4",
-        "@babel/plugin-transform-typeof-symbol": "^7.10.4",
-        "@babel/plugin-transform-unicode-escapes": "^7.10.4",
-        "@babel/plugin-transform-unicode-regex": "^7.10.4",
-        "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.11.0",
-        "browserslist": "^4.12.0",
-        "core-js-compat": "^3.6.2",
-        "invariant": "^2.2.2",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.0",
+        "@babel/plugin-syntax-top-level-await": "^7.12.13",
+        "@babel/plugin-transform-arrow-functions": "^7.13.0",
+        "@babel/plugin-transform-async-to-generator": "^7.13.0",
+        "@babel/plugin-transform-block-scoped-functions": "^7.12.13",
+        "@babel/plugin-transform-block-scoping": "^7.13.16",
+        "@babel/plugin-transform-classes": "^7.13.0",
+        "@babel/plugin-transform-computed-properties": "^7.13.0",
+        "@babel/plugin-transform-destructuring": "^7.13.17",
+        "@babel/plugin-transform-dotall-regex": "^7.12.13",
+        "@babel/plugin-transform-duplicate-keys": "^7.12.13",
+        "@babel/plugin-transform-exponentiation-operator": "^7.12.13",
+        "@babel/plugin-transform-for-of": "^7.13.0",
+        "@babel/plugin-transform-function-name": "^7.12.13",
+        "@babel/plugin-transform-literals": "^7.12.13",
+        "@babel/plugin-transform-member-expression-literals": "^7.12.13",
+        "@babel/plugin-transform-modules-amd": "^7.14.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.14.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.13.8",
+        "@babel/plugin-transform-modules-umd": "^7.14.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13",
+        "@babel/plugin-transform-new-target": "^7.12.13",
+        "@babel/plugin-transform-object-super": "^7.12.13",
+        "@babel/plugin-transform-parameters": "^7.13.0",
+        "@babel/plugin-transform-property-literals": "^7.12.13",
+        "@babel/plugin-transform-regenerator": "^7.13.15",
+        "@babel/plugin-transform-reserved-words": "^7.12.13",
+        "@babel/plugin-transform-shorthand-properties": "^7.12.13",
+        "@babel/plugin-transform-spread": "^7.13.0",
+        "@babel/plugin-transform-sticky-regex": "^7.12.13",
+        "@babel/plugin-transform-template-literals": "^7.13.0",
+        "@babel/plugin-transform-typeof-symbol": "^7.12.13",
+        "@babel/plugin-transform-unicode-escapes": "^7.12.13",
+        "@babel/plugin-transform-unicode-regex": "^7.12.13",
+        "@babel/preset-modules": "^0.1.4",
+        "@babel/types": "^7.14.0",
+        "babel-plugin-polyfill-corejs2": "^0.2.0",
+        "babel-plugin-polyfill-corejs3": "^0.2.0",
+        "babel-plugin-polyfill-regenerator": "^0.2.0",
+        "core-js-compat": "^3.9.0",
+        "semver": "^6.3.0"
       },
       "dependencies": {
-        "@babel/helper-module-imports": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-          "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         },
-        "@babel/types": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-          "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/plugin-proposal-optional-chaining": {
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz",
+          "integrity": "sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
+            "@babel/helper-plugin-utils": "^7.13.0",
+            "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
+            "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+          }
+        },
+        "@babel/plugin-syntax-class-properties": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+          "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.12.13"
+          }
+        },
+        "@babel/plugin-syntax-top-level-await": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz",
+          "integrity": "sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.12.13"
+          }
+        },
+        "@babel/types": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
             "to-fast-properties": "^2.0.0"
           }
         },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+        "babel-plugin-polyfill-corejs3": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz",
+          "integrity": "sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-define-polyfill-provider": "^0.2.0",
+            "core-js-compat": "^3.9.1"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
     },
     "@babel/preset-flow": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.10.4.tgz",
-      "integrity": "sha512-XI6l1CptQCOBv+ZKYwynyswhtOKwpZZp5n0LG1QKCo8erRhqjoQV6nvx61Eg30JHpysWQSBwA2AWRU3pBbSY5g==",
+      "version": "7.13.13",
+      "resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.13.13.tgz",
+      "integrity": "sha512-MDtwtamMifqq3R2mC7l3A3uFalUb3NH5TIBQWjN/epEPlZktcLq4se3J+ivckKrLMGsR7H9LW8+pYuIUN9tsKg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-transform-flow-strip-types": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-validator-option": "^7.12.17",
+        "@babel/plugin-transform-flow-strip-types": "^7.13.0"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
     "@babel/preset-modules": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
-      "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
+      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -3290,28 +3426,59 @@
       }
     },
     "@babel/preset-react": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.10.4.tgz",
-      "integrity": "sha512-BrHp4TgOIy4M19JAfO1LhycVXOPWdDbTRep7eVyatf174Hff+6Uk53sDyajqZPu8W1qXRBiYOfIamek6jA7YVw==",
+      "version": "7.13.13",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.13.13.tgz",
+      "integrity": "sha512-gx+tDLIE06sRjKJkVtpZ/t3mzCDOnPG+ggHZG9lffUbX8+wC739x20YQc9V35Do6ZAxaUc/HhVHIiOzz5MvDmA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-transform-react-display-name": "^7.10.4",
-        "@babel/plugin-transform-react-jsx": "^7.10.4",
-        "@babel/plugin-transform-react-jsx-development": "^7.10.4",
-        "@babel/plugin-transform-react-jsx-self": "^7.10.4",
-        "@babel/plugin-transform-react-jsx-source": "^7.10.4",
-        "@babel/plugin-transform-react-pure-annotations": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-validator-option": "^7.12.17",
+        "@babel/plugin-transform-react-display-name": "^7.12.13",
+        "@babel/plugin-transform-react-jsx": "^7.13.12",
+        "@babel/plugin-transform-react-jsx-development": "^7.12.17",
+        "@babel/plugin-transform-react-pure-annotations": "^7.12.1"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
           "dev": true
         }
       }
     },
+    "@babel/preset-typescript": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.13.0.tgz",
+      "integrity": "sha512-LXJwxrHy0N3f6gIJlYbLta1D9BDtHpQeqwzM0LIfjDlr6UE/D5Mc7W4iDiQzaE+ks0sTjT26ArcHWnJVt0QiHw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-validator-option": "^7.12.17",
+        "@babel/plugin-transform-typescript": "^7.13.0"
+      },
+      "dependencies": {
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/register": {
+      "version": "7.13.16",
+      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.13.16.tgz",
+      "integrity": "sha512-dh2t11ysujTwByQjXNgJ48QZ2zcXKQVdV8s0TbeMI0flmtGWCdTwK9tJiACHXPLmncm5+ktNn/diojA45JE4jg==",
+      "dev": true,
+      "requires": {
+        "clone-deep": "^4.0.1",
+        "find-cache-dir": "^2.0.0",
+        "make-dir": "^2.1.0",
+        "pirates": "^4.0.0",
+        "source-map-support": "^0.5.16"
+      }
+    },
     "@babel/runtime": {
       "version": "7.7.7",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.7.tgz",
@@ -3322,9 +3489,9 @@
       }
     },
     "@babel/runtime-corejs3": {
-      "version": "7.12.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz",
-      "integrity": "sha512-roGr54CsTmNPPzZoCP1AmDXuBoNao7tnSA83TXTwt+UK5QVyh1DIJnrgYRPWKCF2flqZQXwa7Yr8v7VmLzF0YQ==",
+      "version": "7.13.17",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.13.17.tgz",
+      "integrity": "sha512-RGXINY1YvduBlGrP+vHjJqd/nK7JVpfM4rmZLGMx77WoL3sMrhheA0qxii9VNn1VHnxJLEyxmvCB+Wqc+x/FMw==",
       "dev": true,
       "requires": {
         "core-js-pure": "^3.0.0",
@@ -3340,9 +3507,9 @@
       }
     },
     "@babel/standalone": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.11.0.tgz",
-      "integrity": "sha512-Cf4WggQ4vPsGsVU8DbbWtzI/AEQ/oyYE6XFqGnAAadBT5kro0YfDfJhtcLdtye9C6RkOfV0DxcQ3eoZ1Bv6yrA==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.0.tgz",
+      "integrity": "sha512-PPkwh7AQyP+QBHUavMBNSnAVsW4xFe76CQn3d8kWorwwu9l5R7QDjA9v4GkF6jHhL5fen6so20eqY1KDaJjMEQ==",
       "dev": true
     },
     "@babel/template": {
@@ -3538,11 +3705,15 @@
       "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==",
       "dev": true
     },
-    "@icons/material": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz",
-      "integrity": "sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==",
-      "dev": true
+    "@hypnosphi/create-react-context": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@hypnosphi/create-react-context/-/create-react-context-0.3.1.tgz",
+      "integrity": "sha512-V1klUed202XahrWJLLOT3EXNeCpFHCcJntdFGI15ntCwau+jfT386w7OFTMaCqOgXUH1fa0w/I1oZs+i/Rfr0A==",
+      "dev": true,
+      "requires": {
+        "gud": "^1.0.0",
+        "warning": "^4.0.3"
+      }
     },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
@@ -4253,12 +4424,116 @@
         "glob-to-regexp": "^0.3.0"
       }
     },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
+      "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.4",
+        "run-parallel": "^1.1.9"
+      }
+    },
     "@nodelib/fs.stat": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
+      "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==",
       "dev": true
     },
+    "@nodelib/fs.walk": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
+      "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.4",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@npmcli/move-file": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
+      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "@pmmmwh/react-refresh-webpack-plugin": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz",
+      "integrity": "sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ==",
+      "dev": true,
+      "requires": {
+        "ansi-html": "^0.0.7",
+        "error-stack-parser": "^2.0.6",
+        "html-entities": "^1.2.1",
+        "native-url": "^0.2.6",
+        "schema-utils": "^2.6.5",
+        "source-map": "^0.7.3"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+          "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.5",
+            "ajv": "^6.12.4",
+            "ajv-keywords": "^3.5.2"
+          }
+        },
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
+        }
+      }
+    },
     "@popmotion/easing": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@popmotion/easing/-/easing-1.0.2.tgz",
@@ -4276,6 +4551,12 @@
         "tslib": "^1.10.0"
       }
     },
+    "@popperjs/core": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
+      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==",
+      "dev": true
+    },
     "@reach/router": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/@reach/router/-/router-1.3.4.tgz",
@@ -4307,30 +4588,145 @@
       }
     },
     "@storybook/addon-contexts": {
-      "version": "5.3.19",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-contexts/-/addon-contexts-5.3.19.tgz",
-      "integrity": "sha512-4ibfVIkRy+UJa3B4b8YpE5vjSD6W/q/rnd3QkMaMtE6INyWHEKWbS8cdriFsu5xXryJ9s3DwR6EljjQ/xukPtA==",
+      "version": "5.3.21",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-contexts/-/addon-contexts-5.3.21.tgz",
+      "integrity": "sha512-m5rrNTsGgcKqUcjiQrt2ZQpS4nJZ+/rcRP8mm+kwzZHlJGiQNsnLOK2VLlCPphOz2/gDZ/p4nW0z7nPh1M2Irg==",
       "dev": true,
       "requires": {
-        "@storybook/addons": "5.3.19",
-        "@storybook/api": "5.3.19",
-        "@storybook/components": "5.3.19",
-        "@storybook/core-events": "5.3.19",
+        "@storybook/addons": "5.3.21",
+        "@storybook/api": "5.3.21",
+        "@storybook/components": "5.3.21",
+        "@storybook/core-events": "5.3.21",
         "core-js": "^3.0.1",
         "global": "^4.3.2",
         "qs": "^6.6.0"
+      },
+      "dependencies": {
+        "@storybook/addons": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-5.3.21.tgz",
+          "integrity": "sha512-Ji/21WADTLVbTbiKcZ64BcL0Es+h1Afxx3kNmGJqPSTUYroCwIFCT9mUzCqU6G+YyWaISAmTii5UJkTwMkChwA==",
+          "dev": true,
+          "requires": {
+            "@storybook/api": "5.3.21",
+            "@storybook/channels": "5.3.21",
+            "@storybook/client-logger": "5.3.21",
+            "@storybook/core-events": "5.3.21",
+            "core-js": "^3.0.1",
+            "global": "^4.3.2",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/api": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/api/-/api-5.3.21.tgz",
+          "integrity": "sha512-K1o4an/Rx8daKRDooks6qzN6ZGyqizeacZZbair3F8CsSfTgrr2zCcf9pgKojLQa9koEmMHlcdb2KnS+GwPEgA==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.2.1",
+            "@storybook/channels": "5.3.21",
+            "@storybook/client-logger": "5.3.21",
+            "@storybook/core-events": "5.3.21",
+            "@storybook/csf": "0.0.1",
+            "@storybook/router": "5.3.21",
+            "@storybook/theming": "5.3.21",
+            "@types/reach__router": "^1.2.3",
+            "core-js": "^3.0.1",
+            "fast-deep-equal": "^2.0.1",
+            "global": "^4.3.2",
+            "lodash": "^4.17.15",
+            "memoizerific": "^1.11.3",
+            "prop-types": "^15.6.2",
+            "react": "^16.8.3",
+            "semver": "^6.0.0",
+            "shallow-equal": "^1.1.0",
+            "store2": "^2.7.1",
+            "telejson": "^3.2.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/channels": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-5.3.21.tgz",
+          "integrity": "sha512-OXoFs9XtBVg/cCk6lYMrxkzaNlJRf54ABdorp7YAAj7S9tRL1JxOZHxmjNQwEoiRvssmem2rAWtEAxfuEANsAA==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.0.1"
+          }
+        },
+        "@storybook/client-logger": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-5.3.21.tgz",
+          "integrity": "sha512-OzQkwpZ5SK9cXD9Mv6lxPGPot+hSZvnkEW12kpt1AHfJz4ET26YTDOI3oetPsjfRJo6qYLeQX8+wF7rklfXbzA==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.0.1"
+          }
+        },
+        "@storybook/core-events": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-5.3.21.tgz",
+          "integrity": "sha512-/Zsm1sKAh6pzQv8jQUmuhM7nuM01ZljIRKy8p2HjPNlMjDB5yaRkBfyeAUXUg+qXNI6aHVWa4jGdPEdwwY4oLA==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.0.1"
+          }
+        },
+        "@storybook/router": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/router/-/router-5.3.21.tgz",
+          "integrity": "sha512-c29m5UikK5Q1lyd6FltOGFhIcpd6PIb855YS3OUNe3F6ZA1tfJ+aNKrCBc65d1c+fvCGG76dYYYv0RvwEmKXXg==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.2.1",
+            "@storybook/csf": "0.0.1",
+            "@types/reach__router": "^1.2.3",
+            "core-js": "^3.0.1",
+            "global": "^4.3.2",
+            "lodash": "^4.17.15",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.6.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/theming": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-5.3.21.tgz",
+          "integrity": "sha512-FZbxjizqdO9lV5LUixPio/7+6UdPiswCzTJn8Hcot9uwwgfnrViRdN7xyjmSYRqv9nHP3OlYbtdeCAgZ4aPq8g==",
+          "dev": true,
+          "requires": {
+            "@emotion/core": "^10.0.20",
+            "@emotion/styled": "^10.0.17",
+            "@storybook/client-logger": "5.3.21",
+            "core-js": "^3.0.1",
+            "deep-object-diff": "^1.1.0",
+            "emotion-theming": "^10.0.19",
+            "global": "^4.3.2",
+            "memoizerific": "^1.11.3",
+            "polished": "^3.3.1",
+            "prop-types": "^15.7.2",
+            "resolve-from": "^5.0.0",
+            "ts-dedent": "^1.1.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
     "@storybook/addon-info": {
-      "version": "5.3.19",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-info/-/addon-info-5.3.19.tgz",
-      "integrity": "sha512-MiFLcyoOmwawquagQHkqiPHnvBOKrVaS/wnO1XyBvIHwkK+KN7CZ9l7HakA4SO76kugrY9OJYyi5YvEEdN6vww==",
+      "version": "5.3.21",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-info/-/addon-info-5.3.21.tgz",
+      "integrity": "sha512-A/K9HzmoXMuOUxH3AozTvjNZwTlYVHob2OaDRfMza0gYMzG0tOrxqcdNTigeAWAjS//Z0G3enue6rHulQZK/+g==",
       "dev": true,
       "requires": {
-        "@storybook/addons": "5.3.19",
-        "@storybook/client-logger": "5.3.19",
-        "@storybook/components": "5.3.19",
-        "@storybook/theming": "5.3.19",
+        "@storybook/addons": "5.3.21",
+        "@storybook/client-logger": "5.3.21",
+        "@storybook/components": "5.3.21",
+        "@storybook/theming": "5.3.21",
         "core-js": "^3.0.1",
         "global": "^4.3.2",
         "marksy": "^8.0.0",
@@ -4342,32 +4738,604 @@
         "react-is": "^16.8.3",
         "react-lifecycles-compat": "^3.0.4",
         "util-deprecate": "^1.0.2"
+      },
+      "dependencies": {
+        "@storybook/addons": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-5.3.21.tgz",
+          "integrity": "sha512-Ji/21WADTLVbTbiKcZ64BcL0Es+h1Afxx3kNmGJqPSTUYroCwIFCT9mUzCqU6G+YyWaISAmTii5UJkTwMkChwA==",
+          "dev": true,
+          "requires": {
+            "@storybook/api": "5.3.21",
+            "@storybook/channels": "5.3.21",
+            "@storybook/client-logger": "5.3.21",
+            "@storybook/core-events": "5.3.21",
+            "core-js": "^3.0.1",
+            "global": "^4.3.2",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/api": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/api/-/api-5.3.21.tgz",
+          "integrity": "sha512-K1o4an/Rx8daKRDooks6qzN6ZGyqizeacZZbair3F8CsSfTgrr2zCcf9pgKojLQa9koEmMHlcdb2KnS+GwPEgA==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.2.1",
+            "@storybook/channels": "5.3.21",
+            "@storybook/client-logger": "5.3.21",
+            "@storybook/core-events": "5.3.21",
+            "@storybook/csf": "0.0.1",
+            "@storybook/router": "5.3.21",
+            "@storybook/theming": "5.3.21",
+            "@types/reach__router": "^1.2.3",
+            "core-js": "^3.0.1",
+            "fast-deep-equal": "^2.0.1",
+            "global": "^4.3.2",
+            "lodash": "^4.17.15",
+            "memoizerific": "^1.11.3",
+            "prop-types": "^15.6.2",
+            "react": "^16.8.3",
+            "semver": "^6.0.0",
+            "shallow-equal": "^1.1.0",
+            "store2": "^2.7.1",
+            "telejson": "^3.2.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/channels": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-5.3.21.tgz",
+          "integrity": "sha512-OXoFs9XtBVg/cCk6lYMrxkzaNlJRf54ABdorp7YAAj7S9tRL1JxOZHxmjNQwEoiRvssmem2rAWtEAxfuEANsAA==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.0.1"
+          }
+        },
+        "@storybook/client-logger": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-5.3.21.tgz",
+          "integrity": "sha512-OzQkwpZ5SK9cXD9Mv6lxPGPot+hSZvnkEW12kpt1AHfJz4ET26YTDOI3oetPsjfRJo6qYLeQX8+wF7rklfXbzA==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.0.1"
+          }
+        },
+        "@storybook/core-events": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-5.3.21.tgz",
+          "integrity": "sha512-/Zsm1sKAh6pzQv8jQUmuhM7nuM01ZljIRKy8p2HjPNlMjDB5yaRkBfyeAUXUg+qXNI6aHVWa4jGdPEdwwY4oLA==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.0.1"
+          }
+        },
+        "@storybook/router": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/router/-/router-5.3.21.tgz",
+          "integrity": "sha512-c29m5UikK5Q1lyd6FltOGFhIcpd6PIb855YS3OUNe3F6ZA1tfJ+aNKrCBc65d1c+fvCGG76dYYYv0RvwEmKXXg==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.2.1",
+            "@storybook/csf": "0.0.1",
+            "@types/reach__router": "^1.2.3",
+            "core-js": "^3.0.1",
+            "global": "^4.3.2",
+            "lodash": "^4.17.15",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.6.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/theming": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-5.3.21.tgz",
+          "integrity": "sha512-FZbxjizqdO9lV5LUixPio/7+6UdPiswCzTJn8Hcot9uwwgfnrViRdN7xyjmSYRqv9nHP3OlYbtdeCAgZ4aPq8g==",
+          "dev": true,
+          "requires": {
+            "@emotion/core": "^10.0.20",
+            "@emotion/styled": "^10.0.17",
+            "@storybook/client-logger": "5.3.21",
+            "core-js": "^3.0.1",
+            "deep-object-diff": "^1.1.0",
+            "emotion-theming": "^10.0.19",
+            "global": "^4.3.2",
+            "memoizerific": "^1.11.3",
+            "polished": "^3.3.1",
+            "prop-types": "^15.7.2",
+            "resolve-from": "^5.0.0",
+            "ts-dedent": "^1.1.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
     "@storybook/addon-knobs": {
-      "version": "5.3.19",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-knobs/-/addon-knobs-5.3.19.tgz",
-      "integrity": "sha512-e7z6KhvVOUGjygK4VL5Un1U3t0XG0jkb/BOHVWQMtH5dWNn3zofD3LrZZy24eAsyre/ej/LGo/BzwDSXkKLTog==",
+      "version": "6.2.9",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-knobs/-/addon-knobs-6.2.9.tgz",
+      "integrity": "sha512-ic3xXy9uWPfIGP4x3VuGnrUmg/Jn9rHKIqZMhRcC7mFDRVlgbekvQxaruC6VY9LW6o8jV/miReSZkJf7M8o0aQ==",
       "dev": true,
       "requires": {
-        "@storybook/addons": "5.3.19",
-        "@storybook/api": "5.3.19",
-        "@storybook/client-api": "5.3.19",
-        "@storybook/components": "5.3.19",
-        "@storybook/core-events": "5.3.19",
-        "@storybook/theming": "5.3.19",
-        "@types/react-color": "^3.0.1",
-        "copy-to-clipboard": "^3.0.8",
-        "core-js": "^3.0.1",
+        "@storybook/addons": "6.2.9",
+        "@storybook/api": "6.2.9",
+        "@storybook/channels": "6.2.9",
+        "@storybook/client-api": "6.2.9",
+        "@storybook/components": "6.2.9",
+        "@storybook/core-events": "6.2.9",
+        "@storybook/theming": "6.2.9",
+        "copy-to-clipboard": "^3.3.1",
+        "core-js": "^3.8.2",
         "escape-html": "^1.0.3",
-        "fast-deep-equal": "^2.0.1",
-        "global": "^4.3.2",
-        "lodash": "^4.17.15",
+        "fast-deep-equal": "^3.1.3",
+        "global": "^4.4.0",
+        "lodash": "^4.17.20",
         "prop-types": "^15.7.2",
-        "qs": "^6.6.0",
-        "react-color": "^2.17.0",
+        "qs": "^6.10.0",
+        "react-colorful": "^5.0.1",
         "react-lifecycles-compat": "^3.0.4",
-        "react-select": "^3.0.8"
+        "react-select": "^3.2.0",
+        "regenerator-runtime": "^0.13.7"
+      },
+      "dependencies": {
+        "@emotion/core": {
+          "version": "10.1.1",
+          "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
+          "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.5.5",
+            "@emotion/cache": "^10.0.27",
+            "@emotion/css": "^10.0.27",
+            "@emotion/serialize": "^0.11.15",
+            "@emotion/sheet": "0.9.4",
+            "@emotion/utils": "0.11.3"
+          }
+        },
+        "@storybook/addons": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.2.9.tgz",
+          "integrity": "sha512-GnmEKbJwiN1jncN9NSA8CuR1i2XAlasPcl/Zn0jkfV9WitQeczVcJCPw86SGH84AD+tTBCyF2i9UC0KaOV1YBQ==",
+          "dev": true,
+          "requires": {
+            "@storybook/api": "6.2.9",
+            "@storybook/channels": "6.2.9",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/core-events": "6.2.9",
+            "@storybook/router": "6.2.9",
+            "@storybook/theming": "6.2.9",
+            "core-js": "^3.8.2",
+            "global": "^4.4.0",
+            "regenerator-runtime": "^0.13.7"
+          }
+        },
+        "@storybook/api": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.2.9.tgz",
+          "integrity": "sha512-okkA3HAScE9tGnYBrjTOcgzT+L1lRHNoEh3ZfGgh1u/XNEyHGNkj4grvkd6nX7BzRcYQ/l2VkcKCqmOjUnSkVQ==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.3.4",
+            "@storybook/channels": "6.2.9",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/core-events": "6.2.9",
+            "@storybook/csf": "0.0.1",
+            "@storybook/router": "6.2.9",
+            "@storybook/semver": "^7.3.2",
+            "@storybook/theming": "6.2.9",
+            "@types/reach__router": "^1.3.7",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.10.0",
+            "regenerator-runtime": "^0.13.7",
+            "store2": "^2.12.0",
+            "telejson": "^5.1.0",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/channels": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.2.9.tgz",
+          "integrity": "sha512-6dC8Fb2ipNyOQXnUZMDeEUaJGH5DMLzyHlGLhVyDtrO5WR6bO8mQdkzf4+5dSKXgCBNX0BSkssXth4pDjn18rg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/client-logger": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.2.9.tgz",
+          "integrity": "sha512-IfOQZuvpjh66qBInQCJOb9S0dTGpzZ/Cxlcvokp+PYt95KztaWN3mPm+HaDQCeRsrWNe0Bpm1zuickcJ6dBOXg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "global": "^4.4.0"
+          }
+        },
+        "@storybook/components": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/components/-/components-6.2.9.tgz",
+          "integrity": "sha512-hnV1MI2aB2g1sJ7NJphpxi7TwrMZQ/tpCJeHnkjmzyC6ez1MXqcBXGrEEdSXzRfAxjQTOEpu6H1mnns0xMP0Ag==",
+          "dev": true,
+          "requires": {
+            "@popperjs/core": "^2.6.0",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/csf": "0.0.1",
+            "@storybook/theming": "6.2.9",
+            "@types/color-convert": "^2.0.0",
+            "@types/overlayscrollbars": "^1.12.0",
+            "@types/react-syntax-highlighter": "11.0.5",
+            "color-convert": "^2.0.1",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "markdown-to-jsx": "^7.1.0",
+            "memoizerific": "^1.11.3",
+            "overlayscrollbars": "^1.13.1",
+            "polished": "^4.0.5",
+            "prop-types": "^15.7.2",
+            "react-colorful": "^5.0.1",
+            "react-popper-tooltip": "^3.1.1",
+            "react-syntax-highlighter": "^13.5.3",
+            "react-textarea-autosize": "^8.3.0",
+            "regenerator-runtime": "^0.13.7",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/core-events": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.2.9.tgz",
+          "integrity": "sha512-xQmbX/oYQK1QsAGN8hriXX5SUKOoTUe3L4dVaVHxJqy7MReRWJpprJmCpbAPJzWS6WCbDFfCM5kVEexHLOzJlQ==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2"
+          }
+        },
+        "@storybook/router": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.2.9.tgz",
+          "integrity": "sha512-7Bn1OFoItCl8whXRT8N1qp1Lky7kzXJ3aslWp5E8HcM8rxh4OYXfbaeiyJEJxBTGC5zxgY+tAEXHFjsAviFROg==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.3.4",
+            "@storybook/client-logger": "6.2.9",
+            "@types/reach__router": "^1.3.7",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.10.0",
+            "ts-dedent": "^2.0.0"
+          }
+        },
+        "@storybook/semver": {
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/@storybook/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.6.5",
+            "find-up": "^4.1.0"
+          }
+        },
+        "@storybook/theming": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.2.9.tgz",
+          "integrity": "sha512-183oJW7AD7Fhqg5NT4ct3GJntwteAb9jZnQ6yhf9JSdY+fk8OhxRbPf7ov0au2gYACcGrWDd9K5pYQsvWlP5gA==",
+          "dev": true,
+          "requires": {
+            "@emotion/core": "^10.1.1",
+            "@emotion/is-prop-valid": "^0.8.6",
+            "@emotion/styled": "^10.0.27",
+            "@storybook/client-logger": "6.2.9",
+            "core-js": "^3.8.2",
+            "deep-object-diff": "^1.1.0",
+            "emotion-theming": "^10.0.27",
+            "global": "^4.4.0",
+            "memoizerific": "^1.11.3",
+            "polished": "^4.0.5",
+            "resolve-from": "^5.0.0",
+            "ts-dedent": "^2.0.0"
+          }
+        },
+        "@types/reach__router": {
+          "version": "1.3.7",
+          "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.7.tgz",
+          "integrity": "sha512-cyBEb8Ef3SJNH5NYEIDGPoMMmYUxROatuxbICusVRQIqZUB85UCt6R2Ok60tKS/TABJsJYaHyNTW3kqbpxlMjg==",
+          "dev": true,
+          "requires": {
+            "@types/react": "*"
+          }
+        },
+        "@types/react-syntax-highlighter": {
+          "version": "11.0.5",
+          "resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.5.tgz",
+          "integrity": "sha512-VIOi9i2Oj5XsmWWoB72p3KlZoEbdRAcechJa8Ztebw7bDl2YmR+odxIqhtJGp1q2EozHs02US+gzxJ9nuf56qg==",
+          "dev": true,
+          "requires": {
+            "@types/react": "*"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "core-js": {
+          "version": "3.11.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.1.tgz",
+          "integrity": "sha512-k93Isqg7e4txZWMGNYwevZL9MiogLk8pd1PtwrmFmi8IBq4GXqUaVW/a33Llt6amSI36uSjd0GWwc9pTT9ALlQ==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "hastscript": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz",
+          "integrity": "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==",
+          "dev": true,
+          "requires": {
+            "@types/hast": "^2.0.0",
+            "comma-separated-tokens": "^1.0.0",
+            "hast-util-parse-selector": "^2.0.0",
+            "property-information": "^5.0.0",
+            "space-separated-tokens": "^1.0.0"
+          }
+        },
+        "highlight.js": {
+          "version": "10.7.2",
+          "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz",
+          "integrity": "sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
+        "lowlight": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz",
+          "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==",
+          "dev": true,
+          "requires": {
+            "fault": "^1.0.0",
+            "highlight.js": "~10.7.0"
+          }
+        },
+        "markdown-to-jsx": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.1.2.tgz",
+          "integrity": "sha512-O8DMCl32V34RrD+ZHxcAPc2+kYytuDIoQYjY36RVdsLK7uHjgNVvFec4yv0X6LgB4YEZgSvK5QtFi5YVqEpoMA==",
+          "dev": true
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "parse-entities": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
+          "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
+          "dev": true,
+          "requires": {
+            "character-entities": "^1.0.0",
+            "character-entities-legacy": "^1.0.0",
+            "character-reference-invalid": "^1.0.0",
+            "is-alphanumerical": "^1.0.0",
+            "is-decimal": "^1.0.0",
+            "is-hexadecimal": "^1.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "polished": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/polished/-/polished-4.1.2.tgz",
+          "integrity": "sha512-jq4t3PJUpVRcveC53nnbEX35VyQI05x3tniwp26WFdm1dwaNUBHAi5awa/roBlwQxx1uRhwNSYeAi/aMbfiJCQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.17"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.14.0",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+              "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+              "dev": true,
+              "requires": {
+                "regenerator-runtime": "^0.13.4"
+              }
+            }
+          }
+        },
+        "qs": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
+          "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        },
+        "react-popper": {
+          "version": "2.2.5",
+          "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
+          "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
+          "dev": true,
+          "requires": {
+            "react-fast-compare": "^3.0.1",
+            "warning": "^4.0.2"
+          }
+        },
+        "react-popper-tooltip": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/react-popper-tooltip/-/react-popper-tooltip-3.1.1.tgz",
+          "integrity": "sha512-EnERAnnKRptQBJyaee5GJScWNUKQPDD2ywvzZyUjst/wj5U64C8/CnSYLNEmP2hG0IJ3ZhtDxE8oDN+KOyavXQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.12.5",
+            "@popperjs/core": "^2.5.4",
+            "react-popper": "^2.2.4"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.14.0",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+              "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+              "dev": true,
+              "requires": {
+                "regenerator-runtime": "^0.13.4"
+              }
+            }
+          }
+        },
+        "react-syntax-highlighter": {
+          "version": "13.5.3",
+          "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz",
+          "integrity": "sha512-crPaF+QGPeHNIblxxCdf2Lg936NAHKhNhuMzRL3F9ct6aYXL3NcZtCL0Rms9+qVo6Y1EQLdXGypBNSbPL/r+qg==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.3.1",
+            "highlight.js": "^10.1.1",
+            "lowlight": "^1.14.0",
+            "prismjs": "^1.21.0",
+            "refractor": "^3.1.0"
+          }
+        },
+        "react-textarea-autosize": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.3.2.tgz",
+          "integrity": "sha512-JrMWVgQSaExQByP3ggI1eA8zF4mF0+ddVuX7acUeK2V7bmrpjVOY72vmLz2IXFJSAXoY3D80nEzrn0GWajWK3Q==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.10.2",
+            "use-composed-ref": "^1.0.0",
+            "use-latest": "^1.0.0"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.14.0",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+              "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+              "dev": true,
+              "requires": {
+                "regenerator-runtime": "^0.13.4"
+              }
+            }
+          }
+        },
+        "refractor": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.3.1.tgz",
+          "integrity": "sha512-vaN6R56kLMuBszHSWlwTpcZ8KTMG6aUCok4GrxYDT20UIOXxOc5o6oDc8tNTzSlH3m2sI+Eu9Jo2kVdDcUTWYw==",
+          "dev": true,
+          "requires": {
+            "hastscript": "^6.0.0",
+            "parse-entities": "^2.0.0",
+            "prismjs": "~1.23.0"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.7",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+          "dev": true
+        },
+        "store2": {
+          "version": "2.12.0",
+          "resolved": "https://registry.npmjs.org/store2/-/store2-2.12.0.tgz",
+          "integrity": "sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==",
+          "dev": true
+        },
+        "telejson": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.1.1.tgz",
+          "integrity": "sha512-aU7x+nwodmODJPXhU9sC/REOcX/dx1tNbyeOFV1PCTh6e9Mj+bnyfQ7sr13zfJYya9BtpGwnUNn9Fd76Ybj2eg==",
+          "dev": true,
+          "requires": {
+            "@types/is-function": "^1.0.0",
+            "global": "^4.4.0",
+            "is-function": "^1.0.2",
+            "is-regex": "^1.1.2",
+            "is-symbol": "^1.0.3",
+            "isobject": "^4.0.0",
+            "lodash": "^4.17.21",
+            "memoizerific": "^1.11.3"
+          }
+        },
+        "ts-dedent": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.1.1.tgz",
+          "integrity": "sha512-riHuwnzAUCfdIeTBNUq7+Yj+ANnrMXo/7+Z74dIdudS7ys2k8aSGMzpJRMFDF7CLwUTbtvi1ZZff/Wl+XxmqIA==",
+          "dev": true
+        }
       }
     },
     "@storybook/addons": {
@@ -4421,17 +5389,1025 @@
         }
       }
     },
-    "@storybook/channel-postmessage": {
-      "version": "5.3.19",
-      "resolved": "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-5.3.19.tgz",
-      "integrity": "sha512-Iq0f4NPHR0UVVFCWt0cI7Myadk4/SATXYJPT6sv95KhnLjKEeYw571WBlThfp8a9FM80887xG+eIRe93c8dleA==",
+    "@storybook/builder-webpack4": {
+      "version": "6.2.9",
+      "resolved": "https://registry.npmjs.org/@storybook/builder-webpack4/-/builder-webpack4-6.2.9.tgz",
+      "integrity": "sha512-swECic1huVdj+B+iRJIQ8ds59HuPVE4fmhI+j/nhw0CQCsgAEKqDlOQVYEimW6nZX8GO4WxNm6tiiRzxixejbw==",
       "dev": true,
       "requires": {
-        "@storybook/channels": "5.3.19",
-        "@storybook/client-logger": "5.3.19",
-        "core-js": "^3.0.1",
-        "global": "^4.3.2",
-        "telejson": "^3.2.0"
+        "@babel/core": "^7.12.10",
+        "@babel/plugin-proposal-class-properties": "^7.12.1",
+        "@babel/plugin-proposal-decorators": "^7.12.12",
+        "@babel/plugin-proposal-export-default-from": "^7.12.1",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
+        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+        "@babel/plugin-proposal-optional-chaining": "^7.12.7",
+        "@babel/plugin-proposal-private-methods": "^7.12.1",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-transform-arrow-functions": "^7.12.1",
+        "@babel/plugin-transform-block-scoping": "^7.12.12",
+        "@babel/plugin-transform-classes": "^7.12.1",
+        "@babel/plugin-transform-destructuring": "^7.12.1",
+        "@babel/plugin-transform-for-of": "^7.12.1",
+        "@babel/plugin-transform-parameters": "^7.12.1",
+        "@babel/plugin-transform-shorthand-properties": "^7.12.1",
+        "@babel/plugin-transform-spread": "^7.12.1",
+        "@babel/plugin-transform-template-literals": "^7.12.1",
+        "@babel/preset-env": "^7.12.11",
+        "@babel/preset-react": "^7.12.10",
+        "@babel/preset-typescript": "^7.12.7",
+        "@storybook/addons": "6.2.9",
+        "@storybook/api": "6.2.9",
+        "@storybook/channel-postmessage": "6.2.9",
+        "@storybook/channels": "6.2.9",
+        "@storybook/client-api": "6.2.9",
+        "@storybook/client-logger": "6.2.9",
+        "@storybook/components": "6.2.9",
+        "@storybook/core-common": "6.2.9",
+        "@storybook/core-events": "6.2.9",
+        "@storybook/node-logger": "6.2.9",
+        "@storybook/router": "6.2.9",
+        "@storybook/semver": "^7.3.2",
+        "@storybook/theming": "6.2.9",
+        "@storybook/ui": "6.2.9",
+        "@types/node": "^14.0.10",
+        "@types/webpack": "^4.41.26",
+        "autoprefixer": "^9.8.6",
+        "babel-loader": "^8.2.2",
+        "babel-plugin-macros": "^2.8.0",
+        "babel-plugin-polyfill-corejs3": "^0.1.0",
+        "case-sensitive-paths-webpack-plugin": "^2.3.0",
+        "core-js": "^3.8.2",
+        "css-loader": "^3.6.0",
+        "dotenv-webpack": "^1.8.0",
+        "file-loader": "^6.2.0",
+        "find-up": "^5.0.0",
+        "fork-ts-checker-webpack-plugin": "^4.1.6",
+        "fs-extra": "^9.0.1",
+        "glob": "^7.1.6",
+        "glob-promise": "^3.4.0",
+        "global": "^4.4.0",
+        "html-webpack-plugin": "^4.0.0",
+        "pnp-webpack-plugin": "1.6.4",
+        "postcss": "^7.0.35",
+        "postcss-flexbugs-fixes": "^4.2.1",
+        "postcss-loader": "^4.2.0",
+        "raw-loader": "^4.0.2",
+        "react-dev-utils": "^11.0.3",
+        "stable": "^0.1.8",
+        "style-loader": "^1.3.0",
+        "terser-webpack-plugin": "^3.1.0",
+        "ts-dedent": "^2.0.0",
+        "url-loader": "^4.1.1",
+        "util-deprecate": "^1.0.2",
+        "webpack": "4",
+        "webpack-dev-middleware": "^3.7.3",
+        "webpack-filter-warnings-plugin": "^1.2.1",
+        "webpack-hot-middleware": "^2.25.0",
+        "webpack-virtual-modules": "^0.2.2"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.12.13"
+          }
+        },
+        "@babel/core": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.0.tgz",
+          "integrity": "sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.14.0",
+            "@babel/helper-compilation-targets": "^7.13.16",
+            "@babel/helper-module-transforms": "^7.14.0",
+            "@babel/helpers": "^7.14.0",
+            "@babel/parser": "^7.14.0",
+            "@babel/template": "^7.12.13",
+            "@babel/traverse": "^7.14.0",
+            "@babel/types": "^7.14.0",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.1.0",
+            "gensync": "^1.0.0-beta.2",
+            "json5": "^2.1.2",
+            "semver": "^6.3.0",
+            "source-map": "^0.5.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "6.3.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+              "dev": true
+            }
+          }
+        },
+        "@babel/generator": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.0.tgz",
+          "integrity": "sha512-C6u00HbmsrNPug6A+CiNl8rEys7TsdcXwg12BHi2ca5rUfAs3+UwZsuDQSXnc+wCElCXMB8gMaJ3YXDdh8fAlg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.14.0",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-create-class-features-plugin": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.0.tgz",
+          "integrity": "sha512-6pXDPguA5zC40Y8oI5mqr+jEUpjMJonKvknvA+vD8CYDz5uuXEwWBK8sRAsE/t3gfb1k15AQb9RhwpscC4nUJQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-annotate-as-pure": "^7.12.13",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-member-expression-to-functions": "^7.13.12",
+            "@babel/helper-optimise-call-expression": "^7.12.13",
+            "@babel/helper-replace-supers": "^7.13.12",
+            "@babel/helper-split-export-declaration": "^7.12.13"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/helpers": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz",
+          "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.12.13",
+            "@babel/traverse": "^7.14.0",
+            "@babel/types": "^7.14.0"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
+          "dev": true
+        },
+        "@babel/plugin-proposal-decorators": {
+          "version": "7.13.15",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.15.tgz",
+          "integrity": "sha512-ibAMAqUm97yzi+LPgdr5Nqb9CMkeieGHvwPg1ywSGjZrZHQEGqE01HmOio8kxRpA/+VtOHouIVy2FMpBbtltjA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-create-class-features-plugin": "^7.13.11",
+            "@babel/helper-plugin-utils": "^7.13.0",
+            "@babel/plugin-syntax-decorators": "^7.12.13"
+          }
+        },
+        "@babel/plugin-syntax-decorators": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz",
+          "integrity": "sha512-Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.12.13"
+          }
+        },
+        "@babel/template": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
+          "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.14.0",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-split-export-declaration": "^7.12.13",
+            "@babel/parser": "^7.14.0",
+            "@babel/types": "^7.14.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "@emotion/core": {
+          "version": "10.1.1",
+          "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
+          "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.5.5",
+            "@emotion/cache": "^10.0.27",
+            "@emotion/css": "^10.0.27",
+            "@emotion/serialize": "^0.11.15",
+            "@emotion/sheet": "0.9.4",
+            "@emotion/utils": "0.11.3"
+          }
+        },
+        "@storybook/addons": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.2.9.tgz",
+          "integrity": "sha512-GnmEKbJwiN1jncN9NSA8CuR1i2XAlasPcl/Zn0jkfV9WitQeczVcJCPw86SGH84AD+tTBCyF2i9UC0KaOV1YBQ==",
+          "dev": true,
+          "requires": {
+            "@storybook/api": "6.2.9",
+            "@storybook/channels": "6.2.9",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/core-events": "6.2.9",
+            "@storybook/router": "6.2.9",
+            "@storybook/theming": "6.2.9",
+            "core-js": "^3.8.2",
+            "global": "^4.4.0",
+            "regenerator-runtime": "^0.13.7"
+          }
+        },
+        "@storybook/api": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.2.9.tgz",
+          "integrity": "sha512-okkA3HAScE9tGnYBrjTOcgzT+L1lRHNoEh3ZfGgh1u/XNEyHGNkj4grvkd6nX7BzRcYQ/l2VkcKCqmOjUnSkVQ==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.3.4",
+            "@storybook/channels": "6.2.9",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/core-events": "6.2.9",
+            "@storybook/csf": "0.0.1",
+            "@storybook/router": "6.2.9",
+            "@storybook/semver": "^7.3.2",
+            "@storybook/theming": "6.2.9",
+            "@types/reach__router": "^1.3.7",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.10.0",
+            "regenerator-runtime": "^0.13.7",
+            "store2": "^2.12.0",
+            "telejson": "^5.1.0",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/channels": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.2.9.tgz",
+          "integrity": "sha512-6dC8Fb2ipNyOQXnUZMDeEUaJGH5DMLzyHlGLhVyDtrO5WR6bO8mQdkzf4+5dSKXgCBNX0BSkssXth4pDjn18rg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/client-logger": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.2.9.tgz",
+          "integrity": "sha512-IfOQZuvpjh66qBInQCJOb9S0dTGpzZ/Cxlcvokp+PYt95KztaWN3mPm+HaDQCeRsrWNe0Bpm1zuickcJ6dBOXg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "global": "^4.4.0"
+          }
+        },
+        "@storybook/components": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/components/-/components-6.2.9.tgz",
+          "integrity": "sha512-hnV1MI2aB2g1sJ7NJphpxi7TwrMZQ/tpCJeHnkjmzyC6ez1MXqcBXGrEEdSXzRfAxjQTOEpu6H1mnns0xMP0Ag==",
+          "dev": true,
+          "requires": {
+            "@popperjs/core": "^2.6.0",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/csf": "0.0.1",
+            "@storybook/theming": "6.2.9",
+            "@types/color-convert": "^2.0.0",
+            "@types/overlayscrollbars": "^1.12.0",
+            "@types/react-syntax-highlighter": "11.0.5",
+            "color-convert": "^2.0.1",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "markdown-to-jsx": "^7.1.0",
+            "memoizerific": "^1.11.3",
+            "overlayscrollbars": "^1.13.1",
+            "polished": "^4.0.5",
+            "prop-types": "^15.7.2",
+            "react-colorful": "^5.0.1",
+            "react-popper-tooltip": "^3.1.1",
+            "react-syntax-highlighter": "^13.5.3",
+            "react-textarea-autosize": "^8.3.0",
+            "regenerator-runtime": "^0.13.7",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/core-events": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.2.9.tgz",
+          "integrity": "sha512-xQmbX/oYQK1QsAGN8hriXX5SUKOoTUe3L4dVaVHxJqy7MReRWJpprJmCpbAPJzWS6WCbDFfCM5kVEexHLOzJlQ==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2"
+          }
+        },
+        "@storybook/router": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.2.9.tgz",
+          "integrity": "sha512-7Bn1OFoItCl8whXRT8N1qp1Lky7kzXJ3aslWp5E8HcM8rxh4OYXfbaeiyJEJxBTGC5zxgY+tAEXHFjsAviFROg==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.3.4",
+            "@storybook/client-logger": "6.2.9",
+            "@types/reach__router": "^1.3.7",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.10.0",
+            "ts-dedent": "^2.0.0"
+          }
+        },
+        "@storybook/semver": {
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/@storybook/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.6.5",
+            "find-up": "^4.1.0"
+          },
+          "dependencies": {
+            "find-up": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+              "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+              "dev": true,
+              "requires": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+              }
+            }
+          }
+        },
+        "@storybook/theming": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.2.9.tgz",
+          "integrity": "sha512-183oJW7AD7Fhqg5NT4ct3GJntwteAb9jZnQ6yhf9JSdY+fk8OhxRbPf7ov0au2gYACcGrWDd9K5pYQsvWlP5gA==",
+          "dev": true,
+          "requires": {
+            "@emotion/core": "^10.1.1",
+            "@emotion/is-prop-valid": "^0.8.6",
+            "@emotion/styled": "^10.0.27",
+            "@storybook/client-logger": "6.2.9",
+            "core-js": "^3.8.2",
+            "deep-object-diff": "^1.1.0",
+            "emotion-theming": "^10.0.27",
+            "global": "^4.4.0",
+            "memoizerific": "^1.11.3",
+            "polished": "^4.0.5",
+            "resolve-from": "^5.0.0",
+            "ts-dedent": "^2.0.0"
+          }
+        },
+        "@types/reach__router": {
+          "version": "1.3.7",
+          "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.7.tgz",
+          "integrity": "sha512-cyBEb8Ef3SJNH5NYEIDGPoMMmYUxROatuxbICusVRQIqZUB85UCt6R2Ok60tKS/TABJsJYaHyNTW3kqbpxlMjg==",
+          "dev": true,
+          "requires": {
+            "@types/react": "*"
+          }
+        },
+        "@types/react-syntax-highlighter": {
+          "version": "11.0.5",
+          "resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.5.tgz",
+          "integrity": "sha512-VIOi9i2Oj5XsmWWoB72p3KlZoEbdRAcechJa8Ztebw7bDl2YmR+odxIqhtJGp1q2EozHs02US+gzxJ9nuf56qg==",
+          "dev": true,
+          "requires": {
+            "@types/react": "*"
+          }
+        },
+        "@types/webpack": {
+          "version": "4.41.27",
+          "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.27.tgz",
+          "integrity": "sha512-wK/oi5gcHi72VMTbOaQ70VcDxSQ1uX8S2tukBK9ARuGXrYM/+u4ou73roc7trXDNmCxCoerE8zruQqX/wuHszA==",
+          "dev": true,
+          "requires": {
+            "@types/anymatch": "*",
+            "@types/node": "*",
+            "@types/tapable": "^1",
+            "@types/uglify-js": "*",
+            "@types/webpack-sources": "*",
+            "source-map": "^0.6.0"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.6.1",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+              "dev": true
+            }
+          }
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true
+        },
+        "babel-loader": {
+          "version": "8.2.2",
+          "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
+          "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+          "dev": true,
+          "requires": {
+            "find-cache-dir": "^3.3.1",
+            "loader-utils": "^1.4.0",
+            "make-dir": "^3.1.0",
+            "schema-utils": "^2.6.5"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "core-js": {
+          "version": "3.11.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.1.tgz",
+          "integrity": "sha512-k93Isqg7e4txZWMGNYwevZL9MiogLk8pd1PtwrmFmi8IBq4GXqUaVW/a33Llt6amSI36uSjd0GWwc9pTT9ALlQ==",
+          "dev": true
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "find-cache-dir": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^3.0.2",
+            "pkg-dir": "^4.1.0"
+          }
+        },
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          },
+          "dependencies": {
+            "locate-path": {
+              "version": "6.0.0",
+              "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+              "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+              "dev": true,
+              "requires": {
+                "p-locate": "^5.0.0"
+              }
+            },
+            "p-limit": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+              "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+              "dev": true,
+              "requires": {
+                "yocto-queue": "^0.1.0"
+              }
+            },
+            "p-locate": {
+              "version": "5.0.0",
+              "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+              "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+              "dev": true,
+              "requires": {
+                "p-limit": "^3.0.2"
+              }
+            }
+          }
+        },
+        "hastscript": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz",
+          "integrity": "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==",
+          "dev": true,
+          "requires": {
+            "@types/hast": "^2.0.0",
+            "comma-separated-tokens": "^1.0.0",
+            "hast-util-parse-selector": "^2.0.0",
+            "property-information": "^5.0.0",
+            "space-separated-tokens": "^1.0.0"
+          }
+        },
+        "highlight.js": {
+          "version": "10.7.2",
+          "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz",
+          "integrity": "sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "json5": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          },
+          "dependencies": {
+            "json5": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+              "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+              "dev": true,
+              "requires": {
+                "minimist": "^1.2.0"
+              }
+            }
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
+        "lowlight": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz",
+          "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==",
+          "dev": true,
+          "requires": {
+            "fault": "^1.0.0",
+            "highlight.js": "~10.7.0"
+          }
+        },
+        "make-dir": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "6.3.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+              "dev": true
+            }
+          }
+        },
+        "markdown-to-jsx": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.1.2.tgz",
+          "integrity": "sha512-O8DMCl32V34RrD+ZHxcAPc2+kYytuDIoQYjY36RVdsLK7uHjgNVvFec4yv0X6LgB4YEZgSvK5QtFi5YVqEpoMA==",
+          "dev": true
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "parse-entities": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
+          "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
+          "dev": true,
+          "requires": {
+            "character-entities": "^1.0.0",
+            "character-entities-legacy": "^1.0.0",
+            "character-reference-invalid": "^1.0.0",
+            "is-alphanumerical": "^1.0.0",
+            "is-decimal": "^1.0.0",
+            "is-hexadecimal": "^1.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "dev": true,
+          "requires": {
+            "find-up": "^4.0.0"
+          },
+          "dependencies": {
+            "find-up": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+              "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+              "dev": true,
+              "requires": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+              }
+            }
+          }
+        },
+        "polished": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/polished/-/polished-4.1.2.tgz",
+          "integrity": "sha512-jq4t3PJUpVRcveC53nnbEX35VyQI05x3tniwp26WFdm1dwaNUBHAi5awa/roBlwQxx1uRhwNSYeAi/aMbfiJCQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.17"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.14.0",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+              "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+              "dev": true,
+              "requires": {
+                "regenerator-runtime": "^0.13.4"
+              }
+            }
+          }
+        },
+        "qs": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
+          "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        },
+        "react-popper": {
+          "version": "2.2.5",
+          "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
+          "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
+          "dev": true,
+          "requires": {
+            "react-fast-compare": "^3.0.1",
+            "warning": "^4.0.2"
+          }
+        },
+        "react-popper-tooltip": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/react-popper-tooltip/-/react-popper-tooltip-3.1.1.tgz",
+          "integrity": "sha512-EnERAnnKRptQBJyaee5GJScWNUKQPDD2ywvzZyUjst/wj5U64C8/CnSYLNEmP2hG0IJ3ZhtDxE8oDN+KOyavXQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.12.5",
+            "@popperjs/core": "^2.5.4",
+            "react-popper": "^2.2.4"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.14.0",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+              "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+              "dev": true,
+              "requires": {
+                "regenerator-runtime": "^0.13.4"
+              }
+            }
+          }
+        },
+        "react-syntax-highlighter": {
+          "version": "13.5.3",
+          "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz",
+          "integrity": "sha512-crPaF+QGPeHNIblxxCdf2Lg936NAHKhNhuMzRL3F9ct6aYXL3NcZtCL0Rms9+qVo6Y1EQLdXGypBNSbPL/r+qg==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.3.1",
+            "highlight.js": "^10.1.1",
+            "lowlight": "^1.14.0",
+            "prismjs": "^1.21.0",
+            "refractor": "^3.1.0"
+          }
+        },
+        "react-textarea-autosize": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.3.2.tgz",
+          "integrity": "sha512-JrMWVgQSaExQByP3ggI1eA8zF4mF0+ddVuX7acUeK2V7bmrpjVOY72vmLz2IXFJSAXoY3D80nEzrn0GWajWK3Q==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.10.2",
+            "use-composed-ref": "^1.0.0",
+            "use-latest": "^1.0.0"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.14.0",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+              "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+              "dev": true,
+              "requires": {
+                "regenerator-runtime": "^0.13.4"
+              }
+            }
+          }
+        },
+        "refractor": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.3.1.tgz",
+          "integrity": "sha512-vaN6R56kLMuBszHSWlwTpcZ8KTMG6aUCok4GrxYDT20UIOXxOc5o6oDc8tNTzSlH3m2sI+Eu9Jo2kVdDcUTWYw==",
+          "dev": true,
+          "requires": {
+            "hastscript": "^6.0.0",
+            "parse-entities": "^2.0.0",
+            "prismjs": "~1.23.0"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.7",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+          "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.5",
+            "ajv": "^6.12.4",
+            "ajv-keywords": "^3.5.2"
+          }
+        },
+        "store2": {
+          "version": "2.12.0",
+          "resolved": "https://registry.npmjs.org/store2/-/store2-2.12.0.tgz",
+          "integrity": "sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==",
+          "dev": true
+        },
+        "telejson": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.1.1.tgz",
+          "integrity": "sha512-aU7x+nwodmODJPXhU9sC/REOcX/dx1tNbyeOFV1PCTh6e9Mj+bnyfQ7sr13zfJYya9BtpGwnUNn9Fd76Ybj2eg==",
+          "dev": true,
+          "requires": {
+            "@types/is-function": "^1.0.0",
+            "global": "^4.4.0",
+            "is-function": "^1.0.2",
+            "is-regex": "^1.1.2",
+            "is-symbol": "^1.0.3",
+            "isobject": "^4.0.0",
+            "lodash": "^4.17.21",
+            "memoizerific": "^1.11.3"
+          }
+        },
+        "ts-dedent": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.1.1.tgz",
+          "integrity": "sha512-riHuwnzAUCfdIeTBNUq7+Yj+ANnrMXo/7+Z74dIdudS7ys2k8aSGMzpJRMFDF7CLwUTbtvi1ZZff/Wl+XxmqIA==",
+          "dev": true
+        }
+      }
+    },
+    "@storybook/channel-postmessage": {
+      "version": "6.2.9",
+      "resolved": "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-6.2.9.tgz",
+      "integrity": "sha512-OqV+gLeeCHR0KExsIz0B7gD17Cjd9D+I75qnBsLWM9inWO5kc/WZ5svw8Bvjlcm6snWpvxUaT8L+svuqcPSmww==",
+      "dev": true,
+      "requires": {
+        "@storybook/channels": "6.2.9",
+        "@storybook/client-logger": "6.2.9",
+        "@storybook/core-events": "6.2.9",
+        "core-js": "^3.8.2",
+        "global": "^4.4.0",
+        "qs": "^6.10.0",
+        "telejson": "^5.1.0"
+      },
+      "dependencies": {
+        "@storybook/channels": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.2.9.tgz",
+          "integrity": "sha512-6dC8Fb2ipNyOQXnUZMDeEUaJGH5DMLzyHlGLhVyDtrO5WR6bO8mQdkzf4+5dSKXgCBNX0BSkssXth4pDjn18rg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/client-logger": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.2.9.tgz",
+          "integrity": "sha512-IfOQZuvpjh66qBInQCJOb9S0dTGpzZ/Cxlcvokp+PYt95KztaWN3mPm+HaDQCeRsrWNe0Bpm1zuickcJ6dBOXg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "global": "^4.4.0"
+          }
+        },
+        "@storybook/core-events": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.2.9.tgz",
+          "integrity": "sha512-xQmbX/oYQK1QsAGN8hriXX5SUKOoTUe3L4dVaVHxJqy7MReRWJpprJmCpbAPJzWS6WCbDFfCM5kVEexHLOzJlQ==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2"
+          }
+        },
+        "core-js": {
+          "version": "3.11.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.1.tgz",
+          "integrity": "sha512-k93Isqg7e4txZWMGNYwevZL9MiogLk8pd1PtwrmFmi8IBq4GXqUaVW/a33Llt6amSI36uSjd0GWwc9pTT9ALlQ==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
+          "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        },
+        "telejson": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.1.1.tgz",
+          "integrity": "sha512-aU7x+nwodmODJPXhU9sC/REOcX/dx1tNbyeOFV1PCTh6e9Mj+bnyfQ7sr13zfJYya9BtpGwnUNn9Fd76Ybj2eg==",
+          "dev": true,
+          "requires": {
+            "@types/is-function": "^1.0.0",
+            "global": "^4.4.0",
+            "is-function": "^1.0.2",
+            "is-regex": "^1.1.2",
+            "is-symbol": "^1.0.3",
+            "isobject": "^4.0.0",
+            "lodash": "^4.17.21",
+            "memoizerific": "^1.11.3"
+          }
+        },
+        "ts-dedent": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.1.1.tgz",
+          "integrity": "sha512-riHuwnzAUCfdIeTBNUq7+Yj+ANnrMXo/7+Z74dIdudS7ys2k8aSGMzpJRMFDF7CLwUTbtvi1ZZff/Wl+XxmqIA==",
+          "dev": true
+        }
       }
     },
     "@storybook/channels": {
@@ -4444,28 +6420,302 @@
       }
     },
     "@storybook/client-api": {
-      "version": "5.3.19",
-      "resolved": "https://registry.npmjs.org/@storybook/client-api/-/client-api-5.3.19.tgz",
-      "integrity": "sha512-Dh8ZLrLH91j9Fa28Gmp0KFUvvgK348aNMrDNAUdj4m4witz/BWQ2pxz6qq9/xFVErk/GanVC05kazGElqgYCRQ==",
+      "version": "6.2.9",
+      "resolved": "https://registry.npmjs.org/@storybook/client-api/-/client-api-6.2.9.tgz",
+      "integrity": "sha512-aLvEUVkbvv6Qo/2mF4rFCecdqi2CGOUDdsV1a6EFIVS/9gXFdpirsOwKHo9qNjacGdWPlBYGCUcbrw+DvNaSFA==",
       "dev": true,
       "requires": {
-        "@storybook/addons": "5.3.19",
-        "@storybook/channel-postmessage": "5.3.19",
-        "@storybook/channels": "5.3.19",
-        "@storybook/client-logger": "5.3.19",
-        "@storybook/core-events": "5.3.19",
+        "@storybook/addons": "6.2.9",
+        "@storybook/channel-postmessage": "6.2.9",
+        "@storybook/channels": "6.2.9",
+        "@storybook/client-logger": "6.2.9",
+        "@storybook/core-events": "6.2.9",
         "@storybook/csf": "0.0.1",
-        "@types/webpack-env": "^1.15.0",
-        "core-js": "^3.0.1",
-        "eventemitter3": "^4.0.0",
-        "global": "^4.3.2",
-        "is-plain-object": "^3.0.0",
-        "lodash": "^4.17.15",
+        "@types/qs": "^6.9.5",
+        "@types/webpack-env": "^1.16.0",
+        "core-js": "^3.8.2",
+        "global": "^4.4.0",
+        "lodash": "^4.17.20",
         "memoizerific": "^1.11.3",
-        "qs": "^6.6.0",
+        "qs": "^6.10.0",
+        "regenerator-runtime": "^0.13.7",
         "stable": "^0.1.8",
-        "ts-dedent": "^1.1.0",
+        "store2": "^2.12.0",
+        "ts-dedent": "^2.0.0",
         "util-deprecate": "^1.0.2"
+      },
+      "dependencies": {
+        "@emotion/core": {
+          "version": "10.1.1",
+          "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
+          "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.5.5",
+            "@emotion/cache": "^10.0.27",
+            "@emotion/css": "^10.0.27",
+            "@emotion/serialize": "^0.11.15",
+            "@emotion/sheet": "0.9.4",
+            "@emotion/utils": "0.11.3"
+          }
+        },
+        "@storybook/addons": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.2.9.tgz",
+          "integrity": "sha512-GnmEKbJwiN1jncN9NSA8CuR1i2XAlasPcl/Zn0jkfV9WitQeczVcJCPw86SGH84AD+tTBCyF2i9UC0KaOV1YBQ==",
+          "dev": true,
+          "requires": {
+            "@storybook/api": "6.2.9",
+            "@storybook/channels": "6.2.9",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/core-events": "6.2.9",
+            "@storybook/router": "6.2.9",
+            "@storybook/theming": "6.2.9",
+            "core-js": "^3.8.2",
+            "global": "^4.4.0",
+            "regenerator-runtime": "^0.13.7"
+          }
+        },
+        "@storybook/api": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.2.9.tgz",
+          "integrity": "sha512-okkA3HAScE9tGnYBrjTOcgzT+L1lRHNoEh3ZfGgh1u/XNEyHGNkj4grvkd6nX7BzRcYQ/l2VkcKCqmOjUnSkVQ==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.3.4",
+            "@storybook/channels": "6.2.9",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/core-events": "6.2.9",
+            "@storybook/csf": "0.0.1",
+            "@storybook/router": "6.2.9",
+            "@storybook/semver": "^7.3.2",
+            "@storybook/theming": "6.2.9",
+            "@types/reach__router": "^1.3.7",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.10.0",
+            "regenerator-runtime": "^0.13.7",
+            "store2": "^2.12.0",
+            "telejson": "^5.1.0",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/channels": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.2.9.tgz",
+          "integrity": "sha512-6dC8Fb2ipNyOQXnUZMDeEUaJGH5DMLzyHlGLhVyDtrO5WR6bO8mQdkzf4+5dSKXgCBNX0BSkssXth4pDjn18rg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/client-logger": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.2.9.tgz",
+          "integrity": "sha512-IfOQZuvpjh66qBInQCJOb9S0dTGpzZ/Cxlcvokp+PYt95KztaWN3mPm+HaDQCeRsrWNe0Bpm1zuickcJ6dBOXg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "global": "^4.4.0"
+          }
+        },
+        "@storybook/core-events": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.2.9.tgz",
+          "integrity": "sha512-xQmbX/oYQK1QsAGN8hriXX5SUKOoTUe3L4dVaVHxJqy7MReRWJpprJmCpbAPJzWS6WCbDFfCM5kVEexHLOzJlQ==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2"
+          }
+        },
+        "@storybook/router": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.2.9.tgz",
+          "integrity": "sha512-7Bn1OFoItCl8whXRT8N1qp1Lky7kzXJ3aslWp5E8HcM8rxh4OYXfbaeiyJEJxBTGC5zxgY+tAEXHFjsAviFROg==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.3.4",
+            "@storybook/client-logger": "6.2.9",
+            "@types/reach__router": "^1.3.7",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.10.0",
+            "ts-dedent": "^2.0.0"
+          }
+        },
+        "@storybook/semver": {
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/@storybook/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.6.5",
+            "find-up": "^4.1.0"
+          }
+        },
+        "@storybook/theming": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.2.9.tgz",
+          "integrity": "sha512-183oJW7AD7Fhqg5NT4ct3GJntwteAb9jZnQ6yhf9JSdY+fk8OhxRbPf7ov0au2gYACcGrWDd9K5pYQsvWlP5gA==",
+          "dev": true,
+          "requires": {
+            "@emotion/core": "^10.1.1",
+            "@emotion/is-prop-valid": "^0.8.6",
+            "@emotion/styled": "^10.0.27",
+            "@storybook/client-logger": "6.2.9",
+            "core-js": "^3.8.2",
+            "deep-object-diff": "^1.1.0",
+            "emotion-theming": "^10.0.27",
+            "global": "^4.4.0",
+            "memoizerific": "^1.11.3",
+            "polished": "^4.0.5",
+            "resolve-from": "^5.0.0",
+            "ts-dedent": "^2.0.0"
+          }
+        },
+        "@types/reach__router": {
+          "version": "1.3.7",
+          "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.7.tgz",
+          "integrity": "sha512-cyBEb8Ef3SJNH5NYEIDGPoMMmYUxROatuxbICusVRQIqZUB85UCt6R2Ok60tKS/TABJsJYaHyNTW3kqbpxlMjg==",
+          "dev": true,
+          "requires": {
+            "@types/react": "*"
+          }
+        },
+        "core-js": {
+          "version": "3.11.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.1.tgz",
+          "integrity": "sha512-k93Isqg7e4txZWMGNYwevZL9MiogLk8pd1PtwrmFmi8IBq4GXqUaVW/a33Llt6amSI36uSjd0GWwc9pTT9ALlQ==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "polished": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/polished/-/polished-4.1.2.tgz",
+          "integrity": "sha512-jq4t3PJUpVRcveC53nnbEX35VyQI05x3tniwp26WFdm1dwaNUBHAi5awa/roBlwQxx1uRhwNSYeAi/aMbfiJCQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.17"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.14.0",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+              "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+              "dev": true,
+              "requires": {
+                "regenerator-runtime": "^0.13.4"
+              }
+            }
+          }
+        },
+        "qs": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
+          "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.7",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+          "dev": true
+        },
+        "store2": {
+          "version": "2.12.0",
+          "resolved": "https://registry.npmjs.org/store2/-/store2-2.12.0.tgz",
+          "integrity": "sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==",
+          "dev": true
+        },
+        "telejson": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.1.1.tgz",
+          "integrity": "sha512-aU7x+nwodmODJPXhU9sC/REOcX/dx1tNbyeOFV1PCTh6e9Mj+bnyfQ7sr13zfJYya9BtpGwnUNn9Fd76Ybj2eg==",
+          "dev": true,
+          "requires": {
+            "@types/is-function": "^1.0.0",
+            "global": "^4.4.0",
+            "is-function": "^1.0.2",
+            "is-regex": "^1.1.2",
+            "is-symbol": "^1.0.3",
+            "isobject": "^4.0.0",
+            "lodash": "^4.17.21",
+            "memoizerific": "^1.11.3"
+          }
+        },
+        "ts-dedent": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.1.1.tgz",
+          "integrity": "sha512-riHuwnzAUCfdIeTBNUq7+Yj+ANnrMXo/7+Z74dIdudS7ys2k8aSGMzpJRMFDF7CLwUTbtvi1ZZff/Wl+XxmqIA==",
+          "dev": true
+        }
       }
     },
     "@storybook/client-logger": {
@@ -4478,13 +6728,13 @@
       }
     },
     "@storybook/components": {
-      "version": "5.3.19",
-      "resolved": "https://registry.npmjs.org/@storybook/components/-/components-5.3.19.tgz",
-      "integrity": "sha512-3g23/+ktlocaHLJKISu9Neu3XKa6aYP2ctDYkRtGchSB0Q55hQsUVGO+BEVuT7Pk2D59mVCxboBjxcRoPUY4pw==",
+      "version": "5.3.21",
+      "resolved": "https://registry.npmjs.org/@storybook/components/-/components-5.3.21.tgz",
+      "integrity": "sha512-42QQk6qZl6wrtajP8yNCfmNS2t8Iod5QY+4V/l6iNnnT9O+j6cWOlnO+ZyvjNv0Xm0zIOt+VyVjdkKh8FUjQmA==",
       "dev": true,
       "requires": {
-        "@storybook/client-logger": "5.3.19",
-        "@storybook/theming": "5.3.19",
+        "@storybook/client-logger": "5.3.21",
+        "@storybook/theming": "5.3.21",
         "@types/react-syntax-highlighter": "11.0.4",
         "@types/react-textarea-autosize": "^4.3.3",
         "core-js": "^3.0.1",
@@ -4504,99 +6754,694 @@
         "react-textarea-autosize": "^7.1.0",
         "simplebar-react": "^1.0.0-alpha.6",
         "ts-dedent": "^1.1.0"
+      },
+      "dependencies": {
+        "@storybook/client-logger": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-5.3.21.tgz",
+          "integrity": "sha512-OzQkwpZ5SK9cXD9Mv6lxPGPot+hSZvnkEW12kpt1AHfJz4ET26YTDOI3oetPsjfRJo6qYLeQX8+wF7rklfXbzA==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.0.1"
+          }
+        },
+        "@storybook/theming": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-5.3.21.tgz",
+          "integrity": "sha512-FZbxjizqdO9lV5LUixPio/7+6UdPiswCzTJn8Hcot9uwwgfnrViRdN7xyjmSYRqv9nHP3OlYbtdeCAgZ4aPq8g==",
+          "dev": true,
+          "requires": {
+            "@emotion/core": "^10.0.20",
+            "@emotion/styled": "^10.0.17",
+            "@storybook/client-logger": "5.3.21",
+            "core-js": "^3.0.1",
+            "deep-object-diff": "^1.1.0",
+            "emotion-theming": "^10.0.19",
+            "global": "^4.3.2",
+            "memoizerific": "^1.11.3",
+            "polished": "^3.3.1",
+            "prop-types": "^15.7.2",
+            "resolve-from": "^5.0.0",
+            "ts-dedent": "^1.1.0"
+          }
+        }
       }
     },
     "@storybook/core": {
-      "version": "5.3.19",
-      "resolved": "https://registry.npmjs.org/@storybook/core/-/core-5.3.19.tgz",
-      "integrity": "sha512-4EYzglqb1iD6x9gxtAYpRGwGP6qJGiU2UW4GiYrErEmeu6y6tkyaqW5AwGlIo9+6jAfwD0HjaK8afvjKTtmmMQ==",
+      "version": "6.2.9",
+      "resolved": "https://registry.npmjs.org/@storybook/core/-/core-6.2.9.tgz",
+      "integrity": "sha512-pzbyjWvj0t8m0kR2pC9GQne4sZn7Y/zfcbm6/31CL+yhzOQjfJEj3n4ZFUlxikXqQJPg1aWfypfyaeaLL0QyuA==",
       "dev": true,
       "requires": {
-        "@babel/plugin-proposal-class-properties": "^7.7.0",
-        "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
-        "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-        "@babel/plugin-transform-react-constant-elements": "^7.2.0",
-        "@babel/preset-env": "^7.4.5",
-        "@storybook/addons": "5.3.19",
-        "@storybook/channel-postmessage": "5.3.19",
-        "@storybook/client-api": "5.3.19",
-        "@storybook/client-logger": "5.3.19",
-        "@storybook/core-events": "5.3.19",
+        "@storybook/core-client": "6.2.9",
+        "@storybook/core-server": "6.2.9"
+      }
+    },
+    "@storybook/core-client": {
+      "version": "6.2.9",
+      "resolved": "https://registry.npmjs.org/@storybook/core-client/-/core-client-6.2.9.tgz",
+      "integrity": "sha512-jW841J5lCe1Ub5ZMtzYPgCy/OUddFxxVYeHLZyuNxlH5RoiQQxbDpuFlzuZMYGuIzD6eZw+ANE4w5vW/y5oBfA==",
+      "dev": true,
+      "requires": {
+        "@storybook/addons": "6.2.9",
+        "@storybook/channel-postmessage": "6.2.9",
+        "@storybook/client-api": "6.2.9",
+        "@storybook/client-logger": "6.2.9",
+        "@storybook/core-events": "6.2.9",
         "@storybook/csf": "0.0.1",
-        "@storybook/node-logger": "5.3.19",
-        "@storybook/router": "5.3.19",
-        "@storybook/theming": "5.3.19",
-        "@storybook/ui": "5.3.19",
-        "airbnb-js-shims": "^2.2.1",
+        "@storybook/ui": "6.2.9",
         "ansi-to-html": "^0.6.11",
-        "autoprefixer": "^9.7.2",
-        "babel-plugin-add-react-displayname": "^0.0.5",
-        "babel-plugin-emotion": "^10.0.20",
-        "babel-plugin-macros": "^2.7.0",
-        "babel-preset-minify": "^0.5.0 || 0.6.0-alpha.5",
-        "boxen": "^4.1.0",
-        "case-sensitive-paths-webpack-plugin": "^2.2.0",
-        "chalk": "^3.0.0",
-        "cli-table3": "0.5.1",
-        "commander": "^4.0.1",
-        "core-js": "^3.0.1",
-        "corejs-upgrade-webpack-plugin": "^2.2.0",
-        "css-loader": "^3.0.0",
-        "detect-port": "^1.3.0",
-        "dotenv-webpack": "^1.7.0",
-        "ejs": "^2.7.4",
-        "express": "^4.17.0",
-        "file-loader": "^4.2.0",
-        "file-system-cache": "^1.0.5",
-        "find-cache-dir": "^3.0.0",
-        "find-up": "^4.1.0",
-        "fs-extra": "^8.0.1",
-        "glob-base": "^0.3.0",
-        "global": "^4.3.2",
-        "html-webpack-plugin": "^4.0.0-beta.2",
-        "inquirer": "^7.0.0",
-        "interpret": "^2.0.0",
-        "ip": "^1.1.5",
-        "json5": "^2.1.1",
-        "lazy-universal-dotenv": "^3.0.1",
-        "micromatch": "^4.0.2",
-        "node-fetch": "^2.6.0",
-        "open": "^7.0.0",
-        "pnp-webpack-plugin": "1.5.0",
-        "postcss-flexbugs-fixes": "^4.1.0",
-        "postcss-loader": "^3.0.0",
-        "pretty-hrtime": "^1.0.3",
-        "qs": "^6.6.0",
-        "raw-loader": "^3.1.0",
-        "react-dev-utils": "^9.0.0",
-        "regenerator-runtime": "^0.13.3",
-        "resolve": "^1.11.0",
-        "resolve-from": "^5.0.0",
-        "semver": "^6.0.0",
-        "serve-favicon": "^2.5.0",
-        "shelljs": "^0.8.3",
-        "style-loader": "^1.0.0",
-        "terser-webpack-plugin": "^2.1.2",
-        "ts-dedent": "^1.1.0",
-        "unfetch": "^4.1.0",
-        "url-loader": "^2.0.1",
-        "util-deprecate": "^1.0.2",
-        "webpack": "^4.33.0",
-        "webpack-dev-middleware": "^3.7.0",
-        "webpack-hot-middleware": "^2.25.0",
-        "webpack-virtual-modules": "^0.2.0"
+        "core-js": "^3.8.2",
+        "global": "^4.4.0",
+        "lodash": "^4.17.20",
+        "qs": "^6.10.0",
+        "regenerator-runtime": "^0.13.7",
+        "ts-dedent": "^2.0.0",
+        "unfetch": "^4.2.0",
+        "util-deprecate": "^1.0.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+        "@emotion/core": {
+          "version": "10.1.1",
+          "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
+          "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
+            "@babel/runtime": "^7.5.5",
+            "@emotion/cache": "^10.0.27",
+            "@emotion/css": "^10.0.27",
+            "@emotion/serialize": "^0.11.15",
+            "@emotion/sheet": "0.9.4",
+            "@emotion/utils": "0.11.3"
           }
         },
+        "@storybook/addons": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.2.9.tgz",
+          "integrity": "sha512-GnmEKbJwiN1jncN9NSA8CuR1i2XAlasPcl/Zn0jkfV9WitQeczVcJCPw86SGH84AD+tTBCyF2i9UC0KaOV1YBQ==",
+          "dev": true,
+          "requires": {
+            "@storybook/api": "6.2.9",
+            "@storybook/channels": "6.2.9",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/core-events": "6.2.9",
+            "@storybook/router": "6.2.9",
+            "@storybook/theming": "6.2.9",
+            "core-js": "^3.8.2",
+            "global": "^4.4.0",
+            "regenerator-runtime": "^0.13.7"
+          }
+        },
+        "@storybook/api": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.2.9.tgz",
+          "integrity": "sha512-okkA3HAScE9tGnYBrjTOcgzT+L1lRHNoEh3ZfGgh1u/XNEyHGNkj4grvkd6nX7BzRcYQ/l2VkcKCqmOjUnSkVQ==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.3.4",
+            "@storybook/channels": "6.2.9",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/core-events": "6.2.9",
+            "@storybook/csf": "0.0.1",
+            "@storybook/router": "6.2.9",
+            "@storybook/semver": "^7.3.2",
+            "@storybook/theming": "6.2.9",
+            "@types/reach__router": "^1.3.7",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.10.0",
+            "regenerator-runtime": "^0.13.7",
+            "store2": "^2.12.0",
+            "telejson": "^5.1.0",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/channels": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.2.9.tgz",
+          "integrity": "sha512-6dC8Fb2ipNyOQXnUZMDeEUaJGH5DMLzyHlGLhVyDtrO5WR6bO8mQdkzf4+5dSKXgCBNX0BSkssXth4pDjn18rg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/client-logger": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.2.9.tgz",
+          "integrity": "sha512-IfOQZuvpjh66qBInQCJOb9S0dTGpzZ/Cxlcvokp+PYt95KztaWN3mPm+HaDQCeRsrWNe0Bpm1zuickcJ6dBOXg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "global": "^4.4.0"
+          }
+        },
+        "@storybook/core-events": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.2.9.tgz",
+          "integrity": "sha512-xQmbX/oYQK1QsAGN8hriXX5SUKOoTUe3L4dVaVHxJqy7MReRWJpprJmCpbAPJzWS6WCbDFfCM5kVEexHLOzJlQ==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2"
+          }
+        },
+        "@storybook/router": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.2.9.tgz",
+          "integrity": "sha512-7Bn1OFoItCl8whXRT8N1qp1Lky7kzXJ3aslWp5E8HcM8rxh4OYXfbaeiyJEJxBTGC5zxgY+tAEXHFjsAviFROg==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.3.4",
+            "@storybook/client-logger": "6.2.9",
+            "@types/reach__router": "^1.3.7",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.10.0",
+            "ts-dedent": "^2.0.0"
+          }
+        },
+        "@storybook/semver": {
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/@storybook/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.6.5",
+            "find-up": "^4.1.0"
+          }
+        },
+        "@storybook/theming": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.2.9.tgz",
+          "integrity": "sha512-183oJW7AD7Fhqg5NT4ct3GJntwteAb9jZnQ6yhf9JSdY+fk8OhxRbPf7ov0au2gYACcGrWDd9K5pYQsvWlP5gA==",
+          "dev": true,
+          "requires": {
+            "@emotion/core": "^10.1.1",
+            "@emotion/is-prop-valid": "^0.8.6",
+            "@emotion/styled": "^10.0.27",
+            "@storybook/client-logger": "6.2.9",
+            "core-js": "^3.8.2",
+            "deep-object-diff": "^1.1.0",
+            "emotion-theming": "^10.0.27",
+            "global": "^4.4.0",
+            "memoizerific": "^1.11.3",
+            "polished": "^4.0.5",
+            "resolve-from": "^5.0.0",
+            "ts-dedent": "^2.0.0"
+          }
+        },
+        "@types/reach__router": {
+          "version": "1.3.7",
+          "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.7.tgz",
+          "integrity": "sha512-cyBEb8Ef3SJNH5NYEIDGPoMMmYUxROatuxbICusVRQIqZUB85UCt6R2Ok60tKS/TABJsJYaHyNTW3kqbpxlMjg==",
+          "dev": true,
+          "requires": {
+            "@types/react": "*"
+          }
+        },
+        "core-js": {
+          "version": "3.11.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.1.tgz",
+          "integrity": "sha512-k93Isqg7e4txZWMGNYwevZL9MiogLk8pd1PtwrmFmi8IBq4GXqUaVW/a33Llt6amSI36uSjd0GWwc9pTT9ALlQ==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "polished": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/polished/-/polished-4.1.2.tgz",
+          "integrity": "sha512-jq4t3PJUpVRcveC53nnbEX35VyQI05x3tniwp26WFdm1dwaNUBHAi5awa/roBlwQxx1uRhwNSYeAi/aMbfiJCQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.17"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.14.0",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+              "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+              "dev": true,
+              "requires": {
+                "regenerator-runtime": "^0.13.4"
+              }
+            }
+          }
+        },
+        "qs": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
+          "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.7",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+          "dev": true
+        },
+        "store2": {
+          "version": "2.12.0",
+          "resolved": "https://registry.npmjs.org/store2/-/store2-2.12.0.tgz",
+          "integrity": "sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==",
+          "dev": true
+        },
+        "telejson": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.1.1.tgz",
+          "integrity": "sha512-aU7x+nwodmODJPXhU9sC/REOcX/dx1tNbyeOFV1PCTh6e9Mj+bnyfQ7sr13zfJYya9BtpGwnUNn9Fd76Ybj2eg==",
+          "dev": true,
+          "requires": {
+            "@types/is-function": "^1.0.0",
+            "global": "^4.4.0",
+            "is-function": "^1.0.2",
+            "is-regex": "^1.1.2",
+            "is-symbol": "^1.0.3",
+            "isobject": "^4.0.0",
+            "lodash": "^4.17.21",
+            "memoizerific": "^1.11.3"
+          }
+        },
+        "ts-dedent": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.1.1.tgz",
+          "integrity": "sha512-riHuwnzAUCfdIeTBNUq7+Yj+ANnrMXo/7+Z74dIdudS7ys2k8aSGMzpJRMFDF7CLwUTbtvi1ZZff/Wl+XxmqIA==",
+          "dev": true
+        }
+      }
+    },
+    "@storybook/core-common": {
+      "version": "6.2.9",
+      "resolved": "https://registry.npmjs.org/@storybook/core-common/-/core-common-6.2.9.tgz",
+      "integrity": "sha512-ve0Qb4EMit8jGibfZBprmaU2i4LtpB4vSMIzD9nB1YeBmw2cGhHubtmayZ0TwcV3fPQhtYH9wwRWuWyzzHyQyw==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.12.10",
+        "@babel/plugin-proposal-class-properties": "^7.12.1",
+        "@babel/plugin-proposal-decorators": "^7.12.12",
+        "@babel/plugin-proposal-export-default-from": "^7.12.1",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
+        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+        "@babel/plugin-proposal-optional-chaining": "^7.12.7",
+        "@babel/plugin-proposal-private-methods": "^7.12.1",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-transform-arrow-functions": "^7.12.1",
+        "@babel/plugin-transform-block-scoping": "^7.12.12",
+        "@babel/plugin-transform-classes": "^7.12.1",
+        "@babel/plugin-transform-destructuring": "^7.12.1",
+        "@babel/plugin-transform-for-of": "^7.12.1",
+        "@babel/plugin-transform-parameters": "^7.12.1",
+        "@babel/plugin-transform-shorthand-properties": "^7.12.1",
+        "@babel/plugin-transform-spread": "^7.12.1",
+        "@babel/preset-env": "^7.12.11",
+        "@babel/preset-react": "^7.12.10",
+        "@babel/preset-typescript": "^7.12.7",
+        "@babel/register": "^7.12.1",
+        "@storybook/node-logger": "6.2.9",
+        "@storybook/semver": "^7.3.2",
+        "@types/glob-base": "^0.3.0",
+        "@types/micromatch": "^4.0.1",
+        "@types/node": "^14.0.10",
+        "@types/pretty-hrtime": "^1.0.0",
+        "babel-loader": "^8.2.2",
+        "babel-plugin-macros": "^3.0.1",
+        "babel-plugin-polyfill-corejs3": "^0.1.0",
+        "chalk": "^4.1.0",
+        "core-js": "^3.8.2",
+        "express": "^4.17.1",
+        "file-system-cache": "^1.0.5",
+        "find-up": "^5.0.0",
+        "fork-ts-checker-webpack-plugin": "^6.0.4",
+        "glob": "^7.1.6",
+        "glob-base": "^0.3.0",
+        "interpret": "^2.2.0",
+        "json5": "^2.1.3",
+        "lazy-universal-dotenv": "^3.0.1",
+        "micromatch": "^4.0.2",
+        "pkg-dir": "^5.0.0",
+        "pretty-hrtime": "^1.0.3",
+        "resolve-from": "^5.0.0",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2",
+        "webpack": "4"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.12.13"
+          }
+        },
+        "@babel/core": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.0.tgz",
+          "integrity": "sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.14.0",
+            "@babel/helper-compilation-targets": "^7.13.16",
+            "@babel/helper-module-transforms": "^7.14.0",
+            "@babel/helpers": "^7.14.0",
+            "@babel/parser": "^7.14.0",
+            "@babel/template": "^7.12.13",
+            "@babel/traverse": "^7.14.0",
+            "@babel/types": "^7.14.0",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.1.0",
+            "gensync": "^1.0.0-beta.2",
+            "json5": "^2.1.2",
+            "semver": "^6.3.0",
+            "source-map": "^0.5.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "6.3.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+              "dev": true
+            }
+          }
+        },
+        "@babel/generator": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.0.tgz",
+          "integrity": "sha512-C6u00HbmsrNPug6A+CiNl8rEys7TsdcXwg12BHi2ca5rUfAs3+UwZsuDQSXnc+wCElCXMB8gMaJ3YXDdh8fAlg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.14.0",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-create-class-features-plugin": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.0.tgz",
+          "integrity": "sha512-6pXDPguA5zC40Y8oI5mqr+jEUpjMJonKvknvA+vD8CYDz5uuXEwWBK8sRAsE/t3gfb1k15AQb9RhwpscC4nUJQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-annotate-as-pure": "^7.12.13",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-member-expression-to-functions": "^7.13.12",
+            "@babel/helper-optimise-call-expression": "^7.12.13",
+            "@babel/helper-replace-supers": "^7.13.12",
+            "@babel/helper-split-export-declaration": "^7.12.13"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/helpers": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz",
+          "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.12.13",
+            "@babel/traverse": "^7.14.0",
+            "@babel/types": "^7.14.0"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          },
+          "dependencies": {
+            "chalk": {
+              "version": "2.4.2",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+              }
+            }
+          }
+        },
+        "@babel/parser": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
+          "dev": true
+        },
+        "@babel/plugin-proposal-decorators": {
+          "version": "7.13.15",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.15.tgz",
+          "integrity": "sha512-ibAMAqUm97yzi+LPgdr5Nqb9CMkeieGHvwPg1ywSGjZrZHQEGqE01HmOio8kxRpA/+VtOHouIVy2FMpBbtltjA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-create-class-features-plugin": "^7.13.11",
+            "@babel/helper-plugin-utils": "^7.13.0",
+            "@babel/plugin-syntax-decorators": "^7.12.13"
+          }
+        },
+        "@babel/plugin-syntax-decorators": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz",
+          "integrity": "sha512-Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.12.13"
+          }
+        },
+        "@babel/runtime": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+          "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+          "dev": true,
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "@babel/template": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
+          "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.14.0",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-split-export-declaration": "^7.12.13",
+            "@babel/parser": "^7.14.0",
+            "@babel/types": "^7.14.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "@storybook/semver": {
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/@storybook/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.6.5",
+            "find-up": "^4.1.0"
+          },
+          "dependencies": {
+            "find-up": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+              "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+              "dev": true,
+              "requires": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+              }
+            }
+          }
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true
+        },
+        "anymatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "babel-loader": {
+          "version": "8.2.2",
+          "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
+          "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+          "dev": true,
+          "requires": {
+            "find-cache-dir": "^3.3.1",
+            "loader-utils": "^1.4.0",
+            "make-dir": "^3.1.0",
+            "schema-utils": "^2.6.5"
+          }
+        },
+        "babel-plugin-macros": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.0.1.tgz",
+          "integrity": "sha512-CKt4+Oy9k2wiN+hT1uZzOw7d8zb1anbQpf7KLwaaXRCi/4pzKdFKHf7v5mvoPmjkmxshh7eKZQuRop06r5WP4w==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.12.5",
+            "cosmiconfig": "^7.0.0",
+            "resolve": "^1.19.0"
+          }
+        },
+        "binary-extensions": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+          "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+          "dev": true
+        },
         "braces": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
@@ -4607,13 +7452,920 @@
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "4.3.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+              "dev": true,
+              "requires": {
+                "color-convert": "^2.0.1"
+              }
+            },
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
+        "chokidar": {
+          "version": "3.5.1",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+          "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+          "dev": true,
+          "requires": {
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.3.1",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.5.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "core-js": {
+          "version": "3.11.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.1.tgz",
+          "integrity": "sha512-k93Isqg7e4txZWMGNYwevZL9MiogLk8pd1PtwrmFmi8IBq4GXqUaVW/a33Llt6amSI36uSjd0GWwc9pTT9ALlQ==",
+          "dev": true
+        },
+        "cosmiconfig": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+          "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+          "dev": true,
+          "requires": {
+            "@types/parse-json": "^4.0.0",
+            "import-fresh": "^3.2.1",
+            "parse-json": "^5.0.0",
+            "path-type": "^4.0.0",
+            "yaml": "^1.10.0"
+          }
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "find-cache-dir": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^3.0.2",
+            "pkg-dir": "^4.1.0"
+          },
+          "dependencies": {
+            "find-up": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+              "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+              "dev": true,
+              "requires": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+              }
+            },
+            "pkg-dir": {
+              "version": "4.2.0",
+              "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+              "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+              "dev": true,
+              "requires": {
+                "find-up": "^4.0.0"
+              }
+            }
+          }
+        },
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          },
+          "dependencies": {
+            "locate-path": {
+              "version": "6.0.0",
+              "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+              "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+              "dev": true,
+              "requires": {
+                "p-locate": "^5.0.0"
+              }
+            },
+            "p-limit": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+              "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+              "dev": true,
+              "requires": {
+                "yocto-queue": "^0.1.0"
+              }
+            },
+            "p-locate": {
+              "version": "5.0.0",
+              "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+              "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+              "dev": true,
+              "requires": {
+                "p-limit": "^3.0.2"
+              }
+            }
+          }
+        },
+        "fork-ts-checker-webpack-plugin": {
+          "version": "6.2.5",
+          "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.5.tgz",
+          "integrity": "sha512-EqHkTmxOotb5WJEc8kjzJh8IRuRUpHxtBh+jGyOHJcEwwZzqTmlMNAJsVF3tvALohi9yJzV8C1j215DyK8Ta8w==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.8.3",
+            "@types/json-schema": "^7.0.5",
+            "chalk": "^4.1.0",
+            "chokidar": "^3.4.2",
+            "cosmiconfig": "^6.0.0",
+            "deepmerge": "^4.2.2",
+            "fs-extra": "^9.0.0",
+            "memfs": "^3.1.2",
+            "minimatch": "^3.0.4",
+            "schema-utils": "2.7.0",
+            "semver": "^7.3.2",
+            "tapable": "^1.0.0"
+          },
+          "dependencies": {
+            "cosmiconfig": {
+              "version": "6.0.0",
+              "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
+              "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+              "dev": true,
+              "requires": {
+                "@types/parse-json": "^4.0.0",
+                "import-fresh": "^3.1.0",
+                "parse-json": "^5.0.0",
+                "path-type": "^4.0.0",
+                "yaml": "^1.7.2"
+              }
+            },
+            "schema-utils": {
+              "version": "2.7.0",
+              "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
+              "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+              "dev": true,
+              "requires": {
+                "@types/json-schema": "^7.0.4",
+                "ajv": "^6.12.2",
+                "ajv-keywords": "^3.4.1"
+              }
+            },
+            "semver": {
+              "version": "7.3.5",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+              "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+              "dev": true,
+              "requires": {
+                "lru-cache": "^6.0.0"
+              }
+            }
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-binary-path": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+          "dev": true,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "json5": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          },
+          "dependencies": {
+            "json5": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+              "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+              "dev": true,
+              "requires": {
+                "minimist": "^1.2.0"
+              }
+            }
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "make-dir": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "6.3.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+              "dev": true
+            }
+          }
+        },
+        "micromatch": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.2.3"
+          },
+          "dependencies": {
+            "picomatch": {
+              "version": "2.2.3",
+              "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+              "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+              "dev": true
+            }
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
+          "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
+          "dev": true,
+          "requires": {
+            "find-up": "^5.0.0"
+          }
+        },
+        "readdirp": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+          "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+          "dev": true,
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.7",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+          "dev": true
+        },
+        "resolve": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+          "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.2.0",
+            "path-parse": "^1.0.6"
+          }
+        },
+        "schema-utils": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+          "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.5",
+            "ajv": "^6.12.4",
+            "ajv-keywords": "^3.5.2"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        },
+        "ts-dedent": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.1.1.tgz",
+          "integrity": "sha512-riHuwnzAUCfdIeTBNUq7+Yj+ANnrMXo/7+Z74dIdudS7ys2k8aSGMzpJRMFDF7CLwUTbtvi1ZZff/Wl+XxmqIA==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        },
+        "yaml": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+          "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+          "dev": true
+        }
+      }
+    },
+    "@storybook/core-events": {
+      "version": "5.3.19",
+      "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-5.3.19.tgz",
+      "integrity": "sha512-lh78ySqMS7pDdMJAQAe35d1I/I4yPTqp09Cq0YIYOxx9BQZhah4DZTV1QIZt22H5p2lPb5MWLkWSxBaexZnz8A==",
+      "dev": true,
+      "requires": {
+        "core-js": "^3.0.1"
+      }
+    },
+    "@storybook/core-server": {
+      "version": "6.2.9",
+      "resolved": "https://registry.npmjs.org/@storybook/core-server/-/core-server-6.2.9.tgz",
+      "integrity": "sha512-DzihO73pj1Ro0Y4tq9hjw2mLMUYeSRPrx7CndCOBxcTHCKQ8Kd7Dee3wJ49t5/19V7TW1+4lYR59GAy73FeOAQ==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.12.10",
+        "@babel/plugin-transform-template-literals": "^7.12.1",
+        "@babel/preset-react": "^7.12.10",
+        "@storybook/addons": "6.2.9",
+        "@storybook/builder-webpack4": "6.2.9",
+        "@storybook/core-client": "6.2.9",
+        "@storybook/core-common": "6.2.9",
+        "@storybook/node-logger": "6.2.9",
+        "@storybook/semver": "^7.3.2",
+        "@storybook/theming": "6.2.9",
+        "@storybook/ui": "6.2.9",
+        "@types/node": "^14.0.10",
+        "@types/node-fetch": "^2.5.7",
+        "@types/pretty-hrtime": "^1.0.0",
+        "@types/webpack": "^4.41.26",
+        "airbnb-js-shims": "^2.2.1",
+        "babel-loader": "^8.2.2",
+        "better-opn": "^2.1.1",
+        "boxen": "^4.2.0",
+        "case-sensitive-paths-webpack-plugin": "^2.3.0",
+        "chalk": "^4.1.0",
+        "cli-table3": "0.6.0",
+        "commander": "^6.2.1",
+        "core-js": "^3.8.2",
+        "cpy": "^8.1.1",
+        "css-loader": "^3.6.0",
+        "detect-port": "^1.3.0",
+        "dotenv-webpack": "^1.8.0",
+        "express": "^4.17.1",
+        "file-loader": "^6.2.0",
+        "file-system-cache": "^1.0.5",
+        "find-up": "^5.0.0",
+        "fs-extra": "^9.0.1",
+        "global": "^4.4.0",
+        "html-webpack-plugin": "^4.0.0",
+        "ip": "^1.1.5",
+        "node-fetch": "^2.6.1",
+        "pnp-webpack-plugin": "1.6.4",
+        "pretty-hrtime": "^1.0.3",
+        "prompts": "^2.4.0",
+        "read-pkg-up": "^7.0.1",
+        "regenerator-runtime": "^0.13.7",
+        "resolve-from": "^5.0.0",
+        "serve-favicon": "^2.5.0",
+        "style-loader": "^1.3.0",
+        "telejson": "^5.1.0",
+        "terser-webpack-plugin": "^3.1.0",
+        "ts-dedent": "^2.0.0",
+        "url-loader": "^4.1.1",
+        "util-deprecate": "^1.0.2",
+        "webpack": "4",
+        "webpack-dev-middleware": "^3.7.3",
+        "webpack-virtual-modules": "^0.2.2"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.12.13"
+          }
+        },
+        "@babel/core": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.0.tgz",
+          "integrity": "sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.14.0",
+            "@babel/helper-compilation-targets": "^7.13.16",
+            "@babel/helper-module-transforms": "^7.14.0",
+            "@babel/helpers": "^7.14.0",
+            "@babel/parser": "^7.14.0",
+            "@babel/template": "^7.12.13",
+            "@babel/traverse": "^7.14.0",
+            "@babel/types": "^7.14.0",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.1.0",
+            "gensync": "^1.0.0-beta.2",
+            "json5": "^2.1.2",
+            "semver": "^6.3.0",
+            "source-map": "^0.5.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "6.3.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+              "dev": true
+            }
+          }
+        },
+        "@babel/generator": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.0.tgz",
+          "integrity": "sha512-C6u00HbmsrNPug6A+CiNl8rEys7TsdcXwg12BHi2ca5rUfAs3+UwZsuDQSXnc+wCElCXMB8gMaJ3YXDdh8fAlg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.14.0",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/helpers": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz",
+          "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.12.13",
+            "@babel/traverse": "^7.14.0",
+            "@babel/types": "^7.14.0"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          },
+          "dependencies": {
+            "chalk": {
+              "version": "2.4.2",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+              }
+            }
+          }
+        },
+        "@babel/parser": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
+          "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.14.0",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-split-export-declaration": "^7.12.13",
+            "@babel/parser": "^7.14.0",
+            "@babel/types": "^7.14.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "@emotion/core": {
+          "version": "10.1.1",
+          "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
+          "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.5.5",
+            "@emotion/cache": "^10.0.27",
+            "@emotion/css": "^10.0.27",
+            "@emotion/serialize": "^0.11.15",
+            "@emotion/sheet": "0.9.4",
+            "@emotion/utils": "0.11.3"
+          }
+        },
+        "@storybook/addons": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.2.9.tgz",
+          "integrity": "sha512-GnmEKbJwiN1jncN9NSA8CuR1i2XAlasPcl/Zn0jkfV9WitQeczVcJCPw86SGH84AD+tTBCyF2i9UC0KaOV1YBQ==",
+          "dev": true,
+          "requires": {
+            "@storybook/api": "6.2.9",
+            "@storybook/channels": "6.2.9",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/core-events": "6.2.9",
+            "@storybook/router": "6.2.9",
+            "@storybook/theming": "6.2.9",
+            "core-js": "^3.8.2",
+            "global": "^4.4.0",
+            "regenerator-runtime": "^0.13.7"
+          }
+        },
+        "@storybook/api": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.2.9.tgz",
+          "integrity": "sha512-okkA3HAScE9tGnYBrjTOcgzT+L1lRHNoEh3ZfGgh1u/XNEyHGNkj4grvkd6nX7BzRcYQ/l2VkcKCqmOjUnSkVQ==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.3.4",
+            "@storybook/channels": "6.2.9",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/core-events": "6.2.9",
+            "@storybook/csf": "0.0.1",
+            "@storybook/router": "6.2.9",
+            "@storybook/semver": "^7.3.2",
+            "@storybook/theming": "6.2.9",
+            "@types/reach__router": "^1.3.7",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.10.0",
+            "regenerator-runtime": "^0.13.7",
+            "store2": "^2.12.0",
+            "telejson": "^5.1.0",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/channels": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.2.9.tgz",
+          "integrity": "sha512-6dC8Fb2ipNyOQXnUZMDeEUaJGH5DMLzyHlGLhVyDtrO5WR6bO8mQdkzf4+5dSKXgCBNX0BSkssXth4pDjn18rg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/client-logger": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.2.9.tgz",
+          "integrity": "sha512-IfOQZuvpjh66qBInQCJOb9S0dTGpzZ/Cxlcvokp+PYt95KztaWN3mPm+HaDQCeRsrWNe0Bpm1zuickcJ6dBOXg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "global": "^4.4.0"
+          }
+        },
+        "@storybook/core-events": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.2.9.tgz",
+          "integrity": "sha512-xQmbX/oYQK1QsAGN8hriXX5SUKOoTUe3L4dVaVHxJqy7MReRWJpprJmCpbAPJzWS6WCbDFfCM5kVEexHLOzJlQ==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2"
+          }
+        },
+        "@storybook/router": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.2.9.tgz",
+          "integrity": "sha512-7Bn1OFoItCl8whXRT8N1qp1Lky7kzXJ3aslWp5E8HcM8rxh4OYXfbaeiyJEJxBTGC5zxgY+tAEXHFjsAviFROg==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.3.4",
+            "@storybook/client-logger": "6.2.9",
+            "@types/reach__router": "^1.3.7",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.10.0",
+            "ts-dedent": "^2.0.0"
+          }
+        },
+        "@storybook/semver": {
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/@storybook/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.6.5",
+            "find-up": "^4.1.0"
+          },
+          "dependencies": {
+            "find-up": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+              "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+              "dev": true,
+              "requires": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+              }
+            }
+          }
+        },
+        "@storybook/theming": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.2.9.tgz",
+          "integrity": "sha512-183oJW7AD7Fhqg5NT4ct3GJntwteAb9jZnQ6yhf9JSdY+fk8OhxRbPf7ov0au2gYACcGrWDd9K5pYQsvWlP5gA==",
+          "dev": true,
+          "requires": {
+            "@emotion/core": "^10.1.1",
+            "@emotion/is-prop-valid": "^0.8.6",
+            "@emotion/styled": "^10.0.27",
+            "@storybook/client-logger": "6.2.9",
+            "core-js": "^3.8.2",
+            "deep-object-diff": "^1.1.0",
+            "emotion-theming": "^10.0.27",
+            "global": "^4.4.0",
+            "memoizerific": "^1.11.3",
+            "polished": "^4.0.5",
+            "resolve-from": "^5.0.0",
+            "ts-dedent": "^2.0.0"
+          }
+        },
+        "@types/reach__router": {
+          "version": "1.3.7",
+          "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.7.tgz",
+          "integrity": "sha512-cyBEb8Ef3SJNH5NYEIDGPoMMmYUxROatuxbICusVRQIqZUB85UCt6R2Ok60tKS/TABJsJYaHyNTW3kqbpxlMjg==",
+          "dev": true,
+          "requires": {
+            "@types/react": "*"
+          }
+        },
+        "@types/webpack": {
+          "version": "4.41.27",
+          "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.27.tgz",
+          "integrity": "sha512-wK/oi5gcHi72VMTbOaQ70VcDxSQ1uX8S2tukBK9ARuGXrYM/+u4ou73roc7trXDNmCxCoerE8zruQqX/wuHszA==",
+          "dev": true,
+          "requires": {
+            "@types/anymatch": "*",
+            "@types/node": "*",
+            "@types/tapable": "^1",
+            "@types/uglify-js": "*",
+            "@types/webpack-sources": "*",
+            "source-map": "^0.6.0"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.6.1",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+              "dev": true
+            }
+          }
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true
+        },
+        "babel-loader": {
+          "version": "8.2.2",
+          "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
+          "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+          "dev": true,
+          "requires": {
+            "find-cache-dir": "^3.3.1",
+            "loader-utils": "^1.4.0",
+            "make-dir": "^3.1.0",
+            "schema-utils": "^2.6.5"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "4.3.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+              "dev": true,
+              "requires": {
+                "color-convert": "^2.0.1"
+              }
+            },
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
           }
         },
         "color-convert": {
@@ -4632,28 +8384,77 @@
           "dev": true
         },
         "commander": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+          "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
           "dev": true
         },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+        "core-js": {
+          "version": "3.11.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.1.tgz",
+          "integrity": "sha512-k93Isqg7e4txZWMGNYwevZL9MiogLk8pd1PtwrmFmi8IBq4GXqUaVW/a33Llt6amSI36uSjd0GWwc9pTT9ALlQ==",
+          "dev": true
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "find-cache-dir": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
           "dev": true,
           "requires": {
-            "to-regex-range": "^5.0.1"
+            "commondir": "^1.0.1",
+            "make-dir": "^3.0.2",
+            "pkg-dir": "^4.1.0"
           }
         },
         "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
           "dev": true,
           "requires": {
-            "locate-path": "^5.0.0",
+            "locate-path": "^6.0.0",
             "path-exists": "^4.0.0"
+          },
+          "dependencies": {
+            "locate-path": {
+              "version": "6.0.0",
+              "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+              "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+              "dev": true,
+              "requires": {
+                "p-locate": "^5.0.0"
+              }
+            },
+            "p-limit": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+              "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+              "dev": true,
+              "requires": {
+                "yocto-queue": "^0.1.0"
+              }
+            },
+            "p-locate": {
+              "version": "5.0.0",
+              "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+              "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+              "dev": true,
+              "requires": {
+                "p-limit": "^3.0.2"
+              }
+            }
           }
         },
         "has-flag": {
@@ -4662,11 +8463,46 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "json5": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          },
+          "dependencies": {
+            "json5": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+              "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+              "dev": true,
+              "requires": {
+                "minimist": "^1.2.0"
+              }
+            }
+          }
         },
         "locate-path": {
           "version": "5.0.0",
@@ -4677,20 +8513,39 @@
             "p-locate": "^4.1.0"
           }
         },
-        "micromatch": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
+        "make-dir": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
           "dev": true,
           "requires": {
-            "braces": "^3.0.1",
-            "picomatch": "^2.0.5"
+            "semver": "^6.0.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "6.3.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+              "dev": true
+            }
           }
         },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
         "node-fetch": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-          "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+          "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
           "dev": true
         },
         "p-locate": {
@@ -4708,41 +8563,103 @@
           "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
         },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "dev": true,
+          "requires": {
+            "find-up": "^4.0.0"
+          },
+          "dependencies": {
+            "find-up": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+              "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+              "dev": true,
+              "requires": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+              }
+            }
+          }
+        },
+        "polished": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/polished/-/polished-4.1.2.tgz",
+          "integrity": "sha512-jq4t3PJUpVRcveC53nnbEX35VyQI05x3tniwp26WFdm1dwaNUBHAi5awa/roBlwQxx1uRhwNSYeAi/aMbfiJCQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.17"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.14.0",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+              "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+              "dev": true,
+              "requires": {
+                "regenerator-runtime": "^0.13.4"
+              }
+            }
+          }
+        },
+        "qs": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
+          "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.7",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+        "schema-utils": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+          "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "@types/json-schema": "^7.0.5",
+            "ajv": "^6.12.4",
+            "ajv-keywords": "^3.5.2"
           }
         },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+        "store2": {
+          "version": "2.12.0",
+          "resolved": "https://registry.npmjs.org/store2/-/store2-2.12.0.tgz",
+          "integrity": "sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==",
+          "dev": true
+        },
+        "telejson": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.1.1.tgz",
+          "integrity": "sha512-aU7x+nwodmODJPXhU9sC/REOcX/dx1tNbyeOFV1PCTh6e9Mj+bnyfQ7sr13zfJYya9BtpGwnUNn9Fd76Ybj2eg==",
           "dev": true,
           "requires": {
-            "is-number": "^7.0.0"
+            "@types/is-function": "^1.0.0",
+            "global": "^4.4.0",
+            "is-function": "^1.0.2",
+            "is-regex": "^1.1.2",
+            "is-symbol": "^1.0.3",
+            "isobject": "^4.0.0",
+            "lodash": "^4.17.21",
+            "memoizerific": "^1.11.3"
           }
+        },
+        "ts-dedent": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.1.1.tgz",
+          "integrity": "sha512-riHuwnzAUCfdIeTBNUq7+Yj+ANnrMXo/7+Z74dIdudS7ys2k8aSGMzpJRMFDF7CLwUTbtvi1ZZff/Wl+XxmqIA==",
+          "dev": true
         }
       }
     },
-    "@storybook/core-events": {
-      "version": "5.3.19",
-      "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-5.3.19.tgz",
-      "integrity": "sha512-lh78ySqMS7pDdMJAQAe35d1I/I4yPTqp09Cq0YIYOxx9BQZhah4DZTV1QIZt22H5p2lPb5MWLkWSxBaexZnz8A==",
-      "dev": true,
-      "requires": {
-        "core-js": "^3.0.1"
-      }
-    },
     "@storybook/csf": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.0.1.tgz",
@@ -4753,33 +8670,31 @@
       }
     },
     "@storybook/node-logger": {
-      "version": "5.3.19",
-      "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-5.3.19.tgz",
-      "integrity": "sha512-hKshig/u5Nj9fWy0OsyU04yqCxr0A9pydOHIassr4fpLAaePIN2YvqCqE2V+TxQHjZUnowSSIhbXrGt0DI5q2A==",
+      "version": "6.2.9",
+      "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-6.2.9.tgz",
+      "integrity": "sha512-ryRBChWZf1A5hOVONErJZosS25IdMweoMVFAUAcj91iC0ynoSA6YL2jmoE71jQchxEXEgkDeRkX9lR/GlqFGZQ==",
       "dev": true,
       "requires": {
         "@types/npmlog": "^4.1.2",
-        "chalk": "^3.0.0",
-        "core-js": "^3.0.1",
+        "chalk": "^4.1.0",
+        "core-js": "^3.8.2",
         "npmlog": "^4.1.2",
-        "pretty-hrtime": "^1.0.3",
-        "regenerator-runtime": "^0.13.3"
+        "pretty-hrtime": "^1.0.3"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -4801,6 +8716,12 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "core-js": {
+          "version": "3.11.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.1.tgz",
+          "integrity": "sha512-k93Isqg7e4txZWMGNYwevZL9MiogLk8pd1PtwrmFmi8IBq4GXqUaVW/a33Llt6amSI36uSjd0GWwc9pTT9ALlQ==",
+          "dev": true
+        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -4808,9 +8729,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -4819,38 +8740,305 @@
       }
     },
     "@storybook/react": {
-      "version": "5.3.19",
-      "resolved": "https://registry.npmjs.org/@storybook/react/-/react-5.3.19.tgz",
-      "integrity": "sha512-OBRUqol3YLQi/qE55x2pWkv4YpaAmmfj6/Km+7agx+og+oNQl0nnlXy7r27X/4j3ERczzURa5pJHtSjwiNaJNw==",
+      "version": "6.2.9",
+      "resolved": "https://registry.npmjs.org/@storybook/react/-/react-6.2.9.tgz",
+      "integrity": "sha512-glvw+o/Vek2oapYIXCYDK6gm3cuSnx0XdOpiJVcXk3KLb8JfLbdzGYYp6dcWUbyOBqGcGFRpXIgMmkcwgn+fvQ==",
       "dev": true,
       "requires": {
-        "@babel/plugin-transform-react-constant-elements": "^7.6.3",
-        "@babel/preset-flow": "^7.0.0",
-        "@babel/preset-react": "^7.0.0",
-        "@storybook/addons": "5.3.19",
-        "@storybook/core": "5.3.19",
-        "@storybook/node-logger": "5.3.19",
-        "@svgr/webpack": "^4.0.3",
-        "@types/webpack-env": "^1.15.0",
+        "@babel/preset-flow": "^7.12.1",
+        "@babel/preset-react": "^7.12.10",
+        "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
+        "@storybook/addons": "6.2.9",
+        "@storybook/core": "6.2.9",
+        "@storybook/core-common": "6.2.9",
+        "@storybook/node-logger": "6.2.9",
+        "@storybook/semver": "^7.3.2",
+        "@types/webpack-env": "^1.16.0",
         "babel-plugin-add-react-displayname": "^0.0.5",
         "babel-plugin-named-asset-import": "^0.3.1",
-        "babel-plugin-react-docgen": "^4.0.0",
-        "core-js": "^3.0.1",
-        "global": "^4.3.2",
-        "lodash": "^4.17.15",
-        "mini-css-extract-plugin": "^0.7.0",
+        "babel-plugin-react-docgen": "^4.2.1",
+        "core-js": "^3.8.2",
+        "global": "^4.4.0",
+        "lodash": "^4.17.20",
         "prop-types": "^15.7.2",
-        "react-dev-utils": "^9.0.0",
-        "regenerator-runtime": "^0.13.3",
-        "semver": "^6.0.0",
-        "ts-dedent": "^1.1.0",
-        "webpack": "^4.33.0"
+        "react-dev-utils": "^11.0.3",
+        "react-docgen-typescript-plugin": "^0.6.2",
+        "react-refresh": "^0.8.3",
+        "read-pkg-up": "^7.0.1",
+        "regenerator-runtime": "^0.13.7",
+        "ts-dedent": "^2.0.0",
+        "webpack": "4"
       },
       "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+        "@emotion/core": {
+          "version": "10.1.1",
+          "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
+          "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.5.5",
+            "@emotion/cache": "^10.0.27",
+            "@emotion/css": "^10.0.27",
+            "@emotion/serialize": "^0.11.15",
+            "@emotion/sheet": "0.9.4",
+            "@emotion/utils": "0.11.3"
+          }
+        },
+        "@storybook/addons": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.2.9.tgz",
+          "integrity": "sha512-GnmEKbJwiN1jncN9NSA8CuR1i2XAlasPcl/Zn0jkfV9WitQeczVcJCPw86SGH84AD+tTBCyF2i9UC0KaOV1YBQ==",
+          "dev": true,
+          "requires": {
+            "@storybook/api": "6.2.9",
+            "@storybook/channels": "6.2.9",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/core-events": "6.2.9",
+            "@storybook/router": "6.2.9",
+            "@storybook/theming": "6.2.9",
+            "core-js": "^3.8.2",
+            "global": "^4.4.0",
+            "regenerator-runtime": "^0.13.7"
+          }
+        },
+        "@storybook/api": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.2.9.tgz",
+          "integrity": "sha512-okkA3HAScE9tGnYBrjTOcgzT+L1lRHNoEh3ZfGgh1u/XNEyHGNkj4grvkd6nX7BzRcYQ/l2VkcKCqmOjUnSkVQ==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.3.4",
+            "@storybook/channels": "6.2.9",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/core-events": "6.2.9",
+            "@storybook/csf": "0.0.1",
+            "@storybook/router": "6.2.9",
+            "@storybook/semver": "^7.3.2",
+            "@storybook/theming": "6.2.9",
+            "@types/reach__router": "^1.3.7",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.10.0",
+            "regenerator-runtime": "^0.13.7",
+            "store2": "^2.12.0",
+            "telejson": "^5.1.0",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/channels": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.2.9.tgz",
+          "integrity": "sha512-6dC8Fb2ipNyOQXnUZMDeEUaJGH5DMLzyHlGLhVyDtrO5WR6bO8mQdkzf4+5dSKXgCBNX0BSkssXth4pDjn18rg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/client-logger": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.2.9.tgz",
+          "integrity": "sha512-IfOQZuvpjh66qBInQCJOb9S0dTGpzZ/Cxlcvokp+PYt95KztaWN3mPm+HaDQCeRsrWNe0Bpm1zuickcJ6dBOXg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "global": "^4.4.0"
+          }
+        },
+        "@storybook/core-events": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.2.9.tgz",
+          "integrity": "sha512-xQmbX/oYQK1QsAGN8hriXX5SUKOoTUe3L4dVaVHxJqy7MReRWJpprJmCpbAPJzWS6WCbDFfCM5kVEexHLOzJlQ==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2"
+          }
+        },
+        "@storybook/router": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.2.9.tgz",
+          "integrity": "sha512-7Bn1OFoItCl8whXRT8N1qp1Lky7kzXJ3aslWp5E8HcM8rxh4OYXfbaeiyJEJxBTGC5zxgY+tAEXHFjsAviFROg==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.3.4",
+            "@storybook/client-logger": "6.2.9",
+            "@types/reach__router": "^1.3.7",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.10.0",
+            "ts-dedent": "^2.0.0"
+          }
+        },
+        "@storybook/semver": {
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/@storybook/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.6.5",
+            "find-up": "^4.1.0"
+          }
+        },
+        "@storybook/theming": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.2.9.tgz",
+          "integrity": "sha512-183oJW7AD7Fhqg5NT4ct3GJntwteAb9jZnQ6yhf9JSdY+fk8OhxRbPf7ov0au2gYACcGrWDd9K5pYQsvWlP5gA==",
+          "dev": true,
+          "requires": {
+            "@emotion/core": "^10.1.1",
+            "@emotion/is-prop-valid": "^0.8.6",
+            "@emotion/styled": "^10.0.27",
+            "@storybook/client-logger": "6.2.9",
+            "core-js": "^3.8.2",
+            "deep-object-diff": "^1.1.0",
+            "emotion-theming": "^10.0.27",
+            "global": "^4.4.0",
+            "memoizerific": "^1.11.3",
+            "polished": "^4.0.5",
+            "resolve-from": "^5.0.0",
+            "ts-dedent": "^2.0.0"
+          }
+        },
+        "@types/reach__router": {
+          "version": "1.3.7",
+          "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.7.tgz",
+          "integrity": "sha512-cyBEb8Ef3SJNH5NYEIDGPoMMmYUxROatuxbICusVRQIqZUB85UCt6R2Ok60tKS/TABJsJYaHyNTW3kqbpxlMjg==",
+          "dev": true,
+          "requires": {
+            "@types/react": "*"
+          }
+        },
+        "core-js": {
+          "version": "3.11.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.1.tgz",
+          "integrity": "sha512-k93Isqg7e4txZWMGNYwevZL9MiogLk8pd1PtwrmFmi8IBq4GXqUaVW/a33Llt6amSI36uSjd0GWwc9pTT9ALlQ==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "polished": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/polished/-/polished-4.1.2.tgz",
+          "integrity": "sha512-jq4t3PJUpVRcveC53nnbEX35VyQI05x3tniwp26WFdm1dwaNUBHAi5awa/roBlwQxx1uRhwNSYeAi/aMbfiJCQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.17"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.14.0",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+              "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+              "dev": true,
+              "requires": {
+                "regenerator-runtime": "^0.13.4"
+              }
+            }
+          }
+        },
+        "qs": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
+          "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.7",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+          "dev": true
+        },
+        "store2": {
+          "version": "2.12.0",
+          "resolved": "https://registry.npmjs.org/store2/-/store2-2.12.0.tgz",
+          "integrity": "sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==",
+          "dev": true
+        },
+        "telejson": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.1.1.tgz",
+          "integrity": "sha512-aU7x+nwodmODJPXhU9sC/REOcX/dx1tNbyeOFV1PCTh6e9Mj+bnyfQ7sr13zfJYya9BtpGwnUNn9Fd76Ybj2eg==",
+          "dev": true,
+          "requires": {
+            "@types/is-function": "^1.0.0",
+            "global": "^4.4.0",
+            "is-function": "^1.0.2",
+            "is-regex": "^1.1.2",
+            "is-symbol": "^1.0.3",
+            "isobject": "^4.0.0",
+            "lodash": "^4.17.21",
+            "memoizerific": "^1.11.3"
+          }
+        },
+        "ts-dedent": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.1.1.tgz",
+          "integrity": "sha512-riHuwnzAUCfdIeTBNUq7+Yj+ANnrMXo/7+Z74dIdudS7ys2k8aSGMzpJRMFDF7CLwUTbtvi1ZZff/Wl+XxmqIA==",
           "dev": true
         }
       }
@@ -4893,51 +9081,502 @@
       }
     },
     "@storybook/ui": {
-      "version": "5.3.19",
-      "resolved": "https://registry.npmjs.org/@storybook/ui/-/ui-5.3.19.tgz",
-      "integrity": "sha512-r0VxdWab49nm5tzwvveVDnsHIZHMR76veYOu/NHKDUZ5hnQl1LMG1YyMCFFa7KiwD/OrZxRWr6/Ma7ep9kR4Gw==",
+      "version": "6.2.9",
+      "resolved": "https://registry.npmjs.org/@storybook/ui/-/ui-6.2.9.tgz",
+      "integrity": "sha512-jq2xmw3reIqik/6ibUSbNKGR+Xvr9wkAEwexiOl+5WQ5BeYJpw4dmDmsFQf+SQuWaSEUUPolbzkakRQM778Kdg==",
       "dev": true,
       "requires": {
-        "@emotion/core": "^10.0.20",
-        "@storybook/addons": "5.3.19",
-        "@storybook/api": "5.3.19",
-        "@storybook/channels": "5.3.19",
-        "@storybook/client-logger": "5.3.19",
-        "@storybook/components": "5.3.19",
-        "@storybook/core-events": "5.3.19",
-        "@storybook/router": "5.3.19",
-        "@storybook/theming": "5.3.19",
-        "copy-to-clipboard": "^3.0.8",
-        "core-js": "^3.0.1",
-        "core-js-pure": "^3.0.1",
-        "emotion-theming": "^10.0.19",
-        "fast-deep-equal": "^2.0.1",
-        "fuse.js": "^3.4.6",
-        "global": "^4.3.2",
-        "lodash": "^4.17.15",
+        "@emotion/core": "^10.1.1",
+        "@storybook/addons": "6.2.9",
+        "@storybook/api": "6.2.9",
+        "@storybook/channels": "6.2.9",
+        "@storybook/client-logger": "6.2.9",
+        "@storybook/components": "6.2.9",
+        "@storybook/core-events": "6.2.9",
+        "@storybook/router": "6.2.9",
+        "@storybook/semver": "^7.3.2",
+        "@storybook/theming": "6.2.9",
+        "@types/markdown-to-jsx": "^6.11.3",
+        "copy-to-clipboard": "^3.3.1",
+        "core-js": "^3.8.2",
+        "core-js-pure": "^3.8.2",
+        "downshift": "^6.0.15",
+        "emotion-theming": "^10.0.27",
+        "fuse.js": "^3.6.1",
+        "global": "^4.4.0",
+        "lodash": "^4.17.20",
         "markdown-to-jsx": "^6.11.4",
         "memoizerific": "^1.11.3",
-        "polished": "^3.3.1",
-        "prop-types": "^15.7.2",
-        "qs": "^6.6.0",
-        "react": "^16.8.3",
-        "react-dom": "^16.8.3",
-        "react-draggable": "^4.0.3",
-        "react-helmet-async": "^1.0.2",
-        "react-hotkeys": "2.0.0",
-        "react-sizeme": "^2.6.7",
-        "regenerator-runtime": "^0.13.2",
+        "polished": "^4.0.5",
+        "qs": "^6.10.0",
+        "react-draggable": "^4.4.3",
+        "react-helmet-async": "^1.0.7",
+        "react-sizeme": "^3.0.1",
+        "regenerator-runtime": "^0.13.7",
         "resolve-from": "^5.0.0",
-        "semver": "^6.0.0",
-        "store2": "^2.7.1",
-        "telejson": "^3.2.0",
-        "util-deprecate": "^1.0.2"
+        "store2": "^2.12.0"
       },
       "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+        "@emotion/core": {
+          "version": "10.1.1",
+          "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz",
+          "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.5.5",
+            "@emotion/cache": "^10.0.27",
+            "@emotion/css": "^10.0.27",
+            "@emotion/serialize": "^0.11.15",
+            "@emotion/sheet": "0.9.4",
+            "@emotion/utils": "0.11.3"
+          }
+        },
+        "@storybook/addons": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-6.2.9.tgz",
+          "integrity": "sha512-GnmEKbJwiN1jncN9NSA8CuR1i2XAlasPcl/Zn0jkfV9WitQeczVcJCPw86SGH84AD+tTBCyF2i9UC0KaOV1YBQ==",
+          "dev": true,
+          "requires": {
+            "@storybook/api": "6.2.9",
+            "@storybook/channels": "6.2.9",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/core-events": "6.2.9",
+            "@storybook/router": "6.2.9",
+            "@storybook/theming": "6.2.9",
+            "core-js": "^3.8.2",
+            "global": "^4.4.0",
+            "regenerator-runtime": "^0.13.7"
+          }
+        },
+        "@storybook/api": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/api/-/api-6.2.9.tgz",
+          "integrity": "sha512-okkA3HAScE9tGnYBrjTOcgzT+L1lRHNoEh3ZfGgh1u/XNEyHGNkj4grvkd6nX7BzRcYQ/l2VkcKCqmOjUnSkVQ==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.3.4",
+            "@storybook/channels": "6.2.9",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/core-events": "6.2.9",
+            "@storybook/csf": "0.0.1",
+            "@storybook/router": "6.2.9",
+            "@storybook/semver": "^7.3.2",
+            "@storybook/theming": "6.2.9",
+            "@types/reach__router": "^1.3.7",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.10.0",
+            "regenerator-runtime": "^0.13.7",
+            "store2": "^2.12.0",
+            "telejson": "^5.1.0",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/channels": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-6.2.9.tgz",
+          "integrity": "sha512-6dC8Fb2ipNyOQXnUZMDeEUaJGH5DMLzyHlGLhVyDtrO5WR6bO8mQdkzf4+5dSKXgCBNX0BSkssXth4pDjn18rg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/client-logger": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.2.9.tgz",
+          "integrity": "sha512-IfOQZuvpjh66qBInQCJOb9S0dTGpzZ/Cxlcvokp+PYt95KztaWN3mPm+HaDQCeRsrWNe0Bpm1zuickcJ6dBOXg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2",
+            "global": "^4.4.0"
+          }
+        },
+        "@storybook/components": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/components/-/components-6.2.9.tgz",
+          "integrity": "sha512-hnV1MI2aB2g1sJ7NJphpxi7TwrMZQ/tpCJeHnkjmzyC6ez1MXqcBXGrEEdSXzRfAxjQTOEpu6H1mnns0xMP0Ag==",
+          "dev": true,
+          "requires": {
+            "@popperjs/core": "^2.6.0",
+            "@storybook/client-logger": "6.2.9",
+            "@storybook/csf": "0.0.1",
+            "@storybook/theming": "6.2.9",
+            "@types/color-convert": "^2.0.0",
+            "@types/overlayscrollbars": "^1.12.0",
+            "@types/react-syntax-highlighter": "11.0.5",
+            "color-convert": "^2.0.1",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "markdown-to-jsx": "^7.1.0",
+            "memoizerific": "^1.11.3",
+            "overlayscrollbars": "^1.13.1",
+            "polished": "^4.0.5",
+            "prop-types": "^15.7.2",
+            "react-colorful": "^5.0.1",
+            "react-popper-tooltip": "^3.1.1",
+            "react-syntax-highlighter": "^13.5.3",
+            "react-textarea-autosize": "^8.3.0",
+            "regenerator-runtime": "^0.13.7",
+            "ts-dedent": "^2.0.0",
+            "util-deprecate": "^1.0.2"
+          },
+          "dependencies": {
+            "markdown-to-jsx": {
+              "version": "7.1.2",
+              "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.1.2.tgz",
+              "integrity": "sha512-O8DMCl32V34RrD+ZHxcAPc2+kYytuDIoQYjY36RVdsLK7uHjgNVvFec4yv0X6LgB4YEZgSvK5QtFi5YVqEpoMA==",
+              "dev": true
+            }
+          }
+        },
+        "@storybook/core-events": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.2.9.tgz",
+          "integrity": "sha512-xQmbX/oYQK1QsAGN8hriXX5SUKOoTUe3L4dVaVHxJqy7MReRWJpprJmCpbAPJzWS6WCbDFfCM5kVEexHLOzJlQ==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.8.2"
+          }
+        },
+        "@storybook/router": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/router/-/router-6.2.9.tgz",
+          "integrity": "sha512-7Bn1OFoItCl8whXRT8N1qp1Lky7kzXJ3aslWp5E8HcM8rxh4OYXfbaeiyJEJxBTGC5zxgY+tAEXHFjsAviFROg==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.3.4",
+            "@storybook/client-logger": "6.2.9",
+            "@types/reach__router": "^1.3.7",
+            "core-js": "^3.8.2",
+            "fast-deep-equal": "^3.1.3",
+            "global": "^4.4.0",
+            "lodash": "^4.17.20",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.10.0",
+            "ts-dedent": "^2.0.0"
+          }
+        },
+        "@storybook/semver": {
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/@storybook/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.6.5",
+            "find-up": "^4.1.0"
+          }
+        },
+        "@storybook/theming": {
+          "version": "6.2.9",
+          "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-6.2.9.tgz",
+          "integrity": "sha512-183oJW7AD7Fhqg5NT4ct3GJntwteAb9jZnQ6yhf9JSdY+fk8OhxRbPf7ov0au2gYACcGrWDd9K5pYQsvWlP5gA==",
+          "dev": true,
+          "requires": {
+            "@emotion/core": "^10.1.1",
+            "@emotion/is-prop-valid": "^0.8.6",
+            "@emotion/styled": "^10.0.27",
+            "@storybook/client-logger": "6.2.9",
+            "core-js": "^3.8.2",
+            "deep-object-diff": "^1.1.0",
+            "emotion-theming": "^10.0.27",
+            "global": "^4.4.0",
+            "memoizerific": "^1.11.3",
+            "polished": "^4.0.5",
+            "resolve-from": "^5.0.0",
+            "ts-dedent": "^2.0.0"
+          }
+        },
+        "@types/reach__router": {
+          "version": "1.3.7",
+          "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.7.tgz",
+          "integrity": "sha512-cyBEb8Ef3SJNH5NYEIDGPoMMmYUxROatuxbICusVRQIqZUB85UCt6R2Ok60tKS/TABJsJYaHyNTW3kqbpxlMjg==",
+          "dev": true,
+          "requires": {
+            "@types/react": "*"
+          }
+        },
+        "@types/react-syntax-highlighter": {
+          "version": "11.0.5",
+          "resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.5.tgz",
+          "integrity": "sha512-VIOi9i2Oj5XsmWWoB72p3KlZoEbdRAcechJa8Ztebw7bDl2YmR+odxIqhtJGp1q2EozHs02US+gzxJ9nuf56qg==",
+          "dev": true,
+          "requires": {
+            "@types/react": "*"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "core-js": {
+          "version": "3.11.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.1.tgz",
+          "integrity": "sha512-k93Isqg7e4txZWMGNYwevZL9MiogLk8pd1PtwrmFmi8IBq4GXqUaVW/a33Llt6amSI36uSjd0GWwc9pTT9ALlQ==",
+          "dev": true
+        },
+        "core-js-pure": {
+          "version": "3.11.1",
+          "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.11.1.tgz",
+          "integrity": "sha512-2JukQi8HgAOCD5CSimxWWXVrUBoA9Br796uIA5Z06bIjt7PBBI19ircFaAxplgE1mJf3x2BY6MkT/HWA/UryPg==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "hastscript": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz",
+          "integrity": "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==",
+          "dev": true,
+          "requires": {
+            "@types/hast": "^2.0.0",
+            "comma-separated-tokens": "^1.0.0",
+            "hast-util-parse-selector": "^2.0.0",
+            "property-information": "^5.0.0",
+            "space-separated-tokens": "^1.0.0"
+          }
+        },
+        "highlight.js": {
+          "version": "10.7.2",
+          "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz",
+          "integrity": "sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
+        "lowlight": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz",
+          "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==",
+          "dev": true,
+          "requires": {
+            "fault": "^1.0.0",
+            "highlight.js": "~10.7.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "parse-entities": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
+          "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
+          "dev": true,
+          "requires": {
+            "character-entities": "^1.0.0",
+            "character-entities-legacy": "^1.0.0",
+            "character-reference-invalid": "^1.0.0",
+            "is-alphanumerical": "^1.0.0",
+            "is-decimal": "^1.0.0",
+            "is-hexadecimal": "^1.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "polished": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/polished/-/polished-4.1.2.tgz",
+          "integrity": "sha512-jq4t3PJUpVRcveC53nnbEX35VyQI05x3tniwp26WFdm1dwaNUBHAi5awa/roBlwQxx1uRhwNSYeAi/aMbfiJCQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.17"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.14.0",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+              "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+              "dev": true,
+              "requires": {
+                "regenerator-runtime": "^0.13.4"
+              }
+            }
+          }
+        },
+        "qs": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
+          "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        },
+        "react-popper": {
+          "version": "2.2.5",
+          "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
+          "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
+          "dev": true,
+          "requires": {
+            "react-fast-compare": "^3.0.1",
+            "warning": "^4.0.2"
+          }
+        },
+        "react-popper-tooltip": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/react-popper-tooltip/-/react-popper-tooltip-3.1.1.tgz",
+          "integrity": "sha512-EnERAnnKRptQBJyaee5GJScWNUKQPDD2ywvzZyUjst/wj5U64C8/CnSYLNEmP2hG0IJ3ZhtDxE8oDN+KOyavXQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.12.5",
+            "@popperjs/core": "^2.5.4",
+            "react-popper": "^2.2.4"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.14.0",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+              "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+              "dev": true,
+              "requires": {
+                "regenerator-runtime": "^0.13.4"
+              }
+            }
+          }
+        },
+        "react-syntax-highlighter": {
+          "version": "13.5.3",
+          "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz",
+          "integrity": "sha512-crPaF+QGPeHNIblxxCdf2Lg936NAHKhNhuMzRL3F9ct6aYXL3NcZtCL0Rms9+qVo6Y1EQLdXGypBNSbPL/r+qg==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.3.1",
+            "highlight.js": "^10.1.1",
+            "lowlight": "^1.14.0",
+            "prismjs": "^1.21.0",
+            "refractor": "^3.1.0"
+          }
+        },
+        "react-textarea-autosize": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.3.2.tgz",
+          "integrity": "sha512-JrMWVgQSaExQByP3ggI1eA8zF4mF0+ddVuX7acUeK2V7bmrpjVOY72vmLz2IXFJSAXoY3D80nEzrn0GWajWK3Q==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.10.2",
+            "use-composed-ref": "^1.0.0",
+            "use-latest": "^1.0.0"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.14.0",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+              "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+              "dev": true,
+              "requires": {
+                "regenerator-runtime": "^0.13.4"
+              }
+            }
+          }
+        },
+        "refractor": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.3.1.tgz",
+          "integrity": "sha512-vaN6R56kLMuBszHSWlwTpcZ8KTMG6aUCok4GrxYDT20UIOXxOc5o6oDc8tNTzSlH3m2sI+Eu9Jo2kVdDcUTWYw==",
+          "dev": true,
+          "requires": {
+            "hastscript": "^6.0.0",
+            "parse-entities": "^2.0.0",
+            "prismjs": "~1.23.0"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.7",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+          "dev": true
+        },
+        "store2": {
+          "version": "2.12.0",
+          "resolved": "https://registry.npmjs.org/store2/-/store2-2.12.0.tgz",
+          "integrity": "sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==",
+          "dev": true
+        },
+        "telejson": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/telejson/-/telejson-5.1.1.tgz",
+          "integrity": "sha512-aU7x+nwodmODJPXhU9sC/REOcX/dx1tNbyeOFV1PCTh6e9Mj+bnyfQ7sr13zfJYya9BtpGwnUNn9Fd76Ybj2eg==",
+          "dev": true,
+          "requires": {
+            "@types/is-function": "^1.0.0",
+            "global": "^4.4.0",
+            "is-function": "^1.0.2",
+            "is-regex": "^1.1.2",
+            "is-symbol": "^1.0.3",
+            "isobject": "^4.0.0",
+            "lodash": "^4.17.21",
+            "memoizerific": "^1.11.3"
+          }
+        },
+        "ts-dedent": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.1.1.tgz",
+          "integrity": "sha512-riHuwnzAUCfdIeTBNUq7+Yj+ANnrMXo/7+Z74dIdudS7ys2k8aSGMzpJRMFDF7CLwUTbtvi1ZZff/Wl+XxmqIA==",
           "dev": true
         }
       }
@@ -5007,33 +9646,270 @@
       }
     },
     "@svgr/cli": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@svgr/cli/-/cli-5.3.0.tgz",
-      "integrity": "sha512-pQe/Rw8IHXUtx/3Iq8YNWchKoDcLEpMFdcu1SZl1Mc+UJV/Y9IPe1SDDyO+AdfIB+BMYnOLo9xhXyC+Ozhksxg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/cli/-/cli-5.5.0.tgz",
+      "integrity": "sha512-KwEWi8olD7MpHR9pD5CrgsH7W8kQpzhSM0Ar3gGQyXqXdIuRYX5RgkWGm8Zi5ALZV9UhbPE+ObLhuSwEJxOzgA==",
       "dev": true,
       "requires": {
-        "@svgr/core": "^5.3.0",
-        "@svgr/plugin-jsx": "^5.3.0",
-        "@svgr/plugin-prettier": "^5.3.0",
-        "@svgr/plugin-svgo": "^5.3.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^3.0.0",
-        "commander": "^5.0.0",
+        "@svgr/core": "^5.5.0",
+        "@svgr/plugin-jsx": "^5.5.0",
+        "@svgr/plugin-prettier": "^5.5.0",
+        "@svgr/plugin-svgo": "^5.5.0",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.1.0",
+        "commander": "^6.2.0",
         "dashify": "^2.0.0",
-        "glob": "^7.1.4",
-        "output-file-sync": "^2.0.1"
+        "glob": "^7.1.4"
       },
       "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.12.13"
+          }
+        },
+        "@babel/compat-data": {
+          "version": "7.13.15",
+          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.15.tgz",
+          "integrity": "sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==",
+          "dev": true
+        },
+        "@babel/core": {
+          "version": "7.13.16",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.16.tgz",
+          "integrity": "sha512-sXHpixBiWWFti0AV2Zq7avpTasr6sIAu7Y396c608541qAU2ui4a193m0KSQmfPSKFZLnQ3cvlKDOm3XkuXm3Q==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.13.16",
+            "@babel/helper-compilation-targets": "^7.13.16",
+            "@babel/helper-module-transforms": "^7.13.14",
+            "@babel/helpers": "^7.13.16",
+            "@babel/parser": "^7.13.16",
+            "@babel/template": "^7.12.13",
+            "@babel/traverse": "^7.13.15",
+            "@babel/types": "^7.13.16",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.1.0",
+            "gensync": "^1.0.0-beta.2",
+            "json5": "^2.1.2",
+            "semver": "^6.3.0",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.13.16",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.16.tgz",
+          "integrity": "sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.13.16",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-compilation-targets": {
+          "version": "7.13.16",
+          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz",
+          "integrity": "sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==",
+          "dev": true,
+          "requires": {
+            "@babel/compat-data": "^7.13.15",
+            "@babel/helper-validator-option": "^7.12.17",
+            "browserslist": "^4.14.5",
+            "semver": "^6.3.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-member-expression-to-functions": {
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz",
+          "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.13.12"
+          }
+        },
+        "@babel/helper-module-imports": {
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
+          "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.13.12"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.13.14",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz",
+          "integrity": "sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-module-imports": "^7.13.12",
+            "@babel/helper-replace-supers": "^7.13.12",
+            "@babel/helper-simple-access": "^7.13.12",
+            "@babel/helper-split-export-declaration": "^7.12.13",
+            "@babel/helper-validator-identifier": "^7.12.11",
+            "@babel/template": "^7.12.13",
+            "@babel/traverse": "^7.13.13",
+            "@babel/types": "^7.13.14"
+          }
+        },
+        "@babel/helper-optimise-call-expression": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
+          "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-replace-supers": {
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz",
+          "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-member-expression-to-functions": "^7.13.12",
+            "@babel/helper-optimise-call-expression": "^7.12.13",
+            "@babel/traverse": "^7.13.0",
+            "@babel/types": "^7.13.12"
+          }
+        },
+        "@babel/helper-simple-access": {
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz",
+          "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.13.12"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.12.11",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+          "dev": true
+        },
+        "@babel/helpers": {
+          "version": "7.13.17",
+          "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.17.tgz",
+          "integrity": "sha512-Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.12.13",
+            "@babel/traverse": "^7.13.17",
+            "@babel/types": "^7.13.17"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.13.10",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
+          "integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.12.11",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          },
+          "dependencies": {
+            "chalk": {
+              "version": "2.4.2",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+              }
+            }
+          }
+        },
+        "@babel/parser": {
+          "version": "7.13.16",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.16.tgz",
+          "integrity": "sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.13.17",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.17.tgz",
+          "integrity": "sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.13.16",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-split-export-declaration": "^7.12.13",
+            "@babel/parser": "^7.13.16",
+            "@babel/types": "^7.13.17",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.13.17",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.17.tgz",
+          "integrity": "sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.12.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
         "@svgr/babel-plugin-add-jsx-attribute": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.0.1.tgz",
-          "integrity": "sha512-av76JbSudaN2CUOGuKQp5BVqLFidtojg4ApRTg1PBOVsskXK2ORwKnBYhIu0JLA6ynmuNDprlHNCD6IwLiYidw==",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz",
+          "integrity": "sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg==",
           "dev": true
         },
         "@svgr/babel-plugin-remove-jsx-attribute": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.0.1.tgz",
-          "integrity": "sha512-oXyByaDQEK4Ut/eC75698MDKnaadbWmp/LS2w22cZAaoObCkkiwYYgZTZ+bvb3moo//AxvKkBtNrlz6+xBb9ZQ==",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz",
+          "integrity": "sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg==",
           "dev": true
         },
         "@svgr/babel-plugin-remove-jsx-empty-expression": {
@@ -5049,106 +9925,141 @@
           "dev": true
         },
         "@svgr/babel-plugin-svg-dynamic-title": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.0.1.tgz",
-          "integrity": "sha512-IbFiDBvq5WpANPndjEom1Y9k1pHCNfJs87jCN1Lt8NEA7yrNVPSoAjBVmmfi0aVBERfp8IT/lgjn2a/S85lXGg==",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz",
+          "integrity": "sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg==",
           "dev": true
         },
         "@svgr/babel-plugin-svg-em-dimensions": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.0.1.tgz",
-          "integrity": "sha512-7kL9LtqCm1ca+zAbBsrD4ME3EQeVcRxkdrf2GsbKPgkzWJ+399vS4VqCP462+WvFRbG13jSwpNCrvhekdyvXsA==",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz",
+          "integrity": "sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw==",
           "dev": true
         },
         "@svgr/babel-plugin-transform-react-native-svg": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.0.1.tgz",
-          "integrity": "sha512-ITG1jJ0zHQ4yft6ISQqlMW4fHIzsrSB/FmrMxAcJtkTjh9M2/9M8wfKxQya9NnTfZ5WMSlQjXMQNZmGQsuxRrw==",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz",
+          "integrity": "sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q==",
           "dev": true
         },
         "@svgr/babel-plugin-transform-svg-component": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.3.0.tgz",
-          "integrity": "sha512-x+XT8iqm81xRado8GLqDg5eUni8KbgTooqLvVZNUey2s8QBWXy7RbzJP6VX5WB9LgfbA7en6ka1/GfRUHyNhWg==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz",
+          "integrity": "sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ==",
           "dev": true
         },
         "@svgr/babel-preset": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.3.0.tgz",
-          "integrity": "sha512-VQPa3czStMhaDdOpGtzyVwWMZPbe437ocTGtXoa8R/iLTDYLD9BwyQLZZMPglKRBVaWJxqAVA8kbyFJQ9ahVdw==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz",
+          "integrity": "sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig==",
           "dev": true,
           "requires": {
-            "@svgr/babel-plugin-add-jsx-attribute": "^5.0.1",
-            "@svgr/babel-plugin-remove-jsx-attribute": "^5.0.1",
+            "@svgr/babel-plugin-add-jsx-attribute": "^5.4.0",
+            "@svgr/babel-plugin-remove-jsx-attribute": "^5.4.0",
             "@svgr/babel-plugin-remove-jsx-empty-expression": "^5.0.1",
             "@svgr/babel-plugin-replace-jsx-attribute-value": "^5.0.1",
-            "@svgr/babel-plugin-svg-dynamic-title": "^5.0.1",
-            "@svgr/babel-plugin-svg-em-dimensions": "^5.0.1",
-            "@svgr/babel-plugin-transform-react-native-svg": "^5.0.1",
-            "@svgr/babel-plugin-transform-svg-component": "^5.3.0"
+            "@svgr/babel-plugin-svg-dynamic-title": "^5.4.0",
+            "@svgr/babel-plugin-svg-em-dimensions": "^5.4.0",
+            "@svgr/babel-plugin-transform-react-native-svg": "^5.4.0",
+            "@svgr/babel-plugin-transform-svg-component": "^5.5.0"
           }
         },
         "@svgr/core": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.3.0.tgz",
-          "integrity": "sha512-ijUF5bLsK4xA0hmg9GEEeFC35LPYcIkONmQLCgjW3NDTf0eRBgCCm+ZZFdeDTYnkNeh+fFOfHEkv7U3tEbJnZQ==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz",
+          "integrity": "sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ==",
           "dev": true,
           "requires": {
-            "@svgr/plugin-jsx": "^5.3.0",
-            "camelcase": "^5.3.1",
-            "cosmiconfig": "^6.0.0"
+            "@svgr/plugin-jsx": "^5.5.0",
+            "camelcase": "^6.2.0",
+            "cosmiconfig": "^7.0.0"
           }
         },
         "@svgr/hast-util-to-babel-ast": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.0.1.tgz",
-          "integrity": "sha512-G7UHNPNhLyDK5p6RJvSh4TRpHszTxG8jPp5lAxC6Ez6O6rj1plEAjrCDdYj50mvilUuT9IKjqn87F8+agpKaSw==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz",
+          "integrity": "sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.4.4"
+            "@babel/types": "^7.12.6"
           }
         },
         "@svgr/plugin-jsx": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.3.0.tgz",
-          "integrity": "sha512-duJFQ99ZvIXvxJmEhV/8GoKnPrAMOuK7k+lVyepRYHmR0BZr33RupjpApdleU29teXcJO5oMHYsviiHRCQcU9Q==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz",
+          "integrity": "sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA==",
           "dev": true,
           "requires": {
-            "@babel/core": "^7.7.5",
-            "@svgr/babel-preset": "^5.3.0",
-            "@svgr/hast-util-to-babel-ast": "^5.0.1",
+            "@babel/core": "^7.12.3",
+            "@svgr/babel-preset": "^5.5.0",
+            "@svgr/hast-util-to-babel-ast": "^5.5.0",
             "svg-parser": "^2.0.2"
           }
         },
         "@svgr/plugin-svgo": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.3.0.tgz",
-          "integrity": "sha512-rQw558t/pPPA/aWrazLDt3xIuxh9zDuUcQUeR8EO6yiYftkjT7My1MLPz1pha1LhkJCR1ug83fp+TPRYkV9EIQ==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz",
+          "integrity": "sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ==",
           "dev": true,
           "requires": {
-            "cosmiconfig": "^6.0.0",
-            "merge-deep": "^3.0.2",
+            "cosmiconfig": "^7.0.0",
+            "deepmerge": "^4.2.2",
             "svgo": "^1.2.2"
           }
         },
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+        "browserslist": {
+          "version": "4.16.5",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.5.tgz",
+          "integrity": "sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
+            "caniuse-lite": "^1.0.30001214",
+            "colorette": "^1.2.2",
+            "electron-to-chromium": "^1.3.719",
+            "escalade": "^3.1.1",
+            "node-releases": "^1.1.71"
           }
         },
+        "camelcase": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+          "dev": true
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001219",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz",
+          "integrity": "sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ==",
+          "dev": true
+        },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "4.3.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+              "dev": true,
+              "requires": {
+                "color-convert": "^2.0.1"
+              }
+            },
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
           }
         },
         "color-convert": {
@@ -5166,10 +10077,41 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "colorette": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+          "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+          "dev": true
+        },
         "commander": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz",
-          "integrity": "sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+          "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+          "dev": true
+        },
+        "cosmiconfig": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+          "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+          "dev": true,
+          "requires": {
+            "@types/parse-json": "^4.0.0",
+            "import-fresh": "^3.2.1",
+            "parse-json": "^5.0.0",
+            "path-type": "^4.0.0",
+            "yaml": "^1.10.0"
+          }
+        },
+        "electron-to-chromium": {
+          "version": "1.3.723",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.723.tgz",
+          "integrity": "sha512-L+WXyXI7c7+G1V8ANzRsPI5giiimLAUDC6Zs1ojHHPhYXb3k/iTABFmWjivEtsWrRQymjnO66/rO2ZTABGdmWg==",
+          "dev": true
+        },
+        "escalade": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+          "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
           "dev": true
         },
         "has-flag": {
@@ -5178,14 +10120,38 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+        "json5": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "minimist": "^1.2.5"
           }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.71",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
+          "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "yaml": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+          "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+          "dev": true
         }
       }
     },
@@ -5262,13 +10228,13 @@
       }
     },
     "@svgr/plugin-prettier": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-prettier/-/plugin-prettier-5.3.0.tgz",
-      "integrity": "sha512-TyIgFuox1L+tm57cBC6CzTrQ/5Uw0cuuu+/NXv3zN84pOaugLHCoaF56raYL23SUqOQnUaxuJFEE8YvbXm/tJQ==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-prettier/-/plugin-prettier-5.5.0.tgz",
+      "integrity": "sha512-mVc+u+eKUmy8sW5UnFpes9NqVtizJfnhasF8Srbi3XdxVTWyU5lmhWlQAgHLhcrsZKowQ0b7xBa4qWHI5Ew/VQ==",
       "dev": true,
       "requires": {
-        "merge-deep": "^3.0.2",
-        "prettier": "^2.0.1 || ^1.19.1"
+        "deepmerge": "^4.2.2",
+        "prettier": "^2.1.2"
       }
     },
     "@svgr/plugin-svgo": {
@@ -5339,9 +10305,9 @@
       }
     },
     "@testing-library/dom": {
-      "version": "7.28.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.28.1.tgz",
-      "integrity": "sha512-acv3l6kDwZkQif/YqJjstT3ks5aaI33uxGNVIQmdKzbZ2eMKgg3EV2tB84GDdc72k3Kjhl6mO8yUt6StVIdRDg==",
+      "version": "7.30.4",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.30.4.tgz",
+      "integrity": "sha512-GObDVMaI4ARrZEXaRy4moolNAxWPKvEYNV/fa6Uc2eAzR/t4otS6A7EhrntPBIQLeehL9DbVhscvvv7gd6hWqA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.4",
@@ -5355,21 +10321,27 @@
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
           "dev": true,
           "requires": {
-            "@babel/highlight": "^7.10.4"
+            "@babel/highlight": "^7.12.13"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.12.11",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+          "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+          "dev": true
+        },
         "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "version": "7.13.10",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
+          "integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
+            "@babel/helper-validator-identifier": "^7.12.11",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           },
@@ -5388,18 +10360,18 @@
           }
         },
         "@babel/runtime": {
-          "version": "7.12.5",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
-          "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
+          "version": "7.13.17",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz",
+          "integrity": "sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==",
           "dev": true,
           "requires": {
             "regenerator-runtime": "^0.13.4"
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -5456,9 +10428,9 @@
       }
     },
     "@testing-library/jest-dom": {
-      "version": "5.11.6",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.11.6.tgz",
-      "integrity": "sha512-cVZyUNRWwUKI0++yepYpYX7uhrP398I+tGz4zOlLVlUYnZS+Svuxv4fwLeCIy7TnBYKXUaOlQr3vopxL8ZfEnA==",
+      "version": "5.12.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.12.0.tgz",
+      "integrity": "sha512-N9Y82b2Z3j6wzIoAqajlKVF1Zt7sOH0pPee0sUHXHc5cv2Fdn23r+vpWm0MBBoGJtPOly5+Bdx1lnc3CD+A+ow==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.9.2",
@@ -5472,9 +10444,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.12.5",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
-          "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
+          "version": "7.13.17",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz",
+          "integrity": "sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==",
           "dev": true,
           "requires": {
             "regenerator-runtime": "^0.13.4"
@@ -5538,9 +10510,9 @@
       }
     },
     "@testing-library/react": {
-      "version": "11.2.2",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.2.tgz",
-      "integrity": "sha512-jaxm0hwUjv+hzC+UFEywic7buDC9JQ1q3cDsrWVSDAPmLotfA6E6kUHlYm/zOeGCac6g48DR36tFHxl7Zb+N5A==",
+      "version": "11.2.6",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.6.tgz",
+      "integrity": "sha512-TXMCg0jT8xmuU8BkKMtp8l7Z50Ykew5WNX8UoIKTaLFwKkP2+1YDhOLA2Ga3wY4x29jyntk7EWfum0kjlYiSjQ==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.12.5",
@@ -5548,9 +10520,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.12.5",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
-          "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
+          "version": "7.13.17",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz",
+          "integrity": "sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==",
           "dev": true,
           "requires": {
             "regenerator-runtime": "^0.13.4"
@@ -5565,19 +10537,23 @@
       }
     },
     "@testing-library/react-hooks": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/react-hooks/-/react-hooks-3.7.0.tgz",
-      "integrity": "sha512-TwfbY6BWtWIHitjT05sbllyLIProcysC0dF0q1bbDa7OHLC6A6rJOYJwZ13hzfz3O4RtOuInmprBozJRyyo7/g==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@testing-library/react-hooks/-/react-hooks-5.1.2.tgz",
+      "integrity": "sha512-jwhtDYZ5gQUIX8cmVCVdtwNvuF5EiCOWjokRlTV+o/V0GdtRZDykUllL1OXq5PS4+J33wGLNQeeWzEHcWrH7tg==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.12.5",
-        "@types/testing-library__react-hooks": "^3.4.0"
+        "@types/react": ">=16.9.0",
+        "@types/react-dom": ">=16.9.0",
+        "@types/react-test-renderer": ">=16.9.0",
+        "filter-console": "^0.1.1",
+        "react-error-boundary": "^3.1.0"
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.12.5",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
-          "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
+          "version": "7.13.17",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz",
+          "integrity": "sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==",
           "dev": true,
           "requires": {
             "regenerator-runtime": "^0.13.4"
@@ -5598,15 +10574,15 @@
       "dev": true
     },
     "@types/aria-query": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.0.tgz",
-      "integrity": "sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.1.tgz",
+      "integrity": "sha512-S6oPal772qJZHoRZLFc/XoZW2gFvwXusYUmXPXkgxJLuEk2vOt7jc4Yo6z/vtI0EBkbPBVrJJ0B+prLIKiWqHg==",
       "dev": true
     },
     "@types/babel__core": {
-      "version": "7.1.12",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.12.tgz",
-      "integrity": "sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==",
+      "version": "7.1.14",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz",
+      "integrity": "sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -5625,6 +10601,12 @@
         "@babel/types": "^7.0.0"
       }
     },
+    "@types/babel__plugin-transform-runtime": {
+      "version": "7.9.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__plugin-transform-runtime/-/babel__plugin-transform-runtime-7.9.1.tgz",
+      "integrity": "sha512-9tmPrE1Emf22D1Na7AZIS5nCVJkCGNY80dIZaWt2Pxe+oAdQnJXl9ztxS360kyLzU7EniiUFRnT5906JRiaayw==",
+      "dev": true
+    },
     "@types/babel__template": {
       "version": "7.4.0",
       "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
@@ -5644,12 +10626,69 @@
         "@babel/types": "^7.3.0"
       }
     },
+    "@types/braces": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/braces/-/braces-3.0.0.tgz",
+      "integrity": "sha512-TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw==",
+      "dev": true
+    },
+    "@types/color-convert": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/color-convert/-/color-convert-2.0.0.tgz",
+      "integrity": "sha512-m7GG7IKKGuJUXvkZ1qqG3ChccdIM/qBBo913z+Xft0nKCX4hAU/IxKwZBU4cpRZ7GS5kV4vOblUkILtSShCPXQ==",
+      "dev": true,
+      "requires": {
+        "@types/color-name": "*"
+      }
+    },
     "@types/color-name": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
       "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
       "dev": true
     },
+    "@types/eslint": {
+      "version": "7.2.10",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz",
+      "integrity": "sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==",
+      "dev": true,
+      "requires": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "@types/eslint-scope": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
+      "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
+      "dev": true,
+      "requires": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "@types/estree": {
+      "version": "0.0.47",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz",
+      "integrity": "sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==",
+      "dev": true
+    },
+    "@types/glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
+      "dev": true,
+      "requires": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@types/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-pYHWiDR+EOUN18F9byiAoQNUMZ0=",
+      "dev": true
+    },
     "@types/graceful-fs": {
       "version": "4.1.4",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.4.tgz",
@@ -5659,16 +10698,35 @@
         "@types/node": "*"
       }
     },
+    "@types/hast": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.1.tgz",
+      "integrity": "sha512-viwwrB+6xGzw+G1eWpF9geV3fnsDgXqHG+cqgiHrvQfDUW5hzhCyV7Sy3UJxhfRFBsgky2SSW33qi/YrIkjX5Q==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "*"
+      }
+    },
     "@types/history": {
       "version": "4.7.7",
       "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.7.tgz",
       "integrity": "sha512-2xtoL22/3Mv6a70i4+4RB7VgbDDORoWwjcqeNysojZA0R7NK17RbY5Gof/2QiFfJgX+KkWghbwJ+d/2SB8Ndzg==",
       "dev": true
     },
+    "@types/hoist-non-react-statics": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+      "dev": true,
+      "requires": {
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0"
+      }
+    },
     "@types/html-minifier-terser": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz",
-      "integrity": "sha512-iYCgjm1dGPRuo12+BStjd1HiVQqhlRhWDOQigNxn023HcjnhsiFz9pc6CzJj4HwDCSQca9bxTL4PxJDbkdm3PA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
+      "integrity": "sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA==",
       "dev": true
     },
     "@types/is-function": {
@@ -5723,12 +10781,68 @@
       "integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==",
       "dev": true
     },
+    "@types/markdown-to-jsx": {
+      "version": "6.11.3",
+      "resolved": "https://registry.npmjs.org/@types/markdown-to-jsx/-/markdown-to-jsx-6.11.3.tgz",
+      "integrity": "sha512-30nFYpceM/ZEvhGiqWjm5quLUxNeld0HCzJEXMZZDpq53FPkS85mTwkWtCXzCqq8s5JYLgM5W392a02xn8Bdaw==",
+      "dev": true,
+      "requires": {
+        "@types/react": "*"
+      }
+    },
+    "@types/md5": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@types/md5/-/md5-2.3.0.tgz",
+      "integrity": "sha512-556YJ7ejzxIqSSxzyGGpctuZOarNZJt/zlEkhmmDc1f/slOEANHuwu2ZX7YaZ40rMiWoxt8GvAhoDpW1cmSy6A==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/micromatch": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.1.tgz",
+      "integrity": "sha512-my6fLBvpY70KattTNzYOK6KU1oR1+UCz9ug/JbcF5UrEmeCt9P7DV2t7L8+t18mMPINqGQCE4O8PLOPbI84gxw==",
+      "dev": true,
+      "requires": {
+        "@types/braces": "*"
+      }
+    },
+    "@types/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==",
+      "dev": true
+    },
     "@types/node": {
       "version": "14.0.27",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz",
       "integrity": "sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==",
       "dev": true
     },
+    "@types/node-fetch": {
+      "version": "2.5.10",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.10.tgz",
+      "integrity": "sha512-IpkX0AasN44hgEad0gEF/V6EgR5n69VEqPEgnmoM8GsIGro3PowbWs4tR6IhxUTyPLpOn+fiGG6nrQhcmoCuIQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "form-data": "^3.0.0"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+          "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+          "dev": true,
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        }
+      }
+    },
     "@types/normalize-package-data": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
@@ -5741,6 +10855,12 @@
       "integrity": "sha512-4QQmOF5KlwfxJ5IGXFIudkeLCdMABz03RcUXu+LCb24zmln8QW6aDjuGl4d4XPVLf2j+FnjelHTP7dvceAFbhA==",
       "dev": true
     },
+    "@types/overlayscrollbars": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/@types/overlayscrollbars/-/overlayscrollbars-1.12.0.tgz",
+      "integrity": "sha512-h/pScHNKi4mb+TrJGDon8Yb06ujFG0mSg12wIO0sWMUF3dQIe2ExRRdNRviaNt9IjxIiOfnRr7FsQAdHwK4sMg==",
+      "dev": true
+    },
     "@types/parse-json": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
@@ -5753,6 +10873,12 @@
       "integrity": "sha512-UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ==",
       "dev": true
     },
+    "@types/pretty-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/pretty-hrtime/-/pretty-hrtime-1.0.0.tgz",
+      "integrity": "sha512-xl+5r2rcrxdLViAYkkiLMYsoUs3qEyrAnHFyEzYysgRxdVp3WbhysxIvJIxZp9FvZ2CYezh0TaHZorivH+voOQ==",
+      "dev": true
+    },
     "@types/prop-types": {
       "version": "15.7.3",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz",
@@ -5765,6 +10891,12 @@
       "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
       "dev": true
     },
+    "@types/qs": {
+      "version": "6.9.6",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz",
+      "integrity": "sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==",
+      "dev": true
+    },
     "@types/reach__router": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.5.tgz",
@@ -5776,31 +10908,40 @@
       }
     },
     "@types/react": {
-      "version": "16.9.44",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.44.tgz",
-      "integrity": "sha512-BtLoJrXdW8DVZauKP+bY4Kmiq7ubcJq+H/aCpRfvPF7RAT3RwR73Sg8szdc2YasbAlWBDrQ6Q+AFM0KwtQY+WQ==",
+      "version": "16.14.5",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.5.tgz",
+      "integrity": "sha512-YRRv9DNZhaVTVRh9Wmmit7Y0UFhEVqXqCSw3uazRWMxa2x85hWQZ5BN24i7GXZbaclaLXEcodEeIHsjBA8eAMw==",
       "dev": true,
       "requires": {
         "@types/prop-types": "*",
+        "@types/scheduler": "*",
         "csstype": "^3.0.2"
       },
       "dependencies": {
         "csstype": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.2.tgz",
-          "integrity": "sha512-ofovWglpqoqbfLNOTBNZLSbMuGrblAf1efvvArGKOZMBrIoJeu5UsAipQolkijtyQx5MtAzT/J9IHj/CEY1mJw==",
+          "version": "3.0.8",
+          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
+          "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==",
           "dev": true
         }
       }
     },
-    "@types/react-color": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.4.tgz",
-      "integrity": "sha512-EswbYJDF1kkrx93/YU+BbBtb46CCtDMvTiGmcOa/c5PETnwTiSWoseJ1oSWeRl/4rUXkhME9bVURvvPg0W5YQw==",
+    "@types/react-dom": {
+      "version": "16.9.12",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.12.tgz",
+      "integrity": "sha512-i7NPZZpPte3jtVOoW+eLB7G/jsX5OM6GqQnH+lC0nq0rqwlK0x8WcMEvYDgFWqWhWMlTltTimzdMax6wYfZssA==",
       "dev": true,
       "requires": {
-        "@types/react": "*",
-        "@types/reactcss": "*"
+        "@types/react": "^16"
+      }
+    },
+    "@types/react-native": {
+      "version": "0.64.5",
+      "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.64.5.tgz",
+      "integrity": "sha512-k0r8MnQX7UFboZDvMKLov26gFLXKrNgLhCfSVhjaZ6wMUofKijxvee7/wgfAqtT2zS5FR4an4+qn0r72SCbw3g==",
+      "dev": true,
+      "requires": {
+        "@types/react": "*"
       }
     },
     "@types/react-syntax-highlighter": {
@@ -5813,9 +10954,9 @@
       }
     },
     "@types/react-test-renderer": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-17.0.0.tgz",
-      "integrity": "sha512-nvw+F81OmyzpyIE1S0xWpLonLUZCMewslPuA8BtjSKc5XEbn8zEQBXS7KuOLHTNnSOEM2Pum50gHOoZ62tqTRg==",
+      "version": "17.0.1",
+      "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-17.0.1.tgz",
+      "integrity": "sha512-3Fi2O6Zzq/f3QR9dRnlnHso9bMl7weKCviFmfF6B4LS1Uat6Hkm15k0ZAQuDz+UBq6B3+g+NM6IT2nr5QgPzCw==",
       "dev": true,
       "requires": {
         "@types/react": "*"
@@ -5830,14 +10971,11 @@
         "@types/react": "*"
       }
     },
-    "@types/reactcss": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@types/reactcss/-/reactcss-1.2.3.tgz",
-      "integrity": "sha512-d2gQQ0IL6hXLnoRfVYZukQNWHuVsE75DzFTLPUuyyEhJS8G2VvlE+qfQQ91SJjaMqlURRCNIsX7Jcsw6cEuJlA==",
-      "dev": true,
-      "requires": {
-        "@types/react": "*"
-      }
+    "@types/scheduler": {
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.1.tgz",
+      "integrity": "sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA==",
+      "dev": true
     },
     "@types/source-list-map": {
       "version": "0.1.2",
@@ -5851,10 +10989,1584 @@
       "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
       "dev": true
     },
+    "@types/storybook__addon-info": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/@types/storybook__addon-info/-/storybook__addon-info-5.2.3.tgz",
+      "integrity": "sha512-3Q98gW7kvjRhN8sfriIW+ArVRQElvN0a4+GlbZABuuRMEW9N9lXKsuX01IRjkpWplk+gY5VUFLY67urwCn539w==",
+      "dev": true,
+      "requires": {
+        "@storybook/addons": "^5.2.0",
+        "@storybook/react": "^5.2.0",
+        "@types/react": "*"
+      },
+      "dependencies": {
+        "@nodelib/fs.stat": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+          "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+          "dev": true
+        },
+        "@storybook/api": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/api/-/api-5.3.21.tgz",
+          "integrity": "sha512-K1o4an/Rx8daKRDooks6qzN6ZGyqizeacZZbair3F8CsSfTgrr2zCcf9pgKojLQa9koEmMHlcdb2KnS+GwPEgA==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.2.1",
+            "@storybook/channels": "5.3.21",
+            "@storybook/client-logger": "5.3.21",
+            "@storybook/core-events": "5.3.21",
+            "@storybook/csf": "0.0.1",
+            "@storybook/router": "5.3.21",
+            "@storybook/theming": "5.3.21",
+            "@types/reach__router": "^1.2.3",
+            "core-js": "^3.0.1",
+            "fast-deep-equal": "^2.0.1",
+            "global": "^4.3.2",
+            "lodash": "^4.17.15",
+            "memoizerific": "^1.11.3",
+            "prop-types": "^15.6.2",
+            "react": "^16.8.3",
+            "semver": "^6.0.0",
+            "shallow-equal": "^1.1.0",
+            "store2": "^2.7.1",
+            "telejson": "^3.2.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/channel-postmessage": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-5.3.21.tgz",
+          "integrity": "sha512-CfoP7aEbZtJ35R9zeujMRdIwprETUi+Ve+y84DhXYQ2uJ0rR3vO4zHLZnxMMyJ5VnYOfuO042uch07+EKBz40Q==",
+          "dev": true,
+          "requires": {
+            "@storybook/channels": "5.3.21",
+            "@storybook/client-logger": "5.3.21",
+            "core-js": "^3.0.1",
+            "global": "^4.3.2",
+            "telejson": "^3.2.0"
+          }
+        },
+        "@storybook/channels": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-5.3.21.tgz",
+          "integrity": "sha512-OXoFs9XtBVg/cCk6lYMrxkzaNlJRf54ABdorp7YAAj7S9tRL1JxOZHxmjNQwEoiRvssmem2rAWtEAxfuEANsAA==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.0.1"
+          }
+        },
+        "@storybook/client-api": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/client-api/-/client-api-5.3.21.tgz",
+          "integrity": "sha512-vS4DfA2Avvl7JNQymO4e3RUNoTWIGVfZJ70Irnd6PTAZNojbCXTYuigDavrmyf83F3g5rQpwmSAPjuoi/X/FRA==",
+          "dev": true,
+          "requires": {
+            "@storybook/addons": "5.3.21",
+            "@storybook/channel-postmessage": "5.3.21",
+            "@storybook/channels": "5.3.21",
+            "@storybook/client-logger": "5.3.21",
+            "@storybook/core-events": "5.3.21",
+            "@storybook/csf": "0.0.1",
+            "@types/webpack-env": "^1.15.0",
+            "core-js": "^3.0.1",
+            "eventemitter3": "^4.0.0",
+            "global": "^4.3.2",
+            "is-plain-object": "^3.0.0",
+            "lodash": "^4.17.15",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.6.0",
+            "stable": "^0.1.8",
+            "ts-dedent": "^1.1.0",
+            "util-deprecate": "^1.0.2"
+          },
+          "dependencies": {
+            "@storybook/addons": {
+              "version": "5.3.21",
+              "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-5.3.21.tgz",
+              "integrity": "sha512-Ji/21WADTLVbTbiKcZ64BcL0Es+h1Afxx3kNmGJqPSTUYroCwIFCT9mUzCqU6G+YyWaISAmTii5UJkTwMkChwA==",
+              "dev": true,
+              "requires": {
+                "@storybook/api": "5.3.21",
+                "@storybook/channels": "5.3.21",
+                "@storybook/client-logger": "5.3.21",
+                "@storybook/core-events": "5.3.21",
+                "core-js": "^3.0.1",
+                "global": "^4.3.2",
+                "util-deprecate": "^1.0.2"
+              }
+            }
+          }
+        },
+        "@storybook/client-logger": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-5.3.21.tgz",
+          "integrity": "sha512-OzQkwpZ5SK9cXD9Mv6lxPGPot+hSZvnkEW12kpt1AHfJz4ET26YTDOI3oetPsjfRJo6qYLeQX8+wF7rklfXbzA==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.0.1"
+          }
+        },
+        "@storybook/core": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/core/-/core-5.3.21.tgz",
+          "integrity": "sha512-plD47WIsn/JoyRJDOpmH7N7mEMo/jiA8ZlOitLW55zYvzUn8UrVpRFpMYo91OJxiCT6JFoaEh3XtNdhbgUwnPA==",
+          "dev": true,
+          "requires": {
+            "@babel/plugin-proposal-class-properties": "^7.7.0",
+            "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
+            "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+            "@babel/plugin-transform-react-constant-elements": "^7.2.0",
+            "@babel/preset-env": "^7.4.5",
+            "@storybook/addons": "5.3.21",
+            "@storybook/channel-postmessage": "5.3.21",
+            "@storybook/client-api": "5.3.21",
+            "@storybook/client-logger": "5.3.21",
+            "@storybook/core-events": "5.3.21",
+            "@storybook/csf": "0.0.1",
+            "@storybook/node-logger": "5.3.21",
+            "@storybook/router": "5.3.21",
+            "@storybook/theming": "5.3.21",
+            "@storybook/ui": "5.3.21",
+            "airbnb-js-shims": "^2.2.1",
+            "ansi-to-html": "^0.6.11",
+            "autoprefixer": "^9.7.2",
+            "babel-plugin-add-react-displayname": "^0.0.5",
+            "babel-plugin-emotion": "^10.0.20",
+            "babel-plugin-macros": "^2.7.0",
+            "babel-preset-minify": "^0.5.0 || 0.6.0-alpha.5",
+            "boxen": "^4.1.0",
+            "case-sensitive-paths-webpack-plugin": "^2.2.0",
+            "chalk": "^3.0.0",
+            "cli-table3": "0.5.1",
+            "commander": "^4.0.1",
+            "core-js": "^3.0.1",
+            "corejs-upgrade-webpack-plugin": "^2.2.0",
+            "css-loader": "^3.0.0",
+            "detect-port": "^1.3.0",
+            "dotenv-webpack": "^1.7.0",
+            "ejs": "^2.7.4",
+            "express": "^4.17.0",
+            "file-loader": "^4.2.0",
+            "file-system-cache": "^1.0.5",
+            "find-cache-dir": "^3.0.0",
+            "find-up": "^4.1.0",
+            "fs-extra": "^8.0.1",
+            "glob-base": "^0.3.0",
+            "global": "^4.3.2",
+            "html-webpack-plugin": "^4.0.0-beta.2",
+            "inquirer": "^7.0.0",
+            "interpret": "^2.0.0",
+            "ip": "^1.1.5",
+            "json5": "^2.1.1",
+            "lazy-universal-dotenv": "^3.0.1",
+            "micromatch": "^4.0.2",
+            "node-fetch": "^2.6.0",
+            "open": "^7.0.0",
+            "pnp-webpack-plugin": "1.5.0",
+            "postcss-flexbugs-fixes": "^4.1.0",
+            "postcss-loader": "^3.0.0",
+            "pretty-hrtime": "^1.0.3",
+            "qs": "^6.6.0",
+            "raw-loader": "^3.1.0",
+            "react-dev-utils": "^9.0.0",
+            "regenerator-runtime": "^0.13.3",
+            "resolve": "^1.11.0",
+            "resolve-from": "^5.0.0",
+            "semver": "^6.0.0",
+            "serve-favicon": "^2.5.0",
+            "shelljs": "^0.8.3",
+            "style-loader": "^1.0.0",
+            "terser-webpack-plugin": "^2.1.2",
+            "ts-dedent": "^1.1.0",
+            "unfetch": "^4.1.0",
+            "url-loader": "^2.0.1",
+            "util-deprecate": "^1.0.2",
+            "webpack": "^4.33.0",
+            "webpack-dev-middleware": "^3.7.0",
+            "webpack-hot-middleware": "^2.25.0",
+            "webpack-virtual-modules": "^0.2.0"
+          },
+          "dependencies": {
+            "@storybook/addons": {
+              "version": "5.3.21",
+              "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-5.3.21.tgz",
+              "integrity": "sha512-Ji/21WADTLVbTbiKcZ64BcL0Es+h1Afxx3kNmGJqPSTUYroCwIFCT9mUzCqU6G+YyWaISAmTii5UJkTwMkChwA==",
+              "dev": true,
+              "requires": {
+                "@storybook/api": "5.3.21",
+                "@storybook/channels": "5.3.21",
+                "@storybook/client-logger": "5.3.21",
+                "@storybook/core-events": "5.3.21",
+                "core-js": "^3.0.1",
+                "global": "^4.3.2",
+                "util-deprecate": "^1.0.2"
+              }
+            }
+          }
+        },
+        "@storybook/core-events": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-5.3.21.tgz",
+          "integrity": "sha512-/Zsm1sKAh6pzQv8jQUmuhM7nuM01ZljIRKy8p2HjPNlMjDB5yaRkBfyeAUXUg+qXNI6aHVWa4jGdPEdwwY4oLA==",
+          "dev": true,
+          "requires": {
+            "core-js": "^3.0.1"
+          }
+        },
+        "@storybook/node-logger": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-5.3.21.tgz",
+          "integrity": "sha512-8xibncy873JXePCK5MC0qem1MKtWI1Lc4hv6rwURSwYpZtkO7yElay3XAFGUSfz8qFJkoDBmMTxBR3fp4Dln7g==",
+          "dev": true,
+          "requires": {
+            "@types/npmlog": "^4.1.2",
+            "chalk": "^3.0.0",
+            "core-js": "^3.0.1",
+            "npmlog": "^4.1.2",
+            "pretty-hrtime": "^1.0.3",
+            "regenerator-runtime": "^0.13.3"
+          }
+        },
+        "@storybook/react": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/react/-/react-5.3.21.tgz",
+          "integrity": "sha512-A50F8dDZxyLGa/dE3q0Zxt7T5r9UbomoSclqw7oJTO9GI76QOu7GfsoWrEL2gTEDAmqXreLVQqGuTLQhBz0rlA==",
+          "dev": true,
+          "requires": {
+            "@babel/plugin-transform-react-constant-elements": "^7.6.3",
+            "@babel/preset-flow": "^7.0.0",
+            "@babel/preset-react": "^7.0.0",
+            "@storybook/addons": "5.3.21",
+            "@storybook/core": "5.3.21",
+            "@storybook/node-logger": "5.3.21",
+            "@svgr/webpack": "^4.0.3",
+            "@types/webpack-env": "^1.15.0",
+            "babel-plugin-add-react-displayname": "^0.0.5",
+            "babel-plugin-named-asset-import": "^0.3.1",
+            "babel-plugin-react-docgen": "^4.0.0",
+            "core-js": "^3.0.1",
+            "global": "^4.3.2",
+            "lodash": "^4.17.15",
+            "mini-css-extract-plugin": "^0.7.0",
+            "prop-types": "^15.7.2",
+            "react-dev-utils": "^9.0.0",
+            "regenerator-runtime": "^0.13.3",
+            "semver": "^6.0.0",
+            "ts-dedent": "^1.1.0",
+            "webpack": "^4.33.0"
+          },
+          "dependencies": {
+            "@storybook/addons": {
+              "version": "5.3.21",
+              "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-5.3.21.tgz",
+              "integrity": "sha512-Ji/21WADTLVbTbiKcZ64BcL0Es+h1Afxx3kNmGJqPSTUYroCwIFCT9mUzCqU6G+YyWaISAmTii5UJkTwMkChwA==",
+              "dev": true,
+              "requires": {
+                "@storybook/api": "5.3.21",
+                "@storybook/channels": "5.3.21",
+                "@storybook/client-logger": "5.3.21",
+                "@storybook/core-events": "5.3.21",
+                "core-js": "^3.0.1",
+                "global": "^4.3.2",
+                "util-deprecate": "^1.0.2"
+              }
+            }
+          }
+        },
+        "@storybook/router": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/router/-/router-5.3.21.tgz",
+          "integrity": "sha512-c29m5UikK5Q1lyd6FltOGFhIcpd6PIb855YS3OUNe3F6ZA1tfJ+aNKrCBc65d1c+fvCGG76dYYYv0RvwEmKXXg==",
+          "dev": true,
+          "requires": {
+            "@reach/router": "^1.2.1",
+            "@storybook/csf": "0.0.1",
+            "@types/reach__router": "^1.2.3",
+            "core-js": "^3.0.1",
+            "global": "^4.3.2",
+            "lodash": "^4.17.15",
+            "memoizerific": "^1.11.3",
+            "qs": "^6.6.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
+        "@storybook/theming": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-5.3.21.tgz",
+          "integrity": "sha512-FZbxjizqdO9lV5LUixPio/7+6UdPiswCzTJn8Hcot9uwwgfnrViRdN7xyjmSYRqv9nHP3OlYbtdeCAgZ4aPq8g==",
+          "dev": true,
+          "requires": {
+            "@emotion/core": "^10.0.20",
+            "@emotion/styled": "^10.0.17",
+            "@storybook/client-logger": "5.3.21",
+            "core-js": "^3.0.1",
+            "deep-object-diff": "^1.1.0",
+            "emotion-theming": "^10.0.19",
+            "global": "^4.3.2",
+            "memoizerific": "^1.11.3",
+            "polished": "^3.3.1",
+            "prop-types": "^15.7.2",
+            "resolve-from": "^5.0.0",
+            "ts-dedent": "^1.1.0"
+          }
+        },
+        "@storybook/ui": {
+          "version": "5.3.21",
+          "resolved": "https://registry.npmjs.org/@storybook/ui/-/ui-5.3.21.tgz",
+          "integrity": "sha512-OUf8JYY9LN+XfzLSZE6KtboITGDL6C8Z0W9QOXM5LJwFLv4PkANK/f9qsB5vVHFm7vhoO96butFzs6SjTKhxkw==",
+          "dev": true,
+          "requires": {
+            "@emotion/core": "^10.0.20",
+            "@storybook/addons": "5.3.21",
+            "@storybook/api": "5.3.21",
+            "@storybook/channels": "5.3.21",
+            "@storybook/client-logger": "5.3.21",
+            "@storybook/components": "5.3.21",
+            "@storybook/core-events": "5.3.21",
+            "@storybook/router": "5.3.21",
+            "@storybook/theming": "5.3.21",
+            "copy-to-clipboard": "^3.0.8",
+            "core-js": "^3.0.1",
+            "core-js-pure": "^3.0.1",
+            "emotion-theming": "^10.0.19",
+            "fast-deep-equal": "^2.0.1",
+            "fuse.js": "^3.4.6",
+            "global": "^4.3.2",
+            "lodash": "^4.17.15",
+            "markdown-to-jsx": "^6.11.4",
+            "memoizerific": "^1.11.3",
+            "polished": "^3.3.1",
+            "prop-types": "^15.7.2",
+            "qs": "^6.6.0",
+            "react": "^16.8.3",
+            "react-dom": "^16.8.3",
+            "react-draggable": "^4.0.3",
+            "react-helmet-async": "^1.0.2",
+            "react-hotkeys": "2.0.0",
+            "react-sizeme": "^2.6.7",
+            "regenerator-runtime": "^0.13.2",
+            "resolve-from": "^5.0.0",
+            "semver": "^6.0.0",
+            "store2": "^2.7.1",
+            "telejson": "^3.2.0",
+            "util-deprecate": "^1.0.2"
+          },
+          "dependencies": {
+            "@storybook/addons": {
+              "version": "5.3.21",
+              "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-5.3.21.tgz",
+              "integrity": "sha512-Ji/21WADTLVbTbiKcZ64BcL0Es+h1Afxx3kNmGJqPSTUYroCwIFCT9mUzCqU6G+YyWaISAmTii5UJkTwMkChwA==",
+              "dev": true,
+              "requires": {
+                "@storybook/api": "5.3.21",
+                "@storybook/channels": "5.3.21",
+                "@storybook/client-logger": "5.3.21",
+                "@storybook/core-events": "5.3.21",
+                "core-js": "^3.0.1",
+                "global": "^4.3.2",
+                "util-deprecate": "^1.0.2"
+              }
+            }
+          }
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          },
+          "dependencies": {
+            "fast-deep-equal": {
+              "version": "3.1.3",
+              "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+              "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+              "dev": true
+            }
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true
+        },
+        "ansi-escapes": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+          "dev": true
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "array-union": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+          "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+          "dev": true,
+          "requires": {
+            "array-uniq": "^1.0.1"
+          }
+        },
+        "arrify": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+          "dev": true
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "browserslist": {
+          "version": "4.7.0",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.0.tgz",
+          "integrity": "sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "^1.0.30000989",
+            "electron-to-chromium": "^1.3.247",
+            "node-releases": "^1.1.29"
+          }
+        },
+        "cacache": {
+          "version": "13.0.1",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
+          "integrity": "sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==",
+          "dev": true,
+          "requires": {
+            "chownr": "^1.1.2",
+            "figgy-pudding": "^3.5.1",
+            "fs-minipass": "^2.0.0",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.2.2",
+            "infer-owner": "^1.0.4",
+            "lru-cache": "^5.1.1",
+            "minipass": "^3.0.0",
+            "minipass-collect": "^1.0.2",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.2",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "p-map": "^3.0.0",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.7.1",
+            "ssri": "^7.0.0",
+            "unique-filename": "^1.1.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "cli-cursor": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+          "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+          "dev": true,
+          "requires": {
+            "restore-cursor": "^2.0.0"
+          }
+        },
+        "cli-table3": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz",
+          "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==",
+          "dev": true,
+          "requires": {
+            "colors": "^1.1.2",
+            "object-assign": "^4.1.0",
+            "string-width": "^2.1.1"
+          }
+        },
+        "cli-width": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+          "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
+          "dev": true
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "commander": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "detect-port-alt": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
+          "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
+          "dev": true,
+          "requires": {
+            "address": "^1.0.1",
+            "debug": "^2.6.0"
+          }
+        },
+        "dir-glob": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+          "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+          "dev": true,
+          "requires": {
+            "arrify": "^1.0.1",
+            "path-type": "^3.0.0"
+          }
+        },
+        "fast-glob": {
+          "version": "2.2.7",
+          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
+          "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
+          "dev": true,
+          "requires": {
+            "@mrmlnc/readdir-enhanced": "^2.2.1",
+            "@nodelib/fs.stat": "^1.1.2",
+            "glob-parent": "^3.1.0",
+            "is-glob": "^4.0.0",
+            "merge2": "^1.2.3",
+            "micromatch": "^3.1.10"
+          },
+          "dependencies": {
+            "braces": {
+              "version": "2.3.2",
+              "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+              "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+              "dev": true,
+              "requires": {
+                "arr-flatten": "^1.1.0",
+                "array-unique": "^0.3.2",
+                "extend-shallow": "^2.0.1",
+                "fill-range": "^4.0.0",
+                "isobject": "^3.0.1",
+                "repeat-element": "^1.1.2",
+                "snapdragon": "^0.8.1",
+                "snapdragon-node": "^2.0.1",
+                "split-string": "^3.0.2",
+                "to-regex": "^3.0.1"
+              },
+              "dependencies": {
+                "extend-shallow": {
+                  "version": "2.0.1",
+                  "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                  "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                  "dev": true,
+                  "requires": {
+                    "is-extendable": "^0.1.0"
+                  }
+                }
+              }
+            },
+            "fill-range": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+              "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+              "dev": true,
+              "requires": {
+                "extend-shallow": "^2.0.1",
+                "is-number": "^3.0.0",
+                "repeat-string": "^1.6.1",
+                "to-regex-range": "^2.1.0"
+              },
+              "dependencies": {
+                "extend-shallow": {
+                  "version": "2.0.1",
+                  "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                  "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                  "dev": true,
+                  "requires": {
+                    "is-extendable": "^0.1.0"
+                  }
+                }
+              }
+            },
+            "is-number": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+              "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+              "dev": true,
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "dev": true,
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "micromatch": {
+              "version": "3.1.10",
+              "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+              "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+              "dev": true,
+              "requires": {
+                "arr-diff": "^4.0.0",
+                "array-unique": "^0.3.2",
+                "braces": "^2.3.1",
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "extglob": "^2.0.4",
+                "fragment-cache": "^0.2.1",
+                "kind-of": "^6.0.2",
+                "nanomatch": "^1.2.9",
+                "object.pick": "^1.3.0",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.2"
+              }
+            },
+            "to-regex-range": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+              "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+              "dev": true,
+              "requires": {
+                "is-number": "^3.0.0",
+                "repeat-string": "^1.6.1"
+              }
+            }
+          }
+        },
+        "figures": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5"
+          }
+        },
+        "file-loader": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz",
+          "integrity": "sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==",
+          "dev": true,
+          "requires": {
+            "loader-utils": "^1.2.3",
+            "schema-utils": "^2.5.0"
+          }
+        },
+        "filesize": {
+          "version": "3.6.1",
+          "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
+          "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
+          "dev": true
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "find-cache-dir": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^3.0.2",
+            "pkg-dir": "^4.1.0"
+          }
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "fork-ts-checker-webpack-plugin": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz",
+          "integrity": "sha512-zEhg7Hz+KhZlBhILYpXy+Beu96gwvkROWJiTXOCyOOMMrdBIRPvsBpBqgTI4jfJGrJXcqGwJR8zsBGDmzY0jsA==",
+          "dev": true,
+          "requires": {
+            "babel-code-frame": "^6.22.0",
+            "chalk": "^2.4.1",
+            "chokidar": "^2.0.4",
+            "micromatch": "^3.1.10",
+            "minimatch": "^3.0.4",
+            "semver": "^5.6.0",
+            "tapable": "^1.0.0",
+            "worker-rpc": "^0.1.0"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "3.2.1",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+              "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+              "dev": true,
+              "requires": {
+                "color-convert": "^1.9.0"
+              }
+            },
+            "braces": {
+              "version": "2.3.2",
+              "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+              "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+              "dev": true,
+              "requires": {
+                "arr-flatten": "^1.1.0",
+                "array-unique": "^0.3.2",
+                "extend-shallow": "^2.0.1",
+                "fill-range": "^4.0.0",
+                "isobject": "^3.0.1",
+                "repeat-element": "^1.1.2",
+                "snapdragon": "^0.8.1",
+                "snapdragon-node": "^2.0.1",
+                "split-string": "^3.0.2",
+                "to-regex": "^3.0.1"
+              },
+              "dependencies": {
+                "extend-shallow": {
+                  "version": "2.0.1",
+                  "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                  "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                  "dev": true,
+                  "requires": {
+                    "is-extendable": "^0.1.0"
+                  }
+                }
+              }
+            },
+            "chalk": {
+              "version": "2.4.2",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+              }
+            },
+            "color-convert": {
+              "version": "1.9.3",
+              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+              "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+              "dev": true,
+              "requires": {
+                "color-name": "1.1.3"
+              }
+            },
+            "color-name": {
+              "version": "1.1.3",
+              "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+              "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+              "dev": true
+            },
+            "fill-range": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+              "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+              "dev": true,
+              "requires": {
+                "extend-shallow": "^2.0.1",
+                "is-number": "^3.0.0",
+                "repeat-string": "^1.6.1",
+                "to-regex-range": "^2.1.0"
+              },
+              "dependencies": {
+                "extend-shallow": {
+                  "version": "2.0.1",
+                  "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                  "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                  "dev": true,
+                  "requires": {
+                    "is-extendable": "^0.1.0"
+                  }
+                }
+              }
+            },
+            "has-flag": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+              "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+              "dev": true
+            },
+            "is-number": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+              "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+              "dev": true,
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "dev": true,
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "micromatch": {
+              "version": "3.1.10",
+              "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+              "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+              "dev": true,
+              "requires": {
+                "arr-diff": "^4.0.0",
+                "array-unique": "^0.3.2",
+                "braces": "^2.3.1",
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "extglob": "^2.0.4",
+                "fragment-cache": "^0.2.1",
+                "kind-of": "^6.0.2",
+                "nanomatch": "^1.2.9",
+                "object.pick": "^1.3.0",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.2"
+              }
+            },
+            "semver": {
+              "version": "5.7.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "dev": true
+            },
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            },
+            "to-regex-range": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+              "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+              "dev": true,
+              "requires": {
+                "is-number": "^3.0.0",
+                "repeat-string": "^1.6.1"
+              }
+            }
+          }
+        },
+        "fs-extra": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "globby": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
+          "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
+          "dev": true,
+          "requires": {
+            "array-union": "^1.0.1",
+            "dir-glob": "2.0.0",
+            "fast-glob": "^2.0.2",
+            "glob": "^7.1.2",
+            "ignore": "^3.3.5",
+            "pify": "^3.0.0",
+            "slash": "^1.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "ignore": {
+          "version": "3.3.10",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+          "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+          "dev": true
+        },
+        "immer": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz",
+          "integrity": "sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "jest-worker": {
+          "version": "25.5.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
+          "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
+          "dev": true,
+          "requires": {
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        },
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "make-dir": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "mime": {
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
+          "dev": true
+        },
+        "mimic-fn": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "mute-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+          "dev": true
+        },
+        "node-fetch": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+          "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+          "dev": true
+        },
+        "onetime": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "p-map": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+          "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+          "dev": true,
+          "requires": {
+            "aggregate-error": "^3.0.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "picomatch": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+          "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+          "dev": true
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "dev": true,
+          "requires": {
+            "find-up": "^4.0.0"
+          }
+        },
+        "pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
+          "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.1.0"
+          },
+          "dependencies": {
+            "find-up": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+              "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+              "dev": true,
+              "requires": {
+                "locate-path": "^2.0.0"
+              }
+            },
+            "locate-path": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+              "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+              "dev": true,
+              "requires": {
+                "p-locate": "^2.0.0",
+                "path-exists": "^3.0.0"
+              }
+            },
+            "p-limit": {
+              "version": "1.3.0",
+              "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+              "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+              "dev": true,
+              "requires": {
+                "p-try": "^1.0.0"
+              }
+            },
+            "p-locate": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+              "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+              "dev": true,
+              "requires": {
+                "p-limit": "^1.1.0"
+              }
+            },
+            "path-exists": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+              "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+              "dev": true
+            }
+          }
+        },
+        "pnp-webpack-plugin": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.5.0.tgz",
+          "integrity": "sha512-jd9olUr9D7do+RN8Wspzhpxhgp1n6Vd0NtQ4SFkmIACZoEL1nkyAdW9Ygrinjec0vgDcWjscFQQ1gDW8rsfKTg==",
+          "dev": true,
+          "requires": {
+            "ts-pnp": "^1.1.2"
+          }
+        },
+        "postcss-loader": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+          "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+          "dev": true,
+          "requires": {
+            "loader-utils": "^1.1.0",
+            "postcss": "^7.0.0",
+            "postcss-load-config": "^2.0.0",
+            "schema-utils": "^1.0.0"
+          },
+          "dependencies": {
+            "schema-utils": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+              "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+              "dev": true,
+              "requires": {
+                "ajv": "^6.1.0",
+                "ajv-errors": "^1.0.0",
+                "ajv-keywords": "^3.1.0"
+              }
+            }
+          }
+        },
+        "raw-loader": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-3.1.0.tgz",
+          "integrity": "sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==",
+          "dev": true,
+          "requires": {
+            "loader-utils": "^1.1.0",
+            "schema-utils": "^2.0.1"
+          }
+        },
+        "react-dev-utils": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-9.1.0.tgz",
+          "integrity": "sha512-X2KYF/lIGyGwP/F/oXgGDF24nxDA2KC4b7AFto+eqzc/t838gpSGiaU8trTqHXOohuLxxc5qi1eDzsl9ucPDpg==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "7.5.5",
+            "address": "1.1.2",
+            "browserslist": "4.7.0",
+            "chalk": "2.4.2",
+            "cross-spawn": "6.0.5",
+            "detect-port-alt": "1.1.6",
+            "escape-string-regexp": "1.0.5",
+            "filesize": "3.6.1",
+            "find-up": "3.0.0",
+            "fork-ts-checker-webpack-plugin": "1.5.0",
+            "global-modules": "2.0.0",
+            "globby": "8.0.2",
+            "gzip-size": "5.1.1",
+            "immer": "1.10.0",
+            "inquirer": "6.5.0",
+            "is-root": "2.1.0",
+            "loader-utils": "1.2.3",
+            "open": "^6.3.0",
+            "pkg-up": "2.0.0",
+            "react-error-overlay": "^6.0.3",
+            "recursive-readdir": "2.2.2",
+            "shell-quote": "1.7.2",
+            "sockjs-client": "1.4.0",
+            "strip-ansi": "5.2.0",
+            "text-table": "0.2.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+              "dev": true
+            },
+            "ansi-styles": {
+              "version": "3.2.1",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+              "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+              "dev": true,
+              "requires": {
+                "color-convert": "^1.9.0"
+              }
+            },
+            "chalk": {
+              "version": "2.4.2",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+              }
+            },
+            "color-convert": {
+              "version": "1.9.3",
+              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+              "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+              "dev": true,
+              "requires": {
+                "color-name": "1.1.3"
+              }
+            },
+            "color-name": {
+              "version": "1.1.3",
+              "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+              "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+              "dev": true
+            },
+            "find-up": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+              "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+              "dev": true,
+              "requires": {
+                "locate-path": "^3.0.0"
+              }
+            },
+            "has-flag": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+              "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+              "dev": true
+            },
+            "inquirer": {
+              "version": "6.5.0",
+              "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz",
+              "integrity": "sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==",
+              "dev": true,
+              "requires": {
+                "ansi-escapes": "^3.2.0",
+                "chalk": "^2.4.2",
+                "cli-cursor": "^2.1.0",
+                "cli-width": "^2.0.0",
+                "external-editor": "^3.0.3",
+                "figures": "^2.0.0",
+                "lodash": "^4.17.12",
+                "mute-stream": "0.0.7",
+                "run-async": "^2.2.0",
+                "rxjs": "^6.4.0",
+                "string-width": "^2.1.0",
+                "strip-ansi": "^5.1.0",
+                "through": "^2.3.6"
+              }
+            },
+            "locate-path": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+              "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+              "dev": true,
+              "requires": {
+                "p-locate": "^3.0.0",
+                "path-exists": "^3.0.0"
+              }
+            },
+            "open": {
+              "version": "6.4.0",
+              "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
+              "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
+              "dev": true,
+              "requires": {
+                "is-wsl": "^1.1.0"
+              }
+            },
+            "p-locate": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+              "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+              "dev": true,
+              "requires": {
+                "p-limit": "^2.0.0"
+              }
+            },
+            "path-exists": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+              "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            },
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "react-sizeme": {
+          "version": "2.6.12",
+          "resolved": "https://registry.npmjs.org/react-sizeme/-/react-sizeme-2.6.12.tgz",
+          "integrity": "sha512-tL4sCgfmvapYRZ1FO2VmBmjPVzzqgHA7kI8lSJ6JS6L78jXFNRdOZFpXyK6P1NBZvKPPCZxReNgzZNUajAerZw==",
+          "dev": true,
+          "requires": {
+            "element-resize-detector": "^1.2.1",
+            "invariant": "^2.2.4",
+            "shallowequal": "^1.1.0",
+            "throttle-debounce": "^2.1.0"
+          }
+        },
+        "restore-cursor": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+          "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+          "dev": true,
+          "requires": {
+            "onetime": "^2.0.0",
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "schema-utils": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+          "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.5",
+            "ajv": "^6.12.4",
+            "ajv-keywords": "^3.5.2"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "serialize-javascript": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+          "dev": true,
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        },
+        "slash": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+          "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "ssri": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz",
+          "integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "minipass": "^3.1.1"
+          }
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "terser-webpack-plugin": {
+          "version": "2.3.8",
+          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz",
+          "integrity": "sha512-/fKw3R+hWyHfYx7Bv6oPqmk4HGQcrWLtV3X6ggvPuwPNHSnzvVV51z6OaaCOus4YLjutYGOz3pEpbhe6Up2s1w==",
+          "dev": true,
+          "requires": {
+            "cacache": "^13.0.1",
+            "find-cache-dir": "^3.3.1",
+            "jest-worker": "^25.4.0",
+            "p-limit": "^2.3.0",
+            "schema-utils": "^2.6.6",
+            "serialize-javascript": "^4.0.0",
+            "source-map": "^0.6.1",
+            "terser": "^4.6.12",
+            "webpack-sources": "^1.4.3"
+          },
+          "dependencies": {
+            "p-limit": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+              "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+              "dev": true,
+              "requires": {
+                "p-try": "^2.0.0"
+              }
+            },
+            "p-try": {
+              "version": "2.2.0",
+              "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+              "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+              "dev": true
+            }
+          }
+        },
+        "throttle-debounce": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.3.0.tgz",
+          "integrity": "sha512-H7oLPV0P7+jgvrk+6mwwwBDmxTaxnu9HMXmloNLXwnNO0ZxZ31Orah2n8lU1eMPvsaowP2CX+USCgyovXfdOFQ==",
+          "dev": true
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        },
+        "universalify": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+          "dev": true
+        },
+        "url-loader": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.3.0.tgz",
+          "integrity": "sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==",
+          "dev": true,
+          "requires": {
+            "loader-utils": "^1.2.3",
+            "mime": "^2.4.4",
+            "schema-utils": "^2.5.0"
+          }
+        }
+      }
+    },
+    "@types/styled-components": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-4.4.3.tgz",
+      "integrity": "sha512-U0udeNOZBfUkJycmGJwmzun0FBt11rZy08weVQmE2xfUNAbX8AGOEWxWna2d+qAUKxKgMlcG+TZT0+K2FfDcnQ==",
+      "dev": true,
+      "requires": {
+        "@types/hoist-non-react-statics": "*",
+        "@types/react": "*",
+        "@types/react-native": "*",
+        "csstype": "^2.2.0"
+      }
+    },
     "@types/tapable": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz",
-      "integrity": "sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.7.tgz",
+      "integrity": "sha512-0VBprVqfgFD7Ehb2vd8Lh9TG3jP98gvr8rgehQqzztZNI7o8zS8Ad4jyZneKELphpuE212D8J70LnSNQSyO6bQ==",
       "dev": true
     },
     "@types/testing-library__jest-dom": {
@@ -5867,18 +12579,18 @@
       }
     },
     "@types/testing-library__react-hooks": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/@types/testing-library__react-hooks/-/testing-library__react-hooks-3.4.1.tgz",
-      "integrity": "sha512-G4JdzEcq61fUyV6wVW9ebHWEiLK2iQvaBuCHHn9eMSbZzVh4Z4wHnUGIvQOYCCYeu5DnUtFyNYuAAgbSaO/43Q==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/testing-library__react-hooks/-/testing-library__react-hooks-4.0.0.tgz",
+      "integrity": "sha512-UzZUXthQtVjDruR2YA+hqg9ux5AfmZ8Kaw+QDungax+T7wb/5NC4x7YOpIqRx7oY3KksGQ69bzNE/xwzb5NslQ==",
       "dev": true,
       "requires": {
-        "@types/react-test-renderer": "*"
+        "@testing-library/react-hooks": "*"
       }
     },
     "@types/uglify-js": {
-      "version": "3.9.3",
-      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.3.tgz",
-      "integrity": "sha512-KswB5C7Kwduwjj04Ykz+AjvPcfgv/37Za24O2EDzYNbwyzOo8+ydtvzUfZ5UMguiVu29Gx44l1A6VsPPcmYu9w==",
+      "version": "3.13.0",
+      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.0.tgz",
+      "integrity": "sha512-EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q==",
       "dev": true,
       "requires": {
         "source-map": "^0.6.1"
@@ -5892,38 +12604,474 @@
         }
       }
     },
+    "@types/unist": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
+      "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
+      "dev": true
+    },
     "@types/webpack": {
-      "version": "4.41.21",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.21.tgz",
-      "integrity": "sha512-2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA==",
+      "version": "5.28.0",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz",
+      "integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==",
       "dev": true,
       "requires": {
-        "@types/anymatch": "*",
         "@types/node": "*",
-        "@types/tapable": "*",
-        "@types/uglify-js": "*",
-        "@types/webpack-sources": "*",
-        "source-map": "^0.6.0"
+        "tapable": "^2.2.0",
+        "webpack": "^5"
       },
       "dependencies": {
+        "@types/json-schema": {
+          "version": "7.0.7",
+          "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
+          "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
+          "dev": true
+        },
+        "@webassemblyjs/ast": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz",
+          "integrity": "sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/helper-numbers": "1.11.0",
+            "@webassemblyjs/helper-wasm-bytecode": "1.11.0"
+          }
+        },
+        "@webassemblyjs/helper-api-error": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz",
+          "integrity": "sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==",
+          "dev": true
+        },
+        "@webassemblyjs/helper-buffer": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz",
+          "integrity": "sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==",
+          "dev": true
+        },
+        "@webassemblyjs/helper-wasm-bytecode": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz",
+          "integrity": "sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==",
+          "dev": true
+        },
+        "@webassemblyjs/helper-wasm-section": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz",
+          "integrity": "sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/ast": "1.11.0",
+            "@webassemblyjs/helper-buffer": "1.11.0",
+            "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+            "@webassemblyjs/wasm-gen": "1.11.0"
+          }
+        },
+        "@webassemblyjs/ieee754": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz",
+          "integrity": "sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==",
+          "dev": true,
+          "requires": {
+            "@xtuc/ieee754": "^1.2.0"
+          }
+        },
+        "@webassemblyjs/leb128": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz",
+          "integrity": "sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==",
+          "dev": true,
+          "requires": {
+            "@xtuc/long": "4.2.2"
+          }
+        },
+        "@webassemblyjs/utf8": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz",
+          "integrity": "sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==",
+          "dev": true
+        },
+        "@webassemblyjs/wasm-edit": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz",
+          "integrity": "sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/ast": "1.11.0",
+            "@webassemblyjs/helper-buffer": "1.11.0",
+            "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+            "@webassemblyjs/helper-wasm-section": "1.11.0",
+            "@webassemblyjs/wasm-gen": "1.11.0",
+            "@webassemblyjs/wasm-opt": "1.11.0",
+            "@webassemblyjs/wasm-parser": "1.11.0",
+            "@webassemblyjs/wast-printer": "1.11.0"
+          }
+        },
+        "@webassemblyjs/wasm-gen": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz",
+          "integrity": "sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/ast": "1.11.0",
+            "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+            "@webassemblyjs/ieee754": "1.11.0",
+            "@webassemblyjs/leb128": "1.11.0",
+            "@webassemblyjs/utf8": "1.11.0"
+          }
+        },
+        "@webassemblyjs/wasm-opt": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz",
+          "integrity": "sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/ast": "1.11.0",
+            "@webassemblyjs/helper-buffer": "1.11.0",
+            "@webassemblyjs/wasm-gen": "1.11.0",
+            "@webassemblyjs/wasm-parser": "1.11.0"
+          }
+        },
+        "@webassemblyjs/wasm-parser": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz",
+          "integrity": "sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/ast": "1.11.0",
+            "@webassemblyjs/helper-api-error": "1.11.0",
+            "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+            "@webassemblyjs/ieee754": "1.11.0",
+            "@webassemblyjs/leb128": "1.11.0",
+            "@webassemblyjs/utf8": "1.11.0"
+          }
+        },
+        "@webassemblyjs/wast-printer": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz",
+          "integrity": "sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/ast": "1.11.0",
+            "@xtuc/long": "4.2.2"
+          }
+        },
+        "acorn": {
+          "version": "8.2.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.2.tgz",
+          "integrity": "sha512-VrMS8kxT0e7J1EX0p6rI/E0FbfOVcvBpbIqHThFv+f8YrZIlMfVotYcXKVPmTvPW8sW5miJzfUFrrvthUZg8VQ==",
+          "dev": true
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true
+        },
+        "browserslist": {
+          "version": "4.16.5",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.5.tgz",
+          "integrity": "sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "^1.0.30001214",
+            "colorette": "^1.2.2",
+            "electron-to-chromium": "^1.3.719",
+            "escalade": "^3.1.1",
+            "node-releases": "^1.1.71"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001219",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz",
+          "integrity": "sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ==",
+          "dev": true
+        },
+        "colorette": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+          "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+          "dev": true
+        },
+        "electron-to-chromium": {
+          "version": "1.3.723",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.723.tgz",
+          "integrity": "sha512-L+WXyXI7c7+G1V8ANzRsPI5giiimLAUDC6Zs1ojHHPhYXb3k/iTABFmWjivEtsWrRQymjnO66/rO2ZTABGdmWg==",
+          "dev": true
+        },
+        "enhanced-resolve": {
+          "version": "5.8.0",
+          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz",
+          "integrity": "sha512-Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.4",
+            "tapable": "^2.2.0"
+          }
+        },
+        "escalade": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+          "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+          "dev": true
+        },
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
+          }
+        },
+        "esrecurse": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+          "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+          "dev": true,
+          "requires": {
+            "estraverse": "^5.2.0"
+          },
+          "dependencies": {
+            "estraverse": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+              "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+              "dev": true
+            }
+          }
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "glob-to-regexp": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+          "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+          "dev": true
+        },
+        "graceful-fs": {
+          "version": "4.2.6",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+          "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "jest-worker": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+          "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        },
+        "loader-runner": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
+          "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
+          "dev": true
+        },
+        "neo-async": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+          "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.71",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
+          "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "dev": true,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "schema-utils": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.6",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        },
+        "serialize-javascript": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+          "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+          "dev": true,
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.19",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+          "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "tapable": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
+          "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
+          "dev": true
+        },
+        "terser": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz",
+          "integrity": "sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==",
+          "dev": true,
+          "requires": {
+            "commander": "^2.20.0",
+            "source-map": "~0.7.2",
+            "source-map-support": "~0.5.19"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.7.3",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+              "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+              "dev": true
+            }
+          }
+        },
+        "terser-webpack-plugin": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz",
+          "integrity": "sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q==",
+          "dev": true,
+          "requires": {
+            "jest-worker": "^26.6.2",
+            "p-limit": "^3.1.0",
+            "schema-utils": "^3.0.0",
+            "serialize-javascript": "^5.0.1",
+            "source-map": "^0.6.1",
+            "terser": "^5.5.1"
+          }
+        },
+        "watchpack": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz",
+          "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
+          "dev": true,
+          "requires": {
+            "glob-to-regexp": "^0.4.1",
+            "graceful-fs": "^4.1.2"
+          }
+        },
+        "webpack": {
+          "version": "5.36.1",
+          "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.36.1.tgz",
+          "integrity": "sha512-2u25a82T+6quAxSlzEpN/R/RICwt20ONU3z3Ko05S8KVH9FXILcBYb2hD/rQtZT5y7lRAIsIIs05pdndY7ourQ==",
+          "dev": true,
+          "requires": {
+            "@types/eslint-scope": "^3.7.0",
+            "@types/estree": "^0.0.47",
+            "@webassemblyjs/ast": "1.11.0",
+            "@webassemblyjs/wasm-edit": "1.11.0",
+            "@webassemblyjs/wasm-parser": "1.11.0",
+            "acorn": "^8.2.1",
+            "browserslist": "^4.14.5",
+            "chrome-trace-event": "^1.0.2",
+            "enhanced-resolve": "^5.8.0",
+            "es-module-lexer": "^0.4.0",
+            "eslint-scope": "^5.1.1",
+            "events": "^3.2.0",
+            "glob-to-regexp": "^0.4.1",
+            "graceful-fs": "^4.2.4",
+            "json-parse-better-errors": "^1.0.2",
+            "loader-runner": "^4.2.0",
+            "mime-types": "^2.1.27",
+            "neo-async": "^2.6.2",
+            "schema-utils": "^3.0.0",
+            "tapable": "^2.1.1",
+            "terser-webpack-plugin": "^5.1.1",
+            "watchpack": "^2.0.0",
+            "webpack-sources": "^2.1.1"
+          }
+        },
+        "webpack-sources": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz",
+          "integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==",
+          "dev": true,
+          "requires": {
+            "source-list-map": "^2.0.1",
+            "source-map": "^0.6.1"
+          }
         }
       }
     },
     "@types/webpack-env": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.15.2.tgz",
-      "integrity": "sha512-67ZgZpAlhIICIdfQrB5fnDvaKFcDxpKibxznfYRVAT4mQE41Dido/3Ty+E3xGBmTogc5+0Qb8tWhna+5B8z1iQ==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.0.tgz",
+      "integrity": "sha512-Fx+NpfOO0CpeYX2g9bkvX8O5qh9wrU1sOF4g8sft4Mu7z+qfe387YlyY8w8daDyDsKY5vUxM0yxkAYnbkRbZEw==",
       "dev": true
     },
+    "@types/webpack-merge": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/webpack-merge/-/webpack-merge-5.0.0.tgz",
+      "integrity": "sha512-CFedsXD/7vmJ66PaC3eavdqqNZujWlvdkGFcizi0QPtDswK75DV7a5GTKzL9Ev6d0okLurq+ebQjwIEFmP9aZw==",
+      "dev": true,
+      "requires": {
+        "webpack-merge": "*"
+      }
+    },
     "@types/webpack-sources": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.2.tgz",
-      "integrity": "sha512-77T++JyKow4BQB/m9O96n9d/UUHWLQHlcqXb9Vsf4F1+wKNrrlWNFPDLKNT92RJnCSL6CieTc+NDXtCVZswdTw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.0.tgz",
+      "integrity": "sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -6007,6 +13155,31 @@
         "@webassemblyjs/ast": "1.9.0"
       }
     },
+    "@webassemblyjs/helper-numbers": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz",
+      "integrity": "sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.0",
+        "@webassemblyjs/helper-api-error": "1.11.0",
+        "@xtuc/long": "4.2.2"
+      },
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz",
+          "integrity": "sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==",
+          "dev": true
+        },
+        "@webassemblyjs/helper-api-error": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz",
+          "integrity": "sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==",
+          "dev": true
+        }
+      }
+    },
     "@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
@@ -6200,9 +13373,9 @@
       "dev": true
     },
     "aggregate-error": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz",
-      "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "dev": true,
       "requires": {
         "clean-stack": "^2.0.0",
@@ -6417,9 +13590,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.12.5",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
-          "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
+          "version": "7.13.17",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz",
+          "integrity": "sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==",
           "dev": true,
           "requires": {
             "regenerator-runtime": "^0.13.4"
@@ -6458,24 +13631,89 @@
       "dev": true
     },
     "array-includes": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz",
+      "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
+        "es-abstract": "^1.18.0-next.2",
+        "get-intrinsic": "^1.1.1",
         "is-string": "^1.0.5"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+          "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.2",
+            "is-string": "^1.0.5",
+            "object-inspect": "^1.9.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.0"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "object-inspect": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+          "dev": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        }
       }
     },
     "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true
     },
     "array-uniq": {
       "version": "1.0.3",
@@ -6490,42 +13728,243 @@
       "dev": true
     },
     "array.prototype.flat": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
-      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz",
+      "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+          "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.2",
+            "is-string": "^1.0.5",
+            "object-inspect": "^1.9.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.0"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "object-inspect": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+          "dev": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        }
       }
     },
     "array.prototype.flatmap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz",
-      "integrity": "sha512-OOEk+lkePcg+ODXIpvuU9PAryCikCJyo7GlDG1upleEpQRx6mzL9puEBkozQ5iAx20KV0l3DbyQwqciJtqe5Pg==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz",
+      "integrity": "sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
+        "es-abstract": "^1.18.0-next.1",
         "function-bind": "^1.1.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+          "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.2",
+            "is-string": "^1.0.5",
+            "object-inspect": "^1.9.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.0"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "object-inspect": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+          "dev": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        }
       }
     },
     "array.prototype.map": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz",
-      "integrity": "sha512-Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.3.tgz",
+      "integrity": "sha512-nNcb30v0wfDyIe26Yif3PcV1JXQp4zEeEfupG7L4SRjnD6HLbO5b2a7eVSba53bOx4YCHYMBHt+Fp4vYstneRA==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
+        "es-abstract": "^1.18.0-next.1",
         "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.4"
+        "is-string": "^1.0.5"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+          "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.2",
+            "is-string": "^1.0.5",
+            "object-inspect": "^1.9.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.0"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "object-inspect": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+          "dev": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        }
       }
     },
     "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
       "dev": true
     },
     "asap": {
@@ -6602,10 +14041,21 @@
       "dev": true
     },
     "ast-types": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.3.tgz",
-      "integrity": "sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA==",
-      "dev": true
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz",
+      "integrity": "sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.1"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==",
+          "dev": true
+        }
+      }
     },
     "async-each": {
       "version": "1.0.3",
@@ -6619,6 +14069,12 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
       "dev": true
     },
+    "at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "dev": true
+    },
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
@@ -6638,14 +14094,6 @@
         "num2fraction": "^1.2.2",
         "postcss": "^7.0.32",
         "postcss-value-parser": "^4.1.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-          "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
-          "dev": true
-        }
       }
     },
     "aws-sign2": {
@@ -6825,31 +14273,6 @@
         }
       }
     },
-    "babel-loader": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
-      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
-      "dev": true,
-      "requires": {
-        "find-cache-dir": "^2.0.0",
-        "loader-utils": "^1.0.2",
-        "mkdirp": "^0.5.1",
-        "pify": "^4.0.1"
-      },
-      "dependencies": {
-        "find-cache-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^2.0.0",
-            "pkg-dir": "^3.0.0"
-          }
-        }
-      }
-    },
     "babel-plugin-add-react-displayname": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz",
@@ -7085,26 +14508,222 @@
       }
     },
     "babel-plugin-named-asset-import": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.6.tgz",
-      "integrity": "sha512-1aGDUfL1qOOIoqk9QKGIo2lANk+C7ko/fqH0uIyC71x3PEGz0uVP8ISgfEsFuG+FKmjHTvFK/nNM8dowpmUxLA==",
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz",
+      "integrity": "sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw==",
       "dev": true
     },
-    "babel-plugin-react-docgen": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-react-docgen/-/babel-plugin-react-docgen-4.1.0.tgz",
-      "integrity": "sha512-vzpnBlfGv8XOhJM2zbPyyqw2OLEbelgZZsaaRRTpVwNKuYuc+pUg4+dy7i9gCRms0uOQn4osX571HRcCJMJCmA==",
+    "babel-plugin-polyfill-corejs2": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz",
+      "integrity": "sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg==",
       "dev": true,
       "requires": {
+        "@babel/compat-data": "^7.13.11",
+        "@babel/helper-define-polyfill-provider": "^0.2.0",
+        "semver": "^6.1.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "babel-plugin-polyfill-corejs3": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz",
+      "integrity": "sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.1.5",
+        "core-js-compat": "^3.8.1"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.12.13"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.0.tgz",
+          "integrity": "sha512-C6u00HbmsrNPug6A+CiNl8rEys7TsdcXwg12BHi2ca5rUfAs3+UwZsuDQSXnc+wCElCXMB8gMaJ3YXDdh8fAlg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.14.0",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-define-polyfill-provider": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz",
+          "integrity": "sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-compilation-targets": "^7.13.0",
+            "@babel/helper-module-imports": "^7.12.13",
+            "@babel/helper-plugin-utils": "^7.13.0",
+            "@babel/traverse": "^7.13.0",
+            "debug": "^4.1.1",
+            "lodash.debounce": "^4.0.8",
+            "resolve": "^1.14.2",
+            "semver": "^6.1.2"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.12.13",
+            "@babel/template": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-module-imports": {
+          "version": "7.13.12",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
+          "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.13.12"
+          }
+        },
+        "@babel/helper-plugin-utils": {
+          "version": "7.13.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+          "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+          "dev": true
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.0.tgz",
+          "integrity": "sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/parser": "^7.12.13",
+            "@babel/types": "^7.12.13"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
+          "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.14.0",
+            "@babel/helper-function-name": "^7.12.13",
+            "@babel/helper-split-export-declaration": "^7.12.13",
+            "@babel/parser": "^7.14.0",
+            "@babel/types": "^7.14.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.0.tgz",
+          "integrity": "sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "resolve": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+          "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.2.0",
+            "path-parse": "^1.0.6"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "babel-plugin-polyfill-regenerator": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz",
+      "integrity": "sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.2.0"
+      }
+    },
+    "babel-plugin-react-docgen": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-react-docgen/-/babel-plugin-react-docgen-4.2.1.tgz",
+      "integrity": "sha512-UQ0NmGHj/HAqi5Bew8WvNfCk8wSsmdgNd8ZdMjBCICtyCJCq9LiqgqvjCYe570/Wg7AQArSq1VQ60Dd/CHN7mQ==",
+      "dev": true,
+      "requires": {
+        "ast-types": "^0.14.2",
         "lodash": "^4.17.15",
-        "react-docgen": "^5.0.0",
-        "recast": "^0.14.7"
+        "react-docgen": "^5.0.0"
       }
     },
     "babel-plugin-styled-components": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz",
-      "integrity": "sha512-YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz",
+      "integrity": "sha512-FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.0.0",
@@ -7340,6 +14959,15 @@
         "tweetnacl": "^0.14.3"
       }
     },
+    "better-opn": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/better-opn/-/better-opn-2.1.1.tgz",
+      "integrity": "sha512-kIPXZS5qwyKiX/HcRvDYfmBQUa8XP17I0mYZZ0y4UhpYOSvtsLHDYqmomS+Mj20aDvD3knEiQ0ecQy2nhio3yA==",
+      "dev": true,
+      "requires": {
+        "open": "^7.0.3"
+      }
+    },
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -7430,12 +15058,6 @@
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
       "dev": true
     },
-    "bowser": {
-      "version": "1.9.4",
-      "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.9.4.tgz",
-      "integrity": "sha512-9IdMmj2KjigRq6oWhmwv1W36pDuA4STQZ8q6YO9um+x07xgYNCD3Oou+WP/3L1HNz7iqythGet3/p4wvc8AAwQ==",
-      "dev": true
-    },
     "boxen": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
@@ -7459,12 +15081,11 @@
           "dev": true
         },
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -7512,9 +15133,9 @@
           "dev": true
         },
         "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
           "dev": true,
           "requires": {
             "emoji-regex": "^8.0.0",
@@ -7532,13 +15153,19 @@
           }
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
         }
       }
     },
@@ -7700,15 +15327,16 @@
       }
     },
     "browserslist": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz",
-      "integrity": "sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==",
+      "version": "4.16.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.5.tgz",
+      "integrity": "sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001093",
-        "electron-to-chromium": "^1.3.488",
-        "escalade": "^3.0.1",
-        "node-releases": "^1.1.58"
+        "caniuse-lite": "^1.0.30001214",
+        "colorette": "^1.2.2",
+        "electron-to-chromium": "^1.3.719",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.71"
       }
     },
     "bser": {
@@ -7803,6 +15431,16 @@
         }
       }
     },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
     "call-me-maybe": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
@@ -7842,13 +15480,21 @@
       "dev": true
     },
     "camel-case": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz",
-      "integrity": "sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
       "dev": true,
       "requires": {
-        "pascal-case": "^3.1.1",
-        "tslib": "^1.10.0"
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==",
+          "dev": true
+        }
       }
     },
     "camelcase": {
@@ -7870,9 +15516,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001110",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001110.tgz",
-      "integrity": "sha512-KqJWeat4rhSHF0ito4yz9q/JuZHkvn71SsBnxge4azjPDbowIjOUnS8i1xpKGxZxU6BFiPqO2hSV2eiCpFQVRw==",
+      "version": "1.0.30001219",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz",
+      "integrity": "sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ==",
       "dev": true
     },
     "capture-exit": {
@@ -7885,9 +15531,9 @@
       }
     },
     "case-sensitive-paths-webpack-plugin": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz",
-      "integrity": "sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
+      "integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==",
       "dev": true
     },
     "caseless": {
@@ -8070,9 +15716,9 @@
       }
     },
     "classnames": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
-      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
+      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
     },
     "clean-css": {
       "version": "4.2.3",
@@ -8098,9 +15744,9 @@
       "dev": true
     },
     "cli-boxes": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz",
-      "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
+      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
       "dev": true
     },
     "cli-cursor": {
@@ -8113,45 +15759,52 @@
       }
     },
     "cli-table3": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz",
-      "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.0.tgz",
+      "integrity": "sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==",
       "dev": true,
       "requires": {
         "colors": "^1.1.2",
         "object-assign": "^4.1.0",
-        "string-width": "^2.1.1"
+        "string-width": "^4.2.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
           "dev": true
         },
         "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
           "dev": true
         },
         "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
           }
         },
         "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "^5.0.0"
           }
         }
       }
@@ -8163,9 +15816,9 @@
       "dev": true
     },
     "clipboard": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz",
-      "integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
+      "integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -8220,16 +15873,14 @@
       }
     },
     "clone-deep": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
-      "integrity": "sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
       "requires": {
-        "for-own": "^0.1.3",
-        "is-plain-object": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "lazy-cache": "^1.0.3",
-        "shallow-clone": "^0.1.2"
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
       },
       "dependencies": {
         "is-plain-object": {
@@ -8246,15 +15897,6 @@
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
           "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
           "dev": true
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
         }
       }
     },
@@ -8313,9 +15955,9 @@
       "dev": true
     },
     "colorette": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz",
-      "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
       "dev": true
     },
     "colors": {
@@ -8358,6 +16000,12 @@
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
+    "compute-scroll-into-view": {
+      "version": "1.0.17",
+      "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz",
+      "integrity": "sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg==",
+      "dev": true
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -8451,9 +16099,9 @@
       "dev": true
     },
     "copy-to-clipboard": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.2.0.tgz",
-      "integrity": "sha512-eOZERzvCmxS8HWzugj4Uxl8OJxa7T2k1Gi0X5qavwydHIfuSHq2dTD09LOg/XyGq4Zpb5IsR/2OJ5lbOegz78w==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz",
+      "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
       "dev": true,
       "requires": {
         "toggle-selection": "^1.0.6"
@@ -8466,12 +16114,12 @@
       "dev": true
     },
     "core-js-compat": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.11.1.tgz",
+      "integrity": "sha512-aZ0e4tmlG/aOBHj92/TuOuZwp6jFvn1WNabU5VOVixzhu5t5Ao+JZkQOPlgNXu6ynwLrwJxklT4Gw1G1VGEh+g==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.8.5",
+        "browserslist": "^4.16.5",
         "semver": "7.0.0"
       },
       "dependencies": {
@@ -8518,6 +16166,146 @@
         "yaml": "^1.7.2"
       }
     },
+    "cp-file": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz",
+      "integrity": "sha512-0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "make-dir": "^3.0.0",
+        "nested-error-stacks": "^2.0.0",
+        "p-event": "^4.1.0"
+      },
+      "dependencies": {
+        "make-dir": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "cpy": {
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/cpy/-/cpy-8.1.2.tgz",
+      "integrity": "sha512-dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg==",
+      "dev": true,
+      "requires": {
+        "arrify": "^2.0.1",
+        "cp-file": "^7.0.0",
+        "globby": "^9.2.0",
+        "has-glob": "^1.0.0",
+        "junk": "^3.1.0",
+        "nested-error-stacks": "^2.1.0",
+        "p-all": "^2.1.0",
+        "p-filter": "^2.1.0",
+        "p-map": "^3.0.0"
+      },
+      "dependencies": {
+        "@nodelib/fs.stat": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+          "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+          "dev": true
+        },
+        "array-union": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+          "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+          "dev": true,
+          "requires": {
+            "array-uniq": "^1.0.1"
+          }
+        },
+        "dir-glob": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+          "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+          "dev": true,
+          "requires": {
+            "path-type": "^3.0.0"
+          }
+        },
+        "fast-glob": {
+          "version": "2.2.7",
+          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
+          "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
+          "dev": true,
+          "requires": {
+            "@mrmlnc/readdir-enhanced": "^2.2.1",
+            "@nodelib/fs.stat": "^1.1.2",
+            "glob-parent": "^3.1.0",
+            "is-glob": "^4.0.0",
+            "merge2": "^1.2.3",
+            "micromatch": "^3.1.10"
+          }
+        },
+        "globby": {
+          "version": "9.2.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
+          "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
+          "dev": true,
+          "requires": {
+            "@types/glob": "^7.1.1",
+            "array-union": "^1.0.2",
+            "dir-glob": "^2.2.2",
+            "fast-glob": "^2.2.6",
+            "glob": "^7.1.3",
+            "ignore": "^4.0.3",
+            "pify": "^4.0.1",
+            "slash": "^2.0.0"
+          }
+        },
+        "ignore": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "dev": true
+        },
+        "p-map": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+          "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+          "dev": true,
+          "requires": {
+            "aggregate-error": "^3.0.0"
+          }
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+              "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+              "dev": true
+            }
+          }
+        },
+        "slash": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "dev": true
+        }
+      }
+    },
     "create-ecdh": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
@@ -8685,9 +16473,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -8696,27 +16484,27 @@
             "uri-js": "^4.2.2"
           }
         },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true
+        },
         "fast-deep-equal": {
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
           "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
           "dev": true
         },
-        "postcss-value-parser": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-          "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
-          "dev": true
-        },
         "schema-utils": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+          "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.4",
-            "ajv": "^6.12.2",
-            "ajv-keywords": "^3.4.1"
+            "@types/json-schema": "^7.0.5",
+            "ajv": "^6.12.4",
+            "ajv-keywords": "^3.5.2"
           }
         },
         "semver": {
@@ -8728,15 +16516,15 @@
       }
     },
     "css-select": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
       "dev": true,
       "requires": {
-        "boolbase": "~1.0.0",
-        "css-what": "2.1",
-        "domutils": "1.5.1",
-        "nth-check": "~1.0.1"
+        "boolbase": "^1.0.0",
+        "css-what": "^3.2.1",
+        "domutils": "^1.7.0",
+        "nth-check": "^1.0.2"
       }
     },
     "css-select-base-adapter": {
@@ -8754,6 +16542,14 @@
         "camelize": "^1.0.0",
         "css-color-keywords": "^1.0.0",
         "postcss-value-parser": "^3.3.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "css-tree": {
@@ -8775,9 +16571,9 @@
       }
     },
     "css-what": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
-      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
+      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
       "dev": true
     },
     "css.escape": {
@@ -8889,6 +16685,12 @@
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true
     },
+    "dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
+      "dev": true
+    },
     "deep-equal": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
@@ -9031,9 +16833,9 @@
       "dev": true
     },
     "detect-node-es": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.0.0.tgz",
-      "integrity": "sha512-S4AHriUkTX9FoFvL4G8hXDcx6t3gp2HpfCza3Q0v6S78gul2hKWifLQbeW+ZF89+hSm2ZIc/uF3J97ZgytgTRg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
+      "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==",
       "dev": true
     },
     "detect-port": {
@@ -9089,30 +16891,12 @@
       }
     },
     "dir-glob": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
-      "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
       "requires": {
-        "arrify": "^1.0.1",
-        "path-type": "^3.0.0"
-      },
-      "dependencies": {
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-          "dev": true,
-          "requires": {
-            "pify": "^3.0.0"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        }
+        "path-type": "^4.0.0"
       }
     },
     "doctrine": {
@@ -9140,9 +16924,9 @@
       }
     },
     "dom-helpers": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.0.tgz",
-      "integrity": "sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.8.7",
@@ -9150,18 +16934,18 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.0.tgz",
-          "integrity": "sha512-qArkXsjJq7H+T86WrIFV0Fnu/tNOkZ4cgXmjkzAu3b/58D5mFIO8JH/y77t7C9q0OdDRdh9s7Ue5GasYssxtXw==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+          "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
           "dev": true,
           "requires": {
             "regenerator-runtime": "^0.13.4"
           }
         },
         "csstype": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.2.tgz",
-          "integrity": "sha512-ofovWglpqoqbfLNOTBNZLSbMuGrblAf1efvvArGKOZMBrIoJeu5UsAipQolkijtyQx5MtAzT/J9IHj/CEY1mJw==",
+          "version": "3.0.8",
+          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
+          "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==",
           "dev": true
         },
         "regenerator-runtime": {
@@ -9241,9 +17025,9 @@
       }
     },
     "domutils": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
       "dev": true,
       "requires": {
         "dom-serializer": "0",
@@ -9251,19 +17035,27 @@
       }
     },
     "dot-case": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz",
-      "integrity": "sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
       "dev": true,
       "requires": {
-        "no-case": "^3.0.3",
-        "tslib": "^1.10.0"
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==",
+          "dev": true
+        }
       }
     },
     "dotenv": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
-      "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
       "dev": true
     },
     "dotenv-defaults": {
@@ -9273,6 +17065,14 @@
       "dev": true,
       "requires": {
         "dotenv": "^6.2.0"
+      },
+      "dependencies": {
+        "dotenv": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
+          "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+          "dev": true
+        }
       }
     },
     "dotenv-expand": {
@@ -9290,10 +17090,45 @@
         "dotenv-defaults": "^1.0.2"
       }
     },
+    "downshift": {
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.3.tgz",
+      "integrity": "sha512-RA1MuaNcTbt0j+sVLhSs8R2oZbBXYAtdQP/V+uHhT3DoDteZzJPjlC+LQVm9T07Wpvo84QXaZtUCePLDTDwGXg==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.13.10",
+        "compute-scroll-into-view": "^1.0.17",
+        "prop-types": "^15.7.2",
+        "react-is": "^17.0.2"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+          "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+          "dev": true,
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "react-is": {
+          "version": "17.0.2",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+          "dev": true
+        },
+        "regenerator-runtime": {
+          "version": "0.13.7",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+          "dev": true
+        }
+      }
+    },
     "duplexer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
     "duplexify": {
@@ -9331,15 +17166,15 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.518",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.518.tgz",
-      "integrity": "sha512-IspiwXYDKZMxo+qc3Vof4WtwbG9BMDbJfati8PYj7uS4DJmJ67pwjCKZxlTBSAuCZSMcbRnj2Xz2H14uiKT7bQ==",
+      "version": "1.3.723",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.723.tgz",
+      "integrity": "sha512-L+WXyXI7c7+G1V8ANzRsPI5giiimLAUDC6Zs1ojHHPhYXb3k/iTABFmWjivEtsWrRQymjnO66/rO2ZTABGdmWg==",
       "dev": true
     },
     "element-resize-detector": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.1.tgz",
-      "integrity": "sha512-BdFsPepnQr9fznNPF9nF4vQ457U/ZJXQDSNF1zBe7yaga8v9AdZf3/NElYxFdUh7SitSGt040QygiTo6dtatIw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.2.tgz",
+      "integrity": "sha512-+LOXRkCJc4I5WhEJxIDjhmE3raF8jtOMBDqSCgZTMz2TX3oXAX5pE2+MDeopJlGdXzP7KzPbBJaUGfNaP9HG4A==",
       "dev": true,
       "requires": {
         "batch-processor": "1.0.0"
@@ -9421,6 +17256,17 @@
         "once": "^1.4.0"
       }
     },
+    "endent": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/endent/-/endent-2.0.1.tgz",
+      "integrity": "sha512-mADztvcC+vCk4XEZaCz6xIPO2NHQuprv5CAEjuVAu6aZwqAj7nVNlMyl1goPFYqCCpS2OJV9jwpumJLkotZrNw==",
+      "dev": true,
+      "requires": {
+        "dedent": "^0.7.0",
+        "fast-json-parse": "^1.0.3",
+        "objectorarray": "^1.0.4"
+      }
+    },
     "enhanced-resolve": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz",
@@ -9503,54 +17349,21 @@
       "dev": true
     },
     "es-get-iterator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz",
-      "integrity": "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
+      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
       "dev": true,
       "requires": {
-        "es-abstract": "^1.17.4",
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.0",
         "has-symbols": "^1.0.1",
-        "is-arguments": "^1.0.4",
-        "is-map": "^2.0.1",
-        "is-set": "^2.0.1",
+        "is-arguments": "^1.1.0",
+        "is-map": "^2.0.2",
+        "is-set": "^2.0.2",
         "is-string": "^1.0.5",
         "isarray": "^2.0.5"
       },
       "dependencies": {
-        "es-abstract": {
-          "version": "1.17.6",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-          "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-          "dev": true,
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.0",
-            "is-regex": "^1.1.0",
-            "object-inspect": "^1.7.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.0",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-          "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-          "dev": true,
-          "requires": {
-            "has-symbols": "^1.0.1"
-          }
-        },
         "isarray": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
@@ -9559,6 +17372,12 @@
         }
       }
     },
+    "es-module-lexer": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz",
+      "integrity": "sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==",
+      "dev": true
+    },
     "es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -9571,21 +17390,21 @@
       }
     },
     "es5-shim": {
-      "version": "4.5.14",
-      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.5.14.tgz",
-      "integrity": "sha512-7SwlpL+2JpymWTt8sNLuC2zdhhc+wrfe5cMPI2j0o6WsPdfAiPwmFy2f0AocPB4RQVBOZ9kNTgi5YF7TdhkvEg==",
+      "version": "4.5.15",
+      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.5.15.tgz",
+      "integrity": "sha512-FYpuxEjMeDvU4rulKqFdukQyZSTpzhg4ScQHrAosrlVpR6GFyaw14f74yn2+4BugniIS0Frpg7TvwZocU4ZMTw==",
       "dev": true
     },
     "es6-shim": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.5.tgz",
-      "integrity": "sha512-E9kK/bjtCQRpN1K28Xh4BlmP8egvZBGJJ+9GtnzOwt7mdqtrjHFuVGr7QJfdjBIKqrlU5duPf3pCBoDrkjVYFg==",
+      "version": "0.35.6",
+      "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.6.tgz",
+      "integrity": "sha512-EmTr31wppcaIAgblChZiuN/l9Y7DPyw8Xtbg7fIVngn6zMW+IEBJDJngeKC3x6wr0V/vcA2wqeFnaw1bFJbDdA==",
       "dev": true
     },
     "escalade": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz",
-      "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
       "dev": true
     },
     "escape-html": {
@@ -9666,9 +17485,9 @@
       "dev": true
     },
     "eventemitter3": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
-      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
       "dev": true
     },
     "events": {
@@ -9678,9 +17497,9 @@
       "dev": true
     },
     "eventsource": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz",
+      "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==",
       "dev": true,
       "requires": {
         "original": "^1.0.0"
@@ -10025,19 +17844,87 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-      "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
+      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
       "dev": true,
       "requires": {
-        "@mrmlnc/readdir-enhanced": "^2.2.1",
-        "@nodelib/fs.stat": "^1.1.2",
-        "glob-parent": "^3.1.0",
-        "is-glob": "^4.0.0",
-        "merge2": "^1.2.3",
-        "micromatch": "^3.1.10"
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.0",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.2",
+        "picomatch": "^2.2.1"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.2.3"
+          },
+          "dependencies": {
+            "picomatch": {
+              "version": "2.2.3",
+              "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+              "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+              "dev": true
+            }
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
       }
     },
+    "fast-json-parse": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
+      "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==",
+      "dev": true
+    },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -10057,11 +17944,20 @@
       "dev": true
     },
     "fastest-stable-stringify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fastest-stable-stringify/-/fastest-stable-stringify-1.0.1.tgz",
-      "integrity": "sha1-kSLUBtTJ2YvqZEpraFPVh0uHsCg=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fastest-stable-stringify/-/fastest-stable-stringify-2.0.2.tgz",
+      "integrity": "sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q==",
       "dev": true
     },
+    "fastq": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
+      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
     "fault": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz",
@@ -10128,19 +18024,25 @@
       }
     },
     "file-loader": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz",
-      "integrity": "sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.2.3",
-        "schema-utils": "^2.5.0"
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0"
       },
       "dependencies": {
+        "@types/json-schema": {
+          "version": "7.0.7",
+          "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
+          "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
+          "dev": true
+        },
         "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -10149,21 +18051,59 @@
             "uri-js": "^4.2.2"
           }
         },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "dev": true
+        },
         "fast-deep-equal": {
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
           "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
           "dev": true
         },
-        "schema-utils": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+        "json5": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.4",
-            "ajv": "^6.12.2",
-            "ajv-keywords": "^3.4.1"
+            "minimist": "^1.2.5"
+          }
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.6",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         }
       }
@@ -10202,9 +18142,9 @@
       "optional": true
     },
     "filesize": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-      "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz",
+      "integrity": "sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg==",
       "dev": true
     },
     "fill-range": {
@@ -10230,6 +18170,12 @@
         }
       }
     },
+    "filter-console": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/filter-console/-/filter-console-0.1.1.tgz",
+      "integrity": "sha512-zrXoV1Uaz52DqPs+qEwNJWJFAWZpYJ47UNmpN9q4j+/EYsz85uV0DC9k8tRND5kYmoVzL0W+Y75q4Rg8sRJCdg==",
+      "dev": true
+    },
     "finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
@@ -10263,74 +18209,14 @@
       }
     },
     "find-cache-dir": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
       "dev": true,
       "requires": {
         "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
       }
     },
     "find-root": {
@@ -10371,10 +18257,13 @@
       }
     },
     "focus-lock": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.7.0.tgz",
-      "integrity": "sha512-LI7v2mH02R55SekHYdv9pRHR9RajVNyIJ2N5IEkWbg7FT5ZmJ9Hw4mWxHeEUcd+dJo0QmzztHvDvWcc7prVFsw==",
-      "dev": true
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.8.1.tgz",
+      "integrity": "sha512-/LFZOIo82WDsyyv7h7oc0MJF9ACOvDRdx9rWPZ2pgMfNWu/z8hQDBtOchuB/0BVLmuFOZjV02YwUVzNsWx/EzA==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.3"
+      }
     },
     "for-in": {
       "version": "1.0.2",
@@ -10398,14 +18287,13 @@
       "dev": true
     },
     "fork-ts-checker-webpack-plugin": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz",
-      "integrity": "sha512-zEhg7Hz+KhZlBhILYpXy+Beu96gwvkROWJiTXOCyOOMMrdBIRPvsBpBqgTI4jfJGrJXcqGwJR8zsBGDmzY0jsA==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz",
+      "integrity": "sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.22.0",
+        "@babel/code-frame": "^7.5.5",
         "chalk": "^2.4.1",
-        "chokidar": "^2.0.4",
         "micromatch": "^3.1.10",
         "minimatch": "^3.0.4",
         "semver": "^5.6.0",
@@ -10487,23 +18375,25 @@
       }
     },
     "fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dev": true,
       "requires": {
+        "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "dependencies": {
         "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.6"
+            "graceful-fs": "^4.1.6",
+            "universalify": "^2.0.0"
           }
         }
       }
@@ -10517,6 +18407,12 @@
         "minipass": "^3.0.0"
       }
     },
+    "fs-monkey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
+      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
+      "dev": true
+    },
     "fs-write-stream-atomic": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
@@ -11094,20 +18990,87 @@
       "dev": true
     },
     "function.prototype.name": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.2.tgz",
-      "integrity": "sha512-C8A+LlHBJjB2AdcRPorc5JvJ5VUoWlXdEHLOJdCI7kjHEtGTpHQUiqMvCIKUwIsGwZX2jZJy761AXsn356bJQg==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.4.tgz",
+      "integrity": "sha512-iqy1pIotY/RmhdFZygSSlW0wko2yxkSCKqsuv4pr8QESohpYyG/Z7B/XXvPRKTJS//960rgguE5mSRUsDdaJrQ==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "functions-have-names": "^1.2.0"
+        "es-abstract": "^1.18.0-next.2",
+        "functions-have-names": "^1.2.2"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+          "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.2",
+            "is-string": "^1.0.5",
+            "object-inspect": "^1.9.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.0"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "object-inspect": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+          "dev": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        }
       }
     },
     "functions-have-names": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.1.tgz",
-      "integrity": "sha512-j48B/ZI7VKs3sgeI2cZp7WXWmZXu7Iq5pl5/vptV5N2mq+DGFuS/ulaDjtaoLpYzuD6u8UgrUKHfgo7fDTSiBA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.2.tgz",
+      "integrity": "sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA==",
       "dev": true
     },
     "fuse.js": {
@@ -11137,12 +19100,29 @@
         "wide-align": "^1.1.0"
       }
     },
+    "gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true
+    },
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true
     },
+    "get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
+    },
     "get-package-type": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
@@ -11244,6 +19224,15 @@
         }
       }
     },
+    "glob-promise": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-3.4.0.tgz",
+      "integrity": "sha512-q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw==",
+      "dev": true,
+      "requires": {
+        "@types/glob": "*"
+      }
+    },
     "glob-to-regexp": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
@@ -11287,35 +19276,26 @@
       "dev": true
     },
     "globalthis": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz",
-      "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
+      "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3"
       }
     },
     "globby": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
-      "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
+      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
       "dev": true,
       "requires": {
-        "array-union": "^1.0.1",
-        "dir-glob": "2.0.0",
-        "fast-glob": "^2.0.2",
-        "glob": "^7.1.2",
-        "ignore": "^3.3.5",
-        "pify": "^3.0.0",
-        "slash": "^1.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        }
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.1.1",
+        "ignore": "^5.1.4",
+        "merge2": "^1.3.0",
+        "slash": "^3.0.0"
       }
     },
     "good-listener": {
@@ -11411,12 +19391,38 @@
         "ansi-regex": "^2.0.0"
       }
     },
+    "has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true
+    },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
+    "has-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz",
+      "integrity": "sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=",
+      "dev": true,
+      "requires": {
+        "is-glob": "^3.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
+      }
+    },
     "has-symbols": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
@@ -11510,9 +19516,9 @@
       }
     },
     "hast-util-parse-selector": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.4.tgz",
-      "integrity": "sha512-gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA==",
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz",
+      "integrity": "sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==",
       "dev": true
     },
     "hastscript": {
@@ -11589,9 +19595,9 @@
       }
     },
     "html-entities": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
-      "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
+      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
       "dev": true
     },
     "html-escaper": {
@@ -11620,38 +19626,13 @@
           "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
           "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
           "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "terser": {
-          "version": "4.8.0",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-          "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
-          "dev": true,
-          "requires": {
-            "commander": "^2.20.0",
-            "source-map": "~0.6.1",
-            "source-map-support": "~0.5.12"
-          },
-          "dependencies": {
-            "commander": {
-              "version": "2.20.3",
-              "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-              "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-              "dev": true
-            }
-          }
         }
       }
     },
     "html-webpack-plugin": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz",
-      "integrity": "sha512-C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz",
+      "integrity": "sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==",
       "dev": true,
       "requires": {
         "@types/html-minifier-terser": "^5.0.0",
@@ -11659,10 +19640,38 @@
         "@types/webpack": "^4.41.8",
         "html-minifier-terser": "^5.0.1",
         "loader-utils": "^1.2.3",
-        "lodash": "^4.17.15",
+        "lodash": "^4.17.20",
         "pretty-error": "^2.1.1",
         "tapable": "^1.1.3",
         "util.promisify": "1.0.0"
+      },
+      "dependencies": {
+        "@types/webpack": {
+          "version": "4.41.27",
+          "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.27.tgz",
+          "integrity": "sha512-wK/oi5gcHi72VMTbOaQ70VcDxSQ1uX8S2tukBK9ARuGXrYM/+u4ou73roc7trXDNmCxCoerE8zruQqX/wuHszA==",
+          "dev": true,
+          "requires": {
+            "@types/anymatch": "*",
+            "@types/node": "*",
+            "@types/tapable": "^1",
+            "@types/uglify-js": "*",
+            "@types/webpack-sources": "*",
+            "source-map": "^0.6.0"
+          }
+        },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
     "htmlparser2": {
@@ -11714,9 +19723,9 @@
       }
     },
     "http-parser-js": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz",
-      "integrity": "sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
+      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==",
       "dev": true
     },
     "http-signature": {
@@ -11743,9 +19752,9 @@
       "dev": true
     },
     "hyphenate-style-name": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz",
-      "integrity": "sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz",
+      "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==",
       "dev": true
     },
     "iconv-lite": {
@@ -11779,15 +19788,15 @@
       "dev": true
     },
     "ignore": {
-      "version": "3.3.10",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
       "dev": true
     },
     "immer": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz",
-      "integrity": "sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz",
+      "integrity": "sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==",
       "dev": true
     },
     "import-cwd": {
@@ -11856,12 +19865,6 @@
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "dev": true
     },
-    "indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-      "dev": true
-    },
     "infer-owner": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
@@ -11891,12 +19894,11 @@
       "dev": true
     },
     "inline-style-prefixer": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-4.0.2.tgz",
-      "integrity": "sha512-N8nVhwfYga9MiV9jWlwfdj1UDIaZlBFu4cJSJkIr7tZX7sHpHhGR5su1qdpW+7KPL8ISTvCIkcaFi/JdBknvPg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-6.0.0.tgz",
+      "integrity": "sha512-XTHvRUS4ZJNzC1GixJRmOlWSS45fSt+DJoyQC9ytj0WxQfcgofQtDtyKKYxHUqEsWCs+LIWftPF1ie7+i012Fg==",
       "dev": true,
       "requires": {
-        "bowser": "^1.7.3",
         "css-in-js-utils": "^2.0.0"
       }
     },
@@ -11928,19 +19930,18 @@
           "dev": true
         },
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -11981,15 +19982,15 @@
           "dev": true
         },
         "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
           "dev": true
         },
         "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
           "dev": true,
           "requires": {
             "emoji-regex": "^8.0.0",
@@ -12007,9 +20008,9 @@
           }
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -12018,14 +20019,14 @@
       }
     },
     "internal-slot": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.2.tgz",
-      "integrity": "sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
       "dev": true,
       "requires": {
-        "es-abstract": "^1.17.0-next.1",
+        "get-intrinsic": "^1.1.0",
         "has": "^1.0.3",
-        "side-channel": "^1.0.2"
+        "side-channel": "^1.0.4"
       }
     },
     "interpret": {
@@ -12104,10 +20105,13 @@
       }
     },
     "is-arguments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
-      "dev": true
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
+      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0"
+      }
     },
     "is-arrayish": {
       "version": "0.2.1",
@@ -12115,6 +20119,12 @@
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
       "dev": true
     },
+    "is-bigint": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz",
+      "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==",
+      "dev": true
+    },
     "is-binary-path": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
@@ -12124,6 +20134,15 @@
         "binary-extensions": "^1.0.0"
       }
     },
+    "is-boolean-object": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
+      "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0"
+      }
+    },
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
@@ -12265,9 +20284,15 @@
       "dev": true
     },
     "is-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+      "dev": true
+    },
+    "is-negative-zero": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz",
-      "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
       "dev": true
     },
     "is-number": {
@@ -12290,6 +20315,12 @@
         }
       }
     },
+    "is-number-object": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
+      "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
+      "dev": true
+    },
     "is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@@ -12297,13 +20328,10 @@
       "dev": true
     },
     "is-plain-object": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz",
-      "integrity": "sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==",
-      "dev": true,
-      "requires": {
-        "isobject": "^4.0.0"
-      }
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
+      "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
+      "dev": true
     },
     "is-potential-custom-element-name": {
       "version": "1.0.0",
@@ -12327,9 +20355,9 @@
       "dev": true
     },
     "is-set": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz",
-      "integrity": "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
       "dev": true
     },
     "is-stream": {
@@ -12360,9 +20388,9 @@
       "dev": true
     },
     "is-what": {
-      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.11.0.tgz",
-      "integrity": "sha512-70wGVRNNT4DHVK9ZEcQmA3dMUW04Rdnlr5TDrcq/qN/7nMGY/2KIi5wwP7RhaNiIoPNeFyuvL8gaP+SRRP72OA==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
+      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
       "dev": true
     },
     "is-windows": {
@@ -14148,11 +22176,12 @@
       }
     },
     "jest-worker": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
-      "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
       "dev": true,
       "requires": {
+        "@types/node": "*",
         "merge-stream": "^2.0.0",
         "supports-color": "^7.0.0"
       },
@@ -14164,9 +22193,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -14317,6 +22346,12 @@
         "verror": "1.10.0"
       }
     },
+    "junk": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz",
+      "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==",
+      "dev": true
+    },
     "kind-of": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
@@ -14338,6 +22373,12 @@
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true
     },
+    "klona": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
+      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
+      "dev": true
+    },
     "lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -14355,14 +22396,6 @@
         "core-js": "^3.0.4",
         "dotenv": "^8.0.0",
         "dotenv-expand": "^5.1.0"
-      },
-      "dependencies": {
-        "dotenv": {
-          "version": "8.2.0",
-          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
-          "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
-          "dev": true
-        }
       }
     },
     "lcid": {
@@ -14380,15 +22413,6 @@
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true
     },
-    "levenary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
-      "dev": true,
-      "requires": {
-        "leven": "^3.1.0"
-      }
-    },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -14488,12 +22512,20 @@
       }
     },
     "lower-case": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz",
-      "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
       "dev": true,
       "requires": {
-        "tslib": "^1.10.0"
+        "tslib": "^2.0.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==",
+          "dev": true
+        }
       }
     },
     "lowlight": {
@@ -14609,12 +22641,6 @@
         "marked": "^0.3.12"
       }
     },
-    "material-colors": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
-      "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==",
-      "dev": true
-    },
     "md5": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
@@ -14667,10 +22693,19 @@
         }
       }
     },
+    "memfs": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.2.tgz",
+      "integrity": "sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==",
+      "dev": true,
+      "requires": {
+        "fs-monkey": "1.0.3"
+      }
+    },
     "memoize-one": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.1.1.tgz",
-      "integrity": "sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
+      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==",
       "dev": true
     },
     "memoizerific": {
@@ -14708,9 +22743,9 @@
       "dev": true
     },
     "merge-deep": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.2.tgz",
-      "integrity": "sha512-T7qC8kg4Zoti1cFd8Cr0M+qaZfOwjlPDEdZIIPPB2JZctjaPM4fX+i7HOId69tAti2fvO6X5ldfYUONDODsrkA==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz",
+      "integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
@@ -14718,6 +22753,34 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
+        "clone-deep": {
+          "version": "0.2.4",
+          "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
+          "integrity": "sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=",
+          "dev": true,
+          "requires": {
+            "for-own": "^0.1.3",
+            "is-plain-object": "^2.0.1",
+            "kind-of": "^3.0.2",
+            "lazy-cache": "^1.0.3",
+            "shallow-clone": "^0.1.2"
+          }
+        },
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+          "dev": true,
+          "requires": {
+            "isobject": "^3.0.1"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -14726,6 +22789,35 @@
           "requires": {
             "is-buffer": "^1.1.5"
           }
+        },
+        "shallow-clone": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
+          "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.1",
+            "kind-of": "^2.0.1",
+            "lazy-cache": "^0.2.3",
+            "mixin-object": "^2.0.1"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+              "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.0.2"
+              }
+            },
+            "lazy-cache": {
+              "version": "0.2.7",
+              "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
+              "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=",
+              "dev": true
+            }
+          }
         }
       }
     },
@@ -14923,6 +23015,24 @@
         "minipass": "^3.0.0"
       }
     },
+    "minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
     "mississippi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
@@ -15046,25 +23156,47 @@
       "optional": true
     },
     "nano-css": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/nano-css/-/nano-css-5.3.0.tgz",
-      "integrity": "sha512-uM/9NGK9/E9/sTpbIZ/bQ9xOLOIHZwrrb/CRlbDHBU/GFS7Gshl24v/WJhwsVViWkpOXUmiZ66XO7fSB4Wd92Q==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/nano-css/-/nano-css-5.3.1.tgz",
+      "integrity": "sha512-ENPIyNzANQRyYVvb62ajDd7PAyIgS2LIUnT9ewih4yrXSZX4hKoUwssy8WjUH++kEOA5wUTMgNnV7ko5n34kUA==",
       "dev": true,
       "requires": {
-        "css-tree": "^1.0.0-alpha.28",
-        "csstype": "^2.5.5",
-        "fastest-stable-stringify": "^1.0.1",
-        "inline-style-prefixer": "^4.0.0",
-        "rtl-css-js": "^1.9.0",
-        "sourcemap-codec": "^1.4.1",
-        "stacktrace-js": "^2.0.0",
-        "stylis": "3.5.0"
+        "css-tree": "^1.1.2",
+        "csstype": "^3.0.6",
+        "fastest-stable-stringify": "^2.0.2",
+        "inline-style-prefixer": "^6.0.0",
+        "rtl-css-js": "^1.14.0",
+        "sourcemap-codec": "^1.4.8",
+        "stacktrace-js": "^2.0.2",
+        "stylis": "^4.0.6"
       },
       "dependencies": {
-        "stylis": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.0.tgz",
-          "integrity": "sha512-pP7yXN6dwMzAR29Q0mBrabPCe0/mNO1MSr93bhay+hcZondvMMTpeGyd8nbhYJdyperNT2DRxONQuUGcJr5iPw==",
+        "css-tree": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+          "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+          "dev": true,
+          "requires": {
+            "mdn-data": "2.0.14",
+            "source-map": "^0.6.1"
+          }
+        },
+        "csstype": {
+          "version": "3.0.8",
+          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
+          "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==",
+          "dev": true
+        },
+        "mdn-data": {
+          "version": "2.0.14",
+          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+          "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
@@ -15088,6 +23220,15 @@
         "to-regex": "^3.0.1"
       }
     },
+    "native-url": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/native-url/-/native-url-0.2.6.tgz",
+      "integrity": "sha512-k4bDC87WtgrdD362gZz6zoiXQrl40kYlBmpfmSjwRO1VU0V5ccwJTlxuE72F6m3V0vc1xOf6n3UCP9QyerRqmA==",
+      "dev": true,
+      "requires": {
+        "querystring": "^0.2.0"
+      }
+    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -15106,10 +23247,16 @@
       "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
       "dev": true
     },
+    "nested-error-stacks": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz",
+      "integrity": "sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==",
+      "dev": true
+    },
     "nested-object-assign": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/nested-object-assign/-/nested-object-assign-1.0.3.tgz",
-      "integrity": "sha512-kgq1CuvLyUcbcIuTiCA93cQ2IJFSlRwXcN+hLcb2qLJwC2qrePHGZZa7IipyWqaWF6tQjdax2pQnVxdq19Zzwg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/nested-object-assign/-/nested-object-assign-1.0.4.tgz",
+      "integrity": "sha512-FlZ7oN9ICt+fbcJ4ag2IsALIcalfE/E16ttdSA8peBiHJI+oEKdOcafqDnUbeUe5NwWGn/m9zZGO9qrAGzfesg==",
       "dev": true
     },
     "nice-try": {
@@ -15119,13 +23266,21 @@
       "dev": true
     },
     "no-case": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz",
-      "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
       "dev": true,
       "requires": {
-        "lower-case": "^2.0.1",
-        "tslib": "^1.10.0"
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==",
+          "dev": true
+        }
       }
     },
     "node-dir": {
@@ -15276,9 +23431,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.60",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz",
-      "integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==",
+      "version": "1.1.71",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
+      "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
       "dev": true
     },
     "normalize-package-data": {
@@ -15414,49 +23569,13 @@
       "dev": true
     },
     "object-is": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
-      "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.6",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-          "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-          "dev": true,
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.0",
-            "is-regex": "^1.1.0",
-            "object-inspect": "^1.7.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.0",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-          "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-          "dev": true,
-          "requires": {
-            "has-symbols": "^1.0.1"
-          }
-        }
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       }
     },
     "object-keys": {
@@ -15495,62 +23614,159 @@
       }
     },
     "object.entries": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz",
-      "integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz",
+      "integrity": "sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
+        "es-abstract": "^1.18.0-next.1",
         "has": "^1.0.3"
       },
       "dependencies": {
         "es-abstract": {
-          "version": "1.17.6",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-          "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+          "version": "1.18.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+          "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
           "dev": true,
           "requires": {
+            "call-bind": "^1.0.2",
             "es-to-primitive": "^1.2.1",
             "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
             "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.0",
-            "is-regex": "^1.1.0",
-            "object-inspect": "^1.7.0",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.2",
+            "is-string": "^1.0.5",
+            "object-inspect": "^1.9.0",
             "object-keys": "^1.1.1",
-            "object.assign": "^4.1.0",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.0"
           }
         },
+        "has-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+          "dev": true
+        },
         "is-callable": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-          "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
           "dev": true
         },
         "is-regex": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
           "dev": true,
           "requires": {
+            "call-bind": "^1.0.2",
             "has-symbols": "^1.0.1"
           }
+        },
+        "object-inspect": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+          "dev": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
         }
       }
     },
     "object.fromentries": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz",
-      "integrity": "sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.4.tgz",
+      "integrity": "sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
+        "es-abstract": "^1.18.0-next.2",
         "has": "^1.0.3"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+          "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.2",
+            "is-string": "^1.0.5",
+            "object-inspect": "^1.9.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.0"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "object-inspect": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+          "dev": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        }
       }
     },
     "object.getownpropertydescriptors": {
@@ -15592,6 +23808,12 @@
         "has": "^1.0.3"
       }
     },
+    "objectorarray": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz",
+      "integrity": "sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w==",
+      "dev": true
+    },
     "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -15620,9 +23842,9 @@
       }
     },
     "open": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.1.0.tgz",
-      "integrity": "sha512-lLPI5KgOwEYCDKXf4np7y1PBEkj7HYIyP2DY8mVDRnx0VIIu6bNrRB0R66TuO7Mack6EnTNLm4uvcl1UoklTpA==",
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
       "dev": true,
       "requires": {
         "is-docker": "^2.0.0",
@@ -15686,15 +23908,27 @@
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
-    "output-file-sync": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-2.0.1.tgz",
-      "integrity": "sha512-mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ==",
+    "overlayscrollbars": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/overlayscrollbars/-/overlayscrollbars-1.13.1.tgz",
+      "integrity": "sha512-gIQfzgGgu1wy80EB4/6DaJGHMEGmizq27xHIESrzXq0Y/J0Ay1P3DWk6tuVmEPIZH15zaBlxeEJOqdJKmowHCQ==",
+      "dev": true
+    },
+    "p-all": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-all/-/p-all-2.1.0.tgz",
+      "integrity": "sha512-HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11",
-        "is-plain-obj": "^1.1.0",
-        "mkdirp": "^0.5.1"
+        "p-map": "^2.0.0"
+      },
+      "dependencies": {
+        "p-map": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+          "dev": true
+        }
       }
     },
     "p-defer": {
@@ -15709,6 +23943,32 @@
       "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
       "dev": true
     },
+    "p-event": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
+      "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==",
+      "dev": true,
+      "requires": {
+        "p-timeout": "^3.1.0"
+      }
+    },
+    "p-filter": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz",
+      "integrity": "sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==",
+      "dev": true,
+      "requires": {
+        "p-map": "^2.0.0"
+      },
+      "dependencies": {
+        "p-map": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+          "dev": true
+        }
+      }
+    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -15740,14 +24000,23 @@
       }
     },
     "p-map": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "dev": true,
       "requires": {
         "aggregate-error": "^3.0.0"
       }
     },
+    "p-timeout": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
+      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+      "dev": true,
+      "requires": {
+        "p-finally": "^1.0.0"
+      }
+    },
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -15772,13 +24041,21 @@
       }
     },
     "param-case": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz",
-      "integrity": "sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
       "dev": true,
       "requires": {
-        "dot-case": "^3.0.3",
-        "tslib": "^1.10.0"
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==",
+          "dev": true
+        }
       }
     },
     "parent-module": {
@@ -15849,13 +24126,21 @@
       "dev": true
     },
     "pascal-case": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz",
-      "integrity": "sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
       "dev": true,
       "requires": {
-        "no-case": "^3.0.3",
-        "tslib": "^1.10.0"
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==",
+          "dev": true
+        }
       }
     },
     "pascalcase": {
@@ -15972,66 +24257,21 @@
       }
     },
     "pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
       "dev": true,
       "requires": {
-        "find-up": "^2.1.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true
-        }
+        "find-up": "^3.0.0"
       }
     },
     "pnp-webpack-plugin": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.5.0.tgz",
-      "integrity": "sha512-jd9olUr9D7do+RN8Wspzhpxhgp1n6Vd0NtQ4SFkmIACZoEL1nkyAdW9Ygrinjec0vgDcWjscFQQ1gDW8rsfKTg==",
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
+      "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
       "dev": true,
       "requires": {
-        "ts-pnp": "^1.1.2"
+        "ts-pnp": "^1.1.6"
       }
     },
     "polished": {
@@ -16086,9 +24326,9 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.32",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
-      "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
+      "version": "7.0.35",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+      "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
@@ -16123,9 +24363,9 @@
       }
     },
     "postcss-load-config": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
-      "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
+      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
       "dev": true,
       "requires": {
         "cosmiconfig": "^5.0.0",
@@ -16173,15 +24413,134 @@
       }
     },
     "postcss-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
-      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.2.0.tgz",
+      "integrity": "sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^1.0.0"
+        "cosmiconfig": "^7.0.0",
+        "klona": "^2.0.4",
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0",
+        "semver": "^7.3.4"
+      },
+      "dependencies": {
+        "@types/json-schema": {
+          "version": "7.0.7",
+          "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
+          "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
+          "dev": true
+        },
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true
+        },
+        "cosmiconfig": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+          "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+          "dev": true,
+          "requires": {
+            "@types/parse-json": "^4.0.0",
+            "import-fresh": "^3.2.1",
+            "parse-json": "^5.0.0",
+            "path-type": "^4.0.0",
+            "yaml": "^1.10.0"
+          }
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
+        "json5": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.6",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        },
+        "yaml": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+          "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+          "dev": true
+        }
       }
     },
     "postcss-modules-extract-imports": {
@@ -16203,14 +24562,6 @@
         "postcss": "^7.0.32",
         "postcss-selector-parser": "^6.0.2",
         "postcss-value-parser": "^4.1.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-          "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
-          "dev": true
-        }
       }
     },
     "postcss-modules-scope": {
@@ -16234,20 +24585,19 @@
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
-      "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz",
+      "integrity": "sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==",
       "dev": true,
       "requires": {
         "cssesc": "^3.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "util-deprecate": "^1.0.2"
       }
     },
     "postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
       "dev": true
     },
     "prelude-ls": {
@@ -16263,19 +24613,27 @@
       "dev": true
     },
     "prettier": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.2.tgz",
-      "integrity": "sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz",
+      "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==",
       "dev": true
     },
     "pretty-error": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
-      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
+      "integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==",
       "dev": true,
       "requires": {
-        "renderkid": "^2.0.1",
-        "utila": "~0.4"
+        "lodash": "^4.17.20",
+        "renderkid": "^2.0.4"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        }
       }
     },
     "pretty-format": {
@@ -16335,20 +24693,14 @@
       "dev": true
     },
     "prismjs": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.20.0.tgz",
-      "integrity": "sha512-AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ==",
+      "version": "1.23.0",
+      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.23.0.tgz",
+      "integrity": "sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA==",
       "dev": true,
       "requires": {
         "clipboard": "^2.0.0"
       }
     },
-    "private": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-      "dev": true
-    },
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -16377,16 +24729,83 @@
       "dev": true
     },
     "promise.allsettled": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz",
-      "integrity": "sha512-UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.4.tgz",
+      "integrity": "sha512-o73CbvQh/OnPFShxHcHxk0baXR2a1m4ozb85ha0H14VEoi/EJJLa9mnPfEWJx9RjA9MLfhdjZ8I6HhWtBa64Ag==",
       "dev": true,
       "requires": {
-        "array.prototype.map": "^1.0.1",
+        "array.prototype.map": "^1.0.3",
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "iterate-value": "^1.0.0"
+        "es-abstract": "^1.18.0-next.2",
+        "get-intrinsic": "^1.0.2",
+        "iterate-value": "^1.0.2"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+          "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.2",
+            "is-string": "^1.0.5",
+            "object-inspect": "^1.9.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.0"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "object-inspect": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+          "dev": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        }
       }
     },
     "promise.prototype.finally": {
@@ -16421,9 +24840,9 @@
       }
     },
     "property-information": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.5.0.tgz",
-      "integrity": "sha512-RgEbCx2HLa1chNgvChcx+rrCWD0ctBmGSE0M7lVm1yyv4UbvbrWoXp/BkVLZefzjrRBGW8/Js6uh/BnlHXFyjA==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz",
+      "integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==",
       "dev": true,
       "requires": {
         "xtend": "^4.0.0"
@@ -16547,9 +24966,15 @@
       "dev": true
     },
     "querystringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true
     },
     "ramda": {
@@ -16607,19 +25032,25 @@
       }
     },
     "raw-loader": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-3.1.0.tgz",
-      "integrity": "sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
+      "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^2.0.1"
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0"
       },
       "dependencies": {
+        "@types/json-schema": {
+          "version": "7.0.7",
+          "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
+          "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
+          "dev": true
+        },
         "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -16628,35 +25059,72 @@
             "uri-js": "^4.2.2"
           }
         },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "dev": true
+        },
         "fast-deep-equal": {
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
           "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
           "dev": true
         },
-        "schema-utils": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+        "json5": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.4",
-            "ajv": "^6.12.2",
-            "ajv-keywords": "^3.4.1"
+            "minimist": "^1.2.5"
+          }
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.6",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         }
       }
     },
     "react": {
-      "version": "16.8.6",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.8.6.tgz",
-      "integrity": "sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==",
+      "version": "16.14.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
+      "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
       "dev": true,
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "scheduler": "^0.13.6"
+        "prop-types": "^15.6.2"
       }
     },
     "react-addons-create-fragment": {
@@ -16671,99 +25139,124 @@
       }
     },
     "react-clientside-effect": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/react-clientside-effect/-/react-clientside-effect-1.2.2.tgz",
-      "integrity": "sha512-nRmoyxeok5PBO6ytPvSjKp9xwXg9xagoTK1mMjwnQxqM9Hd7MNPl+LS1bOSOe+CV2+4fnEquc7H/S8QD3q697A==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/react-clientside-effect/-/react-clientside-effect-1.2.5.tgz",
+      "integrity": "sha512-2bL8qFW1TGBHozGGbVeyvnggRpMjibeZM2536AKNENLECutp2yfs44IL8Hmpn8qjFQ2K7A9PnYf3vc7aQq/cPA==",
       "dev": true,
       "requires": {
-        "@babel/runtime": "^7.0.0"
+        "@babel/runtime": "^7.12.13"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+          "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
+          "dev": true,
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.7",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+          "dev": true
+        }
       }
     },
-    "react-color": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/react-color/-/react-color-2.18.1.tgz",
-      "integrity": "sha512-X5XpyJS6ncplZs74ak0JJoqPi+33Nzpv5RYWWxn17bslih+X7OlgmfpmGC1fNvdkK7/SGWYf1JJdn7D2n5gSuQ==",
-      "dev": true,
-      "requires": {
-        "@icons/material": "^0.2.4",
-        "lodash": "^4.17.11",
-        "material-colors": "^1.2.1",
-        "prop-types": "^15.5.10",
-        "reactcss": "^1.2.0",
-        "tinycolor2": "^1.4.1"
-      }
+    "react-colorful": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.1.4.tgz",
+      "integrity": "sha512-WOEpRNz8Oo2SEU4eYQ279jEKFSjpFPa9Vi2U/K0DGwP9wOQ8wYkJcNSd5Qbv1L8OFvyKDCbWekjftXaU5mbmtg==",
+      "dev": true
     },
     "react-dev-utils": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-9.1.0.tgz",
-      "integrity": "sha512-X2KYF/lIGyGwP/F/oXgGDF24nxDA2KC4b7AFto+eqzc/t838gpSGiaU8trTqHXOohuLxxc5qi1eDzsl9ucPDpg==",
+      "version": "11.0.4",
+      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz",
+      "integrity": "sha512-dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "7.5.5",
+        "@babel/code-frame": "7.10.4",
         "address": "1.1.2",
-        "browserslist": "4.7.0",
+        "browserslist": "4.14.2",
         "chalk": "2.4.2",
-        "cross-spawn": "6.0.5",
+        "cross-spawn": "7.0.3",
         "detect-port-alt": "1.1.6",
-        "escape-string-regexp": "1.0.5",
-        "filesize": "3.6.1",
-        "find-up": "3.0.0",
-        "fork-ts-checker-webpack-plugin": "1.5.0",
+        "escape-string-regexp": "2.0.0",
+        "filesize": "6.1.0",
+        "find-up": "4.1.0",
+        "fork-ts-checker-webpack-plugin": "4.1.6",
         "global-modules": "2.0.0",
-        "globby": "8.0.2",
+        "globby": "11.0.1",
         "gzip-size": "5.1.1",
-        "immer": "1.10.0",
-        "inquirer": "6.5.0",
+        "immer": "8.0.1",
         "is-root": "2.1.0",
-        "loader-utils": "1.2.3",
-        "open": "^6.3.0",
-        "pkg-up": "2.0.0",
-        "react-error-overlay": "^6.0.3",
+        "loader-utils": "2.0.0",
+        "open": "^7.0.2",
+        "pkg-up": "3.1.0",
+        "prompts": "2.4.0",
+        "react-error-overlay": "^6.0.9",
         "recursive-readdir": "2.2.2",
         "shell-quote": "1.7.2",
-        "sockjs-client": "1.4.0",
-        "strip-ansi": "5.2.0",
+        "strip-ansi": "6.0.0",
         "text-table": "0.2.0"
       },
       "dependencies": {
-        "ansi-escapes": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+        "@babel/code-frame": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
           "dev": true
         },
+        "@babel/highlight": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
         "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
         "browserslist": {
-          "version": "4.7.0",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.0.tgz",
-          "integrity": "sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==",
+          "version": "4.14.2",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz",
+          "integrity": "sha512-HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30000989",
-            "electron-to-chromium": "^1.3.247",
-            "node-releases": "^1.1.29"
+            "caniuse-lite": "^1.0.30001125",
+            "electron-to-chromium": "^1.3.564",
+            "escalade": "^3.0.2",
+            "node-releases": "^1.1.61"
           }
         },
-        "cli-cursor": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-          "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
           "dev": true,
           "requires": {
-            "restore-cursor": "^2.0.0"
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
           }
         },
-        "cli-width": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-          "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
-          "dev": true
-        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -16783,46 +25276,61 @@
             "debug": "^2.6.0"
           }
         },
-        "figures": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-          "dev": true,
-          "requires": {
-            "escape-string-regexp": "^1.0.5"
-          }
-        },
-        "inquirer": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz",
-          "integrity": "sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==",
-          "dev": true,
-          "requires": {
-            "ansi-escapes": "^3.2.0",
-            "chalk": "^2.4.2",
-            "cli-cursor": "^2.1.0",
-            "cli-width": "^2.0.0",
-            "external-editor": "^3.0.3",
-            "figures": "^2.0.0",
-            "lodash": "^4.17.12",
-            "mute-stream": "0.0.7",
-            "run-async": "^2.2.0",
-            "rxjs": "^6.4.0",
-            "string-width": "^2.1.0",
-            "strip-ansi": "^5.1.0",
-            "through": "^2.3.6"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
           "dev": true
         },
-        "mimic-fn": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "json5": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
           "dev": true
         },
         "ms": {
@@ -16831,89 +25339,71 @@
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         },
-        "mute-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
         },
-        "onetime": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-          "dev": true,
-          "requires": {
-            "mimic-fn": "^1.0.0"
-          }
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
         },
-        "open": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
-          "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
-          "dev": true,
-          "requires": {
-            "is-wsl": "^1.1.0"
-          }
-        },
-        "restore-cursor": {
+        "shebang-command": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-          "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
           "dev": true,
           "requires": {
-            "onetime": "^2.0.0",
-            "signal-exit": "^3.0.2"
+            "shebang-regex": "^3.0.0"
           }
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
         },
         "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.1.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-              "dev": true
-            }
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
           }
         }
       }
     },
     "react-docgen": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-5.3.0.tgz",
-      "integrity": "sha512-hUrv69k6nxazOuOmdGeOpC/ldiKy7Qj/UFpxaQi0eDMrUFUTIPGtY5HJu7BggSmiyAMfREaESbtBL9UzdQ+hyg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-5.3.1.tgz",
+      "integrity": "sha512-YG7YujVTwlLslr2Ny8nQiUfbBuEwKsLHJdQTSdEga1eY/nRFh/7LjCWUn6ogYhu2WDKg4z+6W/BJtUi+DPUIlA==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.7.5",
         "@babel/runtime": "^7.7.6",
-        "ast-types": "^0.13.2",
+        "ast-types": "^0.14.2",
         "commander": "^2.19.0",
         "doctrine": "^3.0.0",
         "neo-async": "^2.6.1",
@@ -16921,16 +25411,92 @@
         "strip-indent": "^3.0.0"
       }
     },
+    "react-docgen-typescript": {
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/react-docgen-typescript/-/react-docgen-typescript-1.22.0.tgz",
+      "integrity": "sha512-MPLbF8vzRwAG3GcjdL+OHQlhgtWsLTXs+7uJiHfEeT3Ur7IsZaNYqRTLQ9sj2nB6M6jylcPCeCmH7qbszJmecg==",
+      "dev": true
+    },
+    "react-docgen-typescript-plugin": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-0.6.3.tgz",
+      "integrity": "sha512-av1S/fmWBNFGgNa4qtkidFjjOz23eEi6EdCtwSWo9WNhGzUMyMygbD/DosMWoeFlZpk9R3MXPkRE7PDH6j5GMQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "endent": "^2.0.1",
+        "micromatch": "^4.0.2",
+        "react-docgen-typescript": "^1.20.5",
+        "tslib": "^2.0.0"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "picomatch": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+          "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+          "dev": true
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        },
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==",
+          "dev": true
+        }
+      }
+    },
     "react-dom": {
-      "version": "16.8.6",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.6.tgz",
-      "integrity": "sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==",
+      "version": "16.14.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
+      "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
       "dev": true,
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
         "prop-types": "^15.6.2",
-        "scheduler": "^0.13.6"
+        "scheduler": "^0.19.1"
       }
     },
     "react-draggable": {
@@ -16944,19 +25510,45 @@
       }
     },
     "react-element-to-jsx-string": {
-      "version": "14.3.1",
-      "resolved": "https://registry.npmjs.org/react-element-to-jsx-string/-/react-element-to-jsx-string-14.3.1.tgz",
-      "integrity": "sha512-LRdQWRB+xcVPOL4PU4RYuTg6dUJ/FNmaQ8ls6w38YbzkbV6Yr5tFNESroub9GiSghtnMq8dQg2LcNN5aMIDzVg==",
+      "version": "14.3.2",
+      "resolved": "https://registry.npmjs.org/react-element-to-jsx-string/-/react-element-to-jsx-string-14.3.2.tgz",
+      "integrity": "sha512-WZbvG72cjLXAxV7VOuSzuHEaI3RHj10DZu8EcKQpkKcAj7+qAkG5XUeSdX5FXrA0vPrlx0QsnAzZEBJwzV0e+w==",
       "dev": true,
       "requires": {
         "@base2/pretty-print-object": "1.0.0",
-        "is-plain-object": "3.0.0"
+        "is-plain-object": "3.0.1"
+      }
+    },
+    "react-error-boundary": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-3.1.1.tgz",
+      "integrity": "sha512-W3xCd9zXnanqrTUeViceufD3mIW8Ut29BUD+S2f0eO2XCOU8b6UrJfY46RDGe5lxCJzfe4j0yvIfh0RbTZhKJw==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.12.5"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.13.17",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz",
+          "integrity": "sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==",
+          "dev": true,
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.7",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+          "dev": true
+        }
       }
     },
     "react-error-overlay": {
-      "version": "6.0.7",
-      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz",
-      "integrity": "sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA==",
+      "version": "6.0.9",
+      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
+      "integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==",
       "dev": true
     },
     "react-fast-compare": {
@@ -16966,13 +25558,13 @@
       "dev": true
     },
     "react-focus-lock": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.4.1.tgz",
-      "integrity": "sha512-c5ZP56KSpj9EAxzScTqQO7bQQNPltf/W1ZEBDqNDOV1XOIwvAyHX0O7db9ekiAtxyKgnqZjQlLppVg94fUeL9w==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.5.0.tgz",
+      "integrity": "sha512-XLxj6uTXgz0US8TmqNU2jMfnXwZG0mH2r/afQqvPEaX6nyEll5LHVcEXk2XDUQ34RVeLPkO/xK5x6c/qiuSq/A==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.0.0",
-        "focus-lock": "^0.7.0",
+        "focus-lock": "^0.8.1",
         "prop-types": "^15.6.2",
         "react-clientside-effect": "^1.2.2",
         "use-callback-ref": "^1.2.1",
@@ -16980,22 +25572,22 @@
       }
     },
     "react-helmet-async": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.0.6.tgz",
-      "integrity": "sha512-t+bhAI4NgxfEv8ez4r77cLfR4O4Z55E/FH2DT+uiE4U7yfWgAk7OAOi7IxHxuYEVLI26bqjZvlVCkpC5/5AoNA==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-1.0.9.tgz",
+      "integrity": "sha512-N+iUlo9WR3/u9qGMmP4jiYfaD6pe9IvDTapZLFJz2D3xlTlCM1Bzy4Ab3g72Nbajo/0ZyW+W9hdz8Hbe4l97pQ==",
       "dev": true,
       "requires": {
-        "@babel/runtime": "^7.9.2",
+        "@babel/runtime": "^7.12.5",
         "invariant": "^2.2.4",
         "prop-types": "^15.7.2",
-        "react-fast-compare": "^3.0.1",
+        "react-fast-compare": "^3.2.0",
         "shallowequal": "^1.1.0"
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.0.tgz",
-          "integrity": "sha512-qArkXsjJq7H+T86WrIFV0Fnu/tNOkZ4cgXmjkzAu3b/58D5mFIO8JH/y77t7C9q0OdDRdh9s7Ue5GasYssxtXw==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+          "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
           "dev": true,
           "requires": {
             "regenerator-runtime": "^0.13.4"
@@ -17019,9 +25611,9 @@
       }
     },
     "react-input-autosize": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.2.tgz",
-      "integrity": "sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz",
+      "integrity": "sha512-nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg==",
       "dev": true,
       "requires": {
         "prop-types": "^15.5.8"
@@ -17053,13 +25645,13 @@
       }
     },
     "react-popper": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.7.tgz",
-      "integrity": "sha512-nmqYTx7QVjCm3WUZLeuOomna138R1luC4EqkW3hxJUrAe+3eNz3oFCLYdnPwILfn0mX1Ew2c3wctrjlUMYYUww==",
+      "version": "1.3.11",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz",
+      "integrity": "sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.1.2",
-        "create-react-context": "^0.3.0",
+        "@hypnosphi/create-react-context": "^0.3.1",
         "deep-equal": "^1.1.1",
         "popper.js": "^1.14.4",
         "prop-types": "^15.6.1",
@@ -17078,9 +25670,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.0.tgz",
-          "integrity": "sha512-qArkXsjJq7H+T86WrIFV0Fnu/tNOkZ4cgXmjkzAu3b/58D5mFIO8JH/y77t7C9q0OdDRdh9s7Ue5GasYssxtXw==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+          "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
           "dev": true,
           "requires": {
             "regenerator-runtime": "^0.13.4"
@@ -17094,10 +25686,16 @@
         }
       }
     },
+    "react-refresh": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz",
+      "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==",
+      "dev": true
+    },
     "react-select": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/react-select/-/react-select-3.1.0.tgz",
-      "integrity": "sha512-wBFVblBH1iuCBprtpyGtd1dGMadsG36W5/t2Aj8OE6WbByDg5jIFyT7X5gT+l0qmT5TqWhxX+VsKJvCEl2uL9g==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/react-select/-/react-select-3.2.0.tgz",
+      "integrity": "sha512-B/q3TnCZXEKItO0fFN/I0tWOX3WJvi/X2wtdffmwSQVRwg5BpValScTO1vdic9AxlUgmeSzib2hAZAwIUQUZGQ==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.4.4",
@@ -17106,20 +25704,20 @@
         "@emotion/css": "^10.0.9",
         "memoize-one": "^5.0.0",
         "prop-types": "^15.6.0",
-        "react-input-autosize": "^2.2.2",
+        "react-input-autosize": "^3.0.0",
         "react-transition-group": "^4.3.0"
       }
     },
     "react-sizeme": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/react-sizeme/-/react-sizeme-2.6.12.tgz",
-      "integrity": "sha512-tL4sCgfmvapYRZ1FO2VmBmjPVzzqgHA7kI8lSJ6JS6L78jXFNRdOZFpXyK6P1NBZvKPPCZxReNgzZNUajAerZw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/react-sizeme/-/react-sizeme-3.0.1.tgz",
+      "integrity": "sha512-9Hf1NLgSbny1bha77l9HwvwwxQUJxFUqi44Ih+y3evA+PezBpGdCGlnvye6avss2cIgs9PgdYgMnfuzJWn/RUw==",
       "dev": true,
       "requires": {
-        "element-resize-detector": "^1.2.1",
+        "element-resize-detector": "^1.2.2",
         "invariant": "^2.2.4",
         "shallowequal": "^1.1.0",
-        "throttle-debounce": "^2.1.0"
+        "throttle-debounce": "^3.0.1"
       }
     },
     "react-switch": {
@@ -17172,50 +25770,56 @@
       "dev": true
     },
     "react-use": {
-      "version": "15.3.2",
-      "resolved": "https://registry.npmjs.org/react-use/-/react-use-15.3.2.tgz",
-      "integrity": "sha512-DAbc+pVedZC4P5rLBKdIvTTB03+4T/pR6jZ2pKQPgqfq4UC1Oymmbehon5z8XXSUgZs0tgIvbBzVEdiWMS9k+g==",
+      "version": "17.2.4",
+      "resolved": "https://registry.npmjs.org/react-use/-/react-use-17.2.4.tgz",
+      "integrity": "sha512-vQGpsAM0F5UIlshw5UI8ULGPS4yn5rm7/qvn3T1Gnkrz7YRMEEMh+ynKcmRloOyiIeLvKWiQjMiwRGtdbgs5qQ==",
       "dev": true,
       "requires": {
-        "@types/js-cookie": "2.2.6",
-        "@xobotyi/scrollbar-width": "1.9.5",
-        "copy-to-clipboard": "^3.2.0",
+        "@types/js-cookie": "^2.2.6",
+        "@xobotyi/scrollbar-width": "^1.9.5",
+        "copy-to-clipboard": "^3.3.1",
         "fast-deep-equal": "^3.1.3",
         "fast-shallow-equal": "^1.0.0",
         "js-cookie": "^2.2.1",
-        "nano-css": "^5.2.1",
+        "nano-css": "^5.3.1",
         "react-universal-interface": "^0.6.2",
         "resize-observer-polyfill": "^1.5.1",
-        "screenfull": "^5.0.0",
+        "screenfull": "^5.1.0",
         "set-harmonic-interval": "^1.0.1",
-        "throttle-debounce": "^2.1.0",
+        "throttle-debounce": "^3.0.1",
         "ts-easing": "^0.2.0",
-        "tslib": "^2.0.0"
+        "tslib": "^2.1.0"
       },
       "dependencies": {
+        "copy-to-clipboard": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz",
+          "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
+          "dev": true,
+          "requires": {
+            "toggle-selection": "^1.0.6"
+          }
+        },
         "fast-deep-equal": {
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
           "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
           "dev": true
         },
+        "throttle-debounce": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-3.0.1.tgz",
+          "integrity": "sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==",
+          "dev": true
+        },
         "tslib": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz",
-          "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==",
           "dev": true
         }
       }
     },
-    "reactcss": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz",
-      "integrity": "sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.0.1"
-      }
-    },
     "read-pkg": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
@@ -17280,6 +25884,12 @@
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
           "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
         }
       }
     },
@@ -17309,32 +25919,6 @@
         "readable-stream": "^2.0.2"
       }
     },
-    "recast": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/recast/-/recast-0.14.7.tgz",
-      "integrity": "sha512-/nwm9pkrcWagN40JeJhkPaRxiHXBRkXyRh/hgU088Z/v+qCy+zIHHY6bC6o7NaKAxPqtE6nD8zBH1LfU0/Wx6A==",
-      "dev": true,
-      "requires": {
-        "ast-types": "0.11.3",
-        "esprima": "~4.0.0",
-        "private": "~0.1.5",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "ast-types": {
-          "version": "0.11.3",
-          "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.3.tgz",
-          "integrity": "sha512-XA5o5dsNw8MhyW0Q7MWXJWc4oOzZKbdsEJq45h7c8q/d9DwWZ5F2ugUc1PuMLPGsUnphCt/cNDHu8JeBbxf1qA==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
     "rechoir": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
@@ -17386,9 +25970,9 @@
       }
     },
     "regenerate": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
-      "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
       "dev": true
     },
     "regenerate-unicode-properties": {
@@ -17416,9 +26000,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.0.tgz",
-          "integrity": "sha512-qArkXsjJq7H+T86WrIFV0Fnu/tNOkZ4cgXmjkzAu3b/58D5mFIO8JH/y77t7C9q0OdDRdh9s7Ue5GasYssxtXw==",
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+          "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
           "dev": true,
           "requires": {
             "regenerator-runtime": "^0.13.4"
@@ -17443,19 +26027,19 @@
       }
     },
     "regexp.prototype.flags": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
-      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
+      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       }
     },
     "regexpu-core": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
-      "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
+      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0",
@@ -17473,9 +26057,9 @@
       "dev": true
     },
     "regjsparser": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
-      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
+      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
       "dev": true,
       "requires": {
         "jsesc": "~0.5.0"
@@ -17502,16 +26086,24 @@
       "dev": true
     },
     "renderkid": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
-      "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.5.tgz",
+      "integrity": "sha512-ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ==",
       "dev": true,
       "requires": {
-        "css-select": "^1.1.0",
+        "css-select": "^2.0.2",
         "dom-converter": "^0.2",
-        "htmlparser2": "^3.3.0",
-        "strip-ansi": "^3.0.0",
-        "utila": "^0.4.0"
+        "htmlparser2": "^3.10.1",
+        "lodash": "^4.17.20",
+        "strip-ansi": "^3.0.0"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        }
       }
     },
     "repeat-element": {
@@ -17726,6 +26318,12 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
     "rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -17768,9 +26366,9 @@
       "dev": true
     },
     "rtl-css-js": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/rtl-css-js/-/rtl-css-js-1.14.0.tgz",
-      "integrity": "sha512-Dl5xDTeN3e7scU1cWX8c9b6/Nqz3u/HgR4gePc1kWXYiQWVQbKCEyK6+Hxve9LbcJ5EieHy1J9nJCN3grTtGwg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/rtl-css-js/-/rtl-css-js-1.14.1.tgz",
+      "integrity": "sha512-G9N1s/6329FpJr8k9e1U/Lg0IDWThv99sb7k0IrXHjSnubxe01h52/ajsPRafJK1/2Vqrhz3VKLe3E1dx6jS9Q==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.1.2"
@@ -17782,6 +26380,15 @@
       "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
       "dev": true
     },
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
     "run-queue": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
@@ -17792,9 +26399,9 @@
       }
     },
     "rxjs": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz",
-      "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==",
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
@@ -17854,9 +26461,9 @@
       }
     },
     "scheduler": {
-      "version": "0.13.6",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
-      "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==",
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
+      "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
       "dev": true,
       "requires": {
         "loose-envify": "^1.1.0",
@@ -17875,9 +26482,9 @@
       }
     },
     "screenfull": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-5.0.2.tgz",
-      "integrity": "sha512-cCF2b+L/mnEiORLN5xSAz6H3t18i2oHh9BA8+CQlAh5DRw2+NFAGQJOSYbcGw8B2k04g/lVvFcfZ83b3ysH5UQ==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-5.1.0.tgz",
+      "integrity": "sha512-dYaNuOdzr+kc6J6CFcBrzkLCfyGcMg+gWkJ8us93IQ7y1cevhQAugFsaCdMHb6lw8KV3xPzSxzH7zM1dQap9mA==",
       "dev": true
     },
     "select": {
@@ -18060,32 +26667,12 @@
       }
     },
     "shallow-clone": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-      "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dev": true,
       "requires": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^2.0.1",
-        "lazy-cache": "^0.2.3",
-        "mixin-object": "^2.0.1"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-          "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.0.2"
-          }
-        },
-        "lazy-cache": {
-          "version": "0.2.7",
-          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-          "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=",
-          "dev": true
-        }
+        "kind-of": "^6.0.2"
       }
     },
     "shallow-equal": {
@@ -18148,13 +26735,22 @@
       "optional": true
     },
     "side-channel": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.2.tgz",
-      "integrity": "sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
       "dev": true,
       "requires": {
-        "es-abstract": "^1.17.0-next.1",
-        "object-inspect": "^1.7.0"
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "dependencies": {
+        "object-inspect": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+          "dev": true
+        }
       }
     },
     "signal-exit": {
@@ -18194,9 +26790,9 @@
       "dev": true
     },
     "slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true
     },
     "snapdragon": {
@@ -18342,9 +26938,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -18694,85 +27290,252 @@
       }
     },
     "string.prototype.matchall": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz",
-      "integrity": "sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz",
+      "integrity": "sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
+        "es-abstract": "^1.18.0-next.2",
         "has-symbols": "^1.0.1",
-        "internal-slot": "^1.0.2",
-        "regexp.prototype.flags": "^1.3.0",
-        "side-channel": "^1.0.2"
-      }
-    },
-    "string.prototype.padend": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz",
-      "integrity": "sha512-3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      }
-    },
-    "string.prototype.padstart": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.padstart/-/string.prototype.padstart-3.1.0.tgz",
-      "integrity": "sha512-envqZvUp2JItI+OeQ5UAh1ihbAV5G/2bixTojvlIa090GGqF+NQRxbWb2nv9fTGrZABv6+pE6jXoAZhhS2k4Hw==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "internal-slot": "^1.0.3",
+        "regexp.prototype.flags": "^1.3.1",
+        "side-channel": "^1.0.4"
       },
       "dependencies": {
         "es-abstract": {
-          "version": "1.17.6",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-          "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+          "version": "1.18.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+          "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
           "dev": true,
           "requires": {
+            "call-bind": "^1.0.2",
             "es-to-primitive": "^1.2.1",
             "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
             "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.0",
-            "is-regex": "^1.1.0",
-            "object-inspect": "^1.7.0",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.2",
+            "is-string": "^1.0.5",
+            "object-inspect": "^1.9.0",
             "object-keys": "^1.1.1",
-            "object.assign": "^4.1.0",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.0"
+          },
+          "dependencies": {
+            "has-symbols": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+              "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+              "dev": true
+            }
           }
         },
         "is-callable": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-          "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
           "dev": true
         },
         "is-regex": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
           "dev": true,
           "requires": {
+            "call-bind": "^1.0.2",
             "has-symbols": "^1.0.1"
           }
+        },
+        "object-inspect": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+          "dev": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
         }
       }
     },
+    "string.prototype.padend": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.2.tgz",
+      "integrity": "sha512-/AQFLdYvePENU3W5rgurfWSMU6n+Ww8n/3cUt7E+vPBB/D7YDG8x+qjoFs4M/alR2bW7Qg6xMjVwWUOvuQ0XpQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.2"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+          "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.2",
+            "is-string": "^1.0.5",
+            "object-inspect": "^1.9.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.0"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "object-inspect": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+          "dev": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        }
+      }
+    },
+    "string.prototype.padstart": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.padstart/-/string.prototype.padstart-3.1.2.tgz",
+      "integrity": "sha512-HDpngIP3pd0DeazrfqzuBrQZa+D2arKWquEHfGt5LzVjd+roLC3cjqVI0X8foaZz5rrrhcu8oJAQamW8on9dqw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.2"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+          "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.2",
+            "is-string": "^1.0.5",
+            "object-inspect": "^1.9.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.0"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "object-inspect": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+          "dev": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        }
+      }
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
     "string.prototype.trimleft": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
@@ -18794,49 +27557,13 @@
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.6",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-          "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-          "dev": true,
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.0",
-            "is-regex": "^1.1.0",
-            "object-inspect": "^1.7.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.0",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-          "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-          "dev": true,
-          "requires": {
-            "has-symbols": "^1.0.1"
-          }
-        }
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       }
     },
     "string_decoder": {
@@ -18885,19 +27612,19 @@
       }
     },
     "style-loader": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
-      "integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.3.0.tgz",
+      "integrity": "sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==",
       "dev": true,
       "requires": {
         "loader-utils": "^2.0.0",
-        "schema-utils": "^2.6.6"
+        "schema-utils": "^2.7.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -18906,6 +27633,12 @@
             "uri-js": "^4.2.2"
           }
         },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true
+        },
         "emojis-list": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
@@ -18919,9 +27652,9 @@
           "dev": true
         },
         "json5": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-          "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
           "dev": true,
           "requires": {
             "minimist": "^1.2.5"
@@ -18945,14 +27678,14 @@
           "dev": true
         },
         "schema-utils": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+          "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.4",
-            "ajv": "^6.12.2",
-            "ajv-keywords": "^3.4.1"
+            "@types/json-schema": "^7.0.5",
+            "ajv": "^6.12.4",
+            "ajv-keywords": "^3.5.2"
           }
         }
       }
@@ -18985,6 +27718,14 @@
         "stylis": "^3.5.0",
         "stylis-rule-sheet": "^0.0.10",
         "supports-color": "^5.5.0"
+      },
+      "dependencies": {
+        "stylis": {
+          "version": "3.5.4",
+          "resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz",
+          "integrity": "sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==",
+          "dev": true
+        }
       }
     },
     "stylefire": {
@@ -19000,9 +27741,9 @@
       }
     },
     "stylis": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz",
-      "integrity": "sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==",
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz",
+      "integrity": "sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg==",
       "dev": true
     },
     "stylis-rule-sheet": {
@@ -19111,13 +27852,94 @@
       "dev": true
     },
     "symbol.prototype.description": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/symbol.prototype.description/-/symbol.prototype.description-1.0.2.tgz",
-      "integrity": "sha512-2CW5SU4/Ki1cYOOHcL2cXK4rxSg5hCU1TwZ7X4euKhV9VnfqKslh7T6/UyKkubA8cq2tOmsOv7m3ZUmQslBRuw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/symbol.prototype.description/-/symbol.prototype.description-1.0.4.tgz",
+      "integrity": "sha512-fZkHwJ8ZNRVRzF/+/2OtygyyH06CjC0YZAQRHu9jKKw8RXlJpbizEHvGRUu22Qkg182wJk1ugb5Aovcv3UPrww==",
       "dev": true,
       "requires": {
-        "es-abstract": "^1.17.0-next.1",
-        "has-symbols": "^1.0.1"
+        "call-bind": "^1.0.2",
+        "es-abstract": "^1.18.0-next.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.2"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+          "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "is-callable": "^1.2.3",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.2",
+            "is-string": "^1.0.5",
+            "object-inspect": "^1.9.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.0"
+          },
+          "dependencies": {
+            "has-symbols": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+              "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+              "dev": true
+            }
+          }
+        },
+        "is-callable": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+          "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+          "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "object-inspect": {
+          "version": "1.10.2",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz",
+          "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==",
+          "dev": true
+        },
+        "object.assign": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+          "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.0",
+            "define-properties": "^1.1.3",
+            "has-symbols": "^1.0.1",
+            "object-keys": "^1.1.1"
+          }
+        },
+        "object.getownpropertydescriptors": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
+          "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.18.0-next.2"
+          }
+        }
       }
     },
     "tapable": {
@@ -19126,6 +27948,40 @@
       "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
       "dev": true
     },
+    "tar": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
+      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+      "dev": true,
+      "requires": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^3.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "chownr": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+          "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
     "telejson": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/telejson/-/telejson-3.3.0.tgz",
@@ -19143,9 +27999,9 @@
       }
     },
     "term-size": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz",
-      "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
+      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==",
       "dev": true
     },
     "terminal-link": {
@@ -19178,26 +28034,26 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.7.tgz",
-      "integrity": "sha512-xzYyaHUNhzgaAdBsXxk2Yvo/x1NJdslUaussK3fdpBbvttm1iIwU+c26dj9UxJcwk2c5UWt5F55MUTIA8BE7Dg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.1.0.tgz",
+      "integrity": "sha512-cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA==",
       "dev": true,
       "requires": {
-        "cacache": "^13.0.1",
+        "cacache": "^15.0.5",
         "find-cache-dir": "^3.3.1",
-        "jest-worker": "^25.4.0",
-        "p-limit": "^2.3.0",
+        "jest-worker": "^26.2.1",
+        "p-limit": "^3.0.2",
         "schema-utils": "^2.6.6",
-        "serialize-javascript": "^3.1.0",
+        "serialize-javascript": "^4.0.0",
         "source-map": "^0.6.1",
-        "terser": "^4.6.12",
+        "terser": "^4.8.0",
         "webpack-sources": "^1.4.3"
       },
       "dependencies": {
         "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -19206,62 +28062,177 @@
             "uri-js": "^4.2.2"
           }
         },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true
+        },
         "cacache": {
-          "version": "13.0.1",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
-          "integrity": "sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==",
+          "version": "15.0.6",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.6.tgz",
+          "integrity": "sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==",
           "dev": true,
           "requires": {
-            "chownr": "^1.1.2",
-            "figgy-pudding": "^3.5.1",
+            "@npmcli/move-file": "^1.0.1",
+            "chownr": "^2.0.0",
             "fs-minipass": "^2.0.0",
             "glob": "^7.1.4",
-            "graceful-fs": "^4.2.2",
             "infer-owner": "^1.0.4",
-            "lru-cache": "^5.1.1",
-            "minipass": "^3.0.0",
+            "lru-cache": "^6.0.0",
+            "minipass": "^3.1.1",
             "minipass-collect": "^1.0.2",
             "minipass-flush": "^1.0.5",
             "minipass-pipeline": "^1.2.2",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "p-map": "^3.0.0",
+            "mkdirp": "^1.0.3",
+            "p-map": "^4.0.0",
             "promise-inflight": "^1.0.1",
-            "rimraf": "^2.7.1",
-            "ssri": "^7.0.0",
+            "rimraf": "^3.0.2",
+            "ssri": "^8.0.1",
+            "tar": "^6.0.2",
             "unique-filename": "^1.1.1"
           }
         },
+        "chownr": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+          "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+          "dev": true
+        },
         "fast-deep-equal": {
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
           "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
           "dev": true
         },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+        "find-cache-dir": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "commondir": "^1.0.1",
+            "make-dir": "^3.0.2",
+            "pkg-dir": "^4.1.0"
+          }
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "make-dir": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "dev": true,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          },
+          "dependencies": {
+            "p-limit": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+              "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+              "dev": true,
+              "requires": {
+                "p-try": "^2.0.0"
+              }
+            }
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "dev": true,
+          "requires": {
+            "find-up": "^4.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
           }
         },
         "schema-utils": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+          "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.4",
-            "ajv": "^6.12.2",
-            "ajv-keywords": "^3.4.1"
+            "@types/json-schema": "^7.0.5",
+            "ajv": "^6.12.4",
+            "ajv-keywords": "^3.5.2"
           }
         },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
         "serialize-javascript": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-          "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
           "dev": true,
           "requires": {
             "randombytes": "^2.1.0"
@@ -19274,25 +28245,19 @@
           "dev": true
         },
         "ssri": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz",
-          "integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==",
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+          "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
           "dev": true,
           "requires": {
-            "figgy-pudding": "^3.5.1",
             "minipass": "^3.1.1"
           }
         },
-        "terser": {
-          "version": "4.8.0",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-          "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
-          "dev": true,
-          "requires": {
-            "commander": "^2.20.0",
-            "source-map": "~0.6.1",
-            "source-map-support": "~0.5.12"
-          }
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
         }
       }
     },
@@ -19320,9 +28285,9 @@
       "dev": true
     },
     "throttle-debounce": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.1.0.tgz",
-      "integrity": "sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-3.0.1.tgz",
+      "integrity": "sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==",
       "dev": true
     },
     "through": {
@@ -19357,12 +28322,6 @@
       "dev": true,
       "optional": true
     },
-    "tinycolor2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz",
-      "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=",
-      "dev": true
-    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -19476,6 +28435,181 @@
       "integrity": "sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==",
       "dev": true
     },
+    "ts-essentials": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-2.0.12.tgz",
+      "integrity": "sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==",
+      "dev": true
+    },
+    "ts-loader": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.2.0.tgz",
+      "integrity": "sha512-ebXBFrNyMSmbWgjnb3WBloUBK+VSx1xckaXsMXxlZRDqce/OPdYBVN5efB0W3V0defq0Gcy4YuzvPGqRgjj85A==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "enhanced-resolve": "^4.0.0",
+        "loader-utils": "^2.0.0",
+        "micromatch": "^4.0.0",
+        "semver": "^7.3.4"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "dev": true
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "json5": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "micromatch": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "picomatch": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+          "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+          "dev": true
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
     "ts-pnp": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
@@ -19524,9 +28658,9 @@
       "dev": true
     },
     "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.0.2.tgz",
+      "integrity": "sha512-a720oz3Kjbp3ll0zkeN9qjRhO7I34MKMhPGQiQJAmaZQZQ1lo+NWThK322f7sXV+kTg9B1Ybt16KgBXWgteT8w==",
       "dev": true
     },
     "type-is": {
@@ -19560,16 +28694,42 @@
         "is-typedarray": "^1.0.0"
       }
     },
-    "ua-parser-js": {
-      "version": "0.7.21",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz",
-      "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==",
+    "typescript-plugin-styled-components": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/typescript-plugin-styled-components/-/typescript-plugin-styled-components-1.5.0.tgz",
+      "integrity": "sha512-5x/30WvzlrD0h5MOlp/pFVQFNWCupeG6QqHvsYlsg9Qg1hxG614kf3p4FmgJ35UxKz0mREX7+4S1Li46gsM3eQ==",
       "dev": true
     },
+    "ua-parser-js": {
+      "version": "0.7.28",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz",
+      "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==",
+      "dev": true
+    },
+    "unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "dependencies": {
+        "has-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+          "dev": true
+        }
+      }
+    },
     "unfetch": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.1.0.tgz",
-      "integrity": "sha512-crP/n3eAPUJxZXM9T80/yv0YhkTEx2K1D3h7D1AJM6fzsWZrxdyRuLN0JH/dkZh1LNH8LxCnBzoPFCPbb2iGpg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz",
+      "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==",
       "dev": true
     },
     "unicode-canonical-property-names-ecmascript": {
@@ -19612,12 +28772,6 @@
         "set-value": "^2.0.1"
       }
     },
-    "uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-      "dev": true
-    },
     "unique-filename": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
@@ -19637,9 +28791,9 @@
       }
     },
     "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "dev": true
     },
     "unpipe": {
@@ -19740,20 +28894,26 @@
       }
     },
     "url-loader": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.3.0.tgz",
-      "integrity": "sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
+      "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.2.3",
-        "mime": "^2.4.4",
-        "schema-utils": "^2.5.0"
+        "loader-utils": "^2.0.0",
+        "mime-types": "^2.1.27",
+        "schema-utils": "^3.0.0"
       },
       "dependencies": {
+        "@types/json-schema": {
+          "version": "7.0.7",
+          "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
+          "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
+          "dev": true
+        },
         "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -19762,35 +28922,67 @@
             "uri-js": "^4.2.2"
           }
         },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "dev": true
+        },
         "fast-deep-equal": {
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
           "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
           "dev": true
         },
-        "mime": {
-          "version": "2.4.6",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+        "json5": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
           "dev": true
         },
         "schema-utils": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.4",
-            "ajv": "^6.12.2",
-            "ajv-keywords": "^3.4.1"
+            "@types/json-schema": "^7.0.6",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         }
       }
     },
     "url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
+      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
       "dev": true,
       "requires": {
         "querystringify": "^2.1.1",
@@ -19804,18 +28996,42 @@
       "dev": true
     },
     "use-callback-ref": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.2.4.tgz",
-      "integrity": "sha512-rXpsyvOnqdScyied4Uglsp14qzag1JIemLeTWGKbwpotWht57hbP78aNT+Q4wdFKQfQibbUX4fb6Qb4y11aVOQ==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.2.5.tgz",
+      "integrity": "sha512-gN3vgMISAgacF7sqsLPByqoePooY3n2emTH59Ur5d/M8eg4WTWu1xp8i8DHjohftIyEx0S08RiYxbffr4j8Peg==",
       "dev": true
     },
-    "use-sidecar": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.0.3.tgz",
-      "integrity": "sha512-ygJwGUBeQfWgDls7uTrlEDzJUUR67L8Rm14v/KfFtYCdHhtjHZx1Krb3DIQl3/Q5dJGfXLEQ02RY8BdNBv87SQ==",
+    "use-composed-ref": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.1.0.tgz",
+      "integrity": "sha512-my1lNHGWsSDAhhVAT4MKs6IjBUtG6ZG11uUqexPH9PptiIZDQOzaF4f5tEbJ2+7qvNbtXNBbU3SfmN+fXlWDhg==",
       "dev": true,
       "requires": {
-        "detect-node-es": "^1.0.0",
+        "ts-essentials": "^2.0.3"
+      }
+    },
+    "use-isomorphic-layout-effect": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz",
+      "integrity": "sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ==",
+      "dev": true
+    },
+    "use-latest": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.2.0.tgz",
+      "integrity": "sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw==",
+      "dev": true,
+      "requires": {
+        "use-isomorphic-layout-effect": "^1.0.0"
+      }
+    },
+    "use-sidecar": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.0.5.tgz",
+      "integrity": "sha512-k9jnrjYNwN6xYLj1iaGhonDghfvmeTmYjAiGvOr7clwKfPjMXJf4/HOr7oT5tJwYafgp2tG2l3eZEOfoELiMcA==",
+      "dev": true,
+      "requires": {
+        "detect-node-es": "^1.1.0",
         "tslib": "^1.9.3"
       }
     },
@@ -20294,9 +29510,9 @@
       }
     },
     "webpack-dev-middleware": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
-      "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz",
+      "integrity": "sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==",
       "dev": true,
       "requires": {
         "memory-fs": "^0.4.1",
@@ -20307,13 +29523,19 @@
       },
       "dependencies": {
         "mime": {
-          "version": "2.4.6",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
           "dev": true
         }
       }
     },
+    "webpack-filter-warnings-plugin": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/webpack-filter-warnings-plugin/-/webpack-filter-warnings-plugin-1.2.1.tgz",
+      "integrity": "sha512-Ez6ytc9IseDMLPo0qCuNNYzgtUl8NovOqjIq4uAU8LTD4uoa1w1KpZyyzFtLTEMZpkkOkLfL9eN+KGYdk1Qtwg==",
+      "dev": true
+    },
     "webpack-hot-middleware": {
       "version": "2.25.0",
       "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.25.0.tgz",
@@ -20337,12 +29559,13 @@
       }
     },
     "webpack-merge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz",
+      "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.15"
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
       }
     },
     "webpack-sources": {
@@ -20373,9 +29596,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -20421,9 +29644,9 @@
       }
     },
     "whatwg-fetch": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.3.1.tgz",
-      "integrity": "sha512-faXTmGDcLuEPBpJwb5LQfyxvubKiE+RlbmmweFGKjvIPFj4uHTTfdtTIkdTRhC6OSH9S9eyYbx8kZ0UEaQqYTA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
+      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==",
       "dev": true
     },
     "whatwg-mimetype": {
@@ -20458,6 +29681,19 @@
         "isexe": "^2.0.0"
       }
     },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "requires": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      }
+    },
     "which-module": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
@@ -20501,9 +29737,9 @@
           "dev": true
         },
         "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
           "dev": true,
           "requires": {
             "emoji-regex": "^8.0.0",
@@ -20522,6 +29758,12 @@
         }
       }
     },
+    "wildcard": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+      "dev": true
+    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -20824,6 +30066,12 @@
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
       }
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true
     }
   }
 }
diff --git a/packages/insomnia-components/package.json b/packages/insomnia-components/package.json
index fd2020e5b8..c17d950992 100644
--- a/packages/insomnia-components/package.json
+++ b/packages/insomnia-components/package.json
@@ -6,71 +6,74 @@
   "license": "MIT",
   "repository": "https://github.com/kong/insomnia/tree/develop/packages/insomnia-components",
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "typecheck": "flow check",
-    "jest": "jest",
-    "jest:watch": "jest --watch",
-    "test": "npm run typecheck && npm run jest",
     "build": "webpack --config webpack/webpack.prod.js --display errors-only",
-    "watch": "webpack --config webpack/webpack.dev.js --watch",
     "build-storybook": "build-storybook --quiet",
+    "clean": "",
+    "convert-svg": "rimraf src/assets/svgr && svgr --config-file svgr.config.js --out-dir src/assets/svgr src/assets && rimraf src/assets/svgr/index.tsx",
+    "jest:watch": "jest --watch",
+    "lint": "eslint . --ext .js,.ts,.tsx",
+    "lint:fix": "npm run lint -- --fix",
+    "postclean": "rimraf dist",
+    "prepare": "npm run convert-svg && npm run build",
     "storybook": "start-storybook --port 3223",
-    "convert-svg": "rimraf assets/svgr && svgr --out-dir assets/svgr assets && rimraf assets/svgr/index.js",
-    "prepare": "npm run convert-svg && npm run build"
-  },
-  "jest": {
-    "setupFilesAfterEnv": [
-      "./__jest__/setup-after-env.js"
-    ],
-    "testMatch": [
-      "**/__tests__/**/*.test.js?(x)"
-    ],
-    "verbose": false,
-    "resetMocks": true,
-    "resetModules": true,
-    "coveragePathIgnorePatterns": [
-      "/node_modules/"
-    ]
+    "test": "jest",
+    "watch": "webpack --config webpack/webpack.dev.js --watch"
   },
   "devDependencies": {
     "@babel/core": "^7.7.7",
     "@babel/plugin-proposal-decorators": "^7.8.3",
     "@babel/plugin-proposal-optional-chaining": "^7.12.7",
     "@babel/plugin-transform-runtime": "^7.12.10",
-    "@storybook/addon-contexts": "^5.3.19",
-    "@storybook/addon-info": "^5.3.19",
-    "@storybook/addon-knobs": "^5.3.19",
-    "@storybook/react": "^5.3.19",
-    "@svgr/cli": "^5.3.0",
-    "@testing-library/dom": "^7.28.1",
-    "@testing-library/jest-dom": "^5.11.6",
-    "@testing-library/react": "^11.2.2",
-    "@testing-library/react-hooks": "^3.7.0",
-    "babel-loader": "^8.0.6",
+    "@storybook/addon-contexts": "^5.3.21",
+    "@storybook/addon-info": "^5.3.21",
+    "@storybook/addon-knobs": "^6.2.9",
+    "@storybook/react": "^6.2.9",
+    "@svgr/cli": "^5.5.0",
+    "@testing-library/dom": "^7.30.4",
+    "@testing-library/jest-dom": "^5.12.0",
+    "@testing-library/react": "^11.2.6",
+    "@testing-library/react-hooks": "^5.1.2",
+    "@types/babel__core": "^7.1.14",
+    "@types/babel__plugin-transform-runtime": "^7.9.1",
+    "@types/md5": "^2.3.0",
+    "@types/prop-types": "^15.7.3",
+    "@types/react": "^16.14.5",
+    "@types/react-dom": "^16.9.12",
+    "@types/storybook__addon-info": "^5.2.3",
+    "@types/styled-components": "^4.4.3",
+    "@types/testing-library__jest-dom": "^5.9.5",
+    "@types/testing-library__react-hooks": "^4.0.0",
+    "@types/webpack": "^5.28.0",
+    "@types/webpack-merge": "^5.0.0",
     "babel-plugin-inline-react-svg": "^1.1.1",
     "jest": "^26.6.3",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
-    "react-use": "^15.3.2",
+    "react": "^16.8.3",
+    "react-docgen-typescript": "^1.22.0",
+    "react-dom": "^16.8.3",
+    "react-use": "^17.2.4",
     "storybook-addon-designs": "^5.4.1",
     "styled-components": "^4.4.1",
+    "ts-loader": "^8.2.0",
+    "type-fest": "^1.0.2",
+    "typescript-plugin-styled-components": "^1.5.0",
     "webpack": "^4.44.1",
     "webpack-cli": "^3.3.11",
-    "webpack-merge": "^4.2.2"
+    "webpack-merge": "^5.0.7"
   },
   "dependencies": {
     "class-autobind-decorator": "^3.0.1",
-    "classnames": "^2.2.6",
+    "classnames": "^2.3.1",
     "framer-motion": "^1.10.3",
     "fuzzysort": "^1.1.4",
     "md5": "^2.2.1",
-    "prop-types": "^15.7.2",
     "react-switch": "^5.0.1"
   },
   "peerDependencies": {
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
-    "styled-components": "^4.4.1"
+    "react": "^16.8.3",
+    "react-dom": "^16.8.3",
+    "styled-components": "^5.1.1"
   },
   "gitHead": "d91e6735a76295166545a42c170328da4ab70dd3"
 }
diff --git a/packages/insomnia-components/assets/icn-arrow-right.svg b/packages/insomnia-components/src/assets/icn-arrow-right.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-arrow-right.svg
rename to packages/insomnia-components/src/assets/icn-arrow-right.svg
diff --git a/packages/insomnia-components/assets/icn-bitbucket-logo.svg b/packages/insomnia-components/src/assets/icn-bitbucket-logo.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-bitbucket-logo.svg
rename to packages/insomnia-components/src/assets/icn-bitbucket-logo.svg
diff --git a/packages/insomnia-components/assets/icn-brackets.svg b/packages/insomnia-components/src/assets/icn-brackets.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-brackets.svg
rename to packages/insomnia-components/src/assets/icn-brackets.svg
diff --git a/packages/insomnia-components/assets/icn-burger-menu.svg b/packages/insomnia-components/src/assets/icn-burger-menu.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-burger-menu.svg
rename to packages/insomnia-components/src/assets/icn-burger-menu.svg
diff --git a/packages/insomnia-components/assets/icn-checkmark.svg b/packages/insomnia-components/src/assets/icn-checkmark.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-checkmark.svg
rename to packages/insomnia-components/src/assets/icn-checkmark.svg
diff --git a/packages/insomnia-components/assets/icn-chevron-down.svg b/packages/insomnia-components/src/assets/icn-chevron-down.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-chevron-down.svg
rename to packages/insomnia-components/src/assets/icn-chevron-down.svg
diff --git a/packages/insomnia-components/assets/icn-chevron-up.svg b/packages/insomnia-components/src/assets/icn-chevron-up.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-chevron-up.svg
rename to packages/insomnia-components/src/assets/icn-chevron-up.svg
diff --git a/packages/insomnia-components/assets/icn-clock.svg b/packages/insomnia-components/src/assets/icn-clock.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-clock.svg
rename to packages/insomnia-components/src/assets/icn-clock.svg
diff --git a/packages/insomnia-components/assets/icn-cookie.svg b/packages/insomnia-components/src/assets/icn-cookie.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-cookie.svg
rename to packages/insomnia-components/src/assets/icn-cookie.svg
diff --git a/packages/insomnia-components/assets/icn-drag-grip.svg b/packages/insomnia-components/src/assets/icn-drag-grip.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-drag-grip.svg
rename to packages/insomnia-components/src/assets/icn-drag-grip.svg
diff --git a/packages/insomnia-components/assets/icn-elevator.svg b/packages/insomnia-components/src/assets/icn-elevator.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-elevator.svg
rename to packages/insomnia-components/src/assets/icn-elevator.svg
diff --git a/packages/insomnia-components/assets/icn-ellipsis-circle.svg b/packages/insomnia-components/src/assets/icn-ellipsis-circle.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-ellipsis-circle.svg
rename to packages/insomnia-components/src/assets/icn-ellipsis-circle.svg
diff --git a/packages/insomnia-components/assets/icn-ellipsis.svg b/packages/insomnia-components/src/assets/icn-ellipsis.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-ellipsis.svg
rename to packages/insomnia-components/src/assets/icn-ellipsis.svg
diff --git a/packages/insomnia-components/assets/icn-empty.svg b/packages/insomnia-components/src/assets/icn-empty.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-empty.svg
rename to packages/insomnia-components/src/assets/icn-empty.svg
diff --git a/packages/insomnia-components/assets/icn-errors.svg b/packages/insomnia-components/src/assets/icn-errors.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-errors.svg
rename to packages/insomnia-components/src/assets/icn-errors.svg
diff --git a/packages/insomnia-components/assets/icn-file.svg b/packages/insomnia-components/src/assets/icn-file.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-file.svg
rename to packages/insomnia-components/src/assets/icn-file.svg
diff --git a/packages/insomnia-components/assets/icn-folder-open.svg b/packages/insomnia-components/src/assets/icn-folder-open.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-folder-open.svg
rename to packages/insomnia-components/src/assets/icn-folder-open.svg
diff --git a/packages/insomnia-components/assets/icn-folder.svg b/packages/insomnia-components/src/assets/icn-folder.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-folder.svg
rename to packages/insomnia-components/src/assets/icn-folder.svg
diff --git a/packages/insomnia-components/assets/icn-gear.svg b/packages/insomnia-components/src/assets/icn-gear.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-gear.svg
rename to packages/insomnia-components/src/assets/icn-gear.svg
diff --git a/packages/insomnia-components/assets/icn-git-branch.svg b/packages/insomnia-components/src/assets/icn-git-branch.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-git-branch.svg
rename to packages/insomnia-components/src/assets/icn-git-branch.svg
diff --git a/packages/insomnia-components/assets/icn-github-logo.svg b/packages/insomnia-components/src/assets/icn-github-logo.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-github-logo.svg
rename to packages/insomnia-components/src/assets/icn-github-logo.svg
diff --git a/packages/insomnia-components/assets/icn-gitlab-logo.svg b/packages/insomnia-components/src/assets/icn-gitlab-logo.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-gitlab-logo.svg
rename to packages/insomnia-components/src/assets/icn-gitlab-logo.svg
diff --git a/packages/insomnia-components/assets/icn-gui.svg b/packages/insomnia-components/src/assets/icn-gui.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-gui.svg
rename to packages/insomnia-components/src/assets/icn-gui.svg
diff --git a/packages/insomnia-components/assets/icn-indentation.svg b/packages/insomnia-components/src/assets/icn-indentation.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-indentation.svg
rename to packages/insomnia-components/src/assets/icn-indentation.svg
diff --git a/packages/insomnia-components/assets/icn-info.svg b/packages/insomnia-components/src/assets/icn-info.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-info.svg
rename to packages/insomnia-components/src/assets/icn-info.svg
diff --git a/packages/insomnia-components/assets/icn-key.svg b/packages/insomnia-components/src/assets/icn-key.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-key.svg
rename to packages/insomnia-components/src/assets/icn-key.svg
diff --git a/packages/insomnia-components/assets/icn-minus-circle-fill.svg b/packages/insomnia-components/src/assets/icn-minus-circle-fill.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-minus-circle-fill.svg
rename to packages/insomnia-components/src/assets/icn-minus-circle-fill.svg
diff --git a/packages/insomnia-components/assets/icn-minus-circle.svg b/packages/insomnia-components/src/assets/icn-minus-circle.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-minus-circle.svg
rename to packages/insomnia-components/src/assets/icn-minus-circle.svg
diff --git a/packages/insomnia-components/assets/icn-placeholder.svg b/packages/insomnia-components/src/assets/icn-placeholder.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-placeholder.svg
rename to packages/insomnia-components/src/assets/icn-placeholder.svg
diff --git a/packages/insomnia-components/assets/icn-play.svg b/packages/insomnia-components/src/assets/icn-play.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-play.svg
rename to packages/insomnia-components/src/assets/icn-play.svg
diff --git a/packages/insomnia-components/assets/icn-plus.svg b/packages/insomnia-components/src/assets/icn-plus.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-plus.svg
rename to packages/insomnia-components/src/assets/icn-plus.svg
diff --git a/packages/insomnia-components/assets/icn-prohibited.svg b/packages/insomnia-components/src/assets/icn-prohibited.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-prohibited.svg
rename to packages/insomnia-components/src/assets/icn-prohibited.svg
diff --git a/packages/insomnia-components/assets/icn-question-fill.svg b/packages/insomnia-components/src/assets/icn-question-fill.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-question-fill.svg
rename to packages/insomnia-components/src/assets/icn-question-fill.svg
diff --git a/packages/insomnia-components/assets/icn-question.svg b/packages/insomnia-components/src/assets/icn-question.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-question.svg
rename to packages/insomnia-components/src/assets/icn-question.svg
diff --git a/packages/insomnia-components/assets/icn-search.svg b/packages/insomnia-components/src/assets/icn-search.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-search.svg
rename to packages/insomnia-components/src/assets/icn-search.svg
diff --git a/packages/insomnia-components/assets/icn-sec-cert.svg b/packages/insomnia-components/src/assets/icn-sec-cert.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-sec-cert.svg
rename to packages/insomnia-components/src/assets/icn-sec-cert.svg
diff --git a/packages/insomnia-components/assets/icn-success.svg b/packages/insomnia-components/src/assets/icn-success.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-success.svg
rename to packages/insomnia-components/src/assets/icn-success.svg
diff --git a/packages/insomnia-components/assets/icn-sync.svg b/packages/insomnia-components/src/assets/icn-sync.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-sync.svg
rename to packages/insomnia-components/src/assets/icn-sync.svg
diff --git a/packages/insomnia-components/assets/icn-trashcan.svg b/packages/insomnia-components/src/assets/icn-trashcan.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-trashcan.svg
rename to packages/insomnia-components/src/assets/icn-trashcan.svg
diff --git a/packages/insomnia-components/assets/icn-triangle.svg b/packages/insomnia-components/src/assets/icn-triangle.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-triangle.svg
rename to packages/insomnia-components/src/assets/icn-triangle.svg
diff --git a/packages/insomnia-components/assets/icn-user.svg b/packages/insomnia-components/src/assets/icn-user.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-user.svg
rename to packages/insomnia-components/src/assets/icn-user.svg
diff --git a/packages/insomnia-components/assets/icn-warning-circle.svg b/packages/insomnia-components/src/assets/icn-warning-circle.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-warning-circle.svg
rename to packages/insomnia-components/src/assets/icn-warning-circle.svg
diff --git a/packages/insomnia-components/assets/icn-warning.svg b/packages/insomnia-components/src/assets/icn-warning.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-warning.svg
rename to packages/insomnia-components/src/assets/icn-warning.svg
diff --git a/packages/insomnia-components/assets/icn-x.svg b/packages/insomnia-components/src/assets/icn-x.svg
similarity index 100%
rename from packages/insomnia-components/assets/icn-x.svg
rename to packages/insomnia-components/src/assets/icn-x.svg
diff --git a/packages/insomnia-components/src/breadcrumb.stories.tsx b/packages/insomnia-components/src/breadcrumb.stories.tsx
new file mode 100644
index 0000000000..4c44783cbc
--- /dev/null
+++ b/packages/insomnia-components/src/breadcrumb.stories.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { Breadcrumb } from './breadcrumb';
+
+export default {
+  title: 'Navigation | Breadcrumb',
+};
+
+export const _default = () => (
+  <Breadcrumb
+    className="breadcrumb"
+    crumbs={['Documents', 'Deployment']}
+  />
+);
diff --git a/packages/insomnia-components/components/breadcrumb.js b/packages/insomnia-components/src/breadcrumb.tsx
similarity index 63%
rename from packages/insomnia-components/components/breadcrumb.js
rename to packages/insomnia-components/src/breadcrumb.tsx
index 5c9f9362b2..f3c3187f8f 100644
--- a/packages/insomnia-components/components/breadcrumb.js
+++ b/packages/insomnia-components/src/breadcrumb.tsx
@@ -1,13 +1,13 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import styled from 'styled-components';
 
-type Props = {|
-  crumbs: Array<Object>,
-  onClick: (index: number) => any,
-|};
+export interface BreadcrumbProps {
+  crumbs: string[];
+  className: string;
+  onClick?: React.MouseEventHandler<HTMLAnchorElement>;
+}
 
-const StyledBreadcrumb: React.ComponentType<{}> = styled.ul`
+const StyledBreadcrumb = styled.ul`
   font-size: var(--font-size-lg);
   font-weight: 600;
   color: var(--color-font);
@@ -41,19 +41,11 @@ const StyledBreadcrumb: React.ComponentType<{}> = styled.ul`
   }
 `;
 
-class Breadcrumb extends React.PureComponent<Props> {
-  _handleClick(index: number, e: SyntheticEvent<HTMLAnchorElement>) {
-    e.preventDefault();
-    const { onClick } = this.props;
-    if (typeof onClick === 'function') {
-      onClick(index);
-    }
-  }
-
+export class Breadcrumb extends PureComponent<BreadcrumbProps> {
   render() {
-    const { crumbs, onClick } = this.props;
+    const { className, crumbs, onClick } = this.props;
     return (
-      <StyledBreadcrumb>
+      <StyledBreadcrumb className={className}>
         {crumbs.map((crumb, i, arr) => {
           if (arr.length - 1 === i) {
             return <li key={crumb}>{crumb}</li>;
@@ -71,5 +63,3 @@ class Breadcrumb extends React.PureComponent<Props> {
     );
   }
 }
-
-export default Breadcrumb;
diff --git a/packages/insomnia-components/components/button/async-button.stories.js b/packages/insomnia-components/src/button/async-button.stories.tsx
similarity index 59%
rename from packages/insomnia-components/components/button/async-button.stories.js
rename to packages/insomnia-components/src/button/async-button.stories.tsx
index c303ec2979..76cfd5f36c 100644
--- a/packages/insomnia-components/components/button/async-button.stories.js
+++ b/packages/insomnia-components/src/button/async-button.stories.tsx
@@ -1,5 +1,4 @@
-// @flow
-import * as React from 'react';
+import React from 'react';
 import { AsyncButton } from './async-button';
 import { select, withKnobs } from '@storybook/addon-knobs';
 import { ButtonSizeEnum, ButtonThemeEnum, ButtonVariantEnum } from './button';
@@ -12,9 +11,10 @@ export default {
 export const _default = () => (
   <AsyncButton
     onClick={() => new Promise(resolve => setTimeout(resolve, 3000))}
-    variant={select('Variant', ButtonVariantEnum)}
-    size={select('Size', ButtonSizeEnum)}
-    bg={select('Background', ButtonThemeEnum)}>
+    variant={select('Variant', ButtonVariantEnum, 'outlined')}
+    size={select('Size', ButtonSizeEnum, 'default')}
+    bg={select('Background', ButtonThemeEnum, 'default')}
+  >
     Do stuff for 3 seconds
   </AsyncButton>
 );
@@ -22,10 +22,11 @@ export const _default = () => (
 export const customLoader = () => (
   <AsyncButton
     onClick={() => new Promise(resolve => setTimeout(resolve, 3000))}
-    variant={select('Variant', ButtonVariantEnum)}
-    size={select('Size', ButtonSizeEnum)}
-    bg={select('Background', ButtonThemeEnum)}
-    loadingNode={'Doing stuff...'}>
+    variant={select('Variant', ButtonVariantEnum, 'outlined')}
+    size={select('Size', ButtonSizeEnum, 'default')}
+    bg={select('Background', ButtonThemeEnum, 'default')}
+    loadingNode={'Doing stuff...'}
+  >
     Do stuff for 3 seconds
   </AsyncButton>
 );
diff --git a/packages/insomnia-components/src/button/async-button.tsx b/packages/insomnia-components/src/button/async-button.tsx
new file mode 100644
index 0000000000..47efb7e4dd
--- /dev/null
+++ b/packages/insomnia-components/src/button/async-button.tsx
@@ -0,0 +1,50 @@
+import React, { ReactNode, useCallback, useState } from 'react';
+import { Button } from './button';
+import type { ButtonProps } from './button';
+
+// Taken from https://github.com/then/is-promise
+function isPromise(obj: unknown) {
+  return (
+    !!obj &&
+    (typeof obj === 'object' || typeof obj === 'function') &&
+    // @ts-expect-error -- not updating because this came direclty from the npm
+    typeof obj.then === 'function'
+  );
+}
+
+export interface AsyncButtonProps<T> extends ButtonProps {
+  onClick: (e: React.MouseEvent<HTMLButtonElement>) => Promise<T>;
+  loadingNode?: ReactNode;
+}
+
+export const AsyncButton = <T extends unknown>({
+  onClick,
+  disabled,
+  loadingNode,
+  children,
+  ...props
+}: AsyncButtonProps<T>) => {
+  const [loading, setLoading] = useState(false);
+  const asyncHandler = useCallback(async event => {
+    const result = onClick(event);
+
+    if (isPromise(result)) {
+      try {
+        setLoading(true);
+        await result;
+      } finally {
+        setLoading(false);
+      }
+    }
+  }, [onClick]);
+
+  return (
+    <Button
+      {...props}
+      onClick={asyncHandler}
+      disabled={loading || disabled}
+    >
+      {(loading && loadingNode) || children}
+    </Button>
+  );
+};
diff --git a/packages/insomnia-components/components/button/button.stories.js b/packages/insomnia-components/src/button/button.stories.tsx
similarity index 73%
rename from packages/insomnia-components/components/button/button.stories.js
rename to packages/insomnia-components/src/button/button.stories.tsx
index 6567c2581e..2a2f970ed7 100644
--- a/packages/insomnia-components/components/button/button.stories.js
+++ b/packages/insomnia-components/src/button/button.stories.tsx
@@ -1,9 +1,8 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment } from 'react';
 import { select, number, withKnobs } from '@storybook/addon-knobs';
 import { Button } from './index';
 import styled from 'styled-components';
-import SvgIcon, { IconEnum } from '../svg-icon';
+import { SvgIcon, IconEnum } from '../svg-icon';
 import { ButtonSizeEnum, ButtonThemeEnum, ButtonVariantEnum } from './button';
 
 export default {
@@ -11,7 +10,7 @@ export default {
   decorators: [withKnobs],
 };
 
-const Wrapper: React.ComponentType<any> = styled.div`
+const Wrapper = styled.div`
   display: flex;
 
   & > * {
@@ -19,22 +18,25 @@ const Wrapper: React.ComponentType<any> = styled.div`
     margin-top: 0.8rem;
   }
 `;
+
 Wrapper.displayName = '...';
 
-const Padded: React.ComponentType<any> = styled.div`
+const Padded = styled.div`
   margin: 2rem auto;
 `;
+
 Padded.displayName = '...';
 
 const selectRadius = () => `${number('Radius (px)', 3)}px`;
 
 export const outlined = () => (
   <Button
-    variant={select('Variant', ButtonVariantEnum)}
-    size={select('Size', ButtonSizeEnum)}
+    variant={select('Variant', ButtonVariantEnum, 'outlined')}
+    size={select('Size', ButtonSizeEnum, 'default')}
     radius={selectRadius()}
     onClick={() => window.alert('Clicked!')}
-    bg={select('Background', ButtonThemeEnum)}>
+    bg={select('Background', ButtonThemeEnum, 'default')}
+  >
     Outlined
   </Button>
 );
@@ -44,7 +46,8 @@ export const text = () => (
     variant={select('Variant', ButtonVariantEnum, ButtonVariantEnum.Text)}
     radius={selectRadius()}
     onClick={() => window.alert('Clicked!')}
-    bg={select('Background', ButtonThemeEnum)}>
+    bg={select('Background', ButtonThemeEnum, 'default')}
+  >
     Text
   </Button>
 );
@@ -53,7 +56,8 @@ export const contained = () => (
   <Button
     variant={select('Variant', ButtonVariantEnum, ButtonVariantEnum.Contained)}
     onClick={() => window.alert('Clicked!')}
-    bg={select('Background', ButtonThemeEnum)}>
+    bg={select('Background', ButtonThemeEnum, 'default')}
+  >
     Contained
   </Button>
 );
@@ -61,9 +65,10 @@ export const contained = () => (
 export const disabled = () => (
   <Button
     onClick={() => window.alert('Clicked!')}
-    bg={select('Background', ButtonThemeEnum)}
+    bg={select('Background', ButtonThemeEnum, 'default')}
     radius={selectRadius()}
-    disabled>
+    disabled
+  >
     Can't Touch This
   </Button>
 );
@@ -71,21 +76,21 @@ export const disabled = () => (
 export const withIcon = () => (
   <Button
     onClick={() => window.alert('Clicked!')}
-    bg={select('Background', ButtonThemeEnum)}
-    radius={selectRadius()}>
+    bg={select('Background', ButtonThemeEnum, 'default')}
+    radius={selectRadius()}
+  >
     Expand <SvgIcon icon={IconEnum.chevronDown} />
   </Button>
 );
 
 export const reference = () => {
   const radius = selectRadius();
-
   return (
-    <React.Fragment>
+    <Fragment>
       {Object.values(ButtonSizeEnum).map(s => (
         <Padded>
           <h2>
-            <code>size={(s: any)}</code>
+            <code>size={s as any}</code>
           </h2>
           {Object.values(ButtonVariantEnum).map(v => (
             <Wrapper>
@@ -98,6 +103,6 @@ export const reference = () => {
           ))}
         </Padded>
       ))}
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/insomnia-components/components/button/button.js b/packages/insomnia-components/src/button/button.tsx
similarity index 81%
rename from packages/insomnia-components/components/button/button.js
rename to packages/insomnia-components/src/button/button.tsx
index 9ae62e5ab9..31e307bd69 100644
--- a/packages/insomnia-components/components/button/button.js
+++ b/packages/insomnia-components/src/button/button.tsx
@@ -1,18 +1,18 @@
-// @flow
-import * as React from 'react';
+import { ValueOf } from 'type-fest';
+import React, { ButtonHTMLAttributes, FunctionComponent } from 'react';
 import styled, { css } from 'styled-components';
 
 export const ButtonSizeEnum = {
   Default: 'default',
   Small: 'small',
   Medium: 'medium',
-};
+} as const;
 
 export const ButtonVariantEnum = {
   Outlined: 'outlined',
   Contained: 'contained',
   Text: 'text',
-};
+} as const;
 
 export const ButtonThemeEnum = {
   Default: 'default',
@@ -22,16 +22,16 @@ export const ButtonThemeEnum = {
   Notice: 'notice',
   Warning: 'warning',
   Danger: 'danger',
-};
+} as const;
 
-export type ButtonProps = React.ElementProps<'button'> & {
-  bg?: $Values<typeof ButtonThemeEnum>,
-  variant?: $Values<typeof ButtonVariantEnum>,
-  size?: $Values<typeof ButtonSizeEnum>,
-  radius?: string,
-};
+export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
+  bg?: ValueOf<typeof ButtonThemeEnum>;
+  variant?: ValueOf<typeof ButtonVariantEnum>;
+  size?: ValueOf<typeof ButtonSizeEnum>;
+  radius?: string;
+}
 
-const StyledButton: React.ComponentType<ButtonProps> = styled.button`
+const StyledButton = styled.button<ButtonProps>`
   color: ${({ bg }) => (bg ? `var(--color-${bg})` : 'var(--color-font)')};
   text-align: center;
   font-size: var(--font-size-sm);
@@ -53,12 +53,14 @@ const StyledButton: React.ComponentType<ButtonProps> = styled.button`
           height: calc(var(--line-height-xs) * 0.8);
           font-size: var(--font-size-sm);
         `;
+
       case 'medium':
         return css`
           padding: 0 var(--padding-md);
           height: calc(var(--line-height-md) * 0.8);
           font-size: var(--font-size-md);
         `;
+
       default:
         return css`
           padding: 0 var(--padding-md);
@@ -132,12 +134,18 @@ const StyledButton: React.ComponentType<ButtonProps> = styled.button`
   }
 `;
 
-export const Button = ({ variant, bg, size, radius, ...props }: ButtonProps) => (
+export const Button: FunctionComponent<ButtonProps> = ({
+  variant = 'outlined',
+  bg = 'default',
+  size = 'default',
+  radius = '3px',
+  ...props
+}) => (
   <StyledButton
     {...props}
-    variant={variant || 'outlined'}
-    bg={bg || 'default'}
-    size={size || 'default'}
-    radius={radius || '3px'}
+    variant={variant}
+    bg={bg}
+    size={size}
+    radius={radius}
   />
 );
diff --git a/packages/insomnia-components/components/button/circle-button.stories.js b/packages/insomnia-components/src/button/circle-button.stories.tsx
similarity index 82%
rename from packages/insomnia-components/components/button/circle-button.stories.js
rename to packages/insomnia-components/src/button/circle-button.stories.tsx
index 657271c99a..fd552bfc53 100644
--- a/packages/insomnia-components/components/button/circle-button.stories.js
+++ b/packages/insomnia-components/src/button/circle-button.stories.tsx
@@ -1,7 +1,6 @@
-// @flow
-import * as React from 'react';
+import React from 'react';
 import { number, select, withKnobs } from '@storybook/addon-knobs';
-import SvgIcon, { IconEnum } from '../svg-icon';
+import { SvgIcon, IconEnum } from '../svg-icon';
 import { CircleButton } from './circle-button';
 import { ButtonThemeEnum, ButtonVariantEnum } from './button';
 
@@ -11,6 +10,7 @@ export default {
 };
 
 const selectWidth = () => `${number('Width (px)', 32)}px`;
+
 const selectHeight = () => `${number('Height (px)', 32)}px`;
 
 export const disabled = () => (
@@ -33,8 +33,8 @@ export const dimensions = () => {
       onClick={() => window.alert('Clicked!')}
       width={selectWidth()}
       height={selectHeight()}
-      variant={select('Variant', ButtonVariantEnum)}
-      bg={select('Background', ButtonThemeEnum)}>
+      variant={select('Variant', ButtonVariantEnum, 'outlined')}
+      bg={select('Background', ButtonThemeEnum, 'default')}>
       <SvgIcon icon={select('Icon', IconEnum, IconEnum.gear)} />
     </CircleButton>
   );
diff --git a/packages/insomnia-components/components/button/circle-button.js b/packages/insomnia-components/src/button/circle-button.tsx
similarity index 56%
rename from packages/insomnia-components/components/button/circle-button.js
rename to packages/insomnia-components/src/button/circle-button.tsx
index 4187605ac4..f39409f00d 100644
--- a/packages/insomnia-components/components/button/circle-button.js
+++ b/packages/insomnia-components/src/button/circle-button.tsx
@@ -1,16 +1,14 @@
-// @flow
-
-import * as React from 'react';
+import React, { FunctionComponent } from 'react';
 import styled, { css } from 'styled-components';
 import { Button } from './button';
 import type { ButtonProps } from './button';
 
-type Props = {
-  height?: string,
-  width?: string,
-} & ButtonProps;
+export interface CircleButtonProps extends ButtonProps {
+  height?: string;
+  width?: string;
+}
 
-const StyledCircleButton: React.ComponentType<Props> = styled(Button)`
+const StyledCircleButton = styled(Button)<CircleButtonProps>`
   padding: unset;
   font-size: var(--font-size-xl);
   border-radius: 50%;
@@ -28,4 +26,4 @@ const StyledCircleButton: React.ComponentType<Props> = styled(Button)`
   }
 `;
 
-export const CircleButton = (props: Props) => <StyledCircleButton {...props} />;
+export const CircleButton: FunctionComponent<CircleButtonProps> = props => <StyledCircleButton {...props} />;
diff --git a/packages/insomnia-components/src/button/index.ts b/packages/insomnia-components/src/button/index.ts
new file mode 100644
index 0000000000..6ea18d1d91
--- /dev/null
+++ b/packages/insomnia-components/src/button/index.ts
@@ -0,0 +1,3 @@
+export { Button, ButtonProps, ButtonSizeEnum, ButtonThemeEnum, ButtonVariantEnum } from './button';
+export { AsyncButton, AsyncButtonProps } from './async-button';
+export { CircleButton, CircleButtonProps } from './circle-button';
diff --git a/packages/insomnia-components/src/card-container.tsx b/packages/insomnia-components/src/card-container.tsx
new file mode 100644
index 0000000000..d956215903
--- /dev/null
+++ b/packages/insomnia-components/src/card-container.tsx
@@ -0,0 +1,14 @@
+import React, { PureComponent } from 'react';
+import styled from 'styled-components';
+
+const Cards = styled.div`
+  display: flex;
+  flex-wrap: wrap;
+  padding-top: var(--padding-md);
+`;
+
+export class CardContainer extends PureComponent {
+  render() {
+    return <Cards {...this.props} />;
+  }
+}
diff --git a/packages/insomnia-components/components/card.stories.js b/packages/insomnia-components/src/card.stories.tsx
similarity index 97%
rename from packages/insomnia-components/components/card.stories.js
rename to packages/insomnia-components/src/card.stories.tsx
index 091fab09e9..5df45406ff 100644
--- a/packages/insomnia-components/components/card.stories.js
+++ b/packages/insomnia-components/src/card.stories.tsx
@@ -1,9 +1,8 @@
 import React from 'react';
-import Card from './card';
-import CardContainer from './card-container';
+import { Card } from './card';
+import { CardContainer } from './card-container';
 import { boolean, text, withKnobs } from '@storybook/addon-knobs';
-import { SvgIcon } from '../index';
-import { IconEnum } from './svg-icon';
+import { SvgIcon, IconEnum } from './svg-icon';
 
 export default {
   title: 'Navigation | Card',
diff --git a/packages/insomnia-components/components/card.js b/packages/insomnia-components/src/card.tsx
similarity index 87%
rename from packages/insomnia-components/components/card.js
rename to packages/insomnia-components/src/card.tsx
index 040ccf6bcf..fddab3b8e8 100644
--- a/packages/insomnia-components/components/card.js
+++ b/packages/insomnia-components/src/card.tsx
@@ -1,26 +1,26 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import styled from 'styled-components';
-import SvgIcon, { IconEnum } from './svg-icon';
+import { SvgIcon, IconEnum } from './svg-icon';
 
-type Props = {
-  docBranch: string,
-  docLog: string,
-  docMenu: React.Node,
-  docTitle: string,
-  docVersion: string,
-  docFormat: string,
-  tagLabel: string,
+export interface CardProps {
+  docBranch?: ReactNode;
+  docLog?: ReactNode;
+  docMenu?: ReactNode;
+  docTitle?: ReactNode;
+  docVersion?: ReactNode;
+  tagLabel: ReactNode;
+  docFormat?: ReactNode;
+  onChange?: (e: React.SyntheticEvent<HTMLInputElement>) => any;
+  onClick?: (e: React.SyntheticEvent<HTMLDivElement>) => any;
+  selectable?: boolean;
+}
 
-  onChange?: (e: SyntheticEvent<HTMLInputElement>) => any,
-  onClick?: (e: SyntheticEvent<HTMLDivElement>) => any,
-  selectable?: boolean,
-};
-type State = {
-  selected: boolean,
-};
+interface State {
+  selected: boolean;
+  selectable: boolean;
+}
 
-const StyledCard: React.ComponentType<{}> = styled.div`
+const StyledCard = styled.div`
   & {
     transition: all 0.1s ease-out;
   }
@@ -68,7 +68,7 @@ const StyledCard: React.ComponentType<{}> = styled.div`
   }
 `;
 
-const CardHeader: React.ComponentType<{}> = styled.div`
+const CardHeader = styled.div`
   text-align: left;
   padding-top: var(--padding-md);
   padding-right: 0;
@@ -176,7 +176,7 @@ const CardHeader: React.ComponentType<{}> = styled.div`
   }
 `;
 
-const CardBody: React.ComponentType<{}> = styled.div`
+const CardBody = styled.div`
   justify-content: normal;
   font-weight: 400;
   color: var(--font-color);
@@ -193,7 +193,7 @@ const CardBody: React.ComponentType<{}> = styled.div`
   }
 `;
 
-const CardFooter: React.ComponentType<{}> = styled.div`
+const CardFooter = styled.div`
   margin-top: auto;
   padding-left: var(--padding-md);
   padding-bottom: var(--padding-sm);
@@ -222,14 +222,17 @@ const CardFooter: React.ComponentType<{}> = styled.div`
   }
 `;
 
-class Card extends React.PureComponent<Props, State> {
-  state = {
+export class Card extends PureComponent<CardProps, State> {
+  state: State = {
     selected: false,
     selectable: false,
   };
 
-  _handleOnChange(e: SyntheticInputEvent<HTMLInputElement>) {
-    this.setState({ selected: !this.state.selected });
+  _handleOnChange(e: React.SyntheticEvent<HTMLInputElement>) {
+    this.setState({
+      selected: !this.state.selected,
+    });
+
     if (this.props.onChange) {
       this.props.onChange(e);
     }
@@ -247,7 +250,6 @@ class Card extends React.PureComponent<Props, State> {
       selectable,
       onClick,
     } = this.props;
-
     return (
       <StyledCard className={this.state.selected ? 'selected' : 'deselected'} onClick={onClick}>
         <CardHeader>
@@ -295,5 +297,3 @@ class Card extends React.PureComponent<Props, State> {
     );
   }
 }
-
-export default Card;
diff --git a/packages/insomnia-components/components/dropdown/dropdown-divider.js b/packages/insomnia-components/src/dropdown/dropdown-divider.tsx
similarity index 80%
rename from packages/insomnia-components/components/dropdown/dropdown-divider.js
rename to packages/insomnia-components/src/dropdown/dropdown-divider.tsx
index bdc878c249..9caa6181cc 100644
--- a/packages/insomnia-components/components/dropdown/dropdown-divider.js
+++ b/packages/insomnia-components/src/dropdown/dropdown-divider.tsx
@@ -1,8 +1,7 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import styled, { css } from 'styled-components';
 
-const StyledDivider = styled.div`
+const StyledDivider = styled.div<{ hasName: boolean }>`
   border-bottom: 1px solid var(--hl-lg);
   overflow: visible !important;
   height: 0;
@@ -26,7 +25,7 @@ const StyledLabel = styled.span`
   font-family: var(--font-default);
 `;
 
-class DropdownDivider extends PureComponent {
+export class DropdownDivider extends PureComponent {
   render() {
     const { children } = this.props;
     return (
@@ -36,9 +35,3 @@ class DropdownDivider extends PureComponent {
     );
   }
 }
-
-DropdownDivider.propTypes = {
-  children: PropTypes.node,
-};
-
-export default DropdownDivider;
diff --git a/packages/insomnia-components/components/dropdown/dropdown-item.js b/packages/insomnia-components/src/dropdown/dropdown-item.tsx
similarity index 72%
rename from packages/insomnia-components/components/dropdown/dropdown-item.js
rename to packages/insomnia-components/src/dropdown/dropdown-item.tsx
index 01f0a38897..4409391baa 100644
--- a/packages/insomnia-components/components/dropdown/dropdown-item.js
+++ b/packages/insomnia-components/src/dropdown/dropdown-item.tsx
@@ -1,9 +1,22 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
+import React, { PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import styled, { css } from 'styled-components';
 
-const StyledButton = styled.button`
+export interface DropdownItemProps {
+  buttonClass?: string,
+  stayOpenAfterClick?: boolean,
+  value?: any,
+  disabled?: boolean,
+  onClick?: Function,
+  children?: ReactNode,
+  icon?: ReactNode,
+  right?: ReactNode,
+  className?: string,
+  color?: string,
+  selected?: boolean,
+}
+
+const StyledButton = styled.button<{ selected?: boolean }>`
   display: flex;
   align-items: center;
   min-width: 15rem;
@@ -28,12 +41,10 @@ const StyledButton = styled.button`
     background: var(--hl-md);
   }
 
-  ${({ selected }) =>
-    selected &&
-    css`
-      background: var(--hl-xs) !important;
-      font-weight: bold;
-    `};
+  ${({ selected }) => selected && css`
+    background: var(--hl-xs) !important;
+    font-weight: bold;
+  `};
 
   &:disabled {
     opacity: 0.5;
@@ -75,12 +86,12 @@ const StyledIconContainer = styled.div`
 `;
 
 @autoBindMethodsForReact
-class DropdownItem extends PureComponent {
-  _handleClick(e) {
+export class DropdownItem extends PureComponent<DropdownItemProps> {
+  _handleClick(event: React.MouseEvent<HTMLButtonElement>) {
     const { stayOpenAfterClick, onClick, disabled } = this.props;
 
     if (stayOpenAfterClick) {
-      e.stopPropagation();
+      event.stopPropagation();
     }
 
     if (!onClick || disabled) {
@@ -88,9 +99,9 @@ class DropdownItem extends PureComponent {
     }
 
     if (this.props.hasOwnProperty('value')) {
-      onClick(this.props.value, e);
+      onClick(this.props.value, event);
     } else {
-      onClick(e);
+      onClick(event);
     }
   }
 
@@ -103,8 +114,10 @@ class DropdownItem extends PureComponent {
       disabled,
       right,
       icon,
-      onClick, // eslint-disable-line no-unused-vars
-      stayOpenAfterClick, // eslint-disable-line no-unused-vars
+      onClick,
+      // eslint-disable-line no-unused-vars
+      stayOpenAfterClick,
+      // eslint-disable-line no-unused-vars
       ...props
     } = this.props;
 
@@ -115,7 +128,6 @@ class DropdownItem extends PureComponent {
         <StyledText style={styles}>{children}</StyledText>
       </StyledInner>
     );
-
     return (
       <StyledButton
         className={buttonClass}
@@ -130,19 +142,3 @@ class DropdownItem extends PureComponent {
     );
   }
 }
-
-DropdownItem.propTypes = {
-  buttonClass: PropTypes.any,
-  stayOpenAfterClick: PropTypes.bool,
-  value: PropTypes.any,
-  disabled: PropTypes.bool,
-  onClick: PropTypes.func,
-  children: PropTypes.node,
-  icon: PropTypes.node,
-  right: PropTypes.node,
-  className: PropTypes.string,
-  color: PropTypes.string,
-  selected: PropTypes.bool,
-};
-
-export default DropdownItem;
diff --git a/packages/insomnia-components/components/dropdown/dropdown.stories.js b/packages/insomnia-components/src/dropdown/dropdown.stories.tsx
similarity index 89%
rename from packages/insomnia-components/components/dropdown/dropdown.stories.js
rename to packages/insomnia-components/src/dropdown/dropdown.stories.tsx
index e0bfde4975..66183edf9f 100644
--- a/packages/insomnia-components/components/dropdown/dropdown.stories.js
+++ b/packages/insomnia-components/src/dropdown/dropdown.stories.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { number, withKnobs } from '@storybook/addon-knobs';
-import Dropdown from './dropdown';
-import DropdownItem from './dropdown-item';
-import DropdownDivider from './dropdown-divider';
-import SvgIcon from '../svg-icon';
+import { Dropdown } from './dropdown';
+import { DropdownItem } from './dropdown-item';
+import { DropdownDivider } from './dropdown-divider';
+import { SvgIcon } from '../svg-icon';
 import { Button } from '../button';
 
 export default {
@@ -17,7 +17,8 @@ export const _default = () => (
       <Button>
         Dropdown <SvgIcon icon={open ? 'chevron-up' : 'chevron-down'} />
       </Button>
-    )}>
+    )}
+  >
     <DropdownDivider>Awesome Dropdown</DropdownDivider>
     <DropdownItem icon={<SvgIcon icon="clock" />}>Check Time</DropdownItem>
     <DropdownItem icon={<SvgIcon icon="git-branch" />} right="CTRL+A">
@@ -39,7 +40,8 @@ export const rightAlign = () => (
       <Button>
         Right Align <SvgIcon icon="chevron-down" />
       </Button>
-    )}>
+    )}
+  >
     <DropdownItem>Item 1</DropdownItem>
     <DropdownItem>Item 2</DropdownItem>
     <DropdownItem>Item 3</DropdownItem>
@@ -49,6 +51,7 @@ export const rightAlign = () => (
 export const manyItems = () => {
   const items = [];
   const numItems = number('Num Items', 100);
+
   for (let i = 0; i < numItems; i++) {
     items.push(<DropdownItem key={i}>Item {i + 1}</DropdownItem>);
   }
diff --git a/packages/insomnia-components/components/dropdown/dropdown.js b/packages/insomnia-components/src/dropdown/dropdown.tsx
similarity index 67%
rename from packages/insomnia-components/components/dropdown/dropdown.js
rename to packages/insomnia-components/src/dropdown/dropdown.tsx
index c97a2a08eb..d210bca3ec 100644
--- a/packages/insomnia-components/components/dropdown/dropdown.js
+++ b/packages/insomnia-components/src/dropdown/dropdown.tsx
@@ -1,13 +1,33 @@
-import React, { PureComponent } from 'react';
+import React, {
+  CSSProperties,
+  Fragment,
+  PureComponent,
+  ReactChild,
+  ReactFragment,
+  ReactNode,
+  ReactPortal,
+} from 'react';
 import ReactDOM from 'react-dom';
 import fuzzySort from 'fuzzysort';
-import PropTypes from 'prop-types';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import classnames from 'classnames';
-import DropdownItem from './dropdown-item';
-import DropdownDivider from './dropdown-divider';
+import { DropdownItem } from './dropdown-item';
+import { DropdownDivider } from './dropdown-divider';
 import styled, { css } from 'styled-components';
-import SvgIcon from '../svg-icon';
+import { SvgIcon } from '../svg-icon';
+
+export interface DropdownProps {
+  children: ReactNode;
+  renderButton: ReactNode | ((props: { open: boolean }) => void);
+  right?: boolean;
+  outline?: boolean;
+  wide?: boolean;
+  onOpen?: () => void;
+  onHide?: () => void;
+  className?: string;
+  style?: CSSProperties;
+  beside?: boolean;
+}
 
 const StyledDropdown = styled.div`
   position: relative;
@@ -36,7 +56,7 @@ const StyledBackdrop = styled.div`
   content: ' ';
 `;
 
-const StyledFilter = styled.div`
+const StyledFilter = styled.div<{ filtering: boolean }>`
   border: 1px solid var(--hl-md);
   margin: var(--padding-xs);
   width: auto;
@@ -109,42 +129,57 @@ const StyledMenu = styled.div`
   }
 `;
 
+interface State {
+  open: boolean;
+  dropUp: boolean;
+  filter: string;
+  filterVisible: boolean;
+  filterItems: number[] | null;
+  filterActiveIndex: number;
+  forcedPosition: null | {
+    x: number;
+    y: number;
+  };
+  uniquenessKey: number;
+}
+
 @autoBindMethodsForReact
-class Dropdown extends PureComponent {
-  constructor(props) {
+export class Dropdown extends PureComponent<DropdownProps, State> {
+  // Save body overflow so we can revert it when needed
+  defaultBodyOverflow = document.body.style.overflow;
+  dropdownsContainer: HTMLElement | null = null;
+  _dropdownList: HTMLDivElement | null = null;
+  _cachedMinWidth: string | null = null;
+  _node: HTMLDivElement | null = null;
+  _filter: HTMLInputElement | null = null;
+
+  state: State = {
+    open: false,
+    dropUp: false,
+    // Filter Stuff
+    filter: '',
+    filterVisible: false,
+    filterItems: null,
+    filterActiveIndex: 0,
+    // Position
+    forcedPosition: null,
+    // Use this to force new menu every time dropdown opens
+    uniquenessKey: 0,
+  }
+
+  constructor(props: DropdownProps) {
     super(props);
-
-    this.state = {
-      open: false,
-      dropUp: false,
-
-      // Filter Stuff
-      filter: '',
-      filterVisible: false,
-      filterItems: null,
-      filterActiveIndex: 0,
-
-      // Position
-      forcedPosition: null,
-
-      // Use this to force new menu every time dropdown opens
-      uniquenessKey: 0,
-    };
-
-    // Save body overflow so we can revert it when needed
-    this.defaultBodyOverflow = document.body.style.overflow;
-
     this.dropdownsContainer = document.querySelector('#dropdowns-container');
+
     if (!this.dropdownsContainer) {
       this.dropdownsContainer = document.createElement('div');
       this.dropdownsContainer.id = 'dropdowns-container';
+      // @ts-expect-error -- TSCONVERSION
       this.dropdownsContainer.style = [
         // Position off-screen so we don't see it
         'position: fixed',
         'right: -90000px',
-        'left: -90000px',
-
-        // Make same size as viewport so we can use it to calculate the
+        'left: -90000px', // Make same size as viewport so we can use it to calculate the
         // position of the dropdown accurately.
         'width: 100vw',
         'height: 100vh',
@@ -153,21 +188,17 @@ class Dropdown extends PureComponent {
     }
   }
 
-  _setRef(n) {
-    this._node = n;
-  }
-
-  _handleCheckFilterSubmit(e) {
+  _handleCheckFilterSubmit(e: React.KeyboardEvent<HTMLInputElement>) {
     if (e.key === 'Enter') {
       // Listen for the Enter key and "click" on the active list item
       const selector = `li[data-filter-index="${this.state.filterActiveIndex}"] button`;
-      const button = this._dropdownList.querySelector(selector);
-      button && button.click();
+      this._dropdownList?.querySelector<HTMLButtonElement>(selector)?.click();
     }
   }
 
-  _handleChangeFilter(e) {
-    const newFilter = e.target.value;
+  _handleChangeFilter(event: React.FormEvent<HTMLInputElement>) {
+    // @ts-expect-error -- TSCONVERSION
+    const newFilter = event.target.value;
 
     // Nothing to do if the filter didn't change
     if (newFilter === this.state.filter) {
@@ -176,7 +207,9 @@ class Dropdown extends PureComponent {
 
     // Filter the list items that are filterable (have data-filter-index property)
     const filterItems = [];
-    for (const listItem of this._dropdownList.querySelectorAll('li')) {
+
+    // @ts-expect-error -- TSCONVERSION
+    for (const listItem of (this._dropdownList?.querySelectorAll('li') || [])) {
       if (!listItem.hasAttribute('data-filter-index')) {
         continue;
       }
@@ -197,16 +230,17 @@ class Dropdown extends PureComponent {
     });
   }
 
-  _handleDropdownNavigation(e) {
-    const { key, shiftKey } = e;
-
+  _handleDropdownNavigation(event: React.KeyboardEvent<HTMLDivElement>) {
+    const { key, shiftKey } = event;
     // Handle tab and arrows to move up and down dropdown entries
     const { filterItems, filterActiveIndex } = this.state;
+
     if (['Tab', 'ArrowDown', 'ArrowUp'].includes(key)) {
-      e.preventDefault();
+      event.preventDefault();
       const items = filterItems || [];
+
       if (!filterItems) {
-        for (const li of this._dropdownList.querySelectorAll('li')) {
+        for (const li of (this._dropdownList?.querySelectorAll('li') || [])) {
           if (li.hasAttribute('data-filter-index')) {
             const filterIndex = li.getAttribute('data-filter-index');
             items.push(parseInt(filterIndex, 10));
@@ -215,28 +249,33 @@ class Dropdown extends PureComponent {
       }
 
       const i = items.indexOf(filterActiveIndex);
+
       if (key === 'ArrowUp' || (key === 'Tab' && shiftKey)) {
         const nextI = i > 0 ? items[i - 1] : items[items.length - 1];
-        this.setState({ filterActiveIndex: nextI });
+        this.setState({
+          filterActiveIndex: nextI,
+        });
       } else {
-        this.setState({ filterActiveIndex: items[i + 1] || items[0] });
+        this.setState({
+          filterActiveIndex: items[i + 1] || items[0],
+        });
       }
     }
 
-    this._filter.focus();
+    this._filter?.focus();
   }
 
-  _handleKeyDown(e) {
+  _handleKeyDown(event: React.KeyboardEvent<HTMLDivElement>) {
     if (!this.state.open) {
       return;
     }
 
     // Catch all key presses (like global app hotkeys) if we're open
-    e.stopPropagation();
+    event.stopPropagation();
 
-    this._handleDropdownNavigation(e);
+    this._handleDropdownNavigation(event);
 
-    if (e.key === 'Escape') {
+    if (event.key === 'Escape') {
       this.hide();
     }
   }
@@ -250,12 +289,13 @@ class Dropdown extends PureComponent {
     const dropdownList = this._dropdownList;
 
     // Compute the size of all the menus
-    let dropdownBtnRect = this._node.getBoundingClientRect();
-    const bodyRect = this.dropdownsContainer.getBoundingClientRect();
-    const dropdownListRect = dropdownList.getBoundingClientRect();
+    let dropdownBtnRect = this._node?.getBoundingClientRect();
 
+    const bodyRect = this.dropdownsContainer?.getBoundingClientRect();
+    const dropdownListRect = dropdownList.getBoundingClientRect();
     const { forcedPosition } = this.state;
-    if (forcedPosition) {
+
+    if (forcedPosition && bodyRect !== undefined) {
       dropdownBtnRect = {
         left: forcedPosition.x,
         right: bodyRect.width - forcedPosition.x,
@@ -263,14 +303,16 @@ class Dropdown extends PureComponent {
         bottom: bodyRect.height - forcedPosition.y,
         width: 100,
         height: 10,
+        x: 0,
+        y: 0,
+        toJSON: () => {},
       };
     }
 
     // Should it drop up?
-    const bodyHeight = bodyRect.height;
-    const dropdownTop = dropdownBtnRect.top;
+    const bodyHeight = bodyRect?.height || 0;
+    const dropdownTop = dropdownBtnRect?.top || 0;
     const dropUp = dropdownTop > bodyHeight - 200;
-
     // Reset all the things so we can start fresh
     this._dropdownList.style.left = 'initial';
     this._dropdownList.style.right = 'initial';
@@ -286,14 +328,20 @@ class Dropdown extends PureComponent {
     }
 
     const screenMargin = 6;
-
     const { right, wide } = this.props;
+
+    if (dropdownBtnRect === undefined) {
+      return;
+    }
+
+    if (!bodyRect) {
+      return;
+    }
+
     if (right || wide) {
       const { right: originalRight } = dropdownBtnRect;
-
       // Prevent dropdown from squishing against left side of screen
       const right = Math.max(dropdownListRect.width + screenMargin, originalRight);
-
       const { beside } = this.props;
       const offset = beside ? dropdownBtnRect.width - 40 : 0;
       this._dropdownList.style.right = `${bodyRect.width - right + offset}px`;
@@ -302,13 +350,10 @@ class Dropdown extends PureComponent {
 
     if (!right || wide) {
       const { left: originalLeft } = dropdownBtnRect;
-
       const { beside } = this.props;
       const offset = beside ? dropdownBtnRect.width - 40 : 0;
-
       // Prevent dropdown from squishing against right side of screen
       const left = Math.min(bodyRect.width - dropdownListRect.width - screenMargin, originalLeft);
-
       this._dropdownList.style.left = `${left + offset}px`;
       this._dropdownList.style.maxWidth = `${Math.min(
         dropdownListRect.width,
@@ -327,47 +372,38 @@ class Dropdown extends PureComponent {
     }
   }
 
-  _handleClick(e) {
-    e.preventDefault();
-    e.stopPropagation();
-
+  _handleClick(event: React.MouseEvent<HTMLDivElement>) {
+    event.preventDefault();
+    event.stopPropagation();
     this.toggle();
   }
 
-  static _handleMouseDown(e) {
+  static _handleMouseDown(event: React.MouseEvent<HTMLDivElement>) {
     // Intercept mouse down so that clicks don't trigger things like drag and drop.
-    e.preventDefault();
+    event.preventDefault();
   }
 
-  _addDropdownListRef(n) {
-    this._dropdownList = n;
-  }
+  _getFlattenedChildren(children: ReactNode) {
+    let newChildren: (ReactChild | ReactFragment | ReactPortal)[] = [];
 
-  _addFilterRef(n) {
-    this._filter = n;
-
-    // Automatically focus the filter element when mounted so we can start typing
-    if (this._filter) {
-      this._filter.focus();
-    }
-  }
-
-  _addDropdownMenuRef(n) {
-    this._dropdownMenu = n;
-  }
-
-  _getFlattenedChildren(children) {
-    let newChildren = [];
     for (const child of React.Children.toArray(children)) {
       if (!child) {
         // Ignore null components
         continue;
       }
 
-      if (child.type === React.Fragment) {
-        newChildren = [...newChildren, ...this._getFlattenedChildren(child.props.children)];
+      // @ts-expect-error -- TSCONVERSION
+      if (child.type === Fragment) {
+        newChildren = [
+          ...newChildren,
+          // @ts-expect-error -- TSCONVERSION
+          ...this._getFlattenedChildren(child.props.children),
+        ];
       } else if (Array.isArray(child)) {
-        newChildren = [...newChildren, ...this._getFlattenedChildren(child)];
+        newChildren = [
+          ...newChildren,
+          ...this._getFlattenedChildren(child),
+        ];
       } else {
         newChildren.push(child);
       }
@@ -384,18 +420,22 @@ class Dropdown extends PureComponent {
     // Focus the dropdown button after hiding
     if (this._node) {
       const button = this._node.querySelector('button');
+
       button && button.focus();
     }
 
-    this.setState({ open: false });
+    this.setState({
+      open: false,
+    });
     this.props.onHide && this.props.onHide();
   }
 
   show(filterVisible = false, forcedPosition = null) {
     const bodyHeight = document.body.getBoundingClientRect().height;
-    const dropdownTop = this._node.getBoundingClientRect().top;
-    const dropUp = dropdownTop > bodyHeight - 200;
 
+    const dropdownTop = this._node?.getBoundingClientRect().top || 0;
+
+    const dropUp = dropdownTop > bodyHeight - 200;
     this.setState({
       open: true,
       dropUp,
@@ -406,7 +446,6 @@ class Dropdown extends PureComponent {
       filterActiveIndex: -1,
       uniquenessKey: this.state.uniquenessKey + 1,
     });
-
     this.props.onOpen && this.props.onOpen();
   }
 
@@ -416,7 +455,6 @@ class Dropdown extends PureComponent {
       document.body.style.overflow = this.defaultBodyOverflow;
     } else {
       this.show(filterVisible);
-
       // Prevent body from scrolling when dropdown is open
       document.body.style.overflow = 'hidden';
     }
@@ -424,7 +462,6 @@ class Dropdown extends PureComponent {
 
   render() {
     const { className, style, children, renderButton } = this.props;
-
     const {
       open,
       uniquenessKey,
@@ -433,7 +470,6 @@ class Dropdown extends PureComponent {
       filterItems,
       filter,
     } = this.state;
-
     const menuClasses = classnames({
       'theme--dropdown__menu': true,
     });
@@ -441,6 +477,7 @@ class Dropdown extends PureComponent {
     const allChildren = this._getFlattenedChildren(children);
 
     const visibleChildren = allChildren.filter((child, i) => {
+      // @ts-expect-error -- TSCONVERSION
       if (child.type.name !== DropdownItem.name) {
         return true;
       }
@@ -448,24 +485,33 @@ class Dropdown extends PureComponent {
       // It's visible if its index is in the filterItems
       return !filterItems || filterItems.includes(i);
     });
-
     const dropdownItems = [];
 
     for (let i = 0; i < allChildren.length; i++) {
       const child = allChildren[i];
+
+      // @ts-expect-error -- TSCONVERSION
       if (child.type.name === DropdownItem.name) {
         const active = i === filterActiveIndex;
+
         if (visibleChildren.includes(child)) {
           dropdownItems.push(
-            <li key={i} data-filter-index={i} className={classnames({ active })}>
+            <li
+              key={i}
+              data-filter-index={i}
+              className={classnames({
+                active,
+              })}>
               {child}
             </li>,
           );
         }
+        // @ts-expect-error -- TSCONVERSION
       } else if (child.type.name === DropdownDivider.name) {
         const currentIndex = visibleChildren.indexOf(child);
         const nextChild = visibleChildren[currentIndex + 1];
 
+        // @ts-expect-error -- TSCONVERSION
         // Only show the divider if the next child is a DropdownItem
         if (nextChild && nextChild.type.name === DropdownItem.name) {
           dropdownItems.push(<li key={i}>{child}</li>);
@@ -474,38 +520,58 @@ class Dropdown extends PureComponent {
     }
 
     const noResults = filter && filterItems && filterItems.length === 0;
-
-    const button = typeof renderButton === 'function' ? renderButton({ open }) : renderButton;
+    const button =
+      typeof renderButton === 'function'
+        ? renderButton({
+            open,
+          })
+        : renderButton;
     return (
       <StyledDropdown
         style={style}
         className={className}
-        ref={this._setRef}
+        ref={ref => { this._node = ref; }}
         onClick={this._handleClick}
         onKeyDown={this._handleKeyDown}
-        tabIndex="-1"
-        onMouseDown={Dropdown._handleMouseDown}>
-        <React.Fragment key="button">{button}</React.Fragment>
-        {ReactDOM.createPortal(
+        tabIndex={-1}
+        onMouseDown={Dropdown._handleMouseDown}
+      >
+        <Fragment key="button">{button}</Fragment>
+        {this.dropdownsContainer && ReactDOM.createPortal(
           <div
             key="item"
             className={menuClasses}
-            ref={this._addDropdownMenuRef}
             aria-hidden={!open}>
             {open && <StyledBackdrop className="theme--transparent-overlay" />}
             {open && (
-              <StyledMenu key={uniquenessKey} ref={this._addDropdownListRef} tabIndex="-1">
+              <StyledMenu
+                key={uniquenessKey}
+                ref={ref => { this._dropdownList = ref; }}
+                tabIndex={-1}
+              >
                 <StyledFilter filtering={filterVisible}>
                   <SvgIcon icon="search" />
                   <input
                     type="text"
                     onInput={this._handleChangeFilter}
-                    ref={this._addFilterRef}
+                    ref={ref => {
+                      this._filter = ref;
+
+                      // Automatically focus the filter element when mounted so we can start typing
+                      if (this._filter) {
+                        this._filter.focus();
+                      }
+                    }}
                     onKeyPress={this._handleCheckFilterSubmit}
                   />
                 </StyledFilter>
                 {noResults && <StyledNoResults>No match</StyledNoResults>}
-                <ul className={classnames({ hide: noResults })}>{dropdownItems}</ul>
+                <ul
+                  className={classnames({
+                    hide: noResults,
+                  })}>
+                  {dropdownItems}
+                </ul>
               </StyledMenu>
             )}
           </div>,
@@ -515,21 +581,3 @@ class Dropdown extends PureComponent {
     );
   }
 }
-
-Dropdown.propTypes = {
-  // Required
-  children: PropTypes.node.isRequired,
-  renderButton: PropTypes.oneOfType([PropTypes.node, PropTypes.func]).isRequired,
-
-  // Optional
-  right: PropTypes.bool,
-  outline: PropTypes.bool,
-  wide: PropTypes.bool,
-  onOpen: PropTypes.func,
-  onHide: PropTypes.func,
-  className: PropTypes.string,
-  style: PropTypes.string,
-  beside: PropTypes.bool,
-};
-
-export default Dropdown;
diff --git a/packages/insomnia-components/src/dropdown/index.ts b/packages/insomnia-components/src/dropdown/index.ts
new file mode 100644
index 0000000000..8ede7b4cef
--- /dev/null
+++ b/packages/insomnia-components/src/dropdown/index.ts
@@ -0,0 +1,3 @@
+export { Dropdown, DropdownProps } from './dropdown';
+export { DropdownItem, DropdownItemProps } from './dropdown-item';
+export { DropdownDivider } from './dropdown-divider';
diff --git a/packages/insomnia-components/src/header.stories.tsx b/packages/insomnia-components/src/header.stories.tsx
new file mode 100644
index 0000000000..8acb01a51d
--- /dev/null
+++ b/packages/insomnia-components/src/header.stories.tsx
@@ -0,0 +1,29 @@
+import React, { Fragment } from 'react';
+import { Header } from './header';
+import { Breadcrumb } from './breadcrumb';
+import { Switch } from './switch';
+
+export default {
+  title: 'Layout | Header',
+};
+
+export const _default = () => <Header />;
+
+export const _primary = () => (
+  <Header
+    gridLeft={
+      <Fragment>
+        <Breadcrumb
+          className="breadcrumb"
+          crumbs={['Documents', 'Deployment']}
+        />
+      </Fragment>
+    }
+    gridCenter={<Switch />}
+    gridRight={
+      <Fragment>
+        <div>right</div>
+      </Fragment>
+    }
+  />
+);
diff --git a/packages/insomnia-components/components/header.js b/packages/insomnia-components/src/header.tsx
similarity index 77%
rename from packages/insomnia-components/components/header.js
rename to packages/insomnia-components/src/header.tsx
index 819736b8d5..758ba51bd6 100644
--- a/packages/insomnia-components/components/header.js
+++ b/packages/insomnia-components/src/header.tsx
@@ -1,15 +1,14 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent, ReactNode } from 'react';
 import styled from 'styled-components';
 
-type Props = {|
-  className?: string,
-  gridLeft?: React.Node,
-  gridCenter?: React.Node,
-  gridRight?: React.Node,
-|};
+export interface HeaderProps {
+  className?: string;
+  gridLeft?: ReactNode;
+  gridCenter?: ReactNode;
+  gridRight?: ReactNode;
+}
 
-const StyledHeader: React.ComponentType<{}> = styled.div`
+const StyledHeader = styled.div`
   border-bottom: 1px solid var(--hl-md);
   padding: var(--padding-md);
   display: grid;
@@ -37,7 +36,7 @@ const StyledHeader: React.ComponentType<{}> = styled.div`
   }
 `;
 
-class Header extends React.PureComponent<Props> {
+export class Header extends PureComponent<HeaderProps> {
   render() {
     const { className, gridLeft, gridCenter, gridRight } = this.props;
     return (
@@ -49,5 +48,3 @@ class Header extends React.PureComponent<Props> {
     );
   }
 }
-
-export default Header;
diff --git a/packages/insomnia-components/components/help-tooltip.stories.js b/packages/insomnia-components/src/help-tooltip.stories.tsx
similarity index 78%
rename from packages/insomnia-components/components/help-tooltip.stories.js
rename to packages/insomnia-components/src/help-tooltip.stories.tsx
index 9452f6e626..147f66d40f 100644
--- a/packages/insomnia-components/components/help-tooltip.stories.js
+++ b/packages/insomnia-components/src/help-tooltip.stories.tsx
@@ -1,7 +1,9 @@
 import React from 'react';
-import HelpTooltip from './help-tooltip';
+import { HelpTooltip } from './help-tooltip';
 
-export default { title: 'Helpers | Help Tooltip' };
+export default {
+  title: 'Helpers | Help Tooltip',
+};
 
 export const _question = () => (
   <div>
@@ -23,21 +25,21 @@ export const _onTop = () => (
 
 export const _onRight = () => (
   <div>
-    Hover over the info mark to view
+    Hover over the info mark to view{' '}
     <HelpTooltip position="right">This is the help message</HelpTooltip>
   </div>
 );
 
 export const _onLeft = () => (
   <div>
-    Hover over the info mark to view
+    Hover over the info mark to view{' '}
     <HelpTooltip position="left">This is the help message</HelpTooltip>
   </div>
 );
 
 export const _withDelay = () => (
   <div>
-    Hover over the info mark to view
+    Hover over the info mark to view{' '}
     <HelpTooltip delay={900}> This tooltip had a 900ms delay</HelpTooltip>
   </div>
 );
diff --git a/packages/insomnia-components/components/help-tooltip.js b/packages/insomnia-components/src/help-tooltip.tsx
similarity index 50%
rename from packages/insomnia-components/components/help-tooltip.js
rename to packages/insomnia-components/src/help-tooltip.tsx
index 278fbe8564..3e96534f34 100644
--- a/packages/insomnia-components/components/help-tooltip.js
+++ b/packages/insomnia-components/src/help-tooltip.tsx
@@ -1,22 +1,19 @@
-// @flow
-import * as React from 'react';
+import React, { CSSProperties, PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
-import Tooltip from './tooltip';
-import SvgIcon from './svg-icon';
+import { Tooltip } from './tooltip';
+import { SvgIcon } from './svg-icon';
 
-type Props = {
-  children: React.Node,
-
-  // Optional
-  position?: 'bottom' | 'top' | 'right' | 'left',
-  delay?: number,
-  className?: string,
-  style?: Object,
-  info?: boolean,
-};
+interface Props {
+  children: ReactNode;
+  position?: 'bottom' | 'top' | 'right' | 'left';
+  delay?: number;
+  className?: string;
+  style?: CSSProperties;
+  info?: boolean;
+}
 
 @autoBindMethodsForReact
-class HelpTooltip extends React.PureComponent<Props> {
+export class HelpTooltip extends PureComponent<Props> {
   render() {
     const { children, className, style, info, position, delay } = this.props;
     return (
@@ -25,11 +22,10 @@ class HelpTooltip extends React.PureComponent<Props> {
         delay={delay}
         className={className}
         message={children}
-        style={style}>
+        style={style}
+      >
         {info ? <SvgIcon icon="info" /> : <SvgIcon icon="question" />}
       </Tooltip>
     );
   }
 }
-
-export default HelpTooltip;
diff --git a/packages/insomnia-components/src/index.ts b/packages/insomnia-components/src/index.ts
new file mode 100644
index 0000000000..edac6f06df
--- /dev/null
+++ b/packages/insomnia-components/src/index.ts
@@ -0,0 +1,27 @@
+export * from './button';
+export * from './dropdown';
+export * from './sidebar';
+export * from './list-group';
+
+export { Breadcrumb, BreadcrumbProps } from './breadcrumb';
+export { CardContainer } from './card-container';
+export { Card, CardProps } from './card';
+export { Header, HeaderProps } from './header';
+export { MultiSwitch } from './multi-switch';
+export { NoticeTable, NoticeTableProps } from './notice-table';
+export { RadioButtonGroup, RadioButtonGroupProps } from './radio-button-group';
+export { SvgIcon, SvgIconProps, IconEnum, ThemeEnum, IconId } from './svg-icon';
+export { Switch, SwitchProps, SwitchItem } from './switch';
+export {
+  Table,
+  TableProps,
+  TableBody,
+  TableData,
+  TableDataProps,
+  TableHead,
+  TableHeader,
+  TableHeaderProps,
+  TableRow,
+} from './table';
+export { ToggleSwitch, ToggleSwitchProps } from './toggle-switch';
+export { Tooltip, TooltipProps } from './tooltip';
diff --git a/packages/insomnia-components/__jest__/setup-after-env.js b/packages/insomnia-components/src/jest/setup-after-env.ts
similarity index 58%
rename from packages/insomnia-components/__jest__/setup-after-env.js
rename to packages/insomnia-components/src/jest/setup-after-env.ts
index 666127af39..22c352d6a0 100644
--- a/packages/insomnia-components/__jest__/setup-after-env.js
+++ b/packages/insomnia-components/src/jest/setup-after-env.ts
@@ -1 +1,2 @@
+import '@testing-library/jest-dom';
 import '@testing-library/jest-dom/extend-expect';
diff --git a/packages/insomnia-components/src/list-group/index.ts b/packages/insomnia-components/src/list-group/index.ts
new file mode 100644
index 0000000000..eb0a2f048b
--- /dev/null
+++ b/packages/insomnia-components/src/list-group/index.ts
@@ -0,0 +1,7 @@
+export { ListGroupItem, ListGroupItemProps } from './list-group-item';
+export { ListGroup, ListGroupProps } from './list-group';
+export { UnitTestItem, UnitTestItemProps, TestItem } from './unit-test-item';
+export { UnitTestRequestSelector, UnitTestRequestSelectorProps } from './unit-test-request-selector';
+export { UnitTestResultBadge, UnitTestResultBadgeProps } from './unit-test-result-badge';
+export { UnitTestResultItem, UnitTestResultItemProps } from './unit-test-result-item';
+export { UnitTestResultTimestamp, UnitTestResultTimestampProps } from './unit-test-result-timestamp';
diff --git a/packages/insomnia-components/components/list-group/list-group-item.js b/packages/insomnia-components/src/list-group/list-group-item.tsx
similarity index 61%
rename from packages/insomnia-components/components/list-group/list-group-item.js
rename to packages/insomnia-components/src/list-group/list-group-item.tsx
index 582e7c5121..f943adc157 100644
--- a/packages/insomnia-components/components/list-group/list-group-item.js
+++ b/packages/insomnia-components/src/list-group/list-group-item.tsx
@@ -1,10 +1,13 @@
-// @flow
-import * as React from 'react';
+import React from 'react';
 import styled, { css } from 'styled-components';
 
-type Props = { isSelected?: boolean, selectable?: boolean, indentLevel?: number };
+export interface ListGroupItemProps extends React.LiHTMLAttributes<HTMLLIElement> {
+  isSelected?: boolean;
+  selectable?: boolean;
+  indentLevel?: number;
+}
 
-const ListGroupItem: React.AbstractComponent<Props> = styled.li`
+const StyledListGroupItem = styled.li<ListGroupItemProps>`
   border-bottom: 1px solid var(--hl-xs);
   padding: var(--padding-sm) var(--padding-sm);
 
@@ -30,4 +33,4 @@ const ListGroupItem: React.AbstractComponent<Props> = styled.li`
     `};
 `;
 
-export default ListGroupItem;
+export const ListGroupItem: React.FC<ListGroupItemProps> = props => <StyledListGroupItem {...props} />;
diff --git a/packages/insomnia-components/components/list-group/list-group.stories.js b/packages/insomnia-components/src/list-group/list-group.stories.tsx
similarity index 88%
rename from packages/insomnia-components/components/list-group/list-group.stories.js
rename to packages/insomnia-components/src/list-group/list-group.stories.tsx
index 292fd426fa..7943cdd7a9 100644
--- a/packages/insomnia-components/components/list-group/list-group.stories.js
+++ b/packages/insomnia-components/src/list-group/list-group.stories.tsx
@@ -1,14 +1,18 @@
-// @flow
-import React from 'react';
-import ListGroupItem from './list-group-item';
-import ListGroup from './list-group';
-import UnitTestItem from './unit-test-item';
-import UnitTestResultItem from './unit-test-result-item';
+import React, { useState } from 'react';
+import { ListGroupItem } from './list-group-item';
+import { ListGroup } from './list-group';
+import { UnitTestItem } from './unit-test-item';
+import { UnitTestResultItem } from './unit-test-result-item';
 
-export default { title: 'Lists | List Group' };
+export default {
+  title: 'Lists | List Group',
+};
 
 export const _default = () => (
-  <div style={{ width: '350px' }}>
+  <div
+    style={{
+      width: '350px',
+    }}>
     <ListGroup>
       <ListGroupItem>List</ListGroupItem>
       <ListGroupItem>of</ListGroupItem>
@@ -18,7 +22,10 @@ export const _default = () => (
 );
 
 export const _bordered = () => (
-  <div style={{ width: '350px' }}>
+  <div
+    style={{
+      width: '350px',
+    }}>
     <ListGroup bordered>
       <ListGroupItem>Bordered</ListGroupItem>
       <ListGroupItem>list</ListGroupItem>
@@ -29,7 +36,10 @@ export const _bordered = () => (
 );
 
 export const _indented = () => (
-  <div style={{ width: '350px' }}>
+  <div
+    style={{
+      width: '350px',
+    }}>
     <ListGroup bordered>
       <ListGroupItem indentLevel={0}>Indent 0</ListGroupItem>
       <ListGroupItem indentLevel={1}>Indent 1</ListGroupItem>
@@ -45,9 +55,12 @@ export const _indented = () => (
 );
 
 export const _selectable = () => {
-  const [selected, setSelected] = React.useState(-1);
+  const [selected, setSelected] = useState(-1);
   return (
-    <div style={{ width: '350px' }}>
+    <div
+      style={{
+        width: '350px',
+      }}>
       <ListGroup>
         <ListGroupItem selectable isSelected={selected === 0} onClick={() => setSelected(0)}>
           Selectable
@@ -227,16 +240,25 @@ const _handleRequestSelected = () => {
 };
 
 export const _unitTests = () => (
-  <div style={{ width: '100%' }}>
+  <div
+    style={{
+      width: '100%',
+    }}>
     <ListGroup>
-      {unitTests.map((test, i) => (
+      {unitTests.map(test => (
         <UnitTestItem
           testNameEditable={test.name}
           item={test}
           key={test._id}
           onSetActiveRequest={_handleRequestSelected}
+          // @ts-expect-error -- TSCONVERSION
           selectableRequests={unitTestRequests}>
-          <div style={{ padding: '10px 15px', border: '1px solid #eee', margin: '10px' }}>
+          <div
+            style={{
+              padding: '10px 15px',
+              border: '1px solid #eee',
+              margin: '10px',
+            }}>
             CodeMirror instance.
           </div>
         </UnitTestItem>
@@ -244,11 +266,13 @@ export const _unitTests = () => (
     </ListGroup>
   </div>
 );
-
 export const _unitTestResults = () => (
-  <div style={{ width: '350px' }}>
+  <div
+    style={{
+      width: '350px',
+    }}>
     <ListGroup>
-      {unitTestResults.map((test, i) => (
+      {unitTestResults.map(test => (
         <UnitTestResultItem item={test} key={test._id} />
       ))}
     </ListGroup>
diff --git a/packages/insomnia-components/components/list-group/list-group.js b/packages/insomnia-components/src/list-group/list-group.tsx
similarity index 54%
rename from packages/insomnia-components/components/list-group/list-group.js
rename to packages/insomnia-components/src/list-group/list-group.tsx
index 6687000d1f..36b1178892 100644
--- a/packages/insomnia-components/components/list-group/list-group.js
+++ b/packages/insomnia-components/src/list-group/list-group.tsx
@@ -1,13 +1,12 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent, ReactNode } from 'react';
 import styled from 'styled-components';
 
-type Props = {|
-  children?: React.Node,
-  bordered?: boolean,
-|};
+export interface ListGroupProps {
+  children?: ReactNode;
+  bordered?: boolean;
+}
 
-const StyledListGroup: React.ComponentType<{}> = styled.ul`
+const StyledListGroup = styled.ul<ListGroupProps>`
   list-style-type: none;
   margin: 0;
   padding: 0;
@@ -20,8 +19,6 @@ const StyledListGroup: React.ComponentType<{}> = styled.ul`
     `}
 `;
 
-const ListGroup = ({ children, bordered }: Props) => {
+export const ListGroup: FunctionComponent<ListGroupProps> = ({ children, bordered }) => {
   return <StyledListGroup bordered={bordered}>{children}</StyledListGroup>;
 };
-
-export default ListGroup;
diff --git a/packages/insomnia-components/components/list-group/unit-test-item.js b/packages/insomnia-components/src/list-group/unit-test-item.tsx
similarity index 56%
rename from packages/insomnia-components/components/list-group/unit-test-item.js
rename to packages/insomnia-components/src/list-group/unit-test-item.tsx
index aa38a3274d..742968bfc8 100644
--- a/packages/insomnia-components/components/list-group/unit-test-item.js
+++ b/packages/insomnia-components/src/list-group/unit-test-item.tsx
@@ -1,26 +1,34 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent, ReactNode } from 'react';
 import styled from 'styled-components';
 import { useToggle } from 'react-use';
 import { motion } from 'framer-motion';
-import SvgIcon from '../svg-icon';
+import { SvgIcon } from '../svg-icon';
 import { Button } from '../button';
-import ListGroupItem from './list-group-item';
-import UnitTestRequestSelector from './unit-test-request-selector';
+import { ListGroupItem } from './list-group-item';
+import { UnitTestRequestSelector } from './unit-test-request-selector';
 
-type Props = {|
-  item: Object,
-  children?: React.Node,
-  onDeleteTest?: () => void,
-  onRunTest?: () => void,
-  testNameEditable?: React.Node,
-  testsRunning?: Object,
-  onSetActiveRequest: () => void,
-  selectedRequestId?: string,
-  selectableRequests: Array<{ name: string, request: { _id: string } }>,
-|};
+export interface TestItem {
+  _id: string;
+}
 
-const StyledResultListItem: React.ComponentType<{}> = styled(ListGroupItem)`
+export interface UnitTestItemProps {
+  item: TestItem;
+  children?: ReactNode;
+  onDeleteTest?: () => void;
+  onRunTest?: () => void;
+  testNameEditable?: ReactNode;
+  testsRunning?: TestItem[] | null;
+  onSetActiveRequest: () => void;
+  selectedRequestId?: string | null;
+  selectableRequests: {
+    name: string;
+    request: Request & {
+      _id: string;
+    };
+  }[];
+}
+
+const StyledResultListItem = styled(ListGroupItem)`
   padding: 0 var(--padding-sm);
 
   > div:first-of-type {
@@ -45,13 +53,13 @@ const StyledResultListItem: React.ComponentType<{}> = styled(ListGroupItem)`
   }
 `;
 
-const StyledUnitTestContent: React.ComponentType<{}> = styled(motion.div)`
+const StyledUnitTestContent = styled(motion.div)`
   display: block;
   height: 0px;
   overflow: hidden;
 `;
 
-const UnitTestItem = ({
+export const UnitTestItem: FunctionComponent<UnitTestItemProps> = ({
   item,
   children,
   onDeleteTest,
@@ -61,7 +69,7 @@ const UnitTestItem = ({
   onSetActiveRequest,
   selectedRequestId,
   selectableRequests,
-}: Props) => {
+}) => {
   const [isToggled, toggle] = useToggle(false);
   const toggleIconRotation = -90;
 
@@ -71,36 +79,51 @@ const UnitTestItem = ({
         <Button
           onClick={toggle}
           variant="text"
-          style={!isToggled ? { transform: `rotate(${toggleIconRotation}deg)` } : {}}>
+          style={isToggled ? {} : { transform: `rotate(${toggleIconRotation}deg)` }}
+        >
           <SvgIcon icon="chevron-down" />
         </Button>
+
         <Button variant="text" disabled>
           <SvgIcon icon="file" />
         </Button>
+
         <h2>{testNameEditable}</h2>
+
         <UnitTestRequestSelector
           selectedRequestId={selectedRequestId}
           selectableRequests={selectableRequests}
           onSetActiveRequest={onSetActiveRequest}
         />
+
         <Button variant="text" onClick={onDeleteTest}>
           <SvgIcon icon="trashcan" />
         </Button>
+
         <Button
           variant="text"
           onClick={onRunTest}
-          disabled={testsRunning && testsRunning.find(t => t._id === item._id)}>
+          disabled={Boolean(testsRunning?.find(({ _id }) => _id === item._id))}
+        >
           <SvgIcon icon="play" />
         </Button>
       </div>
+
       <StyledUnitTestContent
-        initial={{ height: isToggled ? '100%' : '0px' }}
-        animate={{ height: isToggled ? '100%' : '0px' }}
-        transition={{ duration: 0.2, ease: 'easeInOut', delay: 0 }}>
+        initial={{
+          height: isToggled ? '100%' : '0px',
+        }}
+        animate={{
+          height: isToggled ? '100%' : '0px',
+        }}
+        transition={{
+          duration: 0.2,
+          ease: 'easeInOut',
+          delay: 0,
+        }}
+      >
         {isToggled && <div>{children}</div>}
       </StyledUnitTestContent>
     </StyledResultListItem>
   );
 };
-
-export default UnitTestItem;
diff --git a/packages/insomnia-components/components/list-group/unit-test-request-selector.js b/packages/insomnia-components/src/list-group/unit-test-request-selector.tsx
similarity index 72%
rename from packages/insomnia-components/components/list-group/unit-test-request-selector.js
rename to packages/insomnia-components/src/list-group/unit-test-request-selector.tsx
index 465892523e..b0ac0f6880 100644
--- a/packages/insomnia-components/components/list-group/unit-test-request-selector.js
+++ b/packages/insomnia-components/src/list-group/unit-test-request-selector.tsx
@@ -1,14 +1,18 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent } from 'react';
 import styled from 'styled-components';
 
-type Props = {
-  onSetActiveRequest: () => void,
-  selectedRequestId?: string,
-  selectableRequests: Array<{ name: string, request: { _id: string } }>,
-};
+export interface UnitTestRequestSelectorProps {
+  onSetActiveRequest: () => void;
+  selectedRequestId?: string | null;
+  selectableRequests: {
+    name: string;
+    request: Request & {
+      _id: string;
+    };
+  }[];
+}
 
-const StyledUnitTestRequestSelector: React.ComponentType<{}> = styled.div`
+const StyledUnitTestRequestSelector = styled.div`
   padding: 0 var(--padding-sm);
   border: 1px solid var(--hl-md);
   border-radius: var(--radius-sm);
@@ -31,11 +35,11 @@ const StyledUnitTestRequestSelector: React.ComponentType<{}> = styled.div`
   }
 `;
 
-const UnitTestRequestSelector = ({
+export const UnitTestRequestSelector: FunctionComponent<UnitTestRequestSelectorProps> = ({
   onSetActiveRequest,
   selectedRequestId,
   selectableRequests,
-}: Props) => {
+}) => {
   return (
     <StyledUnitTestRequestSelector>
       <select
@@ -55,5 +59,3 @@ const UnitTestRequestSelector = ({
     </StyledUnitTestRequestSelector>
   );
 };
-
-export default UnitTestRequestSelector;
diff --git a/packages/insomnia-components/src/list-group/unit-test-result-badge.tsx b/packages/insomnia-components/src/list-group/unit-test-result-badge.tsx
new file mode 100644
index 0000000000..51694d72b1
--- /dev/null
+++ b/packages/insomnia-components/src/list-group/unit-test-result-badge.tsx
@@ -0,0 +1,36 @@
+import React, { FunctionComponent } from 'react';
+import styled from 'styled-components';
+
+export interface UnitTestResultBadgeProps {
+  failed?: boolean;
+}
+
+const StyledBadge = styled.span`
+  padding: var(--padding-xs) var(--padding-sm);
+  border: 1px solid var(--color-success);
+  background-color: var(--color-bg);
+  color: var(--color-success);
+  font-weight: var(--font-weight-bold);
+  border-radius: var(--radius-sm);
+  flex-basis: 3.5em;
+  flex-shrink: 0;
+  text-align: center;
+  text-transform: capitalize;
+`;
+
+// @ts-expect-error https://github.com/microsoft/TypeScript/issues/37597
+const StyledFailedBadge = styled(StyledBadge)`
+  border-color: var(--color-danger);
+  color: var(--color-danger);
+`;
+
+const StyledPassedBadge = styled(StyledBadge)`
+  border-color: var(--color-success);
+  color: var(--color-success);
+`;
+
+export const UnitTestResultBadge: FunctionComponent<UnitTestResultBadgeProps> = ({ failed }) => failed ? (
+  <StyledFailedBadge>Failed</StyledFailedBadge>
+) : (
+  <StyledPassedBadge>Passed</StyledPassedBadge>
+);
diff --git a/packages/insomnia-components/src/list-group/unit-test-result-item.tsx b/packages/insomnia-components/src/list-group/unit-test-result-item.tsx
new file mode 100644
index 0000000000..087c56b75f
--- /dev/null
+++ b/packages/insomnia-components/src/list-group/unit-test-result-item.tsx
@@ -0,0 +1,62 @@
+import React, { FunctionComponent } from 'react';
+import styled from 'styled-components';
+import { ListGroupItem } from './list-group-item';
+import { UnitTestResultTimestamp } from './unit-test-result-timestamp';
+import { UnitTestResultBadge } from './unit-test-result-badge';
+
+export interface UnitTestResultItemProps {
+  item: {
+    duration: string;
+    err?: {
+      message: string;
+    }
+    title: string;
+  };
+}
+
+const StyledResultListItem = styled(ListGroupItem)`
+  > div:first-of-type {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+
+    > *:not(:first-child) {
+      margin: var(--padding-xs) 0 var(--padding-xs) var(--padding-sm);
+    }
+  }
+
+  code {
+    background-color: var(--hl-xs);
+    padding: var(--padding-sm) var(--padding-md) var(--padding-sm) var(--padding-md);
+    color: var(--color-danger);
+    display: block;
+    margin: var(--padding-sm) 0 0 0;
+  }
+
+  p {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    flex-grow: 1;
+  }
+`;
+
+export const UnitTestResultItem: FunctionComponent<UnitTestResultItemProps> = ({
+  item: {
+    err = {},
+    title,
+    duration,
+  },
+}) => {
+  return (
+    <StyledResultListItem>
+      <div>
+        <UnitTestResultBadge failed={Boolean(err.message)} />
+        <p>{title}</p>
+        <UnitTestResultTimestamp timeMs={duration} />
+      </div>
+      {err.message && <code>{err.message}</code>}
+    </StyledResultListItem>
+  );
+};
diff --git a/packages/insomnia-components/components/list-group/unit-test-result-timestamp.js b/packages/insomnia-components/src/list-group/unit-test-result-timestamp.tsx
similarity index 58%
rename from packages/insomnia-components/components/list-group/unit-test-result-timestamp.js
rename to packages/insomnia-components/src/list-group/unit-test-result-timestamp.tsx
index 2370aef6e4..772a874271 100644
--- a/packages/insomnia-components/components/list-group/unit-test-result-timestamp.js
+++ b/packages/insomnia-components/src/list-group/unit-test-result-timestamp.tsx
@@ -1,13 +1,12 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent } from 'react';
 import styled from 'styled-components';
-import SvgIcon from '../svg-icon';
+import { SvgIcon } from '../svg-icon';
 
-type Props = {|
-  timeMs: String,
-|};
+export interface UnitTestResultTimestampProps {
+  timeMs: String;
+}
 
-const StyledTimestamp: React.ComponentType<{}> = styled.div`
+const StyledTimestamp = styled.div`
   display: flex;
   flex-direction: row;
   align-items: center;
@@ -22,7 +21,7 @@ const StyledTimestamp: React.ComponentType<{}> = styled.div`
   }
 `;
 
-const UnitTestResultTimestamp = ({ timeMs }: Props) => {
+export const UnitTestResultTimestamp: FunctionComponent<UnitTestResultTimestampProps> = ({ timeMs }) => {
   return (
     <StyledTimestamp>
       {' '}
@@ -31,5 +30,3 @@ const UnitTestResultTimestamp = ({ timeMs }: Props) => {
     </StyledTimestamp>
   );
 };
-
-export default UnitTestResultTimestamp;
diff --git a/packages/insomnia-components/src/multi-switch.stories.tsx b/packages/insomnia-components/src/multi-switch.stories.tsx
new file mode 100644
index 0000000000..0d9d99ca48
--- /dev/null
+++ b/packages/insomnia-components/src/multi-switch.stories.tsx
@@ -0,0 +1,31 @@
+import React, { useState } from 'react';
+import { MultiSwitch } from './multi-switch';
+
+export default {
+  title: 'Navigation | Sliding Switch',
+};
+
+export const _default = () => {
+  const [selectedValue, setSelectedValue] = useState('debug');
+  return (
+    <MultiSwitch
+      name="activity"
+      onChange={setSelectedValue}
+      choices={[
+        {
+          label: 'Design',
+          value: 'design',
+        },
+        {
+          label: 'Debug',
+          value: 'debug',
+        },
+        {
+          label: 'Test',
+          value: 'test',
+        },
+      ]}
+      selectedValue={selectedValue}
+    />
+  );
+};
diff --git a/packages/insomnia-components/components/multi-switch.js b/packages/insomnia-components/src/multi-switch.tsx
similarity index 60%
rename from packages/insomnia-components/components/multi-switch.js
rename to packages/insomnia-components/src/multi-switch.tsx
index 88aef00baa..cefe602ba6 100644
--- a/packages/insomnia-components/components/multi-switch.js
+++ b/packages/insomnia-components/src/multi-switch.tsx
@@ -1,10 +1,9 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent } from 'react';
 import styled from 'styled-components';
-import type { Props as RadioButtonGroupProps } from './radio-button-group';
-import RadioButtonGroup from './radio-button-group';
+import type { RadioButtonGroupProps } from './radio-button-group';
+import { RadioButtonGroup } from './radio-button-group';
 
-const ThemedButtonGroup: React.ComponentType<RadioButtonGroupProps> = styled(RadioButtonGroup)`
+const ThemedButtonGroup = styled(RadioButtonGroup)<RadioButtonGroupProps>`
   font-weight: bold;
   background: var(--hl-xs);
   color: var(--color-font);
@@ -33,6 +32,4 @@ const ThemedButtonGroup: React.ComponentType<RadioButtonGroupProps> = styled(Rad
   }
 `;
 
-const MultiSwitch = (props: RadioButtonGroupProps) => <ThemedButtonGroup {...props} />;
-
-export default MultiSwitch;
+export const MultiSwitch: FunctionComponent<RadioButtonGroupProps> = props => <ThemedButtonGroup {...props} />;
diff --git a/packages/insomnia-components/components/notice-table.stories.js b/packages/insomnia-components/src/notice-table.stories.tsx
similarity index 65%
rename from packages/insomnia-components/components/notice-table.stories.js
rename to packages/insomnia-components/src/notice-table.stories.tsx
index 30cc389314..4b675f2e35 100644
--- a/packages/insomnia-components/components/notice-table.stories.js
+++ b/packages/insomnia-components/src/notice-table.stories.tsx
@@ -1,12 +1,21 @@
-// @flow
-import * as React from 'react';
-import NoticeTable from './notice-table';
+import React from 'react';
+import { Notice, NoticeTable } from './notice-table';
 
-export default { title: 'Tables | NoticeTable' };
+export default {
+  title: 'Tables | NoticeTable',
+};
 
-const notices = [
-  { type: 'error', line: 3, message: 'This must be fixed now!' },
-  { type: 'warning', line: 10, message: 'This is a small nitpick' },
+const notices: Notice[] = [
+  {
+    type: 'error',
+    line: 3,
+    message: 'This must be fixed now!',
+  },
+  {
+    type: 'warning',
+    line: 10,
+    message: 'This is a small nitpick',
+  },
   {
     type: 'warning',
     line: 40,
@@ -31,10 +40,16 @@ export const _default = () => (
 );
 
 export const manyItems = () => {
-  const notices = [];
+  const notices: Notice[] = [];
+
   for (let i = 0; i < 100; i++) {
-    notices.push({ type: 'error', line: i, message: 'This is message ' + i });
+    notices.push({
+      type: 'error',
+      line: i,
+      message: 'This is message ' + i,
+    });
   }
+
   return (
     <NoticeTable
       notices={notices}
diff --git a/packages/insomnia-components/components/notice-table.js b/packages/insomnia-components/src/notice-table.tsx
similarity index 73%
rename from packages/insomnia-components/components/notice-table.js
rename to packages/insomnia-components/src/notice-table.tsx
index 93ed8dba0d..8b9da2e58d 100644
--- a/packages/insomnia-components/components/notice-table.js
+++ b/packages/insomnia-components/src/notice-table.tsx
@@ -1,31 +1,28 @@
-// @flow
-import * as React from 'react';
+import React, { PureComponent } from 'react';
 import { Table, TableBody, TableData, TableHead, TableHeader, TableRow } from './table';
 import { Button } from './button';
 import styled from 'styled-components';
-import SvgIcon, { IconEnum } from './svg-icon';
+import { SvgIcon, IconEnum } from './svg-icon';
 
-type Notice = {|
-  type: 'warning' | 'error',
-  line: number,
-  message: string,
-|};
+export interface Notice {
+  type: 'warning' | 'error';
+  line: number;
+  message: string;
+}
 
-type Props = {
-  notices: Array<Notice>,
+export interface NoticeTableProps {
+  notices: Notice[];
+  onClick?: (n: Notice, e: React.SyntheticEvent<HTMLElement>) => any;
+  onVisibilityToggle?: (expanded: boolean) => any;
+  compact?: boolean;
+  className?: string;
+}
 
-  // Optional
-  onClick?: (n: Notice, e: SyntheticEvent<HTMLElement>) => any,
-  onVisibilityToggle?: (expanded: boolean) => any,
-  compact?: boolean,
-  className?: string,
-};
+interface State {
+  collapsed: boolean;
+}
 
-type State = {
-  collapsed: boolean,
-};
-
-const Wrapper: React.ComponentType<{}> = styled.div`
+const Wrapper = styled.div`
   width: 100%;
 
   td {
@@ -37,23 +34,23 @@ const Wrapper: React.ComponentType<{}> = styled.div`
   }
 `;
 
-const ScrollWrapperStyled: React.ComponentType<{}> = styled.div`
+const ScrollWrapperStyled = styled.div`
   height: 100%;
   width: 100%;
   max-height: 13rem;
   overflow-y: auto;
 `;
 
-const ErrorCount: React.ComponentType<{}> = styled.div`
+const ErrorCount = styled.div`
   margin-right: var(--padding-md);
   display: inline-flex;
   align-items: center;
 `;
 
-const JumpButton: React.ComponentType<{}> = styled.button`
+const JumpButton = styled.button`
   outline: 0;
   border: 0;
-  background: transparent;
+  ebackground: transparent;
   font-size: var(--font-size-md);
   margin: 0;
   display: none;
@@ -85,7 +82,7 @@ const JumpButton: React.ComponentType<{}> = styled.button`
   }
 `;
 
-const Header: React.ComponentType<{}> = styled.header`
+const Header = styled.header`
   display: flex;
   align-items: center;
   flex-grow: 0;
@@ -96,15 +93,17 @@ const Header: React.ComponentType<{}> = styled.header`
   padding-left: var(--padding-md);
 `;
 
-class NoticeTable extends React.PureComponent<Props, State> {
-  state = {
+export class NoticeTable extends PureComponent<NoticeTableProps, State> {
+  state: State = {
     collapsed: false,
   };
 
-  collapse(e: SyntheticEvent<HTMLButtonElement>) {
+  collapse() {
     const { onVisibilityToggle } = this.props;
     this.setState(
-      state => ({ collapsed: !state.collapsed }),
+      state => ({
+        collapsed: !state.collapsed,
+      }),
       () => {
         if (onVisibilityToggle) {
           onVisibilityToggle(!this.state.collapsed);
@@ -113,8 +112,9 @@ class NoticeTable extends React.PureComponent<Props, State> {
     );
   }
 
-  onClick(notice: Notice, e: SyntheticEvent<HTMLButtonElement>) {
+  onClick(notice: Notice, e: React.SyntheticEvent<HTMLButtonElement>) {
     const { onClick } = this.props;
+
     if (!onClick) {
       return;
     }
@@ -125,16 +125,13 @@ class NoticeTable extends React.PureComponent<Props, State> {
   render() {
     const { notices, compact } = this.props;
     const { collapsed } = this.state;
-
     const caret = collapsed ? (
       <SvgIcon icon={IconEnum.chevronUp} />
     ) : (
       <SvgIcon icon={IconEnum.chevronDown} />
     );
-
     const errors = notices.filter(n => n.type === 'error');
     const warnings = notices.filter(n => n.type === 'warning');
-
     return (
       <Wrapper>
         <Header>
@@ -150,6 +147,7 @@ class NoticeTable extends React.PureComponent<Props, State> {
               </ErrorCount>
             )}
           </div>
+          {/* @ts-expect-error TSCONVERSION */}
           <Button onClick={this.collapse.bind(this)} noOutline>
             {collapsed ? 'Show' : 'Hide'} Details{caret}
           </Button>
@@ -160,16 +158,24 @@ class NoticeTable extends React.PureComponent<Props, State> {
               <TableHead>
                 <TableRow>
                   <TableHeader align="center">Type</TableHeader>
-                  <TableHeader style={{ minWidth: '3em' }} align="center">
+                  <TableHeader
+                    style={{
+                      minWidth: '3em',
+                    }}
+                    align="center">
                     Line
                   </TableHeader>
-                  <TableHeader style={{ width: '100%' }} align="left">
+                  <TableHeader
+                    style={{
+                      width: '100%',
+                    }}
+                    align="left">
                     Message
                   </TableHeader>
                 </TableRow>
               </TableHead>
               <TableBody>
-                {notices.map((n, i) => (
+                {notices.map(n => (
                   <TableRow key={`${n.line}:${n.type}:${n.message}`}>
                     <TableData align="center">
                       <SvgIcon icon={n.type} />
@@ -191,5 +197,3 @@ class NoticeTable extends React.PureComponent<Props, State> {
     );
   }
 }
-
-export default NoticeTable;
diff --git a/packages/insomnia-components/src/radio-button-group.stories.tsx b/packages/insomnia-components/src/radio-button-group.stories.tsx
new file mode 100644
index 0000000000..01101c0a3f
--- /dev/null
+++ b/packages/insomnia-components/src/radio-button-group.stories.tsx
@@ -0,0 +1,35 @@
+import React, { useState } from 'react';
+import { RadioButtonGroup } from './radio-button-group';
+
+export default {
+  title: 'Navigation | Radio Button Group',
+};
+
+export const _default = () => {
+  const [selectedValue, setSelectedValue] = useState('scratch');
+  return (
+    <RadioButtonGroup
+      name="dummy"
+      onChange={setSelectedValue}
+      choices={[
+        {
+          label: 'From Scratch',
+          value: 'scratch',
+        },
+        {
+          label: 'From Repository',
+          value: 'repo',
+        },
+        {
+          label: 'From Clipboard',
+          value: 'clip',
+        },
+        {
+          label: 'From Spec',
+          value: 'spec',
+        },
+      ]}
+      selectedValue={selectedValue}
+    />
+  );
+};
diff --git a/packages/insomnia-components/components/radio-button-group.js b/packages/insomnia-components/src/radio-button-group.tsx
similarity index 65%
rename from packages/insomnia-components/components/radio-button-group.js
rename to packages/insomnia-components/src/radio-button-group.tsx
index 7d1f767f2f..bbc836eab0 100644
--- a/packages/insomnia-components/components/radio-button-group.js
+++ b/packages/insomnia-components/src/radio-button-group.tsx
@@ -1,19 +1,18 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent, useCallback } from 'react';
 import styled from 'styled-components';
 
-export type Props = {
-  name: string,
-  onChange: (value: string) => any,
-  choices: Array<{
-    label: string,
-    value: string,
-  }>,
-  className?: string,
-  selectedValue: string,
-};
+export interface RadioButtonGroupProps {
+  name: string;
+  onChange: (value: string) => any;
+  choices: {
+    label: string;
+    value: string;
+  }[];
+  className?: string;
+  selectedValue: string;
+}
 
-const StyledRadioButtonGroup: React.ComponentType<{}> = styled.div`
+const StyledRadioButtonGroup = styled.div`
   display: flex;
   justify-content: space-between;
   padding: var(--padding-xs);
@@ -25,7 +24,7 @@ const StyledRadioButtonGroup: React.ComponentType<{}> = styled.div`
   }
 `;
 
-const StyledRadioButtonBtn: React.ComponentType<{}> = styled.label`
+const StyledRadioButtonBtn = styled.label`
   cursor: pointer;
   color: var(--color-font);
   flex-grow: 1;
@@ -47,23 +46,20 @@ const StyledRadioButtonBtn: React.ComponentType<{}> = styled.label`
   }
 `;
 
-export default function RadioButtonGroup({
+export const RadioButtonGroup: FunctionComponent<RadioButtonGroupProps> = ({
   name,
   choices,
   onChange,
   className,
   selectedValue,
-}: Props) {
-  const handleChange = React.useCallback(
-    e => {
-      if (typeof onChange !== 'function') {
-        return;
-      }
+}) => {
+  const handleChange = useCallback(e => {
+    if (typeof onChange !== 'function') {
+      return;
+    }
 
-      onChange(e.currentTarget.value);
-    },
-    [onChange],
-  );
+    onChange(e.currentTarget.value);
+  }, [onChange]);
 
   return (
     <StyledRadioButtonGroup className={className}>
@@ -81,4 +77,4 @@ export default function RadioButtonGroup({
       ))}
     </StyledRadioButtonGroup>
   );
-}
+};
diff --git a/packages/insomnia-components/src/sidebar/index.tsx b/packages/insomnia-components/src/sidebar/index.tsx
new file mode 100644
index 0000000000..fb8c76e477
--- /dev/null
+++ b/packages/insomnia-components/src/sidebar/index.tsx
@@ -0,0 +1,18 @@
+export { Sidebar, SidebarProps } from './sidebar';
+export { SidebarBadge, SidebarBadgeProps } from './sidebar-badge';
+export { SidebarFilter, SidebarFilterProps } from './sidebar-filter';
+export { SidebarHeader, SidebarHeaderProps } from './sidebar-header';
+export { SidebarHeaders, SidebarHeadersProps } from './sidebar-headers';
+export { SidebarInfo, SidebarInfoProps, SidebarInfoType } from './sidebar-info';
+export { SidebarInvalidSection, SidebarInvalidSectionProps } from './sidebar-invalid-section';
+export { SidebarItem, SidebarItemProps } from './sidebar-item';
+export { SidebarPanel, SidebarPanelProps } from './sidebar-panel';
+export { SidebarParameters, SidebarParametersProps } from './sidebar-parameters';
+export { SidebarPaths, SidebarPathsProps, SidebarPathsType } from './sidebar-paths';
+export { SidebarRequests, SidebarRequestsProps } from './sidebar-requests';
+export { SidebarResponses, SidebarResponsesProps } from './sidebar-responses';
+export { SidebarSchemas, SidebarSchemasProps } from './sidebar-schemas';
+export { SidebarSection, SidebarSectionProps } from './sidebar-section';
+export { SidebarSecurity, SidebarSecurityProps } from './sidebar-security';
+export { SidebarServers, SidebarServersProps, SidebarServer } from './sidebar-servers';
+export { SidebarTextItem, SidebarTextItemProps } from './sidebar-text-item';
diff --git a/packages/insomnia-components/components/sidebar/sidebar-badge.js b/packages/insomnia-components/src/sidebar/sidebar-badge.tsx
similarity index 84%
rename from packages/insomnia-components/components/sidebar/sidebar-badge.js
rename to packages/insomnia-components/src/sidebar/sidebar-badge.tsx
index b0644925e2..b574a7bc2b 100644
--- a/packages/insomnia-components/components/sidebar/sidebar-badge.js
+++ b/packages/insomnia-components/src/sidebar/sidebar-badge.tsx
@@ -1,14 +1,13 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent } from 'react';
 import styled from 'styled-components';
 
-type Props = {
-  label?: string,
-  onClick?: () => void,
-  method?: 'get' | 'post' | 'delete' | 'parameters' | 'patch' | 'put' | 'options-head' | string,
-};
+export interface SidebarBadgeProps {
+  label?: string;
+  onClick?: () => void;
+  method?: 'get' | 'post' | 'delete' | 'parameters' | 'patch' | 'put' | 'options-head' | string;
+}
 
-const StyledBadge: React.ComponentType<{}> = styled.span`
+const StyledBadge = styled.span`
   display: table;
   border-spacing: var(--padding-xxs) 0;
   &:first-of-type {
@@ -74,12 +73,14 @@ const StyledBadge: React.ComponentType<{}> = styled.span`
   }
 `;
 
-const SidebarBadge = ({ onClick = () => {}, method = 'post', label = method }: Props) => {
+export const SidebarBadge: FunctionComponent<SidebarBadgeProps> = ({
+  onClick = () => {},
+  method = 'post',
+  label = method,
+}) => {
   return (
     <StyledBadge onClick={onClick}>
       <span className={method}>{label}</span>
     </StyledBadge>
   );
 };
-
-export default SidebarBadge;
diff --git a/packages/insomnia-components/components/sidebar/sidebar-filter.js b/packages/insomnia-components/src/sidebar/sidebar-filter.tsx
similarity index 65%
rename from packages/insomnia-components/components/sidebar/sidebar-filter.js
rename to packages/insomnia-components/src/sidebar/sidebar-filter.tsx
index 5099326e7f..788a8882d9 100644
--- a/packages/insomnia-components/components/sidebar/sidebar-filter.js
+++ b/packages/insomnia-components/src/sidebar/sidebar-filter.tsx
@@ -1,15 +1,14 @@
-// @flow
-import * as React from 'react';
-import { useLayoutEffect } from 'react';
+import React, { createRef, FunctionComponent, useLayoutEffect } from 'react';
+
 import styled from 'styled-components';
 import { motion } from 'framer-motion';
 
-type Props = {
-  filter: boolean,
-  onChange?: (e: SyntheticInputEvent<HTMLInputElement>) => any,
-};
+export interface SidebarFilterProps {
+  filter: boolean;
+  onChange?: React.ChangeEventHandler<HTMLInputElement>;
+}
 
-const StyledFilter: React.ComponentType<{}> = styled(motion.div)`
+const StyledFilter = styled(motion.div)`
   padding-left: var(--padding-md);
   padding-right: var(--padding-md);
   overflow: hidden;
@@ -36,8 +35,8 @@ const StyledFilter: React.ComponentType<{}> = styled(motion.div)`
   }
 `;
 
-const SidebarFilter = ({ filter, onChange }: Props) => {
-  const filterField = React.createRef();
+export const SidebarFilter: FunctionComponent<SidebarFilterProps> = ({ filter, onChange }) => {
+  const filterField = createRef<HTMLInputElement>();
 
   useLayoutEffect(() => {
     if (filterField.current && !filter) {
@@ -49,11 +48,13 @@ const SidebarFilter = ({ filter, onChange }: Props) => {
 
   return (
     <StyledFilter
-      initial={{ height: filter ? '100%' : '0px' }}
-      animate={{ height: filter ? '100%' : '0px' }}>
+      initial={{
+        height: filter ? '100%' : '0px',
+      }}
+      animate={{
+        height: filter ? '100%' : '0px',
+      }}>
       <input type="text" placeholder="Filter..." onChange={onChange} ref={filterField} />
     </StyledFilter>
   );
 };
-
-export default SidebarFilter;
diff --git a/packages/insomnia-components/components/sidebar/sidebar-header.js b/packages/insomnia-components/src/sidebar/sidebar-header.tsx
similarity index 67%
rename from packages/insomnia-components/components/sidebar/sidebar-header.js
rename to packages/insomnia-components/src/sidebar/sidebar-header.tsx
index 70890db0a3..204589a877 100644
--- a/packages/insomnia-components/components/sidebar/sidebar-header.js
+++ b/packages/insomnia-components/src/sidebar/sidebar-header.tsx
@@ -1,18 +1,17 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent, ReactNode } from 'react';
 import styled from 'styled-components';
 import { motion } from 'framer-motion';
-import SvgIcon, { IconEnum } from '../svg-icon';
+import { SvgIcon, IconEnum } from '../svg-icon';
 
-type Props = {
-  headerTitle: string,
-  toggleSection: (toggle: SyntheticKeyboardEvent<HTMLButtonElement>) => void,
-  toggleFilter?: () => void,
-  sectionVisible: boolean,
-  children?: React.Node,
-};
+export interface SidebarHeaderProps {
+  headerTitle: string;
+  toggleSection: React.MouseEventHandler<HTMLLIElement>;
+  toggleFilter?: () => void;
+  sectionVisible: boolean;
+  children?: ReactNode;
+}
 
-const StyledHeader: React.ComponentType<{}> = styled.li`
+const StyledHeader = styled.li`
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -56,21 +55,21 @@ const StyledHeader: React.ComponentType<{}> = styled.li`
   }
 `;
 
-const SidebarHeader = ({
+export const SidebarHeader: FunctionComponent<SidebarHeaderProps> = ({
   headerTitle,
   toggleSection,
   toggleFilter,
   sectionVisible,
   children,
-}: Props) => {
-  const handleFilterClick =
+}) => {
+  const handleFilterClick: React.MouseEventHandler<HTMLSpanElement> | undefined =
     sectionVisible && toggleFilter // only handle a click if the section is open
       ? e => {
           e.stopPropagation(); // Prevent a parent from also handling the click
+
           toggleFilter();
         }
       : undefined;
-
   return (
     <StyledHeader onClick={toggleSection}>
       <h6>{headerTitle}</h6>
@@ -78,8 +77,12 @@ const SidebarHeader = ({
         {children || (
           <motion.span
             onClick={handleFilterClick}
-            initial={{ opacity: sectionVisible ? 0.6 : 0 }}
-            animate={{ opacity: sectionVisible ? 0.6 : 0 }}>
+            initial={{
+              opacity: sectionVisible ? 0.6 : 0,
+            }}
+            animate={{
+              opacity: sectionVisible ? 0.6 : 0,
+            }}>
             <SvgIcon icon={IconEnum.search} />
           </motion.span>
         )}
@@ -87,5 +90,3 @@ const SidebarHeader = ({
     </StyledHeader>
   );
 };
-
-export default SidebarHeader;
diff --git a/packages/insomnia-components/components/sidebar/sidebar-headers.js b/packages/insomnia-components/src/sidebar/sidebar-headers.tsx
similarity index 61%
rename from packages/insomnia-components/components/sidebar/sidebar-headers.js
rename to packages/insomnia-components/src/sidebar/sidebar-headers.tsx
index e59dd93330..ad847188f0 100644
--- a/packages/insomnia-components/components/sidebar/sidebar-headers.js
+++ b/packages/insomnia-components/src/sidebar/sidebar-headers.tsx
@@ -1,24 +1,23 @@
-// @flow
-import * as React from 'react';
-import Tooltip from '../tooltip';
-import SidebarItem from './sidebar-item';
-import SvgIcon, { IconEnum } from '../svg-icon';
-import SidebarSection from './sidebar-section';
-import StyledInvalidSection from './sidebar-invalid-section';
+import React, { Component, Fragment, ReactNode } from 'react';
+import { Tooltip } from '../tooltip';
+import { SidebarItem } from './sidebar-item';
+import { SvgIcon, IconEnum } from '../svg-icon';
+import { SidebarSection } from './sidebar-section';
+import { SidebarInvalidSection } from './sidebar-invalid-section';
 
-type Props = {
-  headers: Object,
-  onClick: (section: string, ...args: any) => void,
-};
+export interface SidebarHeadersProps {
+  headers: Record<string, any>;
+  onClick: (section: string, ...args: any) => void;
+}
 
 // Implemented as a class component because of a caveat with render props
 // https://reactjs.org/docs/render-props.html#be-careful-when-using-render-props-with-reactpurecomponent
-export default class SidebarHeaders extends React.Component<Props> {
-  renderBody = (filter: string): null | React.Node => {
+export class SidebarHeaders extends Component<SidebarHeadersProps> {
+  renderBody = (filter: string): null | ReactNode => {
     const { headers, onClick } = this.props;
 
     if (Object.prototype.toString.call(headers) !== '[object Object]') {
-      return <StyledInvalidSection name={'header'} />;
+      return <SidebarInvalidSection name={'header'} />;
     }
 
     const filteredValues = Object.keys(headers).filter(header =>
@@ -32,7 +31,7 @@ export default class SidebarHeaders extends React.Component<Props> {
     return (
       <div>
         {filteredValues.map(header => (
-          <React.Fragment key={header}>
+          <Fragment key={header}>
             <SidebarItem onClick={() => onClick('components', 'headers', header)}>
               <div>
                 <SvgIcon icon={IconEnum.indentation} />
@@ -43,7 +42,7 @@ export default class SidebarHeaders extends React.Component<Props> {
                 </Tooltip>
               </span>
             </SidebarItem>
-          </React.Fragment>
+          </Fragment>
         ))}
       </div>
     );
diff --git a/packages/insomnia-components/src/sidebar/sidebar-info.tsx b/packages/insomnia-components/src/sidebar/sidebar-info.tsx
new file mode 100644
index 0000000000..a934c9c6a0
--- /dev/null
+++ b/packages/insomnia-components/src/sidebar/sidebar-info.tsx
@@ -0,0 +1,55 @@
+import React, { FunctionComponent } from 'react';
+import { SidebarPanel } from './sidebar-panel';
+import { SidebarItem } from './sidebar-item';
+import { SidebarTextItem } from './sidebar-text-item';
+
+export interface SidebarInfoType {
+  title: string;
+  description: string;
+  version: string;
+  license: {
+    name: string;
+  };
+}
+
+export interface SidebarInfoProps {
+  info: SidebarInfoType;
+  childrenVisible: boolean;
+  onClick: (section: string, ...args: string[]) => void;
+}
+
+export const SidebarInfo: FunctionComponent<SidebarInfoProps> = ({
+  info: {
+    title,
+    description,
+    version,
+    license,
+  },
+  childrenVisible,
+  onClick,
+}) => {
+  return (
+    <SidebarPanel childrenVisible={childrenVisible}>
+      {title && (
+        <SidebarItem onClick={() => onClick('info', 'title')}>
+          <SidebarTextItem label={'Title:'} headline={title} />
+        </SidebarItem>
+      )}
+      {description && (
+        <SidebarItem onClick={() => onClick('info', 'description')}>
+          <SidebarTextItem label={'Description:'} headline={description} />
+        </SidebarItem>
+      )}
+      {version && (
+        <SidebarItem onClick={() => onClick('info', 'version')}>
+          <SidebarTextItem label={'Version:'} headline={version} />
+        </SidebarItem>
+      )}
+      {license && license.name && (
+        <SidebarItem onClick={() => onClick('info', 'license')}>
+          <SidebarTextItem label={'License:'} headline={license.name} />
+        </SidebarItem>
+      )}
+    </SidebarPanel>
+  );
+};
diff --git a/packages/insomnia-components/src/sidebar/sidebar-invalid-section.tsx b/packages/insomnia-components/src/sidebar/sidebar-invalid-section.tsx
new file mode 100644
index 0000000000..d0ed7343e2
--- /dev/null
+++ b/packages/insomnia-components/src/sidebar/sidebar-invalid-section.tsx
@@ -0,0 +1,15 @@
+import React, { FunctionComponent } from 'react';
+import styled from 'styled-components';
+
+export interface SidebarInvalidSectionProps {
+  name: string;
+}
+
+const StyledInvalidSection = styled.div`
+  padding: var(--padding-xs) var(--padding-xs) var(--padding-md) var(--padding-md);
+  color: var(--color-warning);
+`;
+
+export const SidebarInvalidSection: FunctionComponent<SidebarInvalidSectionProps> = ({ name }) => (
+  <StyledInvalidSection>Error: Invalid {name} specification.</StyledInvalidSection>
+);
diff --git a/packages/insomnia-components/components/sidebar/sidebar-item.js b/packages/insomnia-components/src/sidebar/sidebar-item.tsx
similarity index 81%
rename from packages/insomnia-components/components/sidebar/sidebar-item.js
rename to packages/insomnia-components/src/sidebar/sidebar-item.tsx
index d9940e8de3..6ee8a7e686 100644
--- a/packages/insomnia-components/components/sidebar/sidebar-item.js
+++ b/packages/insomnia-components/src/sidebar/sidebar-item.tsx
@@ -1,14 +1,13 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent, ReactNode } from 'react';
 import styled from 'styled-components';
 
-type Props = {
-  children: React.Node,
-  gridLayout?: boolean,
-  onClick?: () => void,
-};
+export interface SidebarItemProps {
+  children: ReactNode;
+  gridLayout?: boolean;
+  onClick?: () => void;
+}
 
-const StyledBlockItem: React.ComponentType<{}> = styled.div`
+const StyledBlockItem = styled.div`
   padding: var(--padding-xs) var(--padding-md) var(--padding-xs) 0;
   margin: 0;
   display: flex;
@@ -40,7 +39,7 @@ const StyledBlockItem: React.ComponentType<{}> = styled.div`
   }
 `;
 
-const StyledGridItem: React.ComponentType<{}> = styled.li`
+const StyledGridItem = styled.li`
   padding: 0 0 0 var(--padding-sm);
   margin: 0;
   display: flex;
@@ -76,12 +75,10 @@ const StyledGridItem: React.ComponentType<{}> = styled.li`
   }
 `;
 
-const SidebarItem = ({ children, gridLayout, onClick }: Props) => {
+export const SidebarItem: FunctionComponent<SidebarItemProps> = ({ children, gridLayout, onClick }) => {
   if (gridLayout) {
     return <StyledGridItem onClick={onClick}>{children}</StyledGridItem>;
   } else {
     return <StyledBlockItem onClick={onClick}>{children}</StyledBlockItem>;
   }
 };
-
-export default SidebarItem;
diff --git a/packages/insomnia-components/src/sidebar/sidebar-panel.tsx b/packages/insomnia-components/src/sidebar/sidebar-panel.tsx
new file mode 100644
index 0000000000..bff56b802c
--- /dev/null
+++ b/packages/insomnia-components/src/sidebar/sidebar-panel.tsx
@@ -0,0 +1,29 @@
+import React, { FunctionComponent, ReactNode } from 'react';
+import styled from 'styled-components';
+import { motion } from 'framer-motion';
+
+export interface SidebarPanelProps {
+  children: ReactNode;
+  childrenVisible: boolean;
+}
+
+const StyledPanel = styled(motion.div)`
+  height: 0;
+`;
+
+export const SidebarPanel: FunctionComponent<SidebarPanelProps> = ({ childrenVisible, children }) => (
+  <StyledPanel
+    initial={{
+      height: childrenVisible ? '100%' : '0px',
+    }}
+    animate={{
+      height: childrenVisible ? '100%' : '0px',
+    }}
+    transition={{
+      duration: 0.2,
+      ease: 'easeInOut',
+      delay: 0,
+    }}>
+    {children}
+  </StyledPanel>
+);
diff --git a/packages/insomnia-components/components/sidebar/sidebar-parameters.js b/packages/insomnia-components/src/sidebar/sidebar-parameters.tsx
similarity index 61%
rename from packages/insomnia-components/components/sidebar/sidebar-parameters.js
rename to packages/insomnia-components/src/sidebar/sidebar-parameters.tsx
index 58ab5116d5..91fda394ee 100644
--- a/packages/insomnia-components/components/sidebar/sidebar-parameters.js
+++ b/packages/insomnia-components/src/sidebar/sidebar-parameters.tsx
@@ -1,24 +1,23 @@
-// @flow
-import * as React from 'react';
-import Tooltip from '../tooltip';
-import SidebarItem from './sidebar-item';
-import SvgIcon, { IconEnum } from '../svg-icon';
-import SidebarSection from './sidebar-section';
-import StyledInvalidSection from './sidebar-invalid-section';
+import React, { Component, Fragment, ReactNode } from 'react';
+import { Tooltip } from '../tooltip';
+import { SvgIcon, IconEnum } from '../svg-icon';
+import { SidebarItem } from './sidebar-item';
+import { SidebarSection } from './sidebar-section';
+import { SidebarInvalidSection } from './sidebar-invalid-section';
 
-type Props = {
-  parameters: Object,
-  onClick: (section: string, ...args: any) => void,
-};
+export interface SidebarParametersProps {
+  parameters: Record<string, any>;
+  onClick: (section: string, ...args: any) => void;
+}
 
 // Implemented as a class component because of a caveat with render props
 // https://reactjs.org/docs/render-props.html#be-careful-when-using-render-props-with-reactpurecomponent
-export default class SidebarParameters extends React.Component<Props> {
-  renderBody = (filter: string): null | React.Node => {
+export class SidebarParameters extends Component<SidebarParametersProps> {
+  renderBody = (filter: string): null | ReactNode => {
     const { parameters, onClick } = this.props;
 
     if (Object.prototype.toString.call(parameters) !== '[object Object]') {
-      return <StyledInvalidSection name={'parameter'} />;
+      return <SidebarInvalidSection name={'parameter'} />;
     }
 
     const filteredValues = Object.keys(parameters).filter(parameter =>
@@ -32,7 +31,7 @@ export default class SidebarParameters extends React.Component<Props> {
     return (
       <div>
         {filteredValues.map(parameter => (
-          <React.Fragment key={parameter}>
+          <Fragment key={parameter}>
             <SidebarItem onClick={() => onClick('components', 'parameters', parameter)}>
               <div>
                 <SvgIcon icon={IconEnum.indentation} />
@@ -43,7 +42,7 @@ export default class SidebarParameters extends React.Component<Props> {
                 </Tooltip>
               </span>
             </SidebarItem>
-          </React.Fragment>
+          </Fragment>
         ))}
       </div>
     );
diff --git a/packages/insomnia-components/components/sidebar/sidebar-paths.js b/packages/insomnia-components/src/sidebar/sidebar-paths.tsx
similarity index 57%
rename from packages/insomnia-components/components/sidebar/sidebar-paths.js
rename to packages/insomnia-components/src/sidebar/sidebar-paths.tsx
index 8ee4b15a6a..38c0ccf5c0 100644
--- a/packages/insomnia-components/components/sidebar/sidebar-paths.js
+++ b/packages/insomnia-components/src/sidebar/sidebar-paths.tsx
@@ -1,30 +1,35 @@
-// @flow
-import * as React from 'react';
-import SidebarItem from './sidebar-item';
-import SvgIcon, { IconEnum } from '../svg-icon';
-import SidebarSection from './sidebar-section';
-import SidebarBadge from './sidebar-badge';
-import StyledInvalidSection from './sidebar-invalid-section';
+import React, { Component, Fragment, ReactNode } from 'react';
+import { SvgIcon, IconEnum } from '../svg-icon';
+import { SidebarBadge } from './sidebar-badge';
+import { SidebarItem } from './sidebar-item';
+import { SidebarSection } from './sidebar-section';
+import { SidebarInvalidSection } from './sidebar-invalid-section';
 
-type Props = {
-  paths: Object,
-  onClick: (section: string, ...args: any) => void,
-};
+export type SidebarPathsType = Record<string, any> | string;
 
-const isNotXDashKey = key => key.indexOf('x-') !== 0;
+export interface SidebarPathsProps {
+  paths: SidebarPathsType;
+  onClick: (section: string, ...args: any) => void;
+}
+
+const isNotXDashKey = (key: string) => key.indexOf('x-') !== 0;
 
 // Implemented as a class component because of a caveat with render props
 // https://reactjs.org/docs/render-props.html#be-careful-when-using-render-props-with-reactpurecomponent
-export default class SidebarPaths extends React.Component<Props> {
-  renderBody = (filter: string): null | React.Node => {
+export class SidebarPaths extends Component<SidebarPathsProps> {
+  renderBody = (filter: string): null | ReactNode => {
     const { paths, onClick } = this.props;
     let pathItems = {};
+
     if (typeof paths !== 'string') {
       pathItems = Object.entries(paths || {});
     }
+
     if (Object.prototype.toString.call(pathItems) !== '[object Array]') {
-      return <StyledInvalidSection name={'path'} />;
+      return <SidebarInvalidSection name={'path'} />;
     }
+
+    // @ts-expect-error TSCONVERSION
     const filteredValues = pathItems.filter(pathDetail =>
       pathDetail[0].toLowerCase().includes(filter.toLocaleLowerCase()),
     );
@@ -35,8 +40,9 @@ export default class SidebarPaths extends React.Component<Props> {
 
     return (
       <div>
-        {filteredValues.map(([route, routeBody]) => (
-          <React.Fragment key={route}>
+        {// @ts-expect-error TSCONVERSION
+        filteredValues.map(([route, routeBody]) => (
+          <Fragment key={route}>
             <SidebarItem gridLayout onClick={() => onClick('paths', route)}>
               <div>
                 <SvgIcon icon={IconEnum.indentation} />
@@ -44,7 +50,7 @@ export default class SidebarPaths extends React.Component<Props> {
               <span>{route}</span>
             </SidebarItem>
             <SidebarItem>
-              {Object.keys((routeBody: any))
+              {Object.keys(routeBody)
                 .filter(isNotXDashKey)
                 .map(method => (
                   <SidebarBadge
@@ -53,7 +59,7 @@ export default class SidebarPaths extends React.Component<Props> {
                     onClick={() => onClick('paths', route, method)}></SidebarBadge>
                 ))}
             </SidebarItem>
-          </React.Fragment>
+          </Fragment>
         ))}
       </div>
     );
diff --git a/packages/insomnia-components/components/sidebar/sidebar-requests.js b/packages/insomnia-components/src/sidebar/sidebar-requests.tsx
similarity index 77%
rename from packages/insomnia-components/components/sidebar/sidebar-requests.js
rename to packages/insomnia-components/src/sidebar/sidebar-requests.tsx
index c383db3b1c..9ca1f4d0c1 100644
--- a/packages/insomnia-components/components/sidebar/sidebar-requests.js
+++ b/packages/insomnia-components/src/sidebar/sidebar-requests.tsx
@@ -1,30 +1,29 @@
-// @flow
-import * as React from 'react';
+import React, { Component, Fragment, ReactNode } from 'react';
 import styled from 'styled-components';
-import Tooltip from '../tooltip';
-import SidebarItem from './sidebar-item';
-import SvgIcon, { IconEnum } from '../svg-icon';
-import SidebarSection from './sidebar-section';
-import SidebarBadge from './sidebar-badge';
-import StyledInvalidSection from './sidebar-invalid-section';
+import { SvgIcon, IconEnum } from '../svg-icon';
+import { SidebarBadge } from './sidebar-badge';
+import { SidebarItem } from './sidebar-item';
+import { SidebarSection } from './sidebar-section';
+import { SidebarInvalidSection } from './sidebar-invalid-section';
+import { Tooltip } from '../tooltip';
 
-type Props = {
-  requests: Object,
-  onClick: (section: string, ...args: any) => void,
-};
+export interface SidebarRequestsProps {
+  requests: Record<string, any>;
+  onClick: (section: string, ...args: any) => void;
+}
 
-const StyledRequestFormat: React.ComponentType<{}> = styled.span`
+const StyledRequestFormat = styled.span`
   padding-left: var(--padding-sm);
 `;
 
 // Implemented as a class component because of a caveat with render props
 // https://reactjs.org/docs/render-props.html#be-careful-when-using-render-props-with-reactpurecomponent
-export default class SidebarRequests extends React.Component<Props> {
-  renderBody = (filter: string): null | React.Node => {
+export class SidebarRequests extends Component<SidebarRequestsProps> {
+  renderBody = (filter: string): null | ReactNode => {
     const { requests, onClick } = this.props;
 
     if (Object.prototype.toString.call(requests) !== '[object Object]') {
-      return <StyledInvalidSection name={'request'} />;
+      return <SidebarInvalidSection name={'request'} />;
     }
 
     const filteredValues = Object.keys(requests).filter(requestName =>
@@ -40,7 +39,7 @@ export default class SidebarRequests extends React.Component<Props> {
         {filteredValues.map(requestName => {
           const { description, content } = requests[requestName];
           return (
-            <React.Fragment key={requestName}>
+            <Fragment key={requestName}>
               <SidebarItem
                 gridLayout
                 onClick={() => onClick('components', 'requestBodies', requestName)}>
@@ -54,7 +53,7 @@ export default class SidebarRequests extends React.Component<Props> {
                 </span>
               </SidebarItem>
               {Object.keys(content).map(requestFormat => (
-                <React.Fragment key={requestFormat}>
+                <Fragment key={requestFormat}>
                   <SidebarItem>
                     <StyledRequestFormat>
                       <SvgIcon icon={IconEnum.indentation} />
@@ -93,9 +92,9 @@ export default class SidebarRequests extends React.Component<Props> {
                       ))}
                     </SidebarItem>
                   )}
-                </React.Fragment>
+                </Fragment>
               ))}
-            </React.Fragment>
+            </Fragment>
           );
         })}
       </div>
diff --git a/packages/insomnia-components/components/sidebar/sidebar-responses.js b/packages/insomnia-components/src/sidebar/sidebar-responses.tsx
similarity index 64%
rename from packages/insomnia-components/components/sidebar/sidebar-responses.js
rename to packages/insomnia-components/src/sidebar/sidebar-responses.tsx
index 5920264ae9..bed26c44ac 100644
--- a/packages/insomnia-components/components/sidebar/sidebar-responses.js
+++ b/packages/insomnia-components/src/sidebar/sidebar-responses.tsx
@@ -1,24 +1,23 @@
-// @flow
-import * as React from 'react';
-import Tooltip from '../tooltip';
-import SidebarItem from './sidebar-item';
-import SvgIcon, { IconEnum } from '../svg-icon';
-import SidebarSection from './sidebar-section';
-import StyledInvalidSection from './sidebar-invalid-section';
+import React, { Component, ReactNode } from 'react';
+import { SvgIcon, IconEnum } from '../svg-icon';
+import { SidebarSection } from './sidebar-section';
+import { SidebarInvalidSection } from './sidebar-invalid-section';
+import { SidebarItem } from './sidebar-item';
+import { Tooltip } from '../tooltip';
 
-type Props = {
-  responses: Object,
-  onClick: (section: string, ...args: any) => void,
-};
+export interface SidebarResponsesProps {
+  responses: Record<string, any>;
+  onClick: (section: string, ...args: any) => void;
+}
 
 // Implemented as a class component because of a caveat with render props
 // https://reactjs.org/docs/render-props.html#be-careful-when-using-render-props-with-reactpurecomponent
-export default class SidebarResponses extends React.Component<Props> {
-  renderBody = (filter: string): null | React.Node => {
+export class SidebarResponses extends Component<SidebarResponsesProps> {
+  renderBody = (filter: string): null | ReactNode => {
     const { responses, onClick } = this.props;
 
     if (Object.prototype.toString.call(responses) !== '[object Object]') {
-      return <StyledInvalidSection name={'response'} />;
+      return <SidebarInvalidSection name={'response'} />;
     }
 
     const filteredValues = Object.keys(responses).filter(response =>
diff --git a/packages/insomnia-components/components/sidebar/sidebar-schemas.js b/packages/insomnia-components/src/sidebar/sidebar-schemas.tsx
similarity index 62%
rename from packages/insomnia-components/components/sidebar/sidebar-schemas.js
rename to packages/insomnia-components/src/sidebar/sidebar-schemas.tsx
index 5342cde73d..552034e0c7 100644
--- a/packages/insomnia-components/components/sidebar/sidebar-schemas.js
+++ b/packages/insomnia-components/src/sidebar/sidebar-schemas.tsx
@@ -1,23 +1,22 @@
-// @flow
-import * as React from 'react';
-import SidebarItem from './sidebar-item';
-import SvgIcon, { IconEnum } from '../svg-icon';
-import SidebarSection from './sidebar-section';
-import StyledInvalidSection from './sidebar-invalid-section';
+import React, { Component, ReactNode } from 'react';
+import { SidebarItem } from './sidebar-item';
+import { SvgIcon, IconEnum } from '../svg-icon';
+import { SidebarSection } from './sidebar-section';
+import { SidebarInvalidSection } from './sidebar-invalid-section';
 
-type Props = {
-  schemas: Object,
-  onClick: (section: string, ...args: any) => void,
-};
+export interface SidebarSchemasProps {
+  schemas: Record<string, any>;
+  onClick: (section: string, ...args: any) => void;
+}
 
 // Implemented as a class component because of a caveat with render props
 // https://reactjs.org/docs/render-props.html#be-careful-when-using-render-props-with-reactpurecomponent
-export default class SidebarSchemas extends React.Component<Props> {
-  renderBody = (filter: string): null | React.Node => {
+export class SidebarSchemas extends Component<SidebarSchemasProps> {
+  renderBody = (filter: string): null | ReactNode => {
     const { schemas, onClick } = this.props;
 
     if (Object.prototype.toString.call(schemas) !== '[object Object]') {
-      return <StyledInvalidSection name={'schema'} />;
+      return <SidebarInvalidSection name={'schema'} />;
     }
 
     const filteredValues = Object.keys(schemas).filter(schema =>
diff --git a/packages/insomnia-components/components/sidebar/sidebar-section.js b/packages/insomnia-components/src/sidebar/sidebar-section.tsx
similarity index 60%
rename from packages/insomnia-components/components/sidebar/sidebar-section.js
rename to packages/insomnia-components/src/sidebar/sidebar-section.tsx
index 0440cddc57..2dd8aeec97 100644
--- a/packages/insomnia-components/components/sidebar/sidebar-section.js
+++ b/packages/insomnia-components/src/sidebar/sidebar-section.tsx
@@ -1,36 +1,35 @@
-// @flow
-import * as React from 'react';
-import { useLayoutEffect } from 'react';
-import SidebarHeader from './sidebar-header';
-import SidebarPanel from './sidebar-panel';
-import SidebarFilter from './sidebar-filter';
+import React, { ChangeEvent, FunctionComponent, ReactNode, useCallback, useLayoutEffect, useState } from 'react';
+
+import { SidebarHeader } from './sidebar-header';
+import { SidebarPanel } from './sidebar-panel';
+import { SidebarFilter } from './sidebar-filter';
 import styled from 'styled-components';
 import { motion } from 'framer-motion';
 import { useToggle } from 'react-use';
 
-type SectionProps = {
-  title: string,
-  renderBody: (filterValue: string) => React.Node,
-};
+export interface SidebarSectionProps {
+  title: string;
+  renderBody: (filterValue: string) => ReactNode;
+}
 
-const StyledSection: React.ComponentType<{}> = styled(motion.ul)`
+const StyledSection = styled(motion.ul)`
   overflow: hidden;
   box-sizing: border-box;
   border-bottom: 1px solid var(--hl-md);
 `;
 
-const StyledNoResults: React.ComponentType<{}> = styled.div`
+const StyledNoResults = styled.div`
   padding: var(--padding-xs) var(--padding-xs) var(--padding-md) var(--padding-md);
   color: var(--color-warning);
 `;
 
-const SidebarSection = ({ title, renderBody }: SectionProps) => {
+export const SidebarSection: FunctionComponent<SidebarSectionProps> = ({ title, renderBody }) => {
   const [bodyVisible, toggleBodyVisible] = useToggle(false);
   const [filterVisible, toggleFilterVisible] = useToggle(false);
-  const [filterValue, setFilterValue] = React.useState('');
+  const [filterValue, setFilterValue] = useState('');
 
-  const handleFilterChange = React.useCallback((e: SyntheticInputEvent<HTMLInputElement>) => {
-    setFilterValue(e.target.value);
+  const handleFilterChange = useCallback((event: ChangeEvent<HTMLInputElement>) => {
+    setFilterValue(event.target.value);
   }, []);
 
   useLayoutEffect(() => {
@@ -55,5 +54,3 @@ const SidebarSection = ({ title, renderBody }: SectionProps) => {
     </StyledSection>
   );
 };
-
-export default SidebarSection;
diff --git a/packages/insomnia-components/components/sidebar/sidebar-security.js b/packages/insomnia-components/src/sidebar/sidebar-security.tsx
similarity index 59%
rename from packages/insomnia-components/components/sidebar/sidebar-security.js
rename to packages/insomnia-components/src/sidebar/sidebar-security.tsx
index da1ce8d385..2cb514ddef 100644
--- a/packages/insomnia-components/components/sidebar/sidebar-security.js
+++ b/packages/insomnia-components/src/sidebar/sidebar-security.tsx
@@ -1,23 +1,22 @@
-// @flow
-import * as React from 'react';
-import SidebarItem from './sidebar-item';
-import SvgIcon, { IconEnum } from '../svg-icon';
-import SidebarSection from './sidebar-section';
-import StyledInvalidSection from './sidebar-invalid-section';
+import React, { Component, Fragment, ReactNode } from 'react';
+import { SidebarItem } from './sidebar-item';
+import { SvgIcon, IconEnum } from '../svg-icon';
+import { SidebarSection } from './sidebar-section';
+import { SidebarInvalidSection } from './sidebar-invalid-section';
 
-type Props = {
-  security: Object,
-  onClick: (section: string, ...args: any) => void,
-};
+export interface SidebarSecurityProps {
+  security: Record<string, any>;
+  onClick: (section: string, ...args: any) => void;
+}
 
 // Implemented as a class component because of a caveat with render props
 // https://reactjs.org/docs/render-props.html#be-careful-when-using-render-props-with-reactpurecomponent
-export default class SidebarSecurity extends React.Component<Props> {
-  renderBody = (filter: string): null | React.Node => {
+export class SidebarSecurity extends Component<SidebarSecurityProps> {
+  renderBody = (filter: string): null | ReactNode => {
     const { security, onClick } = this.props;
 
     if (Object.prototype.toString.call(security) !== '[object Object]') {
-      return <StyledInvalidSection name={'security'} />;
+      return <SidebarInvalidSection name={'security'} />;
     }
 
     const filteredValues = Object.keys(security).filter(scheme =>
@@ -31,14 +30,14 @@ export default class SidebarSecurity extends React.Component<Props> {
     return (
       <div>
         {filteredValues.map(scheme => (
-          <React.Fragment key={scheme}>
+          <Fragment key={scheme}>
             <SidebarItem onClick={() => onClick('components', 'securitySchemes', scheme)}>
               <div>
                 <SvgIcon icon={IconEnum.key} />
               </div>
               <span>{scheme}</span>
             </SidebarItem>
-          </React.Fragment>
+          </Fragment>
         ))}
       </div>
     );
diff --git a/packages/insomnia-components/components/sidebar/sidebar-servers.js b/packages/insomnia-components/src/sidebar/sidebar-servers.tsx
similarity index 56%
rename from packages/insomnia-components/components/sidebar/sidebar-servers.js
rename to packages/insomnia-components/src/sidebar/sidebar-servers.tsx
index 4affa5a8de..9a2cda20cd 100644
--- a/packages/insomnia-components/components/sidebar/sidebar-servers.js
+++ b/packages/insomnia-components/src/sidebar/sidebar-servers.tsx
@@ -1,23 +1,28 @@
-// @flow
-import * as React from 'react';
-import SidebarItem from './sidebar-item';
-import SvgIcon, { IconEnum } from '../svg-icon';
-import SidebarSection from './sidebar-section';
-import StyledInvalidSection from './sidebar-invalid-section';
+import React, { Component, Fragment, ReactNode } from 'react';
+import { SidebarItem } from './sidebar-item';
+import { SvgIcon, IconEnum } from '../svg-icon';
+import { SidebarSection } from './sidebar-section';
+import { SidebarInvalidSection } from './sidebar-invalid-section';
 
-type Props = {
-  servers: Array<any>,
-  onClick: (section: string, path: string | number) => void,
-};
+export interface SidebarServer {
+  url: string;
+}
+
+export interface SidebarServersProps {
+  servers: SidebarServer[];
+  onClick: (section: string, path: string | number) => void;
+}
 
 // Implemented as a class component because of a caveat with render props
 // https://reactjs.org/docs/render-props.html#be-careful-when-using-render-props-with-reactpurecomponent
-export default class SidebarServers extends React.Component<Props> {
-  renderBody = (filter: string): null | React.Node => {
+export class SidebarServers extends Component<SidebarServersProps> {
+  renderBody = (filter: string): null | ReactNode => {
     const { servers, onClick } = this.props;
+
     if (!Array.isArray(servers)) {
-      return <StyledInvalidSection name={'server'} />;
+      return <SidebarInvalidSection name={'server'} />;
     }
+
     const filteredValues = servers.filter(server =>
       server.url.includes(filter.toLocaleLowerCase()),
     );
@@ -29,14 +34,14 @@ export default class SidebarServers extends React.Component<Props> {
     return (
       <div>
         {filteredValues.map((server, index) => (
-          <React.Fragment key={server.url}>
+          <Fragment key={server.url}>
             <SidebarItem onClick={() => onClick('servers', index)}>
               <div>
                 <SvgIcon icon={IconEnum.indentation} />
               </div>
               <span>{server.url}</span>
             </SidebarItem>
-          </React.Fragment>
+          </Fragment>
         ))}
       </div>
     );
diff --git a/packages/insomnia-components/components/sidebar/sidebar-text-item.js b/packages/insomnia-components/src/sidebar/sidebar-text-item.tsx
similarity index 50%
rename from packages/insomnia-components/components/sidebar/sidebar-text-item.js
rename to packages/insomnia-components/src/sidebar/sidebar-text-item.tsx
index 5bddb2c705..7ffa7a95fd 100644
--- a/packages/insomnia-components/components/sidebar/sidebar-text-item.js
+++ b/packages/insomnia-components/src/sidebar/sidebar-text-item.tsx
@@ -1,13 +1,12 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent } from 'react';
 import styled from 'styled-components';
 
-type Props = {
-  label: string,
-  headline: string,
-};
+export interface SidebarTextItemProps {
+  label: string;
+  headline: string;
+}
 
-const StyledTextItem: React.ComponentType<{}> = styled.span`
+const StyledTextItem = styled.span`
   display: block;
   padding-left: var(--padding-sm);
   text-overflow: ellipsis;
@@ -15,11 +14,9 @@ const StyledTextItem: React.ComponentType<{}> = styled.span`
   white-space: nowrap;
 `;
 
-const SidebarTextItem = ({ label, headline }: Props) => (
+export const SidebarTextItem: FunctionComponent<SidebarTextItemProps> = ({ label, headline }) => (
   <StyledTextItem>
     <strong>{label}</strong>
     <span>{headline}</span>
   </StyledTextItem>
 );
-
-export default SidebarTextItem;
diff --git a/packages/insomnia-components/components/sidebar/sidebar.stories.js b/packages/insomnia-components/src/sidebar/sidebar.stories.tsx
similarity index 98%
rename from packages/insomnia-components/components/sidebar/sidebar.stories.js
rename to packages/insomnia-components/src/sidebar/sidebar.stories.tsx
index a0b9906262..e299884a96 100644
--- a/packages/insomnia-components/components/sidebar/sidebar.stories.js
+++ b/packages/insomnia-components/src/sidebar/sidebar.stories.tsx
@@ -1,8 +1,9 @@
-import React from 'react';
-import Sidebar from './';
-import SidebarItem from './sidebar-item';
-import SidebarBadge from './sidebar-badge';
-import SvgIcon from '../svg-icon';
+/* eslint-disable camelcase */
+import React, { useState } from 'react';
+import { Sidebar } from './sidebar';
+import { SidebarItem } from './sidebar-item';
+import { SidebarBadge } from './sidebar-badge';
+import { SvgIcon } from '../svg-icon';
 import { withKnobs } from '@storybook/addon-knobs';
 import { withDesign } from 'storybook-addon-designs';
 
@@ -50,7 +51,7 @@ const apiSpec = {
         summary: 'List Tags',
         tags: ['Tags'],
         responses: {
-          '200': {
+          200: {
             description: 'List of Tags in the system',
             content: {
               'application/json': {
@@ -96,7 +97,7 @@ const apiSpec = {
         summary: 'List Tags by Tag Name',
         tags: ['Tags'],
         responses: {
-          '200': {
+          200: {
             description: 'List of entities tagged with the specified tag',
             content: {
               'application/json': {
@@ -148,7 +149,7 @@ const apiSpec = {
         summary: 'List Services',
         tags: ['Services'],
         responses: {
-          '200': {
+          200: {
             description: 'Paginated list of service entities',
             content: {
               'application/json': {
@@ -236,7 +237,7 @@ const apiSpec = {
       post: {
         summary: 'Create Service',
         responses: {
-          '201': {
+          201: {
             description: 'Service created',
             content: {
               'application/json': {
@@ -308,7 +309,7 @@ const apiSpec = {
         summary: 'View Service',
         tags: ['Services'],
         responses: {
-          '200': {
+          200: {
             description: 'Return specified service details',
             content: {
               'application/json': {
@@ -345,7 +346,7 @@ const apiSpec = {
         summary: 'Create or Update Service',
         tags: ['Services'],
         responses: {
-          '200': {
+          200: {
             description: 'Service Updated',
             content: {
               'application/json': {
@@ -374,7 +375,7 @@ const apiSpec = {
               },
             },
           },
-          '201': {
+          201: {
             description: 'Service Created',
             content: {
               'application/json': {
@@ -429,7 +430,7 @@ const apiSpec = {
         summary: 'Delete Service',
         tags: ['Services'],
         responses: {
-          '204': {
+          204: {
             description: 'No Content',
           },
         },
@@ -454,7 +455,7 @@ const apiSpec = {
         summary: 'List Routes for specified Service Name / Id',
         tags: ['Service Routes'],
         responses: {
-          '200': {
+          200: {
             description: 'Paginated list of route entities for specified service',
             content: {
               'application/json': {
@@ -570,7 +571,7 @@ const apiSpec = {
       post: {
         summary: 'Create Route associated to specific Service',
         responses: {
-          '201': {
+          201: {
             description: 'Route created',
             content: {
               'application/json': {
@@ -656,7 +657,7 @@ const apiSpec = {
         summary: 'View Route associated with specified Service',
         tags: ['Service Route'],
         responses: {
-          '200': {
+          200: {
             description: 'Return specified route details',
             content: {
               'application/json': {
@@ -696,7 +697,7 @@ const apiSpec = {
         summary: 'Create or Update Route by Service',
         tags: ['Service Route'],
         responses: {
-          '200': {
+          200: {
             description: 'Route Updated',
             content: {
               'application/json': {
@@ -728,7 +729,7 @@ const apiSpec = {
               },
             },
           },
-          '201': {
+          201: {
             description: 'Route Created',
             content: {
               'application/json': {
@@ -796,7 +797,7 @@ const apiSpec = {
         summary: 'Delete Route associated to specified Service',
         tags: ['Service Route'],
         responses: {
-          '204': {
+          204: {
             description: 'No Content',
           },
         },
@@ -2960,7 +2961,7 @@ const apiSpec2 = {
         operationId: 'listVersionsv2',
         summary: 'List API versions',
         responses: {
-          '200': {
+          200: {
             description: '200 response',
             content: {
               'application/json': {
@@ -2997,7 +2998,7 @@ const apiSpec2 = {
               },
             },
           },
-          '300': {
+          300: {
             description: '300 response',
             content: {
               'application/json': {
@@ -3018,7 +3019,7 @@ const apiSpec2 = {
         operationId: 'getVersionDetailsv2',
         summary: 'Show API version details',
         responses: {
-          '200': {
+          200: {
             description: '200 response',
             content: {
               'application/json': {
@@ -3070,7 +3071,7 @@ const apiSpec2 = {
               },
             },
           },
-          '203': {
+          203: {
             description: '203 response',
             content: {
               'application/json': {
@@ -3123,44 +3124,73 @@ const apiSpec2 = {
 };
 
 export const _default = () => {
-  const [targetPath, setTargetPath] = React.useState('Awaiting click...');
+  const [targetPath, setTargetPath] = useState('Awaiting click...');
 
-  const _handleItemClick = (...items) => {
+  const _handleItemClick = (...items: string[]) => {
     setTargetPath(items.join(' > '));
   };
 
   return (
-    <div style={{ width: '350px' }}>
-      <div style={{ display: 'block', margin: '0px 0px 20px 0px' }}>Target: {targetPath}</div>
+    <div
+      style={{
+        width: '350px',
+      }}>
+      <div
+        style={{
+          display: 'block',
+          margin: '0px 0px 20px 0px',
+        }}>
+        Target: {targetPath}
+      </div>
       <Sidebar jsonData={apiSpec} onClick={_handleItemClick} />
     </div>
   );
 };
 
 export const SimpleAPI = () => {
-  const [targetPath, setTargetPath] = React.useState('Awaiting click...');
+  const [targetPath, setTargetPath] = useState('Awaiting click...');
 
-  const _handleItemClick = (...items) => {
+  const _handleItemClick = (...items: any[]) => {
     setTargetPath(items.join(' > '));
   };
 
   return (
-    <div style={{ width: '350px' }}>
-      <div style={{ display: 'block', margin: '0px 0px 20px 0px' }}>Target: {targetPath}</div>
+    <div
+      style={{
+        width: '350px',
+      }}>
+      <div
+        style={{
+          display: 'block',
+          margin: '0px 0px 20px 0px',
+        }}>
+        Target: {targetPath}
+      </div>
+      {/* @ts-expect-error -- TSCONVERSION */}
       <Sidebar jsonData={apiSpec2} onClick={_handleItemClick} />
     </div>
   );
 };
 
 export const Badges = () => {
-  const [clickedBadge, setClickedBadge] = React.useState('Awaiting click...');
+  const [clickedBadge, setClickedBadge] = useState('Awaiting click...');
 
   const _handleBadgeClick = () => {
     setClickedBadge('Badge Clicked.');
   };
+
   return (
-    <div style={{ width: '600px' }}>
-      <div style={{ display: 'block', margin: '0px 0px 20px 0px' }}>{clickedBadge}</div>
+    <div
+      style={{
+        width: '600px',
+      }}>
+      <div
+        style={{
+          display: 'block',
+          margin: '0px 0px 20px 0px',
+        }}>
+        {clickedBadge}
+      </div>
       <h3>Method Badges</h3>
       <hr />
       <SidebarItem>
@@ -3198,7 +3228,6 @@ export const Badges = () => {
     </div>
   );
 };
-
 _default.story = {
   parameters: {
     design: {
diff --git a/packages/insomnia-components/components/sidebar/index.js b/packages/insomnia-components/src/sidebar/sidebar.tsx
similarity index 65%
rename from packages/insomnia-components/components/sidebar/index.js
rename to packages/insomnia-components/src/sidebar/sidebar.tsx
index 27072f2ca7..796b794a45 100644
--- a/packages/insomnia-components/components/sidebar/index.js
+++ b/packages/insomnia-components/src/sidebar/sidebar.tsx
@@ -1,44 +1,42 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent } from 'react';
 import { motion } from 'framer-motion';
 import styled from 'styled-components';
-import SidebarHeader from './sidebar-header';
-import SidebarInfo from './sidebar-info';
-import SidebarServers from './sidebar-servers';
-import SidebarPaths from './sidebar-paths';
-import SidebarRequests from './sidebar-requests';
-import SidebarResponses from './sidebar-responses';
-import SidebarParameters from './sidebar-parameters';
-import SidebarHeaders from './sidebar-headers';
-import SidebarSchemas from './sidebar-schemas';
-import SidebarSecurity from './sidebar-security';
-import Dropdown from '../dropdown/dropdown';
-import DropdownItem from '../dropdown/dropdown-item';
-import DropdownDivider from '../dropdown/dropdown-divider';
-import SvgIcon, { IconEnum } from '../svg-icon';
+import { SidebarHeader } from './sidebar-header';
+import { SidebarInfo, SidebarInfoType } from './sidebar-info';
+import { SidebarServers, SidebarServer } from './sidebar-servers';
+import { SidebarPaths, SidebarPathsType } from './sidebar-paths';
+import { SidebarRequests } from './sidebar-requests';
+import { SidebarResponses } from './sidebar-responses';
+import { SidebarParameters } from './sidebar-parameters';
+import { SidebarHeaders } from './sidebar-headers';
+import { SidebarSchemas } from './sidebar-schemas';
+import { SidebarSecurity } from './sidebar-security';
+import { Dropdown } from '../dropdown/dropdown';
+import { DropdownItem } from '../dropdown/dropdown-item';
+import { DropdownDivider } from '../dropdown/dropdown-divider';
+import { SvgIcon, IconEnum } from '../svg-icon';
 import { useToggle } from 'react-use';
 
-type Props = {|
-  className?: string,
-  jsonData: Object,
-  onClick: (section: string, path: any) => void,
-  jsonData: {
-    servers?: Object,
-    info?: Object,
-    paths?: Object,
+export interface SidebarProps {
+  className?: string;
+  onClick: (section: string, path: any) => void;
+  jsonData?: {
+    servers?: SidebarServer[];
+    info?: SidebarInfoType;
+    paths?: SidebarPathsType;
     components?: {
-      requestBodies?: Object,
-      responses?: Object,
-      parameters?: Object,
-      headers?: Object,
-      schemas?: Object,
-      securitySchemes?: Object,
-    },
-  },
-  pathItems: Array<Object>,
-|};
+      requestBodies?: Record<string, any>;
+      responses?: Record<string, any>;
+      parameters?: Record<string, any>;
+      headers?: Record<string, any>;
+      schemas?: Record<string, any>;
+      securitySchemes?: Record<string, any>;
+    };
+  };
+  pathItems?: Record<string, any>[];
+}
 
-const StyledSidebar: React.ComponentType<{}> = styled.div`
+const StyledSidebar = styled.div`
   width: 100%;
   height: 100%;
   background-color: var(--color-bg);
@@ -56,16 +54,16 @@ const StyledSidebar: React.ComponentType<{}> = styled.div`
   }
 `;
 
-const StyledSection: React.ComponentType<{}> = styled(motion.ul)`
+const StyledSection = styled(motion.ul)`
   overflow: hidden;
   box-sizing: border-box;
   border-bottom: 1px solid var(--hl-md);
 `;
 
 const DropdownEllipsis = () => <SvgIcon icon={IconEnum.ellipsesCircle} />;
-// Section Expansion & Filtering
 
-function Sidebar(props: Props) {
+// Section Expansion & Filtering
+export const Sidebar: FunctionComponent<SidebarProps> = ({ jsonData, onClick }) => {
   // Section Visibility
   const [infoSec, setInfoSec] = useToggle(false);
   const [pathsVisible, setPathsVisible] = useToggle(true);
@@ -78,12 +76,24 @@ function Sidebar(props: Props) {
   const [securityVisible, setSecurityVisible] = useToggle(true);
 
   // Sections
-  if (props.jsonData === null) {
+  if (jsonData === null) {
     return null;
   }
-  const { servers, info, paths } = props.jsonData || {};
-  const { requestBodies, responses, parameters, headers, schemas, securitySchemes } =
-    props.jsonData.components || {};
+
+  const {
+    servers,
+    info,
+    paths,
+  } = jsonData || {};
+
+  const {
+    requestBodies,
+    responses,
+    parameters,
+    headers,
+    schemas,
+    securitySchemes,
+  } = jsonData?.components || {};
 
   return (
     <StyledSidebar className="theme--sidebar">
@@ -126,27 +136,25 @@ function Sidebar(props: Props) {
               </DropdownItem>
             </Dropdown>
           </SidebarHeader>
-          <SidebarInfo childrenVisible={infoSec} info={info} onClick={props.onClick} />
+          <SidebarInfo childrenVisible={infoSec} info={info} onClick={onClick} />
         </StyledSection>
       )}
-      {serversVisible && servers && <SidebarServers servers={servers} onClick={props.onClick} />}
-      {pathsVisible && paths && <SidebarPaths paths={paths} onClick={props.onClick} />}
+      {serversVisible && servers && <SidebarServers servers={servers} onClick={onClick} />}
+      {pathsVisible && paths && <SidebarPaths paths={paths} onClick={onClick} />}
       {requestsVisible && requestBodies && (
-        <SidebarRequests requests={requestBodies} onClick={props.onClick} />
+        <SidebarRequests requests={requestBodies} onClick={onClick} />
       )}
       {responsesVisible && responses && (
-        <SidebarResponses responses={responses} onClick={props.onClick} />
+        <SidebarResponses responses={responses} onClick={onClick} />
       )}
       {parametersVisible && parameters && (
-        <SidebarParameters parameters={parameters} onClick={props.onClick} />
+        <SidebarParameters parameters={parameters} onClick={onClick} />
       )}
-      {headersVisible && headers && <SidebarHeaders headers={headers} onClick={props.onClick} />}
-      {schemasVisible && schemas && <SidebarSchemas schemas={schemas} onClick={props.onClick} />}
+      {headersVisible && headers && <SidebarHeaders headers={headers} onClick={onClick} />}
+      {schemasVisible && schemas && <SidebarSchemas schemas={schemas} onClick={onClick} />}
       {securityVisible && securitySchemes && (
-        <SidebarSecurity security={securitySchemes} onClick={props.onClick} />
+        <SidebarSecurity security={securitySchemes} onClick={onClick} />
       )}
     </StyledSidebar>
   );
-}
-
-export default Sidebar;
+};
diff --git a/packages/insomnia-components/components/svg-icon.stories.js b/packages/insomnia-components/src/svg-icon.stories.tsx
similarity index 75%
rename from packages/insomnia-components/components/svg-icon.stories.js
rename to packages/insomnia-components/src/svg-icon.stories.tsx
index 3e4fa4d5a6..ed55e961b6 100644
--- a/packages/insomnia-components/components/svg-icon.stories.js
+++ b/packages/insomnia-components/src/svg-icon.stories.tsx
@@ -1,7 +1,6 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment } from 'react';
 import { text, withKnobs } from '@storybook/addon-knobs';
-import SvgIcon, { IconEnum } from './svg-icon';
+import { SvgIcon, IconEnum, IconId } from './svg-icon';
 import { Table, TableBody, TableData, TableHead, TableHeader, TableRow } from './table';
 import styled from 'styled-components';
 
@@ -16,6 +15,7 @@ const Wrapper = styled.div`
     margin-right: 0.5rem;
   }
 `;
+
 Wrapper.displayName = '...';
 
 export const _default = () => <SvgIcon icon={IconEnum.arrowRight} />;
@@ -25,7 +25,7 @@ export const labelled = () => (
 );
 
 export const reference = () => (
-  <React.Fragment>
+  <Fragment>
     <Table striped outlined>
       <TableHead>
         <TableRow>
@@ -35,22 +35,28 @@ export const reference = () => (
         </TableRow>
       </TableHead>
       <TableBody>
-        {Object.keys(SvgIcon.icons)
+        {(Object.keys(SvgIcon.icons) as IconId[])
           .sort()
           .map(name => (
             <TableRow>
               <TableData>
                 <code>{name}</code>
               </TableData>
-              <TableData style={{ fontSize: '1rem' }}>
+              <TableData
+                style={{
+                  fontSize: '1rem',
+                }}>
                 <SvgIcon icon={name} />
               </TableData>
-              <TableData style={{ fontSize: '1.5rem' }}>
+              <TableData
+                style={{
+                  fontSize: '1.5rem',
+                }}>
                 <SvgIcon icon={name} />
               </TableData>
             </TableRow>
           ))}
       </TableBody>
     </Table>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/insomnia-components/src/svg-icon.tsx b/packages/insomnia-components/src/svg-icon.tsx
new file mode 100644
index 0000000000..7b5fdbbcba
--- /dev/null
+++ b/packages/insomnia-components/src/svg-icon.tsx
@@ -0,0 +1,220 @@
+import React, { Component, NamedExoticComponent, ReactNode, SVGProps } from 'react';
+import styled from 'styled-components';
+
+import { SvgIcnArrowRight } from './assets/svgr/IcnArrowRight';
+import { SvgIcnChevronDown } from './assets/svgr/IcnChevronDown';
+import { SvgIcnChevronUp } from './assets/svgr/IcnChevronUp';
+import { SvgIcnClock } from './assets/svgr/IcnClock';
+import { SvgIcnEmpty } from './assets/svgr/IcnEmpty';
+import { SvgIcnErrors } from './assets/svgr/IcnErrors';
+import { SvgIcnGitBranch } from './assets/svgr/IcnGitBranch';
+import { SvgIcnGithubLogo } from './assets/svgr/IcnGithubLogo';
+import { SvgIcnBitbucketLogo } from './assets/svgr/IcnBitbucketLogo';
+import { SvgIcnWarning } from './assets/svgr/IcnWarning';
+import { SvgIcnEllipsis } from './assets/svgr/IcnEllipsis';
+import { SvgIcnBurgerMenu } from './assets/svgr/IcnBurgerMenu';
+import { SvgIcnCheckmark } from './assets/svgr/IcnCheckmark';
+import { SvgIcnCookie } from './assets/svgr/IcnCookie';
+import { SvgIcnDragGrip } from './assets/svgr/IcnDragGrip';
+import { SvgIcnElevator } from './assets/svgr/IcnElevator';
+import { SvgIcnEllipsisCircle } from './assets/svgr/IcnEllipsisCircle';
+import { SvgIcnFile } from './assets/svgr/IcnFile';
+import { SvgIcnFolderOpen } from './assets/svgr/IcnFolderOpen';
+import { SvgIcnFolder } from './assets/svgr/IcnFolder';
+import { SvgIcnGear } from './assets/svgr/IcnGear';
+import { SvgIcnGitlabLogo } from './assets/svgr/IcnGitlabLogo';
+import { SvgIcnGui } from './assets/svgr/IcnGui';
+import { SvgIcnIndentation } from './assets/svgr/IcnIndentation';
+import { SvgIcnMinusCircleFill } from './assets/svgr/IcnMinusCircleFill';
+import { SvgIcnMinusCircle } from './assets/svgr/IcnMinusCircle';
+import { SvgIcnPlaceholder } from './assets/svgr/IcnPlaceholder';
+import { SvgIcnPlay } from './assets/svgr/IcnPlay';
+import { SvgIcnPlus } from './assets/svgr/IcnPlus';
+import { SvgIcnProhibited } from './assets/svgr/IcnProhibited';
+import { SvgIcnQuestionFill } from './assets/svgr/IcnQuestionFill';
+import { SvgIcnQuestion } from './assets/svgr/IcnQuestion';
+import { SvgIcnSearch } from './assets/svgr/IcnSearch';
+import { SvgIcnSecCert } from './assets/svgr/IcnSecCert';
+import { SvgIcnSuccess } from './assets/svgr/IcnSuccess';
+import { SvgIcnSync } from './assets/svgr/IcnSync';
+import { SvgIcnTrashcan } from './assets/svgr/IcnTrashcan';
+import { SvgIcnTriangle } from './assets/svgr/IcnTriangle';
+import { SvgIcnUser } from './assets/svgr/IcnUser';
+import { SvgIcnWarningCircle } from './assets/svgr/IcnWarningCircle';
+import { SvgIcnX } from './assets/svgr/IcnX';
+import { SvgIcnInfo } from './assets/svgr/IcnInfo';
+import { SvgIcnKey } from './assets/svgr/IcnKey';
+import { SvgIcnBrackets } from './assets/svgr/IcnBrackets';
+import { ValueOf } from 'type-fest';
+
+export const ThemeEnum = {
+  default: 'default',
+  highlight: 'highlight',
+
+  // Colors
+  danger: 'danger',
+  info: 'info',
+  notice: 'notice',
+  success: 'success',
+  surprise: 'surprise',
+  warning: 'warning',
+} as const;
+
+type ThemeKeys = ValueOf<typeof ThemeEnum>;
+
+export const IconEnum = {
+  arrowRight: 'arrow-right',
+  chevronDown: 'chevron-down',
+  chevronUp: 'chevron-up',
+  clock: 'clock',
+  ellipsis: 'ellipsis',
+  error: 'error',
+  gitBranch: 'git-branch',
+  github: 'github',
+  bitbucket: 'bitbucket',
+  info: 'info',
+  search: 'search',
+  warning: 'warning',
+  burgerMenu: 'burger-menu',
+  checkmark: 'checkmark',
+  cookie: 'cookie',
+  dragGrip: 'drag-grip',
+  elevator: 'elevator',
+  ellipsesCircle: 'ellipses-circle',
+  file: 'file',
+  folder: 'folder',
+  folderOpen: 'folder-open',
+  gear: 'gear',
+  gitlabLogo: 'gitlab-logo',
+  gui: 'gui',
+  indentation: 'indentation',
+  minusCircle: 'minus-circle',
+  minusCircleFill: 'minus-circle-fill',
+  placeholder: 'placeholder',
+  play: 'play',
+  plus: 'plus',
+  prohibited: 'prohibited',
+  questionFill: 'question-fill',
+  question: 'question',
+  secCert: 'sec-cert',
+  success: 'success',
+  sync: 'sync',
+  trashcan: 'trashcan',
+  triangle: 'triangle',
+  user: 'user',
+  warningCircle: 'warning-circle',
+  x: 'x',
+  key: 'key',
+  brackets: 'brackets',
+
+  /** Blank icon */
+  empty: 'empty',
+} as const;
+
+export type IconId = ValueOf<typeof IconEnum>;
+
+export interface SvgIconProps {
+  icon: IconId;
+  label?: ReactNode;
+}
+
+const SvgIconStyled = styled.div<{
+  theme: ThemeKeys;
+  hasLabel: boolean;
+}>`
+  display: inline-flex;
+  align-items: center;
+  white-space: nowrap;
+
+  svg {
+    flex-shrink: 0;
+    user-select: none;
+    ${({ hasLabel }) => (hasLabel ? 'margin-right: var(--padding-xs);' : null)}
+    ${({ theme }) => {
+      switch (theme) {
+        case ThemeEnum.danger:
+        case ThemeEnum.info:
+        case ThemeEnum.notice:
+        case ThemeEnum.success:
+        case ThemeEnum.surprise:
+        case ThemeEnum.warning:
+          return `fill: var(--color-${theme}); color: var(--color-font-${theme});`;
+
+        case ThemeEnum.highlight:
+          return 'fill: var(--hl); color: var(--color-font-danger);';
+
+        case ThemeEnum.default:
+        default:
+          return 'fill: var(--color-font); color: var(--color-font);';
+      }
+    }}
+  }
+`;
+
+export class SvgIcon extends Component<SvgIconProps> {
+  static icons: Record<IconId, [ThemeKeys, NamedExoticComponent<SVGProps<SVGSVGElement>>]> = {
+    [IconEnum.arrowRight]: [ThemeEnum.highlight, SvgIcnArrowRight],
+    [IconEnum.chevronDown]: [ThemeEnum.default, SvgIcnChevronDown],
+    [IconEnum.chevronUp]: [ThemeEnum.default, SvgIcnChevronUp],
+    [IconEnum.clock]: [ThemeEnum.default, SvgIcnClock],
+    [IconEnum.ellipsis]: [ThemeEnum.default, SvgIcnEllipsis],
+    [IconEnum.empty]: [ThemeEnum.default, SvgIcnEmpty],
+    [IconEnum.error]: [ThemeEnum.danger, SvgIcnErrors],
+    [IconEnum.gitBranch]: [ThemeEnum.default, SvgIcnGitBranch],
+    [IconEnum.github]: [ThemeEnum.default, SvgIcnGithubLogo],
+    [IconEnum.bitbucket]: [ThemeEnum.default, SvgIcnBitbucketLogo],
+    [IconEnum.info]: [ThemeEnum.highlight, SvgIcnInfo],
+    [IconEnum.search]: [ThemeEnum.default, SvgIcnSearch],
+    [IconEnum.warning]: [ThemeEnum.notice, SvgIcnWarning],
+    [IconEnum.burgerMenu]: [ThemeEnum.default, SvgIcnBurgerMenu],
+    [IconEnum.checkmark]: [ThemeEnum.default, SvgIcnCheckmark],
+    [IconEnum.cookie]: [ThemeEnum.default, SvgIcnCookie],
+    [IconEnum.dragGrip]: [ThemeEnum.default, SvgIcnDragGrip],
+    [IconEnum.elevator]: [ThemeEnum.default, SvgIcnElevator],
+    [IconEnum.ellipsesCircle]: [ThemeEnum.default, SvgIcnEllipsisCircle],
+    [IconEnum.elevator]: [ThemeEnum.default, SvgIcnElevator],
+    [IconEnum.file]: [ThemeEnum.default, SvgIcnFile],
+    [IconEnum.folder]: [ThemeEnum.default, SvgIcnFolder],
+    [IconEnum.folderOpen]: [ThemeEnum.default, SvgIcnFolderOpen],
+    [IconEnum.gear]: [ThemeEnum.default, SvgIcnGear],
+    [IconEnum.gitlabLogo]: [ThemeEnum.default, SvgIcnGitlabLogo],
+    [IconEnum.gui]: [ThemeEnum.default, SvgIcnGui],
+    [IconEnum.indentation]: [ThemeEnum.default, SvgIcnIndentation],
+    [IconEnum.minusCircle]: [ThemeEnum.default, SvgIcnMinusCircle],
+    [IconEnum.minusCircleFill]: [ThemeEnum.default, SvgIcnMinusCircleFill],
+    [IconEnum.placeholder]: [ThemeEnum.default, SvgIcnPlaceholder],
+    [IconEnum.play]: [ThemeEnum.default, SvgIcnPlay],
+    [IconEnum.plus]: [ThemeEnum.default, SvgIcnPlus],
+    [IconEnum.prohibited]: [ThemeEnum.default, SvgIcnProhibited],
+    [IconEnum.question]: [ThemeEnum.default, SvgIcnQuestion],
+    [IconEnum.questionFill]: [ThemeEnum.default, SvgIcnQuestionFill],
+    [IconEnum.secCert]: [ThemeEnum.default, SvgIcnSecCert],
+    [IconEnum.success]: [ThemeEnum.success, SvgIcnSuccess],
+    [IconEnum.sync]: [ThemeEnum.default, SvgIcnSync],
+    [IconEnum.trashcan]: [ThemeEnum.default, SvgIcnTrashcan],
+    [IconEnum.triangle]: [ThemeEnum.default, SvgIcnTriangle],
+    [IconEnum.user]: [ThemeEnum.default, SvgIcnUser],
+    [IconEnum.warningCircle]: [ThemeEnum.default, SvgIcnWarningCircle],
+    [IconEnum.x]: [ThemeEnum.default, SvgIcnX],
+    [IconEnum.key]: [ThemeEnum.default, SvgIcnKey],
+    [IconEnum.brackets]: [ThemeEnum.default, SvgIcnBrackets],
+  };
+
+  render() {
+    const { icon, label } = this.props;
+
+    if (!SvgIcon.icons[icon]) {
+      throw new Error(
+        `Invalid icon "${icon}" used. Must be one of ${Object.values(IconEnum).join('|')}`,
+      );
+    }
+
+    const [theme, Svg] = SvgIcon.icons[icon];
+    return (
+      <SvgIconStyled theme={theme} hasLabel={!!label}>
+        <Svg />
+        {label}
+      </SvgIconStyled>
+    );
+  }
+}
diff --git a/packages/insomnia-components/src/switch.stories.tsx b/packages/insomnia-components/src/switch.stories.tsx
new file mode 100644
index 0000000000..a22bc188a0
--- /dev/null
+++ b/packages/insomnia-components/src/switch.stories.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import { Switch } from './switch';
+
+export default {
+  title: 'Navigation | Sliding Switch',
+};
+
+export const _design = () => (
+  <Switch
+    optionItems={[
+      {
+        label: 'DESIGN',
+        selected: true,
+      },
+      {
+        label: 'DEBUG',
+        selected: false,
+      },
+    ]}
+  />
+);
+
+export const _debug = () => (
+  <Switch
+    optionItems={[
+      {
+        label: 'DESIGN',
+        selected: false,
+      },
+      {
+        label: 'DEBUG',
+        selected: true,
+      },
+    ]}
+  />
+);
diff --git a/packages/insomnia-components/components/switch.js b/packages/insomnia-components/src/switch.tsx
similarity index 74%
rename from packages/insomnia-components/components/switch.js
rename to packages/insomnia-components/src/switch.tsx
index 406157d04a..2bd3e5f424 100644
--- a/packages/insomnia-components/components/switch.js
+++ b/packages/insomnia-components/src/switch.tsx
@@ -1,19 +1,18 @@
-// @flow
-import * as React from 'react';
+import React, { Fragment, FunctionComponent } from 'react';
 import styled from 'styled-components';
 
-type Item = {
-  label: string,
-  selected: boolean,
-};
+export interface SwitchItem {
+  label: string;
+  selected: boolean;
+}
 
-type Props = {|
-  className?: string,
-  onClick: (e: SyntheticEvent<HTMLInputElement>) => any,
-  optionItems: Array<Item>,
-|};
+export interface SwitchProps {
+  className?: string;
+  onClick?: (e: React.SyntheticEvent<HTMLInputElement>) => any;
+  optionItems?: SwitchItem[];
+}
 
-const StyledSwitch: React.ComponentType<{}> = styled.div`
+const StyledSwitch = styled.div`
   margin: auto;
   .switch {
     position: relative;
@@ -65,12 +64,12 @@ const StyledSwitch: React.ComponentType<{}> = styled.div`
   }
 `;
 
-const Switch = ({ className, onClick, optionItems }: Props) => (
+export const Switch: FunctionComponent<SwitchProps> = ({ className, onClick, optionItems }) => (
   <StyledSwitch className={className}>
     <div className="switch">
-      {optionItems.map((item, i) => {
+      {optionItems?.map((item, i) => {
         return (
-          <React.Fragment key={item.label}>
+          <Fragment key={item.label}>
             <input
               type="radio"
               className="switch-input"
@@ -78,19 +77,17 @@ const Switch = ({ className, onClick, optionItems }: Props) => (
               onClick={onClick}
               value={item.label}
               id={item.label}
-              defaultChecked={item.selected ? 'defaultChecked' : ''}
+              defaultChecked={item.selected}
             />
             <label
               htmlFor={item.label}
               className={`switch-label ${i === 0 ? 'switch-label-off' : 'switch-label-on'}`}>
               {item.label}
             </label>
-          </React.Fragment>
+          </Fragment>
         );
       })}
       <span className="switch-selection"></span>
     </div>
   </StyledSwitch>
 );
-
-export default Switch;
diff --git a/packages/insomnia-components/components/table.stories.js b/packages/insomnia-components/src/table.stories.tsx
similarity index 96%
rename from packages/insomnia-components/components/table.stories.js
rename to packages/insomnia-components/src/table.stories.tsx
index 789f546463..931cfc02fb 100644
--- a/packages/insomnia-components/components/table.stories.js
+++ b/packages/insomnia-components/src/table.stories.tsx
@@ -1,8 +1,9 @@
-// @flow
-import * as React from 'react';
+import React from 'react';
 import { Table, TableBody, TableData, TableHead, TableHeader, TableRow } from './table';
 
-export default { title: 'Tables | Table' };
+export default {
+  title: 'Tables | Table',
+};
 
 export const _default = () => (
   <Table>
diff --git a/packages/insomnia-components/src/table.tsx b/packages/insomnia-components/src/table.tsx
new file mode 100644
index 0000000000..b49fb57f26
--- /dev/null
+++ b/packages/insomnia-components/src/table.tsx
@@ -0,0 +1,112 @@
+import styled from 'styled-components';
+import { ReactNode } from 'react';
+
+/***********/
+/* <table> *
+/***********/
+export interface TableProps {
+  children: ReactNode;
+  striped?: boolean;
+  outlined?: boolean;
+  compact?: boolean;
+  headings?: ReactNode[];
+}
+
+export const Table = styled.table<TableProps>`
+  width: 100%;
+  border-spacing: 0;
+  border-collapse: collapse;
+
+  td,
+  th {
+    padding: ${({ compact }) => (compact ? 'var(--padding-xs)' : 'var(--padding-sm)')}
+      ${({ compact }) => (compact ? 'var(--padding-sm)' : 'var(--padding-md)')};
+  }
+
+  ${({ striped }) =>
+    striped &&
+    `
+  tbody tr:nth-child(odd) {
+    background: var(--hl-xs);
+  }`}
+
+  ${({ outlined }) =>
+    outlined &&
+    `
+  & {
+    th {
+      background: var(--hl-xxs);
+    }
+
+    &,
+    td {
+      border: 1px solid var(--hl-sm);
+    }
+
+    tr.table--no-outline-row td {
+      border-left: 0;
+      border-right: 0;
+    }
+
+    & {
+      border-radius: 3px;
+      border-collapse: unset;
+    }
+
+    td {
+      border-left: 0;
+      border-bottom: 0;
+
+      &:last-child {
+        border-right: 0;
+      }
+    }
+  }`}
+`;
+
+/********/
+/* <tr> */
+/********/
+export const TableRow = styled.tr``;
+
+/********/
+/* <td> */
+/********/
+export interface TableDataProps {
+  compact?: boolean;
+  align?: 'center' | 'left';
+}
+
+export const TableData = styled.td<TableDataProps>`
+  vertical-align: top;
+  padding: 0 var(--padding-md);
+  text-align: ${({ align }) => align || 'left'};
+`;
+
+/********/
+
+/* <th> */
+
+/********/
+export interface TableHeaderProps {
+  compact?: boolean;
+  align?: 'center' | 'left';
+}
+
+export const TableHeader = styled.th<TableHeaderProps>`
+  vertical-align: top;
+  padding: 0 var(--padding-md);
+  text-align: ${({ align }) => align || 'left'};
+`;
+
+/***********/
+/* <thead> */
+/***********/
+export const TableHead = styled.thead``;
+
+/***********/
+
+/* <tbody> */
+
+/***********/
+export const TableBody = styled.tbody``;
diff --git a/packages/insomnia-components/components/toggle-switch.stories.js b/packages/insomnia-components/src/toggle-switch.stories.tsx
similarity index 67%
rename from packages/insomnia-components/components/toggle-switch.stories.js
rename to packages/insomnia-components/src/toggle-switch.stories.tsx
index d067fe2a82..3b1044dd00 100644
--- a/packages/insomnia-components/components/toggle-switch.stories.js
+++ b/packages/insomnia-components/src/toggle-switch.stories.tsx
@@ -1,7 +1,9 @@
-import * as React from 'react';
-import ToggleSwitch from './toggle-switch';
+import React from 'react';
+import { ToggleSwitch } from './toggle-switch';
 
-export default { title: 'Form Elements | Toggle Switch' };
+export default {
+  title: 'Form Elements | Toggle Switch',
+};
 
 const defaultOnChange = () => {};
 
@@ -21,7 +23,8 @@ export const Disabled = () => (
 );
 
 export const WithLabel = () => (
-  <>
-    <ToggleSwitch onChange={defaultOnChange()} label="text label" />
-  </>
+  <ToggleSwitch
+    onChange={defaultOnChange}
+    label="text label"
+  />
 );
diff --git a/packages/insomnia-components/components/toggle-switch.js b/packages/insomnia-components/src/toggle-switch.tsx
similarity index 55%
rename from packages/insomnia-components/components/toggle-switch.js
rename to packages/insomnia-components/src/toggle-switch.tsx
index 651a4e419f..95c0151582 100644
--- a/packages/insomnia-components/components/toggle-switch.js
+++ b/packages/insomnia-components/src/toggle-switch.tsx
@@ -1,18 +1,17 @@
-// @flow
-import * as React from 'react';
+import React, { FunctionComponent, ReactNode, useCallback, useEffect, useState } from 'react';
 import Switch from 'react-switch';
 import styled from 'styled-components';
 
-type Props = {
-  labelClassName?: string,
-  switchClassName?: string,
-  checked?: boolean,
-  disabled?: boolean,
-  onChange(checked: boolean, Event, string): void | Promise<void>,
-  label?: React.Node,
-};
+export interface ToggleSwitchProps {
+  labelClassName?: string;
+  switchClassName?: string;
+  checked?: boolean;
+  disabled?: boolean;
+  onChange(checked: boolean, arg1: Event, arg2: string): void | Promise<void>;
+  label?: ReactNode;
+}
 
-const ThemedSwitch: React.ComponentType<{ checked: boolean }> = styled(Switch)`
+const ThemedSwitch = styled(Switch)<{ checked: boolean }>`
   .react-switch-bg {
     background: ${({ checked }) => (checked ? 'var(--color-surprise)' : 'var(--hl-xl)')} !important;
   }
@@ -30,29 +29,26 @@ const StyledLabel = styled.label`
   }
 `;
 
-const ToggleSwitch: React.StatelessFunctionalComponent<Props> = ({
+export const ToggleSwitch: FunctionComponent<ToggleSwitchProps> = ({
   labelClassName,
-  switchClassName,
+  switchClassName = '',
   checked: checkedProp,
   onChange,
   disabled,
   label,
   ...props
 }) => {
-  const [checked, setChecked] = React.useState(!!checkedProp);
+  const [checked, setChecked] = useState(Boolean(checkedProp));
 
   // If prop changes and differs from state, update state
-  React.useEffect(() => {
-    setChecked(!!checkedProp);
+  useEffect(() => {
+    setChecked(Boolean(checkedProp));
   }, [checkedProp]);
 
-  const callback = React.useCallback(
-    (c, a, b) => {
-      setChecked(c);
-      onChange(c, a, b);
-    },
-    [onChange],
-  );
+  const callback = useCallback((c, a, b) => {
+    setChecked(c);
+    onChange(c, a, b);
+  }, [onChange]);
 
   const toggle = (
     <ThemedSwitch
@@ -62,7 +58,7 @@ const ToggleSwitch: React.StatelessFunctionalComponent<Props> = ({
       onChange={callback}
       height={20}
       width={40}
-      {...(props: Object)}
+      {...(props as Record<string, any>)}
     />
   );
 
@@ -77,5 +73,3 @@ const ToggleSwitch: React.StatelessFunctionalComponent<Props> = ({
     return toggle;
   }
 };
-
-export default ToggleSwitch;
diff --git a/packages/insomnia-components/components/tooltip.stories.js b/packages/insomnia-components/src/tooltip.stories.tsx
similarity index 88%
rename from packages/insomnia-components/components/tooltip.stories.js
rename to packages/insomnia-components/src/tooltip.stories.tsx
index f9bc98aa6b..3284722208 100644
--- a/packages/insomnia-components/components/tooltip.stories.js
+++ b/packages/insomnia-components/src/tooltip.stories.tsx
@@ -1,7 +1,9 @@
-import React from 'react';
-import Tooltip from './tooltip';
+import React, { Fragment } from 'react';
+import { Tooltip } from './tooltip';
 
-export default { title: 'Helpers | Tooltip' };
+export default {
+  title: 'Helpers | Tooltip',
+};
 
 export const onTop = () => (
   <div className="text-center">
@@ -37,15 +39,14 @@ export const withDelay = () => (
 
 export const withChildren = () => {
   const message = (
-    <React.Fragment>
+    <Fragment>
       This is a{' '}
       <a href="#" onClick={e => e.preventDefault()}>
         Link
       </a>
       .
-    </React.Fragment>
+    </Fragment>
   );
-
   return (
     <div className="text-center">
       <Tooltip message={message}>
diff --git a/packages/insomnia-components/components/__tests__/tooltip.test.js b/packages/insomnia-components/src/tooltip.test.tsx
similarity index 82%
rename from packages/insomnia-components/components/__tests__/tooltip.test.js
rename to packages/insomnia-components/src/tooltip.test.tsx
index d62c410a40..828129e4d6 100644
--- a/packages/insomnia-components/components/__tests__/tooltip.test.js
+++ b/packages/insomnia-components/src/tooltip.test.tsx
@@ -1,12 +1,17 @@
 import React from 'react';
-import { fireEvent, render } from '@testing-library/react';
-import Tooltip from '../tooltip';
+import { fireEvent, render, ByRoleOptions, ByRoleMatcher } from '@testing-library/react';
+import { Tooltip } from './tooltip';
 
-const pause = time => new Promise(resolve => setTimeout(resolve, time));
+const pause = (time: number) => new Promise(resolve => setTimeout(resolve, time));
 
-const expectNoTooltip = queryByRole => {
+type QueryByRole = (
+  text: ByRoleMatcher,
+  options?: ByRoleOptions | undefined,
+) => HTMLElement | null;
+
+const expectNoTooltip = (queryByRole: QueryByRole) => {
   expect(queryByRole('tooltip', { hidden: true })).toBeNull();
-  expect(queryByRole('tooltip')).toBeNull();
+  expect(queryByRole('tooltip', {})).toBeNull();
 };
 
 describe('<Tooltip />', () => {
@@ -45,7 +50,6 @@ describe('<Tooltip />', () => {
   it('should not render tooltip if no message exists', () => {
     const childText = 'some child';
     const message = '';
-
     const { queryByRole, getByText } = render(<Tooltip message={message}>{childText}</Tooltip>);
 
     expectNoTooltip(queryByRole);
diff --git a/packages/insomnia-components/components/tooltip.js b/packages/insomnia-components/src/tooltip.tsx
similarity index 70%
rename from packages/insomnia-components/components/tooltip.js
rename to packages/insomnia-components/src/tooltip.tsx
index 2ad99ee2ba..7bc54308a8 100644
--- a/packages/insomnia-components/components/tooltip.js
+++ b/packages/insomnia-components/src/tooltip.tsx
@@ -1,33 +1,31 @@
-// @flow
-import * as React from 'react';
+import React, { CSSProperties, MouseEvent, PureComponent, ReactNode } from 'react';
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
 import classnames from 'classnames';
 import ReactDOM from 'react-dom';
 import styled from 'styled-components';
 
-type Props = {
-  children: React.Node,
-  message: React.Node,
-  position?: 'bottom' | 'top' | 'right' | 'left',
+export interface TooltipProps {
+  children: ReactNode;
+  message: ReactNode;
+  position?: 'bottom' | 'top' | 'right' | 'left';
+  className?: string;
+  delay?: number;
+  selectable?: boolean;
+  wide?: boolean;
+  style?: CSSProperties;
+}
 
-  // Optional
-  className?: string,
-  delay?: number,
-  selectable?: boolean,
-  wide?: boolean,
-};
+interface State {
+  visible: boolean;
+  movedToBody: boolean;
+}
 
-type State = {
-  visible: boolean,
-  movedToBody: boolean,
-};
-
-const StyledTooltip: React.ComponentType<{}> = styled.div`
+const StyledTooltip = styled.div`
   position: relative;
   display: inline-block;
 `;
 
-const StyledTooltipBubble: React.ComponentType<{}> = styled.div`
+const StyledTooltipBubble = styled.div`
   position: fixed;
   left: -999999px;
   opacity: 0;
@@ -60,42 +58,31 @@ const StyledTooltipBubble: React.ComponentType<{}> = styled.div`
 `;
 
 @autoBindMethodsForReact
-class Tooltip extends React.PureComponent<Props, State> {
-  _showTimeout: TimeoutID;
-  _hideTimeout: TimeoutID;
+export class Tooltip extends PureComponent<TooltipProps, State> {
+  _showTimeout: NodeJS.Timeout | null = null;
+  _hideTimeout: NodeJS.Timeout | null = null;
 
-  // TODO: Figure out what type these should be
-  _tooltip: ?any;
-  _bubble: ?any;
-  _id: string;
+  _tooltip: HTMLDivElement | null = null;
+  _bubble: HTMLDivElement | null = null;
+  _id = Math.random() + '';
 
-  constructor(props: any) {
-    super(props);
-
-    this.state = {
-      visible: false,
-      movedToBody: false,
-    };
-
-    this._id = Math.random() + '';
+  state: State = {
+    visible: false,
+    movedToBody: false,
   }
 
-  _setTooltipRef(n: ?any) {
-    this._tooltip = n;
-  }
-
-  _setBubbleRef(n: ?any) {
-    this._bubble = n;
-  }
-
-  _handleStopClick(e: MouseEvent): void {
+  _handleStopClick(e: MouseEvent) {
     e.stopPropagation();
   }
 
-  _handleMouseEnter(e: MouseEvent): void {
-    clearTimeout(this._showTimeout);
-    clearTimeout(this._hideTimeout);
-    this._showTimeout = setTimeout((): void => {
+  _handleMouseEnter() {
+    if (this._showTimeout !== null) {
+      clearTimeout(this._showTimeout);
+    }
+    if (this._hideTimeout !== null) {
+      clearTimeout(this._hideTimeout);
+    }
+    this._showTimeout = setTimeout(() => {
       const tooltip = this._tooltip;
       const bubble = this._bubble;
 
@@ -110,9 +97,9 @@ class Tooltip extends React.PureComponent<Props, State> {
       const tooltipRect = tooltip.getBoundingClientRect();
       const bubbleRect = bubble.getBoundingClientRect();
       const margin = 3;
-
       let left = 0;
       let top = 0;
+
       switch (this.props.position) {
         case 'right':
           top = tooltipRect.top - bubbleRect.height / 2 + tooltipRect.height / 2;
@@ -138,18 +125,25 @@ class Tooltip extends React.PureComponent<Props, State> {
 
       bubble.style.left = `${Math.max(0, left)}px`;
       bubble.style.top = `${Math.max(0, top)}px`;
-
-      this.setState({ visible: true });
+      this.setState({
+        visible: true,
+      });
     }, this.props.delay || 400);
   }
 
   _handleMouseLeave(): void {
-    clearTimeout(this._showTimeout);
-    clearTimeout(this._hideTimeout);
+    if (this._showTimeout !== null) {
+      clearTimeout(this._showTimeout);
+    }
+    if (this._hideTimeout !== null) {
+      clearTimeout(this._hideTimeout);
+    }
     this._hideTimeout = setTimeout(() => {
-      this.setState({ visible: false });
-
+      this.setState({
+        visible: false,
+      });
       const bubble = this._bubble;
+
       if (!bubble) {
         return;
       }
@@ -162,14 +156,14 @@ class Tooltip extends React.PureComponent<Props, State> {
     }, 100);
   }
 
-  _getContainer(): HTMLElement {
-    let container = document.querySelector('#tooltips-container');
+  _getContainer() {
+    let container = document.querySelector<HTMLElement>('#tooltips-container');
+
     if (!container) {
       container = document.createElement('div');
       container.id = 'tooltips-container';
       container.style.zIndex = '1000000';
       container.style.position = 'relative';
-
       document.body && document.body.appendChild(container);
     }
 
@@ -180,7 +174,9 @@ class Tooltip extends React.PureComponent<Props, State> {
     if (this._bubble) {
       const el = ReactDOM.findDOMNode(this._bubble);
       el && this._getContainer().appendChild(el);
-      this.setState({ movedToBody: true });
+      this.setState({
+        movedToBody: true,
+      });
     }
   }
 
@@ -188,7 +184,9 @@ class Tooltip extends React.PureComponent<Props, State> {
     if (this._bubble) {
       const el = ReactDOM.findDOMNode(this._bubble);
       el && this._getContainer().removeChild(el);
-      this.setState({ movedToBody: false });
+      this.setState({
+        movedToBody: false,
+      });
     }
   }
 
@@ -198,9 +196,8 @@ class Tooltip extends React.PureComponent<Props, State> {
   }
 
   componentDidUpdate() {
-    // If the bubble has not been moved to body, move it
-    //  this can happen if there is no message during the first mount
-    //  but a message is provided during on a subsequent render
+    // If the bubble has not been moved to body, move it.
+    // This can happen if there is no message during the first mount but a message is provided during on a subsequent render.
     if (!this.state.movedToBody) {
       this._moveBubbleToBody();
     }
@@ -225,11 +222,10 @@ class Tooltip extends React.PureComponent<Props, State> {
       'tooltip__bubble--wide': wide,
       selectable: selectable,
     });
-
     return (
       <StyledTooltip
         className={tooltipClasses}
-        ref={this._setTooltipRef}
+        ref={ref => { this._tooltip = ref; }}
         id={this._id}
         onMouseEnter={this._handleMouseEnter}
         onMouseLeave={this._handleMouseLeave}>
@@ -239,7 +235,7 @@ class Tooltip extends React.PureComponent<Props, State> {
           role="tooltip"
           aria-hidden={!visible}
           aria-describedby={this._id}
-          ref={this._setBubbleRef}>
+          ref={ref => { this._bubble = ref; }}>
           {message}
         </StyledTooltipBubble>
         {children}
@@ -247,5 +243,3 @@ class Tooltip extends React.PureComponent<Props, State> {
     );
   }
 }
-
-export default Tooltip;
diff --git a/packages/insomnia-components/svgr.config.js b/packages/insomnia-components/svgr.config.js
new file mode 100644
index 0000000000..0a6177b425
--- /dev/null
+++ b/packages/insomnia-components/svgr.config.js
@@ -0,0 +1,24 @@
+module.exports = {
+  // @ts-expect-error -- no types yet exist for svgr
+  template: ({ template }, options, { componentName, jsx }) => (
+    template.smart({ plugins: ['jsx', 'typescript'] }).ast`
+      import React, { SVGProps, memo } from 'react';
+  
+      export const ${componentName} = memo<SVGProps<SVGSVGElement>>(props => (
+        ${jsx}
+      ));
+  `),
+  icon: true,
+  replaceAttrValues: {
+    '#000': '',
+    '#FFF': 'currentColor',
+  },
+  ext: 'tsx',
+  prettier: true,
+  prettierConfig: {
+    arrowParens: 'avoid',
+    singleQuote: true,
+    parser: 'typescript',
+  },
+  typescript: true,
+};
diff --git a/packages/insomnia-components/tsconfig.build.json b/packages/insomnia-components/tsconfig.build.json
new file mode 100644
index 0000000000..1a01081554
--- /dev/null
+++ b/packages/insomnia-components/tsconfig.build.json
@@ -0,0 +1,19 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "dist",
+    "rootDir": "src",
+    "jsx": "react",
+    "experimentalDecorators": true,
+    "resolveJsonModule": true
+  },
+  "include": [
+    "src"
+  ],
+  "exclude": [
+    "**/*.test.ts",
+    "**/*.test.tsx",
+    "src/jest"
+  ]
+}
diff --git a/packages/insomnia-components/tsconfig.json b/packages/insomnia-components/tsconfig.json
new file mode 100644
index 0000000000..f5e41f276b
--- /dev/null
+++ b/packages/insomnia-components/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "./tsconfig.build.json",
+  "compilerOptions": {
+    "rootDir": "."
+  },
+  "include": [
+    "src",
+    "webpack",
+    "jest.config.js",
+    ".eslintrc.js",
+    "svgr.config.js"
+  ],
+  "exclude": [
+    "dist"
+  ]
+}
diff --git a/packages/insomnia-components/webpack/webpack.common.js b/packages/insomnia-components/webpack/webpack.common.js
index 4ab9810b19..ef2e33b0b4 100644
--- a/packages/insomnia-components/webpack/webpack.common.js
+++ b/packages/insomnia-components/webpack/webpack.common.js
@@ -1,7 +1,10 @@
 const path = require('path');
+const createStyledComponentsTransformer = require('typescript-plugin-styled-components').default;
+const styledComponentsTransformer = createStyledComponentsTransformer();
 
+/** @type { import('webpack').Configuration } */
 module.exports = {
-  entry: {index: './index.js'},
+  entry: { index: './src/index.ts' },
   target: 'web',
   output: {
     path: path.resolve(__dirname, '../dist'),
@@ -10,16 +13,26 @@ module.exports = {
     library: 'insomniaComponents',
     libraryTarget: 'commonjs2',
   },
-  externals: ['react', 'react-dom', 'styled-components'],
+  optimization: {
+    // Disable minification for now, otherwise smoke tests fail
+    // Note, minification is disabled in insomnia-app as well
+    minimize: false,
+  },
   module: {
     rules: [
       {
-        test: /\.js$/,
-        exclude: /node_modules/,
-        use: {
-          loader: 'babel-loader',
+        test: /\.tsx?$/,
+        loader: 'ts-loader',
+        exclude: [/node_modules/],
+        options: {
+          configFile: 'tsconfig.build.json',
+          getCustomTransformers: () => ({ before: [styledComponentsTransformer] }),
         },
       },
     ],
   },
+  resolve: {
+    extensions: ['.js', '.json', '.ts', '.tsx'],
+  },
+  externals: ['react', 'react-dom', 'styled-components'],
 };
diff --git a/packages/insomnia-components/webpack/webpack.dev.js b/packages/insomnia-components/webpack/webpack.dev.js
index f9addbb1c2..ba56821b22 100644
--- a/packages/insomnia-components/webpack/webpack.dev.js
+++ b/packages/insomnia-components/webpack/webpack.dev.js
@@ -1,7 +1,8 @@
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const common = require('./webpack.common');
 
-module.exports = merge(common, {
+/** @type { import('webpack').Configuration } */
+module.exports = merge(common, ({
   mode: 'development',
   devtool: 'inline-source-map',
-})
+}));
diff --git a/packages/insomnia-components/webpack/webpack.prod.js b/packages/insomnia-components/webpack/webpack.prod.js
index d36f9f6733..abf2db5f18 100644
--- a/packages/insomnia-components/webpack/webpack.prod.js
+++ b/packages/insomnia-components/webpack/webpack.prod.js
@@ -1,7 +1,8 @@
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const common = require('./webpack.common');
 
+/** @type { import('webpack').Configuration } */
 module.exports = merge(common, {
   mode: 'production',
   devtool: 'source-map',
-})
+});
diff --git a/packages/insomnia-cookies/.eslintignore b/packages/insomnia-cookies/.eslintignore
new file mode 100644
index 0000000000..47cd12e47e
--- /dev/null
+++ b/packages/insomnia-cookies/.eslintignore
@@ -0,0 +1,3 @@
+src/tough-cookie.d.ts
+node_modules
+dist
\ No newline at end of file
diff --git a/packages/insomnia-cookies/jest.config.js b/packages/insomnia-cookies/jest.config.js
new file mode 100644
index 0000000000..537ce057da
--- /dev/null
+++ b/packages/insomnia-cookies/jest.config.js
@@ -0,0 +1,17 @@
+/** @type { import('@jest/types').Config.InitialOptions } */
+module.exports = {
+  globals: {
+    'ts-jest': {
+      isolatedModules: true,
+    },
+  },
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+  testRegex: ['.+\\.test\\.ts$'],
+  collectCoverage: false,
+  collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  coverageReporters: ['text-summary', 'lcov'],
+};
diff --git a/packages/insomnia-cookies/package.json b/packages/insomnia-cookies/package.json
index 2d1f7d9811..12d003a484 100644
--- a/packages/insomnia-cookies/package.json
+++ b/packages/insomnia-cookies/package.json
@@ -4,9 +4,21 @@
   "author": "Gregory Schier <greg.schier@konghq.com>",
   "description": "Cookie utilities",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "package.json",
+    "READEM.md"
+  ],
   "scripts": {
-    "test": "jest --silent"
+    "bootstrap": "npm run build",
+    "lint": "eslint . --ext .js,.ts,.tsx",
+    "lint:fix": "npm run lint -- --fix",
+    "clean": "tsc --build tsconfig.build.json --clean",
+    "postclean": "rimraf dist",
+    "build": "tsc --build tsconfig.build.json",
+    "test": "jest"
   },
   "dependencies": {
     "tough-cookie": "^2.3.3"
diff --git a/packages/insomnia-cookies/__tests__/index.test.js b/packages/insomnia-cookies/src/cookies.test.ts
similarity index 79%
rename from packages/insomnia-cookies/__tests__/index.test.js
rename to packages/insomnia-cookies/src/cookies.test.ts
index ebaababc07..33f664e75d 100644
--- a/packages/insomnia-cookies/__tests__/index.test.js
+++ b/packages/insomnia-cookies/src/cookies.test.ts
@@ -1,5 +1,5 @@
-const { CookieJar } = require('tough-cookie');
-const { jarFromCookies, cookiesFromJar } = require('..');
+import { CookieJar, Cookie, CookieSerialized } from 'tough-cookie';
+import { jarFromCookies, cookiesFromJar } from './cookies';
 
 describe('jarFromCookies()', () => {
   it('returns valid cookies', done => {
@@ -8,7 +8,7 @@ describe('jarFromCookies()', () => {
         key: 'foo',
         value: 'bar',
         domain: 'google.com',
-      },
+      } as Cookie,
     ]);
 
     jar.store.getAllCookies((err, cookies) => {
@@ -23,6 +23,7 @@ describe('jarFromCookies()', () => {
   });
 
   it('handles malformed JSON', () => {
+    // @ts-expect-error this test is verifying that an invalid input is handled appropriately
     const jar = jarFromCookies('not a jar');
     expect(jar.constructor.name).toBe('CookieJar');
   });
@@ -31,7 +32,7 @@ describe('jarFromCookies()', () => {
 describe('cookiesFromJar()', () => {
   it('returns valid jar', async () => {
     const d = new Date();
-    const initialCookies = [
+    const initialCookies: CookieSerialized[] = [
       {
         key: 'bar',
         value: 'baz',
@@ -41,7 +42,7 @@ describe('cookiesFromJar()', () => {
       {
         // This one will fail to parse, and be skipped
         bad: 'cookie',
-      },
+      } as CookieSerialized,
     ];
 
     const jar = CookieJar.fromJSON({ cookies: initialCookies });
@@ -58,12 +59,12 @@ describe('cookiesFromJar()', () => {
   it('handles bad jar', async () => {
     const jar = CookieJar.fromJSON({ cookies: [] });
 
-    // MemoryStore never actually throws errors, so lets mock the
-    // function to force it to this time.
+    // MemoryStore never actually throws errors, so lets mock the function to force it to this time.
+    // @ts-expect-error intentionally invalid value
     jar.store.getAllCookies = cb => cb(new Error('Dummy Error'));
     const cookies = await cookiesFromJar(jar);
 
-    // Cookies failed to p
+    // Cookies failed to parse
     expect(cookies.length).toBe(0);
   });
 });
diff --git a/packages/insomnia-cookies/index.js b/packages/insomnia-cookies/src/cookies.ts
similarity index 52%
rename from packages/insomnia-cookies/index.js
rename to packages/insomnia-cookies/src/cookies.ts
index 77426a1b96..72c2965407 100644
--- a/packages/insomnia-cookies/index.js
+++ b/packages/insomnia-cookies/src/cookies.ts
@@ -1,19 +1,17 @@
-const { CookieJar, Cookie } = require('tough-cookie');
+import { CookieJar, Cookie, CookieJSON } from 'tough-cookie';
 
 /**
  * Get a list of cookie objects from a request.jar()
- *
- * @param jar
  */
-module.exports.cookiesFromJar = function(jar) {
+export const cookiesFromJar = (cookieJar: CookieJar): Promise<CookieJSON[]> => {
   return new Promise(resolve => {
-    jar.store.getAllCookies((err, cookies) => {
+    cookieJar.store.getAllCookies((err, cookies) => {
       if (err) {
         console.warn('Failed to get cookies form jar', err);
         resolve([]);
       } else {
         // NOTE: Perform toJSON so we have a plain JS object instead of Cookie instance
-        resolve(cookies.map(c => c.toJSON()));
+        resolve(cookies.map(cookie => cookie.toJSON()));
       }
     });
   });
@@ -21,20 +19,18 @@ module.exports.cookiesFromJar = function(jar) {
 
 /**
  * Get a request.jar() from a list of cookie objects
- *
- * @param cookies
  */
-module.exports.jarFromCookies = function(cookies) {
-  let jar;
+export const jarFromCookies = (cookies: Cookie[]) => {
+  let jar: CookieJar;
 
   try {
-    // For some reason, fromJSON modifies `cookies`. Create a copy first
-    // just to be sure
+    // For some reason, fromJSON modifies `cookies`.
+    // Create a copy first just to be sure.
     const copy = JSON.stringify({ cookies });
     jar = CookieJar.fromJSON(copy);
   } catch (e) {
     console.log('[cookies] Failed to initialize cookie jar', e);
-    jar = new CookieJar();
+    jar = new CookieJar() as CookieJar;
   }
 
   jar.rejectPublicSuffixes = false;
@@ -43,18 +39,21 @@ module.exports.jarFromCookies = function(cookies) {
   return jar;
 };
 
-module.exports.cookieToString = function(cookie) {
+export const cookieToString = (cookie: Parameters<typeof Cookie.fromJSON>[0] | Cookie) => {
   // Cookie can either be a plain JS object or Cookie instance
   if (!(cookie instanceof Cookie)) {
-    cookie = Cookie.fromJSON(cookie);
-  }
+    cookie = Cookie.fromJSON(cookie) as Cookie;
 
+    if (cookie === null) {
+      throw new Error(`Unable to read cookie: ${cookie}`);
+    }
+  }
   let str = cookie.toString();
 
   // tough-cookie toString() doesn't put domain on all the time.
   // This hack adds when tough-cookie won't
-  if (cookie.domain && cookie.hostOnly) {
-    str += '; Domain=' + cookie.domain;
+  if ((cookie as Cookie).domain && (cookie as Cookie).hostOnly) {
+    str += `; Domain=${(cookie as Cookie).domain}`;
   }
 
   return str;
diff --git a/packages/insomnia-cookies/src/index.ts b/packages/insomnia-cookies/src/index.ts
new file mode 100644
index 0000000000..a7c627f6fc
--- /dev/null
+++ b/packages/insomnia-cookies/src/index.ts
@@ -0,0 +1 @@
+export { cookiesFromJar, jarFromCookies, cookieToString } from './cookies';
diff --git a/packages/insomnia-cookies/src/tough-cookie.d.ts b/packages/insomnia-cookies/src/tough-cookie.d.ts
new file mode 100644
index 0000000000..4e093a46a9
--- /dev/null
+++ b/packages/insomnia-cookies/src/tough-cookie.d.ts
@@ -0,0 +1,244 @@
+// These types are adapted from the v2.3.5 types because module augmentation is not possible because they named a namespace (`CookieJar`) the same name as a namespace (`CookieJar`) which causes a circular dependency when you try to augment the CookieJar class to add some of the (missing) types we need.
+// If you're asking yourself whether we should upstream these changes the answer is "absolutely... not".  We need to just update to tough-cookie v4.
+
+/* eslint-disable -- eslint has a hard time with declaration files */
+
+declare module 'tough-cookie' {
+
+  // Type definitions for tough-cookie 2.3
+  // Project: https://github.com/salesforce/tough-cookie
+  // Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
+  //                 LiJinyao <https://github.com/LiJinyao>
+  //                 Michael Wei <https://github.com/no2chem>
+  // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+  // TypeScript Version: 2.2
+
+  /**
+   * Parse a cookie date string into a Date.
+   * Parses according to RFC6265 Section 5.1.1, not Date.parse().
+   */
+  export function parseDate(string: string): Date;
+
+  /**
+    * Format a Date into a RFC1123 string (the RFC6265-recommended format).
+    */
+  export function formatDate(date: Date): string;
+
+  /**
+    * Transforms a domain-name into a canonical domain-name.
+    * The canonical domain-name is a trimmed, lowercased, stripped-of-leading-dot
+    * and optionally punycode-encoded domain-name (Section 5.1.2 of RFC6265).
+    * For the most part, this function is idempotent (can be run again on its output without ill effects).
+    */
+  export function canonicalDomain(str: string): string;
+
+  /**
+    * Answers "does this real domain match the domain in a cookie?".
+    * The str is the "current" domain-name and the domStr is the "cookie" domain-name.
+    * Matches according to RFC6265 Section 5.1.3, but it helps to think of it as a "suffix match".
+    *
+    * The canonicalize parameter will run the other two parameters through canonicalDomain or not.
+    */
+  export function domainMatch(str: string, domStr: string, canonicalize?: boolean): boolean;
+
+  /**
+    * Given a current request/response path, gives the Path apropriate for storing in a cookie.
+    * This is basically the "directory" of a "file" in the path, but is specified by Section 5.1.4 of the RFC.
+    *
+    * The path parameter MUST be only the pathname part of a URI (i.e. excludes the hostname, query, fragment, etc.).
+    * This is the .pathname property of node's uri.parse() output.
+    */
+  export function defaultPath(path: string): string;
+
+  /**
+    * Answers "does the request-path path-match a given cookie-path?" as per RFC6265 Section 5.1.4.
+    * Returns a boolean.
+    *
+    * This is essentially a prefix-match where cookiePath is a prefix of reqPath.
+    */
+  export function pathMatch(reqPath: string, cookiePath: string): boolean;
+
+  /**
+    * alias for fromJSON(string)
+    */
+  export function fromJSON(string: string): Cookie;
+
+  export function getPublicSuffix(hostname: string): string | null;
+
+  export function cookieCompare(a: Cookie, b: Cookie): number;
+
+  export function permuteDomain(domain: string): string[];
+
+  export function permutePath(path: string): string[];
+
+  export interface CookieJSON { [key: string]: any; }
+
+  export class Cookie {
+    static parse(cookieString: string, options?: ParseOptions): Cookie | undefined;
+
+    static fromJSON(strOrObj: string | object): Cookie | null;
+
+    constructor(properties?: CookieProperties);
+
+    key: string;
+    value: string;
+    expires: Date | 'Infinity';
+    maxAge: number | 'Infinity' | '-Infinity';
+    domain: string | null;
+    path: string | null;
+    secure: boolean;
+    httpOnly: boolean;
+    extensions: string[] | null;
+    creation: Date | null;
+    creationIndex: number;
+
+    hostOnly: boolean | null;
+    pathIsDefault: boolean | null;
+    lastAccessed: Date | null;
+
+    toString(): string;
+
+    cookieString(): string;
+
+    setExpires(String: string): void;
+
+    setMaxAge(number: number): void;
+
+    expiryTime(now?: number): number | typeof Infinity;
+
+    expiryDate(now?: number): Date;
+
+    TTL(now?: Date): number | typeof Infinity;
+
+    canonicalizedDomain(): string;
+
+    cdomain(): string;
+
+    toJSON(): CookieJSON;
+
+    clone(): Cookie;
+
+    validate(): boolean | string;
+  }
+
+  export interface ParseOptions {
+    loose?: boolean;
+  }
+
+  export interface CookieProperties {
+    key?: string;
+    value?: string;
+    expires?: Date;
+    maxAge?: number | 'Infinity' | '-Infinity';
+    domain?: string;
+    path?: string;
+    secure?: boolean;
+    httpOnly?: boolean;
+    extensions?: string[];
+    creation?: Date;
+    creationIndex?: number;
+
+    hostOnly?: boolean;
+    pathIsDefault?: boolean;
+    lastAccessed?: Date;
+  }
+
+  export interface CookieSerialized {
+    [key: string]: any;
+  }
+
+  export interface CookieJarOptions {
+    rejectPublicSuffixes?: boolean;
+    looseMode?: boolean;
+  }
+
+  export interface SetCookieOptions {
+    http?: boolean;
+    secure?: boolean;
+    now?: Date;
+    ignoreError?: boolean;
+  }
+
+  export interface GetCookiesOptions {
+    http?: boolean;
+    secure?: boolean;
+    now?: Date;
+    expire?: boolean;
+    allPaths?: boolean;
+  }
+
+  export interface CookieJarSerialized {
+    version: string;
+    storeType: string;
+    rejectPublicSuffixes: boolean;
+    cookies: CookieSerialized[];
+  }
+
+  export class CookieJar {
+    static deserialize(serialized: CookieJarSerialized | string, store: Store, cb: (err: Error | null, object: CookieJar) => void): void;
+    static deserialize(serialized: CookieJarSerialized | string, cb: (err: Error | null, object: CookieJar) => void): void;
+
+    static deserializeSync(serialized: CookieJarSerialized | string, store?: Store): CookieJar;
+
+    static fromJSON(stringOrObject: string | CookieSerialized): CookieJar;
+
+    constructor(store?: Store, options?: CookieJarOptions);
+
+    setCookie(cookieOrString: Cookie | string, currentUrl: string, options: SetCookieOptions, cb: (err: Error | null, cookie: Cookie) => void): void;
+    setCookie(cookieOrString: Cookie | string, currentUrl: string, cb: (err: Error, cookie: Cookie) => void): void;
+
+    setCookieSync(cookieOrString: Cookie | string, currentUrl: string, options?: SetCookieOptions): void;
+
+    getCookies(currentUrl: string, options: GetCookiesOptions, cb: (err: Error | null, cookies: Cookie[]) => void): void;
+    getCookies(currentUrl: string, cb: (err: Error | null, cookies: Cookie[]) => void): void;
+
+    getCookiesSync(currentUrl: string, options?: GetCookiesOptions): Cookie[];
+
+    getCookieString(currentUrl: string, options: GetCookiesOptions, cb: (err: Error | null, cookies: string) => void): void;
+    getCookieString(currentUrl: string, cb: (err: Error | null, cookies: string) => void): void;
+
+    getCookieStringSync(currentUrl: string, options?: GetCookiesOptions): string;
+
+    getSetCookieStrings(currentUrl: string, options: GetCookiesOptions, cb: (err: Error | null, cookies: string) => void): void;
+    getSetCookieStrings(currentUrl: string, cb: (err: Error | null, cookies: string) => void): void;
+
+    getSetCookieStringsSync(currentUrl: string, options?: GetCookiesOptions): string;
+
+    serialize(cb: (err: Error | null, serializedObject: CookieJarSerialized) => void): void;
+
+    serializeSync(): CookieJarSerialized;
+
+    toJSON(): CookieJarSerialized;
+
+    clone(store: Store, cb: (err: Error | null, newJar: CookieJar) => void): void;
+    clone(cb: (err: Error | null, newJar: CookieJar) => void): void;
+
+    cloneSync(store: Store): CookieJar;
+
+    store: Store;
+
+    rejectPublicSuffixes: boolean;
+
+    looseMode: boolean;
+
+    fromJSON(): CookieJar;
+  }
+
+  export abstract class Store {
+    findCookie(domain: string, path: string, key: string, cb: (err: Error | null, cookie: Cookie | null) => void): void;
+
+    findCookies(domain: string, path: string, cb: (err: Error | null, cookie: Cookie[]) => void): void;
+
+    putCookie(cookie: Cookie, cb: (err: Error | null) => void): void;
+
+    updateCookie(oldCookie: Cookie, newCookie: Cookie, cb: (err: Error | null) => void): void;
+
+    removeCookie(domain: string, path: string, key: string, cb: (err: Error | null) => void): void;
+
+    removeCookies(domain: string, path: string, cb: (err: Error | null) => void): void;
+
+    getAllCookies(cb: (err: Error | null, cookie: Cookie[]) => void): void;
+  }
+
+  export class MemoryCookieStore extends Store { }
+}
\ No newline at end of file
diff --git a/packages/insomnia-cookies/tsconfig.build.json b/packages/insomnia-cookies/tsconfig.build.json
new file mode 100644
index 0000000000..95458e4845
--- /dev/null
+++ b/packages/insomnia-cookies/tsconfig.build.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "dist",
+    "rootDir": "src",
+    "resolveJsonModule": true
+  },
+  "include": [
+    "src"
+  ],
+  "exclude": [
+    "**/*.test.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/insomnia-cookies/tsconfig.json b/packages/insomnia-cookies/tsconfig.json
new file mode 100644
index 0000000000..b9f9bd556d
--- /dev/null
+++ b/packages/insomnia-cookies/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "extends": "./tsconfig.build.json",
+  "compilerOptions": {
+    "composite": false,
+    "rootDir": "."
+  },
+  "include": [
+    "src",
+    "jest.config.js"
+  ],
+  "exclude": [
+    "dist"
+  ]
+}
\ No newline at end of file
diff --git a/packages/insomnia-importers/.eslintignore b/packages/insomnia-importers/.eslintignore
new file mode 100644
index 0000000000..3497551220
--- /dev/null
+++ b/packages/insomnia-importers/.eslintignore
@@ -0,0 +1,2 @@
+bin
+dist
\ No newline at end of file
diff --git a/packages/insomnia-importers/.eslintrc.js b/packages/insomnia-importers/.eslintrc.js
new file mode 100644
index 0000000000..c5d1c094f1
--- /dev/null
+++ b/packages/insomnia-importers/.eslintrc.js
@@ -0,0 +1,8 @@
+/** @type { import('eslint').Linter.Config } */
+module.exports = {
+  extends: '../../.eslintrc.js',
+  rules: {
+    '@typescript-eslint/no-use-before-define': 'off', // TSCONVERSION
+    camelcase: ['error', { allow: ['__export_format', '__export_date', '__export_source', '_postman_variable_scope'] }],
+  },
+};
diff --git a/packages/insomnia-importers/README.md b/packages/insomnia-importers/README.md
index d50ce355b2..b15b1d9571 100755
--- a/packages/insomnia-importers/README.md
+++ b/packages/insomnia-importers/README.md
@@ -23,7 +23,7 @@ npm install -g insomnia-importers
 For programmatic usage, install in project
 
 ```bash
-npm install --save insomnia-importers
+npm install insomnia-importers
 ```
 
 ## Command Line Usage
@@ -53,7 +53,7 @@ const importers = require('insomnia-importers');
 Run all tests
 
 ```shell
-npm test
+npm run test
 ```
 
 Run test watcher
diff --git a/packages/insomnia-importers/bin/cli b/packages/insomnia-importers/bin/cli
index c832b180e1..af72e839ef 100755
--- a/packages/insomnia-importers/bin/cli
+++ b/packages/insomnia-importers/bin/cli
@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require('../src/cli').go();
+require('../dist/src/cli').go();
\ No newline at end of file
diff --git a/packages/insomnia-importers/index.js b/packages/insomnia-importers/index.js
deleted file mode 100755
index 0f9d507669..0000000000
--- a/packages/insomnia-importers/index.js
+++ /dev/null
@@ -1,45 +0,0 @@
-const utils = require('./src/utils');
-
-const importers = [
-  require('./src/importers/insomnia-1'),
-  require('./src/importers/insomnia-2'),
-  require('./src/importers/insomnia-3'),
-  require('./src/importers/insomnia-4'),
-  require('./src/importers/postman'),
-  require('./src/importers/postman-env'),
-  require('./src/importers/har'),
-  require('./src/importers/curl'),
-  require('./src/importers/swagger2'),
-  require('./src/importers/openapi3'),
-  require('./src/importers/wsdl'),
-];
-
-module.exports.convert = async function(contents) {
-  for (const importer of importers) {
-    const resources = await importer.convert(contents);
-
-    if (resources) {
-      if (resources.length > 0 && resources[0].variable) {
-        resources[0].environment = resources[0].variable;
-      }
-      const parsedData = {
-        type: {
-          id: importer.id,
-          name: importer.name,
-          description: importer.description,
-        },
-        data: {
-          _type: 'export',
-          __export_format: 4,
-          __export_date: utils.getDateString(),
-          __export_source: 'insomnia.importers:v0.1.0',
-          resources: resources.map(utils.setDefaults),
-        },
-      };
-
-      return parsedData;
-    }
-  }
-
-  throw new Error('No importers found for file');
-};
diff --git a/packages/insomnia-importers/jest.config.js b/packages/insomnia-importers/jest.config.js
new file mode 100644
index 0000000000..537ce057da
--- /dev/null
+++ b/packages/insomnia-importers/jest.config.js
@@ -0,0 +1,17 @@
+/** @type { import('@jest/types').Config.InitialOptions } */
+module.exports = {
+  globals: {
+    'ts-jest': {
+      isolatedModules: true,
+    },
+  },
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+  testRegex: ['.+\\.test\\.ts$'],
+  collectCoverage: false,
+  collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  coverageReporters: ['text-summary', 'lcov'],
+};
diff --git a/packages/insomnia-importers/package-lock.json b/packages/insomnia-importers/package-lock.json
index 47fc38e096..602e0ba2fe 100644
--- a/packages/insomnia-importers/package-lock.json
+++ b/packages/insomnia-importers/package-lock.json
@@ -4,18 +4,93 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@babel/runtime": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz",
-      "integrity": "sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==",
+    "@apidevtools/json-schema-ref-parser": {
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.7.tgz",
+      "integrity": "sha512-QdwOGF1+eeyFh+17v2Tz626WX0nucd1iKOm6JUTUvCZdbolblCOOQCxGrQPY0f7jEhn36PiAWqZnsC2r5vmUWg==",
       "requires": {
-        "regenerator-runtime": "^0.13.2"
+        "@jsdevtools/ono": "^7.1.3",
+        "call-me-maybe": "^1.0.1",
+        "js-yaml": "^3.13.1"
+      }
+    },
+    "@apidevtools/openapi-schemas": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@apidevtools/openapi-schemas/-/openapi-schemas-2.0.4.tgz",
+      "integrity": "sha512-ob5c4UiaMYkb24pNhvfSABShAwpREvUGCkqjiz/BX9gKZ32y/S22M+ALIHftTAuv9KsFVSpVdIDzi9ZzFh5TCA=="
+    },
+    "@apidevtools/swagger-methods": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@apidevtools/swagger-methods/-/swagger-methods-3.0.2.tgz",
+      "integrity": "sha512-QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg=="
+    },
+    "@apidevtools/swagger-parser": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@apidevtools/swagger-parser/-/swagger-parser-10.0.2.tgz",
+      "integrity": "sha512-JFxcEyp8RlNHgBCE98nwuTkZT6eNFPc1aosWV6wPcQph72TSEEu1k3baJD4/x1qznU+JiDdz8F5pTwabZh+Dhg==",
+      "requires": {
+        "@apidevtools/json-schema-ref-parser": "^9.0.6",
+        "@apidevtools/openapi-schemas": "^2.0.4",
+        "@apidevtools/swagger-methods": "^3.0.2",
+        "@jsdevtools/ono": "^7.1.3",
+        "call-me-maybe": "^1.0.1",
+        "z-schema": "^4.2.3"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "optional": true
+        },
+        "validator": {
+          "version": "12.2.0",
+          "resolved": "https://registry.npmjs.org/validator/-/validator-12.2.0.tgz",
+          "integrity": "sha512-jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ=="
+        },
+        "z-schema": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-4.2.3.tgz",
+          "integrity": "sha512-zkvK/9TC6p38IwcrbnT3ul9in1UX4cm1y/VZSs4GHKIiDCrlafc+YQBgQBUdDXLAoZHf2qvQ7gJJOo6yT1LH6A==",
+          "requires": {
+            "commander": "^2.7.1",
+            "lodash.get": "^4.4.2",
+            "lodash.isequal": "^4.5.0",
+            "validator": "^12.0.0"
+          }
+        }
+      }
+    },
+    "@jsdevtools/ono": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz",
+      "integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="
+    },
+    "@types/lodash": {
+      "version": "4.14.168",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz",
+      "integrity": "sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==",
+      "dev": true
+    },
+    "@types/shell-quote": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@types/shell-quote/-/shell-quote-1.7.0.tgz",
+      "integrity": "sha512-0CJaSSayMigMKu/Egx1eVcFjgGYkP6T4dyPRs462BFrMB/OK2FAJFV/24+6R4cGIXw6ZQpZK8XEd2UCVKfkZRw==",
+      "dev": true
+    },
+    "@types/yaml": {
+      "version": "1.9.7",
+      "resolved": "https://registry.npmjs.org/@types/yaml/-/yaml-1.9.7.tgz",
+      "integrity": "sha512-8WMXRDD1D+wCohjfslHDgICd2JtMATZU8CkhH8LVJqcJs6dyYj5TGptzP8wApbmEullGBSsCEzzap73DQ1HJaA==",
+      "dev": true,
+      "requires": {
+        "yaml": "*"
       }
     },
     "apiconnect-wsdl": {
-      "version": "1.8.29",
-      "resolved": "https://registry.npmjs.org/apiconnect-wsdl/-/apiconnect-wsdl-1.8.29.tgz",
-      "integrity": "sha512-3IjuUdl5aX+dDwEc3IHy5N8/dK7IisuMg699J+iyjqOyjd6ERU1R7rQDremjQ94lrfsSHGTLvhCByXlxO4h2sQ==",
+      "version": "1.8.31",
+      "resolved": "https://registry.npmjs.org/apiconnect-wsdl/-/apiconnect-wsdl-1.8.31.tgz",
+      "integrity": "sha512-kNs26If9xCJnGolVTAt0VWIA8KrqwodQLqDRTrfc7txD54LJ+hFx638sPYEdG9jw78eifWyy+FBlS5befYSa8Q==",
       "requires": {
         "iconv-lite": "^0.4.24",
         "js-yaml": "^3.13.1",
@@ -28,6 +103,12 @@
         "yauzl": "^2.10.0"
       },
       "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "optional": true
+        },
         "json-schema-ref-parser": {
           "version": "7.1.4",
           "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-7.1.4.tgz",
@@ -50,6 +131,11 @@
           "resolved": "https://registry.npmjs.org/ono/-/ono-5.1.0.tgz",
           "integrity": "sha512-GgqRIUWErLX4l9Up0khRtbrlH8Fyj59A0nKv8V6pWEto38aUgnOGOOF7UmgFFLzFnDSc8REzaTXOc0hqEe7yIw=="
         },
+        "openapi-types": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.5.tgz",
+          "integrity": "sha512-11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="
+        },
         "swagger-methods": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/swagger-methods/-/swagger-methods-2.0.2.tgz",
@@ -88,28 +174,13 @@
       }
     },
     "argparse": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "requires": {
         "sprintf-js": "~1.0.2"
       }
     },
-    "array-filter": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
-      "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw="
-    },
-    "array-map": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
-      "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
-    },
-    "array-reduce": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
-      "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys="
-    },
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -159,9 +230,9 @@
       }
     },
     "commander": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz",
+      "integrity": "sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg=="
     },
     "constant-case": {
       "version": "3.0.3",
@@ -173,11 +244,6 @@
         "upper-case": "^2.0.1"
       }
     },
-    "core-js": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
-      "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A=="
-    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -193,9 +259,9 @@
       }
     },
     "esprima": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "fd-slicer": {
       "version": "1.1.0",
@@ -205,11 +271,6 @@
         "pend": "~1.2.0"
       }
     },
-    "format-util": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/format-util/-/format-util-1.0.3.tgz",
-      "integrity": "sha1-Ay3KShFiYqEsQ/TD7IVmQWxbLZU="
-    },
     "header-case": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.3.tgz",
@@ -243,43 +304,18 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
       }
     },
-    "json-schema-ref-parser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz",
-      "integrity": "sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==",
-      "requires": {
-        "call-me-maybe": "^1.0.1",
-        "js-yaml": "^3.12.1",
-        "ono": "^4.0.11"
-      }
-    },
-    "jsonify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
-    },
-    "jsonschema": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.4.tgz",
-      "integrity": "sha512-lz1nOH69GbsVHeVgEdvyavc/33oymY1AZwtePMiMj4HZPMbP5OIKK3zT9INMWjwua/V4Z4yq7wSlBbSG+g4AEw=="
-    },
-    "jsonschema-draft4": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/jsonschema-draft4/-/jsonschema-draft4-1.0.0.tgz",
-      "integrity": "sha1-8K8gBQVPDwrefqIRhhS2ncUS2GU="
-    },
     "jszip": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
-      "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.6.0.tgz",
+      "integrity": "sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ==",
       "requires": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
@@ -327,33 +363,16 @@
         "tslib": "^1.10.0"
       }
     },
-    "ono": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz",
-      "integrity": "sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==",
-      "requires": {
-        "format-util": "^1.0.3"
-      }
-    },
-    "openapi-schema-validation": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/openapi-schema-validation/-/openapi-schema-validation-0.4.2.tgz",
-      "integrity": "sha512-K8LqLpkUf2S04p2Nphq9L+3bGFh/kJypxIG2NVGKX0ffzT4NQI9HirhiY6Iurfej9lCu7y4Ndm4tv+lm86Ck7w==",
-      "requires": {
-        "jsonschema": "1.2.4",
-        "jsonschema-draft4": "^1.0.0",
-        "swagger-schema-official": "2.0.0-bab6bed"
-      }
-    },
     "openapi-schemas": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/openapi-schemas/-/openapi-schemas-1.0.3.tgz",
       "integrity": "sha512-KtMWcK2VtOS+nD8RKSIyScJsj8JrmVWcIX7Kjx4xEHijFYuvMTDON8WfeKOgeSb4uNG6UsqLj5Na7nKbSav9RQ=="
     },
     "openapi-types": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.5.tgz",
-      "integrity": "sha512-11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-7.2.3.tgz",
+      "integrity": "sha512-olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA==",
+      "dev": true
     },
     "pako": {
       "version": "1.0.11",
@@ -416,11 +435,6 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "regenerator-runtime": {
-      "version": "0.13.2",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
-      "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA=="
-    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -452,15 +466,9 @@
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
     },
     "shell-quote": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
-      "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
-      "requires": {
-        "array-filter": "~0.0.0",
-        "array-map": "~0.0.0",
-        "array-reduce": "~0.0.0",
-        "jsonify": "~0.0.0"
-      }
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
+      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="
     },
     "snake-case": {
       "version": "3.0.3",
@@ -484,30 +492,6 @@
         "safe-buffer": "~5.1.0"
       }
     },
-    "swagger-methods": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/swagger-methods/-/swagger-methods-1.0.8.tgz",
-      "integrity": "sha512-G6baCwuHA+C5jf4FNOrosE4XlmGsdjbOjdBK4yuiDDj/ro9uR4Srj3OR84oQMT8F3qKp00tYNv0YN730oTHPZA=="
-    },
-    "swagger-parser": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/swagger-parser/-/swagger-parser-6.0.5.tgz",
-      "integrity": "sha512-UL47eu4+GRm5y+N7J+W6QQiqAJn2lojyqgMwS0EZgA55dXd5xmpQCsjUmH/Rf0eKDiG1kULc9VS515PxAyTDVw==",
-      "requires": {
-        "call-me-maybe": "^1.0.1",
-        "json-schema-ref-parser": "^6.0.3",
-        "ono": "^4.0.11",
-        "openapi-schema-validation": "^0.4.2",
-        "swagger-methods": "^1.0.8",
-        "swagger-schema-official": "2.0.0-bab6bed",
-        "z-schema": "^3.24.2"
-      }
-    },
-    "swagger-schema-official": {
-      "version": "2.0.0-bab6bed",
-      "resolved": "https://registry.npmjs.org/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz",
-      "integrity": "sha1-cAcEaNbSl3ylI3suUZyn0Gouo/0="
-    },
     "tslib": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
@@ -534,11 +518,6 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "validator": {
-      "version": "10.11.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz",
-      "integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="
-    },
     "xml2js": {
       "version": "0.4.23",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
@@ -559,12 +538,9 @@
       "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="
     },
     "yaml": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.5.0.tgz",
-      "integrity": "sha512-nKxSWOa7vxAP2pikrGxbkZsG/garQseRiLn9mIDjzwoQsyVy7ZWIpLoARejnINGGLA4fttuzRFFNxxbsztdJgw==",
-      "requires": {
-        "@babel/runtime": "^7.4.3"
-      }
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
     },
     "yauzl": {
       "version": "2.10.0",
@@ -574,18 +550,6 @@
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
       }
-    },
-    "z-schema": {
-      "version": "3.25.1",
-      "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-3.25.1.tgz",
-      "integrity": "sha512-7tDlwhrBG+oYFdXNOjILSurpfQyuVgkRe3hB2q8TEssamDHB7BbLWYkYO98nTn0FibfdFroFKDjndbgufAgS/Q==",
-      "requires": {
-        "commander": "^2.7.1",
-        "core-js": "^2.5.7",
-        "lodash.get": "^4.0.0",
-        "lodash.isequal": "^4.0.0",
-        "validator": "^10.0.0"
-      }
     }
   }
 }
diff --git a/packages/insomnia-importers/package.json b/packages/insomnia-importers/package.json
index aa83947ffd..60ee06a1bb 100755
--- a/packages/insomnia-importers/package.json
+++ b/packages/insomnia-importers/package.json
@@ -8,21 +8,34 @@
   "bugs": {
     "url": "https://github.com/kong/insomnia"
   },
-  "main": "index.js",
+  "main": "dist/src/index.js",
+  "types": "dist/src/index.d.ts",
   "bin": {
-    "insomnia-import": "./bin/cli"
+    "insomnia-import": "./dist/src/cli"
   },
   "scripts": {
+    "bootstrap": "npm run build",
+    "lint": "eslint . --ext .js,.ts,.tsx",
+    "lint:fix": "npm run lint -- --fix",
+    "clean": "tsc --build tsconfig.build.json --clean",
+    "postclean": "rimraf dist",
+    "build": "tsc --build tsconfig.build.json",
     "test": "jest --silent"
   },
   "dependencies": {
-    "apiconnect-wsdl": "^1.8.29",
+    "apiconnect-wsdl": "^1.8.31",
     "change-case": "^4.1.1",
-    "commander": "^2.20.0",
+    "commander": "^7.1.0",
     "lodash": "^4.17.15",
-    "shell-quote": "^1.6.1",
-    "swagger-parser": "^6.0.5",
-    "yaml": "^1.5.0"
+    "shell-quote": "^1.7.2",
+    "@apidevtools/swagger-parser": "10.0.2",
+    "yaml": "^1.10.0"
   },
-  "gitHead": "e46bf021cf4b4379e31d2b2d9025d476d6839fa1"
+  "gitHead": "e46bf021cf4b4379e31d2b2d9025d476d6839fa1",
+  "devDependencies": {
+    "@types/lodash": "^4.14.168",
+    "@types/shell-quote": "^1.7.0",
+    "@types/yaml": "^1.9.7",
+    "openapi-types": "^7.0.1"
+  }
 }
diff --git a/packages/insomnia-importers/src/cli.js b/packages/insomnia-importers/src/cli.ts
old mode 100755
new mode 100644
similarity index 74%
rename from packages/insomnia-importers/src/cli.js
rename to packages/insomnia-importers/src/cli.ts
index f15acf7822..1527e5896e
--- a/packages/insomnia-importers/src/cli.js
+++ b/packages/insomnia-importers/src/cli.ts
@@ -1,16 +1,13 @@
-'use strict';
+import program from 'commander';
+import path from 'path';
+import { convert } from './convert';
+import fs from 'fs';
+import { version } from '../package.json';
 
-const program = require('commander');
-const path = require('path');
-const importers = require('../index');
-const fs = require('fs');
-const { version } = require('../package.json');
-
-module.exports.go = async function() {
+export const go = async () => {
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
   // Configure the arguments parsing //
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
-
   program
     .version(version, '-v, --version')
     .usage('[options] <input>')
@@ -20,10 +17,7 @@ module.exports.go = async function() {
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
   // Set up the directory to work on //
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
-
   const inputPath = program.args[0];
-  const outputPath = program.output || program.args[1];
-
   if (!inputPath) {
     console.log('Input path not specified');
     process.exit(1);
@@ -32,17 +26,15 @@ module.exports.go = async function() {
   // ~~~~~~~~~~~~~~~~~~~~~~ //
   // Convert the input file //
   // ~~~~~~~~~~~~~~~~~~~~~~ //
-
   const fullInputPath = path.resolve(inputPath);
   const fileContents = fs.readFileSync(fullInputPath, 'utf8');
-
-  const result = await importers.convert(fileContents);
+  const result = await convert(fileContents);
   const exportContents = JSON.stringify(result.data, null, 2);
 
   // ~~~~~~~~~~~~~~~~ //
   // Write the output //
   // ~~~~~~~~~~~~~~~~ //
-
+  const outputPath = program.args[1];
   if (outputPath) {
     const fullOutputPath = path.resolve(outputPath);
     fs.writeFileSync(fullOutputPath, exportContents);
diff --git a/packages/insomnia-importers/src/__tests__/import-errors.test.js b/packages/insomnia-importers/src/convert.test.ts
old mode 100755
new mode 100644
similarity index 70%
rename from packages/insomnia-importers/src/__tests__/import-errors.test.js
rename to packages/insomnia-importers/src/convert.test.ts
index 885c96821a..8bd07a6d00
--- a/packages/insomnia-importers/src/__tests__/import-errors.test.js
+++ b/packages/insomnia-importers/src/convert.test.ts
@@ -1,11 +1,9 @@
-'use strict';
-
-const importers = require('../../index');
+import { convert } from './convert';
 
 describe('Import errors', () => {
   it('fail to find importer', async () => {
     try {
-      await importers.convert('foo');
+      await convert('foo');
       fail('Should have thrown error');
     } catch (err) {
       expect(err.message).toBe('No importers found for file');
diff --git a/packages/insomnia-importers/src/convert.ts b/packages/insomnia-importers/src/convert.ts
new file mode 100644
index 0000000000..5b98803864
--- /dev/null
+++ b/packages/insomnia-importers/src/convert.ts
@@ -0,0 +1,49 @@
+import { setDefaults } from './utils';
+import { importers } from './importers';
+import { ImportRequest } from './entities';
+
+export interface RootConverter {
+  type: {
+    id: string;
+    name: string;
+    description: string;
+  };
+  data: {
+    _type: 'export';
+    __export_format: 4;
+    __export_date: string;
+    __export_source: `insomnia.importers:v${string}`;
+    resources: ImportRequest;
+  };
+}
+
+export const convert = async (rawData: string) => {
+  for (const importer of importers) {
+    const resources = await importer.convert(rawData);
+
+    if (!resources) {
+      continue;
+    }
+
+    if (resources.length > 0 && resources[0].variable) {
+      resources[0].environment = resources[0].variable;
+    }
+
+    return {
+      type: {
+        id: importer.id,
+        name: importer.name,
+        description: importer.description,
+      },
+      data: {
+        _type: 'export',
+        __export_format: 4,
+        __export_date: new Date().toISOString(),
+        __export_source: 'insomnia.importers:v0.1.0',
+        resources: resources.map(setDefaults),
+      },
+    };
+  }
+
+  throw new Error('No importers found for file');
+};
diff --git a/packages/insomnia-importers/src/entities.ts b/packages/insomnia-importers/src/entities.ts
new file mode 100644
index 0000000000..e59c2319b4
--- /dev/null
+++ b/packages/insomnia-importers/src/entities.ts
@@ -0,0 +1,101 @@
+// eslint-disable-next-line @typescript-eslint/no-explicit-any -- this is a temporary hold-me-over while we get the types into better condition
+export type UNKNOWN = any;
+
+export interface UNKNOWN_OBJ {
+  [key: string]: UNKNOWN;
+}
+
+export interface Comment {
+  comment?: UNKNOWN;
+}
+
+export type Variable = `{{ ${string} }}`;
+
+export interface Authentication extends Comment {
+  authorizationUrl?: string;
+  accessTokenUrl?: string;
+  clientId?: string;
+  clientSecret?: Variable;
+  scope?: string;
+  type?: 'basic' | 'oauth2';
+  grantType?: 'authorization_code' | 'password' | 'client_credentials';
+  disabled?: boolean;
+  username?: string;
+  password?: string;
+}
+
+export interface Parameter extends Comment {
+  name: string;
+  value?: string;
+  filename?: string;
+  fileName?: string;
+  disabled?: boolean;
+  type?: 'file' | string;
+}
+
+export type Body =
+  | string
+  | {
+      mimeType?: string;
+      text?: string;
+      params?: Parameter[];
+    };
+
+export interface Cookie {
+  name: string;
+  value: string;
+}
+
+export interface Header extends Comment {
+  name: 'Cookie' | 'Content-Type' | string;
+  disabled?: boolean;
+  value: UNKNOWN;
+}
+
+export interface PostData {
+  params?: Parameter[];
+  mimeType?: string;
+  text?: string;
+}
+
+export interface QueryString extends Comment {
+  name: string;
+}
+
+export type ImportRequestType =
+  | 'environment'
+  | 'request'
+  | 'request_group'
+  | 'workspace';
+
+export interface ImportRequest<T extends {} = {}> extends Comment {
+  _id?: string;
+  _type?: ImportRequestType;
+  authentication?: Authentication;
+  body?: Body;
+  cookies?: Cookie[];
+  environment?: UNKNOWN_OBJ;
+  headers?: Header[];
+  httpVersion?: string;
+  method?: string;
+  name?: string;
+  data?: T;
+  description?: string;
+  parameters?: Parameter[];
+  parentId?: string | null;
+  postData?: PostData;
+  variable?: UNKNOWN;
+  queryString?: QueryString[];
+  url?: string;
+}
+
+export type Converter<T extends {} = {}> = (
+  rawData: string
+) => ImportRequest<T>[] | Promise<ImportRequest<T>[] | null> | null;
+
+export interface Importer {
+  id: string;
+  name: string;
+  description: string;
+  convert: Converter;
+}
diff --git a/packages/insomnia-importers/src/importers/apiconnect-wsdl.d.ts b/packages/insomnia-importers/src/importers/apiconnect-wsdl.d.ts
new file mode 100644
index 0000000000..8b7d6726a8
--- /dev/null
+++ b/packages/insomnia-importers/src/importers/apiconnect-wsdl.d.ts
@@ -0,0 +1,62 @@
+// eslint-disable-next-line @typescript-eslint/no-explicit-any -- this is a temporary hold-me-over while we get the types into better condition
+type UNKNOWN = any;
+interface UNKNOWN_OBJ {
+  [key: string]: UNKNOWN;
+}
+
+type WSDL = UNKNOWN;
+
+interface Service {
+  service: string;
+  filename: string;
+}
+
+interface ServiceData {
+  services: Service[];
+}
+
+interface WSDLEntry {
+  serviceJSON: UNKNOWN;
+  fullName: string;
+  filename: string;
+}
+
+declare module 'apiconnect-wsdl' {
+  export function getJsonForWSDL(
+    location: string,
+    /** Authorization header */
+    auth?: string,
+    options?: {
+      selfContained?: boolean;
+      config?: UNKNOWN;
+      req?: UNKNOWN;
+      flatten?: boolean;
+      sanitizeWSDL?: boolean;
+    }
+  ): Promise<WSDL[]>;
+
+  export function getWSDLServices(
+    allWSDLs: WSDL[],
+    options?: UNKNOWN_OBJ
+  ): ServiceData;
+
+  export function findWSDLForServiceName(
+    allWSDLs: WSDL[],
+    serviceName: string,
+    serviceFilename?: string
+  ): WSDLEntry;
+
+  export interface Swagger {
+    definitions: {
+      Security?: UNKNOWN;
+    };
+    paths: UNKNOWN_OBJ;
+  }
+
+  export function getSwaggerForService(
+    wsdlEntry: WSDLEntry,
+    serviceName: string,
+    wsdlId: string,
+    createOptions?: UNKNOWN_OBJ
+  ): Swagger;
+}
diff --git a/packages/insomnia-importers/src/importers/curl.js b/packages/insomnia-importers/src/importers/curl.js
deleted file mode 100755
index bfed0f0679..0000000000
--- a/packages/insomnia-importers/src/importers/curl.js
+++ /dev/null
@@ -1,258 +0,0 @@
-'use strict';
-
-const { parse } = require('shell-quote');
-const { URL } = require('url');
-
-let requestCount = 1;
-
-module.exports.id = 'curl';
-module.exports.name = 'cURL';
-module.exports.description = 'cURL command line tool';
-
-const SUPPORTED_ARGS = [
-  'url',
-  'u',
-  'user',
-  'header',
-  'H',
-  'cookie',
-  'b',
-  'get',
-  'G',
-  'd',
-  'data',
-  'data-raw',
-  'data-urlencode',
-  'data-binary',
-  'data-ascii',
-  'form',
-  'F',
-  'request',
-  'X',
-];
-
-module.exports.convert = function(rawData) {
-  requestCount = 1;
-
-  if (!rawData.match(/^\s*curl /)) {
-    return null;
-  }
-
-  const requests = [];
-
-  // Parse the whole thing into one big tokenized list
-  const allArgs = parse(rawData);
-
-  // ~~~~~~~~~~~~~~~~~~~~~~ //
-  // Aggregate the commands //
-  // ~~~~~~~~~~~~~~~~~~~~~~ //
-
-  const commands = [];
-
-  let currentCommand = [];
-  for (const arg of allArgs) {
-    if (typeof arg === 'object' && arg.op === ';') {
-      commands.push(currentCommand);
-      currentCommand = [];
-    } else if (typeof arg === 'object' && arg.op.length > 1 && arg.op.indexOf('$') === 0) {
-      if (arg.op[1] === "'") {
-        // Handle the case where literal like -H $'Header: \'Some Quoted Thing\''
-        const str = arg.op.slice(2, arg.op.length - 1).replace(/\\'/g, "'");
-        currentCommand.push(str);
-      }
-    } else if (typeof arg === 'object' && arg.op === 'glob') {
-      currentCommand.push(arg.pattern);
-    } else if (typeof arg === 'object') {
-      // Not sure what this could be, so just skip it
-    } else {
-      currentCommand.push(arg);
-    }
-  }
-
-  // Push the last unfinished command
-  commands.push(currentCommand);
-
-  for (const args of commands) {
-    if (args[0] !== 'curl') {
-      continue;
-    }
-
-    requests.push(importArgs(args));
-  }
-
-  return requests;
-};
-
-function importArgs(args) {
-  // ~~~~~~~~~~~~~~~~~~~~~ //
-  // Collect all the flags //
-  // ~~~~~~~~~~~~~~~~~~~~~ //
-
-  const pairs = {};
-  const singletons = [];
-
-  // Start at 1 so we can skip the ^curl part
-  for (let i = 1; i < args.length; i++) {
-    const arg = args[i];
-    if (arg.match(/^-{1,2}[\w-]+/)) {
-      const isSingleDash = arg[0] === '-' && arg[1] !== '-';
-      let name = arg.replace(/^-{1,2}/, '');
-
-      if (!SUPPORTED_ARGS.includes(name)) {
-        continue;
-      }
-
-      let value;
-      if (isSingleDash && name.length > 1) {
-        // Handle squished arguments like -XPOST
-        value = name.slice(1);
-        name = name.slice(0, 1);
-      } else if (args[i + 1] && args[i + 1].indexOf('-') !== 0) {
-        // Next arg is not a flag, so assign it as the value
-        value = args[i + 1];
-        i++; // Skip next one
-      } else {
-        value = true;
-      }
-
-      if (!pairs[name]) {
-        pairs[name] = [value];
-      } else {
-        pairs[name].push(value);
-      }
-    } else if (arg) {
-      singletons.push(arg);
-    }
-  }
-
-  // ~~~~~~~~~~~~~~~~~ //
-  // Build the request //
-  // ~~~~~~~~~~~~~~~~~ //
-
-  // Url & parameters
-  let parameters = [];
-  let url = '';
-
-  try {
-    const urlObject = new URL(getPairValue(pairs, singletons[0] || '', 'url'));
-    parameters = Array.from(urlObject.searchParams.entries()).map(([key, value]) => ({
-      name: key,
-      value,
-      disabled: false,
-    }));
-    url = urlObject.href.replace(urlObject.search, '').replace(/\/$/, '');
-  } catch (err) {}
-
-  // Authentication
-  const [username, password] = getPairValue(pairs, '', 'u', 'user').split(/:(.*)$/);
-  const authentication = username ? { username: username.trim(), password: password.trim() } : {};
-
-  // Headers
-  const headers = [...(pairs.header || []), ...(pairs.H || [])].map(str => {
-    const [name, value] = str.split(/:(.*)$/);
-    return { name: name.trim(), value: value.trim() };
-  });
-
-  // Cookies
-  const cookieHeaderValue = [...(pairs.cookie || []), ...(pairs.b || [])]
-    .map(str => {
-      const name = str.split('=', 1)[0];
-      const value = str.replace(`${name}=`, '');
-      return `${name}=${value}`;
-    })
-    .join('; ');
-
-  // Convert cookie value to header
-  const existingCookieHeader = headers.find(h => h.name.toLowerCase() === 'cookie');
-  if (cookieHeaderValue && existingCookieHeader) {
-    // Has existing cookie header, so let's update it
-    existingCookieHeader.value += `; ${cookieHeaderValue}`;
-  } else if (cookieHeaderValue) {
-    // No existing cookie header, so let's make a new one
-    headers.push({ name: 'Cookie', value: cookieHeaderValue });
-  }
-
-  // Body (Text or Blob)
-  const bodyAsGET = getPairValue(pairs, false, 'G', 'get');
-
-  let textBodyParams = [];
-  const paramNames = ['d', 'data', 'data-raw', 'data-urlencode', 'data-binary', 'data-ascii'];
-
-  for (const paramName of paramNames) {
-    const pair = pairs[paramName];
-    if (pair && pair.length) {
-      textBodyParams = textBodyParams.concat(pair);
-    }
-  }
-  // join params to make body
-  const textBody = textBodyParams.join('&');
-
-  const contentTypeHeader = headers.find(h => h.name.toLowerCase() === 'content-type');
-  const mimeType = contentTypeHeader ? contentTypeHeader.value.split(';')[0] : null;
-
-  // Body (Multipart Form Data)
-  const formDataParams = [...(pairs.form || []), ...(pairs.F || [])].map(str => {
-    const [name, value] = str.split('=');
-    const item = { name };
-
-    if (value.indexOf('@') === 0) {
-      item.fileName = value.slice(1);
-      item.type = 'file';
-    } else {
-      item.value = value;
-      item.type = 'text';
-    }
-    return item;
-  });
-
-  // Body
-  const body = mimeType ? { mimeType: mimeType } : {};
-  if (textBody && bodyAsGET) {
-    const bodyParams = textBody.split('&').map(v => {
-      const [name, value] = v.split('=');
-      return { name: name || '', value: value || '' };
-    });
-
-    parameters.push(...bodyParams);
-  } else if (textBody && mimeType === 'application/x-www-form-urlencoded') {
-    body.params = textBody.split('&').map(v => {
-      const [name, value] = v.split('=');
-      return { name: name || '', value: value || '' };
-    });
-  } else if (textBody) {
-    body.text = textBody;
-    body.mimeType = mimeType || '';
-  } else if (formDataParams.length) {
-    body.params = formDataParams;
-    body.mimeType = mimeType || 'multipart/form-data';
-  }
-
-  // Method
-  let method = getPairValue(pairs, '__UNSET__', 'X', 'request').toUpperCase();
-  if (method === '__UNSET__') {
-    method = body.text || body.params ? 'POST' : 'GET';
-  }
-
-  const count = requestCount++;
-  return {
-    _id: `__REQ_${count}__`,
-    _type: 'request',
-    parentId: '__WORKSPACE_ID__',
-    name: url || `cURL Import ${count}`,
-    parameters,
-    url,
-    method,
-    headers,
-    authentication,
-    body,
-  };
-}
-
-function getPairValue(pairs, defaultValue, ...names) {
-  for (const name of names) {
-    if (pairs[name] && pairs[name].length) {
-      return pairs[name][0];
-    }
-  }
-  return defaultValue;
-}
diff --git a/packages/insomnia-importers/src/importers/curl.ts b/packages/insomnia-importers/src/importers/curl.ts
new file mode 100644
index 0000000000..a78d457116
--- /dev/null
+++ b/packages/insomnia-importers/src/importers/curl.ts
@@ -0,0 +1,344 @@
+import { ControlOperator, parse, ParseEntry } from 'shell-quote';
+import { URL } from 'url';
+import { Converter, ImportRequest, Parameter, PostData } from '../entities';
+
+export const id = 'curl';
+export const name = 'cURL';
+export const description = 'cURL command line tool';
+
+let requestCount = 1;
+
+const SUPPORTED_ARGS = [
+  'url',
+  'u',
+  'user',
+  'header',
+  'H',
+  'cookie',
+  'b',
+  'get',
+  'G',
+  'd',
+  'data',
+  'data-raw',
+  'data-urlencode',
+  'data-binary',
+  'data-ascii',
+  'form',
+  'F',
+  'request',
+  'X',
+];
+
+type Pair = string | boolean;
+
+interface PairsByName {
+  [name: string]: Pair[];
+}
+
+const importCommand = (parseEntries: ParseEntry[]): ImportRequest => {
+  // ~~~~~~~~~~~~~~~~~~~~~ //
+  // Collect all the flags //
+  // ~~~~~~~~~~~~~~~~~~~~~ //
+  const pairsByName: PairsByName = {};
+  const singletons: ParseEntry[] = [];
+
+  // Start at 1 so we can skip the ^curl part
+  for (let i = 1; i < parseEntries.length; i++) {
+    const parseEntry = parseEntries[i];
+
+    if (typeof parseEntry === 'string' && parseEntry.match(/^-{1,2}[\w-]+/)) {
+      const isSingleDash = parseEntry[0] === '-' && parseEntry[1] !== '-';
+      let name = parseEntry.replace(/^-{1,2}/, '');
+
+      if (!SUPPORTED_ARGS.includes(name)) {
+        continue;
+      }
+
+      let value;
+      const nextEntry = parseEntries[i + 1];
+      if (isSingleDash && name.length > 1) {
+        // Handle squished arguments like -XPOST
+        value = name.slice(1);
+        name = name.slice(0, 1);
+      } else if (typeof nextEntry === 'string' && !nextEntry.startsWith('-')) {
+        // Next arg is not a flag, so assign it as the value
+        value = nextEntry;
+        i++; // Skip next one
+      } else {
+        value = true;
+      }
+
+      if (!pairsByName[name]) {
+        pairsByName[name] = [value];
+      } else {
+        pairsByName[name].push(value);
+      }
+    } else if (parseEntry) {
+      singletons.push(parseEntry);
+    }
+  }
+
+  // ~~~~~~~~~~~~~~~~~ //
+  // Build the request //
+  // ~~~~~~~~~~~~~~~~~ //
+
+  /// /////// Url & parameters //////////
+  let parameters: Parameter[] = [];
+  let url = '';
+
+  try {
+    const urlValue = getPairValue(
+      pairsByName,
+      (singletons[0] as string) || '',
+      ['url'],
+    );
+    const { searchParams, href, search } = new URL(urlValue);
+    parameters = Array.from(searchParams.entries()).map(([name, value]) => ({
+      name,
+      value,
+      disabled: false,
+    }));
+
+    url = href.replace(search, '').replace(/\/$/, '');
+  } catch (error) {}
+
+  /// /////// Authentication //////////
+  const [username, password] = getPairValue(pairsByName, '', [
+    'u',
+    'user',
+  ]).split(/:(.*)$/);
+
+  const authentication = username
+    ? {
+        username: username.trim(),
+        password: password.trim(),
+      }
+    : {};
+
+  /// /////// Headers //////////
+  const headers = [
+    ...((pairsByName.header as string[] | undefined) || []),
+    ...((pairsByName.H as string[] | undefined) || []),
+  ].map((header) => {
+    const [name, value] = header.split(/:(.*)$/);
+    return {
+      name: name.trim(),
+      value: value.trim(),
+    };
+  });
+
+  /// /////// Cookies //////////
+  const cookieHeaderValue = [
+    ...((pairsByName.cookie as string[] | undefined) || []),
+    ...((pairsByName.b as string[] | undefined) || []),
+  ]
+    .map((str) => {
+      const name = str.split('=', 1)[0];
+      const value = str.replace(`${name}=`, '');
+      return `${name}=${value}`;
+    })
+    .join('; ');
+
+  // Convert cookie value to header
+  const existingCookieHeader = headers.find(
+    (header) => header.name.toLowerCase() === 'cookie',
+  );
+
+  if (cookieHeaderValue && existingCookieHeader) {
+    // Has existing cookie header, so let's update it
+    existingCookieHeader.value += `; ${cookieHeaderValue}`;
+  } else if (cookieHeaderValue) {
+    // No existing cookie header, so let's make a new one
+    headers.push({
+      name: 'Cookie',
+      value: cookieHeaderValue,
+    });
+  }
+
+  /// /////// Body (Text or Blob) //////////
+  let textBodyParams: Pair[] = [];
+  const paramNames = [
+    'd',
+    'data',
+    'data-raw',
+    'data-urlencode',
+    'data-binary',
+    'data-ascii',
+  ];
+
+  for (const paramName of paramNames) {
+    const pair = pairsByName[paramName];
+
+    if (pair && pair.length) {
+      textBodyParams = textBodyParams.concat(pair);
+    }
+  }
+
+  // join params to make body
+  const textBody = textBodyParams.join('&');
+  const contentTypeHeader = headers.find(
+    (header) => header.name.toLowerCase() === 'content-type',
+  );
+  const mimeType = contentTypeHeader
+    ? contentTypeHeader.value.split(';')[0]
+    : null;
+
+  /// /////// Body (Multipart Form Data) //////////
+  const formDataParams = [
+    ...((pairsByName.form as string[] | undefined) || []),
+    ...((pairsByName.F as string[] | undefined) || []),
+  ].map((str) => {
+    const [name, value] = str.split('=');
+    const item: Parameter = {
+      name,
+    };
+
+    if (value.indexOf('@') === 0) {
+      item.fileName = value.slice(1);
+      item.type = 'file';
+    } else {
+      item.value = value;
+      item.type = 'text';
+    }
+
+    return item;
+  });
+
+  /// /////// Body //////////
+  const body: PostData = mimeType ? { mimeType } : {};
+  const bodyAsGET = getPairValue(pairsByName, false, ['G', 'get']);
+
+  if (textBody && bodyAsGET) {
+    const bodyParams = textBody.split('&').map((v) => {
+      const [name, value] = v.split('=');
+      return {
+        name: name || '',
+        value: value || '',
+      };
+    });
+    parameters.push(...bodyParams);
+  } else if (textBody && mimeType === 'application/x-www-form-urlencoded') {
+    body.params = textBody.split('&').map((v) => {
+      const [name, value] = v.split('=');
+      return {
+        name: name || '',
+        value: value || '',
+      };
+    });
+  } else if (textBody) {
+    body.text = textBody;
+    body.mimeType = mimeType || '';
+  } else if (formDataParams.length) {
+    body.params = formDataParams;
+    body.mimeType = mimeType || 'multipart/form-data';
+  }
+
+  /// /////// Method //////////
+  let method = getPairValue(pairsByName, '__UNSET__', [
+    'X',
+    'request',
+  ]).toUpperCase();
+
+  if (method === '__UNSET__') {
+    method = body.text || body.params ? 'POST' : 'GET';
+  }
+
+  const count = requestCount++;
+  return {
+    _id: `__REQ_${count}__`,
+    _type: 'request',
+    parentId: '__WORKSPACE_ID__',
+    name: url || `cURL Import ${count}`,
+    parameters,
+    url,
+    method,
+    headers,
+    authentication,
+    body,
+  };
+};
+
+const getPairValue = <T extends string | boolean>(
+  parisByName: PairsByName,
+  defaultValue: T,
+  names: string[],
+) => {
+  for (const name of names) {
+    if (parisByName[name] && parisByName[name].length) {
+      return parisByName[name][0] as T;
+    }
+  }
+
+  return defaultValue;
+};
+
+export const convert: Converter = (rawData) => {
+  requestCount = 1;
+
+  if (!rawData.match(/^\s*curl /)) {
+    return null;
+  }
+
+  // Parse the whole thing into one big tokenized list
+  const parseEntries = parse(rawData);
+
+  // ~~~~~~~~~~~~~~~~~~~~~~ //
+  // Aggregate the commands //
+  // ~~~~~~~~~~~~~~~~~~~~~~ //
+  const commands: ParseEntry[][] = [];
+
+  let currentCommand: ParseEntry[] = [];
+
+  for (const parseEntry of parseEntries) {
+    if (typeof parseEntry === 'string') {
+      if (parseEntry.startsWith('$')) {
+        currentCommand.push(parseEntry.slice(1, Infinity));
+      } else {
+        currentCommand.push(parseEntry);
+      }
+      continue;
+    }
+
+    if ((parseEntry as { comment: string }).comment) {
+      continue;
+    }
+
+    const { op } = parseEntry as
+      | { op: 'glob'; pattern: string }
+      | { op: ControlOperator };
+
+    // `;` separates commands
+    if (op === ';') {
+      commands.push(currentCommand);
+      currentCommand = [];
+      continue;
+    }
+
+    if (op?.startsWith('$')) {
+      // Handle the case where literal like -H $'Header: \'Some Quoted Thing\''
+      const str = op.slice(2, op.length - 1).replace(/\\'/g, "'");
+
+      currentCommand.push(str);
+      continue;
+    }
+
+    if (op === 'glob') {
+      currentCommand.push(
+        (parseEntry as { op: 'glob'; pattern: string }).pattern,
+      );
+      continue;
+    }
+
+    // Not sure what else this could be, so just keep going
+  }
+
+  // Push the last unfinished command
+  commands.push(currentCommand);
+
+  const requests: ImportRequest[] = commands
+    .filter((command) => command[0] === 'curl')
+    .map(importCommand);
+
+  return requests;
+};
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/complex-input.sh b/packages/insomnia-importers/src/importers/fixtures/curl/complex-input.sh
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/complex-input.sh
rename to packages/insomnia-importers/src/importers/fixtures/curl/complex-input.sh
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/complex-output.json b/packages/insomnia-importers/src/importers/fixtures/curl/complex-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/complex-output.json
rename to packages/insomnia-importers/src/importers/fixtures/curl/complex-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/dollar-sign-input.sh b/packages/insomnia-importers/src/importers/fixtures/curl/dollar-sign-input.sh
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/dollar-sign-input.sh
rename to packages/insomnia-importers/src/importers/fixtures/curl/dollar-sign-input.sh
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/dollar-sign-output.json b/packages/insomnia-importers/src/importers/fixtures/curl/dollar-sign-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/dollar-sign-output.json
rename to packages/insomnia-importers/src/importers/fixtures/curl/dollar-sign-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/form-input.sh b/packages/insomnia-importers/src/importers/fixtures/curl/form-input.sh
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/form-input.sh
rename to packages/insomnia-importers/src/importers/fixtures/curl/form-input.sh
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/form-output.json b/packages/insomnia-importers/src/importers/fixtures/curl/form-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/form-output.json
rename to packages/insomnia-importers/src/importers/fixtures/curl/form-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/from-chrome-input.sh b/packages/insomnia-importers/src/importers/fixtures/curl/from-chrome-input.sh
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/from-chrome-input.sh
rename to packages/insomnia-importers/src/importers/fixtures/curl/from-chrome-input.sh
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/from-chrome-output.json b/packages/insomnia-importers/src/importers/fixtures/curl/from-chrome-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/from-chrome-output.json
rename to packages/insomnia-importers/src/importers/fixtures/curl/from-chrome-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/get-input.sh b/packages/insomnia-importers/src/importers/fixtures/curl/get-input.sh
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/get-input.sh
rename to packages/insomnia-importers/src/importers/fixtures/curl/get-input.sh
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/get-output.json b/packages/insomnia-importers/src/importers/fixtures/curl/get-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/get-output.json
rename to packages/insomnia-importers/src/importers/fixtures/curl/get-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/header-colon-input.sh b/packages/insomnia-importers/src/importers/fixtures/curl/header-colon-input.sh
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/header-colon-input.sh
rename to packages/insomnia-importers/src/importers/fixtures/curl/header-colon-input.sh
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/header-colon-output.json b/packages/insomnia-importers/src/importers/fixtures/curl/header-colon-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/header-colon-output.json
rename to packages/insomnia-importers/src/importers/fixtures/curl/header-colon-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/multi-data-input.sh b/packages/insomnia-importers/src/importers/fixtures/curl/multi-data-input.sh
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/multi-data-input.sh
rename to packages/insomnia-importers/src/importers/fixtures/curl/multi-data-input.sh
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/multi-data-output.json b/packages/insomnia-importers/src/importers/fixtures/curl/multi-data-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/multi-data-output.json
rename to packages/insomnia-importers/src/importers/fixtures/curl/multi-data-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/multi-input.sh b/packages/insomnia-importers/src/importers/fixtures/curl/multi-input.sh
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/multi-input.sh
rename to packages/insomnia-importers/src/importers/fixtures/curl/multi-input.sh
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/multi-output.json b/packages/insomnia-importers/src/importers/fixtures/curl/multi-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/multi-output.json
rename to packages/insomnia-importers/src/importers/fixtures/curl/multi-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/no-url-input.sh b/packages/insomnia-importers/src/importers/fixtures/curl/no-url-input.sh
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/no-url-input.sh
rename to packages/insomnia-importers/src/importers/fixtures/curl/no-url-input.sh
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/no-url-output.json b/packages/insomnia-importers/src/importers/fixtures/curl/no-url-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/no-url-output.json
rename to packages/insomnia-importers/src/importers/fixtures/curl/no-url-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/question-mark-input.sh b/packages/insomnia-importers/src/importers/fixtures/curl/question-mark-input.sh
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/question-mark-input.sh
rename to packages/insomnia-importers/src/importers/fixtures/curl/question-mark-input.sh
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/question-mark-output.json b/packages/insomnia-importers/src/importers/fixtures/curl/question-mark-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/question-mark-output.json
rename to packages/insomnia-importers/src/importers/fixtures/curl/question-mark-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/simple-url-input.sh b/packages/insomnia-importers/src/importers/fixtures/curl/simple-url-input.sh
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/simple-url-input.sh
rename to packages/insomnia-importers/src/importers/fixtures/curl/simple-url-input.sh
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/simple-url-output.json b/packages/insomnia-importers/src/importers/fixtures/curl/simple-url-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/simple-url-output.json
rename to packages/insomnia-importers/src/importers/fixtures/curl/simple-url-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/skip-squished-input.sh b/packages/insomnia-importers/src/importers/fixtures/curl/skip-squished-input.sh
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/skip-squished-input.sh
rename to packages/insomnia-importers/src/importers/fixtures/curl/skip-squished-input.sh
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/squished-output.json b/packages/insomnia-importers/src/importers/fixtures/curl/squished-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/squished-output.json
rename to packages/insomnia-importers/src/importers/fixtures/curl/squished-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/url-only-input.sh b/packages/insomnia-importers/src/importers/fixtures/curl/url-only-input.sh
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/url-only-input.sh
rename to packages/insomnia-importers/src/importers/fixtures/curl/url-only-input.sh
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/url-only-output.json b/packages/insomnia-importers/src/importers/fixtures/curl/url-only-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/url-only-output.json
rename to packages/insomnia-importers/src/importers/fixtures/curl/url-only-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/urlencoded-input.sh b/packages/insomnia-importers/src/importers/fixtures/curl/urlencoded-input.sh
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/urlencoded-input.sh
rename to packages/insomnia-importers/src/importers/fixtures/curl/urlencoded-input.sh
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/curl/urlencoded-output.json b/packages/insomnia-importers/src/importers/fixtures/curl/urlencoded-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/curl/urlencoded-output.json
rename to packages/insomnia-importers/src/importers/fixtures/curl/urlencoded-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/har/deep-input.json b/packages/insomnia-importers/src/importers/fixtures/har/deep-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/har/deep-input.json
rename to packages/insomnia-importers/src/importers/fixtures/har/deep-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/har/deep-output.json b/packages/insomnia-importers/src/importers/fixtures/har/deep-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/har/deep-output.json
rename to packages/insomnia-importers/src/importers/fixtures/har/deep-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/har/form-data-input.json b/packages/insomnia-importers/src/importers/fixtures/har/form-data-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/har/form-data-input.json
rename to packages/insomnia-importers/src/importers/fixtures/har/form-data-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/har/form-data-output.json b/packages/insomnia-importers/src/importers/fixtures/har/form-data-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/har/form-data-output.json
rename to packages/insomnia-importers/src/importers/fixtures/har/form-data-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/har/minimal-input.json b/packages/insomnia-importers/src/importers/fixtures/har/minimal-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/har/minimal-input.json
rename to packages/insomnia-importers/src/importers/fixtures/har/minimal-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/har/minimal-output.json b/packages/insomnia-importers/src/importers/fixtures/har/minimal-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/har/minimal-output.json
rename to packages/insomnia-importers/src/importers/fixtures/har/minimal-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/har/no-requests-input.json b/packages/insomnia-importers/src/importers/fixtures/har/no-requests-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/har/no-requests-input.json
rename to packages/insomnia-importers/src/importers/fixtures/har/no-requests-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/har/no-requests-output.json b/packages/insomnia-importers/src/importers/fixtures/har/no-requests-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/har/no-requests-output.json
rename to packages/insomnia-importers/src/importers/fixtures/har/no-requests-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/har/shallow-input.json b/packages/insomnia-importers/src/importers/fixtures/har/shallow-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/har/shallow-input.json
rename to packages/insomnia-importers/src/importers/fixtures/har/shallow-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/har/shallow-output.json b/packages/insomnia-importers/src/importers/fixtures/har/shallow-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/har/shallow-output.json
rename to packages/insomnia-importers/src/importers/fixtures/har/shallow-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/insomnia-1/complex-input.json b/packages/insomnia-importers/src/importers/fixtures/insomnia-1/complex-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/insomnia-1/complex-input.json
rename to packages/insomnia-importers/src/importers/fixtures/insomnia-1/complex-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/insomnia-1/complex-output.json b/packages/insomnia-importers/src/importers/fixtures/insomnia-1/complex-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/insomnia-1/complex-output.json
rename to packages/insomnia-importers/src/importers/fixtures/insomnia-1/complex-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/insomnia-1/form-input.json b/packages/insomnia-importers/src/importers/fixtures/insomnia-1/form-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/insomnia-1/form-input.json
rename to packages/insomnia-importers/src/importers/fixtures/insomnia-1/form-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/insomnia-1/form-output.json b/packages/insomnia-importers/src/importers/fixtures/insomnia-1/form-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/insomnia-1/form-output.json
rename to packages/insomnia-importers/src/importers/fixtures/insomnia-1/form-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/insomnia-1/minimal-input.json b/packages/insomnia-importers/src/importers/fixtures/insomnia-1/minimal-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/insomnia-1/minimal-input.json
rename to packages/insomnia-importers/src/importers/fixtures/insomnia-1/minimal-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/insomnia-1/minimal-output.json b/packages/insomnia-importers/src/importers/fixtures/insomnia-1/minimal-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/insomnia-1/minimal-output.json
rename to packages/insomnia-importers/src/importers/fixtures/insomnia-1/minimal-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/insomnia-2/complex-input.json b/packages/insomnia-importers/src/importers/fixtures/insomnia-2/complex-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/insomnia-2/complex-input.json
rename to packages/insomnia-importers/src/importers/fixtures/insomnia-2/complex-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/insomnia-2/complex-output.json b/packages/insomnia-importers/src/importers/fixtures/insomnia-2/complex-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/insomnia-2/complex-output.json
rename to packages/insomnia-importers/src/importers/fixtures/insomnia-2/complex-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/insomnia-3/basic-input.json b/packages/insomnia-importers/src/importers/fixtures/insomnia-3/basic-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/insomnia-3/basic-input.json
rename to packages/insomnia-importers/src/importers/fixtures/insomnia-3/basic-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/insomnia-3/basic-output.json b/packages/insomnia-importers/src/importers/fixtures/insomnia-3/basic-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/insomnia-3/basic-output.json
rename to packages/insomnia-importers/src/importers/fixtures/insomnia-3/basic-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/insomnia-4/basic-input.yaml b/packages/insomnia-importers/src/importers/fixtures/insomnia-4/basic-input.yaml
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/insomnia-4/basic-input.yaml
rename to packages/insomnia-importers/src/importers/fixtures/insomnia-4/basic-input.yaml
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/insomnia-4/basic-output.json b/packages/insomnia-importers/src/importers/fixtures/insomnia-4/basic-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/insomnia-4/basic-output.json
rename to packages/insomnia-importers/src/importers/fixtures/insomnia-4/basic-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/dereferenced-input.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/dereferenced-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/dereferenced-input.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/dereferenced-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/dereferenced-output.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/dereferenced-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/dereferenced-output.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/dereferenced-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/dereferenced-with-tags-input.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/dereferenced-with-tags-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/dereferenced-with-tags-input.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/dereferenced-with-tags-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/dereferenced-with-tags-output.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/dereferenced-with-tags-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/dereferenced-with-tags-output.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/dereferenced-with-tags-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/endpoint-security-input.yaml b/packages/insomnia-importers/src/importers/fixtures/openapi3/endpoint-security-input.yaml
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/endpoint-security-input.yaml
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/endpoint-security-input.yaml
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/endpoint-security-output.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/endpoint-security-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/endpoint-security-output.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/endpoint-security-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/example-with-server-variables-input.yaml b/packages/insomnia-importers/src/importers/fixtures/openapi3/example-with-server-variables-input.yaml
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/example-with-server-variables-input.yaml
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/example-with-server-variables-input.yaml
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/example-with-server-variables-output.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/example-with-server-variables-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/example-with-server-variables-output.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/example-with-server-variables-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/example-without-servers-input.yaml b/packages/insomnia-importers/src/importers/fixtures/openapi3/example-without-servers-input.yaml
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/example-without-servers-input.yaml
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/example-without-servers-input.yaml
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/example-without-servers-output.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/example-without-servers-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/example-without-servers-output.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/example-without-servers-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/global-security-input.yaml b/packages/insomnia-importers/src/importers/fixtures/openapi3/global-security-input.yaml
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/global-security-input.yaml
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/global-security-input.yaml
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/global-security-output.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/global-security-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/global-security-output.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/global-security-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/path-plugin-input.yaml b/packages/insomnia-importers/src/importers/fixtures/openapi3/path-plugin-input.yaml
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/path-plugin-input.yaml
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/path-plugin-input.yaml
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/path-plugin-output.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/path-plugin-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/path-plugin-output.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/path-plugin-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-input.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-input.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-output.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-output.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-readonly-input.yml b/packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-readonly-input.yml
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-readonly-input.yml
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-readonly-input.yml
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-readonly-output.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-readonly-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-readonly-output.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-readonly-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-with-tags-input.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-with-tags-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-with-tags-input.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-with-tags-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-with-tags-output.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-with-tags-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-with-tags-output.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-with-tags-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-yml-input.yml b/packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-yml-input.yml
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-yml-input.yml
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-yml-input.yml
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-yml-output.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-yml-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-yml-output.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-yml-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-yml-with-tags-input.yml b/packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-yml-with-tags-input.yml
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-yml-with-tags-input.yml
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-yml-with-tags-input.yml
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-yml-with-tags-output.json b/packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-yml-with-tags-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/openapi3/petstore-yml-with-tags-output.json
rename to packages/insomnia-importers/src/importers/fixtures/openapi3/petstore-yml-with-tags-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman-env/basic-input.json b/packages/insomnia-importers/src/importers/fixtures/postman-env/basic-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman-env/basic-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman-env/basic-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman-env/basic-output.json b/packages/insomnia-importers/src/importers/fixtures/postman-env/basic-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman-env/basic-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman-env/basic-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman-env/no-name-input.json b/packages/insomnia-importers/src/importers/fixtures/postman-env/no-name-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman-env/no-name-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman-env/no-name-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman-env/no-name-output.json b/packages/insomnia-importers/src/importers/fixtures/postman-env/no-name-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman-env/no-name-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman-env/no-name-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/aws-signature-auth-v2_0-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/aws-signature-auth-v2_0-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/aws-signature-auth-v2_0-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/aws-signature-auth-v2_0-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/aws-signature-auth-v2_0-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/aws-signature-auth-v2_0-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/aws-signature-auth-v2_0-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/aws-signature-auth-v2_0-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/aws-signature-auth-v2_1-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/aws-signature-auth-v2_1-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/aws-signature-auth-v2_1-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/aws-signature-auth-v2_1-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/aws-signature-auth-v2_1-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/aws-signature-auth-v2_1-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/aws-signature-auth-v2_1-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/aws-signature-auth-v2_1-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/basic-auth-v2_0-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/basic-auth-v2_0-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/basic-auth-v2_0-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/basic-auth-v2_0-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/basic-auth-v2_0-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/basic-auth-v2_0-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/basic-auth-v2_0-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/basic-auth-v2_0-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/basic-auth-v2_1-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/basic-auth-v2_1-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/basic-auth-v2_1-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/basic-auth-v2_1-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/basic-auth-v2_1-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/basic-auth-v2_1-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/basic-auth-v2_1-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/basic-auth-v2_1-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/bearer-token-v2_0-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/bearer-token-v2_0-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/bearer-token-v2_0-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/bearer-token-v2_0-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/bearer-token-v2_0-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/bearer-token-v2_0-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/bearer-token-v2_0-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/bearer-token-v2_0-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/bearer-token-v2_1-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/bearer-token-v2_1-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/bearer-token-v2_1-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/bearer-token-v2_1-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/bearer-token-v2_1-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/bearer-token-v2_1-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/bearer-token-v2_1-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/bearer-token-v2_1-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/complex-url-v2_0-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/complex-url-v2_0-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/complex-url-v2_0-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/complex-url-v2_0-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/complex-url-v2_0-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/complex-url-v2_0-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/complex-url-v2_0-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/complex-url-v2_0-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/complex-url-v2_1-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/complex-url-v2_1-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/complex-url-v2_1-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/complex-url-v2_1-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/complex-url-v2_1-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/complex-url-v2_1-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/complex-url-v2_1-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/complex-url-v2_1-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/complex-v2_0-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/complex-v2_0-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/complex-v2_0-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/complex-v2_0-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/complex-v2_0-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/complex-v2_0-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/complex-v2_0-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/complex-v2_0-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/complex-v2_1-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/complex-v2_1-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/complex-v2_1-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/complex-v2_1-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/complex-v2_1-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/complex-v2_1-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/complex-v2_1-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/complex-v2_1-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/digest-auth-v2_0-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/digest-auth-v2_0-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/digest-auth-v2_0-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/digest-auth-v2_0-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/digest-auth-v2_0-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/digest-auth-v2_0-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/digest-auth-v2_0-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/digest-auth-v2_0-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/digest-auth-v2_1-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/digest-auth-v2_1-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/digest-auth-v2_1-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/digest-auth-v2_1-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/digest-auth-v2_1-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/digest-auth-v2_1-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/digest-auth-v2_1-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/digest-auth-v2_1-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/minimal-v2_0-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/minimal-v2_0-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/minimal-v2_0-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/minimal-v2_0-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/minimal-v2_0-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/minimal-v2_0-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/minimal-v2_0-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/minimal-v2_0-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/minimal-v2_1-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/minimal-v2_1-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/minimal-v2_1-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/minimal-v2_1-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/minimal-v2_1-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/minimal-v2_1-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/minimal-v2_1-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/minimal-v2_1-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/oauth1_0-auth-v2_0-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/oauth1_0-auth-v2_0-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/oauth1_0-auth-v2_0-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/oauth1_0-auth-v2_0-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/oauth1_0-auth-v2_0-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/oauth1_0-auth-v2_0-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/oauth1_0-auth-v2_0-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/oauth1_0-auth-v2_0-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/oauth1_0-auth-v2_1-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/oauth1_0-auth-v2_1-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/oauth1_0-auth-v2_1-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/oauth1_0-auth-v2_1-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/oauth1_0-auth-v2_1-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/oauth1_0-auth-v2_1-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/oauth1_0-auth-v2_1-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/oauth1_0-auth-v2_1-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/oauth2_0-auth-v2_0-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/oauth2_0-auth-v2_0-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/oauth2_0-auth-v2_0-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/oauth2_0-auth-v2_0-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/oauth2_0-auth-v2_0-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/oauth2_0-auth-v2_0-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/oauth2_0-auth-v2_0-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/oauth2_0-auth-v2_0-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/oauth2_0-auth-v2_1-input.json b/packages/insomnia-importers/src/importers/fixtures/postman/oauth2_0-auth-v2_1-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/oauth2_0-auth-v2_1-input.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/oauth2_0-auth-v2_1-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/postman/oauth2_0-auth-v2_1-output.json b/packages/insomnia-importers/src/importers/fixtures/postman/oauth2_0-auth-v2_1-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/postman/oauth2_0-auth-v2_1-output.json
rename to packages/insomnia-importers/src/importers/fixtures/postman/oauth2_0-auth-v2_1-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/dereferenced-input.json b/packages/insomnia-importers/src/importers/fixtures/swagger2/dereferenced-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/swagger2/dereferenced-input.json
rename to packages/insomnia-importers/src/importers/fixtures/swagger2/dereferenced-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/dereferenced-output.json b/packages/insomnia-importers/src/importers/fixtures/swagger2/dereferenced-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/swagger2/dereferenced-output.json
rename to packages/insomnia-importers/src/importers/fixtures/swagger2/dereferenced-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/dereferenced-with-tags-input.json b/packages/insomnia-importers/src/importers/fixtures/swagger2/dereferenced-with-tags-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/swagger2/dereferenced-with-tags-input.json
rename to packages/insomnia-importers/src/importers/fixtures/swagger2/dereferenced-with-tags-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/dereferenced-with-tags-output.json b/packages/insomnia-importers/src/importers/fixtures/swagger2/dereferenced-with-tags-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/swagger2/dereferenced-with-tags-output.json
rename to packages/insomnia-importers/src/importers/fixtures/swagger2/dereferenced-with-tags-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-input.json b/packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-input.json
rename to packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-output.json b/packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-output.json
rename to packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-with-tags-input.json b/packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-with-tags-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-with-tags-input.json
rename to packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-with-tags-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-with-tags-output.json b/packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-with-tags-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-with-tags-output.json
rename to packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-with-tags-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-yml-input.yml b/packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-yml-input.yml
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-yml-input.yml
rename to packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-yml-input.yml
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-yml-output.json b/packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-yml-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-yml-output.json
rename to packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-yml-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-yml-with-tags-input.yml b/packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-yml-with-tags-input.yml
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-yml-with-tags-input.yml
rename to packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-yml-with-tags-input.yml
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-yml-with-tags-output.json b/packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-yml-with-tags-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/swagger2/petstore-yml-with-tags-output.json
rename to packages/insomnia-importers/src/importers/fixtures/swagger2/petstore-yml-with-tags-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/user-example-input.json b/packages/insomnia-importers/src/importers/fixtures/swagger2/user-example-input.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/swagger2/user-example-input.json
rename to packages/insomnia-importers/src/importers/fixtures/swagger2/user-example-input.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/swagger2/user-example-output.json b/packages/insomnia-importers/src/importers/fixtures/swagger2/user-example-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/swagger2/user-example-output.json
rename to packages/insomnia-importers/src/importers/fixtures/swagger2/user-example-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/wsdl/addition-input.wsdl b/packages/insomnia-importers/src/importers/fixtures/wsdl/addition-input.wsdl
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/wsdl/addition-input.wsdl
rename to packages/insomnia-importers/src/importers/fixtures/wsdl/addition-input.wsdl
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/wsdl/addition-output.json b/packages/insomnia-importers/src/importers/fixtures/wsdl/addition-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/wsdl/addition-output.json
rename to packages/insomnia-importers/src/importers/fixtures/wsdl/addition-output.json
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/wsdl/calculator-input.wsdl b/packages/insomnia-importers/src/importers/fixtures/wsdl/calculator-input.wsdl
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/wsdl/calculator-input.wsdl
rename to packages/insomnia-importers/src/importers/fixtures/wsdl/calculator-input.wsdl
diff --git a/packages/insomnia-importers/src/__tests__/fixtures/wsdl/calculator-output.json b/packages/insomnia-importers/src/importers/fixtures/wsdl/calculator-output.json
similarity index 100%
rename from packages/insomnia-importers/src/__tests__/fixtures/wsdl/calculator-output.json
rename to packages/insomnia-importers/src/importers/fixtures/wsdl/calculator-output.json
diff --git a/packages/insomnia-importers/src/importers/har.js b/packages/insomnia-importers/src/importers/har.js
deleted file mode 100755
index d1cea362ca..0000000000
--- a/packages/insomnia-importers/src/importers/har.js
+++ /dev/null
@@ -1,137 +0,0 @@
-'use strict';
-
-let requestCount = 1;
-
-module.exports.id = 'har';
-module.exports.name = 'HAR 1.2';
-module.exports.description = 'Importer for HTTP Archive 1.2';
-
-module.exports.convert = function(rawData) {
-  requestCount = 1;
-
-  let data;
-  try {
-    data = JSON.parse(rawData);
-    const requests = extractRequests(data);
-    return requests.map(importRequest);
-  } catch (e) {
-    return null;
-  }
-};
-
-function importRequest(request) {
-  const cookieHeaderValue = mapImporter(request.cookies, importCookieToHeaderString).join('; ');
-  const headers = mapImporter(request.headers, importHeader);
-
-  // Convert cookie value to header
-  const existingCookieHeader = headers.find(h => h.name.toLowerCase() === 'cookie');
-  if (cookieHeaderValue && existingCookieHeader) {
-    // Has existing cookie header, so let's update it
-    existingCookieHeader.value += `; ${cookieHeaderValue}`;
-  } else if (cookieHeaderValue) {
-    // No existing cookie header, so let's make a new one
-    headers.push({ name: 'Cookie', value: cookieHeaderValue });
-  }
-
-  const count = requestCount++;
-
-  return {
-    _type: 'request',
-    _id: `__REQ_${count}__`,
-    name: request.comment || request.url || `HAR Import ${count}`,
-    parentId: '__WORKSPACE_ID__',
-    url: importUrl(request.url),
-    method: importMethod(request.method),
-    body: importPostData(request.postData),
-    parameters: mapImporter(request.queryString, importQueryString),
-    headers: headers,
-
-    // Authentication isn't part of HAR, but we should be able to
-    // sniff for things like Basic Authentication headers and pull
-    // out the auth info
-    authentication: {},
-  };
-}
-
-function importUrl(url) {
-  return url;
-}
-
-function importMethod(method) {
-  return method.toUpperCase();
-}
-
-function importCookieToHeaderString(obj) {
-  return `${obj.name}=${obj.value}`;
-}
-
-function importHeader(obj) {
-  return removeComment(obj);
-}
-
-function importQueryString(obj) {
-  return removeComment(obj);
-}
-
-function importPostData(obj) {
-  if (!obj) {
-    return {};
-  }
-
-  if (obj.params && obj.params.length) {
-    const mimeType = obj.mimeType || 'application/x-www-form-urlencoded';
-    const params = obj.params.map(p => {
-      const item = { name: p.name };
-      if (p.fileName) {
-        item.fileName = p.fileName;
-      } else {
-        item.value = p.value || '';
-      }
-      return item;
-    });
-
-    return { params, mimeType };
-  } else {
-    return {
-      mimeType: obj.mimeType || '',
-      text: obj.text || '',
-    };
-  }
-}
-
-function removeComment(obj) {
-  const newObj = Object.assign({}, obj);
-  delete newObj.comment;
-  return newObj;
-}
-
-function mapImporter(arr, importFn) {
-  if (!arr) {
-    return [];
-  } else {
-    return arr.map(importFn);
-  }
-}
-
-function extractRequests(harRoot) {
-  const requests = [];
-
-  const log = harRoot.log;
-  if (!log && harRoot.httpVersion && harRoot.method && harRoot.url) {
-    // If there is not "log" property, try to use the root object
-    // if it looks like a request
-    requests.push(harRoot);
-    return requests;
-  }
-
-  for (const entry of log.entries) {
-    if (entry.comment && entry.request && !entry.request.comment) {
-      // Preserve the entry comment for request name generation
-      entry.request.comment = entry.comment;
-    }
-
-    requests.push(entry.request);
-  }
-
-  return requests;
-}
diff --git a/packages/insomnia-importers/src/importers/har.ts b/packages/insomnia-importers/src/importers/har.ts
new file mode 100644
index 0000000000..17b72e45c7
--- /dev/null
+++ b/packages/insomnia-importers/src/importers/har.ts
@@ -0,0 +1,119 @@
+import { UNKNOWN, ImportRequest, PostData, Body, Converter } from '../entities';
+
+export const id = 'har';
+export const name = 'HAR 1.2';
+export const description = 'Importer for HTTP Archive 1.2';
+
+let requestCount = 1;
+
+interface Entry {
+  comment: UNKNOWN;
+  request: ImportRequest;
+}
+
+interface HarRoot {
+  log: {
+    entries: Entry[];
+  };
+  httpVersion: UNKNOWN;
+  method: UNKNOWN;
+  url: UNKNOWN;
+}
+
+const extractRequests = (harRoot: HarRoot): ImportRequest[] => {
+  const { log, httpVersion, method, url } = harRoot;
+
+  if (!log && httpVersion && method && url) {
+    // If there is not "log" property, try to use the root object if it looks like a request
+    return [harRoot];
+  }
+
+  return log.entries.map(({ comment, request }) => {
+    if (comment && request && !request.comment) {
+      // Preserve the entry comment for request name generation
+      request.comment = comment;
+    }
+    return request;
+  });
+};
+
+const removeComment = <T extends { comment?: UNKNOWN }>(obj: T) => {
+  const { comment, ...newObject } = obj;
+  return newObject;
+};
+
+const importPostData = (postData?: PostData): Body => {
+  if (!postData) {
+    return {};
+  }
+
+  const { params, mimeType = '', text = '' } = postData;
+
+  if (params && params.length) {
+    return {
+      mimeType: mimeType || 'application/x-www-form-urlencoded',
+      params: params.map(({ name, fileName, value = '' }) => ({
+        name,
+        ...(fileName ? { fileName } : { value }),
+      })),
+    };
+  } else {
+    return {
+      mimeType,
+      text,
+    };
+  }
+};
+
+const importRequest = (request: ImportRequest): ImportRequest => {
+  const cookieHeaderValue = (request.cookies ?? [])
+    .map(({ name, value }) => `${name}=${value}`)
+    .join('; ');
+
+  const headers = request.headers ? request.headers.map(removeComment) : [];
+
+  // Convert cookie value to header
+  const existingCookieHeader = headers.find(
+    (header) => header.name.toLowerCase() === 'cookie',
+  );
+
+  if (cookieHeaderValue && existingCookieHeader) {
+    // Has existing cookie header, so let's update it
+    existingCookieHeader.value += `; ${cookieHeaderValue}`;
+  } else if (cookieHeaderValue) {
+    // No existing cookie header, so let's make a new one
+    headers.push({
+      name: 'Cookie',
+      value: cookieHeaderValue,
+    });
+  }
+
+  const count = requestCount++;
+  return {
+    _type: 'request',
+    _id: `__REQ_${count}__`,
+    name: request.comment || request.url || `HAR Import ${count}`,
+    parentId: '__WORKSPACE_ID__',
+    url: request.url,
+    method: request.method?.toUpperCase(),
+    body: importPostData(request.postData),
+    parameters: request.queryString
+      ? request.queryString.map(removeComment)
+      : [],
+    headers: headers,
+    // Authentication isn't part of HAR, but we should be able to sniff for things like Basic Authentication headers and pull out the auth info
+    authentication: {},
+  };
+};
+
+export const convert: Converter = (rawData) => {
+  requestCount = 1;
+
+  try {
+    const data = JSON.parse(rawData);
+    const requests = extractRequests(data);
+    return requests.map(importRequest);
+  } catch (error) {
+    return null;
+  }
+};
diff --git a/packages/insomnia-importers/src/__tests__/fixtures.test.js b/packages/insomnia-importers/src/importers/index.test.ts
old mode 100755
new mode 100644
similarity index 55%
rename from packages/insomnia-importers/src/__tests__/fixtures.test.js
rename to packages/insomnia-importers/src/importers/index.test.ts
index 77a33eec2c..27e071111b
--- a/packages/insomnia-importers/src/__tests__/fixtures.test.js
+++ b/packages/insomnia-importers/src/importers/index.test.ts
@@ -1,51 +1,59 @@
-'use strict';
+import fs from 'fs';
+import path from 'path';
+import { convert } from '../convert';
 
-const fs = require('fs');
-const path = require('path');
-
-const importers = require('../../index');
 const fixturesPath = path.join(__dirname, './fixtures');
 const fixtures = fs.readdirSync(fixturesPath);
 
 describe('Fixtures', () => {
-  describe.each(fixtures)('Import %s', name => {
+  describe.each(fixtures)('Import %s', (name) => {
     const dir = path.join(fixturesPath, `./${name}`);
-    const inputs = fs.readdirSync(dir).filter(name => !!name.match(/^(.+)-?input\.[^.]+$/));
+    const inputs = fs
+      .readdirSync(dir)
+      .filter((name) => name.match(/^(.+)-?input\.[^.]+$/));
 
     for (const input of inputs) {
       const prefix = input.replace(/-input\.[^.]+/, '');
       const output = `${prefix}-output.json`;
 
+      // TEMPORARY !!!!!!!!!!!!!!!!!!!!1
+      // TEMPORARY !!!!!!!!!!!!!!!!!!!!1
+      // TEMPORARY !!!!!!!!!!!!!!!!!!!!1
+      // TEMPORARY !!!!!!!!!!!!!!!!!!!!1
+      // TODO(TSCONVERSION)
+      // openapi3
+      // swagger2
+      if (name !== 'openapi3') {
+        continue;
+      }
+
       if (prefix.startsWith('skip')) {
         continue;
       }
 
       it(input, async () => {
         expect.assertions(5);
+
         expect(typeof input).toBe('string');
-        expect(typeof output).toBe('string');
-
         const inputContents = fs.readFileSync(path.join(dir, input), 'utf8');
-        const outputContents = fs.readFileSync(path.join(dir, output), 'utf8');
-
         expect(typeof inputContents).toBe('string');
+
+        expect(typeof output).toBe('string');
+        const outputContents = fs.readFileSync(path.join(dir, output), 'utf8');
         expect(typeof outputContents).toBe('string');
 
-        const results = await importers.convert(inputContents);
+        const results = await convert(inputContents);
         const expected = JSON.parse(outputContents);
-
         expected.__export_date = results.data.__export_date;
-
         expect(results.data).toEqual(expected);
 
         const ids = new Set();
-        for (const r of results.data.resources) {
-          if (ids.has(r._id)) {
-            throw new Error(
-              'Export contained multiple duplicate IDs: ' + JSON.stringify(r, null, '\t'),
-            );
+        for (const resource of results.data.resources) {
+          if (ids.has(resource._id)) {
+            const json = JSON.stringify(resource, null, '\t');
+            throw new Error(`Export contained multiple duplicate IDs: ${json}`);
           }
-          ids.add(r._id);
+          ids.add(resource._id);
         }
       });
     }
diff --git a/packages/insomnia-importers/src/importers/index.ts b/packages/insomnia-importers/src/importers/index.ts
new file mode 100644
index 0000000000..5398bc658e
--- /dev/null
+++ b/packages/insomnia-importers/src/importers/index.ts
@@ -0,0 +1,32 @@
+import * as curl from './curl';
+import * as har from './har';
+import * as insomnia1 from './insomnia-1';
+import * as insomnia2 from './insomnia-2';
+import * as insomnia3 from './insomnia-3';
+import * as insomnia4 from './insomnia-4';
+import * as openapi3 from './openapi-3';
+import * as postmanenv from './postman-env';
+import * as postman from './postman';
+import * as swagger2 from './swagger-2';
+import * as wsdl from './wsdl';
+import { Importer } from '../entities';
+
+// note that the importers are tried one at a time until one works (for every given input).  That means that we would benefit from keeping the less computationally intense importers near the bottom of the list and the more computationally intense ones near the top.
+export const importers: Importer[] = [
+  insomnia1,
+  insomnia2,
+  insomnia3,
+  insomnia4,
+  postman,
+  postmanenv,
+  har,
+  curl,
+  swagger2,
+  openapi3,
+  wsdl,
+];
+
+export { Insomnia1Data } from './insomnia-1';
+export { Insomnia2Data } from './insomnia-2';
+export { Insomnia3Data } from './insomnia-3';
+export { Insomnia4Data } from './insomnia-4';
diff --git a/packages/insomnia-importers/src/importers/insomnia-1.js b/packages/insomnia-importers/src/importers/insomnia-1.js
deleted file mode 100755
index 987a7cd66c..0000000000
--- a/packages/insomnia-importers/src/importers/insomnia-1.js
+++ /dev/null
@@ -1,118 +0,0 @@
-'use strict';
-
-let requestCount = 1;
-let requestGroupCount = 1;
-
-const FORMAT_MAP = {
-  json: 'application/json',
-  xml: 'application/xml',
-  form: 'application/x-www-form-urlencoded',
-  text: 'text/plain',
-};
-
-module.exports.id = 'insomnia-1';
-module.exports.name = 'Insomnia v1';
-module.exports.description = 'Legacy Insomnia format';
-
-module.exports.convert = function(rawData) {
-  requestCount = 1;
-  requestGroupCount = 1;
-
-  let data;
-  try {
-    data = JSON.parse(rawData);
-  } catch (e) {
-    return null;
-  }
-
-  if (data.__export_format !== 1) {
-    // Bail early if it's not the legacy format
-    return null;
-  }
-
-  return importItems(data.items, '__WORKSPACE_ID__');
-};
-
-function importItems(items, parentId) {
-  let resources = [];
-
-  for (const item of items) {
-    const requestGroup = importRequestGroupItem(item, parentId);
-    resources = [
-      ...resources,
-      requestGroup,
-      ...item.requests.map(item => importRequestItem(item, requestGroup._id)),
-    ];
-  }
-
-  return resources;
-}
-
-function importRequestGroupItem(item, parentId) {
-  let environment = {};
-  if (item.environments && item.environments.base) {
-    environment = item.environments.base;
-  }
-
-  const count = requestGroupCount++;
-  return {
-    _type: 'request_group',
-    _id: `__GRP_${count}__`,
-    parentId,
-    environment,
-    name: item.name || `Imported Folder ${count}`,
-  };
-}
-
-function importRequestItem(item, parentId) {
-  const authentication = {};
-  if (item.authentication) {
-    authentication.username = item.authentication.username;
-    authentication.password = item.authentication.password;
-  }
-
-  const headers = item.headers || [];
-  let contentTypeHeader = headers.find(h => h.name.toLowerCase() === 'content-type');
-  if (item.__insomnia && item.__insomnia.format) {
-    const contentType = FORMAT_MAP[item.__insomnia.format];
-    if (!contentTypeHeader) {
-      contentTypeHeader = { name: 'Content-Type', value: contentType };
-      headers.push(contentTypeHeader);
-    }
-  }
-
-  let body = {};
-  if (
-    contentTypeHeader &&
-    (contentTypeHeader.value.match(/^application\/x-www-form-urlencoded/i) ||
-      contentTypeHeader.value.match(/^multipart\/form-encoded/i))
-  ) {
-    body.mimeType = contentTypeHeader.value.split(';')[0];
-    body.params = (item.body || '').split('&').map(v => {
-      const [name, value] = v.split('=');
-      return {
-        name: decodeURIComponent(name),
-        value: decodeURIComponent(value || ''),
-      };
-    });
-  } else if (item.body) {
-    body = {
-      mimeType: FORMAT_MAP[item.__insomnia.format] || '',
-      text: item.body,
-    };
-  }
-
-  const count = requestCount++;
-  return {
-    _type: 'request',
-    _id: `__REQ_${count}__`,
-    parentId,
-    name: item.name || `Imported HAR ${count}`,
-    url: item.url || '',
-    method: item.method || 'GET',
-    body: body,
-    parameters: item.params || [],
-    headers,
-    authentication,
-  };
-}
diff --git a/packages/insomnia-importers/src/importers/insomnia-1.ts b/packages/insomnia-importers/src/importers/insomnia-1.ts
new file mode 100644
index 0000000000..c803b224c1
--- /dev/null
+++ b/packages/insomnia-importers/src/importers/insomnia-1.ts
@@ -0,0 +1,170 @@
+import {
+  Converter,
+  UNKNOWN,
+  UNKNOWN_OBJ,
+  ImportRequest,
+  Header,
+  Parameter,
+} from '../entities';
+
+export const id = 'insomnia-1';
+export const name = 'Insomnia v1';
+export const description = 'Legacy Insomnia format';
+
+type Format = 'form' | 'json' | 'text' | 'xml';
+
+interface Item {
+  requests: UNKNOWN[];
+  name?: string;
+  environments?: {
+    base: UNKNOWN_OBJ;
+  };
+  __insomnia?: {
+    format: Format;
+  };
+  authentication?: {
+    _type?: 'basic';
+    username?: string;
+    password?: string;
+  };
+  headers?: Header[];
+  body:
+    | string
+    | {
+        mimeType: string;
+        text?: string;
+        params?: Parameter[];
+      };
+  params: Parameter[];
+  url?: string;
+  method?: string;
+}
+
+export interface Insomnia1Data {
+  __export_format: 1;
+  items: Item[];
+}
+
+let requestCount = 1;
+let requestGroupCount = 1;
+
+const FORMAT_MAP: Record<Format, string> = {
+  form: 'application/x-www-form-urlencoded',
+  json: 'application/json',
+  text: 'text/plain',
+  xml: 'application/xml',
+};
+
+const importRequestGroupItem = (item: Item): ImportRequest => {
+  const environment = item.environments?.base ?? {};
+
+  const count = requestGroupCount++;
+  return {
+    _type: 'request_group',
+    _id: `__GRP_${count}__`,
+    parentId: '__WORKSPACE_ID__',
+    environment,
+    name: item.name || `Imported Folder ${count}`,
+  };
+};
+
+const importRequestItem = (parentId?: string) => ({
+  authentication: { username, password } = {},
+  headers = [],
+  __insomnia,
+  body: itemBody,
+  name,
+  url = '',
+  method = 'GET',
+  params = [],
+}: Item): ImportRequest => {
+  let contentTypeHeader = headers.find(
+    ({ name }) => name.toLowerCase() === 'content-type',
+  );
+
+  if (__insomnia?.format) {
+    const contentType = FORMAT_MAP[__insomnia.format];
+
+    if (!contentTypeHeader) {
+      contentTypeHeader = {
+        name: 'Content-Type',
+        value: contentType,
+      };
+      headers.push(contentTypeHeader);
+    }
+  }
+
+  let body = {};
+
+  const isForm =
+    contentTypeHeader &&
+    (contentTypeHeader.value.match(/^application\/x-www-form-urlencoded/i) ||
+      contentTypeHeader.value.match(/^multipart\/form-encoded/i));
+
+  if (isForm) {
+    const mimeType = contentTypeHeader ? contentTypeHeader.value.split(';')[0] : '';
+    const params = (typeof itemBody === 'string' ? itemBody : '')
+      .split('&')
+      .map((param) => {
+        const [name, value] = param.split('=');
+        return {
+          name: decodeURIComponent(name),
+          value: decodeURIComponent(value || ''),
+        };
+      });
+    body = {
+      mimeType,
+      params,
+    };
+  } else if (itemBody) {
+    const mimeType = __insomnia?.format ? FORMAT_MAP[__insomnia?.format] : '';
+    body = {
+      mimeType,
+      text: itemBody,
+    };
+  }
+
+  const count = requestCount++;
+  return {
+    _type: 'request',
+    _id: `__REQ_${count}__`,
+    parentId,
+    name: name || `Imported HAR ${count}`,
+    url,
+    method,
+    body,
+    parameters: params || [],
+    headers,
+    authentication: {
+      password,
+      username,
+    },
+  };
+};
+
+export const convert: Converter = (rawData) => {
+  requestCount = 1;
+  requestGroupCount = 1;
+  let data;
+
+  try {
+    data = JSON.parse(rawData) as Insomnia1Data;
+  } catch (error) {
+    return null;
+  }
+
+  if (data.__export_format !== 1) {
+    // Exit early if it's not the legacy format
+    return null;
+  }
+
+  return data.items
+    .map((item) => {
+      const requestGroup = importRequestGroupItem(item);
+      return [
+        requestGroup,
+        ...item.requests.map(importRequestItem(requestGroup._id)),
+      ];
+    })
+    .flat();
+};
diff --git a/packages/insomnia-importers/src/importers/insomnia-2.js b/packages/insomnia-importers/src/importers/insomnia-2.js
deleted file mode 100755
index 4c048e437d..0000000000
--- a/packages/insomnia-importers/src/importers/insomnia-2.js
+++ /dev/null
@@ -1,37 +0,0 @@
-'use strict';
-
-module.exports.id = 'insomnia-2';
-module.exports.name = 'Insomnia v2';
-module.exports.description = 'Insomnia export format 2';
-
-module.exports.convert = function(rawData) {
-  let data;
-  try {
-    data = JSON.parse(rawData);
-  } catch (e) {
-    return null;
-  }
-
-  if (data.__export_format !== 2) {
-    // Bail early if it's not the legacy format
-    return null;
-  }
-
-  // The only difference between 2 and 3 is the request body object
-  for (const resource of data.resources) {
-    if (resource._type !== 'request') {
-      continue;
-    }
-
-    // Convert old String request bodies to new (HAR) schema
-    const headers = resource.headers || [];
-    const contentTypeHeader = headers.find(h => h.name.toLowerCase() === 'content-type');
-    const mimeType = contentTypeHeader ? contentTypeHeader.value.split(';')[0] : null;
-    resource.body = {
-      mimeType: mimeType || '',
-      text: resource.body,
-    };
-  }
-
-  return data.resources;
-};
diff --git a/packages/insomnia-importers/src/importers/insomnia-2.ts b/packages/insomnia-importers/src/importers/insomnia-2.ts
new file mode 100644
index 0000000000..8d52e6b288
--- /dev/null
+++ b/packages/insomnia-importers/src/importers/insomnia-2.ts
@@ -0,0 +1,46 @@
+import { Converter, ImportRequest } from '../entities';
+import { Insomnia1Data } from './insomnia-1';
+
+export const id = 'insomnia-2';
+export const name = 'Insomnia v2';
+export const description = 'Insomnia export format 2';
+
+export interface Insomnia2Data extends Omit<Insomnia1Data, '__export_format'> {
+  __export_format: 2;
+  resources: ImportRequest[];
+}
+
+export const convert: Converter = (rawData) => {
+  let data: Insomnia2Data | null = null;
+
+  try {
+    data = JSON.parse(rawData) as Insomnia2Data;
+  } catch (e) {
+    return null;
+  }
+
+  if (data.__export_format !== 2) {
+    // Exit early if it's not the legacy format
+    return null;
+  }
+
+  // The only difference between 2 and 3 is the request body object
+  for (const resource of data.resources) {
+    if (resource._type !== 'request') {
+      continue;
+    }
+
+    // Convert old String request bodies to new (HAR) schema
+    const contentTypeHeader = resource.headers?.find(
+      ({ name }) => name.toLowerCase() === 'content-type',
+    );
+
+    const mimeType = contentTypeHeader?.value.split(';')[0] ?? '';
+    resource.body = {
+      mimeType,
+      text: resource.body as string,
+    };
+  }
+
+  return data.resources;
+};
diff --git a/packages/insomnia-importers/src/importers/insomnia-3.js b/packages/insomnia-importers/src/importers/insomnia-3.js
deleted file mode 100755
index 6e4241dda0..0000000000
--- a/packages/insomnia-importers/src/importers/insomnia-3.js
+++ /dev/null
@@ -1,22 +0,0 @@
-'use strict';
-
-module.exports.id = 'insomnia-3';
-module.exports.name = 'Insomnia v3';
-module.exports.description = 'Insomnia export format 3';
-
-module.exports.convert = function(rawData) {
-  let data;
-  try {
-    data = JSON.parse(rawData);
-  } catch (e) {
-    return null;
-  }
-
-  if (data.__export_format !== 3) {
-    // Bail early if it's not the legacy format
-    return null;
-  }
-
-  // This is the target export format so nothing needs to change
-  return data.resources;
-};
diff --git a/packages/insomnia-importers/src/importers/insomnia-3.ts b/packages/insomnia-importers/src/importers/insomnia-3.ts
new file mode 100644
index 0000000000..a1f3eedfcb
--- /dev/null
+++ b/packages/insomnia-importers/src/importers/insomnia-3.ts
@@ -0,0 +1,28 @@
+import { Converter } from '../entities';
+import { Insomnia2Data } from './insomnia-2';
+
+export const id = 'insomnia-3';
+export const name = 'Insomnia v3';
+export const description = 'Insomnia export format 3';
+
+export interface Insomnia3Data extends Omit<Insomnia2Data, '__export_format'> {
+  __export_format: 3;
+}
+
+export const convert: Converter = (rawData) => {
+  let data: Insomnia3Data | null = null;
+
+  try {
+    data = JSON.parse(rawData) as Insomnia3Data;
+  } catch (e) {
+    return null;
+  }
+
+  if (data.__export_format !== 3) {
+    // Bail early if it's not the legacy format
+    return null;
+  }
+
+  // This is the target export format so nothing needs to change
+  return data.resources;
+};
diff --git a/packages/insomnia-importers/src/importers/insomnia-4.js b/packages/insomnia-importers/src/importers/insomnia-4.js
deleted file mode 100644
index 1bb1b1f53f..0000000000
--- a/packages/insomnia-importers/src/importers/insomnia-4.js
+++ /dev/null
@@ -1,24 +0,0 @@
-'use strict';
-
-const YAML = require('yaml');
-
-module.exports.id = 'insomnia-4';
-module.exports.name = 'Insomnia v4';
-module.exports.description = 'Insomnia export format 4';
-
-module.exports.convert = function(rawData) {
-  let data;
-  try {
-    data = YAML.parse(rawData);
-  } catch (e) {
-    return null;
-  }
-
-  if (data.__export_format !== 4) {
-    // Bail early if it's not the legacy format
-    return null;
-  }
-
-  // This is the target export format so nothing needs to change
-  return data.resources;
-};
diff --git a/packages/insomnia-importers/src/importers/insomnia-4.ts b/packages/insomnia-importers/src/importers/insomnia-4.ts
new file mode 100644
index 0000000000..a497dc5119
--- /dev/null
+++ b/packages/insomnia-importers/src/importers/insomnia-4.ts
@@ -0,0 +1,28 @@
+import YAML from 'yaml';
+import { Converter } from '../entities';
+import { Insomnia3Data } from './insomnia-3';
+
+export const id = 'insomnia-4';
+export const name = 'Insomnia v4';
+export const description = 'Insomnia export format 4';
+
+export interface Insomnia4Data extends Omit<Insomnia3Data, '__export_format'> {
+  __export_format: 4;
+}
+
+export const convert: Converter = (rawData) => {
+  let data;
+
+  try {
+    data = YAML.parse(rawData);
+  } catch (e) {
+    return null;
+  }
+
+  if (data.__export_format !== 4) {
+    // Bail early if it's not the legacy format
+    return null;
+  } // This is the target export format so nothing needs to change
+
+  return data.resources;
+};
diff --git a/packages/insomnia-importers/src/importers/openapi-3.ts b/packages/insomnia-importers/src/importers/openapi-3.ts
new file mode 100644
index 0000000000..f6d9293f56
--- /dev/null
+++ b/packages/insomnia-importers/src/importers/openapi-3.ts
@@ -0,0 +1,744 @@
+import crypto from 'crypto';
+import { camelCase } from 'change-case';
+import SwaggerParser from '@apidevtools/swagger-parser';
+import { parse as urlParse } from 'url';
+import { Authentication, Converter, ImportRequest } from '../entities';
+import { unthrowableParseJson } from '../utils';
+import YAML from 'yaml';
+import { OpenAPIV2, OpenAPIV3 } from 'openapi-types';
+
+export const id = 'openapi3';
+export const name = 'OpenAPI 3.0';
+export const description = 'Importer for OpenAPI 3.0 specification (json/yaml)';
+
+/* eslint-disable camelcase -- some camecase is required by the parsing of the spec itself */
+
+const SUPPORTED_OPENAPI_VERSION = /^3\.\d+\.\d+$/;
+
+// 3.x.x
+const MIMETYPE_JSON = 'application/json';
+const MIMETYPE_LITERALLY_ANYTHING = '*/*';
+const SUPPORTED_MIME_TYPES = [MIMETYPE_JSON, MIMETYPE_LITERALLY_ANYTHING];
+const WORKSPACE_ID = '__WORKSPACE_ID__';
+const SECURITY_TYPE = {
+  HTTP: 'http',
+  API_KEY: 'apiKey',
+  OAUTH: 'oauth2',
+  OPEN_ID: 'openIdConnect',
+};
+const HTTP_AUTH_SCHEME = {
+  BASIC: 'basic',
+  BEARER: 'bearer',
+};
+const OAUTH_FLOWS = {
+  AUTHORIZATION_CODE: 'authorizationCode',
+  CLIENT_CREDENTIALS: 'clientCredentials',
+  IMPLICIT: 'implicit',
+  PASSWORD: 'password',
+} as const;
+const SUPPORTED_SECURITY_TYPES = [
+  SECURITY_TYPE.HTTP,
+  SECURITY_TYPE.API_KEY,
+  SECURITY_TYPE.OAUTH,
+];
+const SUPPORTED_HTTP_AUTH_SCHEMES = [
+  HTTP_AUTH_SCHEME.BASIC,
+  HTTP_AUTH_SCHEME.BEARER,
+];
+const VARIABLE_SEARCH_VALUE = /{([^}]+)}/g;
+let requestCounts: Record<string, number> = {};
+
+/**
+ * Gets a server to use as the default
+ * Either the first server defined in the specification, or an example if none are specified
+ *
+ * @returns the resolved server URL
+ */
+const getDefaultServerUrl = (api: OpenAPIV3.Document) => {
+  const exampleServer = 'http://example.com/';
+  const servers = api.servers || [];
+  const firstServer = servers[0];
+  const foundServer = firstServer && firstServer.url;
+
+  if (!foundServer) {
+    return urlParse(exampleServer);
+  }
+
+  const url = resolveVariables(firstServer);
+  return urlParse(url);
+};
+
+/**
+ * Resolve default variables for a server url
+ *
+ * @returns the resolved url
+ */
+const resolveVariables = (server: OpenAPIV3.ServerObject) => {
+  let resolvedUrl = server.url;
+  const variables = server.variables || {};
+  let shouldContinue = true;
+
+  do {
+    // Regexp contain the global flag (g), meaning we must execute our regex on the original string.
+    // https://stackoverflow.com/a/27753327
+    const [replace, name] = VARIABLE_SEARCH_VALUE.exec(server.url) || [];
+    const variable = variables && variables[name];
+    const value = variable && variable.default;
+
+    if (name && !value) {
+      // We found a variable in the url (name) but we have no default to replace it with (value)
+      throw new Error(`Server variable "${name}" missing default value`);
+    }
+
+    shouldContinue = !!name;
+    resolvedUrl = replace ? resolvedUrl.replace(replace, value) : resolvedUrl;
+  } while (shouldContinue);
+
+  return resolvedUrl;
+};
+
+/**
+ * Parse string data into openapi 3 object (https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#oasObject)
+ */
+const parseDocument = (rawData: string): OpenAPIV3.Document | null => {
+  try {
+    return (unthrowableParseJson(rawData) ||
+      YAML.parse(rawData)) as OpenAPIV3.Document;
+  } catch (err) {
+    return null;
+  }
+};
+
+/**
+ * Create request definitions based on openapi document.
+ */
+const parseEndpoints = (document?: OpenAPIV3.Document | null) => {
+  if (!document) {
+    return [];
+  }
+
+  const rootSecurity = document.security;
+  const securitySchemes = document.components?.securitySchemes as OpenAPIV3.SecuritySchemeObject | undefined;
+  const defaultParent = WORKSPACE_ID;
+
+  const endpointsSchemas: ({
+    path: string,
+    method: string,
+    tags?: string[],
+  } & OpenAPIV3.SchemaObject)[] = Object.keys(document.paths)
+    .map((path) => {
+      const schemasPerMethod = document.paths[path];
+
+      if (!schemasPerMethod) {
+        return [];
+      }
+
+      return Object.keys(schemasPerMethod)
+        .filter(method => method !== 'parameters' && method.indexOf('x-') !== 0)
+        .map(method => ({
+          ...((schemasPerMethod as Record<string, OpenAPIV3.SchemaObject>)[method]),
+          path,
+          method,
+        }));
+    })
+    .flat();
+
+  const folders = document.tags?.map(importFolderItem(defaultParent)) || [];
+  const folderLookup = folders.reduce((accumulator, folder) => ({
+    ...accumulator,
+    ...(folder.name ? { [folder.name]: folder._id } : {}),
+  }), {} as Record<OpenAPIV3.TagObject['name'], string | undefined>);
+
+  const requests: ImportRequest[] = [];
+  endpointsSchemas.forEach(endpointSchema => {
+    let { tags } = endpointSchema;
+
+    if (!tags || tags.length === 0) {
+      tags = [''];
+    }
+
+    tags.forEach(tag => {
+      const parentId = folderLookup[tag] || defaultParent;
+      const resolvedSecurity = (endpointSchema as unknown as OpenAPIV3.Document).security || rootSecurity;
+      requests.push(
+        importRequest(
+          endpointSchema,
+          parentId,
+          resolvedSecurity,
+          securitySchemes,
+        ),
+      );
+    });
+  });
+
+  return [
+    ...folders,
+    ...requests,
+  ];
+};
+
+/**
+ * Return Insomnia folder / request group
+ */
+const importFolderItem = (parentId: string) => (
+  item: OpenAPIV3.SchemaObject,
+): ImportRequest => {
+  const hash = crypto
+    .createHash('sha1')
+    // @ts-expect-error -- this is not present on the official types, yet was here in the source code
+    .update(item.name)
+    .digest('hex')
+    .slice(0, 8);
+  return {
+    parentId,
+    _id: `fld___WORKSPACE_ID__${hash}`,
+    _type: 'request_group',
+    // @ts-expect-error -- this is not present on the official types, yet was here in the source code
+    name: item.name || 'Folder {requestGroupCount}',
+    description: item.description || '',
+  };
+};
+
+/**
+ * Return path with parameters replaced by insomnia variables
+ *
+ * I.e. "/foo/:bar" => "/foo/{{ bar }}"
+ */
+const pathWithParamsAsVariables = (path?: string) =>
+  path?.replace(VARIABLE_SEARCH_VALUE, '{{ $1 }}') ?? '';
+
+/**
+ * Return Insomnia request
+ */
+const importRequest = (
+  endpointSchema: OpenAPIV3.SchemaObject & { summary?: string; path?: string; method?: string },
+  parentId: string,
+  security?: OpenAPIV3.SecurityRequirementObject[],
+  securitySchemes?: OpenAPIV3.SecuritySchemeObject,
+): ImportRequest => {
+  const name = endpointSchema.summary || endpointSchema.path;
+  const id = generateUniqueRequestId(endpointSchema as OpenAPIV3.OperationObject);
+  const paramHeaders = prepareHeaders(endpointSchema);
+  const {
+    authentication,
+    headers: securityHeaders,
+    parameters: securityParams,
+  } = parseSecurity(security, securitySchemes);
+  return {
+    _type: 'request',
+    _id: id,
+    parentId: parentId,
+    name,
+    method: endpointSchema.method?.toUpperCase(),
+    url: `{{ base_url }}${pathWithParamsAsVariables(endpointSchema.path)}`,
+    body: prepareBody(endpointSchema),
+    headers: [...paramHeaders, ...securityHeaders],
+    authentication: authentication as Authentication,
+    parameters: [...prepareQueryParams(endpointSchema), ...securityParams],
+  };
+};
+
+/**
+ * Imports insomnia definitions of query parameters.
+ */
+const prepareQueryParams = (endpointSchema: OpenAPIV3.PathItemObject) => {
+  return convertParameters(
+    endpointSchema.parameters?.filter(parameter => (
+      (parameter as OpenAPIV3.ParameterObject).in === 'query'
+    )) as OpenAPIV3.ParameterObject[]);
+};
+
+/**
+ * Imports insomnia definitions of header parameters.
+ */
+const prepareHeaders = (endpointSchema: OpenAPIV3.PathItemObject) => {
+  return convertParameters(
+    endpointSchema.parameters?.filter(parameter => (
+      (parameter as OpenAPIV3.ParameterObject).in === 'header'
+    )) as OpenAPIV3.ParameterObject[]);
+};
+
+/**
+ * Parse OpenAPI 3 securitySchemes into insomnia definitions of authentication, headers and parameters
+ * @returns headers or basic|bearer http authentication details
+ */
+const parseSecurity = (
+  security?: OpenAPIV3.SecurityRequirementObject[],
+  securitySchemes?: OpenAPIV3.SecuritySchemeObject,
+) => {
+  if (!security || !securitySchemes) {
+    return {
+      authentication: {},
+      headers: [],
+      parameters: [],
+    };
+  }
+
+  const supportedSchemes = security
+    .map((securityPolicy) => {
+      const securityName = Object.keys(securityPolicy)[0];
+      // @ts-expect-error the base types do not include an index but from what I can tell, they should
+      return securitySchemes[securityName];
+    })
+    .filter(schemeDetails => (
+      schemeDetails && SUPPORTED_SECURITY_TYPES.includes(schemeDetails.type)
+    ));
+  const apiKeySchemes = supportedSchemes.filter(scheme => (
+    scheme.type === SECURITY_TYPE.API_KEY
+  ));
+  const apiKeyHeaders = apiKeySchemes
+    .filter((scheme) => scheme.in === 'header')
+    .map((scheme) => {
+      const variableName = camelCase(scheme.name);
+      return {
+        name: scheme.name,
+        disabled: false,
+        value: `{{ ${variableName} }}`,
+      };
+    });
+  const apiKeyCookies = apiKeySchemes
+    .filter((scheme) => scheme.in === 'cookie')
+    .map((scheme) => {
+      const variableName = camelCase(scheme.name);
+      return `${scheme.name}={{ ${variableName} }}`;
+    });
+  const apiKeyCookieHeader = {
+    name: 'Cookie',
+    disabled: false,
+    value: apiKeyCookies.join('; '),
+  };
+  const apiKeyParams = apiKeySchemes
+    .filter((scheme) => scheme.in === 'query')
+    .map((scheme) => {
+      const variableName = camelCase(scheme.name);
+      return {
+        name: scheme.name,
+        disabled: false,
+        value: `{{ ${variableName} }}`,
+      };
+    });
+
+  if (apiKeyCookies.length > 0) {
+    apiKeyHeaders.push(apiKeyCookieHeader);
+  }
+
+  const authentication = (() => {
+    const authScheme = supportedSchemes.find(
+      (scheme) =>
+        [SECURITY_TYPE.HTTP, SECURITY_TYPE.OAUTH].includes(scheme.type) &&
+        SUPPORTED_HTTP_AUTH_SCHEMES.includes(scheme.scheme),
+    );
+
+    if (!authScheme) {
+      return {};
+    }
+
+    switch (authScheme.type) {
+      case SECURITY_TYPE.HTTP:
+        return parseHttpAuth(
+          (authScheme as OpenAPIV3.HttpSecurityScheme).scheme,
+        );
+
+      case SECURITY_TYPE.OAUTH:
+        return parseOAuth2(authScheme as OpenAPIV3.OAuth2SecurityScheme);
+
+      default:
+        return {};
+    }
+  })();
+
+  return {
+    authentication,
+    headers: apiKeyHeaders,
+    parameters: apiKeyParams,
+  };
+};
+
+/**
+ * Get Insomnia environment variables for OpenAPI securitySchemes
+ *
+ * @returns Insomnia environment variables containing security information
+ */
+const getSecurityEnvVariables = (securitySchemeObject?: OpenAPIV3.SecuritySchemeObject) => {
+  if (!securitySchemeObject) {
+    return {};
+  }
+
+  const securitySchemes = Object.values(securitySchemeObject);
+
+  const apiKeyVariableNames = securitySchemes
+    .filter((scheme) => scheme.type === SECURITY_TYPE.API_KEY)
+    .map((scheme) => camelCase(scheme.name));
+  const variables: Record<string, string> = {};
+  Array.from(new Set(apiKeyVariableNames)).forEach(name => {
+    variables[name] = name;
+  });
+
+  const hasHttpBasicScheme = securitySchemes.some(scheme => (
+    scheme.type === SECURITY_TYPE.HTTP && scheme.scheme === 'basic'
+  ));
+  if (hasHttpBasicScheme) {
+    variables.httpUsername = 'username';
+    variables.httpPassword = 'password';
+  }
+  const hasHttpBearerScheme = securitySchemes.some(scheme => (
+    scheme.type === SECURITY_TYPE.HTTP && scheme.scheme === 'bearer'
+  ));
+  if (hasHttpBearerScheme) {
+    variables.bearerToken = 'bearerToken';
+  }
+
+  const oauth2Variables = securitySchemes.reduce((accumulator, scheme) => {
+    if (scheme.type === SECURITY_TYPE.OAUTH && scheme.scheme === 'bearer') {
+      accumulator.oauth2ClientId = 'clientId';
+      const flows = scheme.flows || {};
+
+      if (
+        flows.authorizationCode ||
+        flows.clientCredentials ||
+        flows.password
+      ) {
+        accumulator.oauth2ClientSecret = 'clientSecret';
+      }
+
+      if (flows.password) {
+        accumulator.oauth2Username = 'username';
+        accumulator.oauth2Password = 'password';
+      }
+    }
+
+    return accumulator;
+  }, {});
+
+  return {
+    ...variables,
+    ...oauth2Variables,
+  };
+};
+
+/**
+ * Imports insomnia request body definitions, including data mock (if available)
+ *
+ * If multiple types are available, the one for which an example can be generated will be selected first (i.e. application/json)
+ */
+const prepareBody = (endpointSchema: OpenAPIV3.OperationObject): ImportRequest['body'] => {
+  const { content } = (endpointSchema.requestBody || { content: {} }) as OpenAPIV3.RequestBodyObject;
+
+  const mimeTypes = Object.keys(content);
+  const supportedMimeType = SUPPORTED_MIME_TYPES.find(mimeType =>
+    mimeTypes.includes(mimeType),
+  );
+
+  if (supportedMimeType === MIMETYPE_JSON) {
+    const bodyParameter = content[supportedMimeType];
+
+    if (bodyParameter == null) {
+      return {
+        mimeType: MIMETYPE_JSON,
+      };
+    }
+
+    const example = generateParameterExample(bodyParameter.schema as OpenAPIV3.SchemaObject);
+    const text = JSON.stringify(example, null, 2);
+    return {
+      mimeType: MIMETYPE_JSON,
+      text,
+    };
+  }
+
+  if (
+    mimeTypes &&
+    mimeTypes.length &&
+    mimeTypes[0] !== MIMETYPE_LITERALLY_ANYTHING
+  ) {
+    return {
+      mimeType: mimeTypes[0] || undefined,
+    };
+  } else {
+    return {};
+  }
+};
+
+/**
+ * Converts openapi schema of parametes into insomnia one.
+ */
+const convertParameters = (parameters: OpenAPIV3.ParameterObject[] = []) => {
+  return parameters.map((parameter) => {
+    const { required, name, schema } = parameter;
+    return {
+      name,
+      disabled: required !== true,
+      value: `${generateParameterExample(schema as OpenAPIV3.SchemaObject)}`,
+    };
+  });
+};
+
+/**
+ * Generate example value of parameter based on it's schema.
+ * Returns example / default value of the parameter, if any of those are defined. If not, returns value based on parameter type.
+ */
+// @ts-expect-error -- ran out of time during TypeScript conversion to handle this particular recursion
+const generateParameterExample = (schema: OpenAPIV3.SchemaObject | string) => {
+  const typeExamples = {
+    string: () => 'string',
+    string_email: () => 'user@example.com',
+    'string_date-time': () => new Date().toISOString(),
+    string_byte: () => 'ZXhhbXBsZQ==',
+    number: () => 0,
+    number_float: () => 0.0,
+    number_double: () => 0.0,
+    integer: () => 0,
+    boolean: () => true,
+    object: (schema: OpenAPIV3.SchemaObject) => {
+      const example: OpenAPIV3.SchemaObject['properties'] = {};
+      const { properties } = schema;
+
+      if (properties) {
+        for (const propertyName of Object.keys(properties)) {
+          example[propertyName] = generateParameterExample(
+            properties[propertyName] as OpenAPIV3.SchemaObject,
+          );
+        }
+      }
+
+      return example;
+    },
+    // @ts-expect-error -- ran out of time during TypeScript conversion to handle this particular recursion
+    array: (schema: OpenAPIV2.ItemsObject) => {
+      // @ts-expect-error -- ran out of time during TypeScript conversion to handle this particular recursion
+      const value = generateParameterExample(schema.items);
+
+      if (schema.collectionFormat === 'csv') {
+        return value;
+      } else {
+        return [value];
+      }
+    },
+  };
+
+  if (typeof schema === 'string') {
+    // @ts-expect-error -- ran out of time during TypeScript conversion to handle this particular recursion
+    return typeExamples[schema];
+  }
+
+  if (schema instanceof Object) {
+    const { type, format, example, readOnly, default: defaultValue } = schema;
+
+    if (readOnly) {
+      return undefined;
+    }
+
+    if (example) {
+      return example;
+    }
+
+    if (defaultValue) {
+      return defaultValue;
+    }
+
+    // @ts-expect-error -- ran out of time during TypeScript conversion to handle this particular recursion
+    const factory = typeExamples[`${type}_${format}`] || typeExamples[type];
+
+    if (!factory) {
+      return null;
+    }
+
+    return factory(schema);
+  }
+};
+
+/**
+ * Generates a unique and deterministic request ID based on the endpoint schema
+ */
+const generateUniqueRequestId = (
+  endpointSchema: OpenAPIV3.OperationObject<{ method?: string; path?: string }>,
+) => {
+  // `operationId` is already unique to the workspace, so we can just use that, combined with the workspace id to get something globally unique
+  const uniqueKey = endpointSchema.operationId || `[${endpointSchema.method}]${endpointSchema.path}`;
+
+  const hash = crypto
+    .createHash('sha1')
+    .update(uniqueKey)
+    .digest('hex')
+    .slice(0, 8);
+
+  // Suffix the ID with a counter in case we try creating two with the same hash
+  if (requestCounts.hasOwnProperty(hash)) {
+    requestCounts[hash] += 1;
+  } else {
+    requestCounts[hash] = 0;
+  }
+
+  return `req_${WORKSPACE_ID}${hash}${requestCounts[hash] || ''}`;
+};
+
+const parseHttpAuth = (scheme: string) => {
+  switch (scheme) {
+    case HTTP_AUTH_SCHEME.BASIC:
+      return {
+        type: 'basic',
+        username: '{{ httpUsername }}',
+        password: '{{ httpPassword }}',
+      };
+
+    case HTTP_AUTH_SCHEME.BEARER:
+      return {
+        type: 'bearer',
+        token: '{{bearerToken}}',
+        prefix: '',
+      };
+
+    default:
+      return {};
+  }
+};
+
+const parseOAuth2Scopes = (
+  flow: OpenAPIV3.OAuth2SecurityScheme['flows'][keyof OpenAPIV3.OAuth2SecurityScheme['flows']],
+) => {
+  if (!flow?.scopes) {
+    return '';
+  }
+
+  const scopes = Object.keys(flow.scopes || {});
+  return scopes.join(' ');
+};
+
+const mapOAuth2GrantType = (
+  grantType: keyof OpenAPIV3.OAuth2SecurityScheme['flows'],
+) => {
+  const types = {
+    [OAUTH_FLOWS.AUTHORIZATION_CODE]: 'authorization_code',
+    [OAUTH_FLOWS.CLIENT_CREDENTIALS]: 'client_credentials',
+    [OAUTH_FLOWS.IMPLICIT]: 'implicit',
+    [OAUTH_FLOWS.PASSWORD]: 'password',
+  };
+  return types[grantType];
+};
+
+const parseOAuth2 = (scheme: OpenAPIV3.OAuth2SecurityScheme) => {
+  const flows = Object.keys(
+    scheme.flows,
+  ) as (keyof OpenAPIV3.OAuth2SecurityScheme['flows'])[];
+
+  if (!flows.length) {
+    return {};
+  }
+
+  const grantType = flows[0];
+  const flow = scheme.flows[grantType];
+
+  if (!flow) {
+    return {};
+  }
+
+  const base = {
+    clientId: '{{ oauth2ClientId }}',
+    grantType: mapOAuth2GrantType(grantType),
+    scope: parseOAuth2Scopes(flow),
+    type: 'oauth2',
+  };
+
+  switch (grantType) {
+    case OAUTH_FLOWS.AUTHORIZATION_CODE:
+      return {
+        ...base,
+        clientSecret: '{{ oauth2ClientSecret }}',
+        accessTokenUrl: (flow as OpenAPIV3.OAuth2SecurityScheme['flows'][typeof OAUTH_FLOWS.AUTHORIZATION_CODE])?.tokenUrl,
+        authorizationUrl: (flow as OpenAPIV3.OAuth2SecurityScheme['flows'][typeof OAUTH_FLOWS.AUTHORIZATION_CODE])?.authorizationUrl,
+      };
+
+    case OAUTH_FLOWS.CLIENT_CREDENTIALS:
+      return {
+        ...base,
+        clientSecret: '{{ oauth2ClientSecret }}',
+        accessTokenUrl: (flow as OpenAPIV3.OAuth2SecurityScheme['flows'][typeof OAUTH_FLOWS.CLIENT_CREDENTIALS])?.tokenUrl,
+      };
+
+    case OAUTH_FLOWS.IMPLICIT:
+      return {
+        ...base,
+        authorizationUrl: (flow as OpenAPIV3.OAuth2SecurityScheme['flows'][typeof OAUTH_FLOWS.IMPLICIT])?.authorizationUrl,
+      };
+
+    case OAUTH_FLOWS.PASSWORD:
+      return {
+        ...base,
+        clientSecret: '{{ oauth2ClientSecret }}',
+        username: '{{ oauth2Username }}',
+        password: '{{ oauth2Password }}',
+        accessTokenUrl: (flow as OpenAPIV3.OAuth2SecurityScheme['flows'][typeof OAUTH_FLOWS.PASSWORD])?.tokenUrl,
+      };
+
+    default:
+      return {};
+  }
+};
+
+export const convert: Converter = async rawData => {
+  // Reset
+  requestCounts = {};
+
+  // Validate
+  let apiDocument = parseDocument(rawData);
+
+  if (!apiDocument || !SUPPORTED_OPENAPI_VERSION.test(apiDocument.openapi)) {
+    return null;
+  }
+
+  try {
+    apiDocument = await SwaggerParser.validate(apiDocument) as OpenAPIV3.Document;
+  } catch (err) {
+    console.log('[openapi-3] Import file validation failed', err);
+  }
+
+  // Import
+  const workspace: ImportRequest = {
+    _type: 'workspace',
+    _id: WORKSPACE_ID,
+    parentId: null,
+    name: `${apiDocument.info.title} ${apiDocument.info.version}`,
+    description: apiDocument.info.description || '', // scope is not set because it could be imported for design OR to generate requests
+  };
+
+  const baseEnv: ImportRequest = {
+    _type: 'environment',
+    _id: '__BASE_ENVIRONMENT_ID__',
+    parentId: WORKSPACE_ID,
+    name: 'Base environment',
+    data: {
+      base_url: '{{ scheme }}://{{ host }}{{ base_path }}',
+    },
+  };
+  const defaultServerUrl = getDefaultServerUrl(apiDocument);
+  const securityVariables = getSecurityEnvVariables(
+    apiDocument.components?.securitySchemes as unknown as OpenAPIV3.SecuritySchemeObject,
+  );
+  const protocol = defaultServerUrl.protocol || '';
+
+  // Base path is pulled out of the URL, and the trailing slash is removed
+  const basePath = (defaultServerUrl.pathname || '').replace(/\/$/, '');
+
+  const openapiEnv: ImportRequest = {
+    _type: 'environment',
+    _id: 'env___BASE_ENVIRONMENT_ID___sub',
+    parentId: baseEnv._id,
+    name: 'OpenAPI env',
+    data: {
+      // note: `URL.protocol` returns with trailing `:` (i.e. "https:")
+      scheme: protocol.replace(/:$/, '') || ['http'],
+      base_path: basePath,
+      host: defaultServerUrl.host || '',
+      ...securityVariables,
+    },
+  };
+
+  const endpoints = parseEndpoints(apiDocument);
+
+  return [
+    workspace,
+    baseEnv,
+    openapiEnv,
+    ...endpoints,
+  ];
+};
diff --git a/packages/insomnia-importers/src/importers/openapi3.js b/packages/insomnia-importers/src/importers/openapi3.js
deleted file mode 100644
index b9fc8e590e..0000000000
--- a/packages/insomnia-importers/src/importers/openapi3.js
+++ /dev/null
@@ -1,717 +0,0 @@
-'use strict';
-
-const crypto = require('crypto');
-const changeCase = require('change-case');
-
-const SwaggerParser = require('swagger-parser');
-const { parse: urlParse } = require('url');
-const utils = require('../utils');
-
-const SUPPORTED_OPENAPI_VERSION = /^3\.\d+\.\d+$/; // 3.x.x
-const MIMETYPE_JSON = 'application/json';
-const MIMETYPE_LITERALLY_ANYTHING = '*/*';
-const SUPPORTED_MIME_TYPES = [MIMETYPE_JSON, MIMETYPE_LITERALLY_ANYTHING];
-const WORKSPACE_ID = '__WORKSPACE_ID__';
-const SECURITY_TYPE = {
-  HTTP: 'http',
-  API_KEY: 'apiKey',
-  OAUTH: 'oauth2',
-  OPEN_ID: 'openIdConnect',
-};
-const HTTP_AUTH_SCHEME = {
-  BASIC: 'basic',
-  BEARER: 'bearer',
-};
-const OAUTH_FLOWS = {
-  AUTHORIZATION_CODE: 'authorizationCode',
-  CLIENT_CREDENTIALS: 'clientCredentials',
-  IMPLICIT: 'implicit',
-  PASSWORD: 'password',
-};
-const SUPPORTED_SECURITY_TYPES = [SECURITY_TYPE.HTTP, SECURITY_TYPE.API_KEY, SECURITY_TYPE.OAUTH];
-const SUPPORTED_HTTP_AUTH_SCHEMES = [HTTP_AUTH_SCHEME.BASIC, HTTP_AUTH_SCHEME.BEARER];
-const VARIABLE_SEARCH_VALUE = /{([^}]+)}/g;
-let requestCounts = {};
-
-module.exports.id = 'openapi3';
-module.exports.name = 'OpenAPI 3.0';
-module.exports.description = 'Importer for OpenAPI 3.0 specification (json/yaml)';
-
-module.exports.convert = async function(rawData) {
-  // Reset
-  requestCounts = {};
-
-  // Validate
-  let api = await parseDocument(rawData);
-  if (!api || !SUPPORTED_OPENAPI_VERSION.test(api.openapi)) {
-    return null;
-  }
-
-  try {
-    api = await SwaggerParser.validate(api);
-  } catch (err) {
-    console.log('[openapi3] Import file validation failed', err);
-  }
-
-  // Import
-  const workspace = {
-    _type: 'workspace',
-    _id: WORKSPACE_ID,
-    parentId: null,
-    name: `${api.info.title} ${api.info.version}`,
-    description: api.info.description || '',
-    // scope is not set because it could be imported for design OR to generate requests
-  };
-
-  const baseEnv = {
-    _type: 'environment',
-    _id: '__BASE_ENVIRONMENT_ID__',
-    parentId: WORKSPACE_ID,
-    name: 'Base environment',
-    data: {
-      base_url: '{{ scheme }}://{{ host }}{{ base_path }}',
-    },
-  };
-
-  const defaultServerUrl = getDefaultServerUrl(api);
-  const securityVariables = getSecurityEnvVariables(
-    api.components && api.components.securitySchemes,
-  );
-
-  const protocol = defaultServerUrl.protocol || '';
-
-  // Base path is pulled out of the URL, and the trailing slash is removed
-  const basePath = (defaultServerUrl.pathname || '').replace(/\/$/, '');
-
-  const openapiEnv = {
-    _type: 'environment',
-    _id: 'env___BASE_ENVIRONMENT_ID___sub',
-    parentId: baseEnv._id,
-    name: 'OpenAPI env',
-    data: {
-      // note: `URL.protocol` returns with trailing `:` (i.e. "https:")
-      scheme: protocol.replace(/:$/, '') || ['http'],
-      base_path: basePath,
-      host: defaultServerUrl.host || '',
-      ...securityVariables,
-    },
-  };
-
-  const endpoints = parseEndpoints(api);
-
-  return [workspace, baseEnv, openapiEnv, ...endpoints];
-};
-
-/**
- * Gets a server to use as the default
- * Either the first server defined in the specification, or an example if none are specified
- *
- * @param {Object} api - openapi3 object
- * @returns {UrlWithStringQuery} the resolved server URL
- */
-function getDefaultServerUrl(api) {
-  const exampleServer = 'http://example.com/';
-  const servers = api.servers || [];
-  const firstServer = servers[0];
-  const foundServer = firstServer && firstServer.url;
-
-  if (!foundServer) {
-    return urlParse(exampleServer);
-  }
-
-  const url = resolveVariables(firstServer);
-
-  return urlParse(url);
-}
-
-/**
- * Resolve default variables for a server url
- *
- * @param {Object} str - the server
- * @returns {string} - the resolved url
- */
-function resolveVariables(server) {
-  let resolvedUrl = server.url;
-  const variables = server.variables || {};
-
-  let shouldContinue = true;
-
-  do {
-    // Regexp contain the global flag (g), meaning we must execute our regex on the original string.
-    // https://stackoverflow.com/a/27753327
-    const [replace, name] = VARIABLE_SEARCH_VALUE.exec(server.url) || [];
-
-    const variable = variables && variables[name];
-    const value = variable && variable.default;
-
-    if (name && !value) {
-      // We found a variable in the url (name) but we have no default to replace it with (value)
-      throw new Error(`Server variable "${name}" missing default value`);
-    }
-
-    shouldContinue = !!name;
-    resolvedUrl = replace ? resolvedUrl.replace(replace, value) : resolvedUrl;
-  } while (shouldContinue);
-
-  return resolvedUrl;
-}
-
-/**
- * Parse string data into openapi 3 object (https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#oasObject)
- *
- * @param {string} rawData
- *
- * @returns {Promise<Object|null>} OpenAPI 3 object
- */
-async function parseDocument(rawData) {
-  try {
-    return utils.unthrowableParseJson(rawData) || SwaggerParser.YAML.parse(rawData);
-  } catch (err) {
-    return null;
-  }
-}
-
-/**
- * Create request definitions based on openapi document.
- *
- * @param {Object} document - OpenAPI 3 valid object (https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#oasObject)
- *
- * @returns {Object[]} array of insomnia endpoints definitions
- */
-function parseEndpoints(document) {
-  const rootSecurity = document.security;
-  const securitySchemes = document.components ? document.components.securitySchemes : {};
-  const defaultParent = WORKSPACE_ID;
-
-  const paths = Object.keys(document.paths);
-  const endpointsSchemas = paths
-    .map(path => {
-      const schemasPerMethod = document.paths[path];
-      const methods = Object.keys(schemasPerMethod);
-
-      return methods
-        .filter(method => method !== 'parameters' && method.indexOf('x-') !== 0)
-        .map(method => Object.assign({}, schemasPerMethod[method], { path, method }));
-    })
-    .reduce(
-      // flat single array
-      (flat, arr) => flat.concat(arr),
-      [],
-    );
-
-  const tags = document.tags || [];
-  const folders = tags.map(tag => {
-    return importFolderItem(tag, defaultParent);
-  });
-  const folderLookup = {};
-
-  for (const folder of folders) {
-    folderLookup[folder.name] = folder._id;
-  }
-
-  const requests = [];
-  endpointsSchemas.map(endpointSchema => {
-    let { tags } = endpointSchema;
-
-    if (!tags || tags.length === 0) {
-      tags = [''];
-    }
-
-    for (const tag of tags) {
-      const parentId = folderLookup[tag] || defaultParent;
-      const resolvedSecurity = endpointSchema.security || rootSecurity;
-      requests.push(importRequest(endpointSchema, parentId, resolvedSecurity, securitySchemes));
-    }
-  });
-
-  return [...folders, ...requests];
-}
-
-/**
- * Return Insomnia folder / request group
- *
- *
- * @param {Object} item - OpenAPI 3 endpoint schema
- * @param {string} parentId - id of parent category
- * @returns {Object}
- */
-function importFolderItem(item, parentId) {
-  const hash = crypto
-    .createHash('sha1')
-    .update(item.name)
-    .digest('hex')
-    .slice(0, 8);
-  return {
-    parentId,
-    _id: `fld___WORKSPACE_ID__${hash}`,
-    _type: 'request_group',
-    name: item.name || 'Folder {requestGroupCount}',
-    description: item.description || '',
-  };
-}
-
-/**
- * Return Insomnia request
- *
- *
- * @param {Object} endpointSchema - OpenAPI 3 endpoint schema
- * @param {string} parentId - id of parent category
- * @param {Object} security - OpenAPI 3 security rules
- * @param {Object} securitySchemes - OpenAPI 3 security schemes
- * @returns {Object}
- */
-function importRequest(endpointSchema, parentId, security, securitySchemes) {
-  const name = endpointSchema.summary || endpointSchema.path;
-  const id = generateUniqueRequestId(endpointSchema);
-  const paramHeaders = prepareHeaders(endpointSchema);
-  const { authentication, headers: securityHeaders, parameters: securityParams } = parseSecurity(
-    security,
-    securitySchemes,
-  );
-
-  const request = {
-    _type: 'request',
-    _id: id,
-    parentId: parentId,
-    name,
-    method: endpointSchema.method.toUpperCase(),
-    url: '{{ base_url }}' + pathWithParamsAsVariables(endpointSchema.path),
-    body: prepareBody(endpointSchema),
-    headers: [...paramHeaders, ...securityHeaders],
-    authentication,
-    parameters: [...prepareQueryParams(endpointSchema), ...securityParams],
-  };
-
-  return request;
-}
-
-/**
- * Return path with parameters replaced by insomnia variables
- *
- * I.e. "/foo/:bar" => "/foo/{{ bar }}"
- *
- * @param {string} path
- * @returns {string}
- */
-function pathWithParamsAsVariables(path) {
-  return path.replace(VARIABLE_SEARCH_VALUE, '{{ $1 }}');
-}
-
-/**
- * Imports insomnia definitions of query parameters.
- *
- * @param {Object} endpointSchema - OpenAPI 3 endpoint schema
- * @returns {Object[]} array of parameters definitions
- */
-function prepareQueryParams(endpointSchema) {
-  const isSendInQuery = p => p.in === 'query';
-  const parameters = endpointSchema.parameters || [];
-  const queryParameters = parameters.filter(isSendInQuery);
-  return convertParameters(queryParameters);
-}
-
-/**
- * Imports insomnia definitions of header parameters.
- *
- * @param {Object} endpointSchema - OpenAPI 3 endpoint schema
- * @returns {Object[]} array of parameters definitions
- */
-function prepareHeaders(endpointSchema) {
-  const isSendInHeader = p => p.in === 'header';
-  const parameters = endpointSchema.parameters || [];
-  const headerParameters = parameters.filter(isSendInHeader);
-  return convertParameters(headerParameters);
-}
-
-/**
- * Parse OpenAPI 3 securitySchemes into insomnia definitions of authentication, headers and parameters
- *
- * @param {Object} security - OpenAPI 3 security rules
- * @param {Object} securitySchemes - OpenAPI 3 security schemes
- * @returns {Object} headers or basic|bearer http authentication details
- */
-function parseSecurity(security, securitySchemes) {
-  if (!security || !securitySchemes) {
-    return {
-      authentication: {},
-      headers: [],
-      parameters: [],
-    };
-  }
-
-  const supportedSchemes = security
-    .map(securityPolicy => {
-      const securityName = Object.keys(securityPolicy)[0];
-      return securitySchemes[securityName];
-    })
-    .filter(
-      schemeDetails => schemeDetails && SUPPORTED_SECURITY_TYPES.includes(schemeDetails.type),
-    );
-
-  const apiKeySchemes = supportedSchemes.filter(scheme => scheme.type === SECURITY_TYPE.API_KEY);
-  const apiKeyHeaders = apiKeySchemes
-    .filter(scheme => scheme.in === 'header')
-    .map(scheme => {
-      const variableName = changeCase.camelCase(scheme.name);
-      return {
-        name: scheme.name,
-        disabled: false,
-        value: `{{ ${variableName} }}`,
-      };
-    });
-  const apiKeyCookies = apiKeySchemes
-    .filter(scheme => scheme.in === 'cookie')
-    .map(scheme => {
-      const variableName = changeCase.camelCase(scheme.name);
-      return `${scheme.name}={{ ${variableName} }}`;
-    });
-  const apiKeyCookieHeader = { name: 'Cookie', disabled: false, value: apiKeyCookies.join('; ') };
-  const apiKeyParams = apiKeySchemes
-    .filter(scheme => scheme.in === 'query')
-    .map(scheme => {
-      const variableName = changeCase.camelCase(scheme.name);
-      return {
-        name: scheme.name,
-        disabled: false,
-        value: `{{ ${variableName} }}`,
-      };
-    });
-
-  if (apiKeyCookies.length > 0) {
-    apiKeyHeaders.push(apiKeyCookieHeader);
-  }
-
-  const authentication = (() => {
-    const authScheme = supportedSchemes.find(
-      scheme =>
-        [SECURITY_TYPE.HTTP, SECURITY_TYPE.OAUTH].includes(scheme.type) &&
-        SUPPORTED_HTTP_AUTH_SCHEMES.includes(scheme.scheme),
-    );
-
-    if (!authScheme) {
-      return {};
-    }
-
-    switch (authScheme.type) {
-      case SECURITY_TYPE.HTTP:
-        return parseHttpAuth(authScheme.scheme);
-      case SECURITY_TYPE.OAUTH:
-        return parseOAuth2(authScheme);
-      default:
-        return {};
-    }
-  })();
-
-  return {
-    authentication,
-    headers: apiKeyHeaders,
-    parameters: apiKeyParams,
-  };
-}
-
-/**
- * Get Insomnia environment variables for OpenAPI securitySchemes
- *
- * @param {Object} securitySchemes - Open API security schemes
- * @returns {Object} Insomnia environment variables containing security information
- */
-function getSecurityEnvVariables(securitySchemes) {
-  if (!securitySchemes) {
-    return {};
-  }
-
-  const variables = {};
-  const securitySchemesArray = Object.values(securitySchemes);
-  const apiKeyVariableNames = securitySchemesArray
-    .filter(scheme => scheme.type === SECURITY_TYPE.API_KEY)
-    .map(scheme => changeCase.camelCase(scheme.name));
-  const hasHttpBasicScheme = securitySchemesArray.some(
-    scheme => scheme.type === SECURITY_TYPE.HTTP && scheme.scheme === 'basic',
-  );
-  const hasHttpBearerScheme = securitySchemesArray.some(
-    scheme => scheme.type === SECURITY_TYPE.HTTP && scheme.scheme === 'bearer',
-  );
-  const oauth2Variables = securitySchemesArray.reduce((acc, scheme) => {
-    if (scheme.type === SECURITY_TYPE.OAUTH && scheme.scheme === 'bearer') {
-      acc.oauth2ClientId = 'clientId';
-      const flows = scheme.flows || {};
-      if (flows.authorizationCode || flows.clientCredentials || flows.password) {
-        acc.oauth2ClientSecret = 'clientSecret';
-      }
-      if (flows.password) {
-        acc.oauth2Username = 'username';
-        acc.oauth2Password = 'password';
-      }
-    }
-    return acc;
-  }, {});
-
-  Array.from(new Set(apiKeyVariableNames)).forEach(name => {
-    variables[name] = name;
-  });
-
-  if (hasHttpBasicScheme) {
-    variables.httpUsername = 'username';
-    variables.httpPassword = 'password';
-  }
-
-  if (hasHttpBearerScheme) {
-    variables.bearerToken = 'bearerToken';
-  }
-
-  return { ...variables, ...oauth2Variables };
-}
-
-/**
- * Imports insomnia request body definitions, including data mock (if available)
- *
- * If multiple types are available, the one for which an example can be generated will be selected first (i.e. application/json)
- *
- * @param {Object} endpointSchema - OpenAPI 3 endpoint schema
- *
- * @return {Object} insomnia request's body definition
- */
-function prepareBody(endpointSchema) {
-  // request
-  const requestBody = endpointSchema.requestBody || {};
-  const content = requestBody.content || {};
-  const mimeTypes = Object.keys(content);
-
-  const isAvailable = m => mimeTypes.includes(m);
-  const supportedMimeType = SUPPORTED_MIME_TYPES.find(isAvailable);
-
-  if (supportedMimeType === MIMETYPE_JSON) {
-    const bodyParameter = content[supportedMimeType];
-
-    if (bodyParameter == null) {
-      return {
-        mimeType: MIMETYPE_JSON,
-      };
-    }
-
-    const example = generateParameterExample(bodyParameter.schema);
-    const text = JSON.stringify(example, null, 2);
-    return {
-      mimeType: MIMETYPE_JSON,
-      text,
-    };
-  }
-
-  if (mimeTypes && mimeTypes.length && mimeTypes[0] !== MIMETYPE_LITERALLY_ANYTHING) {
-    return {
-      mimeType: mimeTypes[0] || undefined,
-    };
-  } else {
-    return {};
-  }
-}
-
-/**
- * Converts openapi schema of parametes into insomnia one.
- *
- * @param {Object[]} parameters - array of OpenAPI schemas of parameters
- * @returns {Object[]} array of insomnia parameters definitions
- */
-function convertParameters(parameters) {
-  return parameters.map(parameter => {
-    const { required, name, schema } = parameter;
-    return {
-      name,
-      disabled: required !== true,
-      value: `${generateParameterExample(schema)}`,
-    };
-  });
-}
-
-/**
- * Generate example value of parameter based on it's schema.
- * Returns example / default value of the parameter, if any of those are defined. If not, returns value based on parameter type.
- *
- * @param {string|Object} schema - OpenAPI 3 parameter definition object
- * (https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#parameterObject) or string with valid parameter type
- *
- * @returns {*}
- */
-function generateParameterExample(schema) {
-  const typeExamples = {
-    string: () => 'string',
-    string_email: () => 'user@example.com',
-    'string_date-time': () => new Date().toISOString(),
-    string_byte: () => 'ZXhhbXBsZQ==',
-    number: () => 0,
-    number_float: () => 0.0,
-    number_double: () => 0.0,
-    integer: () => 0,
-    boolean: () => true,
-    object: schema => {
-      const example = {};
-      const { properties } = schema;
-
-      if (properties) {
-        for (const propertyName of Object.keys(properties)) {
-          example[propertyName] = generateParameterExample(properties[propertyName]);
-        }
-      }
-
-      return example;
-    },
-    array: schema => {
-      const value = generateParameterExample(schema.items);
-      if (schema.collectionFormat === 'csv') {
-        return value;
-      } else {
-        return [value];
-      }
-    },
-  };
-
-  if (typeof schema === 'string') {
-    return typeExamples[schema];
-  }
-
-  if (schema instanceof Object) {
-    const { type, format, example, readOnly, default: defaultValue } = schema;
-
-    if (readOnly) {
-      return undefined;
-    }
-
-    if (example) {
-      return example;
-    }
-
-    if (defaultValue) {
-      return defaultValue;
-    }
-
-    const factory = typeExamples[`${type}_${format}`] || typeExamples[type];
-
-    if (!factory) {
-      return null;
-    }
-
-    return factory(schema);
-  }
-}
-
-/**
- * Generates a unique and deterministic request ID based on the endpoint schema
- *
- * @param endpointSchema
- */
-function generateUniqueRequestId(endpointSchema) {
-  // `operationId` is unique already, so we can just use that, combined with the ID
-  // of the workspace to get something globally unique
-  const uniqueKey = endpointSchema.operationId
-    ? `${endpointSchema.operationId}`
-    : `[${endpointSchema.method}]${endpointSchema.path}`;
-
-  const hash = crypto
-    .createHash('sha1')
-    .update(uniqueKey)
-    .digest('hex')
-    .slice(0, 8);
-
-  // Suffix the ID with a counter in case we try creating two with the same hash
-  if (requestCounts.hasOwnProperty(hash)) {
-    requestCounts[hash]++;
-  } else {
-    requestCounts[hash] = 0;
-  }
-
-  return `req_${WORKSPACE_ID}${hash}${requestCounts[hash] || ''}`;
-}
-
-function parseHttpAuth(scheme) {
-  switch (scheme) {
-    case HTTP_AUTH_SCHEME.BASIC:
-      return importBasicAuthentication();
-    case HTTP_AUTH_SCHEME.BEARER:
-      return importBearerAuthentication();
-    default:
-      return {};
-  }
-}
-
-function parseOAuth2Scopes(flow) {
-  const scopes = Object.keys(flow.scopes || {});
-  return scopes.join(' ');
-}
-
-function mapOAuth2GrantType(grantType) {
-  const types = {
-    [OAUTH_FLOWS.AUTHORIZATION_CODE]: 'authorization_code',
-    [OAUTH_FLOWS.CLIENT_CREDENTIALS]: 'client_credentials',
-    [OAUTH_FLOWS.IMPLICIT]: 'implicit',
-    [OAUTH_FLOWS.PASSWORD]: 'password',
-  };
-
-  return types[grantType];
-}
-
-function parseOAuth2(scheme) {
-  const flows = Object.keys(scheme.flows);
-
-  if (!flows.length) {
-    return {};
-  }
-
-  const grantType = flows[0];
-  const flow = scheme.flows[grantType];
-
-  if (!flow) {
-    return {};
-  }
-
-  const base = {
-    clientId: '{{ oauth2ClientId }}',
-    grantType: mapOAuth2GrantType(grantType),
-    scope: parseOAuth2Scopes(flow),
-    type: 'oauth2',
-  };
-
-  switch (grantType) {
-    case OAUTH_FLOWS.AUTHORIZATION_CODE:
-      return {
-        ...base,
-        clientSecret: '{{ oauth2ClientSecret }}',
-        accessTokenUrl: flow.tokenUrl,
-        authorizationUrl: flow.authorizationUrl,
-      };
-    case OAUTH_FLOWS.CLIENT_CREDENTIALS:
-      return {
-        ...base,
-        clientSecret: '{{ oauth2ClientSecret }}',
-        accessTokenUrl: flow.tokenUrl,
-      };
-    case OAUTH_FLOWS.IMPLICIT:
-      return {
-        ...base,
-        authorizationUrl: flow.authorizationUrl,
-      };
-    case OAUTH_FLOWS.PASSWORD:
-      return {
-        ...base,
-        clientSecret: '{{ oauth2ClientSecret }}',
-        username: '{{ oauth2Username }}',
-        password: '{{ oauth2Password }}',
-        accessTokenUrl: flow.tokenUrl,
-      };
-  }
-}
-
-function importBearerAuthentication() {
-  return {
-    type: 'bearer',
-    token: '{{bearerToken}}',
-    prefix: '',
-  };
-}
-
-function importBasicAuthentication() {
-  return {
-    type: 'basic',
-    username: '{{ httpUsername }}',
-    password: '{{ httpPassword }}',
-  };
-}
diff --git a/packages/insomnia-importers/src/importers/postman-2.0.types.ts b/packages/insomnia-importers/src/importers/postman-2.0.types.ts
new file mode 100644
index 0000000000..90cf3fd738
--- /dev/null
+++ b/packages/insomnia-importers/src/importers/postman-2.0.types.ts
@@ -0,0 +1,657 @@
+// generated from https://schema.getpostman.com/json/collection/v2.0.0/collection.json
+/* eslint-disable */
+
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+
+/**
+ * A collection's friendly name is defined by this field. You would want to set this field to a value that would allow you to easily identify this collection among a bunch of other collections, as such outlining its usage or content.
+ */
+export type NameOfTheCollection = string;
+/**
+ * A Description can be a raw text, or be an object, which holds the description along with its format.
+ */
+export type DefinitionsDescription = Description | string | null;
+/**
+ * Postman allows you to version your collections as they grow, and this field holds the version number. While optional, it is recommended that you use this field to its fullest extent!
+ */
+export type CollectionVersion =
+  | {
+      /**
+       * Increment this number if you make changes to the collection that changes its behaviour. E.g: Removing or adding new test scripts. (partly or completely).
+       */
+      major: number;
+      /**
+       * You should increment this number if you make changes that will not break anything that uses the collection. E.g: removing a folder.
+       */
+      minor: number;
+      /**
+       * Ideally, minor changes to a collection should result in the increment of this number.
+       */
+      patch: number;
+      /**
+       * A human friendly identifier to make sense of the version numbers. E.g: 'beta-3'
+       */
+      identifier?: string;
+      meta?: unknown;
+      [k: string]: unknown;
+    }
+  | string;
+export type Items = Item | Folder;
+/**
+ * Using variables in your Postman requests eliminates the need to duplicate requests, which can save a lot of time. Variables can be defined, and referenced to from any part of a request.
+ */
+export type Variable = Variable1 & Variable2;
+export type Variable1 =
+  | {
+      [k: string]: unknown;
+    }
+  | {
+      [k: string]: unknown;
+    }
+  | {
+      [k: string]: unknown;
+    };
+/**
+ * Collection variables allow you to define a set of variables, that are a *part of the collection*, as opposed to environments, which are separate entities.
+ * *Note: Collection variables must not contain any sensitive information.*
+ */
+export type VariableList = Variable[];
+/**
+ * If object, contains the complete broken-down URL for this request. If string, contains the literal request URL.
+ */
+export type Url =
+  | {
+      /**
+       * The string representation of the request URL, including the protocol, host, path, hash, query parameter(s) and path variable(s).
+       */
+      raw?: string;
+      /**
+       * The protocol associated with the request, E.g: 'http'
+       */
+      protocol?: string;
+      host?: Host;
+      path?:
+        | string
+        | (
+            | string
+            | {
+                type?: string;
+                value?: string;
+                [k: string]: unknown;
+              }
+          )[];
+      /**
+       * The port number present in this URL. An empty value implies 80/443 depending on whether the protocol field contains http/https.
+       */
+      port?: string;
+      /**
+       * An array of QueryParams, which is basically the query string part of the URL, parsed into separate variables
+       */
+      query?: QueryParam[];
+      /**
+       * Contains the URL fragment (if any). Usually this is not transmitted over the network, but it could be useful to store this in some cases.
+       */
+      hash?: string;
+      /**
+       * Postman supports path variables with the syntax `/path/:variableName/to/somewhere`. These variables are stored in this field.
+       */
+      variable?: Variable1[];
+      [k: string]: unknown;
+    }
+  | string;
+/**
+ * The host for the URL, E.g: api.yourdomain.com. Can be stored as a string or as an array of strings.
+ */
+export type Host = string | string[];
+/**
+ * Postman allows you to configure scripts to run when specific events occur. These scripts are stored here, and can be referenced in the collection by their ID.
+ */
+export type EventList = Event[];
+/**
+ * A request represents an HTTP request. If a string, the string is assumed to be the request URL and the method is assumed to be 'GET'.
+ */
+export type Request = Request1 | string;
+/**
+ * A representation for a list of headers
+ */
+export type HeaderList = Header[];
+export type FormParameter =
+  | {
+      key: string;
+      value?: string;
+      /**
+       * When set to true, prevents this form data entity from being sent.
+       */
+      disabled?: boolean;
+      type?: 'text';
+      /**
+       * Override Content-Type header of this form data entity.
+       */
+      contentType?: string;
+      description?: DefinitionsDescription;
+      [k: string]: unknown;
+    }
+  | {
+      key: string;
+      src?: string | unknown[] | null;
+      /**
+       * When set to true, prevents this form data entity from being sent.
+       */
+      disabled?: boolean;
+      type?: 'file';
+      /**
+       * Override Content-Type header of this form data entity.
+       */
+      contentType?: string;
+      description?: DefinitionsDescription;
+      [k: string]: unknown;
+    };
+/**
+ * The time taken by the request to complete. If a number, the unit is milliseconds. If the response is manually created, this can be set to `null`.
+ */
+export type ResponseTime = null | string | number;
+/**
+ * Set of timing information related to request and response in milliseconds
+ */
+export type ResponseTimings = {
+  [k: string]: unknown;
+} | null;
+export type Headers = Header1 | string | null;
+export type Header2 = string;
+/**
+ * No HTTP request is complete without its headers, and the same is true for a Postman request. This field is an array containing all the headers.
+ */
+export type Header1 = (Header | Header2)[];
+export type Responses = Response[];
+export type Items1 = Item | Folder;
+
+export interface HttpsSchemaGetpostmanComJsonCollectionV200 {
+  info: Information;
+  /**
+   * Items are the basic unit for a Postman collection. You can think of them as corresponding to a single API endpoint. Each Item has one request and may have multiple API responses associated with it.
+   */
+  item: Items[];
+  event?: EventList;
+  variable?: VariableList;
+  auth?: null | Auth;
+  protocolProfileBehavior?: ProtocolProfileBehavior;
+  [k: string]: unknown;
+}
+/**
+ * Detailed description of the info block
+ */
+export interface Information {
+  name: NameOfTheCollection;
+  /**
+   * Every collection is identified by the unique value of this field. The value of this field is usually easiest to generate using a UID generator function. If you already have a collection, it is recommended that you maintain the same id since changing the id usually implies that is a different collection than it was originally.
+   *  *Note: This field exists for compatibility reasons with Collection Format V1.*
+   */
+  _postman_id?: string;
+  description?: DefinitionsDescription;
+  version?: CollectionVersion;
+  /**
+   * This should ideally hold a link to the Postman schema that is used to validate this collection. E.g: https://schema.getpostman.com/collection/v1
+   */
+  schema: string;
+  [k: string]: unknown;
+}
+export interface Description {
+  /**
+   * The content of the description goes here, as a raw string.
+   */
+  content?: string;
+  /**
+   * Holds the mime type of the raw description content. E.g: 'text/markdown' or 'text/html'.
+   * The type is used to correctly render the description when generating documentation, or in the Postman app.
+   */
+  type?: string;
+  /**
+   * Description can have versions associated with it, which should be put in this property.
+   */
+  version?: {
+    [k: string]: unknown;
+  };
+  [k: string]: unknown;
+}
+/**
+ * Items are entities which contain an actual HTTP request, and sample responses attached to it.
+ */
+export interface Item {
+  /**
+   * A unique ID that is used to identify collections internally
+   */
+  id?: string;
+  /**
+   * A human readable identifier for the current item.
+   */
+  name?: string;
+  description?: DefinitionsDescription;
+  variable?: VariableList;
+  event?: EventList;
+  request: Request;
+  response?: Responses;
+  protocolProfileBehavior?: ProtocolProfileBehavior;
+  [k: string]: unknown;
+}
+export interface Variable2 {
+  /**
+   * A variable ID is a unique user-defined value that identifies the variable within a collection. In traditional terms, this would be a variable name.
+   */
+  id?: string;
+  /**
+   * A variable key is a human friendly value that identifies the variable within a collection. In traditional terms, this would be a variable name.
+   */
+  key?: string;
+  /**
+   * The value that a variable holds in this collection. Ultimately, the variables will be replaced by this value, when say running a set of requests from a collection
+   */
+  value?: {
+    [k: string]: unknown;
+  };
+  /**
+   * A variable may have multiple types. This field specifies the type of the variable.
+   */
+  type?: 'string' | 'boolean' | 'any' | 'number';
+  /**
+   * Variable name
+   */
+  name?: string;
+  description?: DefinitionsDescription;
+  /**
+   * When set to true, indicates that this variable has been set by Postman
+   */
+  system?: boolean;
+  disabled?: boolean;
+  [k: string]: unknown;
+}
+/**
+ * Defines a script associated with an associated event name
+ */
+export interface Event {
+  /**
+   * A unique identifier for the enclosing event.
+   */
+  id?: string;
+  /**
+   * Can be set to `test` or `prerequest` for test scripts or pre-request scripts respectively.
+   */
+  listen: string;
+  script?: Script;
+  /**
+   * Indicates whether the event is disabled. If absent, the event is assumed to be enabled.
+   */
+  disabled?: boolean;
+  [k: string]: unknown;
+}
+/**
+ * A script is a snippet of Javascript code that can be used to to perform setup or teardown operations on a particular response.
+ */
+export interface Script {
+  /**
+   * A unique, user defined identifier that can  be used to refer to this script from requests.
+   */
+  id?: string;
+  /**
+   * Type of the script. E.g: 'text/javascript'
+   */
+  type?: string;
+  exec?: string[] | string;
+  src?: Url;
+  /**
+   * Script name
+   */
+  name?: string;
+  [k: string]: unknown;
+}
+export interface QueryParam {
+  key?: string | null;
+  value?: string | null;
+  /**
+   * If set to true, the current query parameter will not be sent with the request.
+   */
+  disabled?: boolean;
+  description?: DefinitionsDescription;
+  [k: string]: unknown;
+}
+export interface Request1 {
+  url?: Url;
+  auth?: null | Auth;
+  proxy?: ProxyConfig;
+  certificate?: Certificate;
+  method?:
+    | (
+        | 'GET'
+        | 'PUT'
+        | 'POST'
+        | 'PATCH'
+        | 'DELETE'
+        | 'COPY'
+        | 'HEAD'
+        | 'OPTIONS'
+        | 'LINK'
+        | 'UNLINK'
+        | 'PURGE'
+        | 'LOCK'
+        | 'UNLOCK'
+        | 'PROPFIND'
+        | 'VIEW'
+      )
+    | string;
+  description?: DefinitionsDescription;
+  header?: HeaderList | string;
+  body?: {
+    /**
+     * Postman stores the type of data associated with this request in this field.
+     */
+    mode?: 'raw' | 'urlencoded' | 'formdata' | 'file' | 'graphql';
+    raw?: string;
+    urlencoded?: UrlEncodedParameter[];
+    formdata?: FormParameter[];
+    file?: {
+      src?: string | null;
+      content?: string;
+      [k: string]: unknown;
+    };
+    graphql?: {
+      [k: string]: unknown;
+    };
+    /**
+     * Additional configurations and options set for various body modes.
+     */
+    options?: {
+      [k: string]: unknown;
+    };
+    /**
+     * When set to true, prevents request body from being sent.
+     */
+    disabled?: boolean;
+    [k: string]: unknown;
+  } | null;
+  [k: string]: unknown;
+}
+/**
+ * Represents authentication helpers provided by Postman
+ */
+export interface Auth {
+  type:
+    | 'apikey'
+    | 'awsv4'
+    | 'basic'
+    | 'bearer'
+    | 'digest'
+    | 'edgegrid'
+    | 'hawk'
+    | 'ntlm'
+    | 'noauth'
+    | 'oauth1'
+    | 'oauth2';
+  noauth?: unknown;
+  apikey?: APIKeyAuthentication;
+  awsv4?: AWSSignatureV4;
+  basic?: BasicAuthentication;
+  bearer?: BearerTokenAuthentication;
+  digest?: DigestAuthentication;
+  edgegrid?: EdgeGridAuthentication;
+  hawk?: HawkAuthentication;
+  ntlm?: NTLMAuthentication;
+  oauth1?: OAuth1;
+  oauth2?: OAuth2;
+  [k: string]: unknown;
+}
+/**
+ * The attributes for API Key Authentication. e.g. key, value, in.
+ */
+export interface APIKeyAuthentication {
+  [k: string]: unknown;
+}
+/**
+ * The attributes for [AWS Auth](http://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html). e.g. accessKey, secretKey, region, service.
+ */
+export interface AWSSignatureV4 {
+  [k: string]: unknown;
+}
+/**
+ * The attributes for [Basic Authentication](https://en.wikipedia.org/wiki/Basic_access_authentication). e.g. username, password.
+ */
+export interface BasicAuthentication {
+  [k: string]: unknown;
+}
+/**
+ * The attributes for [Bearer Token Authentication](https://tools.ietf.org/html/rfc6750). e.g. token.
+ */
+export interface BearerTokenAuthentication {
+  [k: string]: unknown;
+}
+/**
+ * The attributes for [Digest Authentication](https://en.wikipedia.org/wiki/Digest_access_authentication). e.g. username, password, realm, nonce, nonceCount, algorithm, qop, opaque, clientNonce.
+ */
+export interface DigestAuthentication {
+  [k: string]: unknown;
+}
+/**
+ * The attributes for [Akamai EdgeGrid Authentication](https://developer.akamai.com/legacy/introduction/Client_Auth.html). e.g. accessToken, clientToken, clientSecret, baseURL, nonce, timestamp, headersToSign.
+ */
+export interface EdgeGridAuthentication {
+  [k: string]: unknown;
+}
+/**
+ * The attributes for [Hawk Authentication](https://github.com/hueniverse/hawk). e.g. authId, authKey, algorith, user, nonce, extraData, appId, delegation, timestamp.
+ */
+export interface HawkAuthentication {
+  [k: string]: unknown;
+}
+/**
+ * The attributes for [NTLM Authentication](https://msdn.microsoft.com/en-us/library/cc237488.aspx). e.g. username, password, domain, workstation.
+ */
+export interface NTLMAuthentication {
+  [k: string]: unknown;
+}
+/**
+ * The attributes for [OAuth1](https://oauth.net/1/). e.g. consumerKey, consumerSecret, token, tokenSecret, signatureMethod, timestamp, nonce, version, realm, encodeOAuthSign.
+ */
+export interface OAuth1 {
+  [k: string]: unknown;
+}
+/**
+ * The attributes for [OAuth2](https://oauth.net/2/). e.g. accessToken, addTokenTo.
+ */
+export interface OAuth2 {
+  [k: string]: unknown;
+}
+/**
+ * Using the Proxy, you can configure your custom proxy into the postman for particular url match
+ */
+export interface ProxyConfig {
+  /**
+   * The Url match for which the proxy config is defined
+   */
+  match?: string;
+  /**
+   * The proxy server host
+   */
+  host?: string;
+  /**
+   * The proxy server port
+   */
+  port?: number;
+  /**
+   * The tunneling details for the proxy config
+   */
+  tunnel?: boolean;
+  /**
+   * When set to true, ignores this proxy configuration entity
+   */
+  disabled?: boolean;
+  [k: string]: unknown;
+}
+/**
+ * A representation of an ssl certificate
+ */
+export interface Certificate {
+  /**
+   * A name for the certificate for user reference
+   */
+  name?: string;
+  /**
+   * A list of Url match pattern strings, to identify Urls this certificate can be used for.
+   */
+  matches?: string[];
+  /**
+   * An object containing path to file containing private key, on the file system
+   */
+  key?: {
+    /**
+     * The path to file containing key for certificate, on the file system
+     */
+    src?: {
+      [k: string]: unknown;
+    };
+    [k: string]: unknown;
+  };
+  /**
+   * An object containing path to file certificate, on the file system
+   */
+  cert?: {
+    /**
+     * The path to file containing key for certificate, on the file system
+     */
+    src?: {
+      [k: string]: unknown;
+    };
+    [k: string]: unknown;
+  };
+  /**
+   * The passphrase for the certificate
+   */
+  passphrase?: string;
+  [k: string]: unknown;
+}
+/**
+ * Represents a single HTTP Header
+ */
+export interface Header {
+  /**
+   * This holds the LHS of the HTTP Header, e.g ``Content-Type`` or ``X-Custom-Header``
+   */
+  key: string;
+  /**
+   * The value (or the RHS) of the Header is stored in this field.
+   */
+  value: string;
+  /**
+   * If set to true, the current header will not be sent with requests.
+   */
+  disabled?: boolean;
+  description?: DefinitionsDescription;
+  [k: string]: unknown;
+}
+export interface UrlEncodedParameter {
+  key: string;
+  value?: string;
+  disabled?: boolean;
+  description?: DefinitionsDescription;
+  [k: string]: unknown;
+}
+/**
+ * A response represents an HTTP response.
+ */
+export interface Response {
+  /**
+   * A unique, user defined identifier that can  be used to refer to this response from requests.
+   */
+  id?: string;
+  originalRequest?: Request;
+  responseTime?: ResponseTime;
+  timings?: ResponseTimings;
+  header?: Headers;
+  cookie?: Cookie[];
+  /**
+   * The raw text of the response.
+   */
+  body?: null | string;
+  /**
+   * The response status, e.g: '200 OK'
+   */
+  status?: string;
+  /**
+   * The numerical response code, example: 200, 201, 404, etc.
+   */
+  code?: number;
+  [k: string]: unknown;
+}
+/**
+ * A Cookie, that follows the [Google Chrome format](https://developer.chrome.com/extensions/cookies)
+ */
+export interface Cookie {
+  /**
+   * The domain for which this cookie is valid.
+   */
+  domain: string;
+  /**
+   * When the cookie expires.
+   */
+  expires?: string | number;
+  maxAge?: string;
+  /**
+   * True if the cookie is a host-only cookie. (i.e. a request's URL domain must exactly match the domain of the cookie).
+   */
+  hostOnly?: boolean;
+  /**
+   * Indicates if this cookie is HTTP Only. (if True, the cookie is inaccessible to client-side scripts)
+   */
+  httpOnly?: boolean;
+  /**
+   * This is the name of the Cookie.
+   */
+  name?: string;
+  /**
+   * The path associated with the Cookie.
+   */
+  path: string;
+  /**
+   * Indicates if the 'secure' flag is set on the Cookie, meaning that it is transmitted over secure connections only. (typically HTTPS)
+   */
+  secure?: boolean;
+  /**
+   * True if the cookie is a session cookie.
+   */
+  session?: boolean;
+  /**
+   * The value of the Cookie.
+   */
+  value?: string;
+  /**
+   * Custom attributes for a cookie go here, such as the [Priority Field](https://code.google.com/p/chromium/issues/detail?id=232693)
+   */
+  extensions?: unknown[];
+  [k: string]: unknown;
+}
+/**
+ * Set of configurations used to alter the usual behavior of sending the request
+ */
+export interface ProtocolProfileBehavior {
+  [k: string]: unknown;
+}
+/**
+ * One of the primary goals of Postman is to organize the development of APIs. To this end, it is necessary to be able to group requests together. This can be achived using 'Folders'. A folder just is an ordered set of requests.
+ */
+export interface Folder {
+  /**
+   * A folder's friendly name is defined by this field. You would want to set this field to a value that would allow you to easily identify this folder.
+   */
+  name?: string;
+  description?: DefinitionsDescription;
+  variable?: VariableList;
+  /**
+   * Items are entities which contain an actual HTTP request, and sample responses attached to it. Folders may contain many items.
+   */
+  item: Items1[];
+  event?: EventList;
+  auth?: null | Auth;
+  protocolProfileBehavior?: ProtocolProfileBehavior;
+  [k: string]: unknown;
+}
diff --git a/packages/insomnia-importers/src/importers/postman-2.1.types.ts b/packages/insomnia-importers/src/importers/postman-2.1.types.ts
new file mode 100644
index 0000000000..39ee25d016
--- /dev/null
+++ b/packages/insomnia-importers/src/importers/postman-2.1.types.ts
@@ -0,0 +1,646 @@
+// generated from https://schema.getpostman.com/json/collection/v2.1.0/collection.json
+/* eslint-disable */
+
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+
+/**
+ * A collection's friendly name is defined by this field. You would want to set this field to a value that would allow you to easily identify this collection among a bunch of other collections, as such outlining its usage or content.
+ */
+export type NameOfTheCollection = string;
+/**
+ * A Description can be a raw text, or be an object, which holds the description along with its format.
+ */
+export type DefinitionsDescription = Description | string | null;
+/**
+ * Postman allows you to version your collections as they grow, and this field holds the version number. While optional, it is recommended that you use this field to its fullest extent!
+ */
+export type CollectionVersion =
+  | {
+      /**
+       * Increment this number if you make changes to the collection that changes its behaviour. E.g: Removing or adding new test scripts. (partly or completely).
+       */
+      major: number;
+      /**
+       * You should increment this number if you make changes that will not break anything that uses the collection. E.g: removing a folder.
+       */
+      minor: number;
+      /**
+       * Ideally, minor changes to a collection should result in the increment of this number.
+       */
+      patch: number;
+      /**
+       * A human friendly identifier to make sense of the version numbers. E.g: 'beta-3'
+       */
+      identifier?: string;
+      meta?: unknown;
+      [k: string]: unknown;
+    }
+  | string;
+export type Items = Item | Folder;
+/**
+ * Using variables in your Postman requests eliminates the need to duplicate requests, which can save a lot of time. Variables can be defined, and referenced to from any part of a request.
+ */
+export type Variable = Variable1 & Variable2;
+export type Variable1 =
+  | {
+      [k: string]: unknown;
+    }
+  | {
+      [k: string]: unknown;
+    }
+  | {
+      [k: string]: unknown;
+    };
+/**
+ * Collection variables allow you to define a set of variables, that are a *part of the collection*, as opposed to environments, which are separate entities.
+ * *Note: Collection variables must not contain any sensitive information.*
+ */
+export type VariableList = Variable[];
+/**
+ * If object, contains the complete broken-down URL for this request. If string, contains the literal request URL.
+ */
+export type Url =
+  | {
+      /**
+       * The string representation of the request URL, including the protocol, host, path, hash, query parameter(s) and path variable(s).
+       */
+      raw?: string;
+      /**
+       * The protocol associated with the request, E.g: 'http'
+       */
+      protocol?: string;
+      host?: Host;
+      path?:
+        | string
+        | (
+            | string
+            | {
+                type?: string;
+                value?: string;
+                [k: string]: unknown;
+              }
+          )[];
+      /**
+       * The port number present in this URL. An empty value implies 80/443 depending on whether the protocol field contains http/https.
+       */
+      port?: string;
+      /**
+       * An array of QueryParams, which is basically the query string part of the URL, parsed into separate variables
+       */
+      query?: QueryParam[];
+      /**
+       * Contains the URL fragment (if any). Usually this is not transmitted over the network, but it could be useful to store this in some cases.
+       */
+      hash?: string;
+      /**
+       * Postman supports path variables with the syntax `/path/:variableName/to/somewhere`. These variables are stored in this field.
+       */
+      variable?: Variable1[];
+      [k: string]: unknown;
+    }
+  | string;
+/**
+ * The host for the URL, E.g: api.yourdomain.com. Can be stored as a string or as an array of strings.
+ */
+export type Host = string | string[];
+/**
+ * Postman allows you to configure scripts to run when specific events occur. These scripts are stored here, and can be referenced in the collection by their ID.
+ */
+export type EventList = Event[];
+/**
+ * A request represents an HTTP request. If a string, the string is assumed to be the request URL and the method is assumed to be 'GET'.
+ */
+export type Request = Request1 | string;
+/**
+ * The attributes for API Key Authentication.
+ */
+export type APIKeyAuthentication = Auth1[];
+/**
+ * The attributes for [AWS Auth](http://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html).
+ */
+export type AWSSignatureV4 = Auth1[];
+/**
+ * The attributes for [Basic Authentication](https://en.wikipedia.org/wiki/Basic_access_authentication).
+ */
+export type BasicAuthentication = Auth1[];
+/**
+ * The helper attributes for [Bearer Token Authentication](https://tools.ietf.org/html/rfc6750)
+ */
+export type BearerTokenAuthentication = Auth1[];
+/**
+ * The attributes for [Digest Authentication](https://en.wikipedia.org/wiki/Digest_access_authentication).
+ */
+export type DigestAuthentication = Auth1[];
+/**
+ * The attributes for [Akamai EdgeGrid Authentication](https://developer.akamai.com/legacy/introduction/Client_Auth.html).
+ */
+export type EdgeGridAuthentication = Auth1[];
+/**
+ * The attributes for [Hawk Authentication](https://github.com/hueniverse/hawk)
+ */
+export type HawkAuthentication = Auth1[];
+/**
+ * The attributes for [NTLM Authentication](https://msdn.microsoft.com/en-us/library/cc237488.aspx)
+ */
+export type NTLMAuthentication = Auth1[];
+/**
+ * The attributes for [OAuth2](https://oauth.net/1/)
+ */
+export type OAuth1 = Auth1[];
+/**
+ * Helper attributes for [OAuth2](https://oauth.net/2/)
+ */
+export type OAuth2 = Auth1[];
+/**
+ * A representation for a list of headers
+ */
+export type HeaderList = Header[];
+export type FormParameter =
+  | {
+      key: string;
+      value?: string;
+      /**
+       * When set to true, prevents this form data entity from being sent.
+       */
+      disabled?: boolean;
+      type?: 'text';
+      /**
+       * Override Content-Type header of this form data entity.
+       */
+      contentType?: string;
+      description?: DefinitionsDescription;
+      [k: string]: unknown;
+    }
+  | {
+      key: string;
+      src?: string | null | unknown[];
+      /**
+       * When set to true, prevents this form data entity from being sent.
+       */
+      disabled?: boolean;
+      type?: 'file';
+      /**
+       * Override Content-Type header of this form data entity.
+       */
+      contentType?: string;
+      description?: DefinitionsDescription;
+      [k: string]: unknown;
+    };
+/**
+ * The time taken by the request to complete. If a number, the unit is milliseconds. If the response is manually created, this can be set to `null`.
+ */
+export type ResponseTime = null | string | number;
+/**
+ * Set of timing information related to request and response in milliseconds
+ */
+export type ResponseTimings = {
+  [k: string]: unknown;
+} | null;
+export type Headers = Header1 | string | null;
+export type Header2 = string;
+/**
+ * No HTTP request is complete without its headers, and the same is true for a Postman request. This field is an array containing all the headers.
+ */
+export type Header1 = (Header | Header2)[];
+export type Responses = Response[];
+export type Items1 = Item | Folder;
+
+export interface HttpsSchemaGetpostmanComJsonCollectionV210 {
+  info: Information;
+  /**
+   * Items are the basic unit for a Postman collection. You can think of them as corresponding to a single API endpoint. Each Item has one request and may have multiple API responses associated with it.
+   */
+  item: Items[];
+  event?: EventList;
+  variable?: VariableList;
+  auth?: null | Auth;
+  protocolProfileBehavior?: ProtocolProfileBehavior;
+  [k: string]: unknown;
+}
+/**
+ * Detailed description of the info block
+ */
+export interface Information {
+  name: NameOfTheCollection;
+  /**
+   * Every collection is identified by the unique value of this field. The value of this field is usually easiest to generate using a UID generator function. If you already have a collection, it is recommended that you maintain the same id since changing the id usually implies that is a different collection than it was originally.
+   *  *Note: This field exists for compatibility reasons with Collection Format V1.*
+   */
+  _postman_id?: string;
+  description?: DefinitionsDescription;
+  version?: CollectionVersion;
+  /**
+   * This should ideally hold a link to the Postman schema that is used to validate this collection. E.g: https://schema.getpostman.com/collection/v1
+   */
+  schema: string;
+  [k: string]: unknown;
+}
+export interface Description {
+  /**
+   * The content of the description goes here, as a raw string.
+   */
+  content?: string;
+  /**
+   * Holds the mime type of the raw description content. E.g: 'text/markdown' or 'text/html'.
+   * The type is used to correctly render the description when generating documentation, or in the Postman app.
+   */
+  type?: string;
+  /**
+   * Description can have versions associated with it, which should be put in this property.
+   */
+  version?: {
+    [k: string]: unknown;
+  };
+  [k: string]: unknown;
+}
+/**
+ * Items are entities which contain an actual HTTP request, and sample responses attached to it.
+ */
+export interface Item {
+  /**
+   * A unique ID that is used to identify collections internally
+   */
+  id?: string;
+  /**
+   * A human readable identifier for the current item.
+   */
+  name?: string;
+  description?: DefinitionsDescription;
+  variable?: VariableList;
+  event?: EventList;
+  request: Request;
+  response?: Responses;
+  protocolProfileBehavior?: ProtocolProfileBehavior;
+  [k: string]: unknown;
+}
+export interface Variable2 {
+  /**
+   * A variable ID is a unique user-defined value that identifies the variable within a collection. In traditional terms, this would be a variable name.
+   */
+  id?: string;
+  /**
+   * A variable key is a human friendly value that identifies the variable within a collection. In traditional terms, this would be a variable name.
+   */
+  key?: string;
+  /**
+   * The value that a variable holds in this collection. Ultimately, the variables will be replaced by this value, when say running a set of requests from a collection
+   */
+  value?: {
+    [k: string]: unknown;
+  };
+  /**
+   * A variable may have multiple types. This field specifies the type of the variable.
+   */
+  type?: 'string' | 'boolean' | 'any' | 'number';
+  /**
+   * Variable name
+   */
+  name?: string;
+  description?: DefinitionsDescription;
+  /**
+   * When set to true, indicates that this variable has been set by Postman
+   */
+  system?: boolean;
+  disabled?: boolean;
+  [k: string]: unknown;
+}
+/**
+ * Defines a script associated with an associated event name
+ */
+export interface Event {
+  /**
+   * A unique identifier for the enclosing event.
+   */
+  id?: string;
+  /**
+   * Can be set to `test` or `prerequest` for test scripts or pre-request scripts respectively.
+   */
+  listen: string;
+  script?: Script;
+  /**
+   * Indicates whether the event is disabled. If absent, the event is assumed to be enabled.
+   */
+  disabled?: boolean;
+  [k: string]: unknown;
+}
+/**
+ * A script is a snippet of Javascript code that can be used to to perform setup or teardown operations on a particular response.
+ */
+export interface Script {
+  /**
+   * A unique, user defined identifier that can  be used to refer to this script from requests.
+   */
+  id?: string;
+  /**
+   * Type of the script. E.g: 'text/javascript'
+   */
+  type?: string;
+  exec?: string[] | string;
+  src?: Url;
+  /**
+   * Script name
+   */
+  name?: string;
+  [k: string]: unknown;
+}
+export interface QueryParam {
+  key?: string | null;
+  value?: string | null;
+  /**
+   * If set to true, the current query parameter will not be sent with the request.
+   */
+  disabled?: boolean;
+  description?: DefinitionsDescription;
+  [k: string]: unknown;
+}
+export interface Request1 {
+  url?: Url;
+  auth?: null | Auth;
+  proxy?: ProxyConfig;
+  certificate?: Certificate;
+  method?:
+    | (
+        | 'GET'
+        | 'PUT'
+        | 'POST'
+        | 'PATCH'
+        | 'DELETE'
+        | 'COPY'
+        | 'HEAD'
+        | 'OPTIONS'
+        | 'LINK'
+        | 'UNLINK'
+        | 'PURGE'
+        | 'LOCK'
+        | 'UNLOCK'
+        | 'PROPFIND'
+        | 'VIEW'
+      )
+    | string;
+  description?: DefinitionsDescription;
+  header?: HeaderList | string;
+  body?: {
+    /**
+     * Postman stores the type of data associated with this request in this field.
+     */
+    mode?: 'raw' | 'urlencoded' | 'formdata' | 'file' | 'graphql';
+    raw?: string;
+    urlencoded?: UrlEncodedParameter[];
+    formdata?: FormParameter[];
+    file?: {
+      src?: string | null;
+      content?: string;
+      [k: string]: unknown;
+    };
+    graphql?: {
+      [k: string]: unknown;
+    };
+    /**
+     * Additional configurations and options set for various body modes.
+     */
+    options?: {
+      [k: string]: unknown;
+    };
+    /**
+     * When set to true, prevents request body from being sent.
+     */
+    disabled?: boolean;
+    [k: string]: unknown;
+  } | null;
+  [k: string]: unknown;
+}
+/**
+ * Represents authentication helpers provided by Postman
+ */
+export interface Auth {
+  type:
+    | 'apikey'
+    | 'awsv4'
+    | 'basic'
+    | 'bearer'
+    | 'digest'
+    | 'edgegrid'
+    | 'hawk'
+    | 'noauth'
+    | 'oauth1'
+    | 'oauth2'
+    | 'ntlm';
+  noauth?: unknown;
+  apikey?: APIKeyAuthentication;
+  awsv4?: AWSSignatureV4;
+  basic?: BasicAuthentication;
+  bearer?: BearerTokenAuthentication;
+  digest?: DigestAuthentication;
+  edgegrid?: EdgeGridAuthentication;
+  hawk?: HawkAuthentication;
+  ntlm?: NTLMAuthentication;
+  oauth1?: OAuth1;
+  oauth2?: OAuth2;
+  [k: string]: unknown;
+}
+/**
+ * Represents an attribute for any authorization method provided by Postman. For example `username` and `password` are set as auth attributes for Basic Authentication method.
+ */
+export interface Auth1 {
+  key: string;
+  value?: unknown;
+  type?: string;
+  [k: string]: unknown;
+}
+/**
+ * Using the Proxy, you can configure your custom proxy into the postman for particular url match
+ */
+export interface ProxyConfig {
+  /**
+   * The Url match for which the proxy config is defined
+   */
+  match?: string;
+  /**
+   * The proxy server host
+   */
+  host?: string;
+  /**
+   * The proxy server port
+   */
+  port?: number;
+  /**
+   * The tunneling details for the proxy config
+   */
+  tunnel?: boolean;
+  /**
+   * When set to true, ignores this proxy configuration entity
+   */
+  disabled?: boolean;
+  [k: string]: unknown;
+}
+/**
+ * A representation of an ssl certificate
+ */
+export interface Certificate {
+  /**
+   * A name for the certificate for user reference
+   */
+  name?: string;
+  /**
+   * A list of Url match pattern strings, to identify Urls this certificate can be used for.
+   */
+  matches?: string[];
+  /**
+   * An object containing path to file containing private key, on the file system
+   */
+  key?: {
+    /**
+     * The path to file containing key for certificate, on the file system
+     */
+    src?: {
+      [k: string]: unknown;
+    };
+    [k: string]: unknown;
+  };
+  /**
+   * An object containing path to file certificate, on the file system
+   */
+  cert?: {
+    /**
+     * The path to file containing key for certificate, on the file system
+     */
+    src?: {
+      [k: string]: unknown;
+    };
+    [k: string]: unknown;
+  };
+  /**
+   * The passphrase for the certificate
+   */
+  passphrase?: string;
+  [k: string]: unknown;
+}
+/**
+ * Represents a single HTTP Header
+ */
+export interface Header {
+  /**
+   * This holds the LHS of the HTTP Header, e.g ``Content-Type`` or ``X-Custom-Header``
+   */
+  key: string;
+  /**
+   * The value (or the RHS) of the Header is stored in this field.
+   */
+  value: string;
+  /**
+   * If set to true, the current header will not be sent with requests.
+   */
+  disabled?: boolean;
+  description?: DefinitionsDescription;
+  [k: string]: unknown;
+}
+export interface UrlEncodedParameter {
+  key: string;
+  value?: string;
+  disabled?: boolean;
+  description?: DefinitionsDescription;
+  [k: string]: unknown;
+}
+/**
+ * A response represents an HTTP response.
+ */
+export interface Response {
+  /**
+   * A unique, user defined identifier that can  be used to refer to this response from requests.
+   */
+  id?: string;
+  originalRequest?: Request;
+  responseTime?: ResponseTime;
+  timings?: ResponseTimings;
+  header?: Headers;
+  cookie?: Cookie[];
+  /**
+   * The raw text of the response.
+   */
+  body?: null | string;
+  /**
+   * The response status, e.g: '200 OK'
+   */
+  status?: string;
+  /**
+   * The numerical response code, example: 200, 201, 404, etc.
+   */
+  code?: number;
+  [k: string]: unknown;
+}
+/**
+ * A Cookie, that follows the [Google Chrome format](https://developer.chrome.com/extensions/cookies)
+ */
+export interface Cookie {
+  /**
+   * The domain for which this cookie is valid.
+   */
+  domain: string;
+  /**
+   * When the cookie expires.
+   */
+  expires?: string | number;
+  maxAge?: string;
+  /**
+   * True if the cookie is a host-only cookie. (i.e. a request's URL domain must exactly match the domain of the cookie).
+   */
+  hostOnly?: boolean;
+  /**
+   * Indicates if this cookie is HTTP Only. (if True, the cookie is inaccessible to client-side scripts)
+   */
+  httpOnly?: boolean;
+  /**
+   * This is the name of the Cookie.
+   */
+  name?: string;
+  /**
+   * The path associated with the Cookie.
+   */
+  path: string;
+  /**
+   * Indicates if the 'secure' flag is set on the Cookie, meaning that it is transmitted over secure connections only. (typically HTTPS)
+   */
+  secure?: boolean;
+  /**
+   * True if the cookie is a session cookie.
+   */
+  session?: boolean;
+  /**
+   * The value of the Cookie.
+   */
+  value?: string;
+  /**
+   * Custom attributes for a cookie go here, such as the [Priority Field](https://code.google.com/p/chromium/issues/detail?id=232693)
+   */
+  extensions?: unknown[];
+  [k: string]: unknown;
+}
+/**
+ * Set of configurations used to alter the usual behavior of sending the request
+ */
+export interface ProtocolProfileBehavior {
+  [k: string]: unknown;
+}
+/**
+ * One of the primary goals of Postman is to organize the development of APIs. To this end, it is necessary to be able to group requests together. This can be achived using 'Folders'. A folder just is an ordered set of requests.
+ */
+export interface Folder {
+  /**
+   * A folder's friendly name is defined by this field. You would want to set this field to a value that would allow you to easily identify this folder.
+   */
+  name?: string;
+  description?: DefinitionsDescription;
+  variable?: VariableList;
+  /**
+   * Items are entities which contain an actual HTTP request, and sample responses attached to it. Folders may contain many items.
+   */
+  item: Items1[];
+  event?: EventList;
+  auth?: null | Auth;
+  protocolProfileBehavior?: ProtocolProfileBehavior;
+  [k: string]: unknown;
+}
diff --git a/packages/insomnia-importers/src/importers/postman-env.js b/packages/insomnia-importers/src/importers/postman-env.js
deleted file mode 100755
index 4db49aeea3..0000000000
--- a/packages/insomnia-importers/src/importers/postman-env.js
+++ /dev/null
@@ -1,38 +0,0 @@
-'use strict';
-
-module.exports.id = 'postman-environment';
-module.exports.name = 'Postman Environment';
-module.exports.description = 'Importer for Postman environments';
-
-module.exports.convert = function(rawData) {
-  let data;
-  try {
-    data = JSON.parse(rawData);
-    if (data._postman_variable_scope === 'environment') {
-      return importEnvironment(data);
-    }
-  } catch (e) {
-    // Nothing
-  }
-
-  return null;
-};
-
-function importEnvironment(environment) {
-  const newEnvironment = {
-    _id: '__ENV_1__',
-    _type: 'environment',
-    name: environment.name || 'Postman Environment',
-    data: {},
-  };
-
-  for (const value of environment.values) {
-    if (!value.enabled) {
-      continue;
-    }
-
-    newEnvironment.data[value.key] = value.value;
-  }
-
-  return [newEnvironment];
-}
diff --git a/packages/insomnia-importers/src/importers/postman-env.ts b/packages/insomnia-importers/src/importers/postman-env.ts
new file mode 100644
index 0000000000..46bc32fc4f
--- /dev/null
+++ b/packages/insomnia-importers/src/importers/postman-env.ts
@@ -0,0 +1,54 @@
+import { Converter } from '../entities';
+
+export const id = 'postman-environment';
+export const name = 'Postman Environment';
+export const description = 'Importer for Postman environments';
+
+interface EnvVar {
+  enabled: boolean;
+  key: string;
+  value: string;
+}
+
+interface Environment {
+  name: string;
+  values: EnvVar[];
+  _postman_variable_scope: 'environment' | string;
+}
+
+type Data = {
+  [key in EnvVar['key']]: EnvVar['value'];
+};
+
+export const convert: Converter<Data> = (rawData) => {
+  try {
+    const { _postman_variable_scope, name, values } = JSON.parse(
+      rawData,
+    ) as Environment;
+
+    if (_postman_variable_scope !== 'environment') {
+      return null;
+    }
+
+    return [
+      {
+        _id: '__ENV_1__',
+        _type: 'environment',
+        name: name || 'Postman Environment',
+        data: values.reduce((accumulator, { enabled, key, value }) => {
+          if (!enabled) {
+            return accumulator;
+          }
+          return {
+            ...accumulator,
+            [key]: value,
+          };
+        }, {}),
+      },
+    ];
+  } catch (e) {
+    // Nothing
+  }
+
+  return null;
+};
diff --git a/packages/insomnia-importers/src/importers/postman.js b/packages/insomnia-importers/src/importers/postman.js
deleted file mode 100755
index 11f5909f32..0000000000
--- a/packages/insomnia-importers/src/importers/postman.js
+++ /dev/null
@@ -1,411 +0,0 @@
-'use strict';
-
-module.exports.id = 'postman';
-module.exports.name = 'Postman';
-module.exports.description = 'Importer for Postman collections';
-
-let requestCount = 1;
-let requestGroupCount = 1;
-
-const POSTMAN_SCHEMA_V2_0 = 'https://schema.getpostman.com/json/collection/v2.0.0/collection.json';
-const POSTMAN_SCHEMA_V2_1 = 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json';
-
-module.exports.convert = function(rawData) {
-  requestCount = 1;
-  requestGroupCount = 1;
-
-  let data;
-  try {
-    data = JSON.parse(rawData);
-    if (data.info.schema === POSTMAN_SCHEMA_V2_0 || data.info.schema === POSTMAN_SCHEMA_V2_1) {
-      return importCollection(data, data.info.schema);
-    }
-  } catch (e) {
-    // Nothing
-  }
-
-  return null;
-};
-
-function importCollection(collection, schema) {
-  const postmanVariable = importVariable(collection.variable || []);
-  const collectionFolder = {
-    parentId: '__WORKSPACE_ID__',
-    _id: `__GRP_${requestGroupCount++}__`,
-    _type: 'request_group',
-    name: collection.info.name,
-    description: collection.info.description || '',
-  };
-  if (postmanVariable) {
-    collectionFolder.variable = postmanVariable;
-  }
-  return [collectionFolder, ...importItem(collection.item, collectionFolder._id, schema)];
-}
-
-function importVariable(items) {
-  const variable = {};
-  if (items.length === 0) {
-    return null;
-  } else {
-    for (let idx = 0; idx < items.length; idx++) {
-      variable[items[idx].key] = items[idx].value;
-    }
-  }
-
-  return variable;
-}
-
-function importItem(items, parentId = '__WORKSPACE_ID__', schema) {
-  let resources = [];
-
-  for (const item of items) {
-    if (item.hasOwnProperty('request')) {
-      resources = [...resources, importRequestItem(item, parentId, schema)];
-    } else {
-      const requestGroup = importFolderItem(item, parentId);
-      resources = [...resources, requestGroup, ...importItem(item.item, requestGroup._id, schema)];
-    }
-  }
-
-  return resources;
-}
-
-function importFolderItem(item, parentId) {
-  return {
-    parentId,
-    _id: `__GRP_${requestGroupCount++}__`,
-    _type: 'request_group',
-    name: item.name,
-    description: item.description || '',
-  };
-}
-
-function importRequestItem(item, parentId, schema) {
-  const { request } = item;
-  return {
-    parentId,
-    _id: `__REQ_${requestCount++}__`,
-    _type: 'request',
-    name: item.name || '',
-    description: request.description || '',
-    url: importUrl(request.url),
-    method: request.method || 'GET',
-    headers: mapImporter(request.header, importHeader),
-    body: importBody(request.body, schema),
-    authentication: importAuthentication(request.auth, schema),
-  };
-}
-
-function importHeader(header) {
-  return Object.assign({
-    name: header.key,
-    value: header.value,
-  });
-}
-
-function importUrl(url) {
-  if (!url) {
-    return '';
-  }
-
-  if (url.raw) {
-    return url.raw;
-  }
-
-  return url;
-}
-
-function importBody(body, schema) {
-  if (!body) {
-    return {};
-  } else if (body.mode === 'raw') {
-    return importBodyRaw(body.raw);
-  } else if (body.mode === 'urlencoded') {
-    return importBodyFormUrlEncoded(body.urlencoded, schema);
-  } else if (body.mode === 'formdata') {
-    // TODO: Handle this as properly as multipart/form-data
-    return importBodyFormdata(body.formdata, schema);
-  } else {
-    return {};
-  }
-}
-
-function importBodyFormdata(formdata, schema) {
-  const params = formdata.map(({ key, value, type, enabled, disabled, src }) => {
-    const item = {
-      type,
-      name: key,
-    };
-
-    if (schema === POSTMAN_SCHEMA_V2_0) {
-      item.disabled = !enabled;
-    } else if (schema === POSTMAN_SCHEMA_V2_1) {
-      item.disabled = !!disabled;
-    }
-
-    if (type === 'file') {
-      item.fileName = src;
-    } else {
-      item.value = value;
-    }
-
-    return item;
-  });
-
-  return {
-    params,
-    mimeType: 'multipart/form-data',
-  };
-}
-
-function importBodyFormUrlEncoded(urlEncoded, schema) {
-  const params = urlEncoded.map(({ key, value, enabled, disabled }) => {
-    const item = {
-      value,
-      name: key,
-    };
-
-    if (schema === POSTMAN_SCHEMA_V2_0) {
-      item.disabled = !enabled;
-    } else if (schema === POSTMAN_SCHEMA_V2_1) {
-      item.disabled = !!disabled;
-    }
-
-    return item;
-  });
-
-  return {
-    params,
-    mimeType: 'application/x-www-form-urlencoded',
-  };
-}
-
-function importBodyRaw(raw) {
-  if (raw === '') {
-    return {};
-  }
-
-  return {
-    mimeType: '',
-    text: raw,
-  };
-}
-
-function mapImporter(arr, importFn) {
-  if (!arr) {
-    return [];
-  } else {
-    return arr.map(importFn);
-  }
-}
-
-function importAuthentication(auth, schema) {
-  if (!auth) {
-    return {};
-  }
-  if (auth.type === 'awsv4') {
-    return importAwsV4Authentication(auth, schema);
-  } else if (auth.type === 'basic') {
-    return importBasicAuthentication(auth, schema);
-  } else if (auth.type === 'bearer') {
-    return importBearerTokenAuthentication(auth, schema);
-  } else if (auth.type === 'digest') {
-    return importDigestAuthentication(auth, schema);
-  } else if (auth.type === 'oauth1') {
-    return importOauth1Authentication(auth, schema);
-  } else if (auth.type === 'oauth2') {
-    return importOauth2Authentication(auth, schema);
-  } else {
-    return {};
-  }
-}
-
-function importAwsV4Authentication(auth, schema) {
-  if (!auth.awsv4) {
-    return {};
-  }
-
-  const item = {
-    type: 'iam',
-    disabled: false,
-    accessKeyId: 'aws-access-key',
-    region: 'aws-region',
-    secretAccessKey: 'aws-secret-key',
-    service: 'aws-service-name',
-    sessionToken: 'aws-session-token',
-  };
-
-  if (schema === POSTMAN_SCHEMA_V2_0) {
-    item.accessKeyId = auth.awsv4.accessKey;
-    item.region = auth.awsv4.region;
-    item.secretAccessKey = auth.awsv4.secretKey;
-    item.service = auth.awsv4.service;
-    item.sessionToken = auth.awsv4.sessionToken;
-  }
-
-  if (schema === POSTMAN_SCHEMA_V2_1) {
-    item.accessKeyId = findValueByKey(auth.awsv4, 'accessKey');
-    item.region = findValueByKey(auth.awsv4, 'region');
-    item.secretAccessKey = findValueByKey(auth.awsv4, 'secretKey');
-    item.service = findValueByKey(auth.awsv4, 'service');
-    item.sessionToken = findValueByKey(auth.awsv4, 'sessionToken');
-  }
-
-  return item;
-}
-
-function importBasicAuthentication(auth, schema) {
-  if (!auth.basic) {
-    return {};
-  }
-
-  const item = {
-    type: 'basic',
-    disabled: false,
-    username: '',
-    password: '',
-  };
-
-  if (schema === POSTMAN_SCHEMA_V2_0) {
-    item.username = auth.basic.username;
-    item.password = auth.basic.password;
-  }
-
-  if (schema === POSTMAN_SCHEMA_V2_1) {
-    item.username = findValueByKey(auth.basic, 'username');
-    item.password = findValueByKey(auth.basic, 'password');
-  }
-
-  return item;
-}
-
-function importBearerTokenAuthentication(auth, schema) {
-  if (!auth.bearer) {
-    return {};
-  }
-
-  const item = {
-    type: 'bearer',
-    disabled: false,
-    token: '',
-    prefix: '',
-  };
-
-  if (schema === POSTMAN_SCHEMA_V2_0) {
-    item.token = auth.bearer.token;
-  }
-
-  if (schema === POSTMAN_SCHEMA_V2_1) {
-    item.token = findValueByKey(auth.bearer, 'token');
-  }
-
-  return item;
-}
-
-function importDigestAuthentication(auth, schema) {
-  if (!auth.digest) {
-    return {};
-  }
-
-  const item = {
-    type: 'digest',
-    disabled: false,
-    username: '',
-    password: '',
-  };
-
-  if (schema === POSTMAN_SCHEMA_V2_0) {
-    item.username = auth.digest.username;
-    item.password = auth.digest.password;
-  }
-
-  if (schema === POSTMAN_SCHEMA_V2_1) {
-    item.username = findValueByKey(auth.digest, 'username');
-    item.password = findValueByKey(auth.digest, 'password');
-  }
-
-  return item;
-}
-
-function importOauth1Authentication(auth, schema) {
-  if (!auth.oauth1) {
-    return {};
-  }
-
-  const item = {
-    type: 'oauth1',
-    disabled: false,
-    callback: '',
-    consumerKey: '',
-    consumerSecret: '',
-    nonce: '',
-    privateKey: '',
-    realm: '',
-    signatureMethod: '',
-    timestamp: '',
-    tokenKey: '',
-    tokenSecret: '',
-    verifier: '',
-    version: '',
-  };
-
-  if (schema === POSTMAN_SCHEMA_V2_0) {
-    item.consumerKey = auth.oauth1.consumerKey;
-    item.consumerSecret = auth.oauth1.consumerSecret;
-    item.nonce = auth.oauth1.nonce;
-    item.realm = auth.oauth1.realm;
-    item.signatureMethod = auth.oauth1.signatureMethod;
-    item.timestamp = auth.oauth1.timestamp;
-    item.tokenKey = auth.oauth1.token;
-    item.tokenSecret = auth.oauth1.tokenSecret;
-    item.version = auth.oauth1.version;
-  }
-
-  if (schema === POSTMAN_SCHEMA_V2_1) {
-    item.consumerKey = findValueByKey(auth.oauth1, 'consumerKey');
-    item.consumerSecret = findValueByKey(auth.oauth1, 'consumerSecret');
-    item.nonce = findValueByKey(auth.oauth1, 'nonce');
-    item.realm = findValueByKey(auth.oauth1, 'realm');
-    item.signatureMethod = findValueByKey(auth.oauth1, 'signatureMethod');
-    item.timestamp = findValueByKey(auth.oauth1, 'timestamp');
-    item.tokenKey = findValueByKey(auth.oauth1, 'token');
-    item.tokenSecret = findValueByKey(auth.oauth1, 'tokenSecret');
-    item.version = findValueByKey(auth.oauth1, 'version');
-  }
-
-  return item;
-}
-
-function importOauth2Authentication(auth, schema) {
-  if (!auth.oauth2) {
-    return {};
-  }
-
-  // Note: Postman v2.0 and v2.1 don't export any Oauth config. They only export the token
-  // So just return a disabled and empty Oauth 2 configuration so the user can fill it in later.
-
-  const item = {
-    type: 'oauth2',
-    disabled: true,
-    accessTokenUrl: '',
-    authorizationUrl: '',
-    grantType: 'authorization_code',
-    password: '',
-    username: '',
-  };
-
-  return item;
-}
-
-function findValueByKey(array, key) {
-  if (!array) {
-    return '';
-  }
-
-  const obj = array.find(o => o.key === key);
-  if (obj) {
-    return obj.value || '';
-  }
-
-  return '';
-}
diff --git a/packages/insomnia-importers/src/importers/postman.ts b/packages/insomnia-importers/src/importers/postman.ts
new file mode 100644
index 0000000000..b536786065
--- /dev/null
+++ b/packages/insomnia-importers/src/importers/postman.ts
@@ -0,0 +1,513 @@
+import { Converter, ImportRequest, Parameter } from '../entities';
+import {
+  HttpsSchemaGetpostmanComJsonCollectionV200 as V200Schema,
+  Variable2 as V200Variable2,
+  Auth as V200Auth,
+  Request1 as V200Request1,
+  UrlEncodedParameter as V200UrlEncodedParameter,
+  FormParameter as V200FormParameter,
+  Item as V200Item,
+  Folder as V200Folder,
+  Header as V200Header,
+} from './postman-2.0.types';
+import {
+  HttpsSchemaGetpostmanComJsonCollectionV210 as V210Schema,
+  Variable2 as V210Variable2,
+  Auth as V210Auth,
+  Request1 as V210Request1,
+  Auth1 as V210Auth1,
+  UrlEncodedParameter as V210UrlEncodedParameter,
+  FormParameter as V210FormParameter,
+  Item as V210Item,
+  Folder as V210Folder,
+  Header as V210Header,
+} from './postman-2.1.types';
+
+export const id = 'postman';
+export const name = 'Postman';
+export const description = 'Importer for Postman collections';
+
+type PostmanCollection = V200Schema | V210Schema;
+
+type Variable = V200Variable2 | V210Variable2;
+
+type Auth = V200Auth | V210Auth;
+
+type Body = V200Request1['body'] | V210Request1['body'];
+
+type UrlEncodedParameter = V200UrlEncodedParameter | V210UrlEncodedParameter;
+
+type FormParameter = V200FormParameter | V210FormParameter;
+
+type Item = V200Item | V210Item;
+
+type Folder = V200Folder | V210Folder;
+
+type Header = V200Header | V210Header;
+
+let requestCount = 1;
+let requestGroupCount = 1;
+
+const POSTMAN_SCHEMA_V2_0 =
+  'https://schema.getpostman.com/json/collection/v2.0.0/collection.json';
+const POSTMAN_SCHEMA_V2_1 =
+  'https://schema.getpostman.com/json/collection/v2.1.0/collection.json';
+
+class ImportCollection {
+  collection;
+
+  constructor(collection: PostmanCollection) {
+    this.collection = collection;
+  }
+
+  importVariable = (variables: Variable[]) => {
+    if (variables?.length === 0) {
+      return null;
+    }
+
+    const variable: { [key: string]: Variable['value'] } = {};
+    for (let i = 0; i < variables.length; i++) {
+      const key = variables[i].key;
+      if (key === undefined) {
+        continue;
+      }
+      variable[key] = variables[i].value;
+    }
+    return variable;
+  };
+
+  importItems = (
+    items: PostmanCollection['item'],
+    parentId = '__WORKSPACE_ID__',
+  ): ImportRequest[] => {
+    // @ts-expect-error this is because there are devergent behaviors for how the function treats this collection.  This is handled appropriately in the function itself in different branches.
+    return items.reduce((accumulator: ImportRequest[], item: Item | Folder) => {
+      if (Object.prototype.hasOwnProperty.call(item, 'request')) {
+        return [...accumulator, this.importRequestItem(item as Item, parentId)];
+      }
+
+      const requestGroup = this.importFolderItem(item as Folder, parentId);
+      return [
+        ...accumulator,
+        requestGroup,
+        ...this.importItems(
+          item.item as PostmanCollection['item'],
+          requestGroup._id,
+        ),
+      ];
+    }, []);
+  };
+
+  importRequestItem = (
+    { request, name = '' }: Item,
+    parentId: string,
+  ): ImportRequest => {
+    if (typeof request === 'string') {
+      return {};
+    }
+
+    return {
+      parentId,
+      _id: `__REQ_${requestCount++}__`,
+      _type: 'request',
+      name,
+      description: (request.description as string) || '',
+      url: this.importUrl(request.url),
+      method: request.method || 'GET',
+      headers: ((request.header || []) as Header[])?.map((header) => ({
+        name: header.key,
+        value: header.value,
+      })),
+      body: this.importBody(request.body),
+      authentication: this.importAuthentication(request.auth),
+    };
+  };
+
+  importFolderItem = ({ name, description }: Folder, parentId: string) => {
+    return {
+      parentId,
+      _id: `__GRP_${requestGroupCount++}__`,
+      _type: 'request_group',
+      name,
+      description: description || '',
+    };
+  };
+
+  importCollection = (): ImportRequest[] => {
+    const {
+      item,
+      info: { name, description },
+      variable,
+    } = this.collection;
+
+    const postmanVariable = this.importVariable(variable || []);
+    const collectionFolder: ImportRequest = {
+      parentId: '__WORKSPACE_ID__',
+      _id: `__GRP_${requestGroupCount++}__`,
+      _type: 'request_group',
+      name,
+      description: typeof description === 'string' ? description : '',
+    };
+
+    if (postmanVariable) {
+      collectionFolder.variable = postmanVariable;
+    }
+
+    return [collectionFolder, ...this.importItems(item, collectionFolder._id)];
+  };
+
+  importUrl = (url?: { raw?: string } | string) => {
+    if (!url) {
+      return '';
+    }
+
+    if (typeof url === 'object' && url.raw) {
+      return url.raw;
+    }
+    if (typeof url === 'string') {
+      return url;
+    }
+    return '';
+  };
+
+  importBody = (body: Body): ImportRequest['body'] => {
+    if (!body) {
+      return {};
+    }
+
+    switch (body.mode) {
+      case 'raw':
+        return this.importBodyRaw(body.raw);
+
+      case 'urlencoded':
+        return this.importBodyFormUrlEncoded(body.urlencoded);
+
+      case 'formdata':
+        // TODO: Handle this as properly as multipart/form-data
+        return this.importBodyFormdata(body.formdata);
+
+      default:
+        return {};
+    }
+  };
+
+  importBodyFormdata = (formdata?: FormParameter[]) => {
+    const { schema } = this.collection.info;
+
+    const params = formdata?.map(
+      ({ key, value, type, enabled, disabled, src }) => {
+        const item: Parameter = {
+          type,
+          name: key,
+        };
+
+        if (schema === POSTMAN_SCHEMA_V2_0) {
+          item.disabled = !enabled;
+        } else if (schema === POSTMAN_SCHEMA_V2_1) {
+          item.disabled = !!disabled;
+        }
+
+        if (type === 'file') {
+          item.fileName = src as string;
+        } else {
+          item.value = value as string;
+        }
+
+        return item;
+      },
+    );
+
+    return {
+      params,
+      mimeType: 'multipart/form-data',
+    };
+  };
+
+  importBodyFormUrlEncoded = (
+    urlEncoded?: UrlEncodedParameter[],
+  ): ImportRequest['body'] => {
+    const { schema } = this.collection.info;
+
+    const params = urlEncoded?.map(({ key, value, enabled, disabled }) => {
+      const item: Parameter = {
+        value,
+        name: key,
+      };
+
+      if (schema === POSTMAN_SCHEMA_V2_0) {
+        item.disabled = !enabled;
+      } else if (schema === POSTMAN_SCHEMA_V2_1) {
+        item.disabled = !!disabled;
+      }
+
+      return item;
+    });
+
+    return {
+      params,
+      mimeType: 'application/x-www-form-urlencoded',
+    };
+  };
+
+  importBodyRaw = (raw?: string) => {
+    if (raw === '') {
+      return {};
+    }
+
+    return {
+      mimeType: '',
+      text: raw,
+    };
+  };
+
+  importAuthentication = (auth?: Auth | null) => {
+    if (!auth) {
+      return {};
+    }
+
+    switch (auth.type) {
+      case 'awsv4':
+        return this.importAwsV4Authentication(auth);
+      case 'basic':
+        return this.importBasicAuthentication(auth);
+      case 'bearer':
+        return this.importBearerTokenAuthentication(auth);
+      case 'digest':
+        return this.importDigestAuthentication(auth);
+      case 'oauth1':
+        return this.importOauth1Authentication(auth);
+      case 'oauth2':
+        return this.importOauth2Authentication(auth);
+      default:
+        return {};
+    }
+  };
+
+  importAwsV4Authentication = (auth: Auth) => {
+    if (!auth.awsv4) {
+      return {};
+    }
+
+    const item = {
+      type: 'iam',
+      disabled: false,
+      accessKeyId: 'aws-access-key',
+      region: 'aws-region',
+      secretAccessKey: 'aws-secret-key',
+      service: 'aws-service-name',
+      sessionToken: 'aws-session-token',
+    };
+
+    const { schema } = this.collection.info;
+    if (schema === POSTMAN_SCHEMA_V2_0) {
+      const awsv4 = auth.awsv4 as V200Auth['awsv4'];
+      item.accessKeyId = awsv4?.accessKey as string;
+      item.region = awsv4?.region as string;
+      item.secretAccessKey = awsv4?.secretKey as string;
+      item.service = awsv4?.service as string;
+      item.sessionToken = awsv4?.sessionToken as string;
+    }
+
+    if (schema === POSTMAN_SCHEMA_V2_1) {
+      const awsv4 = auth.awsv4 as V210Auth['awsv4'];
+      item.accessKeyId = this.findValueByKey(awsv4, 'accessKey');
+      item.region = this.findValueByKey(awsv4, 'region');
+      item.secretAccessKey = this.findValueByKey(awsv4, 'secretKey');
+      item.service = this.findValueByKey(awsv4, 'service');
+      item.sessionToken = this.findValueByKey(awsv4, 'sessionToken');
+    }
+
+    return item;
+  };
+
+  importBasicAuthentication = (auth: Auth) => {
+    if (!auth.basic) {
+      return {};
+    }
+
+    const item = {
+      type: 'basic',
+      disabled: false,
+      username: '',
+      password: '',
+    };
+    const { schema } = this.collection.info;
+
+    if (schema === POSTMAN_SCHEMA_V2_0) {
+      const basic = auth.basic as V200Auth['basic'];
+      item.username = basic?.username as string;
+      item.password = basic?.password as string;
+    }
+
+    if (schema === POSTMAN_SCHEMA_V2_1) {
+      const basic = auth.basic as V210Auth['basic'];
+      item.username = this.findValueByKey(basic, 'username');
+      item.password = this.findValueByKey(basic, 'password');
+    }
+
+    return item;
+  };
+
+  importBearerTokenAuthentication = (auth: Auth) => {
+    if (!auth.bearer) {
+      return {};
+    }
+
+    const item = {
+      type: 'bearer',
+      disabled: false,
+      token: '',
+      prefix: '',
+    };
+    const { schema } = this.collection.info;
+
+    if (schema === POSTMAN_SCHEMA_V2_0) {
+      item.token = (auth.bearer as V200Auth['bearer'])?.token as string;
+    }
+
+    if (schema === POSTMAN_SCHEMA_V2_1) {
+      item.token = this.findValueByKey(
+        auth.bearer as V210Auth['bearer'],
+        'token',
+      );
+    }
+
+    return item;
+  };
+
+  importDigestAuthentication = (auth: Auth) => {
+    if (!auth.digest) {
+      return {};
+    }
+
+    const item = {
+      type: 'digest',
+      disabled: false,
+      username: '',
+      password: '',
+    };
+
+    const { schema } = this.collection.info;
+
+    if (schema === POSTMAN_SCHEMA_V2_0) {
+      const digest = auth.digest as V200Auth['digest'];
+      item.username = digest?.username as string;
+      item.password = digest?.password as string;
+    }
+
+    if (schema === POSTMAN_SCHEMA_V2_1) {
+      const digest = auth.digest as V210Auth1[];
+      item.username = this.findValueByKey<V210Auth1>(digest, 'username');
+      item.password = this.findValueByKey<V210Auth1>(digest, 'password');
+    }
+
+    return item;
+  };
+
+  importOauth1Authentication = (auth: Auth) => {
+    if (!auth.oauth1) {
+      return {};
+    }
+
+    const item = {
+      type: 'oauth1',
+      disabled: false,
+      callback: '',
+      consumerKey: '',
+      consumerSecret: '',
+      nonce: '',
+      privateKey: '',
+      realm: '',
+      signatureMethod: '',
+      timestamp: '',
+      tokenKey: '',
+      tokenSecret: '',
+      verifier: '',
+      version: '',
+    };
+
+    const { schema } = this.collection.info;
+    if (schema === POSTMAN_SCHEMA_V2_0) {
+      const oauth1 = auth.oauth1 as V200Auth['oauth1'];
+      item.consumerKey = oauth1?.consumerKey as string;
+      item.consumerSecret = oauth1?.consumerSecret as string;
+      item.nonce = oauth1?.nonce as string;
+      item.realm = oauth1?.realm as string;
+      item.signatureMethod = oauth1?.signatureMethod as string;
+      item.timestamp = oauth1?.timestamp as string;
+      item.tokenKey = oauth1?.token as string;
+      item.tokenSecret = oauth1?.tokenSecret as string;
+      item.version = oauth1?.version as string;
+    }
+
+    if (schema === POSTMAN_SCHEMA_V2_1) {
+      const oauth1 = auth.oauth1 as V210Auth['oauth1'];
+      item.consumerKey = this.findValueByKey(oauth1, 'consumerKey');
+      item.consumerSecret = this.findValueByKey(oauth1, 'consumerSecret');
+      item.nonce = this.findValueByKey(oauth1, 'nonce');
+      item.realm = this.findValueByKey(oauth1, 'realm');
+      item.signatureMethod = this.findValueByKey(oauth1, 'signatureMethod');
+      item.timestamp = this.findValueByKey(oauth1, 'timestamp');
+      item.tokenKey = this.findValueByKey(oauth1, 'token');
+      item.tokenSecret = this.findValueByKey(oauth1, 'tokenSecret');
+      item.version = this.findValueByKey(oauth1, 'version');
+    }
+
+    return item;
+  };
+
+  importOauth2Authentication = (auth: Auth) => {
+    if (!auth.oauth2) {
+      return {};
+    } // Note: Postman v2.0 and v2.1 don't export any Oauth config. They only export the token
+    // So just return a disabled and empty Oauth 2 configuration so the user can fill it in later.
+
+    const item = {
+      type: 'oauth2',
+      disabled: true,
+      accessTokenUrl: '',
+      authorizationUrl: '',
+      grantType: 'authorization_code',
+      password: '',
+      username: '',
+    };
+    return item;
+  };
+
+  findValueByKey = <T extends { key: string; value?: unknown }>(
+    array?: T[],
+    key?: keyof T,
+  ) => {
+    if (!array) {
+      return '';
+    }
+
+    const obj = array.find((o) => o.key === key);
+
+    if (obj && typeof obj.value === 'string') {
+      return obj.value || '';
+    }
+
+    return '';
+  };
+}
+
+export const convert: Converter = (rawData) => {
+  requestCount = 1;
+  requestGroupCount = 1;
+
+  try {
+    const collection = JSON.parse(rawData) as PostmanCollection;
+
+    if (
+      collection.info.schema === POSTMAN_SCHEMA_V2_0 ||
+      collection.info.schema === POSTMAN_SCHEMA_V2_1
+    ) {
+      return new ImportCollection(collection).importCollection();
+    }
+  } catch (e) {
+    // Nothing
+  }
+
+  return null;
+};
diff --git a/packages/insomnia-importers/src/importers/swagger-2.ts b/packages/insomnia-importers/src/importers/swagger-2.ts
new file mode 100644
index 0000000000..9b9e9f7c89
--- /dev/null
+++ b/packages/insomnia-importers/src/importers/swagger-2.ts
@@ -0,0 +1,589 @@
+import crypto from 'crypto';
+import { unthrowableParseJson } from '../utils';
+import SwaggerParser from '@apidevtools/swagger-parser';
+import { OpenAPIV2 } from 'openapi-types';
+import YAML from 'yaml';
+import { Converter, Header, ImportRequest } from '../entities';
+
+const SUPPORTED_SWAGGER_VERSION = '2.0';
+const MIMETYPE_JSON = 'application/json';
+const MIMETYPE_URLENCODED = 'application/x-www-form-urlencoded';
+const MIMETYPE_MULTIPART = 'multipart/form-data';
+const SUPPORTED_MIME_TYPES = [
+  MIMETYPE_JSON,
+  MIMETYPE_URLENCODED,
+  MIMETYPE_MULTIPART,
+];
+const WORKSPACE_ID = '__WORKSPACE_ID__';
+let requestCount = 1;
+export const id = 'swagger2';
+export const name = 'Swagger 2.0';
+export const description = 'Importer for Swagger 2.0 specification (json/yaml)';
+
+/* eslint-disable camelcase -- this file uses camel case too often */
+
+/**
+ * Return Insomnia folder / request group
+ */
+const importFolderItem = (parentId: string) => (
+  item: OpenAPIV2.TagObject,
+): ImportRequest => {
+  const hash = crypto
+    .createHash('sha1')
+    .update(item.name)
+    .digest('hex')
+    .slice(0, 8);
+  return {
+    parentId,
+    _id: `fld___WORKSPACE_ID__${hash}`,
+    _type: 'request_group',
+    name: item.name || 'Folder {requestGroupCount}',
+    description: item.description || '',
+  };
+};
+
+/**
+ * Parse string data into swagger 2.0 object (https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#swagger-object)
+ */
+const parseDocument = (rawData: string) => {
+  try {
+    return unthrowableParseJson(rawData) || YAML.parse(rawData);
+  } catch (err) {
+    return null;
+  }
+};
+
+/**
+ * Create request definitions based on swagger document.
+ */
+const parseEndpoints = (document: OpenAPIV2.Document) => {
+  const defaultParent = WORKSPACE_ID;
+  const globalMimeTypes = document.consumes ?? [];
+  const endpointsSchemas: OpenAPIV2.OperationObject[] = Object.keys(
+    document.paths,
+  )
+    .map((path: keyof OpenAPIV2.PathsObject) => {
+      const schemasPerMethod: OpenAPIV2.PathItemObject = document.paths[path];
+      const methods = Object.keys(
+        schemasPerMethod,
+      ) as (keyof OpenAPIV2.PathItemObject)[];
+      return methods
+        .filter((method) => method !== 'parameters' && method !== '$ref')
+        .map((method) => ({
+          ...(schemasPerMethod[method] as OpenAPIV2.OperationObject),
+          path,
+          method,
+        }));
+    })
+    .flat();
+
+  const tags = document.tags || [];
+
+  const implicitTags = endpointsSchemas
+    .map((endpointSchema) => endpointSchema.tags)
+    .flat()
+    .reduce((distinct, value) => {
+      // remove duplicates
+      if (value !== undefined && !distinct.includes(value)) {
+        distinct.push(value);
+      }
+      return distinct;
+    }, [] as string[])
+    .filter((tag) => !tags.map((tag) => tag.name).includes(tag))
+    .map((name) => ({ name, desciption: '' }));
+
+  const folders = [...tags, ...implicitTags].map(
+    importFolderItem(defaultParent),
+  );
+
+  const folderLookup = folders.reduce(
+    (accumulator, { _id, name }) => ({
+      ...accumulator,
+      ...(name === undefined ? {} : { [name]: _id }),
+    }),
+    {} as { [name: string]: string | undefined },
+  );
+
+  const requests: ImportRequest[] = [];
+  endpointsSchemas.map((endpointSchema) => {
+    let { tags } = endpointSchema;
+    if (!tags || tags.length === 0) tags = [''];
+    tags.forEach((tag, index) => {
+      const requestId = endpointSchema.operationId
+        ? `${endpointSchema.operationId}${index > 0 ? index : ''}`
+        : `__REQUEST_${requestCount++}__`;
+
+      const parentId = folderLookup[tag] || defaultParent;
+      requests.push(
+        importRequest(
+          document,
+          endpointSchema,
+          globalMimeTypes,
+          requestId,
+          parentId,
+        ),
+      );
+    });
+  });
+
+  return [...folders, ...requests];
+};
+
+const importRequest = (
+  document: OpenAPIV2.Document,
+  endpointSchema: OpenAPIV2.OperationObject<{ method?: string; path?: string }>,
+  globalMimeTypes: OpenAPIV2.MimeTypes,
+  requestId: string,
+  parentId: string,
+): ImportRequest => {
+  const name =
+    endpointSchema.summary || `${endpointSchema.method} ${endpointSchema.path}`;
+
+  const body = prepareBody(document, endpointSchema, globalMimeTypes);
+
+  let headers = prepareHeaders(endpointSchema);
+  const noContentTypeHeader = !headers?.find(
+    (header) => header.name === 'Content-Type',
+  );
+
+  if (body.mimeType && noContentTypeHeader) {
+    headers = [
+      {
+        name: 'Content-Type',
+        disabled: false,
+        value: body.mimeType,
+      },
+      ...headers,
+    ];
+  }
+
+  const request: ImportRequest = {
+    _type: 'request',
+    _id: requestId,
+    parentId: parentId,
+    name,
+    method: endpointSchema.method?.toUpperCase(),
+    url: `{{ base_url }}${pathWithParamsAsVariables(endpointSchema.path)}`,
+    body,
+    description: endpointSchema.description || '',
+    headers,
+    parameters: prepareQueryParams(endpointSchema),
+  };
+
+  return setupAuthentication(
+    document.securityDefinitions,
+    endpointSchema,
+    request,
+  );
+};
+
+/**
+ * Populate Insomnia request with authentication
+ */
+const setupAuthentication = (
+  securityDefinitions: OpenAPIV2.SecurityDefinitionsObject | undefined,
+  endpointSchema: OpenAPIV2.OperationObject | undefined,
+  request: ImportRequest,
+) => {
+  if (!securityDefinitions) {
+    return request;
+  }
+
+  if (!endpointSchema?.security || endpointSchema.security.length === 0) {
+    return request;
+  }
+
+  const usedDefinitions = endpointSchema.security.reduce(
+    (collect, requirement) => [
+      ...collect,
+      ...(Object.keys(requirement) as string[]),
+    ],
+    [] as string[],
+  );
+
+  const scopes = endpointSchema.security.reduce((accumulator, security) => {
+    for (const defname of Object.keys(security)) {
+      if (security[defname].length === 0) {
+        continue;
+      }
+      return accumulator.concat(security[defname]);
+    }
+
+    return accumulator;
+  }, [] as string[]);
+
+  for (const usedDefinition of usedDefinitions) {
+    const securityScheme = securityDefinitions[usedDefinition];
+
+    if (securityScheme.type === 'basic') {
+      request.authentication = {
+        type: 'basic',
+        disabled: false,
+        password: '{{ password }}',
+        username: '{{ username }}',
+      };
+    }
+
+    if (securityScheme.type === 'apiKey') {
+      if (securityScheme.in === 'header') {
+        request.headers?.push({
+          name: securityScheme.name,
+          disabled: false,
+          value: '{{ api_key }}',
+        });
+      }
+
+      if (securityScheme.in === 'query') {
+        request.parameters?.push({
+          name: securityScheme.name,
+          disabled: false,
+          value: '{{ api_key }}',
+        });
+      }
+    }
+
+    if (securityScheme.type === 'oauth2') {
+      if (securityScheme.flow === 'implicit') {
+        request.authentication = {
+          type: 'oauth2',
+          grantType: 'authorization_code',
+          disabled: false,
+          authorizationUrl: securityScheme.authorizationUrl,
+          clientId: '{{ client_id }}',
+          scope: scopes.join(' '),
+        };
+      }
+
+      if (securityScheme.flow === 'password') {
+        request.authentication = {
+          type: 'oauth2',
+          grantType: 'password',
+          disabled: false,
+          accessTokenUrl: securityScheme.tokenUrl,
+          username: '{{ username }}',
+          password: '{{ password }}',
+          clientId: '{{ client_id }}',
+          clientSecret: '{{ client_secret }}',
+          scope: scopes.join(' '),
+        };
+      }
+
+      if (securityScheme.flow === 'application') {
+        request.authentication = {
+          type: 'oauth2',
+          grantType: 'client_credentials',
+          disabled: false,
+          accessTokenUrl: securityScheme.tokenUrl,
+          clientId: '{{ client_id }}',
+          clientSecret: '{{ client_secret }}',
+          scope: scopes.join(' '),
+        };
+      }
+
+      if (securityScheme.flow === 'accessCode') {
+        request.authentication = {
+          type: 'oauth2',
+          grantType: 'authorization_code',
+          disabled: false,
+          accessTokenUrl: securityScheme.tokenUrl,
+          authorizationUrl: securityScheme.authorizationUrl,
+          clientId: '{{ client_id }}',
+          clientSecret: '{{ client_secret }}',
+          scope: scopes.join(' '),
+        };
+      }
+    }
+  }
+
+  return request;
+};
+
+/**
+ * Return path with parameters replaced by insomnia variables
+ *
+ * I.e. "/foo/:bar" => "/foo/{{ bar }}"
+ */
+const pathWithParamsAsVariables = (path?: string) => {
+  return path?.replace(/{([^}]+)}/g, '{{ $1 }}');
+};
+
+/**
+ * Imports insomnia definitions of query parameters.
+ */
+const prepareQueryParams = (endpointSchema: OpenAPIV2.OperationObject) => {
+  return (
+    convertParameters(
+      ((endpointSchema.parameters as unknown) as OpenAPIV2.Parameter[])?.filter(
+        (parameter) => parameter.in === 'query',
+      ),
+    ) || []
+  );
+};
+
+/**
+ * Imports insomnia definitions of header parameters.
+ */
+const prepareHeaders = (
+  endpointSchema: OpenAPIV2.OperationObject,
+): Header[] => {
+  return (
+    (convertParameters(
+      ((endpointSchema.parameters as unknown) as OpenAPIV2.Parameter[])?.filter(
+        (parameter) => parameter.in === 'header',
+      ),
+    ) as Header[]) || []
+  );
+};
+
+const resolve$ref = (document: OpenAPIV2.Document, $ref: string) => {
+  const [, ...parts] = $ref.split('/') as (keyof OpenAPIV2.Document)[];
+  return parts.reduce(
+    (accumulator, path) => accumulator[path] as OpenAPIV2.Document,
+    document,
+  );
+};
+
+/**
+ * Imports insomnia request body definitions, including data mock (if available)
+ *
+ * If multiple types are available, the one for which an example can be generated will be selected first (i.e. application/json)
+ */
+const prepareBody = (
+  document: OpenAPIV2.Document,
+  endpointSchema: OpenAPIV2.OperationObject,
+  globalMimeTypes: OpenAPIV2.MimeTypes,
+) => {
+  const mimeTypes = endpointSchema.consumes || globalMimeTypes || [];
+
+  const supportedMimeType = SUPPORTED_MIME_TYPES.find((mimeType) =>
+    mimeTypes.includes(mimeType),
+  );
+
+  if (supportedMimeType === MIMETYPE_JSON) {
+    const parameters = endpointSchema.parameters || [];
+    const bodyParameter = parameters.find(
+      (parameter) => (parameter as OpenAPIV2.Parameter).in === 'body',
+    );
+
+    if (!bodyParameter) {
+      return {};
+    }
+
+    const type = (bodyParameter as OpenAPIV2.ParameterObject).type || 'object';
+    const example = generateParameterExample(type);
+    let text;
+
+    if (type === 'object') {
+      const { schema } = bodyParameter as OpenAPIV2.ParameterObject;
+      if (schema.$ref) {
+        const definition = resolve$ref(document, schema.$ref);
+        text = JSON.stringify(example(definition), null, 2);
+      } else {
+        text = JSON.stringify(example(schema), null, 2);
+      }
+    } else {
+      text = JSON.stringify(example, null, 2);
+    }
+
+    return {
+      mimeType: supportedMimeType,
+      text,
+    };
+  }
+
+  if (
+    supportedMimeType === MIMETYPE_URLENCODED ||
+    supportedMimeType === MIMETYPE_MULTIPART
+  ) {
+    const parameters = endpointSchema.parameters || [];
+    const formDataParameters = ((parameters as unknown) as OpenAPIV2.Parameter[]).filter(
+      (parameter) => parameter.in === 'formData',
+    );
+
+    if (formDataParameters.length === 0) {
+      return {};
+    }
+
+    return {
+      mimeType: supportedMimeType,
+      params: convertParameters(formDataParameters),
+    };
+  }
+
+  if (mimeTypes && mimeTypes.length) {
+    return {
+      mimeType: mimeTypes[0] || undefined,
+    };
+  } else {
+    return {};
+  }
+};
+
+type TypeExample =
+  | 'string'
+  | 'string_email'
+  | 'string_date-time'
+  | 'string_byte'
+  | 'number'
+  | 'number_float'
+  | 'number_double'
+  | 'integer'
+  | 'boolean'
+  | 'object'
+  | 'array';
+
+/**
+ * Generate example value of parameter based on it's schema.
+ * Returns example / default value of the parameter, if any of those are defined. If not, returns value based on parameter type.
+ */
+const generateParameterExample = (
+  parameter: OpenAPIV2.Parameter | TypeExample,
+  ancestors: OpenAPIV2.Parameter[] = [],
+) => {
+  const typeExamples: {
+    [kind in TypeExample]: (
+      parameter: OpenAPIV2.Parameter
+    ) => null | string | boolean | number | Record<string, unknown>;
+  } = {
+    string: () => 'string',
+    string_email: () => 'user@example.com',
+    'string_date-time': () => new Date().toISOString(),
+    string_byte: () => 'ZXhhbXBsZQ==',
+    number: () => 0,
+    number_float: () => 0.0,
+    number_double: () => 0.0,
+    integer: () => 0,
+    boolean: () => true,
+    object: (parameter: OpenAPIV2.Parameter) => {
+      if (ancestors.indexOf(parameter) !== -1) {
+        return {};
+      }
+
+      const example = {};
+
+      const { properties } = parameter;
+      if (properties) {
+        ancestors.push(parameter);
+        Object.keys(properties).forEach((propertyName) => {
+          // @ts-expect-error there's no way, so far as I'm aware, for TypeScript to know what's actually going on here.
+          example[propertyName] = generateParameterExample(
+            properties[propertyName],
+            ancestors,
+          );
+        });
+        ancestors.pop();
+      }
+
+      return example;
+    },
+    array: ({ items, collectionFormat }: OpenAPIV2.Parameter) => {
+      const value = generateParameterExample(items, ancestors);
+
+      if (collectionFormat === 'csv') {
+        return value;
+      } else {
+        return [value];
+      }
+    },
+  };
+
+  if (typeof parameter === 'string') {
+    return typeExamples[parameter];
+  }
+
+  if (typeof parameter === 'object') {
+    const { type, format, example, default: defaultValue } = parameter;
+
+    if (example) {
+      return example;
+    }
+
+    if (defaultValue) {
+      return defaultValue;
+    }
+
+    const factory =
+      typeExamples[`${type}_${format}` as TypeExample] ||
+      typeExamples[type as TypeExample];
+
+    if (!factory) {
+      return null;
+    }
+
+    return factory(parameter);
+  }
+};
+
+/**
+ * Converts swagger schema of parametes into insomnia one.
+ */
+const convertParameters = (parameters?: OpenAPIV2.Parameter[]) => {
+  return parameters?.map((parameter) => {
+    const { required, name, type } = parameter;
+
+    if (type === 'file') {
+      return {
+        name,
+        disabled: required !== true,
+        type: 'file',
+      };
+    }
+
+    return {
+      name,
+      disabled: required !== true,
+      value: `${generateParameterExample(parameter) as string}`,
+    };
+  });
+};
+
+export const convert: Converter = async (rawData) => {
+  requestCount = 1; // Validate
+
+  let api = await parseDocument(rawData);
+
+  if (!api || api.swagger !== SUPPORTED_SWAGGER_VERSION) {
+    return null;
+  } // Await here so we catch any exceptions
+
+  try {
+    api = await SwaggerParser.validate(api);
+  } catch (err) {
+    // We already know it's a Swagger doc so we will try to import it anyway instead
+    // of bailing out here.
+    console.log('[swagger] Import file validation failed', err);
+  } // Import
+
+  const workspace: ImportRequest = {
+    _type: 'workspace',
+    _id: WORKSPACE_ID,
+    parentId: null,
+    name: `${api.info.title} ${api.info.version}`,
+    description: api.info.description || '', // scope is not set because it could be imported for design OR to generate requests
+  };
+
+  const baseEnv: ImportRequest = {
+    _type: 'environment',
+    _id: '__BASE_ENVIRONMENT_ID__',
+    parentId: WORKSPACE_ID,
+    name: 'Base environment',
+    data: {
+      base_url: '{{ scheme }}://{{ host }}{{ base_path }}',
+    },
+  };
+
+  const swaggerEnv: ImportRequest = {
+    _type: 'environment',
+    _id: 'env___BASE_ENVIRONMENT_ID___sub',
+    parentId: baseEnv._id,
+    name: 'Swagger env',
+    data: {
+      base_path: api.basePath || '',
+      scheme: (api.schemes || ['http'])[0],
+      host: api.host || '',
+    },
+  };
+  const endpoints = parseEndpoints(api);
+
+  return [workspace, baseEnv, swaggerEnv, ...endpoints];
+};
diff --git a/packages/insomnia-importers/src/importers/swagger2.js b/packages/insomnia-importers/src/importers/swagger2.js
deleted file mode 100644
index eee909aca7..0000000000
--- a/packages/insomnia-importers/src/importers/swagger2.js
+++ /dev/null
@@ -1,521 +0,0 @@
-'use strict';
-
-const crypto = require('crypto');
-const utils = require('../utils');
-const SwaggerParser = require('swagger-parser');
-const SUPPORTED_SWAGGER_VERSION = '2.0';
-const MIMETYPE_JSON = 'application/json';
-const MIMETYPE_URLENCODED = 'application/x-www-form-urlencoded';
-const MIMETYPE_MULTIPART = 'multipart/form-data';
-const SUPPORTED_MIME_TYPES = [MIMETYPE_JSON, MIMETYPE_URLENCODED, MIMETYPE_MULTIPART];
-const WORKSPACE_ID = '__WORKSPACE_ID__';
-
-let requestCount = 1;
-
-module.exports.id = 'swagger2';
-module.exports.name = 'Swagger 2.0';
-module.exports.description = 'Importer for Swagger 2.0 specification (json/yaml)';
-
-module.exports.convert = async function(rawData) {
-  requestCount = 1;
-
-  // Validate
-  let api = await parseDocument(rawData);
-  if (!api || api.swagger !== SUPPORTED_SWAGGER_VERSION) {
-    return null;
-  }
-
-  // Await here so we catch any exceptions
-  try {
-    api = await SwaggerParser.validate(api);
-  } catch (err) {
-    // We already know it's a Swagger doc so we will try to import it anyway instead
-    // of bailing out here.
-    console.log('[swagger] Import file validation failed', err);
-  }
-
-  // Import
-  const workspace = {
-    _type: 'workspace',
-    _id: WORKSPACE_ID,
-    parentId: null,
-    name: `${api.info.title} ${api.info.version}`,
-    description: api.info.description || '',
-    // scope is not set because it could be imported for design OR to generate requests
-  };
-
-  const baseEnv = {
-    _type: 'environment',
-    _id: '__BASE_ENVIRONMENT_ID__',
-    parentId: WORKSPACE_ID,
-    name: 'Base environment',
-    data: {
-      base_url: '{{ scheme }}://{{ host }}{{ base_path }}',
-    },
-  };
-
-  const swaggerEnv = {
-    _type: 'environment',
-    _id: 'env___BASE_ENVIRONMENT_ID___sub',
-    parentId: baseEnv._id,
-    name: 'Swagger env',
-    data: {
-      base_path: api.basePath || '',
-      scheme: (api.schemes || ['http'])[0],
-      host: api.host || '',
-    },
-  };
-
-  const endpoints = parseEndpoints(api);
-
-  return [workspace, baseEnv, swaggerEnv, ...endpoints];
-};
-
-/**
- * Parse string data into swagger 2.0 object (https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#swagger-object)
- *
- * @param {string} rawData
- *
- * @returns {Object|null} Swagger 2.0 object
- */
-async function parseDocument(rawData) {
-  try {
-    return utils.unthrowableParseJson(rawData) || SwaggerParser.YAML.parse(rawData);
-  } catch (err) {
-    return null;
-  }
-}
-
-/**
- * Create request definitions based on swagger document.
- *
- * @param {Object} document - Swagger 2.0 valid object (https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#swagger-object)
- *
- * @returns {Object[]} array of insomnia endpoints definitions
- */
-function parseEndpoints(document) {
-  const defaultParent = WORKSPACE_ID;
-  const globalMimeTypes = document.consumes;
-
-  const paths = Object.keys(document.paths);
-  const endpointsSchemas = paths
-    .map(path => {
-      const schemasPerMethod = document.paths[path];
-      const methods = Object.keys(schemasPerMethod);
-
-      return methods
-        .filter(method => method !== 'parameters')
-        .map(method => Object.assign({}, schemasPerMethod[method], { path, method }));
-    })
-    .reduce((flat, arr) => flat.concat(arr), []); // flat single array
-
-  const tags = document.tags || [];
-
-  const implicitTags = endpointsSchemas
-    .map(endpointSchema => endpointSchema.tags)
-    .reduce((flat, arr) => flat.concat(arr), []) // flat single array
-    .reduce((distinct, value) => {
-      if (!distinct.includes(value)) {
-        distinct.push(value);
-      }
-      return distinct;
-    }, []) // remove duplicates
-    .filter(tag => !tags.map(tag => tag.name).includes(tag))
-    .map(tag => ({
-      name: tag,
-      desciption: '',
-    }));
-
-  const folders = [...tags, ...implicitTags].map(tag => {
-    return importFolderItem(tag, defaultParent);
-  });
-  const folderLookup = {};
-  folders.forEach(folder => (folderLookup[folder.name] = folder._id));
-
-  const requests = [];
-  endpointsSchemas.map(endpointSchema => {
-    let { tags } = endpointSchema;
-    if (!tags || tags.length === 0) tags = [''];
-    tags.forEach((tag, index) => {
-      const id = endpointSchema.operationId
-        ? `${endpointSchema.operationId}${index > 0 ? index : ''}`
-        : `__REQUEST_${requestCount++}__`;
-      const parentId = folderLookup[tag] || defaultParent;
-      requests.push(importRequest(document, endpointSchema, globalMimeTypes, id, parentId));
-    });
-  });
-
-  return [...folders, ...requests];
-}
-
-/**
- * Return Insomnia folder / request group
- *
- *
- * @param {Object} item - swagger 2.0 endpoint schema
- * @param {string} parentId - id of parent category
- * @returns {Object}
- */
-function importFolderItem(item, parentId) {
-  const hash = crypto
-    .createHash('sha1')
-    .update(item.name)
-    .digest('hex')
-    .slice(0, 8);
-  return {
-    parentId,
-    _id: `fld___WORKSPACE_ID__${hash}`,
-    _type: 'request_group',
-    name: item.name || 'Folder {requestGroupCount}',
-    description: item.description || '',
-  };
-}
-
-/**
- * Return Insomnia request
- *
- * @param {Object} schema - swagger 2.0 schema
- * @param {Object} endpointSchema - swagger 2.0 endpoint schema
- * @param {string[]} globalMimeTypes - list of mimeTypes available in document globally (i.e. document.consumes)
- * @param {string} id - id to be given to current request
- * @param {string} parentId - id of parent category
- * @returns {Object}
- */
-
-function importRequest(schema, endpointSchema, globalMimeTypes, id, parentId) {
-  const name = endpointSchema.summary || `${endpointSchema.method} ${endpointSchema.path}`;
-  const request = {
-    _type: 'request',
-    _id: id,
-    parentId: parentId,
-    name,
-    method: endpointSchema.method.toUpperCase(),
-    url: '{{ base_url }}' + pathWithParamsAsVariables(endpointSchema.path),
-    body: prepareBody(schema, endpointSchema, globalMimeTypes),
-    description: endpointSchema.description || '',
-    headers: prepareHeaders(endpointSchema),
-    parameters: prepareQueryParams(endpointSchema),
-  };
-
-  if (request.body.mimeType && !request.headers.find(header => header.name === 'Content-Type')) {
-    request.headers = [
-      {
-        name: 'Content-Type',
-        disabled: false,
-        value: request.body.mimeType,
-      },
-    ].concat(request.headers);
-  }
-
-  return setupAuthentication(schema.securityDefinitions, endpointSchema, request);
-}
-
-/**
- * Populate Insomnia request with authentication
- *
- * @param {Object} securityDefinitions - swagger 2.0 security definitions
- * @param {Object} endpointSchema - swagger 2.0 endpoint schema
- * @param {Object} request - insomnia request object
- * @returns {Object}
- */
-function setupAuthentication(securityDefinitions, endpointSchema, request) {
-  if (!securityDefinitions) {
-    return request;
-  }
-  if (endpointSchema.security && endpointSchema.security.length > 0) {
-    const usedDefinitions = endpointSchema.security.reduce(
-      (collect, obj) => collect.concat(...Object.keys(obj)),
-      [],
-    );
-    const scopes = endpointSchema.security.reduce((scopes, security) => {
-      for (const defname of Object.keys(security)) {
-        if (security[defname].length === 0) {
-          continue;
-        }
-        return scopes.concat(security[defname]);
-      }
-      return scopes;
-    }, []);
-    for (const usedDefinition of usedDefinitions) {
-      const definition = securityDefinitions[usedDefinition];
-      if (definition.type === 'basic') {
-        request.authentication = {
-          type: 'basic',
-          disabled: false,
-          password: '{{ password }}',
-          username: '{{ username }}',
-        };
-      }
-      if (definition.type === 'apiKey') {
-        if (definition.in === 'header') {
-          request.headers.push({
-            name: definition.name,
-            disabled: false,
-            value: '{{ api_key }}',
-          });
-        }
-        if (definition.in === 'query') {
-          request.parameters.push({
-            name: definition.name,
-            disabled: false,
-            value: '{{ api_key }}',
-          });
-        }
-      }
-      if (definition.type === 'oauth2') {
-        if (definition.flow === 'implicit') {
-          request.authentication = {
-            type: 'oauth2',
-            grantType: 'authorization_code',
-            disabled: false,
-            authorizationUrl: definition.authorizationUrl,
-            clientId: '{{ client_id }}',
-            scope: scopes.join(' '),
-          };
-        }
-        if (definition.flow === 'password') {
-          request.authentication = {
-            type: 'oauth2',
-            grantType: 'password',
-            disabled: false,
-            accessTokenUrl: definition.tokenUrl,
-            username: '{{ username }}',
-            password: '{{ password }}',
-            clientId: '{{ client_id }}',
-            clientSecret: '{{ client_secret }}',
-            scope: scopes.join(' '),
-          };
-        }
-        if (definition.flow === 'application') {
-          request.authentication = {
-            type: 'oauth2',
-            grantType: 'client_credentials',
-            disabled: false,
-            accessTokenUrl: definition.tokenUrl,
-            clientId: '{{ client_id }}',
-            clientSecret: '{{ client_secret }}',
-            scope: scopes.join(' '),
-          };
-        }
-        if (definition.flow === 'accessCode') {
-          request.authentication = {
-            type: 'oauth2',
-            grantType: 'authorization_code',
-            disabled: false,
-            accessTokenUrl: definition.tokenUrl,
-            authorizationUrl: definition.authorizationUrl,
-            clientId: '{{ client_id }}',
-            clientSecret: '{{ client_secret }}',
-            scope: scopes.join(' '),
-          };
-        }
-      }
-    }
-  }
-  return request;
-}
-
-/**
- * Return path with parameters replaced by insomnia variables
- *
- * I.e. "/foo/:bar" => "/foo/{{ bar }}"
- *
- * @param {string} path
- * @returns {string}
- */
-function pathWithParamsAsVariables(path) {
-  return path.replace(/{([^}]+)}/g, '{{ $1 }}');
-}
-
-/**
- * Imports insomnia definitions of query parameters.
- *
- * @param {Object} endpointSchema - swagger 2.0 endpoint schema
- * @returns {Object[]} array of parameters definitions
- */
-function prepareQueryParams(endpointSchema) {
-  const isSendInQuery = p => p.in === 'query';
-  const parameters = endpointSchema.parameters || [];
-  const queryParameters = parameters.filter(isSendInQuery);
-  return convertParameters(queryParameters);
-}
-
-/**
- * Imports insomnia definitions of header parameters.
- *
- * @param {Object} endpointSchema - swagger 2.0 endpoint schema
- * @returns {Object[]} array of parameters definitions
- */
-function prepareHeaders(endpointSchema) {
-  const isSendInHeader = p => p.in === 'header';
-  const parameters = endpointSchema.parameters || [];
-  const headerParameters = parameters.filter(isSendInHeader);
-  return convertParameters(headerParameters);
-}
-
-function resolve$ref(schema, $ref) {
-  const parts = $ref.split('/');
-  parts.shift(); // remove #
-  return parts.reduce((doc, path) => doc[path], schema);
-}
-
-/**
- * Imports insomnia request body definitions, including data mock (if available)
- *
- * If multiple types are available, the one for which an example can be generated will be selected first (i.e. application/json)
- *
- * @param {Object} schema - swagger 2.0 schema
- * @param {Object} endpointSchema - swagger 2.0 endpoint schema
- * @param {string[]} globalMimeTypes - list of mimeTypes available in document globally (i.e. document.consumes)
- *
- * @return {Object} insomnia request's body definition
- */
-function prepareBody(schema, endpointSchema, globalMimeTypes) {
-  const mimeTypes = endpointSchema.consumes || globalMimeTypes || [];
-  const isAvailable = m => mimeTypes.includes(m);
-  const supportedMimeType = SUPPORTED_MIME_TYPES.find(isAvailable);
-  if (supportedMimeType === MIMETYPE_JSON) {
-    const isSendInBody = p => p.in === 'body';
-    const parameters = endpointSchema.parameters || [];
-    const bodyParameter = parameters.find(isSendInBody);
-    if (!bodyParameter) {
-      return {};
-    }
-
-    const type = bodyParameter.type || 'object';
-    const example = generateParameterExample(type);
-    let text;
-    if (type === 'object') {
-      if (bodyParameter.schema.$ref) {
-        const definition = resolve$ref(schema, bodyParameter.schema.$ref);
-        text = JSON.stringify(example(definition), null, 2);
-      } else {
-        text = JSON.stringify(example(bodyParameter.schema), null, 2);
-      }
-    } else {
-      text = JSON.stringify(example, null, 2);
-    }
-
-    return {
-      mimeType: supportedMimeType,
-      text,
-    };
-  }
-
-  if (supportedMimeType === MIMETYPE_URLENCODED || supportedMimeType === MIMETYPE_MULTIPART) {
-    const isSendInFormData = p => p.in === 'formData';
-    const parameters = endpointSchema.parameters || [];
-    const formDataParameters = parameters.filter(isSendInFormData);
-
-    if (formDataParameters.length === 0) {
-      return {};
-    }
-    return {
-      mimeType: supportedMimeType,
-      params: convertParameters(formDataParameters),
-    };
-  }
-
-  if (mimeTypes && mimeTypes.length) {
-    return {
-      mimeType: mimeTypes[0] || undefined,
-    };
-  } else {
-    return {};
-  }
-}
-
-/**
- * Converts swagger schema of parametes into insomnia one.
- *
- * @param {Object[]} parameters - array of swagger schemas of parameters
- * @returns {Object[]} array of insomnia parameters definitions
- */
-function convertParameters(parameters) {
-  return parameters.map(parameter => {
-    const { required, name, type } = parameter;
-    if (type === 'file') {
-      return {
-        name,
-        disabled: required !== true,
-        type: 'file',
-      };
-    }
-    return {
-      name,
-      disabled: required !== true,
-      value: `${generateParameterExample(parameter)}`,
-    };
-  });
-}
-
-/**
- * Generate example value of parameter based on it's schema.
- * Returns example / default value of the parameter, if any of those are defined. If not, returns value based on parameter type.
- *
- * @param {string|Object} schema - Swagger 2.0 parameter definition object
- * (https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#parametersDefinitionsObject) or string with valid parameter type
- *
- * @returns {*}
- */
-function generateParameterExample(schema, ancestors = []) {
-  const typeExamples = {
-    string: () => 'string',
-    string_email: () => 'user@example.com',
-    'string_date-time': () => new Date().toISOString(),
-    string_byte: () => 'ZXhhbXBsZQ==',
-    number: () => 0,
-    number_float: () => 0.0,
-    number_double: () => 0.0,
-    integer: () => 0,
-    boolean: () => true,
-    object: schema => {
-      const example = {};
-      const { properties } = schema;
-      if (ancestors.indexOf(schema) !== -1) {
-        return example;
-      }
-      if (properties) {
-        ancestors.push(schema);
-        Object.keys(properties).forEach(propertyName => {
-          example[propertyName] = generateParameterExample(properties[propertyName], ancestors);
-        });
-        ancestors.pop();
-      }
-
-      return example;
-    },
-    array: schema => {
-      const value = generateParameterExample(schema.items, ancestors);
-      if (schema.collectionFormat === 'csv') {
-        return value;
-      } else {
-        return [value];
-      }
-    },
-  };
-
-  if (typeof schema === 'string') {
-    return typeExamples[schema];
-  }
-
-  if (schema instanceof Object) {
-    const { type, format, example, default: defaultValue } = schema;
-
-    if (example) {
-      return example;
-    }
-
-    if (defaultValue) {
-      return defaultValue;
-    }
-
-    const factory = typeExamples[`${type}_${format}`] || typeExamples[type];
-
-    if (!factory) {
-      return null;
-    }
-
-    return factory(schema);
-  }
-}
diff --git a/packages/insomnia-importers/src/importers/wsdl.js b/packages/insomnia-importers/src/importers/wsdl.ts
similarity index 50%
rename from packages/insomnia-importers/src/importers/wsdl.js
rename to packages/insomnia-importers/src/importers/wsdl.ts
index 34f2836a08..5968ee0051 100644
--- a/packages/insomnia-importers/src/importers/wsdl.js
+++ b/packages/insomnia-importers/src/importers/wsdl.ts
@@ -1,52 +1,35 @@
-'use strict';
-const postman = require('./postman');
-const apiWSDL = require('apiconnect-wsdl');
+import * as postman from './postman';
+import {
+  getJsonForWSDL,
+  getWSDLServices,
+  findWSDLForServiceName,
+  getSwaggerForService,
+  Swagger,
+} from 'apiconnect-wsdl';
+import { get } from 'lodash';
+import { Converter } from '../entities';
 
-module.exports.id = 'wsdl';
-module.exports.name = 'WSDL';
-module.exports.description = 'Importer for WSDL files';
+export const id = 'wsdl';
+export const name = 'WSDL';
+export const description = 'Importer for WSDL files';
 
-module.exports.convert = async function(data) {
-  try {
-    if (data.indexOf('wsdl:definition') !== -1) {
-      const postmanData = await convertWsdlToPostman(
-        '<?xml version="1.0" encoding="UTF-8" ?>' + data,
-      );
-      postmanData.info.schema += 'collection.json';
-      const postmanJson = JSON.stringify(postmanData);
-      return postman.convert(postmanJson);
-    }
-  } catch (e) {
-    // Nothing
-  }
-
-  return null;
-};
-const { get } = require('lodash');
-
-function convertToPostman(items) {
-  const out = {
-    info: {
-      name: get(items[0], 'info.title'),
-      schema: 'https://schema.getpostman.com/json/collection/v2.0.0/', // required
-    },
-  };
-
-  out.item = items.map(i => {
+const convertToPostman = (items: Swagger[]) => {
+  const item = items.map((swagger) => {
     const item = [];
-    const url = get(i, 'x-ibm-configuration.assembly.execute.0.proxy.target-url');
-    for (const k of Object.keys(i.paths)) {
-      const methods = i.paths[k];
+    const url = get(
+      swagger,
+      'x-ibm-configuration.assembly.execute.0.proxy.target-url',
+    );
+
+    for (const path of Object.keys(swagger.paths)) {
+      const methods = swagger.paths[path];
 
       for (const method of Object.keys(methods)) {
         const api = methods[method];
         const paths = get(api, 'parameters.0.schema.$ref').split('/');
-
         paths.shift();
         paths.push('example');
-
-        const example = get(i, paths.join('.'));
-
+        const example = get(swagger, paths.join('.'));
         item.push({
           name: api.operationId,
           description: api.description || '',
@@ -61,12 +44,12 @@ function convertToPostman(items) {
               },
               {
                 key: 'Content-Type',
-                value: get(i, 'consumes.0'),
+                value: get(swagger, 'consumes.0'),
                 disabled: false,
               },
               {
                 key: 'Accept',
-                value: get(i, 'produces.0'),
+                value: get(swagger, 'produces.0'),
                 disabled: false,
               },
             ],
@@ -80,28 +63,44 @@ function convertToPostman(items) {
     }
 
     return {
-      name: get(i, 'info.title'),
+      name: get(swagger, 'info.title'),
       item,
     };
   });
+  return {
+    info: {
+      name: get(items[0], 'info.title'),
+      schema: 'https://schema.getpostman.com/json/collection/v2.0.0/', // required
+    },
+    item,
+  };
+};
 
-  return out;
-}
+const convertWsdlToPostman = async (input: string) => {
+  const wsdls = await getJsonForWSDL(input);
+  const { services } = getWSDLServices(wsdls);
 
-async function convertWsdlToPostman(input) {
-  const wsdls = await apiWSDL.getJsonForWSDL(input);
-  const serviceData = apiWSDL.getWSDLServices(wsdls);
-
-  // Loop through all services
-  const items = [];
-  for (const item of Object.keys(serviceData.services)) {
-    const svcName = serviceData.services[item].service;
-    const wsdlId = serviceData.services[item].filename;
-    const wsdlEntry = apiWSDL.findWSDLForServiceName(wsdls, svcName);
-    const swagger = apiWSDL.getSwaggerForService(wsdlEntry, svcName, wsdlId);
-
-    items.push(swagger);
-  }
+  const items = services.map(({ service, filename }) => {
+    const wsdlEntry = findWSDLForServiceName(wsdls, service);
+    return getSwaggerForService(wsdlEntry, service, filename);
+  });
 
   return convertToPostman(items);
-}
+};
+
+export const convert: Converter = async (rawData) => {
+  try {
+    if (rawData.indexOf('wsdl:definition') !== -1) {
+      const postmanData = await convertWsdlToPostman(
+        `<?xml version="1.0" encoding="UTF-8" ?>${rawData}`,
+      );
+      postmanData.info.schema += 'collection.json';
+      const postmanJson = JSON.stringify(postmanData);
+      return postman.convert(postmanJson);
+    }
+  } catch (e) {
+    // Nothing
+  }
+
+  return null;
+};
diff --git a/packages/insomnia-importers/src/index.ts b/packages/insomnia-importers/src/index.ts
new file mode 100755
index 0000000000..d9773a2766
--- /dev/null
+++ b/packages/insomnia-importers/src/index.ts
@@ -0,0 +1,3 @@
+export { convert, RootConverter } from './convert';
+export * from './importers';
+export { ImportRequest, Converter, Importer } from './entities';
diff --git a/packages/insomnia-importers/src/utils.js b/packages/insomnia-importers/src/utils.js
deleted file mode 100755
index f9a991c04c..0000000000
--- a/packages/insomnia-importers/src/utils.js
+++ /dev/null
@@ -1,64 +0,0 @@
-module.exports.setDefaults = function(obj) {
-  if (!obj || !obj._type) {
-    return obj;
-  } else if (obj._type === 'request') {
-    return module.exports.setDefaultsRequest(obj);
-  } else if (obj._type === 'request_group') {
-    return module.exports.setDefaultsRequestGroup(obj);
-  } else if (obj._type === 'environment') {
-    return module.exports.setDefaultsEnvironment(obj);
-  } else {
-    return obj;
-  }
-};
-
-module.exports.setDefaultsRequest = function(request) {
-  request.method = (request.method || 'GET').toUpperCase();
-  return Object.assign(
-    {
-      parentId: '__WORKSPACE_ID__',
-      name: 'Imported',
-      url: '',
-      body: '',
-      method: 'GET',
-      parameters: [],
-      headers: [],
-      authentication: {},
-    },
-    request,
-  );
-};
-
-module.exports.setDefaultsRequestGroup = function(requestGroup) {
-  return Object.assign(
-    {
-      parentId: '__WORKSPACE_ID__',
-      name: 'Imported',
-      environment: {},
-    },
-    requestGroup,
-  );
-};
-
-module.exports.setDefaultsEnvironment = function(environment) {
-  return Object.assign(
-    {
-      parentId: '__BASE_ENVIRONMENT_ID__',
-      name: 'Imported Environment',
-      data: {},
-    },
-    environment,
-  );
-};
-
-module.exports.getDateString = function() {
-  return new Date().toISOString();
-};
-
-module.exports.unthrowableParseJson = function(rawData) {
-  try {
-    return JSON.parse(rawData);
-  } catch (err) {
-    return null;
-  }
-};
diff --git a/packages/insomnia-importers/src/__tests__/utils.test.js b/packages/insomnia-importers/src/utils.test.ts
old mode 100755
new mode 100644
similarity index 62%
rename from packages/insomnia-importers/src/__tests__/utils.test.js
rename to packages/insomnia-importers/src/utils.test.ts
index 9dc39b6cc9..b401a72aef
--- a/packages/insomnia-importers/src/__tests__/utils.test.js
+++ b/packages/insomnia-importers/src/utils.test.ts
@@ -1,19 +1,22 @@
-'use strict';
-
-const utils = require('../../src/utils');
+import { setDefaults, unthrowableParseJson } from './utils';
 
 describe('setDefaults()', () => {
   it('should leave non-objects alone', () => {
-    expect(utils.setDefaults(null)).toBe(null);
+    expect(setDefaults(null)).toBe(null);
   });
-
   it('should leave unrecognized types alone', () => {
-    const obj = { _type: 'weird' };
-    expect(utils.setDefaults(obj)).toBe(obj);
+    const obj = {
+      _type: 'weird',
+    };
+    // @ts-expect-error -- this is an intentionally unrecognized `_type`
+    expect(setDefaults(obj)).toBe(obj);
   });
-
   it('should set correct request defaults', () => {
-    expect(utils.setDefaults({ _type: 'request' })).toEqual({
+    expect(
+      setDefaults({
+        _type: 'request',
+      }),
+    ).toEqual({
       _type: 'request',
       parentId: '__WORKSPACE_ID__',
       name: 'Imported',
@@ -25,38 +28,42 @@ describe('setDefaults()', () => {
       authentication: {},
     });
   });
-
   it('should set correct request_group defaults', () => {
-    expect(utils.setDefaults({ _type: 'request_group' })).toEqual({
+    expect(
+      setDefaults({
+        _type: 'request_group',
+      }),
+    ).toEqual({
       _type: 'request_group',
       parentId: '__WORKSPACE_ID__',
       name: 'Imported',
       environment: {},
     });
   });
-
   it('should set correct environment defaults', () => {
-    expect(utils.setDefaults({ _type: 'environment' })).toEqual({
+    expect(
+      setDefaults({
+        _type: 'environment',
+      }),
+    ).toEqual({
       _type: 'environment',
       parentId: '__BASE_ENVIRONMENT_ID__',
       name: 'Imported Environment',
       data: {},
     });
   });
-
   describe('unthrowableParseJson', () => {
     it('should parse happy json', () => {
       const json = '{"foo": "bar"}';
-      const obj = utils.unthrowableParseJson(json);
-
-      expect(obj).toEqual({ foo: 'bar' });
+      const obj = unthrowableParseJson(json);
+      expect(obj).toEqual({
+        foo: 'bar',
+      });
     });
-
     it('should quietly fail on bad json', () => {
       expect(() => {
         const json = '{"foo": "bar';
-        const obj = utils.unthrowableParseJson(json);
-
+        const obj = unthrowableParseJson(json);
         expect(obj).toBeNull();
       }).not.toThrow();
     });
diff --git a/packages/insomnia-importers/src/utils.ts b/packages/insomnia-importers/src/utils.ts
new file mode 100644
index 0000000000..4b49ad5055
--- /dev/null
+++ b/packages/insomnia-importers/src/utils.ts
@@ -0,0 +1,49 @@
+import { ImportRequest } from './entities';
+
+export const setDefaults = (obj: ImportRequest) => {
+  if (!obj || !obj._type) {
+    return obj;
+  }
+
+  switch (obj._type) {
+    case 'request':
+      return {
+        parentId: '__WORKSPACE_ID__',
+        name: 'Imported',
+        url: '',
+        body: '',
+        parameters: [],
+        headers: [],
+        authentication: {},
+        ...obj,
+        method: (obj.method || 'GET').toUpperCase(),
+      };
+
+    case 'request_group':
+      return {
+        parentId: '__WORKSPACE_ID__',
+        name: 'Imported',
+        environment: {},
+        ...obj,
+      };
+
+    case 'environment':
+      return {
+        parentId: '__BASE_ENVIRONMENT_ID__',
+        name: 'Imported Environment',
+        data: {},
+        ...obj,
+      };
+
+    default:
+      return obj;
+  }
+};
+
+export const unthrowableParseJson = (rawData: string) => {
+  try {
+    return JSON.parse(rawData);
+  } catch (err) {
+    return null;
+  }
+};
diff --git a/packages/insomnia-importers/tsconfig.build.json b/packages/insomnia-importers/tsconfig.build.json
new file mode 100644
index 0000000000..6846b08666
--- /dev/null
+++ b/packages/insomnia-importers/tsconfig.build.json
@@ -0,0 +1,19 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "dist",
+    "rootDir": ".",
+    "lib": ["ES2019"],
+    "resolveJsonModule": true
+  },
+  "include": [
+    "src",
+    "package.json"
+  ],
+  "exclude": [
+    "**/*.test.ts",
+    "bin",
+    "dist"
+  ]
+}
diff --git a/packages/insomnia-importers/tsconfig.json b/packages/insomnia-importers/tsconfig.json
new file mode 100644
index 0000000000..16f7ccc40a
--- /dev/null
+++ b/packages/insomnia-importers/tsconfig.json
@@ -0,0 +1,18 @@
+{
+  "extends": "./tsconfig.build.json",
+  "compilerOptions": {
+    "composite": false,
+    "rootDir": ".",
+  },
+  "include": [
+    "src",
+    "jest.config.js",
+    ".eslintrc.js",
+    "package.json"
+
+  ],
+  "exclude": [
+    "bin",
+    "dist"
+  ]
+}
diff --git a/packages/insomnia-inso/.babelrc b/packages/insomnia-inso/.babelrc
deleted file mode 100644
index ff98aba32a..0000000000
--- a/packages/insomnia-inso/.babelrc
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "targets": {
-          "node": "12"
-        }
-      }
-    ],
-    "@babel/preset-flow"
-  ],
-  "plugins": [
-    ["@babel/plugin-proposal-optional-chaining"]
-  ]
-}
diff --git a/packages/insomnia-inso/.eslintignore b/packages/insomnia-inso/.eslintignore
new file mode 100644
index 0000000000..635bcf166f
--- /dev/null
+++ b/packages/insomnia-inso/.eslintignore
@@ -0,0 +1,3 @@
+dist
+bin
+coverage
diff --git a/packages/insomnia-inso/.eslintrc.js b/packages/insomnia-inso/.eslintrc.js
new file mode 100644
index 0000000000..17427cb1b2
--- /dev/null
+++ b/packages/insomnia-inso/.eslintrc.js
@@ -0,0 +1,7 @@
+/** @type { import('eslint').Linter.Config } */
+module.exports = {
+  extends: '../../.eslintrc.js',
+  rules: {
+    '@typescript-eslint/no-use-before-define': 'off', // TSCONVERSION
+  },
+};
diff --git a/packages/insomnia-inso/.flowconfig b/packages/insomnia-inso/.flowconfig
deleted file mode 100644
index 23a42f9b1f..0000000000
--- a/packages/insomnia-inso/.flowconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-[ignore]
-.*/node_modules/.*
-./.cache
-./dist
-
-[include]
-
-[libs]
-./flow-typed
-
-[options]
-esproposal.optional_chaining=enable
-
-[lints]
diff --git a/packages/insomnia-inso/README.md b/packages/insomnia-inso/README.md
index 89e7c047df..83c00cab78 100644
--- a/packages/insomnia-inso/README.md
+++ b/packages/insomnia-inso/README.md
@@ -9,7 +9,7 @@
     <br />
   </h1>
   <h3>A CLI for <a href="https://insomnia.rest">Insomnia Designer</a></h3>
-  <pre>npm i -g <a href="https://www.npmjs.com/package/insomnia-inso">insomnia-inso</a></pre>
+  <pre>npm install --global <a href="https://www.npmjs.com/package/insomnia-inso">insomnia-inso</a></pre>
   <img src="https://raw.githubusercontent.com/Kong/insomnia/develop/packages/insomnia-inso/assets/demo.gif" alt=""/>
   <br />
 </div>
@@ -74,7 +74,7 @@ Similar to the Kong [Kubernetes](https://insomnia.rest/plugins/insomnia-plugin-k
 
 ### Examples
 
-When running in the <a href="https://github.com/Kong/insomnia/tree/develop/packages/insomnia-inso/src/db/__fixtures__/git-repo">git-repo</a> directory
+When running in the <a href="https://github.com/Kong/insomnia/tree/develop/packages/insomnia-inso/src/db/fixtures/git-repo">git-repo</a> directory
 
 Not specifying any arguments will prompt
 
@@ -114,7 +114,7 @@ Designer has the ability to lint and validate your OpenAPI specification as you
 
 ### Examples
 
-When running in the <a href="https://github.com/Kong/insomnia/tree/develop/packages/insomnia-inso/src/db/__fixtures__/git-repo">git-repo</a> directory
+When running in the <a href="https://github.com/Kong/insomnia/tree/develop/packages/insomnia-inso/src/db/fixtures/git-repo">git-repo</a> directory
 
 Not specifying any arguments will prompt
 
@@ -140,14 +140,14 @@ The test runner is built on top of Mocha, thus many of the options behave as the
 |Option|Alias|Description|
 |- |- |- |
 | `--env <identifier>` | `-e` |the environment to use - an environment name or id |
-| `--reporter <value>` | `-r` |reporter to use, options are `dot, list, spec, min and progress` (default: `spec` )|
+| `--reporter <value>` | `-r` |reporter to use, options are `dot, list, min, progress, spec` (default: `spec` )|
 | `--testNamePattern <regex>` | `-t` | run tests that match the regex|
 | `--bail` | `-b` | abort ("bail") after the first test failure|
 | `--keepFile` | | do not delete the generated test file (useful for debugging)|
 
 ### Examples
 
-When running in the <a href="https://github.com/Kong/insomnia/tree/develop/packages/insomnia-inso/src/db/__fixtures__/git-repo">git-repo</a> directory
+When running in the <a href="https://github.com/Kong/insomnia/tree/develop/packages/insomnia-inso/src/db/fixtures/git-repo">git-repo</a> directory
 
 Not specifying any arguments will prompt
 
@@ -190,7 +190,7 @@ This command will extract and export the raw OpenAPI specification from the data
 
 ### Examples
 
-When running in the <a href="https://github.com/Kong/insomnia/tree/develop/packages/insomnia-inso/src/db/__fixtures__/git-repo">git-repo</a> directory
+When running in the <a href="https://github.com/Kong/insomnia/tree/develop/packages/insomnia-inso/src/db/fixtures/git-repo">git-repo</a> directory
 
 Not specifying any arguments will prompt
 
@@ -218,7 +218,7 @@ The `inso` [config file](#configuration) supports scripts, akin to NPM scripts d
 
 ### Examples
 
-When running in the <a href="https://github.com/Kong/insomnia/tree/develop/packages/insomnia-inso/src/db/__fixtures__/git-repo">git-repo</a> directory, with the following inso config file.
+When running in the <a href="https://github.com/Kong/insomnia/tree/develop/packages/insomnia-inso/src/db/fixtures/git-repo">git-repo</a> directory, with the following inso config file.
 
 ``` yaml
 # .insorc.yaml
@@ -326,7 +326,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v1
       - name: Install inso
-        run: npm install -g insomnia-inso
+        run: npm install --global insomnia-inso
       - name: Lint
         run: inso lint spec "Designer Demo" --ci
       - name: Run test suites
diff --git a/packages/insomnia-inso/__jest__/before.js b/packages/insomnia-inso/__jest__/before.js
deleted file mode 100644
index d1b6245cb9..0000000000
--- a/packages/insomnia-inso/__jest__/before.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import logger from '../src/logger';
-
-export function globalBeforeAll() {
-  logger.__getLogs = () => {
-    const logs = {};
-    // Taken from https://github.com/nuxt-contrib/consola/blob/master/src/types.js
-    [
-      'silent',
-      'fatal',
-      'error',
-      'warn',
-      'log',
-      'info',
-      'success',
-      'debug',
-      'trace',
-      'verbose',
-    ].forEach(level => {
-      logs[level] = logger[level].mock.calls.map(c => (c.length === 1 ? c[0] : c));
-    });
-    return logs;
-  };
-}
-
-export function globalBeforeEach() {
-  logger.mockTypes(() => jest.fn());
-}
diff --git a/packages/insomnia-inso/__mocks__/cosmiconfig.js b/packages/insomnia-inso/__mocks__/cosmiconfig.js
deleted file mode 100644
index 98df34eec0..0000000000
--- a/packages/insomnia-inso/__mocks__/cosmiconfig.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const mock = { load: jest.fn(), search: jest.fn() };
-
-module.exports = {
-  cosmiconfigSync: () => mock,
-};
diff --git a/packages/insomnia-inso/__mocks__/enquirer.js b/packages/insomnia-inso/__mocks__/enquirer.js
deleted file mode 100644
index d01ffb692e..0000000000
--- a/packages/insomnia-inso/__mocks__/enquirer.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const __constructorMock = jest.fn();
-let returnValue = 'test';
-
-class Prompt {
-  constructor(options) {
-    __constructorMock(options);
-  }
-
-  run() {
-    return returnValue;
-  }
-}
-
-module.exports = {
-  __constructorMock,
-  __mockPromptRun: v => {
-    returnValue = v;
-  },
-  AutoComplete: Prompt,
-};
diff --git a/packages/insomnia-inso/__mocks__/insomnia-send-request.js b/packages/insomnia-inso/__mocks__/insomnia-send-request.js
deleted file mode 100644
index 8b677d898d..0000000000
--- a/packages/insomnia-inso/__mocks__/insomnia-send-request.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-  getSendRequestCallbackMemDb: jest.fn().mockResolvedValue(jest.fn()),
-};
diff --git a/packages/insomnia-inso/__mocks__/insomnia-testing.js b/packages/insomnia-inso/__mocks__/insomnia-testing.js
deleted file mode 100644
index 995af414f6..0000000000
--- a/packages/insomnia-inso/__mocks__/insomnia-testing.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// const mod = jest.requireActual('insomnia-testing');
-
-module.exports = {
-  generate: jest.fn(),
-  generateToFile: jest.fn(),
-  runTests: jest.fn(),
-  runTestsCli: jest.fn(),
-};
diff --git a/packages/insomnia-inso/bin/inso b/packages/insomnia-inso/bin/inso
index 6ecbe6bae4..7e1be0ce20 100755
--- a/packages/insomnia-inso/bin/inso
+++ b/packages/insomnia-inso/bin/inso
@@ -1,4 +1,5 @@
 #!/usr/bin/env node
 
 global.require = require;
-require('../dist').go();
+const insomniacli = require('../dist/index.js');
+insomniacli.go();
diff --git a/packages/insomnia-inso/flow-typed/@stoplight/spectral.js b/packages/insomnia-inso/flow-typed/@stoplight/spectral.js
deleted file mode 100644
index 10091eeb01..0000000000
--- a/packages/insomnia-inso/flow-typed/@stoplight/spectral.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module '@stoplight/spectral' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-inso/flow-typed/commander.js b/packages/insomnia-inso/flow-typed/commander.js
deleted file mode 100644
index bb41a6ece6..0000000000
--- a/packages/insomnia-inso/flow-typed/commander.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'commander' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-inso/flow-typed/consola.js b/packages/insomnia-inso/flow-typed/consola.js
deleted file mode 100644
index f97e79eead..0000000000
--- a/packages/insomnia-inso/flow-typed/consola.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'consola' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-inso/flow-typed/cosmiconfig.js b/packages/insomnia-inso/flow-typed/cosmiconfig.js
deleted file mode 100644
index 3d5c255bb0..0000000000
--- a/packages/insomnia-inso/flow-typed/cosmiconfig.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'cosmiconfig' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-inso/flow-typed/enquirer.js b/packages/insomnia-inso/flow-typed/enquirer.js
deleted file mode 100644
index 093be57849..0000000000
--- a/packages/insomnia-inso/flow-typed/enquirer.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'enquirer' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-inso/flow-typed/execa.js b/packages/insomnia-inso/flow-typed/execa.js
deleted file mode 100644
index e8ebe509a5..0000000000
--- a/packages/insomnia-inso/flow-typed/execa.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'execa' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-inso/flow-typed/get-bin-path.js b/packages/insomnia-inso/flow-typed/get-bin-path.js
deleted file mode 100644
index 0926b947e8..0000000000
--- a/packages/insomnia-inso/flow-typed/get-bin-path.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'get-bin-path' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-inso/flow-typed/insomnia-send-request.js b/packages/insomnia-inso/flow-typed/insomnia-send-request.js
deleted file mode 100644
index 5465184cf7..0000000000
--- a/packages/insomnia-inso/flow-typed/insomnia-send-request.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// @flow
-
-declare module 'insomnia-send-request' {
-  declare module.exports: {
-    getSendRequestCallback: ( environmentId: string ) => Promise<Object>,
-    getSendRequestCallbackMemDb: (
-      environmentId: string,
-      memDb: { [string]: Array<Object> },
-    ) => Promise<Object>,
-  }
-}
diff --git a/packages/insomnia-inso/flow-typed/insomnia-testing.js b/packages/insomnia-inso/flow-typed/insomnia-testing.js
deleted file mode 100644
index 9049413532..0000000000
--- a/packages/insomnia-inso/flow-typed/insomnia-testing.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'insomnia-testing' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-inso/flow-typed/jest.js b/packages/insomnia-inso/flow-typed/jest.js
deleted file mode 100644
index 2ad13d02b9..0000000000
--- a/packages/insomnia-inso/flow-typed/jest.js
+++ /dev/null
@@ -1,1186 +0,0 @@
-type JestMockFn<TArguments: $ReadOnlyArray<*>, TReturn> = {
-  (...args: TArguments): TReturn,
-  /**
-   * An object for introspecting mock calls
-   */
-  mock: {
-    /**
-     * An array that represents all calls that have been made into this mock
-     * function. Each call is represented by an array of arguments that were
-     * passed during the call.
-     */
-    calls: Array<TArguments>,
-    /**
-     * An array that contains all the object instances that have been
-     * instantiated from this mock function.
-     */
-    instances: Array<TReturn>,
-    /**
-     * An array that contains all the object results that have been
-     * returned by this mock function call
-     */
-    results: Array<{
-      isThrow: boolean,
-      value: TReturn,
-      ...
-    }>,
-    ...
-  },
-  /**
-   * Resets all information stored in the mockFn.mock.calls and
-   * mockFn.mock.instances arrays. Often this is useful when you want to clean
-   * up a mock's usage data between two assertions.
-   */
-  mockClear(): void,
-  /**
-   * Resets all information stored in the mock. This is useful when you want to
-   * completely restore a mock back to its initial state.
-   */
-  mockReset(): void,
-  /**
-   * Removes the mock and restores the initial implementation. This is useful
-   * when you want to mock functions in certain test cases and restore the
-   * original implementation in others. Beware that mockFn.mockRestore only
-   * works when mock was created with jest.spyOn. Thus you have to take care of
-   * restoration yourself when manually assigning jest.fn().
-   */
-  mockRestore(): void,
-  /**
-   * Accepts a function that should be used as the implementation of the mock.
-   * The mock itself will still record all calls that go into and instances
-   * that come from itself -- the only difference is that the implementation
-   * will also be executed when the mock is called.
-   */
-  mockImplementation(fn: (...args: TArguments) => TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Accepts a function that will be used as an implementation of the mock for
-   * one call to the mocked function. Can be chained so that multiple function
-   * calls produce different results.
-   */
-  mockImplementationOnce(fn: (...args: TArguments) => TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Accepts a string to use in test result output in place of "jest.fn()" to
-   * indicate which mock function is being referenced.
-   */
-  mockName(name: string): JestMockFn<TArguments, TReturn>,
-  /**
-   * Just a simple sugar function for returning `this`
-   */
-  mockReturnThis(): void,
-  /**
-   * Accepts a value that will be returned whenever the mock function is called.
-   */
-  mockReturnValue(value: TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Sugar for only returning a value once inside your mock
-   */
-  mockReturnValueOnce(value: TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Sugar for jest.fn().mockImplementation(() => Promise.resolve(value))
-   */
-  mockResolvedValue(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
-  /**
-   * Sugar for jest.fn().mockImplementationOnce(() => Promise.resolve(value))
-   */
-  mockResolvedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
-  /**
-   * Sugar for jest.fn().mockImplementation(() => Promise.reject(value))
-   */
-  mockRejectedValue(value: TReturn): JestMockFn<TArguments, Promise<any>>,
-  /**
-   * Sugar for jest.fn().mockImplementationOnce(() => Promise.reject(value))
-   */
-  mockRejectedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<any>>,
-  ...
-};
-
-type JestAsymmetricEqualityType = {
-  /**
-   * A custom Jasmine equality tester
-   */
-  asymmetricMatch(value: mixed): boolean,
-  ...
-};
-
-type JestCallsType = {
-  allArgs(): mixed,
-  all(): mixed,
-  any(): boolean,
-  count(): number,
-  first(): mixed,
-  mostRecent(): mixed,
-  reset(): void,
-  ...
-};
-
-type JestClockType = {
-  install(): void,
-  mockDate(date: Date): void,
-  tick(milliseconds?: number): void,
-  uninstall(): void,
-  ...
-};
-
-type JestMatcherResult = {
-  message?: string | (() => string),
-  pass: boolean,
-  ...
-};
-
-type JestMatcher = (
-  received: any,
-  ...actual: Array<any>
-) => JestMatcherResult | Promise<JestMatcherResult>;
-
-type JestPromiseType = {
-  /**
-   * Use rejects to unwrap the reason of a rejected promise so any other
-   * matcher can be chained. If the promise is fulfilled the assertion fails.
-   */
-  rejects: JestExpectType,
-  /**
-   * Use resolves to unwrap the value of a fulfilled promise so any other
-   * matcher can be chained. If the promise is rejected the assertion fails.
-   */
-  resolves: JestExpectType,
-  ...
-};
-
-/**
- * Jest allows functions and classes to be used as test names in test() and
- * describe()
- */
-type JestTestName = string | Function;
-
-/**
- *  Plugin: jest-styled-components
- */
-
-type JestStyledComponentsMatcherValue =
-  | string
-  | JestAsymmetricEqualityType
-  | RegExp
-  | typeof undefined;
-
-type JestStyledComponentsMatcherOptions = {
-  media?: string,
-  modifier?: string,
-  supports?: string,
-  ...
-};
-
-type JestStyledComponentsMatchersType = {
-  toHaveStyleRule(
-    property: string,
-    value: JestStyledComponentsMatcherValue,
-    options?: JestStyledComponentsMatcherOptions,
-  ): void,
-  ...
-};
-
-/**
- *  Plugin: jest-enzyme
- */
-type EnzymeMatchersType = {
-  // 5.x
-  toBeEmpty(): void,
-  toBePresent(): void,
-  // 6.x
-  toBeChecked(): void,
-  toBeDisabled(): void,
-  toBeEmptyRender(): void,
-  toContainMatchingElement(selector: string): void,
-  toContainMatchingElements(n: number, selector: string): void,
-  toContainExactlyOneMatchingElement(selector: string): void,
-  toContainReact(element: React$Element<any>): void,
-  toExist(): void,
-  toHaveClassName(className: string): void,
-  toHaveHTML(html: string): void,
-  toHaveProp: ((propKey: string, propValue?: any) => void) & ((props: { ... }) => void),
-  toHaveRef(refName: string): void,
-  toHaveState: ((stateKey: string, stateValue?: any) => void) & ((state: { ... }) => void),
-  toHaveStyle: ((styleKey: string, styleValue?: any) => void) & ((style: { ... }) => void),
-  toHaveTagName(tagName: string): void,
-  toHaveText(text: string): void,
-  toHaveValue(value: any): void,
-  toIncludeText(text: string): void,
-  toMatchElement(
-    element: React$Element<any>,
-    options?: {| ignoreProps?: boolean, verbose?: boolean |},
-  ): void,
-  toMatchSelector(selector: string): void,
-  // 7.x
-  toHaveDisplayName(name: string): void,
-  ...
-};
-
-// DOM testing library extensions (jest-dom)
-// https://github.com/testing-library/jest-dom
-type DomTestingLibraryType = {
-  /**
-   * @deprecated
-   */
-  toBeInTheDOM(container?: HTMLElement): void,
-  toBeInTheDocument(): void,
-  toBeVisible(): void,
-  toBeEmpty(): void,
-  toBeDisabled(): void,
-  toBeEnabled(): void,
-  toBeInvalid(): void,
-  toBeRequired(): void,
-  toBeValid(): void,
-  toContainElement(element: HTMLElement | null): void,
-  toContainHTML(htmlText: string): void,
-  toHaveAttribute(attr: string, value?: any): void,
-  toHaveClass(...classNames: string[]): void,
-  toHaveFocus(): void,
-  toHaveFormValues(expectedValues: { [name: string]: any, ... }): void,
-  toHaveStyle(css: string): void,
-  toHaveTextContent(text: string | RegExp, options?: { normalizeWhitespace: boolean, ... }): void,
-  toHaveValue(value?: string | string[] | number): void,
-  ...
-};
-
-// Jest JQuery Matchers: https://github.com/unindented/custom-jquery-matchers
-type JestJQueryMatchersType = {
-  toExist(): void,
-  toHaveLength(len: number): void,
-  toHaveId(id: string): void,
-  toHaveClass(className: string): void,
-  toHaveTag(tag: string): void,
-  toHaveAttr(key: string, val?: any): void,
-  toHaveProp(key: string, val?: any): void,
-  toHaveText(text: string | RegExp): void,
-  toHaveData(key: string, val?: any): void,
-  toHaveValue(val: any): void,
-  toHaveCss(css: { [key: string]: any, ... }): void,
-  toBeChecked(): void,
-  toBeDisabled(): void,
-  toBeEmpty(): void,
-  toBeHidden(): void,
-  toBeSelected(): void,
-  toBeVisible(): void,
-  toBeFocused(): void,
-  toBeInDom(): void,
-  toBeMatchedBy(sel: string): void,
-  toHaveDescendant(sel: string): void,
-  toHaveDescendantWithText(sel: string, text: string | RegExp): void,
-  ...
-};
-
-// Jest Extended Matchers: https://github.com/jest-community/jest-extended
-type JestExtendedMatchersType = {
-  /**
-   * Note: Currently unimplemented
-   * Passing assertion
-   *
-   * @param {String} message
-   */
-  //  pass(message: string): void;
-
-  /**
-   * Note: Currently unimplemented
-   * Failing assertion
-   *
-   * @param {String} message
-   */
-  //  fail(message: string): void;
-
-  /**
-   * Use .toBeEmpty when checking if a String '', Array [] or Object {} is empty.
-   */
-  toBeEmpty(): void,
-  /**
-   * Use .toBeOneOf when checking if a value is a member of a given Array.
-   * @param {Array.<*>} members
-   */
-  toBeOneOf(members: any[]): void,
-  /**
-   * Use `.toBeNil` when checking a value is `null` or `undefined`.
-   */
-  toBeNil(): void,
-  /**
-   * Use `.toSatisfy` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean`.
-   * @param {Function} predicate
-   */
-  toSatisfy(predicate: (n: any) => boolean): void,
-  /**
-   * Use `.toBeArray` when checking if a value is an `Array`.
-   */
-  toBeArray(): void,
-  /**
-   * Use `.toBeArrayOfSize` when checking if a value is an `Array` of size x.
-   * @param {Number} x
-   */
-  toBeArrayOfSize(x: number): void,
-  /**
-   * Use `.toIncludeAllMembers` when checking if an `Array` contains all of the same members of a given set.
-   * @param {Array.<*>} members
-   */
-  toIncludeAllMembers(members: any[]): void,
-  /**
-   * Use `.toIncludeAnyMembers` when checking if an `Array` contains any of the members of a given set.
-   * @param {Array.<*>} members
-   */
-  toIncludeAnyMembers(members: any[]): void,
-  /**
-   * Use `.toSatisfyAll` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean` for all values in an array.
-   * @param {Function} predicate
-   */
-  toSatisfyAll(predicate: (n: any) => boolean): void,
-  /**
-   * Use `.toBeBoolean` when checking if a value is a `Boolean`.
-   */
-  toBeBoolean(): void,
-  /**
-   * Use `.toBeTrue` when checking a value is equal (===) to `true`.
-   */
-  toBeTrue(): void,
-  /**
-   * Use `.toBeFalse` when checking a value is equal (===) to `false`.
-   */
-  toBeFalse(): void,
-  /**
-   * Use .toBeDate when checking if a value is a Date.
-   */
-  toBeDate(): void,
-  /**
-   * Use `.toBeFunction` when checking if a value is a `Function`.
-   */
-  toBeFunction(): void,
-  /**
-   * Use `.toHaveBeenCalledBefore` when checking if a `Mock` was called before another `Mock`.
-   *
-   * Note: Required Jest version >22
-   * Note: Your mock functions will have to be asynchronous to cause the timestamps inside of Jest to occur in a differentJS event loop, otherwise the mock timestamps will all be the same
-   *
-   * @param {Mock} mock
-   */
-  toHaveBeenCalledBefore(mock: JestMockFn<any, any>): void,
-  /**
-   * Use `.toBeNumber` when checking if a value is a `Number`.
-   */
-  toBeNumber(): void,
-  /**
-   * Use `.toBeNaN` when checking a value is `NaN`.
-   */
-  toBeNaN(): void,
-  /**
-   * Use `.toBeFinite` when checking if a value is a `Number`, not `NaN` or `Infinity`.
-   */
-  toBeFinite(): void,
-  /**
-   * Use `.toBePositive` when checking if a value is a positive `Number`.
-   */
-  toBePositive(): void,
-  /**
-   * Use `.toBeNegative` when checking if a value is a negative `Number`.
-   */
-  toBeNegative(): void,
-  /**
-   * Use `.toBeEven` when checking if a value is an even `Number`.
-   */
-  toBeEven(): void,
-  /**
-   * Use `.toBeOdd` when checking if a value is an odd `Number`.
-   */
-  toBeOdd(): void,
-  /**
-   * Use `.toBeWithin` when checking if a number is in between the given bounds of: start (inclusive) and end (exclusive).
-   *
-   * @param {Number} start
-   * @param {Number} end
-   */
-  toBeWithin(start: number, end: number): void,
-  /**
-   * Use `.toBeObject` when checking if a value is an `Object`.
-   */
-  toBeObject(): void,
-  /**
-   * Use `.toContainKey` when checking if an object contains the provided key.
-   *
-   * @param {String} key
-   */
-  toContainKey(key: string): void,
-  /**
-   * Use `.toContainKeys` when checking if an object has all of the provided keys.
-   *
-   * @param {Array.<String>} keys
-   */
-  toContainKeys(keys: string[]): void,
-  /**
-   * Use `.toContainAllKeys` when checking if an object only contains all of the provided keys.
-   *
-   * @param {Array.<String>} keys
-   */
-  toContainAllKeys(keys: string[]): void,
-  /**
-   * Use `.toContainAnyKeys` when checking if an object contains at least one of the provided keys.
-   *
-   * @param {Array.<String>} keys
-   */
-  toContainAnyKeys(keys: string[]): void,
-  /**
-   * Use `.toContainValue` when checking if an object contains the provided value.
-   *
-   * @param {*} value
-   */
-  toContainValue(value: any): void,
-  /**
-   * Use `.toContainValues` when checking if an object contains all of the provided values.
-   *
-   * @param {Array.<*>} values
-   */
-  toContainValues(values: any[]): void,
-  /**
-   * Use `.toContainAllValues` when checking if an object only contains all of the provided values.
-   *
-   * @param {Array.<*>} values
-   */
-  toContainAllValues(values: any[]): void,
-  /**
-   * Use `.toContainAnyValues` when checking if an object contains at least one of the provided values.
-   *
-   * @param {Array.<*>} values
-   */
-  toContainAnyValues(values: any[]): void,
-  /**
-   * Use `.toContainEntry` when checking if an object contains the provided entry.
-   *
-   * @param {Array.<String, String>} entry
-   */
-  toContainEntry(entry: [string, string]): void,
-  /**
-   * Use `.toContainEntries` when checking if an object contains all of the provided entries.
-   *
-   * @param {Array.<Array.<String, String>>} entries
-   */
-  toContainEntries(entries: [string, string][]): void,
-  /**
-   * Use `.toContainAllEntries` when checking if an object only contains all of the provided entries.
-   *
-   * @param {Array.<Array.<String, String>>} entries
-   */
-  toContainAllEntries(entries: [string, string][]): void,
-  /**
-   * Use `.toContainAnyEntries` when checking if an object contains at least one of the provided entries.
-   *
-   * @param {Array.<Array.<String, String>>} entries
-   */
-  toContainAnyEntries(entries: [string, string][]): void,
-  /**
-   * Use `.toBeExtensible` when checking if an object is extensible.
-   */
-  toBeExtensible(): void,
-  /**
-   * Use `.toBeFrozen` when checking if an object is frozen.
-   */
-  toBeFrozen(): void,
-  /**
-   * Use `.toBeSealed` when checking if an object is sealed.
-   */
-  toBeSealed(): void,
-  /**
-   * Use `.toBeString` when checking if a value is a `String`.
-   */
-  toBeString(): void,
-  /**
-   * Use `.toEqualCaseInsensitive` when checking if a string is equal (===) to another ignoring the casing of both strings.
-   *
-   * @param {String} string
-   */
-  toEqualCaseInsensitive(string: string): void,
-  /**
-   * Use `.toStartWith` when checking if a `String` starts with a given `String` prefix.
-   *
-   * @param {String} prefix
-   */
-  toStartWith(prefix: string): void,
-  /**
-   * Use `.toEndWith` when checking if a `String` ends with a given `String` suffix.
-   *
-   * @param {String} suffix
-   */
-  toEndWith(suffix: string): void,
-  /**
-   * Use `.toInclude` when checking if a `String` includes the given `String` substring.
-   *
-   * @param {String} substring
-   */
-  toInclude(substring: string): void,
-  /**
-   * Use `.toIncludeRepeated` when checking if a `String` includes the given `String` substring the correct number of times.
-   *
-   * @param {String} substring
-   * @param {Number} times
-   */
-  toIncludeRepeated(substring: string, times: number): void,
-  /**
-   * Use `.toIncludeMultiple` when checking if a `String` includes all of the given substrings.
-   *
-   * @param {Array.<String>} substring
-   */
-  toIncludeMultiple(substring: string[]): void,
-  ...
-};
-
-interface JestExpectType {
-  not: JestExpectType &
-    EnzymeMatchersType &
-    DomTestingLibraryType &
-    JestJQueryMatchersType &
-    JestStyledComponentsMatchersType &
-    JestExtendedMatchersType;
-
-  /**
-   * If you have a mock function, you can use .lastCalledWith to test what
-   * arguments it was last called with.
-   */
-  lastCalledWith(...args: Array<any>): void;
-
-  /**
-   * toBe just checks that a value is what you expect. It uses === to check
-   * strict equality.
-   */
-  toBe(value: any): void;
-
-  /**
-   * Use .toBeCalledWith to ensure that a mock function was called with
-   * specific arguments.
-   */
-  toBeCalledWith(...args: Array<any>): void;
-
-  /**
-   * Using exact equality with floating point numbers is a bad idea. Rounding
-   * means that intuitive things fail.
-   */
-  toBeCloseTo(num: number, delta: any): void;
-
-  /**
-   * Use .toBeDefined to check that a variable is not undefined.
-   */
-  toBeDefined(): void;
-
-  /**
-   * Use .toBeFalsy when you don't care what a value is, you just want to
-   * ensure a value is false in a boolean context.
-   */
-  toBeFalsy(): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeGreaterThan.
-   */
-  toBeGreaterThan(number: number): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeGreaterThanOrEqual.
-   */
-  toBeGreaterThanOrEqual(number: number): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeLessThan.
-   */
-  toBeLessThan(number: number): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeLessThanOrEqual.
-   */
-  toBeLessThanOrEqual(number: number): void;
-
-  /**
-   * Use .toBeInstanceOf(Class) to check that an object is an instance of a
-   * class.
-   */
-  toBeInstanceOf(cls: Class<*>): void;
-
-  /**
-   * .toBeNull() is the same as .toBe(null) but the error messages are a bit
-   * nicer.
-   */
-  toBeNull(): void;
-
-  /**
-   * Use .toBeTruthy when you don't care what a value is, you just want to
-   * ensure a value is true in a boolean context.
-   */
-  toBeTruthy(): void;
-
-  /**
-   * Use .toBeUndefined to check that a variable is undefined.
-   */
-  toBeUndefined(): void;
-
-  /**
-   * Use .toContain when you want to check that an item is in a list. For
-   * testing the items in the list, this uses ===, a strict equality check.
-   */
-  toContain(item: any): void;
-
-  /**
-   * Use .toContainEqual when you want to check that an item is in a list. For
-   * testing the items in the list, this matcher recursively checks the
-   * equality of all fields, rather than checking for object identity.
-   */
-  toContainEqual(item: any): void;
-
-  /**
-   * Use .toEqual when you want to check that two objects have the same value.
-   * This matcher recursively checks the equality of all fields, rather than
-   * checking for object identity.
-   */
-  toEqual(value: any): void;
-
-  /**
-   * Use .toHaveBeenCalled to ensure that a mock function got called.
-   */
-  toHaveBeenCalled(): void;
-
-  toBeCalled(): void;
-
-  /**
-   * Use .toHaveBeenCalledTimes to ensure that a mock function got called exact
-   * number of times.
-   */
-  toHaveBeenCalledTimes(number: number): void;
-
-  toBeCalledTimes(number: number): void;
-
-  /**
-   *
-   */
-  toHaveBeenNthCalledWith(nthCall: number, ...args: Array<any>): void;
-
-  nthCalledWith(nthCall: number, ...args: Array<any>): void;
-
-  /**
-   *
-   */
-  toHaveReturned(): void;
-
-  toReturn(): void;
-
-  /**
-   *
-   */
-  toHaveReturnedTimes(number: number): void;
-
-  toReturnTimes(number: number): void;
-
-  /**
-   *
-   */
-  toHaveReturnedWith(value: any): void;
-
-  toReturnWith(value: any): void;
-
-  /**
-   *
-   */
-  toHaveLastReturnedWith(value: any): void;
-
-  lastReturnedWith(value: any): void;
-
-  /**
-   *
-   */
-  toHaveNthReturnedWith(nthCall: number, value: any): void;
-
-  nthReturnedWith(nthCall: number, value: any): void;
-
-  /**
-   * Use .toHaveBeenCalledWith to ensure that a mock function was called with
-   * specific arguments.
-   */
-  toHaveBeenCalledWith(...args: Array<any>): void;
-
-  toBeCalledWith(...args: Array<any>): void;
-
-  /**
-   * Use .toHaveBeenLastCalledWith to ensure that a mock function was last called
-   * with specific arguments.
-   */
-  toHaveBeenLastCalledWith(...args: Array<any>): void;
-
-  lastCalledWith(...args: Array<any>): void;
-
-  /**
-   * Check that an object has a .length property and it is set to a certain
-   * numeric value.
-   */
-  toHaveLength(number: number): void;
-
-  /**
-   *
-   */
-  toHaveProperty(propPath: string | $ReadOnlyArray<string>, value?: any): void;
-
-  /**
-   * Use .toMatch to check that a string matches a regular expression or string.
-   */
-  toMatch(regexpOrString: RegExp | string): void;
-
-  /**
-   * Use .toMatchObject to check that a javascript object matches a subset of the properties of an object.
-   */
-  toMatchObject(object: Object | Array<Object>): void;
-
-  /**
-   * Use .toStrictEqual to check that a javascript object matches a subset of the properties of an object.
-   */
-  toStrictEqual(value: any): void;
-
-  /**
-   * This ensures that an Object matches the most recent snapshot.
-   */
-  toMatchSnapshot(propertyMatchers?: any, name?: string): void;
-
-  /**
-   * This ensures that an Object matches the most recent snapshot.
-   */
-  toMatchSnapshot(name: string): void;
-
-  toMatchInlineSnapshot(snapshot?: string): void;
-
-  toMatchInlineSnapshot(propertyMatchers?: any, snapshot?: string): void;
-
-  /**
-   * Use .toThrow to test that a function throws when it is called.
-   * If you want to test that a specific error gets thrown, you can provide an
-   * argument to toThrow. The argument can be a string for the error message,
-   * a class for the error, or a regex that should match the error.
-   *
-   * Alias: .toThrowError
-   */
-  toThrow(message?: string | Error | Class<Error> | RegExp): void;
-
-  toThrowError(message?: string | Error | Class<Error> | RegExp): void;
-
-  /**
-   * Use .toThrowErrorMatchingSnapshot to test that a function throws a error
-   * matching the most recent snapshot when it is called.
-   */
-  toThrowErrorMatchingSnapshot(): void;
-
-  toThrowErrorMatchingInlineSnapshot(snapshot?: string): void;
-}
-
-type JestObjectType = {
-  /**
-   *  Disables automatic mocking in the module loader.
-   *
-   *  After this method is called, all `require()`s will return the real
-   *  versions of each module (rather than a mocked version).
-   */
-  disableAutomock(): JestObjectType,
-  /**
-   * An un-hoisted version of disableAutomock
-   */
-  autoMockOff(): JestObjectType,
-  /**
-   * Enables automatic mocking in the module loader.
-   */
-  enableAutomock(): JestObjectType,
-  /**
-   * An un-hoisted version of enableAutomock
-   */
-  autoMockOn(): JestObjectType,
-  /**
-   * Clears the mock.calls and mock.instances properties of all mocks.
-   * Equivalent to calling .mockClear() on every mocked function.
-   */
-  clearAllMocks(): JestObjectType,
-  /**
-   * Resets the state of all mocks. Equivalent to calling .mockReset() on every
-   * mocked function.
-   */
-  resetAllMocks(): JestObjectType,
-  /**
-   * Restores all mocks back to their original value.
-   */
-  restoreAllMocks(): JestObjectType,
-  /**
-   * Removes any pending timers from the timer system.
-   */
-  clearAllTimers(): void,
-  /**
-   * Returns the number of fake timers still left to run.
-   */
-  getTimerCount(): number,
-  /**
-   * The same as `mock` but not moved to the top of the expectation by
-   * babel-jest.
-   */
-  doMock(moduleName: string, moduleFactory?: any): JestObjectType,
-  /**
-   * The same as `unmock` but not moved to the top of the expectation by
-   * babel-jest.
-   */
-  dontMock(moduleName: string): JestObjectType,
-  /**
-   * Returns a new, unused mock function. Optionally takes a mock
-   * implementation.
-   */
-  fn<TArguments: $ReadOnlyArray<*>, TReturn>(
-    implementation?: (...args: TArguments) => TReturn,
-  ): JestMockFn<TArguments, TReturn>,
-  /**
-   * Determines if the given function is a mocked function.
-   */
-  isMockFunction(fn: Function): boolean,
-  /**
-   * Given the name of a module, use the automatic mocking system to generate a
-   * mocked version of the module for you.
-   */
-  genMockFromModule(moduleName: string): any,
-  /**
-   * Mocks a module with an auto-mocked version when it is being required.
-   *
-   * The second argument can be used to specify an explicit module factory that
-   * is being run instead of using Jest's automocking feature.
-   *
-   * The third argument can be used to create virtual mocks -- mocks of modules
-   * that don't exist anywhere in the system.
-   */
-  mock(moduleName: string, moduleFactory?: any, options?: Object): JestObjectType,
-  /**
-   * Returns the actual module instead of a mock, bypassing all checks on
-   * whether the module should receive a mock implementation or not.
-   */
-  requireActual(moduleName: string): any,
-  /**
-   * Returns a mock module instead of the actual module, bypassing all checks
-   * on whether the module should be required normally or not.
-   */
-  requireMock(moduleName: string): any,
-  /**
-   * Resets the module registry - the cache of all required modules. This is
-   * useful to isolate modules where local state might conflict between tests.
-   */
-  resetModules(): JestObjectType,
-  /**
-   * Creates a sandbox registry for the modules that are loaded inside the
-   * callback function. This is useful to isolate specific modules for every
-   * test so that local module state doesn't conflict between tests.
-   */
-  isolateModules(fn: () => void): JestObjectType,
-  /**
-   * Exhausts the micro-task queue (usually interfaced in node via
-   * process.nextTick).
-   */
-  runAllTicks(): void,
-  /**
-   * Exhausts the macro-task queue (i.e., all tasks queued by setTimeout(),
-   * setInterval(), and setImmediate()).
-   */
-  runAllTimers(): void,
-  /**
-   * Exhausts all tasks queued by setImmediate().
-   */
-  runAllImmediates(): void,
-  /**
-   * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-   * or setInterval() and setImmediate()).
-   */
-  advanceTimersByTime(msToRun: number): void,
-  /**
-   * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-   * or setInterval() and setImmediate()).
-   *
-   * Renamed to `advanceTimersByTime`.
-   */
-  runTimersToTime(msToRun: number): void,
-  /**
-   * Executes only the macro-tasks that are currently pending (i.e., only the
-   * tasks that have been queued by setTimeout() or setInterval() up to this
-   * point)
-   */
-  runOnlyPendingTimers(): void,
-  /**
-   * Explicitly supplies the mock object that the module system should return
-   * for the specified module. Note: It is recommended to use jest.mock()
-   * instead.
-   */
-  setMock(moduleName: string, moduleExports: any): JestObjectType,
-  /**
-   * Indicates that the module system should never return a mocked version of
-   * the specified module from require() (e.g. that it should always return the
-   * real module).
-   */
-  unmock(moduleName: string): JestObjectType,
-  /**
-   * Instructs Jest to use fake versions of the standard timer functions
-   * (setTimeout, setInterval, clearTimeout, clearInterval, nextTick,
-   * setImmediate and clearImmediate).
-   */
-  useFakeTimers(): JestObjectType,
-  /**
-   * Instructs Jest to use the real versions of the standard timer functions.
-   */
-  useRealTimers(): JestObjectType,
-  /**
-   * Creates a mock function similar to jest.fn but also tracks calls to
-   * object[methodName].
-   */
-  spyOn(object: Object, methodName: string, accessType?: 'get' | 'set'): JestMockFn<any, any>,
-  /**
-   * Set the default timeout interval for tests and before/after hooks in milliseconds.
-   * Note: The default timeout interval is 5 seconds if this method is not called.
-   */
-  setTimeout(timeout: number): JestObjectType,
-  ...
-};
-
-type JestSpyType = { calls: JestCallsType, ... };
-
-type JestDoneFn = {|
-  (): void,
-  fail: (error: Error) => void,
-|};
-
-/** Runs this function after every test inside this context */
-declare function afterEach(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** Runs this function before every test inside this context */
-declare function beforeEach(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** Runs this function after all tests have finished inside this context */
-declare function afterAll(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** Runs this function before any tests have started inside this context */
-declare function beforeAll(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** A context for grouping tests together */
-declare var describe: {
-  /**
-   * Creates a block that groups together several related tests in one "test suite"
-   */
-  (name: JestTestName, fn: () => void): void,
-  /**
-   * Only run this describe block
-   */
-  only(name: JestTestName, fn: () => void): void,
-  /**
-   * Skip running this describe block
-   */
-  skip(name: JestTestName, fn: () => void): void,
-  /**
-   * each runs this test against array of argument arrays per each run
-   *
-   * @param {table} table of Test
-   */
-  each(
-    ...table: Array<Array<mixed> | mixed> | [Array<string>, string]
-  ): (name: JestTestName, fn?: (...args: Array<any>) => ?Promise<mixed>, timeout?: number) => void,
-  ...
-};
-
-/** An individual test unit */
-declare var it: {
-  /**
-   * An individual test unit
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  (name: JestTestName, fn?: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void,
-  /**
-   * Only run this test
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  only: {|
-    (name: JestTestName, fn?: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void,
-    each(
-      ...table: Array<Array<mixed> | mixed> | [Array<string>, string]
-    ): (
-      name: JestTestName,
-      fn?: (...args: Array<any>) => ?Promise<mixed>,
-      timeout?: number,
-    ) => void,
-  |},
-  /**
-   * Skip running this test
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  skip(name: JestTestName, fn?: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void,
-  /**
-   * Highlight planned tests in the summary output
-   *
-   * @param {String} Name of Test to do
-   */
-  todo(name: string): void,
-  /**
-   * Run the test concurrently
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  concurrent(
-    name: JestTestName,
-    fn?: (done: JestDoneFn) => ?Promise<mixed>,
-    timeout?: number,
-  ): void,
-  /**
-   * each runs this test against array of argument arrays per each run
-   *
-   * @param {table} table of Test
-   */
-  each(
-    ...table: Array<Array<mixed> | mixed> | [Array<string>, string]
-  ): (name: JestTestName, fn?: (...args: Array<any>) => ?Promise<mixed>, timeout?: number) => void,
-  ...
-};
-
-declare function fit(
-  name: JestTestName,
-  fn: (done: JestDoneFn) => ?Promise<mixed>,
-  timeout?: number,
-): void;
-
-/** An individual test unit */
-declare var test: typeof it;
-/** A disabled group of tests */
-declare var xdescribe: typeof describe;
-/** A focused group of tests */
-declare var fdescribe: typeof describe;
-/** A disabled individual test */
-declare var xit: typeof it;
-/** A disabled individual test */
-declare var xtest: typeof it;
-
-type JestPrettyFormatColors = {
-  comment: {
-    close: string,
-    open: string,
-    ...
-  },
-  content: {
-    close: string,
-    open: string,
-    ...
-  },
-  prop: {
-    close: string,
-    open: string,
-    ...
-  },
-  tag: {
-    close: string,
-    open: string,
-    ...
-  },
-  value: {
-    close: string,
-    open: string,
-    ...
-  },
-  ...
-};
-
-type JestPrettyFormatIndent = string => string;
-type JestPrettyFormatRefs = Array<any>;
-type JestPrettyFormatPrint = any => string;
-type JestPrettyFormatStringOrNull = string | null;
-
-type JestPrettyFormatOptions = {|
-  callToJSON: boolean,
-  edgeSpacing: string,
-  escapeRegex: boolean,
-  highlight: boolean,
-  indent: number,
-  maxDepth: number,
-  min: boolean,
-  plugins: JestPrettyFormatPlugins,
-  printFunctionName: boolean,
-  spacing: string,
-  theme: {|
-    comment: string,
-    content: string,
-    prop: string,
-    tag: string,
-    value: string,
-  |},
-|};
-
-type JestPrettyFormatPlugin = {
-  print: (
-    val: any,
-    serialize: JestPrettyFormatPrint,
-    indent: JestPrettyFormatIndent,
-    opts: JestPrettyFormatOptions,
-    colors: JestPrettyFormatColors,
-  ) => string,
-  test: any => boolean,
-  ...
-};
-
-type JestPrettyFormatPlugins = Array<JestPrettyFormatPlugin>;
-
-/** The expect function is used every time you want to test a value */
-declare var expect: {
-  /** The object that you want to make assertions against */
-  (
-    value: any,
-  ): JestExpectType &
-    JestPromiseType &
-    EnzymeMatchersType &
-    DomTestingLibraryType &
-    JestJQueryMatchersType &
-    JestStyledComponentsMatchersType &
-    JestExtendedMatchersType,
-  /** Add additional Jasmine matchers to Jest's roster */
-  extend(matchers: { [name: string]: JestMatcher, ... }): void,
-  /** Add a module that formats application-specific data structures. */
-  addSnapshotSerializer(pluginModule: JestPrettyFormatPlugin): void,
-  assertions(expectedAssertions: number): void,
-  hasAssertions(): void,
-  any(value: mixed): JestAsymmetricEqualityType,
-  anything(): any,
-  arrayContaining(value: Array<mixed>): Array<mixed>,
-  objectContaining(value: Object): Object,
-  /** Matches any received string that contains the exact expected string. */
-  stringContaining(value: string): string,
-  stringMatching(value: string | RegExp): string,
-  not: {
-    arrayContaining: (value: $ReadOnlyArray<mixed>) => Array<mixed>,
-    objectContaining: (value: { ... }) => Object,
-    stringContaining: (value: string) => string,
-    stringMatching: (value: string | RegExp) => string,
-    ...
-  },
-  ...
-};
-
-// TODO handle return type
-// http://jasmine.github.io/2.4/introduction.html#section-Spies
-declare function spyOn(value: mixed, method: string): Object;
-
-/** Holds all functions related to manipulating test runner */
-declare var jest: JestObjectType;
-
-/**
- * The global Jasmine object, this is generally not exposed as the public API,
- * using features inside here could break in later versions of Jest.
- */
-declare var jasmine: {
-  DEFAULT_TIMEOUT_INTERVAL: number,
-  any(value: mixed): JestAsymmetricEqualityType,
-  anything(): any,
-  arrayContaining(value: Array<mixed>): Array<mixed>,
-  clock(): JestClockType,
-  createSpy(name: string): JestSpyType,
-  createSpyObj(
-    baseName: string,
-    methodNames: Array<string>,
-  ): { [methodName: string]: JestSpyType, ... },
-  objectContaining(value: Object): Object,
-  stringMatching(value: string): string,
-  ...
-};
diff --git a/packages/insomnia-inso/flow-typed/lodash.flattendeep.js b/packages/insomnia-inso/flow-typed/lodash.flattendeep.js
deleted file mode 100644
index be2847d7fa..0000000000
--- a/packages/insomnia-inso/flow-typed/lodash.flattendeep.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'lodash.flattendeep' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-inso/flow-typed/mkdirp.js b/packages/insomnia-inso/flow-typed/mkdirp.js
deleted file mode 100644
index 92b7dbbfcb..0000000000
--- a/packages/insomnia-inso/flow-typed/mkdirp.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// @flow
-
-declare module 'mkdirp' {
-  declare module.exports: {
-    sync: (path: string) => string | null,
-  };
-}
diff --git a/packages/insomnia-inso/flow-typed/nedb.js b/packages/insomnia-inso/flow-typed/nedb.js
deleted file mode 100644
index fb3ae0e595..0000000000
--- a/packages/insomnia-inso/flow-typed/nedb.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'nedb' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-inso/flow-typed/openapi-2-kong.js b/packages/insomnia-inso/flow-typed/openapi-2-kong.js
deleted file mode 100644
index 5d3d0ccf4b..0000000000
--- a/packages/insomnia-inso/flow-typed/openapi-2-kong.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// @flow
-
-declare type ConversionResultType = 'kong-declarative-config' | 'kong-for-kubernetes';
-
-declare type DeclarativeConfigResult = {
-  type: 'kong-declarative-config',
-  label: string,
-  documents: Object,
-  warnings: Array<{
-    severity: number,
-    message: string,
-    range: {
-      /* TODO */
-    },
-  }>,
-};
-
-declare type KongForKubernetesResult = {
-  type: 'kong-for-kubernetes',
-  label: string,
-  documents: Array<Object>,
-  warnings: Array<{
-    severity: number,
-    message: string,
-    range: {
-      /* TODO */
-    },
-  }>,
-};
-
-declare type ConversionResult = DeclarativeConfigResult | KongForKubernetesResult;
-
-declare module 'openapi-2-kong' {
-  declare module.exports: {
-    generate: (specPath: string, type: ConversionResultType, tags?: Array<string>) => Promise<ConversionResult>,
-    generateFromString: (specStr: string, type: ConversionResultType, tags?: Array<string>) => Promise<ConversionResult>,
-  };
-}
diff --git a/packages/insomnia-inso/flow-typed/string-argv.js b/packages/insomnia-inso/flow-typed/string-argv.js
deleted file mode 100644
index 6f31a9e0c1..0000000000
--- a/packages/insomnia-inso/flow-typed/string-argv.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'string-argv' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-inso/flow-typed/yaml.js b/packages/insomnia-inso/flow-typed/yaml.js
deleted file mode 100644
index 119502e9ea..0000000000
--- a/packages/insomnia-inso/flow-typed/yaml.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// @flow
-
-declare module 'yaml' {
-  declare module.exports: {
-    stringify: Object => string,
-    parse: string => Object,
-    parseCST: string => Object,
-  };
-}
diff --git a/packages/insomnia-inso/jest.config.js b/packages/insomnia-inso/jest.config.js
new file mode 100644
index 0000000000..dd1cda9855
--- /dev/null
+++ b/packages/insomnia-inso/jest.config.js
@@ -0,0 +1,35 @@
+/** @type { import('@jest/types').Config.InitialOptions } */
+module.exports = {
+  globals: {
+    'ts-jest': {
+      isolatedModules: true,
+    },
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+  testMatch: [
+    '**/*.test.ts',
+  ],
+  verbose: false,
+  resetMocks: true,
+  resetModules: true,
+
+  setupFiles: [
+    './src/jest/setup.ts',
+  ],
+  collectCoverage: true,
+  coveragePathIgnorePatterns: [
+    '/node_modules/',
+  ],
+  coverageThreshold: {
+    global: {
+      branches: 88,
+      functions: 96,
+      lines: 95,
+      statements: 95,
+    },
+  },
+};
diff --git a/packages/insomnia-inso/package-lock.json b/packages/insomnia-inso/package-lock.json
index 5726a692d8..ac62bbcf91 100644
--- a/packages/insomnia-inso/package-lock.json
+++ b/packages/insomnia-inso/package-lock.json
@@ -460,15 +460,6 @@
 				"@babel/helper-plugin-utils": "^7.8.0"
 			}
 		},
-		"@babel/plugin-syntax-bigint": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
 		"@babel/plugin-syntax-class-properties": {
 			"version": "7.10.1",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz",
@@ -496,15 +487,6 @@
 				"@babel/helper-plugin-utils": "^7.10.1"
 			}
 		},
-		"@babel/plugin-syntax-import-meta": {
-			"version": "7.10.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.1.tgz",
-			"integrity": "sha512-ypC4jwfIVF72og0dgvEcFRdOM2V9Qm1tu7RGmdZOlhsccyK0wisXmMObGuWEOd5jQ+K9wcIgSNftCpk2vkjUfQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.1"
-			}
-		},
 		"@babel/plugin-syntax-json-strings": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
@@ -514,15 +496,6 @@
 				"@babel/helper-plugin-utils": "^7.8.0"
 			}
 		},
-		"@babel/plugin-syntax-logical-assignment-operators": {
-			"version": "7.10.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.1.tgz",
-			"integrity": "sha512-XyHIFa9kdrgJS91CUH+ccPVTnJShr8nLGc5bG2IhGXv5p1Rd+8BleGE5yzIg2Nc1QZAdHDa0Qp4m6066OL96Iw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.1"
-			}
-		},
 		"@babel/plugin-syntax-nullish-coalescing-operator": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
@@ -1044,260 +1017,6 @@
 				"to-fast-properties": "^2.0.0"
 			}
 		},
-		"@bcoe/v8-coverage": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-			"dev": true
-		},
-		"@cnakazawa/watch": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
-			"integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
-			"dev": true,
-			"requires": {
-				"exec-sh": "^0.3.2",
-				"minimist": "^1.2.0"
-			}
-		},
-		"@istanbuljs/load-nyc-config": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-			"dev": true,
-			"requires": {
-				"camelcase": "^5.3.1",
-				"find-up": "^4.1.0",
-				"get-package-type": "^0.1.0",
-				"js-yaml": "^3.13.1",
-				"resolve-from": "^5.0.0"
-			}
-		},
-		"@istanbuljs/schema": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
-			"integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
-			"dev": true
-		},
-		"@jest/console": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/console/-/console-26.1.0.tgz",
-			"integrity": "sha512-+0lpTHMd/8pJp+Nd4lyip+/Iyf2dZJvcCqrlkeZQoQid+JlThA4M9vxHtheyrQ99jJTMQam+es4BcvZ5W5cC3A==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"chalk": "^4.0.0",
-				"jest-message-util": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"slash": "^3.0.0"
-			},
-			"dependencies": {
-				"slash": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-					"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-					"dev": true
-				}
-			}
-		},
-		"@jest/core": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/core/-/core-26.1.0.tgz",
-			"integrity": "sha512-zyizYmDJOOVke4OO/De//aiv8b07OwZzL2cfsvWF3q9YssfpcKfcnZAwDY8f+A76xXSMMYe8i/f/LPocLlByfw==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^26.1.0",
-				"@jest/reporters": "^26.1.0",
-				"@jest/test-result": "^26.1.0",
-				"@jest/transform": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.4",
-				"jest-changed-files": "^26.1.0",
-				"jest-config": "^26.1.0",
-				"jest-haste-map": "^26.1.0",
-				"jest-message-util": "^26.1.0",
-				"jest-regex-util": "^26.0.0",
-				"jest-resolve": "^26.1.0",
-				"jest-resolve-dependencies": "^26.1.0",
-				"jest-runner": "^26.1.0",
-				"jest-runtime": "^26.1.0",
-				"jest-snapshot": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"jest-validate": "^26.1.0",
-				"jest-watcher": "^26.1.0",
-				"micromatch": "^4.0.2",
-				"p-each-series": "^2.1.0",
-				"rimraf": "^3.0.0",
-				"slash": "^3.0.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"dependencies": {
-				"slash": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-					"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-					"dev": true
-				}
-			}
-		},
-		"@jest/environment": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.1.0.tgz",
-			"integrity": "sha512-86+DNcGongbX7ai/KE/S3/NcUVZfrwvFzOOWX/W+OOTvTds7j07LtC+MgGydH5c8Ri3uIrvdmVgd1xFD5zt/xA==",
-			"dev": true,
-			"requires": {
-				"@jest/fake-timers": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"jest-mock": "^26.1.0"
-			}
-		},
-		"@jest/fake-timers": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.1.0.tgz",
-			"integrity": "sha512-Y5F3kBVWxhau3TJ825iuWy++BAuQzK/xEa+wD9vDH3RytW9f2DbMVodfUQC54rZDX3POqdxCgcKdgcOL0rYUpA==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"@sinonjs/fake-timers": "^6.0.1",
-				"jest-message-util": "^26.1.0",
-				"jest-mock": "^26.1.0",
-				"jest-util": "^26.1.0"
-			}
-		},
-		"@jest/globals": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.1.0.tgz",
-			"integrity": "sha512-MKiHPNaT+ZoG85oMaYUmGHEqu98y3WO2yeIDJrs2sJqHhYOy3Z6F7F/luzFomRQ8SQ1wEkmahFAz2291Iv8EAw==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"expect": "^26.1.0"
-			}
-		},
-		"@jest/reporters": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.1.0.tgz",
-			"integrity": "sha512-SVAysur9FOIojJbF4wLP0TybmqwDkdnFxHSPzHMMIYyBtldCW9gG+Q5xWjpMFyErDiwlRuPyMSJSU64A67Pazg==",
-			"dev": true,
-			"requires": {
-				"@bcoe/v8-coverage": "^0.2.3",
-				"@jest/console": "^26.1.0",
-				"@jest/test-result": "^26.1.0",
-				"@jest/transform": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"chalk": "^4.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"exit": "^0.1.2",
-				"glob": "^7.1.2",
-				"graceful-fs": "^4.2.4",
-				"istanbul-lib-coverage": "^3.0.0",
-				"istanbul-lib-instrument": "^4.0.3",
-				"istanbul-lib-report": "^3.0.0",
-				"istanbul-lib-source-maps": "^4.0.0",
-				"istanbul-reports": "^3.0.2",
-				"jest-haste-map": "^26.1.0",
-				"jest-resolve": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"jest-worker": "^26.1.0",
-				"node-notifier": "^7.0.0",
-				"slash": "^3.0.0",
-				"source-map": "^0.6.0",
-				"string-length": "^4.0.1",
-				"terminal-link": "^2.0.0",
-				"v8-to-istanbul": "^4.1.3"
-			},
-			"dependencies": {
-				"slash": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-					"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-					"dev": true
-				}
-			}
-		},
-		"@jest/source-map": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.1.0.tgz",
-			"integrity": "sha512-XYRPYx4eEVX15cMT9mstnO7hkHP3krNtKfxUYd8L7gbtia8JvZZ6bMzSwa6IQJENbudTwKMw5R1BePRD+bkEmA==",
-			"dev": true,
-			"requires": {
-				"callsites": "^3.0.0",
-				"graceful-fs": "^4.2.4",
-				"source-map": "^0.6.0"
-			}
-		},
-		"@jest/test-result": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.1.0.tgz",
-			"integrity": "sha512-Xz44mhXph93EYMA8aYDz+75mFbarTV/d/x0yMdI3tfSRs/vh4CqSxgzVmCps1fPkHDCtn0tU8IH9iCKgGeGpfw==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"collect-v8-coverage": "^1.0.0"
-			}
-		},
-		"@jest/test-sequencer": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.1.0.tgz",
-			"integrity": "sha512-Z/hcK+rTq56E6sBwMoQhSRDVjqrGtj1y14e2bIgcowARaIE1SgOanwx6gvY4Q9gTKMoZQXbXvptji+q5GYxa6Q==",
-			"dev": true,
-			"requires": {
-				"@jest/test-result": "^26.1.0",
-				"graceful-fs": "^4.2.4",
-				"jest-haste-map": "^26.1.0",
-				"jest-runner": "^26.1.0",
-				"jest-runtime": "^26.1.0"
-			}
-		},
-		"@jest/transform": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.1.0.tgz",
-			"integrity": "sha512-ICPm6sUXmZJieq45ix28k0s+d/z2E8CHDsq+WwtWI6kW8m7I8kPqarSEcUN86entHQ570ZBRci5OWaKL0wlAWw==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.1.0",
-				"@jest/types": "^26.1.0",
-				"babel-plugin-istanbul": "^6.0.0",
-				"chalk": "^4.0.0",
-				"convert-source-map": "^1.4.0",
-				"fast-json-stable-stringify": "^2.0.0",
-				"graceful-fs": "^4.2.4",
-				"jest-haste-map": "^26.1.0",
-				"jest-regex-util": "^26.0.0",
-				"jest-util": "^26.1.0",
-				"micromatch": "^4.0.2",
-				"pirates": "^4.0.1",
-				"slash": "^3.0.0",
-				"source-map": "^0.6.1",
-				"write-file-atomic": "^3.0.0"
-			},
-			"dependencies": {
-				"slash": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-					"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-					"dev": true
-				}
-			}
-		},
-		"@jest/types": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz",
-			"integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==",
-			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^1.1.1",
-				"@types/yargs": "^15.0.0",
-				"chalk": "^4.0.0"
-			}
-		},
 		"@nodelib/fs.scandir": {
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
@@ -1321,24 +1040,6 @@
 				"fastq": "^1.6.0"
 			}
 		},
-		"@sinonjs/commons": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.0.tgz",
-			"integrity": "sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==",
-			"dev": true,
-			"requires": {
-				"type-detect": "4.0.8"
-			}
-		},
-		"@sinonjs/fake-timers": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
-			"integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
-			"dev": true,
-			"requires": {
-				"@sinonjs/commons": "^1.7.0"
-			}
-		},
 		"@stoplight/json": {
 			"version": "3.6.0",
 			"resolved": "https://registry.npmjs.org/@stoplight/json/-/json-3.6.0.tgz",
@@ -1444,10 +1145,16 @@
 			"resolved": "https://registry.npmjs.org/@stoplight/yaml-ast-parser/-/yaml-ast-parser-0.0.44.tgz",
 			"integrity": "sha512-PdY8p2Ufgtorf4d2DbKMfknILMa8KwuyyMMR/2lgK1mLaU8F5PKWYc+h9hIzC+ar0bh7m9h2rINo32m7ADfVyA=="
 		},
+		"@types/anymatch": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",
+			"integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==",
+			"dev": true
+		},
 		"@types/babel__core": {
-			"version": "7.1.9",
-			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz",
-			"integrity": "sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw==",
+			"version": "7.1.13",
+			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.13.tgz",
+			"integrity": "sha512-CC6amBNND16pTk4K3ZqKIaba6VGKAQs3gMjEY17FVd56oI/ZWt9OhS6riYiWv9s8ENbYUi7p8lgqb0QHQvUKQQ==",
 			"dev": true,
 			"requires": {
 				"@babel/parser": "^7.1.0",
@@ -1458,18 +1165,24 @@
 			}
 		},
 		"@types/babel__generator": {
-			"version": "7.6.1",
-			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz",
-			"integrity": "sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==",
+			"version": "7.6.2",
+			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
+			"integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
 			"dev": true,
 			"requires": {
 				"@babel/types": "^7.0.0"
 			}
 		},
+		"@types/babel__preset-env": {
+			"version": "7.9.1",
+			"resolved": "https://registry.npmjs.org/@types/babel__preset-env/-/babel__preset-env-7.9.1.tgz",
+			"integrity": "sha512-kkCHo5fk24m3gcH7oVhRLdw6xGF2tog5rc8/CbXIyTSYSO0NhStjEYCaEmRjs5VB5Jy5Wbj+0QvuGdxuGdvAfQ==",
+			"dev": true
+		},
 		"@types/babel__template": {
-			"version": "7.0.2",
-			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
-			"integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
+			"integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
 			"dev": true,
 			"requires": {
 				"@babel/parser": "^7.1.0",
@@ -1490,49 +1203,64 @@
 			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
 			"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
 		},
-		"@types/graceful-fs": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
-			"integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
+		"@types/glob": {
+			"version": "7.1.3",
+			"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+			"integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
 			"dev": true,
 			"requires": {
+				"@types/minimatch": "*",
 				"@types/node": "*"
 			}
 		},
-		"@types/istanbul-lib-coverage": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-			"integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
-			"dev": true
-		},
-		"@types/istanbul-lib-report": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-coverage": "*"
-			}
-		},
-		"@types/istanbul-reports": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
-			"integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
-			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-coverage": "*",
-				"@types/istanbul-lib-report": "*"
-			}
-		},
 		"@types/json-schema": {
 			"version": "7.0.5",
 			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz",
 			"integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="
 		},
+		"@types/lodash": {
+			"version": "4.14.168",
+			"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz",
+			"integrity": "sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==",
+			"dev": true
+		},
+		"@types/lodash.flattendeep": {
+			"version": "4.4.6",
+			"resolved": "https://registry.npmjs.org/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.6.tgz",
+			"integrity": "sha512-uLm2MaRVlqJSGsMK0RZpP5T3KqReq+9WbYDHCUhBhp98v56hMG/Yht52bsoTSui9xz2mUvQ9NfG3LrNGDL92Ng==",
+			"dev": true,
+			"requires": {
+				"@types/lodash": "*"
+			}
+		},
+		"@types/minimatch": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+			"integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+			"dev": true
+		},
+		"@types/mkdirp": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.1.tgz",
+			"integrity": "sha512-HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
+		"@types/nedb": {
+			"version": "1.8.11",
+			"resolved": "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.11.tgz",
+			"integrity": "sha512-qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
 		"@types/node": {
-			"version": "14.0.14",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.14.tgz",
-			"integrity": "sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==",
+			"version": "14.14.35",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.35.tgz",
+			"integrity": "sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==",
 			"dev": true
 		},
 		"@types/normalize-package-data": {
@@ -1546,37 +1274,92 @@
 			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
 			"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
 		},
-		"@types/prettier": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.0.1.tgz",
-			"integrity": "sha512-boy4xPNEtiw6N3abRhBi/e7hNvy3Tt8E9ZRAQrwAGzoCGZS/1wjo9KY7JHhnfnEsG5wSjDbymCozUM9a3ea7OQ==",
+		"@types/rimraf": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.0.tgz",
+			"integrity": "sha512-7WhJ0MdpFgYQPXlF4Dx+DhgvlPCfz/x5mHaeDQAKhcenvQP1KCpLQ18JklAqeGMYSAT2PxLpzd0g2/HE7fj7hQ==",
+			"dev": true,
+			"requires": {
+				"@types/glob": "*",
+				"@types/node": "*"
+			}
+		},
+		"@types/source-list-map": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
+			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
 			"dev": true
 		},
-		"@types/stack-utils": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
-			"integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
+		"@types/tapable": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz",
+			"integrity": "sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==",
 			"dev": true
 		},
+		"@types/uglify-js": {
+			"version": "3.13.0",
+			"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.0.tgz",
+			"integrity": "sha512-EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q==",
+			"dev": true,
+			"requires": {
+				"source-map": "^0.6.1"
+			}
+		},
 		"@types/urijs": {
 			"version": "1.19.9",
 			"resolved": "https://registry.npmjs.org/@types/urijs/-/urijs-1.19.9.tgz",
 			"integrity": "sha512-/tiJyrc0GPcsReHzgC0SXwOmoPjLqYe01W7dLYB0yasQXMbcRee+ZIk+g8MIQhoBS8fPoBQO3Y93+aeBrI93Ug=="
 		},
-		"@types/yargs": {
-			"version": "15.0.5",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-			"integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
+		"@types/webpack": {
+			"version": "4.41.26",
+			"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.26.tgz",
+			"integrity": "sha512-7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA==",
 			"dev": true,
 			"requires": {
-				"@types/yargs-parser": "*"
+				"@types/anymatch": "*",
+				"@types/node": "*",
+				"@types/tapable": "*",
+				"@types/uglify-js": "*",
+				"@types/webpack-sources": "*",
+				"source-map": "^0.6.0"
 			}
 		},
-		"@types/yargs-parser": {
-			"version": "15.0.0",
-			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
-			"integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
-			"dev": true
+		"@types/webpack-node-externals": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@types/webpack-node-externals/-/webpack-node-externals-2.5.0.tgz",
+			"integrity": "sha512-KaWfhUQlpWknM/CMBKhV7i0vxX/N2xEy3WeaE500s4ZNxC4nLnKB+0F3gD3Fg+5octPq0nn8ZlfFR/P3dSkXpw==",
+			"dev": true,
+			"requires": {
+				"@types/webpack": "*"
+			}
+		},
+		"@types/webpack-sources": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.0.tgz",
+			"integrity": "sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"@types/source-list-map": "*",
+				"source-map": "^0.7.3"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+					"dev": true
+				}
+			}
+		},
+		"@types/yaml": {
+			"version": "1.9.7",
+			"resolved": "https://registry.npmjs.org/@types/yaml/-/yaml-1.9.7.tgz",
+			"integrity": "sha512-8WMXRDD1D+wCohjfslHDgICd2JtMATZU8CkhH8LVJqcJs6dyYj5TGptzP8wApbmEullGBSsCEzzap73DQ1HJaA==",
+			"dev": true,
+			"requires": {
+				"yaml": "*"
+			}
 		},
 		"@webassemblyjs/ast": {
 			"version": "1.9.0",
@@ -1765,12 +1548,6 @@
 			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
 			"dev": true
 		},
-		"abab": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
-			"integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==",
-			"dev": true
-		},
 		"abort-controller": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
@@ -1779,28 +1556,6 @@
 				"event-target-shim": "^5.0.0"
 			}
 		},
-		"acorn": {
-			"version": "7.3.1",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
-			"integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==",
-			"dev": true
-		},
-		"acorn-globals": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-			"integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-			"dev": true,
-			"requires": {
-				"acorn": "^7.1.1",
-				"acorn-walk": "^7.1.1"
-			}
-		},
-		"acorn-walk": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-			"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-			"dev": true
-		},
 		"agent-base": {
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
@@ -1841,26 +1596,9 @@
 			}
 		},
 		"ansi-colors": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-			"integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="
-		},
-		"ansi-escapes": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-			"integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-			"dev": true,
-			"requires": {
-				"type-fest": "^0.11.0"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "0.11.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-					"integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-					"dev": true
-				}
-			}
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="
 		},
 		"ansi-regex": {
 			"version": "5.0.0",
@@ -1880,6 +1618,7 @@
 			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
 			"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"micromatch": "^3.1.4",
 				"normalize-path": "^2.1.1"
@@ -1890,6 +1629,7 @@
 					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
 					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"arr-flatten": "^1.1.0",
 						"array-unique": "^0.3.2",
@@ -1908,6 +1648,7 @@
 							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
 							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 							"dev": true,
+							"optional": true,
 							"requires": {
 								"is-extendable": "^0.1.0"
 							}
@@ -1919,6 +1660,7 @@
 					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
 					"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"extend-shallow": "^2.0.1",
 						"is-number": "^3.0.0",
@@ -1931,6 +1673,7 @@
 							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
 							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 							"dev": true,
+							"optional": true,
 							"requires": {
 								"is-extendable": "^0.1.0"
 							}
@@ -1942,6 +1685,7 @@
 					"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
 					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"kind-of": "^3.0.2"
 					},
@@ -1951,6 +1695,7 @@
 							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
 							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 							"dev": true,
+							"optional": true,
 							"requires": {
 								"is-buffer": "^1.1.5"
 							}
@@ -1962,6 +1707,7 @@
 					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
 					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"arr-diff": "^4.0.0",
 						"array-unique": "^0.3.2",
@@ -1983,6 +1729,7 @@
 					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
 					"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"remove-trailing-separator": "^1.0.1"
 					}
@@ -1992,6 +1739,7 @@
 					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
 					"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"is-number": "^3.0.0",
 						"repeat-string": "^1.6.1"
@@ -2005,15 +1753,6 @@
 			"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
 			"dev": true
 		},
-		"argparse": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-			"dev": true,
-			"requires": {
-				"sprintf-js": "~1.0.2"
-			}
-		},
 		"arr-diff": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -2038,15 +1777,6 @@
 			"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
 			"dev": true
 		},
-		"asn1": {
-			"version": "0.2.4",
-			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-			"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-			"dev": true,
-			"requires": {
-				"safer-buffer": "~2.1.0"
-			}
-		},
 		"asn1.js": {
 			"version": "4.10.1",
 			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
@@ -2093,12 +1823,6 @@
 				}
 			}
 		},
-		"assert-plus": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-			"dev": true
-		},
 		"assign-symbols": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -2122,54 +1846,12 @@
 			"dev": true,
 			"optional": true
 		},
-		"asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-			"dev": true
-		},
 		"atob": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
 			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
 			"dev": true
 		},
-		"aws-sign2": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-			"dev": true
-		},
-		"aws4": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
-			"integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==",
-			"dev": true
-		},
-		"babel-jest": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.1.0.tgz",
-			"integrity": "sha512-Nkqgtfe7j6PxLO6TnCQQlkMm8wdTdnIF8xrdpooHCuD5hXRzVEPbPneTJKknH5Dsv3L8ip9unHDAp48YQ54Dkg==",
-			"dev": true,
-			"requires": {
-				"@jest/transform": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"@types/babel__core": "^7.1.7",
-				"babel-plugin-istanbul": "^6.0.0",
-				"babel-preset-jest": "^26.1.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.4",
-				"slash": "^3.0.0"
-			},
-			"dependencies": {
-				"slash": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-					"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-					"dev": true
-				}
-			}
-		},
 		"babel-plugin-dynamic-import-node": {
 			"version": "2.3.3",
 			"resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
@@ -2179,60 +1861,6 @@
 				"object.assign": "^4.1.0"
 			}
 		},
-		"babel-plugin-istanbul": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-			"integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-instrument": "^4.0.0",
-				"test-exclude": "^6.0.0"
-			}
-		},
-		"babel-plugin-jest-hoist": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.1.0.tgz",
-			"integrity": "sha512-qhqLVkkSlqmC83bdMhM8WW4Z9tB+JkjqAqlbbohS9sJLT5Ha2vfzuKqg5yenXrAjOPG2YC0WiXdH3a9PvB+YYw==",
-			"dev": true,
-			"requires": {
-				"@babel/template": "^7.3.3",
-				"@babel/types": "^7.3.3",
-				"@types/babel__core": "^7.0.0",
-				"@types/babel__traverse": "^7.0.6"
-			}
-		},
-		"babel-preset-current-node-syntax": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz",
-			"integrity": "sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ==",
-			"dev": true,
-			"requires": {
-				"@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-import-meta": "^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": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.1.0.tgz",
-			"integrity": "sha512-na9qCqFksknlEj5iSdw1ehMVR06LCCTkZLGKeEtxDDdhg8xpUF09m29Kvh1pRbZ07h7AQ5ttLYUwpXL4tO6w7w==",
-			"dev": true,
-			"requires": {
-				"babel-plugin-jest-hoist": "^26.1.0",
-				"babel-preset-current-node-syntax": "^0.1.2"
-			}
-		},
 		"balanced-match": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -2300,15 +1928,6 @@
 			"integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
 			"dev": true
 		},
-		"bcrypt-pbkdf": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-			"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-			"dev": true,
-			"requires": {
-				"tweetnacl": "^0.14.3"
-			}
-		},
 		"better-ajv-errors": {
 			"version": "0.6.7",
 			"resolved": "https://registry.npmjs.org/better-ajv-errors/-/better-ajv-errors-0.6.7.tgz",
@@ -2407,12 +2026,6 @@
 			"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
 			"dev": true
 		},
-		"browser-process-hrtime": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-			"dev": true
-		},
 		"browserify-aes": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
@@ -2534,15 +2147,6 @@
 				"node-releases": "^1.1.58"
 			}
 		},
-		"bser": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-			"dev": true,
-			"requires": {
-				"node-int64": "^0.4.0"
-			}
-		},
 		"buffer": {
 			"version": "4.9.2",
 			"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
@@ -2661,21 +2265,6 @@
 			"integrity": "sha512-QzPRKDCyp7RhjczTPZaqK3CjPA5Ht2UnXhZhCI4f7QiB5JK6KEuZBxIzyWnB3wO4hgAj4GMRxAhuiacfw0Psjg==",
 			"dev": true
 		},
-		"capture-exit": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
-			"integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
-			"dev": true,
-			"requires": {
-				"rsvp": "^4.8.4"
-			}
-		},
-		"caseless": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-			"dev": true
-		},
 		"chalk": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
@@ -2722,12 +2311,6 @@
 				}
 			}
 		},
-		"char-regex": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-			"dev": true
-		},
 		"chokidar": {
 			"version": "3.4.2",
 			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
@@ -2773,12 +2356,6 @@
 				"tslib": "^1.9.0"
 			}
 		},
-		"ci-info": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-			"integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-			"dev": true
-		},
 		"cipher-base": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -2843,12 +2420,6 @@
 			"resolved": "https://registry.npmjs.org/code-error-fragment/-/code-error-fragment-0.0.230.tgz",
 			"integrity": "sha512-cadkfKp6932H8UkhzE/gcUqhRMNf8jHzkAN7+5Myabswaghu4xABTgPHDCjW+dBAJxj/SpkTYokpzDqY4pCzQw=="
 		},
-		"collect-v8-coverage": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-			"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-			"dev": true
-		},
 		"collection-visit": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -2872,15 +2443,6 @@
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
 			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
 		},
-		"combined-stream": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-			"dev": true,
-			"requires": {
-				"delayed-stream": "~1.0.0"
-			}
-		},
 		"commander": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
@@ -3097,60 +2659,17 @@
 				"randomfill": "^1.0.3"
 			}
 		},
-		"cssom": {
-			"version": "0.4.4",
-			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-			"integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
-			"dev": true
-		},
-		"cssstyle": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-			"integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-			"dev": true,
-			"requires": {
-				"cssom": "~0.3.6"
-			},
-			"dependencies": {
-				"cssom": {
-					"version": "0.3.8",
-					"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-					"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-					"dev": true
-				}
-			}
-		},
 		"cyclist": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
 			"integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
 			"dev": true
 		},
-		"dashdash": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
-		},
 		"data-uri-to-buffer": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz",
 			"integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ=="
 		},
-		"data-urls": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-			"integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-			"dev": true,
-			"requires": {
-				"abab": "^2.0.3",
-				"whatwg-mimetype": "^2.3.0",
-				"whatwg-url": "^8.0.0"
-			}
-		},
 		"debug": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -3180,12 +2699,6 @@
 			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
 			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
 		},
-		"deepmerge": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-			"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-			"dev": true
-		},
 		"define-properties": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -3246,12 +2759,6 @@
 				"esprima": "3.x.x"
 			}
 		},
-		"delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-			"dev": true
-		},
 		"depd": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -3278,18 +2785,6 @@
 			"integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
 			"dev": true
 		},
-		"detect-newline": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-			"dev": true
-		},
-		"diff-sequences": {
-			"version": "26.0.0",
-			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.0.0.tgz",
-			"integrity": "sha512-JC/eHYEC3aSS0vZGjuoc4vHA0yAQTzhQQldXMeMF+JlxLGJlCO38Gma82NV9gk1jGFz8mDzUMeaKXvjRRdJ2dg==",
-			"dev": true
-		},
 		"diffie-hellman": {
 			"version": "5.0.3",
 			"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
@@ -3315,23 +2810,6 @@
 			"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
 			"dev": true
 		},
-		"domexception": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-			"integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
-			"dev": true,
-			"requires": {
-				"webidl-conversions": "^5.0.0"
-			},
-			"dependencies": {
-				"webidl-conversions": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-					"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-					"dev": true
-				}
-			}
-		},
 		"duplexify": {
 			"version": "3.7.1",
 			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -3344,16 +2822,6 @@
 				"stream-shift": "^1.0.0"
 			}
 		},
-		"ecc-jsbn": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-			"dev": true,
-			"requires": {
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.1.0"
-			}
-		},
 		"electron-to-chromium": {
 			"version": "1.3.483",
 			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.483.tgz",
@@ -3427,11 +2895,11 @@
 			}
 		},
 		"enquirer": {
-			"version": "2.3.5",
-			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.5.tgz",
-			"integrity": "sha512-BNT1C08P9XD0vNg3J475yIUG+mVdp9T6towYFHUv897X0KoHBjB1shyrNmhmtHWKP17iSWgo7Gqh7BBuzLZMSA==",
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
 			"requires": {
-				"ansi-colors": "^3.2.1"
+				"ansi-colors": "^4.1.1"
 			}
 		},
 		"eol": {
@@ -3554,35 +3022,23 @@
 				"safe-buffer": "^5.1.1"
 			}
 		},
-		"exec-sh": {
-			"version": "0.3.4",
-			"resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
-			"integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
-			"dev": true
-		},
 		"execa": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-4.0.2.tgz",
-			"integrity": "sha512-QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz",
+			"integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==",
 			"dev": true,
 			"requires": {
-				"cross-spawn": "^7.0.0",
-				"get-stream": "^5.0.0",
-				"human-signals": "^1.1.1",
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
 				"is-stream": "^2.0.0",
 				"merge-stream": "^2.0.0",
-				"npm-run-path": "^4.0.0",
-				"onetime": "^5.1.0",
-				"signal-exit": "^3.0.2",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
 				"strip-final-newline": "^2.0.0"
 			}
 		},
-		"exit": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-			"dev": true
-		},
 		"expand-brackets": {
 			"version": "2.1.4",
 			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -3642,47 +3098,6 @@
 				"homedir-polyfill": "^1.0.1"
 			}
 		},
-		"expect": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/expect/-/expect-26.1.0.tgz",
-			"integrity": "sha512-QbH4LZXDsno9AACrN9eM0zfnby9G+OsdNgZUohjg/P0mLy1O+/bzTAJGT6VSIjVCe8yKM6SzEl/ckEOFBT7Vnw==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"ansi-styles": "^4.0.0",
-				"jest-get-type": "^26.0.0",
-				"jest-matcher-utils": "^26.1.0",
-				"jest-message-util": "^26.1.0",
-				"jest-regex-util": "^26.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
 		"extend": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -3774,12 +3189,6 @@
 				}
 			}
 		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"dev": true
-		},
 		"fast-deep-equal": {
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -3820,15 +3229,6 @@
 				"reusify": "^1.0.4"
 			}
 		},
-		"fb-watchman": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-			"integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
-			"dev": true,
-			"requires": {
-				"bser": "2.1.1"
-			}
-		},
 		"figgy-pudding": {
 			"version": "3.5.2",
 			"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
@@ -4030,12 +3430,6 @@
 				}
 			}
 		},
-		"flow-bin": {
-			"version": "0.126.1",
-			"resolved": "https://registry.npmjs.org/flow-bin/-/flow-bin-0.126.1.tgz",
-			"integrity": "sha512-RI05x7rVzruRVJQN3M4vLEjZMwUHJKhGz9FmL8HN7WiSo66/131EyJS6Vo8PkKyM2pgT9GRWfGP/tXlqS54XUg==",
-			"dev": true
-		},
 		"flush-write-stream": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
@@ -4052,23 +3446,6 @@
 			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
 			"dev": true
 		},
-		"forever-agent": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-			"dev": true
-		},
-		"form-data": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-			"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-			"dev": true,
-			"requires": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.6",
-				"mime-types": "^2.1.12"
-			}
-		},
 		"fragment-cache": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -4162,20 +3539,11 @@
 			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
 			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
 		},
-		"get-package-type": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-			"dev": true
-		},
 		"get-stream": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-			"integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-			"dev": true,
-			"requires": {
-				"pump": "^3.0.0"
-			}
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz",
+			"integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==",
+			"dev": true
 		},
 		"get-uri": {
 			"version": "2.0.4",
@@ -4211,15 +3579,6 @@
 			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
 			"dev": true
 		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
-		},
 		"glob": {
 			"version": "7.1.6",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
@@ -4314,29 +3673,6 @@
 			"resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
 			"integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
 		},
-		"growly": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-			"integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
-			"dev": true,
-			"optional": true
-		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-			"dev": true
-		},
-		"har-validator": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-			"dev": true,
-			"requires": {
-				"ajv": "^6.5.5",
-				"har-schema": "^2.0.0"
-			}
-		},
 		"has-flag": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -4475,21 +3811,6 @@
 			"integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
 			"dev": true
 		},
-		"html-encoding-sniffer": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-			"integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
-			"dev": true,
-			"requires": {
-				"whatwg-encoding": "^1.0.5"
-			}
-		},
-		"html-escaper": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-			"dev": true
-		},
 		"http-errors": {
 			"version": "1.7.3",
 			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
@@ -4526,17 +3847,6 @@
 				}
 			}
 		},
-		"http-signature": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0",
-				"jsprim": "^1.2.2",
-				"sshpk": "^1.7.0"
-			}
-		},
 		"https-browserify": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -4563,9 +3873,9 @@
 			}
 		},
 		"human-signals": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-			"integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
 			"dev": true
 		},
 		"iconv-lite": {
@@ -4614,16 +3924,6 @@
 				}
 			}
 		},
-		"import-local": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-			"integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
-			"dev": true,
-			"requires": {
-				"pkg-dir": "^4.2.0",
-				"resolve-cwd": "^3.0.0"
-			}
-		},
 		"imurmurhash": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -4677,12 +3977,6 @@
 			"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
 			"integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
 		},
-		"ip-regex": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-			"integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-			"dev": true
-		},
 		"is-accessor-descriptor": {
 			"version": "0.1.6",
 			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
@@ -4724,15 +4018,6 @@
 			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
 			"dev": true
 		},
-		"is-ci": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-			"integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-			"dev": true,
-			"requires": {
-				"ci-info": "^2.0.0"
-			}
-		},
 		"is-data-descriptor": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -4772,13 +4057,6 @@
 				}
 			}
 		},
-		"is-docker": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz",
-			"integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==",
-			"dev": true,
-			"optional": true
-		},
 		"is-extendable": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -4795,12 +4073,6 @@
 			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
 			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
 		},
-		"is-generator-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-			"dev": true
-		},
 		"is-glob": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
@@ -4829,40 +4101,18 @@
 				"isobject": "^3.0.1"
 			}
 		},
-		"is-potential-custom-element-name": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
-			"integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
-			"dev": true
-		},
 		"is-stream": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
 			"integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
 			"dev": true
 		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-			"dev": true
-		},
 		"is-windows": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
 			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
 			"dev": true
 		},
-		"is-wsl": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"is-docker": "^2.0.0"
-			}
-		},
 		"isarray": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -4880,655 +4130,11 @@
 			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
 			"dev": true
 		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-			"dev": true
-		},
-		"istanbul-lib-coverage": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-			"integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-			"dev": true
-		},
-		"istanbul-lib-instrument": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-			"integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.7.5",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-coverage": "^3.0.0",
-				"semver": "^6.3.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
-			}
-		},
-		"istanbul-lib-report": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-			"integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-			"dev": true,
-			"requires": {
-				"istanbul-lib-coverage": "^3.0.0",
-				"make-dir": "^3.0.0",
-				"supports-color": "^7.1.0"
-			},
-			"dependencies": {
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"make-dir": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-					"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-					"dev": true,
-					"requires": {
-						"semver": "^6.0.0"
-					}
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-					"integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"istanbul-lib-source-maps": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-			"integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.1.1",
-				"istanbul-lib-coverage": "^3.0.0",
-				"source-map": "^0.6.1"
-			}
-		},
-		"istanbul-reports": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-			"integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
-			"dev": true,
-			"requires": {
-				"html-escaper": "^2.0.0",
-				"istanbul-lib-report": "^3.0.0"
-			}
-		},
-		"jest": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest/-/jest-26.1.0.tgz",
-			"integrity": "sha512-LIti8jppw5BcQvmNJe4w2g1N/3V68HUfAv9zDVm7v+VAtQulGhH0LnmmiVkbNE4M4I43Bj2fXPiBGKt26k9tHw==",
-			"dev": true,
-			"requires": {
-				"@jest/core": "^26.1.0",
-				"import-local": "^3.0.2",
-				"jest-cli": "^26.1.0"
-			},
-			"dependencies": {
-				"jest-cli": {
-					"version": "26.1.0",
-					"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.1.0.tgz",
-					"integrity": "sha512-Imumvjgi3rU7stq6SJ1JUEMaV5aAgJYXIs0jPqdUnF47N/Tk83EXfmtvNKQ+SnFVI6t6mDOvfM3aA9Sg6kQPSw==",
-					"dev": true,
-					"requires": {
-						"@jest/core": "^26.1.0",
-						"@jest/test-result": "^26.1.0",
-						"@jest/types": "^26.1.0",
-						"chalk": "^4.0.0",
-						"exit": "^0.1.2",
-						"graceful-fs": "^4.2.4",
-						"import-local": "^3.0.2",
-						"is-ci": "^2.0.0",
-						"jest-config": "^26.1.0",
-						"jest-util": "^26.1.0",
-						"jest-validate": "^26.1.0",
-						"prompts": "^2.0.1",
-						"yargs": "^15.3.1"
-					}
-				}
-			}
-		},
-		"jest-changed-files": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.1.0.tgz",
-			"integrity": "sha512-HS5MIJp3B8t0NRKGMCZkcDUZo36mVRvrDETl81aqljT1S9tqiHRSpyoOvWg9ZilzZG9TDisDNaN1IXm54fLRZw==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"execa": "^4.0.0",
-				"throat": "^5.0.0"
-			}
-		},
-		"jest-config": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.1.0.tgz",
-			"integrity": "sha512-ONTGeoMbAwGCdq4WuKkMcdMoyfs5CLzHEkzFOlVvcDXufZSaIWh/OXMLa2fwKXiOaFcqEw8qFr4VOKJQfn4CVw==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.1.0",
-				"@jest/test-sequencer": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"babel-jest": "^26.1.0",
-				"chalk": "^4.0.0",
-				"deepmerge": "^4.2.2",
-				"glob": "^7.1.1",
-				"graceful-fs": "^4.2.4",
-				"jest-environment-jsdom": "^26.1.0",
-				"jest-environment-node": "^26.1.0",
-				"jest-get-type": "^26.0.0",
-				"jest-jasmine2": "^26.1.0",
-				"jest-regex-util": "^26.0.0",
-				"jest-resolve": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"jest-validate": "^26.1.0",
-				"micromatch": "^4.0.2",
-				"pretty-format": "^26.1.0"
-			}
-		},
-		"jest-diff": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.1.0.tgz",
-			"integrity": "sha512-GZpIcom339y0OXznsEKjtkfKxNdg7bVbEofK8Q6MnevTIiR1jNhDWKhRX6X0SDXJlwn3dy59nZ1z55fLkAqPWg==",
-			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0",
-				"diff-sequences": "^26.0.0",
-				"jest-get-type": "^26.0.0",
-				"pretty-format": "^26.1.0"
-			}
-		},
-		"jest-docblock": {
-			"version": "26.0.0",
-			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
-			"integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
-			"dev": true,
-			"requires": {
-				"detect-newline": "^3.0.0"
-			}
-		},
-		"jest-each": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.1.0.tgz",
-			"integrity": "sha512-lYiSo4Igr81q6QRsVQq9LIkJW0hZcKxkIkHzNeTMPENYYDw/W/Raq28iJ0sLlNFYz2qxxeLnc5K2gQoFYlu2bA==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^26.0.0",
-				"jest-util": "^26.1.0",
-				"pretty-format": "^26.1.0"
-			}
-		},
-		"jest-environment-jsdom": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.1.0.tgz",
-			"integrity": "sha512-dWfiJ+spunVAwzXbdVqPH1LbuJW/kDL+FyqgA5YzquisHqTi0g9hquKif9xKm7c1bKBj6wbmJuDkeMCnxZEpUw==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^26.1.0",
-				"@jest/fake-timers": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"jest-mock": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"jsdom": "^16.2.2"
-			}
-		},
-		"jest-environment-node": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.1.0.tgz",
-			"integrity": "sha512-DNm5x1aQH0iRAe9UYAkZenuzuJ69VKzDCAYISFHQ5i9e+2Tbeu2ONGY7YStubCLH8a1wdKBgqScYw85+ySxqxg==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^26.1.0",
-				"@jest/fake-timers": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"jest-mock": "^26.1.0",
-				"jest-util": "^26.1.0"
-			}
-		},
-		"jest-get-type": {
-			"version": "26.0.0",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz",
-			"integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==",
-			"dev": true
-		},
-		"jest-haste-map": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.1.0.tgz",
-			"integrity": "sha512-WeBS54xCIz9twzkEdm6+vJBXgRBQfdbbXD0dk8lJh7gLihopABlJmIQFdWSDDtuDe4PRiObsjZSUjbJ1uhWEpA==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"@types/graceful-fs": "^4.1.2",
-				"anymatch": "^3.0.3",
-				"fb-watchman": "^2.0.0",
-				"fsevents": "^2.1.2",
-				"graceful-fs": "^4.2.4",
-				"jest-serializer": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"jest-worker": "^26.1.0",
-				"micromatch": "^4.0.2",
-				"sane": "^4.0.3",
-				"walker": "^1.0.7",
-				"which": "^2.0.2"
-			},
-			"dependencies": {
-				"anymatch": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-					"integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-					"dev": true,
-					"requires": {
-						"normalize-path": "^3.0.0",
-						"picomatch": "^2.0.4"
-					}
-				},
-				"fsevents": {
-					"version": "2.1.3",
-					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-					"integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-					"dev": true,
-					"optional": true
-				}
-			}
-		},
-		"jest-jasmine2": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.1.0.tgz",
-			"integrity": "sha512-1IPtoDKOAG+MeBrKvvuxxGPJb35MTTRSDglNdWWCndCB3TIVzbLThRBkwH9P081vXLgiJHZY8Bz3yzFS803xqQ==",
-			"dev": true,
-			"requires": {
-				"@babel/traverse": "^7.1.0",
-				"@jest/environment": "^26.1.0",
-				"@jest/source-map": "^26.1.0",
-				"@jest/test-result": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"chalk": "^4.0.0",
-				"co": "^4.6.0",
-				"expect": "^26.1.0",
-				"is-generator-fn": "^2.0.0",
-				"jest-each": "^26.1.0",
-				"jest-matcher-utils": "^26.1.0",
-				"jest-message-util": "^26.1.0",
-				"jest-runtime": "^26.1.0",
-				"jest-snapshot": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"pretty-format": "^26.1.0",
-				"throat": "^5.0.0"
-			}
-		},
-		"jest-leak-detector": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.1.0.tgz",
-			"integrity": "sha512-dsMnKF+4BVOZwvQDlgn3MG+Ns4JuLv8jNvXH56bgqrrboyCbI1rQg6EI5rs+8IYagVcfVP2yZFKfWNZy0rK0Hw==",
-			"dev": true,
-			"requires": {
-				"jest-get-type": "^26.0.0",
-				"pretty-format": "^26.1.0"
-			}
-		},
-		"jest-matcher-utils": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.1.0.tgz",
-			"integrity": "sha512-PW9JtItbYvES/xLn5mYxjMd+Rk+/kIt88EfH3N7w9KeOrHWaHrdYPnVHndGbsFGRJ2d5gKtwggCvkqbFDoouQA==",
-			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0",
-				"jest-diff": "^26.1.0",
-				"jest-get-type": "^26.0.0",
-				"pretty-format": "^26.1.0"
-			}
-		},
-		"jest-message-util": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.1.0.tgz",
-			"integrity": "sha512-dY0+UlldiAJwNDJ08SF0HdF32g9PkbF2NRK/+2iMPU40O6q+iSn1lgog/u0UH8ksWoPv0+gNq8cjhYO2MFtT0g==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@jest/types": "^26.1.0",
-				"@types/stack-utils": "^1.0.1",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.4",
-				"micromatch": "^4.0.2",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.2"
-			},
-			"dependencies": {
-				"slash": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-					"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-					"dev": true
-				}
-			}
-		},
-		"jest-mock": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.1.0.tgz",
-			"integrity": "sha512-1Rm8EIJ3ZFA8yCIie92UbxZWj9SuVmUGcyhLHyAhY6WI3NIct38nVcfOPWhJteqSn8V8e3xOMha9Ojfazfpovw==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0"
-			}
-		},
-		"jest-pnp-resolver": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-			"integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-			"dev": true
-		},
-		"jest-regex-util": {
-			"version": "26.0.0",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-			"integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
-			"dev": true
-		},
-		"jest-resolve": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.1.0.tgz",
-			"integrity": "sha512-KsY1JV9FeVgEmwIISbZZN83RNGJ1CC+XUCikf/ZWJBX/tO4a4NvA21YixokhdR9UnmPKKAC4LafVixJBrwlmfg==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.4",
-				"jest-pnp-resolver": "^1.2.1",
-				"jest-util": "^26.1.0",
-				"read-pkg-up": "^7.0.1",
-				"resolve": "^1.17.0",
-				"slash": "^3.0.0"
-			},
-			"dependencies": {
-				"slash": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-					"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-					"dev": true
-				}
-			}
-		},
-		"jest-resolve-dependencies": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.1.0.tgz",
-			"integrity": "sha512-fQVEPHHQ1JjHRDxzlLU/buuQ9om+hqW6Vo928aa4b4yvq4ZHBtRSDsLdKQLuCqn5CkTVpYZ7ARh2fbA8WkRE6g==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"jest-regex-util": "^26.0.0",
-				"jest-snapshot": "^26.1.0"
-			}
-		},
-		"jest-runner": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.1.0.tgz",
-			"integrity": "sha512-elvP7y0fVDREnfqit0zAxiXkDRSw6dgCkzPCf1XvIMnSDZ8yogmSKJf192dpOgnUVykmQXwYYJnCx641uLTgcw==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^26.1.0",
-				"@jest/environment": "^26.1.0",
-				"@jest/test-result": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"chalk": "^4.0.0",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.4",
-				"jest-config": "^26.1.0",
-				"jest-docblock": "^26.0.0",
-				"jest-haste-map": "^26.1.0",
-				"jest-jasmine2": "^26.1.0",
-				"jest-leak-detector": "^26.1.0",
-				"jest-message-util": "^26.1.0",
-				"jest-resolve": "^26.1.0",
-				"jest-runtime": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"jest-worker": "^26.1.0",
-				"source-map-support": "^0.5.6",
-				"throat": "^5.0.0"
-			}
-		},
-		"jest-runtime": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.1.0.tgz",
-			"integrity": "sha512-1qiYN+EZLmG1QV2wdEBRf+Ci8i3VSfIYLF02U18PiUDrMbhfpN/EAMMkJtT02jgJUoaEOpHAIXG6zS3QRMzRmA==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^26.1.0",
-				"@jest/environment": "^26.1.0",
-				"@jest/fake-timers": "^26.1.0",
-				"@jest/globals": "^26.1.0",
-				"@jest/source-map": "^26.1.0",
-				"@jest/test-result": "^26.1.0",
-				"@jest/transform": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"@types/yargs": "^15.0.0",
-				"chalk": "^4.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"exit": "^0.1.2",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.4",
-				"jest-config": "^26.1.0",
-				"jest-haste-map": "^26.1.0",
-				"jest-message-util": "^26.1.0",
-				"jest-mock": "^26.1.0",
-				"jest-regex-util": "^26.0.0",
-				"jest-resolve": "^26.1.0",
-				"jest-snapshot": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"jest-validate": "^26.1.0",
-				"slash": "^3.0.0",
-				"strip-bom": "^4.0.0",
-				"yargs": "^15.3.1"
-			},
-			"dependencies": {
-				"slash": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-					"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-					"dev": true
-				}
-			}
-		},
-		"jest-serializer": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.1.0.tgz",
-			"integrity": "sha512-eqZOQG/0+MHmr25b2Z86g7+Kzd5dG9dhCiUoyUNJPgiqi38DqbDEOlHcNijyfZoj74soGBohKBZuJFS18YTJ5w==",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.2.4"
-			}
-		},
-		"jest-snapshot": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.1.0.tgz",
-			"integrity": "sha512-YhSbU7eMTVQO/iRbNs8j0mKRxGp4plo7sJ3GzOQ0IYjvsBiwg0T1o0zGQAYepza7lYHuPTrG5J2yDd0CE2YxSw==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0",
-				"@jest/types": "^26.1.0",
-				"@types/prettier": "^2.0.0",
-				"chalk": "^4.0.0",
-				"expect": "^26.1.0",
-				"graceful-fs": "^4.2.4",
-				"jest-diff": "^26.1.0",
-				"jest-get-type": "^26.0.0",
-				"jest-haste-map": "^26.1.0",
-				"jest-matcher-utils": "^26.1.0",
-				"jest-message-util": "^26.1.0",
-				"jest-resolve": "^26.1.0",
-				"natural-compare": "^1.4.0",
-				"pretty-format": "^26.1.0",
-				"semver": "^7.3.2"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "7.3.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-					"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-					"dev": true
-				}
-			}
-		},
-		"jest-util": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.1.0.tgz",
-			"integrity": "sha512-rNMOwFQevljfNGvbzNQAxdmXQ+NawW/J72dmddsK0E8vgxXCMtwQ/EH0BiWEIxh0hhMcTsxwAxINt7Lh46Uzbg==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.4",
-				"is-ci": "^2.0.0",
-				"micromatch": "^4.0.2"
-			}
-		},
-		"jest-validate": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.1.0.tgz",
-			"integrity": "sha512-WPApOOnXsiwhZtmkDsxnpye+XLb/tUISP+H6cHjfUIXvlG+eKwP+isnivsxlHCPaO9Q5wvbhloIBkdF3qUn+Nw==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"camelcase": "^6.0.0",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^26.0.0",
-				"leven": "^3.1.0",
-				"pretty-format": "^26.1.0"
-			},
-			"dependencies": {
-				"camelcase": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
-					"integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
-					"dev": true
-				}
-			}
-		},
-		"jest-watcher": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.1.0.tgz",
-			"integrity": "sha512-ffEOhJl2EvAIki613oPsSG11usqnGUzIiK7MMX6hE4422aXOcVEG3ySCTDFLn1+LZNXGPE8tuJxhp8OBJ1pgzQ==",
-			"dev": true,
-			"requires": {
-				"@jest/test-result": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"jest-util": "^26.1.0",
-				"string-length": "^4.0.1"
-			}
-		},
-		"jest-worker": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.1.0.tgz",
-			"integrity": "sha512-Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ==",
-			"dev": true,
-			"requires": {
-				"merge-stream": "^2.0.0",
-				"supports-color": "^7.0.0"
-			},
-			"dependencies": {
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-					"integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
 		"js-tokens": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
 			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
 		},
-		"js-yaml": {
-			"version": "3.14.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-			"integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
-			"dev": true,
-			"requires": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
-			},
-			"dependencies": {
-				"esprima": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-					"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-					"dev": true
-				}
-			}
-		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"dev": true
-		},
-		"jsdom": {
-			"version": "16.2.2",
-			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.2.2.tgz",
-			"integrity": "sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg==",
-			"dev": true,
-			"requires": {
-				"abab": "^2.0.3",
-				"acorn": "^7.1.1",
-				"acorn-globals": "^6.0.0",
-				"cssom": "^0.4.4",
-				"cssstyle": "^2.2.0",
-				"data-urls": "^2.0.0",
-				"decimal.js": "^10.2.0",
-				"domexception": "^2.0.1",
-				"escodegen": "^1.14.1",
-				"html-encoding-sniffer": "^2.0.1",
-				"is-potential-custom-element-name": "^1.0.0",
-				"nwsapi": "^2.2.0",
-				"parse5": "5.1.1",
-				"request": "^2.88.2",
-				"request-promise-native": "^1.0.8",
-				"saxes": "^5.0.0",
-				"symbol-tree": "^3.2.4",
-				"tough-cookie": "^3.0.1",
-				"w3c-hr-time": "^1.0.2",
-				"w3c-xmlserializer": "^2.0.0",
-				"webidl-conversions": "^6.0.0",
-				"whatwg-encoding": "^1.0.5",
-				"whatwg-mimetype": "^2.3.0",
-				"whatwg-url": "^8.0.0",
-				"ws": "^7.2.3",
-				"xml-name-validator": "^3.0.0"
-			}
-		},
 		"jsesc": {
 			"version": "2.5.2",
 			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -5540,23 +4146,11 @@
 			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
 			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
 		},
-		"json-schema": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-			"dev": true
-		},
 		"json-schema-traverse": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
 			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
 		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-			"dev": true
-		},
 		"json-to-ast": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/json-to-ast/-/json-to-ast-2.1.0.tgz",
@@ -5590,30 +4184,12 @@
 			"resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
 			"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk="
 		},
-		"jsprim": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.2.3",
-				"verror": "1.10.0"
-			}
-		},
 		"kind-of": {
 			"version": "6.0.3",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
 			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
 			"dev": true
 		},
-		"kleur": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-			"dev": true
-		},
 		"leven": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -5704,12 +4280,6 @@
 			"resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
 			"integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI="
 		},
-		"lodash.sortby": {
-			"version": "4.7.0",
-			"resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-			"integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-			"dev": true
-		},
 		"loose-envify": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -5737,15 +4307,6 @@
 				"semver": "^5.6.0"
 			}
 		},
-		"makeerror": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-			"integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
-			"dev": true,
-			"requires": {
-				"tmpl": "1.0.x"
-			}
-		},
 		"map-cache": {
 			"version": "0.2.2",
 			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -5820,21 +4381,6 @@
 				}
 			}
 		},
-		"mime-db": {
-			"version": "1.44.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
-			"integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
-			"dev": true
-		},
-		"mime-types": {
-			"version": "2.1.27",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
-			"integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
-			"dev": true,
-			"requires": {
-				"mime-db": "1.44.0"
-			}
-		},
 		"mimic-fn": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -5981,12 +4527,6 @@
 				"to-regex": "^3.0.1"
 			}
 		},
-		"natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-			"dev": true
-		},
 		"nedb": {
 			"version": "1.8.0",
 			"resolved": "https://registry.npmjs.org/nedb/-/nedb-1.8.0.tgz",
@@ -6031,12 +4571,6 @@
 			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
 			"integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
 		},
-		"node-int64": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-			"integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-			"dev": true
-		},
 		"node-libs-browser": {
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
@@ -6091,33 +4625,55 @@
 				}
 			}
 		},
-		"node-modules-regexp": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-			"integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-			"dev": true
-		},
-		"node-notifier": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.1.tgz",
-			"integrity": "sha512-VkzhierE7DBmQEElhTGJIoiZa1oqRijOtgOlsXg32KrJRXsPy0NXFBqWGW/wTswnJlDCs5viRYaqWguqzsKcmg==",
+		"node-loader": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/node-loader/-/node-loader-1.0.2.tgz",
+			"integrity": "sha512-myxAxpyMR7knjA4Uzwf3gjxaMtxSWj2vpm9o6AYWWxQ1S3XMBNeG2vzYcp/5eW03cBGfgSxyP+wntP8qhBJNhQ==",
 			"dev": true,
-			"optional": true,
 			"requires": {
-				"growly": "^1.3.0",
-				"is-wsl": "^2.1.1",
-				"semver": "^7.2.1",
-				"shellwords": "^0.1.1",
-				"uuid": "^7.0.3",
-				"which": "^2.0.2"
+				"loader-utils": "^2.0.0",
+				"schema-utils": "^3.0.0"
 			},
 			"dependencies": {
-				"semver": {
-					"version": "7.3.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-					"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+				"@types/json-schema": {
+					"version": "7.0.7",
+					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
+					"integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
+					"dev": true
+				},
+				"ajv": {
+					"version": "6.12.6",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
 					"dev": true,
-					"optional": true
+					"requires": {
+						"fast-deep-equal": "^3.1.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
+				},
+				"loader-utils": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+					"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+					"dev": true,
+					"requires": {
+						"big.js": "^5.2.2",
+						"emojis-list": "^3.0.0",
+						"json5": "^2.1.2"
+					}
+				},
+				"schema-utils": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+					"integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+					"dev": true,
+					"requires": {
+						"@types/json-schema": "^7.0.6",
+						"ajv": "^6.12.5",
+						"ajv-keywords": "^3.5.2"
+					}
 				}
 			}
 		},
@@ -6143,7 +4699,8 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
 			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"npm-run-path": {
 			"version": "4.0.1",
@@ -6154,18 +4711,6 @@
 				"path-key": "^3.0.0"
 			}
 		},
-		"nwsapi": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-			"integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-			"dev": true
-		},
-		"oauth-sign": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-			"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-			"dev": true
-		},
 		"object-assign": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -6249,9 +4794,9 @@
 			}
 		},
 		"onetime": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-			"integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
 			"dev": true,
 			"requires": {
 				"mimic-fn": "^2.1.0"
@@ -6276,18 +4821,6 @@
 			"integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
 			"dev": true
 		},
-		"p-each-series": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
-			"integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==",
-			"dev": true
-		},
-		"p-finally": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-			"integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-			"dev": true
-		},
 		"p-limit": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -6392,12 +4925,6 @@
 			"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
 			"dev": true
 		},
-		"parse5": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-			"integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
-			"dev": true
-		},
 		"pascalcase": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -6458,12 +4985,6 @@
 				"sha.js": "^2.4.8"
 			}
 		},
-		"performance-now": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-			"dev": true
-		},
 		"picomatch": {
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
@@ -6475,24 +4996,6 @@
 			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
 			"dev": true
 		},
-		"pirates": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-			"integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-			"dev": true,
-			"requires": {
-				"node-modules-regexp": "^1.0.0"
-			}
-		},
-		"pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-			"dev": true,
-			"requires": {
-				"find-up": "^4.0.0"
-			}
-		},
 		"posix-character-classes": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -6504,45 +5007,6 @@
 			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
 			"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
 		},
-		"pretty-format": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.1.0.tgz",
-			"integrity": "sha512-GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"ansi-regex": "^5.0.0",
-				"ansi-styles": "^4.0.0",
-				"react-is": "^16.12.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
 		"private": {
 			"version": "0.1.8",
 			"resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
@@ -6566,16 +5030,6 @@
 			"integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
 			"dev": true
 		},
-		"prompts": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-			"integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
-			"dev": true,
-			"requires": {
-				"kleur": "^3.0.3",
-				"sisteransi": "^1.0.4"
-			}
-		},
 		"proxy-agent": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.1.1.tgz",
@@ -6602,12 +5056,6 @@
 			"integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
 			"dev": true
 		},
-		"psl": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-			"dev": true
-		},
 		"public-encrypt": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
@@ -6668,12 +5116,6 @@
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
 			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
 		},
-		"qs": {
-			"version": "6.5.2",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-			"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-			"dev": true
-		},
 		"querystring": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -6716,12 +5158,6 @@
 				"unpipe": "1.0.0"
 			}
 		},
-		"react-is": {
-			"version": "16.13.1",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-			"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-			"dev": true
-		},
 		"read-pkg": {
 			"version": "5.2.0",
 			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
@@ -6873,7 +5309,8 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
 			"integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"repeat-element": {
 			"version": "1.1.3",
@@ -6887,84 +5324,6 @@
 			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
 			"dev": true
 		},
-		"request": {
-			"version": "2.88.2",
-			"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-			"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-			"dev": true,
-			"requires": {
-				"aws-sign2": "~0.7.0",
-				"aws4": "^1.8.0",
-				"caseless": "~0.12.0",
-				"combined-stream": "~1.0.6",
-				"extend": "~3.0.2",
-				"forever-agent": "~0.6.1",
-				"form-data": "~2.3.2",
-				"har-validator": "~5.1.3",
-				"http-signature": "~1.2.0",
-				"is-typedarray": "~1.0.0",
-				"isstream": "~0.1.2",
-				"json-stringify-safe": "~5.0.1",
-				"mime-types": "~2.1.19",
-				"oauth-sign": "~0.9.0",
-				"performance-now": "^2.1.0",
-				"qs": "~6.5.2",
-				"safe-buffer": "^5.1.2",
-				"tough-cookie": "~2.5.0",
-				"tunnel-agent": "^0.6.0",
-				"uuid": "^3.3.2"
-			},
-			"dependencies": {
-				"tough-cookie": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-					"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-					"dev": true,
-					"requires": {
-						"psl": "^1.1.28",
-						"punycode": "^2.1.1"
-					}
-				},
-				"uuid": {
-					"version": "3.4.0",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-					"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-					"dev": true
-				}
-			}
-		},
-		"request-promise-core": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
-			"integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.17.15"
-			}
-		},
-		"request-promise-native": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
-			"integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
-			"dev": true,
-			"requires": {
-				"request-promise-core": "1.1.3",
-				"stealthy-require": "^1.1.1",
-				"tough-cookie": "^2.3.3"
-			},
-			"dependencies": {
-				"tough-cookie": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-					"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-					"dev": true,
-					"requires": {
-						"psl": "^1.1.28",
-						"punycode": "^2.1.1"
-					}
-				}
-			}
-		},
 		"require-directory": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -6984,15 +5343,6 @@
 				"path-parse": "^1.0.6"
 			}
 		},
-		"resolve-cwd": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-			"dev": true,
-			"requires": {
-				"resolve-from": "^5.0.0"
-			}
-		},
 		"resolve-dir": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
@@ -7016,12 +5366,6 @@
 				}
 			}
 		},
-		"resolve-from": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-			"dev": true
-		},
 		"resolve-url": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -7058,12 +5402,6 @@
 				"inherits": "^2.0.1"
 			}
 		},
-		"rsvp": {
-			"version": "4.8.5",
-			"resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
-			"integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
-			"dev": true
-		},
 		"run-parallel": {
 			"version": "1.1.9",
 			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
@@ -7102,219 +5440,6 @@
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
-		"sane": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
-			"integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
-			"dev": true,
-			"requires": {
-				"@cnakazawa/watch": "^1.0.3",
-				"anymatch": "^2.0.0",
-				"capture-exit": "^2.0.0",
-				"exec-sh": "^0.3.2",
-				"execa": "^1.0.0",
-				"fb-watchman": "^2.0.0",
-				"micromatch": "^3.1.4",
-				"minimist": "^1.1.1",
-				"walker": "~1.0.5"
-			},
-			"dependencies": {
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^4.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"
-					}
-				},
-				"fill-range": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-					"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-					"dev": true,
-					"requires": {
-						"extend-shallow": "^2.0.1",
-						"is-number": "^3.0.0",
-						"repeat-string": "^1.6.1",
-						"to-regex-range": "^2.1.0"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"is-number": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-							"dev": true,
-							"requires": {
-								"is-buffer": "^1.1.5"
-							}
-						}
-					}
-				},
-				"is-stream": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-					"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
-					}
-				},
-				"npm-run-path": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-					"integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-					"dev": true,
-					"requires": {
-						"path-key": "^2.0.0"
-					}
-				},
-				"path-key": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-					"integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-					"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^1.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-					"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-					"dev": true
-				},
-				"to-regex-range": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-					"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-					"dev": true,
-					"requires": {
-						"is-number": "^3.0.0",
-						"repeat-string": "^1.6.1"
-					}
-				},
-				"which": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
-			}
-		},
-		"saxes": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-			"integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-			"dev": true,
-			"requires": {
-				"xmlchars": "^2.2.0"
-			}
-		},
 		"schema-utils": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -7414,25 +5539,12 @@
 			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 			"dev": true
 		},
-		"shellwords": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-			"integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
-			"dev": true,
-			"optional": true
-		},
 		"signal-exit": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
 			"integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
 			"dev": true
 		},
-		"sisteransi": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-			"dev": true
-		},
 		"smart-buffer": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
@@ -7675,29 +5787,6 @@
 				"extend-shallow": "^3.0.0"
 			}
 		},
-		"sprintf-js": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-			"dev": true
-		},
-		"sshpk": {
-			"version": "1.16.1",
-			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-			"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-			"dev": true,
-			"requires": {
-				"asn1": "~0.2.3",
-				"assert-plus": "^1.0.0",
-				"bcrypt-pbkdf": "^1.0.0",
-				"dashdash": "^1.12.0",
-				"ecc-jsbn": "~0.1.1",
-				"getpass": "^0.1.1",
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.0.2",
-				"tweetnacl": "~0.14.0"
-			}
-		},
 		"ssri": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
@@ -7707,23 +5796,6 @@
 				"figgy-pudding": "^3.5.1"
 			}
 		},
-		"stack-utils": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-			"integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-			"dev": true,
-			"requires": {
-				"escape-string-regexp": "^2.0.0"
-			},
-			"dependencies": {
-				"escape-string-regexp": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-					"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-					"dev": true
-				}
-			}
-		},
 		"static-extend": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -7750,12 +5822,6 @@
 			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
 			"integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
 		},
-		"stealthy-require": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-			"integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-			"dev": true
-		},
 		"stream-browserify": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
@@ -7805,16 +5871,6 @@
 			"resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
 			"integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg=="
 		},
-		"string-length": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
-			"integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
-			"dev": true,
-			"requires": {
-				"char-regex": "^1.0.2",
-				"strip-ansi": "^6.0.0"
-			}
-		},
 		"string-width": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
@@ -7838,18 +5894,6 @@
 				"ansi-regex": "^5.0.0"
 			}
 		},
-		"strip-bom": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-			"dev": true
-		},
-		"strip-eof": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-			"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-			"dev": true
-		},
 		"strip-final-newline": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
@@ -7864,55 +5908,12 @@
 				"has-flag": "^3.0.0"
 			}
 		},
-		"supports-hyperlinks": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
-			"integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
-			"dev": true,
-			"requires": {
-				"has-flag": "^4.0.0",
-				"supports-color": "^7.0.0"
-			},
-			"dependencies": {
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-					"integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"symbol-tree": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-			"dev": true
-		},
 		"tapable": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
 			"integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
 			"dev": true
 		},
-		"terminal-link": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-			"integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-			"dev": true,
-			"requires": {
-				"ansi-escapes": "^4.2.1",
-				"supports-hyperlinks": "^2.0.0"
-			}
-		},
 		"terser": {
 			"version": "4.8.0",
 			"resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
@@ -7957,28 +5958,11 @@
 				}
 			}
 		},
-		"test-exclude": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-			"dev": true,
-			"requires": {
-				"@istanbuljs/schema": "^0.1.2",
-				"glob": "^7.1.4",
-				"minimatch": "^3.0.4"
-			}
-		},
 		"text-table": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
 			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
 		},
-		"throat": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
-			"integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
-			"dev": true
-		},
 		"through2": {
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
@@ -8003,12 +5987,6 @@
 				"setimmediate": "^1.0.4"
 			}
 		},
-		"tmpl": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-			"integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
-			"dev": true
-		},
 		"to-arraybuffer": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -8066,24 +6044,103 @@
 			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
 			"integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
 		},
-		"tough-cookie": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-			"integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+		"ts-loader": {
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.2.0.tgz",
+			"integrity": "sha512-ebXBFrNyMSmbWgjnb3WBloUBK+VSx1xckaXsMXxlZRDqce/OPdYBVN5efB0W3V0defq0Gcy4YuzvPGqRgjj85A==",
 			"dev": true,
 			"requires": {
-				"ip-regex": "^2.1.0",
-				"psl": "^1.1.28",
-				"punycode": "^2.1.1"
-			}
-		},
-		"tr46": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
-			"integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
-			"dev": true,
-			"requires": {
-				"punycode": "^2.1.1"
+				"chalk": "^4.1.0",
+				"enhanced-resolve": "^4.0.0",
+				"loader-utils": "^2.0.0",
+				"micromatch": "^4.0.0",
+				"semver": "^7.3.4"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^2.0.1"
+					}
+				},
+				"chalk": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+					"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^4.1.0",
+						"supports-color": "^7.1.0"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"dev": true,
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"color-name": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"loader-utils": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+					"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+					"dev": true,
+					"requires": {
+						"big.js": "^5.2.2",
+						"emojis-list": "^3.0.0",
+						"json5": "^2.1.2"
+					}
+				},
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				},
+				"supports-color": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
+				}
 			}
 		},
 		"tslib": {
@@ -8097,21 +6154,6 @@
 			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
 			"dev": true
 		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"dev": true,
-			"requires": {
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"dev": true
-		},
 		"type-check": {
 			"version": "0.3.2",
 			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -8120,12 +6162,6 @@
 				"prelude-ls": "~1.1.2"
 			}
 		},
-		"type-detect": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-			"dev": true
-		},
 		"type-fest": {
 			"version": "0.8.1",
 			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
@@ -8138,15 +6174,6 @@
 			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
 			"dev": true
 		},
-		"typedarray-to-buffer": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-			"dev": true,
-			"requires": {
-				"is-typedarray": "^1.0.0"
-			}
-		},
 		"underscore": {
 			"version": "1.4.4",
 			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
@@ -8338,38 +6365,12 @@
 			"resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz",
 			"integrity": "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg=="
 		},
-		"uuid": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-			"integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
-			"dev": true,
-			"optional": true
-		},
 		"v8-compile-cache": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
 			"integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
 			"dev": true
 		},
-		"v8-to-istanbul": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz",
-			"integrity": "sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ==",
-			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-coverage": "^2.0.1",
-				"convert-source-map": "^1.6.0",
-				"source-map": "^0.7.3"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				}
-			}
-		},
 		"validate-npm-package-license": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
@@ -8380,50 +6381,12 @@
 				"spdx-expression-parse": "^3.0.0"
 			}
 		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0",
-				"core-util-is": "1.0.2",
-				"extsprintf": "^1.2.0"
-			}
-		},
 		"vm-browserify": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
 			"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
 			"dev": true
 		},
-		"w3c-hr-time": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-			"integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-			"dev": true,
-			"requires": {
-				"browser-process-hrtime": "^1.0.0"
-			}
-		},
-		"w3c-xmlserializer": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-			"integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-			"dev": true,
-			"requires": {
-				"xml-name-validator": "^3.0.0"
-			}
-		},
-		"walker": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-			"integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
-			"dev": true,
-			"requires": {
-				"makeerror": "1.0.x"
-			}
-		},
 		"watchpack": {
 			"version": "1.7.4",
 			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
@@ -8657,12 +6620,6 @@
 				}
 			}
 		},
-		"webidl-conversions": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-			"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-			"dev": true
-		},
 		"webpack": {
 			"version": "4.44.1",
 			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz",
@@ -9114,40 +7071,6 @@
 				"source-map": "~0.6.1"
 			}
 		},
-		"whatwg-encoding": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-			"integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-			"dev": true,
-			"requires": {
-				"iconv-lite": "0.4.24"
-			}
-		},
-		"whatwg-mimetype": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-			"integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-			"dev": true
-		},
-		"whatwg-url": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.1.0.tgz",
-			"integrity": "sha512-vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw==",
-			"dev": true,
-			"requires": {
-				"lodash.sortby": "^4.7.0",
-				"tr46": "^2.0.2",
-				"webidl-conversions": "^5.0.0"
-			},
-			"dependencies": {
-				"webidl-conversions": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-					"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-					"dev": true
-				}
-			}
-		},
 		"which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -9227,36 +7150,6 @@
 			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
 			"dev": true
 		},
-		"write-file-atomic": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-			"dev": true,
-			"requires": {
-				"imurmurhash": "^0.1.4",
-				"is-typedarray": "^1.0.0",
-				"signal-exit": "^3.0.2",
-				"typedarray-to-buffer": "^3.1.5"
-			}
-		},
-		"ws": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz",
-			"integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==",
-			"dev": true
-		},
-		"xml-name-validator": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-			"dev": true
-		},
-		"xmlchars": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-			"dev": true
-		},
 		"xregexp": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
diff --git a/packages/insomnia-inso/package.json b/packages/insomnia-inso/package.json
index 3cd5ec2544..88c8a524b3 100644
--- a/packages/insomnia-inso/package.json
+++ b/packages/insomnia-inso/package.json
@@ -9,64 +9,56 @@
   "bugs": {
     "url": "https://github.com/kong/insomnia"
   },
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "bin": {
     "inso": "bin/inso"
   },
   "scripts": {
-    "typecheck": "",
-    "test": "jest",
+    "bootstrap": "npm run build",
+    "lint": "eslint . --ext .js,.ts,.tsx",
+    "lint:fix": "npm run lint -- --fix",
+    "clean": "tsc --build tsconfig.build.json --clean",
+    "postclean": "rimraf dist",
+    "test": "jest --runInBand",
     "test:watch": "jest --watch",
     "test:snapshots": "npm run build && jest -u",
-    "build": "webpack --config webpack/webpack.config.development.js --display errors-only",
+    "prebuild": "npm run clean",
+    "build": "webpack --config webpack/webpack.config.development.js",
     "build:production": "webpack --config webpack/webpack.config.production.js --display errors-only",
     "start": "npm run build -- --watch",
-    "bootstrap": "npm run build",
-    "prepare": "npm run build:production"
-  },
-  "jest": {
-    "setupFiles": [
-      "./__jest__/setup.js"
-    ],
-    "testMatch": [
-      "**/__tests__/**/*.test.js"
-    ],
-    "verbose": false,
-    "resetMocks": true,
-    "resetModules": true,
-    "collectCoverage": true,
-    "coveragePathIgnorePatterns": [
-      "/node_modules/"
-    ],
-    "coverageThreshold": {
-      "global": {
-        "branches": 90,
-        "functions": 100,
-        "lines": 95,
-        "statements": 95
-      }
-    }
+    "prepare-temp-disabled": "npm run build:production"
   },
   "devDependencies": {
     "@babel/core": "^7.9.0",
     "@babel/plugin-proposal-optional-chaining": "^7.9.0",
     "@babel/preset-env": "^7.10.2",
     "@babel/preset-flow": "^7.10.1",
-    "execa": "^4.0.2",
-    "flow-bin": "^0.126.1",
+    "@types/babel__core": "^7.1.12",
+    "@types/babel__preset-env": "^7.9.1",
+    "@types/lodash.flattendeep": "^4.4.6",
+    "@types/mkdirp": "^1.0.1",
+    "@types/nedb": "^1.8.11",
+    "@types/node": "^14.14.32",
+    "@types/rimraf": "^3.0.0",
+    "@types/webpack-node-externals": "^2.5.0",
+    "@types/yaml": "^1.9.7",
+    "execa": "^5.0.0",
     "get-bin-path": "^5.1.0",
-    "jest": "^26.0.1",
+    "node-loader": "1.0.2",
     "rimraf": "^3.0.2",
-    "webpack": "^4.44.1",
+    "ts-loader": "^8.2.0",
+    "webpack": "4.44.1",
     "webpack-cli": "^3.3.12",
     "webpack-merge": "^5.0.7",
     "webpack-node-externals": "^1.7.2"
   },
   "dependencies": {
-    "@stoplight/spectral": "^5.4.0",
+    "@stoplight/spectral": "5.4.0",
     "commander": "^5.1.0",
     "consola": "^2.15.0",
     "cosmiconfig": "^6.0.0",
-    "enquirer": "^2.3.5",
+    "enquirer": "^2.3.6",
     "insomnia-plugin-base64": "2.2.35",
     "insomnia-plugin-cookie-jar": "2.2.35",
     "insomnia-plugin-core-themes": "2.2.35",
diff --git a/packages/insomnia-inso/src/__mocks__/cosmiconfig.ts b/packages/insomnia-inso/src/__mocks__/cosmiconfig.ts
new file mode 100644
index 0000000000..e73d850acd
--- /dev/null
+++ b/packages/insomnia-inso/src/__mocks__/cosmiconfig.ts
@@ -0,0 +1,4 @@
+export const cosmiconfigSync = () => ({
+  load: jest.fn(),
+  search: jest.fn(),
+});
diff --git a/packages/insomnia-inso/src/__mocks__/util.js b/packages/insomnia-inso/src/__mocks__/util.ts
similarity index 99%
rename from packages/insomnia-inso/src/__mocks__/util.js
rename to packages/insomnia-inso/src/__mocks__/util.ts
index e33bd8239b..41b314bc08 100644
--- a/packages/insomnia-inso/src/__mocks__/util.js
+++ b/packages/insomnia-inso/src/__mocks__/util.ts
@@ -1,6 +1,5 @@
 // eslint-disable-next-line filenames/match-exported
 const mod = jest.requireActual('../util');
-
 mod.exit = jest.fn();
 
 module.exports = mod;
diff --git a/packages/insomnia-inso/src/__tests__/__snapshots__/inso-snapshot.test.js.snap b/packages/insomnia-inso/src/__snapshots__/inso-snapshot.test.ts.snap
similarity index 98%
rename from packages/insomnia-inso/src/__tests__/__snapshots__/inso-snapshot.test.js.snap
rename to packages/insomnia-inso/src/__snapshots__/inso-snapshot.test.ts.snap
index 8121260067..4590979639 100644
--- a/packages/insomnia-inso/src/__tests__/__snapshots__/inso-snapshot.test.js.snap
+++ b/packages/insomnia-inso/src/__snapshots__/inso-snapshot.test.ts.snap
@@ -163,8 +163,8 @@ Run Insomnia unit test suites
 Options:
   -e, --env <identifier>         environment to use
   -t, --testNamePattern <regex>  run tests that match the regex
-  -r, --reporter <reporter>      reporter to use, options are [dot, list, spec,
-                                 min, progress] (default: spec)
+  -r, --reporter <reporter>      reporter to use, options are [dot, list, min,
+                                 progress, spec] (default: spec)
   -b, --bail                     abort (\\"bail\\") after first test failure
   --keepFile                     do not delete the generated test file
   -h, --help                     display help for command"
diff --git a/packages/insomnia-inso/src/__tests__/cli.test.js b/packages/insomnia-inso/src/cli.test.ts
similarity index 84%
rename from packages/insomnia-inso/src/__tests__/cli.test.js
rename to packages/insomnia-inso/src/cli.test.ts
index ce8e3183ff..83f5a60ffc 100644
--- a/packages/insomnia-inso/src/__tests__/cli.test.js
+++ b/packages/insomnia-inso/src/cli.test.ts
@@ -1,26 +1,24 @@
-// @flow
-import * as cli from '../cli';
-import { generateConfig } from '../commands/generate-config';
-import { lintSpecification } from '../commands/lint-specification';
-import { runInsomniaTests } from '../commands/run-tests';
-import { exportSpecification } from '../commands/export-specification';
+import * as cli from './cli';
+import { generateConfig } from './commands/generate-config';
+import { lintSpecification } from './commands/lint-specification';
+import { runInsomniaTests } from './commands/run-tests';
+import { exportSpecification } from './commands/export-specification';
 import { parseArgsStringToArgv } from 'string-argv';
-import * as packageJson from '../../package.json';
-import { globalBeforeAll, globalBeforeEach } from '../../__jest__/before';
-import logger from '../logger';
-import { exit } from '../util';
+import * as packageJson from '../package.json';
+import { globalBeforeAll, globalBeforeEach } from './jest/before';
+import { logger } from './logger';
+import { exit } from './util';
 
-jest.mock('../commands/generate-config');
-jest.mock('../commands/lint-specification');
-jest.mock('../commands/run-tests');
-jest.mock('../commands/export-specification');
+jest.mock('./commands/generate-config');
+jest.mock('./commands/lint-specification');
+jest.mock('./commands/run-tests');
+jest.mock('./commands/export-specification');
 jest.unmock('cosmiconfig');
-jest.mock('../util');
+jest.mock('./util');
 
 const initInso = () => {
-  return (...args: Array<string>): void => {
+  return (...args: string[]): void => {
     const cliArgs = parseArgsStringToArgv(`node test ${args.join(' ')}`);
-
     return cli.go(cliArgs, true);
   };
 };
@@ -31,14 +29,15 @@ describe('cli', () => {
   });
 
   let inso = initInso();
+
   beforeEach(() => {
     globalBeforeEach();
     inso = initInso();
     jest.spyOn(console, 'error').mockImplementation(() => {});
-    (generateConfig: any).mockResolvedValue(true);
-    (lintSpecification: any).mockResolvedValue(true);
-    (runInsomniaTests: any).mockResolvedValue(true);
-    (exportSpecification: any).mockResolvedValue(true);
+    generateConfig.mockResolvedValue(true);
+    lintSpecification.mockResolvedValue(true);
+    runInsomniaTests.mockResolvedValue(true);
+    exportSpecification.mockResolvedValue(true);
   });
 
   afterEach(() => {
@@ -53,27 +52,25 @@ describe('cli', () => {
     it('should throw error if working dir argument is missing', () => {
       expect(() => inso('-w')).toThrowError();
     });
-
     it.each(['-v', '--version'])('inso %s should print version from package.json', args => {
       logger.wrapAll();
       expect(() => inso(args)).toThrowError(packageJson.version);
       logger.restoreAll();
     });
-
     it.each(['-v', '--version'])('inso %s should print "dev" if running in development', args => {
       const oldNodeEnv = process.env.NODE_ENV;
-
       process.env.NODE_ENV = 'development';
       logger.wrapAll();
       expect(() => inso(args)).toThrowError('dev');
       logger.restoreAll();
-
       process.env.NODE_ENV = oldNodeEnv;
     });
 
     it('should print options', () => {
       inso('generate config file.yaml -t declarative --printOptions --verbose');
+
       const logs = logger.__getLogs();
+
       expect(logs.log[0]).toContainEqual({
         type: 'declarative',
         printOptions: true,
@@ -152,7 +149,9 @@ describe('cli', () => {
   describe('run test', () => {
     it('should call runInsomniaTests with no arg and default reporter', () => {
       inso('run test');
-      expect(runInsomniaTests).toHaveBeenCalledWith(undefined, { reporter: 'spec' });
+      expect(runInsomniaTests).toHaveBeenCalledWith(undefined, {
+        reporter: 'spec',
+      });
     });
 
     it('should throw error if env argument is missing', () => {
@@ -199,7 +198,9 @@ describe('cli', () => {
 
     it('should call exportSpec with all expected arguments', () => {
       inso('export spec spc_123 -o output.yaml');
-      expect(exportSpecification).toHaveBeenCalledWith('spc_123', { output: 'output.yaml' });
+      expect(exportSpecification).toHaveBeenCalledWith('spc_123', {
+        output: 'output.yaml',
+      });
     });
 
     it('should call generateConfig with global options', () => {
@@ -214,26 +215,30 @@ describe('cli', () => {
   });
 
   describe('script', () => {
-    const insorcFilePath = '--config src/__fixtures__/.insorc-with-scripts.yaml';
+    const insorcFilePath = '--config src/fixtures/.insorc-with-scripts.yaml';
 
     const expectExitWith = async (result: boolean): Promise<void> =>
-      expect((exit: Object).mock.calls[0][0]).resolves.toBe(result);
+      expect(
+        (exit as jest.Mock).mock.calls[0][0],
+      ).resolves.toBe(result);
 
     it('should call script command by default', () => {
       inso('gen-conf', insorcFilePath);
-
       expect(generateConfig).toHaveBeenCalledWith(
         'Designer Demo',
-        expect.objectContaining({ type: 'declarative' }),
+        expect.objectContaining({
+          type: 'declarative',
+        }),
       );
     });
 
     it('should call script command', () => {
       inso('script gen-conf', insorcFilePath);
-
       expect(generateConfig).toHaveBeenCalledWith(
         'Designer Demo',
-        expect.objectContaining({ type: 'declarative' }),
+        expect.objectContaining({
+          type: 'declarative',
+        }),
       );
     });
 
@@ -241,6 +246,7 @@ describe('cli', () => {
       inso('invalid-script', insorcFilePath);
 
       const logs = logger.__getLogs();
+
       expect(logs.fatal).toContain('Tasks in a script should start with `inso`.');
       expect(generateConfig).not.toHaveBeenCalledWith();
       await expectExitWith(false);
@@ -248,13 +254,15 @@ describe('cli', () => {
 
     it('should call nested command', async () => {
       inso('gen-conf:k8s', insorcFilePath);
-
       expect(generateConfig).toHaveBeenCalledWith(
         'Designer Demo',
-        expect.objectContaining({ type: 'kubernetes' }),
+        expect.objectContaining({
+          type: 'kubernetes',
+        }),
       );
 
       const logs = logger.__getLogs();
+
       expect(logs.debug).toEqual([
         '>> inso gen-conf --type kubernetes',
         '>> inso generate config Designer Demo --type declarative --type kubernetes',
@@ -264,17 +272,17 @@ describe('cli', () => {
 
     it('should call nested command and pass through props', async () => {
       inso('gen-conf:k8s --type declarative', insorcFilePath);
-
       expect(generateConfig).toHaveBeenCalledWith(
         'Designer Demo',
-        expect.objectContaining({ type: 'declarative' }),
+        expect.objectContaining({
+          type: 'declarative',
+        }),
       );
       await expectExitWith(true);
     });
 
     it('should override env setting from command', async () => {
       inso('test:200s --env NewEnv', insorcFilePath);
-
       expect(runInsomniaTests).toHaveBeenCalledWith(
         'Designer Demo',
         expect.objectContaining({
@@ -286,7 +294,9 @@ describe('cli', () => {
 
     it('should fail if script not found', async () => {
       inso('not-found-script', insorcFilePath);
+
       const logs = logger.__getLogs();
+
       expect(logs.fatal).toContain(
         'Could not find inso script "not-found-script" in the config file.',
       );
diff --git a/packages/insomnia-inso/src/cli.js b/packages/insomnia-inso/src/cli.ts
old mode 100755
new mode 100644
similarity index 54%
rename from packages/insomnia-inso/src/cli.js
rename to packages/insomnia-inso/src/cli.ts
index aec5875dea..5f571a8e10
--- a/packages/insomnia-inso/src/cli.js
+++ b/packages/insomnia-inso/src/cli.ts
@@ -1,59 +1,54 @@
-// @flow
-import { ConversionTypeMap, generateConfig } from './commands/generate-config';
+import { conversionTypeMap, generateConfig } from './commands/generate-config';
 import { getVersion, logErrorExit1, exit } from './util';
-import { runInsomniaTests, TestReporterEnum } from './commands/run-tests';
+import { reporterTypes, runInsomniaTests, TestReporter } from './commands/run-tests';
 import { lintSpecification } from './commands/lint-specification';
 import { exportSpecification } from './commands/export-specification';
 import { parseArgsStringToArgv } from 'string-argv';
 import commander from 'commander';
-import getOptions from './get-options';
-import logger, { configureLogger } from './logger';
+import { logger, configureLogger } from './logger';
 import type { GenerateConfigOptions } from './commands/generate-config';
 import type { RunTestsOptions } from './commands/run-tests';
 import type { LintSpecificationOptions } from './commands/lint-specification';
 import type { ExportSpecificationOptions } from './commands/export-specification';
-import type { GlobalOptions } from './get-options';
+import { getOptions } from './get-options';
+import { UNKNOWN_OBJ } from './types';
 
-type CreateCommandType = (command?: string, options?: Object) => Object;
-
-function prepareCommand(options: $Shape<GlobalOptions>): void {
+const prepareCommand = (options: Partial<GenerateConfigOptions>) => {
   configureLogger(options.verbose, options.ci);
-  options.printOptions && logger.log(`Loaded options`, options, '\n');
-}
+  options.printOptions && logger.log('Loaded options', options, '\n');
+  return options;
+};
 
-function makeGenerateCommand(createCommand: CreateCommandType) {
+type CreateCommand = (command: string) => commander.Command
+
+const makeGenerateCommand = (commandCreator: CreateCommand) => {
   // inso generate
-  const generate = createCommand('generate').description('Code generation utilities');
+  const command = commandCreator('generate').description('Code generation utilities');
+  const defaultType = 'declarative'; // inso generate config -t kubernetes config.yaml
 
-  const conversionTypes = Object.keys(ConversionTypeMap).join(', ');
-
-  const defaultType = 'declarative';
-  // inso generate config -t kubernetes config.yaml
-  generate
+  command
     .command('config [identifier]')
     .description('Generate configuration from an api spec.')
     .option(
       '-t, --type <value>',
-      `type of configuration to generate, options are [${conversionTypes}] (default: ${defaultType})`,
+      `type of configuration to generate, options are [${Object.keys(conversionTypeMap).join(', ')}] (default: ${defaultType})`,
     )
     .option('-o, --output <path>', 'save the generated config to a file')
     .action((identifier, cmd) => {
-      const options = getOptions<GenerateConfigOptions>(cmd, { type: defaultType });
-      prepareCommand(options);
+      let options = getOptions<GenerateConfigOptions>(cmd, {
+        type: defaultType,
+      });
+      options = prepareCommand(options);
       return exit(generateConfig(identifier, options));
     });
+  return command;
+};
 
-  return generate;
-}
-
-function makeTestCommand(createCommand: CreateCommandType) {
+const makeTestCommand = (commandCreator: CreateCommand) => {
   // inso run
-  const run = createCommand('run').description('Execution utilities');
+  const run = commandCreator('run').description('Execution utilities');
+  const defaultReporter: TestReporter = 'spec'; // inso run tests
 
-  const reporterTypes = Object.keys(TestReporterEnum).join(', ');
-
-  const defaultReporter = TestReporterEnum.spec;
-  // inso run tests
   run
     .command('test [identifier]')
     .description('Run Insomnia unit test suites')
@@ -61,64 +56,64 @@ function makeTestCommand(createCommand: CreateCommandType) {
     .option('-t, --testNamePattern <regex>', 'run tests that match the regex')
     .option(
       '-r, --reporter <reporter>',
-      `reporter to use, options are [${reporterTypes}] (default: ${defaultReporter})`,
+      `reporter to use, options are [${reporterTypes.join(', ')}] (default: ${defaultReporter})`,
     )
     .option('-b, --bail', 'abort ("bail") after first test failure')
     .option('--keepFile', 'do not delete the generated test file')
     .action((identifier, cmd) => {
-      const options = getOptions<RunTestsOptions>(cmd, { reporter: defaultReporter });
-      prepareCommand(options);
+      let options = getOptions<RunTestsOptions>(cmd, {
+        reporter: defaultReporter,
+      });
+      options = prepareCommand(options);
       return exit(runInsomniaTests(identifier, options));
     });
-
   return run;
-}
+};
 
-function makeLintCommand(createCommand: CreateCommandType) {
+const makeLintCommand = (commandCreator: CreateCommand) => {
   // inso lint
-  const lint = createCommand('lint').description('Linting utilities');
+  const lint = commandCreator('lint').description('Linting utilities'); // inso lint spec
 
-  // inso lint spec
   lint
     .command('spec [identifier]')
     .description('Lint an API Specification')
     .action((identifier, cmd) => {
-      const options = getOptions<LintSpecificationOptions>(cmd);
-      prepareCommand(options);
+      let options = getOptions<LintSpecificationOptions>(cmd);
+      options = prepareCommand(options);
       return exit(lintSpecification(identifier, options));
     });
-
   return lint;
-}
+};
 
-function makeExportCommand(createCommand: CreateCommandType) {
+const makeExportCommand = (commandCreator: CreateCommand) => {
   // inso export
-  const exportCmd = createCommand('export').description('Export data from insomnia models');
+  const exportCmd = commandCreator('export').description('Export data from insomnia models'); // inso export spec
 
-  // inso export spec
   exportCmd
     .command('spec [identifier]')
     .description('Export an API Specification to a file')
     .option('-o, --output <path>', 'save the generated config to a file')
     .action((identifier, cmd) => {
-      const options = getOptions<ExportSpecificationOptions>(cmd);
-      prepareCommand(options);
+      let options = getOptions<ExportSpecificationOptions>(cmd);
+      options = prepareCommand(options);
       return exit(exportSpecification(identifier, options));
     });
-
   return exportCmd;
-}
+};
 
-function addScriptCommand(originalCommand: Object) {
+const addScriptCommand = (originalCommand: commander.Command) => {
   // inso script
   originalCommand
-    .command('script <name>', { isDefault: true })
+    .command('script <name>', {
+      isDefault: true,
+    })
     .description('Run scripts defined in .insorc')
     .allowUnknownOption()
+    // @ts-expect-error this appears to actually be valid, and I don't want to risk changing any behavior
     .action((scriptName, cmd) => {
       // Load scripts
-      const options = getOptions(cmd);
-      prepareCommand(options);
+      let options = getOptions(cmd);
+      options = prepareCommand(options);
 
       // Ignore the first arg because that will be scriptName, get the rest
       const passThroughArgs = cmd.args.slice(1);
@@ -128,29 +123,28 @@ function addScriptCommand(originalCommand: Object) {
 
       if (!scriptTask) {
         logger.fatal(`Could not find inso script "${scriptName}" in the config file.`);
-        return exit(new Promise(resolve => resolve(false)));
+        return exit(new Promise((resolve) => resolve(false)));
       }
 
       if (!scriptTask.startsWith('inso')) {
         logger.fatal('Tasks in a script should start with `inso`.');
-        return exit(new Promise(resolve => resolve(false)));
+        return exit(new Promise((resolve) => resolve(false)));
       }
 
       // Collect args
-      const scriptArgs: Array<string> = parseArgsStringToArgv(
+      const scriptArgs: string[] = parseArgsStringToArgv(
         `self ${scriptTask} ${passThroughArgs.join(' ')}`,
       );
 
       // Print command
-      logger.debug(`>> ${scriptArgs.slice(1).join(' ')}`);
+      logger.debug(`>> ${scriptArgs.slice(1).join(' ')}`); // Run
 
-      // Run
       runWithArgs(originalCommand, scriptArgs);
     });
-}
+};
 
-export function go(args?: Array<string>, exitOverride?: boolean): void {
-  const createCommand: CreateCommandType = (cmd?: string) => {
+export const go = (args?: string[], exitOverride?: boolean) => {
+  const commandCreator = (cmd?: string) => {
     const command = new commander.Command(cmd).storeOptionsAsProperties(false);
 
     if (exitOverride) {
@@ -163,10 +157,12 @@ export function go(args?: Array<string>, exitOverride?: boolean): void {
   configureLogger();
 
   // inso
-  const cmd = createCommand();
+  const cmd = commandCreator();
 
   // Version and description
-  cmd.version(getVersion(), '-v, --version').description('A CLI for Insomnia!');
+  cmd
+    .version(getVersion(), '-v, --version')
+    .description('A CLI for Insomnia!');
 
   // Global options
   cmd
@@ -179,17 +175,19 @@ export function go(args?: Array<string>, exitOverride?: boolean): void {
 
   // Add commands and sub commands
   cmd
-    .addCommand(makeGenerateCommand(createCommand))
-    .addCommand(makeTestCommand(createCommand))
-    .addCommand(makeLintCommand(createCommand))
-    .addCommand(makeExportCommand(createCommand));
+    .addCommand(makeGenerateCommand(commandCreator))
+    .addCommand(makeTestCommand(commandCreator))
+    .addCommand(makeLintCommand(commandCreator))
+    .addCommand(makeExportCommand(commandCreator));
 
   // Add script base command
   addScriptCommand(cmd);
-
   runWithArgs(cmd, args || process.argv);
-}
+};
 
-function runWithArgs(cmd: Object, args: Array<string>) {
+const runWithArgs = (
+  cmd: UNKNOWN_OBJ,
+  args: string[],
+) => {
   cmd.parseAsync(args).catch(logErrorExit1);
-}
+};
diff --git a/packages/insomnia-inso/src/commands/__mocks__/insomnia-send-request.ts b/packages/insomnia-inso/src/commands/__mocks__/insomnia-send-request.ts
new file mode 100644
index 0000000000..0aa8122210
--- /dev/null
+++ b/packages/insomnia-inso/src/commands/__mocks__/insomnia-send-request.ts
@@ -0,0 +1 @@
+export const getSendRequestCallbackMemDb = jest.fn().mockResolvedValue(jest.fn());
diff --git a/packages/insomnia-inso/src/commands/__mocks__/insomnia-testing.ts b/packages/insomnia-inso/src/commands/__mocks__/insomnia-testing.ts
new file mode 100644
index 0000000000..6421443cb7
--- /dev/null
+++ b/packages/insomnia-inso/src/commands/__mocks__/insomnia-testing.ts
@@ -0,0 +1,4 @@
+export const generate = jest.fn();
+export const generateToFile = jest.fn();
+export const runTests = jest.fn();
+export const runTestsCli = jest.fn();
diff --git a/packages/insomnia-inso/__mocks__/openapi-2-kong.js b/packages/insomnia-inso/src/commands/__mocks__/openapi-2-kong.ts
similarity index 56%
rename from packages/insomnia-inso/__mocks__/openapi-2-kong.js
rename to packages/insomnia-inso/src/commands/__mocks__/openapi-2-kong.ts
index 4769eb8f50..3f84db26f8 100644
--- a/packages/insomnia-inso/__mocks__/openapi-2-kong.js
+++ b/packages/insomnia-inso/src/commands/__mocks__/openapi-2-kong.ts
@@ -1,7 +1,5 @@
-const mod = jest.requireActual('openapi-2-kong');
-
 module.exports = {
-  ...mod,
+  ...jest.requireActual('openapi-2-kong'),
   generate: jest.fn(),
   generateFromString: jest.fn(),
 };
diff --git a/packages/insomnia-inso/src/commands/__tests__/export-specification.test.js b/packages/insomnia-inso/src/commands/export-specification.test.ts
similarity index 76%
rename from packages/insomnia-inso/src/commands/__tests__/export-specification.test.js
rename to packages/insomnia-inso/src/commands/export-specification.test.ts
index bd1ff5168d..78ce4b4432 100644
--- a/packages/insomnia-inso/src/commands/__tests__/export-specification.test.js
+++ b/packages/insomnia-inso/src/commands/export-specification.test.ts
@@ -1,30 +1,30 @@
-// @flow
-import { exportSpecification } from '../export-specification';
-import { writeFileWithCliOptions } from '../../write-file';
-import { globalBeforeAll, globalBeforeEach } from '../../../__jest__/before';
-import logger from '../../logger';
+import { exportSpecification } from './export-specification';
+import { writeFileWithCliOptions } from '../write-file';
+import { globalBeforeAll, globalBeforeEach } from '../jest/before';
+import { logger } from '../logger';
+import { UNKNOWN } from '../types';
 
-jest.mock('../../write-file');
+jest.mock('../write-file');
 
 describe('exportSpecification()', () => {
   beforeAll(() => {
     globalBeforeAll();
   });
+
   beforeEach(() => {
     globalBeforeEach();
   });
 
-  // make flow happy
-  const mock = (mockFn: any) => mockFn;
+  const mock = (mockFn: UNKNOWN) => mockFn;
+
   afterEach(() => {
     jest.restoreAllMocks();
   });
 
   it('should load identifier from database', async () => {
     const result = await exportSpecification('spc_46c5a4a40e83445a9bd9d9758b86c16c', {
-      workingDir: 'src/db/__fixtures__/git-repo',
+      workingDir: 'src/db/fixtures/git-repo',
     });
-
     expect(result).toBe(true);
     expect(writeFileWithCliOptions).not.toHaveBeenCalled();
     expect(logger.__getLogs().log).toEqual([expect.stringContaining("openapi: '3.0.2")]);
@@ -33,34 +33,27 @@ describe('exportSpecification()', () => {
   it('should output document to a file', async () => {
     const outputPath = 'this-is-the-output-path';
     mock(writeFileWithCliOptions).mockResolvedValue(outputPath);
-
     const options = {
       output: 'output.yaml',
-      workingDir: 'src/db/__fixtures__/git-repo',
+      workingDir: 'src/db/fixtures/git-repo',
     };
-
     const result = await exportSpecification('spc_46c5a4a40e83445a9bd9d9758b86c16c', options);
-
     expect(result).toBe(true);
-
     expect(writeFileWithCliOptions).toHaveBeenCalledWith(
       options.output,
       expect.stringContaining("openapi: '3.0.2"),
       options.workingDir,
     );
-
     expect(logger.__getLogs().log).toEqual([`Specification exported to "${outputPath}".`]);
   });
 
   it('should throw if writing file returns error', async () => {
     const error = new Error('error message');
     mock(writeFileWithCliOptions).mockRejectedValue(error);
-
     const options = {
       output: 'output.yaml',
-      workingDir: 'src/db/__fixtures__/git-repo',
+      workingDir: 'src/db/fixtures/git-repo',
     };
-
     await expect(
       exportSpecification('spc_46c5a4a40e83445a9bd9d9758b86c16c', options),
     ).rejects.toThrowError(error);
@@ -68,9 +61,8 @@ describe('exportSpecification()', () => {
 
   it('should return false if spec could not be found', async () => {
     const result = await exportSpecification('not-found', {
-      workingDir: 'src/db/__fixtures__/git-repo',
+      workingDir: 'src/db/fixtures/git-repo',
     });
-
     expect(result).toBe(false);
     expect(logger.__getLogs().fatal).toEqual(['Specification not found.']);
   });
diff --git a/packages/insomnia-inso/src/commands/export-specification.js b/packages/insomnia-inso/src/commands/export-specification.ts
similarity index 76%
rename from packages/insomnia-inso/src/commands/export-specification.js
rename to packages/insomnia-inso/src/commands/export-specification.ts
index 139a42885b..fc1c69545f 100644
--- a/packages/insomnia-inso/src/commands/export-specification.js
+++ b/packages/insomnia-inso/src/commands/export-specification.ts
@@ -1,24 +1,26 @@
-// @flow
 import type { GlobalOptions } from '../get-options';
 import { loadDb } from '../db';
 import { loadApiSpec, promptApiSpec } from '../db/models/api-spec';
 import { writeFileWithCliOptions } from '../write-file';
-import logger from '../logger';
+import { logger } from '../logger';
 
 export type ExportSpecificationOptions = GlobalOptions & {
-  output?: string,
+  output?: string;
 };
 
 export async function exportSpecification(
-  identifier: ?string,
+  identifier: string | null | undefined,
   { output, workingDir, appDataDir, ci }: ExportSpecificationOptions,
-): Promise<boolean> {
-  const db = await loadDb({ workingDir, appDataDir, filterTypes: ['ApiSpec'] });
-
+) {
+  const db = await loadDb({
+    workingDir,
+    appDataDir,
+    filterTypes: ['ApiSpec'],
+  });
   const specFromDb = identifier ? loadApiSpec(db, identifier) : await promptApiSpec(db, !!ci);
 
   if (!specFromDb) {
-    logger.fatal(`Specification not found.`);
+    logger.fatal('Specification not found.');
     return false;
   }
 
diff --git a/packages/insomnia-inso/src/commands/__fixtures__/openapi-spec.yaml b/packages/insomnia-inso/src/commands/fixtures/openapi-spec.yaml
similarity index 100%
rename from packages/insomnia-inso/src/commands/__fixtures__/openapi-spec.yaml
rename to packages/insomnia-inso/src/commands/fixtures/openapi-spec.yaml
diff --git a/packages/insomnia-inso/src/commands/__tests__/generate-config.test.js b/packages/insomnia-inso/src/commands/generate-config.test.ts
similarity index 70%
rename from packages/insomnia-inso/src/commands/__tests__/generate-config.test.js
rename to packages/insomnia-inso/src/commands/generate-config.test.ts
index 1cc48eb4fd..b1441bdf18 100644
--- a/packages/insomnia-inso/src/commands/__tests__/generate-config.test.js
+++ b/packages/insomnia-inso/src/commands/generate-config.test.ts
@@ -1,26 +1,26 @@
-// @flow
-import { ConversionTypeMap, generateConfig } from '../generate-config';
+import { conversionTypeMap, generateConfig, GenerateConfigOptions } from './generate-config';
 import o2k from 'openapi-2-kong';
 import path from 'path';
-import { writeFileWithCliOptions } from '../../write-file';
-import { globalBeforeAll, globalBeforeEach } from '../../../__jest__/before';
-import logger from '../../logger';
-import { InsoError } from '../../errors';
+import { writeFileWithCliOptions } from '../write-file';
+import { globalBeforeAll, globalBeforeEach } from '../jest/before';
+import { logger } from '../logger';
+import { InsoError } from '../errors';
 import os from 'os';
+import { UNKNOWN } from '../types';
 
 jest.mock('openapi-2-kong');
-jest.mock('../../write-file');
+jest.mock('../write-file');
 
 describe('generateConfig()', () => {
   beforeAll(() => {
     globalBeforeAll();
   });
+
   beforeEach(() => {
     globalBeforeEach();
   });
 
-  // make flow happy
-  const mock = (mockFn: any) => mockFn;
+  const mock = (mockFn: UNKNOWN) => mockFn;
 
   afterEach(() => {
     jest.restoreAllMocks();
@@ -29,8 +29,10 @@ describe('generateConfig()', () => {
   const filePath = 'file.yaml';
 
   it('should should not generate if type arg is invalid', async () => {
-    await generateConfig(filePath, { type: 'invalid' });
-
+    await generateConfig(filePath, {
+      // @ts-expect-error intentionally invalid input
+      type: 'invalid',
+    });
     expect(o2k.generate).not.toHaveBeenCalled();
     expect(logger.__getLogs().fatal).toEqual([
       'Config type "invalid" not unrecognized. Options are [kubernetes, declarative].',
@@ -38,130 +40,118 @@ describe('generateConfig()', () => {
   });
 
   it('should print conversion documents to console', async () => {
-    mock(o2k.generate).mockResolvedValue({ documents: ['a', 'b'] });
-
-    await generateConfig(filePath, { type: 'kubernetes' });
-
-    expect(o2k.generate).toHaveBeenCalledWith(filePath, ConversionTypeMap.kubernetes);
+    mock(o2k.generate).mockResolvedValue({
+      documents: ['a', 'b'],
+    });
+    await generateConfig(filePath, {
+      type: 'kubernetes',
+    });
+    expect(o2k.generate).toHaveBeenCalledWith(filePath, conversionTypeMap.kubernetes);
     expect(logger.__getLogs().log).toEqual(['a\n---\nb\n']);
   });
 
   it('should load identifier from database', async () => {
-    mock(o2k.generateFromString).mockResolvedValue({ documents: ['a', 'b'] });
-
+    mock(o2k.generateFromString).mockResolvedValue({
+      documents: ['a', 'b'],
+    });
     await generateConfig('spc_46c5a4a40e83445a9bd9d9758b86c16c', {
       type: 'kubernetes',
-      workingDir: 'src/db/__fixtures__/git-repo',
+      workingDir: 'src/db/fixtures/git-repo',
     });
-
     expect(o2k.generateFromString).toHaveBeenCalled();
     expect(logger.__getLogs().log).toEqual(['a\n---\nb\n']);
   });
 
   it('should output generated document to a file', async () => {
-    mock(o2k.generate).mockResolvedValue({ documents: ['a', 'b'] });
+    mock(o2k.generate).mockResolvedValue({
+      documents: ['a', 'b'],
+    });
     const outputPath = 'this-is-the-output-path';
     mock(writeFileWithCliOptions).mockResolvedValue(outputPath);
-
-    const options = {
+    const options: Partial<GenerateConfigOptions> = {
       type: 'kubernetes',
       output: 'output.yaml',
       workingDir: 'working/dir',
     };
-
     const result = await generateConfig(filePath, options);
-
     expect(result).toBe(true);
-
     expect(writeFileWithCliOptions).toHaveBeenCalledWith(
       options.output,
       'a\n---\nb\n',
       options.workingDir,
     );
-
     expect(logger.__getLogs().log).toEqual([`Configuration generated to "${outputPath}".`]);
   });
 
   it('should return false if failed to write file', async () => {
-    mock(o2k.generate).mockResolvedValue({ documents: ['a', 'b'] });
+    mock(o2k.generate).mockResolvedValue({
+      documents: ['a', 'b'],
+    });
     const error = new Error('error message');
-
     mock(writeFileWithCliOptions).mockRejectedValue(error);
-
-    const options = {
+    const options: Partial<GenerateConfigOptions> = {
       type: 'kubernetes',
       output: 'output.yaml',
       workingDir: 'working/dir',
     };
-
     const result = generateConfig(filePath, options);
-
     await expect(result).rejects.toThrowError(error);
   });
 
   it('should generate documents using workingDir', async () => {
-    mock(o2k.generate).mockResolvedValue({ documents: ['a', 'b'] });
+    mock(o2k.generate).mockResolvedValue({
+      documents: ['a', 'b'],
+    });
     const outputPath = 'this-is-the-output-path';
     mock(writeFileWithCliOptions).mockResolvedValue(outputPath);
-
     const result = await generateConfig('file.yaml', {
       type: 'kubernetes',
       workingDir: 'test/dir',
       output: 'output.yaml',
     });
+    expect(result).toBe(true); // Read from workingDir
 
-    expect(result).toBe(true);
-
-    // Read from workingDir
     expect(o2k.generate).toHaveBeenCalledWith(
       path.normalize('test/dir/file.yaml'),
-      ConversionTypeMap.kubernetes,
+      conversionTypeMap.kubernetes,
     );
-
     expect(logger.__getLogs().log).toEqual([`Configuration generated to "${outputPath}".`]);
   });
 
   it('should generate documents using absolute path', async () => {
-    mock(o2k.generate).mockResolvedValue({ documents: ['a', 'b'] });
+    mock(o2k.generate).mockResolvedValue({
+      documents: ['a', 'b'],
+    });
     const outputPath = 'this-is-the-output-path';
     mock(writeFileWithCliOptions).mockResolvedValue(outputPath);
-
     const absolutePath = path.join(os.tmpdir(), 'dev', 'file.yaml');
-
     const result = await generateConfig(absolutePath, {
       type: 'kubernetes',
       workingDir: 'test/dir',
       output: 'output.yaml',
     });
+    expect(result).toBe(true); // Read from workingDir
 
-    expect(result).toBe(true);
-
-    // Read from workingDir
-    expect(o2k.generate).toHaveBeenCalledWith(absolutePath, ConversionTypeMap.kubernetes);
-
+    expect(o2k.generate).toHaveBeenCalledWith(absolutePath, conversionTypeMap.kubernetes);
     expect(logger.__getLogs().log).toEqual([`Configuration generated to "${outputPath}".`]);
   });
 
   it('should throw InsoError if there is an error thrown by openapi-2-kong', async () => {
     const error = new Error('err');
     mock(o2k.generate).mockRejectedValue(error);
-
     const promise = generateConfig('file.yaml', {
       type: 'kubernetes',
     });
-
     await expect(promise).rejects.toThrowError(
-      new InsoError(`There was an error while generating configuration`, error),
+      new InsoError('There was an error while generating configuration', error),
     );
   });
 
   it('should warn if no valid spec can be found', async () => {
     mock(o2k.generate).mockResolvedValue({});
-
     const result = await generateConfig('file.yaml', {
       type: 'kubernetes',
     });
-
     expect(result).toBe(false);
     expect(logger.__getLogs().log).toEqual([
       'Could not find a valid specification to generate configuration.',
diff --git a/packages/insomnia-inso/src/commands/generate-config.js b/packages/insomnia-inso/src/commands/generate-config.ts
similarity index 57%
rename from packages/insomnia-inso/src/commands/generate-config.js
rename to packages/insomnia-inso/src/commands/generate-config.ts
index 7659399e12..55fe2db413 100644
--- a/packages/insomnia-inso/src/commands/generate-config.js
+++ b/packages/insomnia-inso/src/commands/generate-config.ts
@@ -1,45 +1,54 @@
-// @flow
-import * as o2k from 'openapi-2-kong';
+import { ConversionResult, ConversionResultType, generate, generateFromString } from 'openapi-2-kong';
 import YAML from 'yaml';
 import path from 'path';
 import type { GlobalOptions } from '../get-options';
 import { loadDb } from '../db';
 import { loadApiSpec, promptApiSpec } from '../db/models/api-spec';
 import { writeFileWithCliOptions } from '../write-file';
-import logger from '../logger';
+import { logger } from '../logger';
 import { InsoError } from '../errors';
 
-export const ConversionTypeMap: { [string]: ConversionResultType } = {
+export const conversionTypeMap = {
   kubernetes: 'kong-for-kubernetes',
   declarative: 'kong-declarative-config',
-};
+} as const;
+
+export const conversionTypes: ConversionResultType[] = [
+  'kong-declarative-config',
+  'kong-for-kubernetes',
+];
 
 export type GenerateConfigOptions = GlobalOptions & {
-  type: $Keys<typeof ConversionTypeMap>,
-  output?: string,
+  type: keyof (typeof conversionTypeMap);
+  output?: string;
 };
 
-function validateOptions({ type }: GenerateConfigOptions): boolean {
-  if (!ConversionTypeMap[type]) {
-    const conversionTypes = Object.keys(ConversionTypeMap).join(', ');
-    logger.fatal(`Config type "${type}" not unrecognized. Options are [${conversionTypes}].`);
+const validateOptions = (
+  options: Partial<GenerateConfigOptions> = {},
+): options is Partial<GenerateConfigOptions> & Pick<GenerateConfigOptions, 'type'> => {
+  const { type } = options;
+  if (!type || !conversionTypeMap[type]) {
+    logger.fatal(`Config type "${type}" not unrecognized. Options are [${Object.keys(conversionTypeMap).join(', ')}].`);
     return false;
   }
 
   return true;
-}
+};
 
-export async function generateConfig(
-  identifier: ?string,
-  options: GenerateConfigOptions,
-): Promise<boolean> {
+export const generateConfig = async (
+  identifier?: string | null,
+  options: Partial<GenerateConfigOptions> = {},
+) => {
   if (!validateOptions(options)) {
     return false;
   }
 
   const { type, output, appDataDir, workingDir, ci } = options;
-
-  const db = await loadDb({ workingDir, appDataDir, filterTypes: ['ApiSpec'] });
+  const db = await loadDb({
+    workingDir,
+    appDataDir,
+    filterTypes: ['ApiSpec'],
+  });
 
   let result: ConversionResult | null = null;
 
@@ -49,27 +58,25 @@ export async function generateConfig(
   try {
     if (specFromDb?.contents) {
       logger.trace('Generating config from database contents');
-      result = await o2k.generateFromString(specFromDb.contents, ConversionTypeMap[type]);
+      result = await generateFromString(specFromDb.contents, conversionTypeMap[type]);
     } else if (identifier) {
       // try load as a file
       const fileName = path.isAbsolute(identifier)
         ? identifier
         : path.join(workingDir || '.', identifier);
       logger.trace(`Generating config from file \`${fileName}\``);
-      result = await o2k.generate(fileName, ConversionTypeMap[type]);
+      result = await generate(fileName, conversionTypeMap[type]);
     }
   } catch (e) {
-    throw new InsoError(`There was an error while generating configuration`, e);
+    throw new InsoError('There was an error while generating configuration', e);
   }
 
-  if (!result?.documents) {
+  if (!result?.documents || !Array.isArray(result.documents)) {
     logger.log('Could not find a valid specification to generate configuration.');
-
     return false;
   }
 
-  const yamlDocs = result.documents.map(d => YAML.stringify(d));
-
+  const yamlDocs = result.documents.map(document => YAML.stringify(document));
   // Join the YAML docs with "---" and strip any extra newlines surrounding them
   const document = yamlDocs.join('\n---\n').replace(/\n+---\n+/g, '\n---\n');
 
@@ -81,4 +88,4 @@ export async function generateConfig(
   }
 
   return true;
-}
+};
diff --git a/packages/insomnia-inso/src/commands/__tests__/lint-specification.test.js b/packages/insomnia-inso/src/commands/lint-specification.test.ts
similarity index 76%
rename from packages/insomnia-inso/src/commands/__tests__/lint-specification.test.js
rename to packages/insomnia-inso/src/commands/lint-specification.test.ts
index 624f50eb3b..5369796bec 100644
--- a/packages/insomnia-inso/src/commands/__tests__/lint-specification.test.js
+++ b/packages/insomnia-inso/src/commands/lint-specification.test.ts
@@ -1,8 +1,7 @@
-// @flow
 import path from 'path';
-import { lintSpecification } from '../lint-specification';
-import { globalBeforeAll, globalBeforeEach } from '../../../__jest__/before';
-import logger from '../../logger';
+import { lintSpecification } from './lint-specification';
+import { globalBeforeAll, globalBeforeEach } from '../jest/before';
+import { logger } from '../logger';
 
 describe('lint specification', () => {
   beforeAll(() => {
@@ -11,63 +10,52 @@ describe('lint specification', () => {
   beforeEach(() => {
     globalBeforeEach();
   });
-
   afterEach(() => {
     jest.restoreAllMocks();
   });
-
   it('should return true for linting passed', async () => {
     const result = await lintSpecification('spc_46c5a4a40e83445a9bd9d9758b86c16c', {
-      workingDir: 'src/db/__fixtures__/git-repo',
+      workingDir: 'src/db/fixtures/git-repo',
     });
-
     expect(result).toBe(true);
   });
-
   it('should lint specification from file with relative path', async () => {
     const result = await lintSpecification('openapi-spec.yaml', {
-      workingDir: 'src/commands/__fixtures__',
+      workingDir: 'src/commands/fixtures',
     });
-
     expect(result).toBe(true);
   });
-
   it('should lint specification from file with relative path and no working directory', async () => {
-    const result = await lintSpecification('src/commands/__fixtures__/openapi-spec.yaml', {});
-
+    const result = await lintSpecification('src/commands/fixtures/openapi-spec.yaml', {});
     expect(result).toBe(true);
   });
-
   it('should lint specification from file with absolute path', async () => {
-    const directory = path.join(process.cwd(), 'src/commands/__fixtures__');
+    const directory = path.join(process.cwd(), 'src/commands/fixtures');
     const result = await lintSpecification(path.join(directory, 'openapi-spec.yaml'), {
       workingDir: 'src',
     });
-
     expect(result).toBe(true);
   });
-
   it('should return false for linting failed', async () => {
     const result = await lintSpecification('spc_46c5a4a40e83445a9bd9d9758b86c16c', {
-      workingDir: 'src/db/__fixtures__/git-repo-malformed-spec',
+      workingDir: 'src/db/fixtures/git-repo-malformed-spec',
     });
-
     expect(result).toBe(false);
   });
-
   it('should return false if spec could not be found', async () => {
     const result = await lintSpecification('not-found', {});
-
     expect(result).toBe(false);
+
     const logs = logger.__getLogs();
+
     expect(logs.fatal).toContain('Failed to read "not-found"');
   });
-
   it('should return false if spec was not specified', async () => {
     const result = await lintSpecification('', {});
-
     expect(result).toBe(false);
+
     const logs = logger.__getLogs();
+
     expect(logs.fatal).toContain('Specification not found.');
   });
 });
diff --git a/packages/insomnia-inso/src/commands/lint-specification.js b/packages/insomnia-inso/src/commands/lint-specification.ts
similarity index 82%
rename from packages/insomnia-inso/src/commands/lint-specification.js
rename to packages/insomnia-inso/src/commands/lint-specification.ts
index 24c505d54f..2af9e4fee2 100644
--- a/packages/insomnia-inso/src/commands/lint-specification.js
+++ b/packages/insomnia-inso/src/commands/lint-specification.ts
@@ -1,9 +1,8 @@
-// @flow
 import { Spectral } from '@stoplight/spectral';
 import type { GlobalOptions } from '../get-options';
 import { loadDb } from '../db';
 import { loadApiSpec, promptApiSpec } from '../db/models/api-spec';
-import logger from '../logger';
+import { logger } from '../logger';
 import { InsoError } from '../errors';
 import fs from 'fs';
 import path from 'path';
@@ -11,14 +10,17 @@ import path from 'path';
 export type LintSpecificationOptions = GlobalOptions;
 
 export async function lintSpecification(
-  identifier: ?string,
+  identifier: string | null | undefined,
   { workingDir, appDataDir, ci }: LintSpecificationOptions,
-): Promise<boolean> {
-  const db = await loadDb({ workingDir, appDataDir, filterTypes: ['ApiSpec'] });
+) {
+  const db = await loadDb({
+    workingDir,
+    appDataDir,
+    filterTypes: ['ApiSpec'],
+  });
 
   const specFromDb = identifier ? loadApiSpec(db, identifier) : await promptApiSpec(db, !!ci);
-
-  let specContent: string = '';
+  let specContent = '';
 
   try {
     if (specFromDb?.contents) {
@@ -30,13 +32,14 @@ export async function lintSpecification(
         ? identifier
         : path.join(workingDir || '.', identifier);
       logger.trace(`Linting specification from file \`${fileName}\``);
+
       try {
         specContent = (await fs.promises.readFile(fileName)).toString();
       } catch (e) {
         throw new InsoError(`Failed to read "${fileName}"`, e);
       }
     } else {
-      logger.fatal(`Specification not found.`);
+      logger.fatal('Specification not found.');
       return false;
     }
   } catch (e) {
@@ -49,13 +52,12 @@ export async function lintSpecification(
 
   if (results.length) {
     logger.log(`${results.length} lint errors found. \n`);
-
-    results.forEach(r =>
+    results.forEach((r) =>
       logger.log(`${r.range.start.line}:${r.range.start.character} - ${r.message}`),
     );
     return false;
   }
 
-  logger.log(`No linting errors. Yay!`);
+  logger.log('No linting errors. Yay!');
   return true;
 }
diff --git a/packages/insomnia-inso/src/commands/__tests__/run-tests.test.js b/packages/insomnia-inso/src/commands/run-tests.test.ts
similarity index 63%
rename from packages/insomnia-inso/src/commands/__tests__/run-tests.test.js
rename to packages/insomnia-inso/src/commands/run-tests.test.ts
index 431ba0d39c..916ccaaff1 100644
--- a/packages/insomnia-inso/src/commands/__tests__/run-tests.test.js
+++ b/packages/insomnia-inso/src/commands/run-tests.test.ts
@@ -1,57 +1,61 @@
-// @flow
-
-import insomniaTesting from 'insomnia-testing';
-import { runInsomniaTests, TestReporterEnum } from '../run-tests';
-import { globalBeforeAll, globalBeforeEach } from '../../../__jest__/before';
-import logger from '../../logger';
+import { generate as _generate, runTestsCli as _runTestsCli } from 'insomnia-testing';
+import { runInsomniaTests, RunTestsOptions } from './run-tests';
+import { globalBeforeAll, globalBeforeEach } from '../jest/before';
+import { logger } from '../logger';
+import { GenerateConfigOptions } from './generate-config';
 
 jest.mock('insomnia-testing');
 jest.mock('insomnia-send-request');
 
+const generate = _generate as jest.Mock;
+const runTestsCli = _runTestsCli as jest.Mock;
+
 describe('runInsomniaTests()', () => {
   beforeAll(() => {
     globalBeforeAll();
   });
+
   beforeEach(() => {
     globalBeforeEach();
   });
 
-  // make flow happy
-  const mock = (mockFn: any) => mockFn;
   afterEach(() => {
     jest.restoreAllMocks();
   });
 
-  const base = {
-    reporter: TestReporterEnum.spec,
-    appDataDir: 'src/db/__fixtures__/nedb',
+  const base: RunTestsOptions = {
+    reporter: 'spec',
+    appDataDir: 'src/db/fixtures/nedb',
     ci: true,
   };
 
-  it('should should not generate if type arg is invalid', async () => {
-    await runInsomniaTests(null, ({ reporter: 'invalid' }: Object));
-
-    expect(insomniaTesting.runTestsCli).not.toHaveBeenCalled();
+  it('should should not  as _generate if type arg is invalid', async () => {
+    await runInsomniaTests(null, {
+      // @ts-expect-error this is intentionally passing in a bad value
+      reporter: 'invalid',
+    });
+    expect(runTestsCli).not.toHaveBeenCalled();
     expect(logger.__getLogs().fatal).toEqual([
-      'Reporter "invalid" not unrecognized. Options are [dot, list, spec, min, progress].',
+      'Reporter "invalid" not unrecognized. Options are [dot, list, min, progress, spec].',
     ]);
   });
 
   it('should forward options to insomnia-testing', async () => {
     const contents = 'generated test contents';
-    mock(insomniaTesting.generate).mockResolvedValue(contents);
+    generate.mockReturnValue(contents);
 
-    const options = {
+    const options: Partial<GenerateConfigOptions> = {
       ...base,
+      // @ts-expect-error not sure why this was an invalid value, but I'm going to leave it here
       reporter: 'min',
       bail: true,
       keepFile: false,
       testNamePattern: 'Math',
       env: 'env_env_ca046a738f001eb3090261a537b1b78f86c2094c_sub',
     };
-    await runInsomniaTests('spc_46c5a4a40e83445a9bd9d9758b86c16c', options);
 
-    expect(insomniaTesting.runTestsCli).toHaveBeenCalledWith(contents, {
+    await runInsomniaTests('spc_46c5a4a40e83445a9bd9d9758b86c16c', options);
+    expect(runTestsCli).toHaveBeenCalledWith(contents, {
       reporter: 'min',
       bail: true,
       keepFile: false,
@@ -61,22 +65,19 @@ describe('runInsomniaTests()', () => {
   });
 
   it('should return false if test results have any failures', async function() {
-    mock(insomniaTesting.runTestsCli).mockResolvedValue(false);
-
+    runTestsCli.mockResolvedValue(false);
     const result = await runInsomniaTests('spc_46c5a4a40e83445a9bd9d9758b86c16c', {
       ...base,
       env: 'env_env_ca046a738f001eb3090261a537b1b78f86c2094c_sub',
     });
-
     expect(result).toBe(false);
   });
 
   it('should return false if test suites could not be found', async () => {
     const result = await runInsomniaTests('not-found', {
       ...base,
-      workingDir: 'src/db/__fixtures__/git-repo',
+      workingDir: 'src/db/fixtures/git-repo',
     });
-
     expect(result).toBe(false);
     expect(logger.__getLogs().fatal).toEqual(['No test suites found; cannot run tests.']);
   });
@@ -84,23 +85,20 @@ describe('runInsomniaTests()', () => {
   it('should return false if environment could not be found', async () => {
     const result = runInsomniaTests('spc_46c5a4a40e83445a9bd9d9758b86c16c', {
       ...base,
-      workingDir: 'src/db/__fixtures__/git-repo',
+      workingDir: 'src/db/fixtures/git-repo',
       env: 'not-found',
     });
-
     await expect(result).rejects.toThrowError(
       'Expected single sub environment in the data store, but found none.',
     );
   });
 
   it('should return true if test results have no failures', async function() {
-    mock(insomniaTesting.runTestsCli).mockResolvedValue(true);
-
+    runTestsCli.mockResolvedValue(true);
     const result = await runInsomniaTests('spc_46c5a4a40e83445a9bd9d9758b86c16c', {
       ...base,
       env: 'env_env_ca046a738f001eb3090261a537b1b78f86c2094c_sub',
     });
-
     expect(result).toBe(true);
   });
 });
diff --git a/packages/insomnia-inso/src/commands/run-tests.js b/packages/insomnia-inso/src/commands/run-tests.ts
similarity index 58%
rename from packages/insomnia-inso/src/commands/run-tests.js
rename to packages/insomnia-inso/src/commands/run-tests.ts
index c3c3113fac..6d9327c5cc 100644
--- a/packages/insomnia-inso/src/commands/run-tests.js
+++ b/packages/insomnia-inso/src/commands/run-tests.ts
@@ -1,56 +1,64 @@
-// @flow
-
-import { generate, runTestsCli } from 'insomnia-testing';
+import { generate, runTestsCli, TestSuite } from 'insomnia-testing';
 import type { GlobalOptions } from '../get-options';
 import { loadDb } from '../db';
 import type { UnitTest, UnitTestSuite } from '../db/models/types';
-import logger, { noConsoleLog } from '../logger';
+import { logger, noConsoleLog } from '../logger';
 import { loadTestSuites, promptTestSuites } from '../db/models/unit-test-suite';
 import { loadEnvironment, promptEnvironment } from '../db/models/environment';
 
-export const TestReporterEnum = {
-  dot: 'dot',
-  list: 'list',
-  spec: 'spec',
-  min: 'min',
-  progress: 'progress',
-};
+export type TestReporter = 'dot' | 'list' | 'spec' | 'min' | 'progress';
+
+export const reporterTypes: TestReporter[] = [
+  'dot',
+  'list',
+  'min',
+  'progress',
+  'spec',
+];
+
+export const reporterTypesSet = new Set(reporterTypes);
 
 export type RunTestsOptions = GlobalOptions & {
-  env?: string,
-  reporter: $Keys<typeof TestReporterEnum>,
-  bail?: boolean,
-  keepFile?: boolean,
-  testNamePattern?: string,
+  env?: string;
+  reporter: TestReporter;
+  bail?: boolean;
+  keepFile?: boolean;
+  testNamePattern?: string;
 };
 
-function validateOptions({ reporter }: RunTestsOptions): boolean {
-  if (reporter && !TestReporterEnum[reporter]) {
-    const reporterTypes = Object.keys(TestReporterEnum).join(', ');
-    logger.fatal(`Reporter "${reporter}" not unrecognized. Options are [${reporterTypes}].`);
+function validateOptions({ reporter }: Partial<RunTestsOptions>): boolean {
+  if (reporter && !reporterTypesSet.has(reporter)) {
+    logger.fatal(`Reporter "${reporter}" not unrecognized. Options are [${reporterTypes.join(', ')}].`);
     return false;
   }
 
   return true;
 }
 
-const createTestSuite = (dbSuite: UnitTestSuite, dbTests: Array<UnitTest>) => ({
+const createTestSuite = (dbSuite: UnitTestSuite, dbTests: UnitTest[]): TestSuite => ({
   name: dbSuite.name,
-  tests: dbTests.map(({ name, code, requestId }) => ({ name, code, defaultRequestId: requestId })),
+  suites: [],
+  tests: dbTests.map(({ name, code, requestId }) => ({
+    name,
+    code,
+    defaultRequestId: requestId,
+  })),
 });
 
 // Identifier can be the id or name of a workspace, apiSpec, or unit test suite
 export async function runInsomniaTests(
-  identifier: ?string,
-  options: RunTestsOptions,
-): Promise<boolean> {
+  identifier: string | null | undefined,
+  options: Partial<RunTestsOptions>,
+) {
   if (!validateOptions(options)) {
     return false;
   }
 
   const { reporter, bail, keepFile, appDataDir, workingDir, env, ci, testNamePattern } = options;
-
-  const db = await loadDb({ workingDir, appDataDir });
+  const db = await loadDb({
+    workingDir,
+    appDataDir,
+  });
 
   // Find suites
   const suites = identifier ? loadTestSuites(db, identifier) : await promptTestSuites(db, !!ci);
@@ -72,19 +80,19 @@ export async function runInsomniaTests(
   }
 
   // Generate test file
-  const testFileContents = await generate(
+  const testFileContents = generate(
     suites.map(suite =>
       createTestSuite(
         suite,
-        db.UnitTest.filter(t => t.parentId === suite._id),
+        db.UnitTest.filter(test => test.parentId === suite._id),
       ),
     ),
   );
 
-  // Load lazily when needed, otherwise this require slows down the entire CLI.
+  // eslint-disable-next-line @typescript-eslint/no-var-requires -- Load lazily when needed, otherwise this require slows down the entire CLI.
   const { getSendRequestCallbackMemDb } = require('insomnia-send-request');
-  const sendRequest = await getSendRequestCallbackMemDb(environment._id, db);
 
+  const sendRequest = await getSendRequestCallbackMemDb(environment._id, db);
   return await noConsoleLog(() =>
     runTestsCli(testFileContents, {
       reporter,
diff --git a/packages/insomnia-inso/src/__tests__/data-directory.test.js b/packages/insomnia-inso/src/data-directory.test.ts
similarity index 77%
rename from packages/insomnia-inso/src/__tests__/data-directory.test.js
rename to packages/insomnia-inso/src/data-directory.test.ts
index 9b6c7148c0..1ff750c45e 100644
--- a/packages/insomnia-inso/src/__tests__/data-directory.test.js
+++ b/packages/insomnia-inso/src/data-directory.test.ts
@@ -1,65 +1,74 @@
-// @flow
-import { getAppDataDir } from '../data-directory';
+import { getAppDataDir } from './data-directory';
 import path from 'path';
+import os from 'os';
 
 jest.mock('os', () => ({
-  ...jest.requireActual('os'),
+  ...jest.requireActual<typeof os>('os'),
   homedir: (): string => 'homedir',
 }));
 
+const setPlatform = (platform: NodeJS.Platform) => {
+  Object.defineProperty(process, 'platform', {
+    value: platform,
+  });
+};
+
 describe('getAppDataDir()', () => {
   const OLD_ENV = process.env;
   const OLD_PLATFORM = process.platform;
 
   beforeEach(() => {
     process.env = { ...OLD_ENV }; // make a copy
-    _setPlatform(OLD_PLATFORM);
+
+    setPlatform(OLD_PLATFORM);
   });
 
   afterAll(() => {
     process.env = OLD_ENV; // restore old env
-    _setPlatform(OLD_PLATFORM);
+
+    setPlatform(OLD_PLATFORM);
   });
 
   it('should return the correct directory on macOS', () => {
-    _setPlatform('darwin');
+    setPlatform('darwin');
+
     expect(getAppDataDir('testApp')).toBe(
       path.join('homedir', 'Library', 'Application Support', 'testApp'),
     );
   });
 
   it('should return the correct directory on Windows with APPDATA not set', () => {
-    _setPlatform('win32');
+    setPlatform('win32');
+
     process.env.APPDATA = undefined;
     expect(getAppDataDir('testApp')).toBe(path.join('homedir', 'AppData', 'Roaming', 'testApp'));
   });
 
   it('should return the correct directory on Windows with APPDATA set', () => {
-    _setPlatform('win32');
+    setPlatform('win32');
+
     process.env.APPDATA = 'test';
     expect(getAppDataDir('testApp')).toBe(path.join('test', 'testApp'));
   });
 
   it('should return the correct directory on Linux with XDG_DATA_HOME not set', () => {
-    _setPlatform('linux');
+    setPlatform('linux');
+
     process.env.XDG_DATA_HOME = undefined;
     expect(getAppDataDir('testApp')).toBe(path.join('homedir', '.config', 'testApp'));
   });
 
   it('should return the correct directory on Linux with XDG_DATA_HOME set', () => {
-    _setPlatform('linux');
+    setPlatform('linux');
+
     process.env.XDG_DATA_HOME = 'test';
     expect(getAppDataDir('testApp')).toBe(path.join('test', 'testApp'));
   });
 
   it('should return nothing on other platforms', () => {
-    _setPlatform('testPlatform');
+    // @ts-expect-error this is an intentionally bad value
+    setPlatform('testPlatform');
+
     expect(getAppDataDir('testApp')).toBe('');
   });
 });
-
-function _setPlatform(platform: string) {
-  Object.defineProperty(process, 'platform', {
-    value: platform,
-  });
-}
diff --git a/packages/insomnia-inso/src/data-directory.js b/packages/insomnia-inso/src/data-directory.ts
similarity index 71%
rename from packages/insomnia-inso/src/data-directory.js
rename to packages/insomnia-inso/src/data-directory.ts
index 7080a1fade..3601c5092c 100644
--- a/packages/insomnia-inso/src/data-directory.js
+++ b/packages/insomnia-inso/src/data-directory.ts
@@ -1,18 +1,22 @@
-// @flow
 import path from 'path';
 import { homedir } from 'os';
 
-// getAppDataDir returns the data directory for an Electron app,
-// it is equivalent to the app.getPath('userData') API in Electron.
-// https://www.electronjs.org/docs/api/app#appgetpathname
+/**
+ * getAppDataDir returns the data directory for an Electron app,
+ * it is equivalent to the app.getPath('userData') API in Electron.
+ * https://www.electronjs.org/docs/api/app#appgetpathname
+*/
 export function getAppDataDir(app: string): string {
   switch (process.platform) {
     case 'darwin':
       return path.join(homedir(), 'Library', 'Application Support', app);
+
     case 'win32':
       return path.join(process.env.APPDATA || path.join(homedir(), 'AppData', 'Roaming'), app);
+
     case 'linux':
       return path.join(process.env.XDG_DATA_HOME || path.join(homedir(), '.config'), app);
+
     default:
       return '';
   }
diff --git a/packages/insomnia-inso/src/db/__mocks__/index.js b/packages/insomnia-inso/src/db/__mocks__/index.ts
similarity index 98%
rename from packages/insomnia-inso/src/db/__mocks__/index.js
rename to packages/insomnia-inso/src/db/__mocks__/index.ts
index 3d67fd7ed2..63fd996af5 100644
--- a/packages/insomnia-inso/src/db/__mocks__/index.js
+++ b/packages/insomnia-inso/src/db/__mocks__/index.ts
@@ -1,8 +1,5 @@
 // eslint-disable-next-line filenames/match-exported
 const db = jest.requireActual('../index');
-
 const database = db.emptyDb();
-
 db.loadDb = jest.fn().mockResolvedValue(database);
-
 module.exports = db;
diff --git a/packages/insomnia-inso/src/db/adapters/__tests__/git-adapter.test.js b/packages/insomnia-inso/src/db/adapters/git-adapter.test.ts
similarity index 92%
rename from packages/insomnia-inso/src/db/adapters/__tests__/git-adapter.test.js
rename to packages/insomnia-inso/src/db/adapters/git-adapter.test.ts
index e2df036cf8..ebbd055041 100644
--- a/packages/insomnia-inso/src/db/adapters/__tests__/git-adapter.test.js
+++ b/packages/insomnia-inso/src/db/adapters/git-adapter.test.ts
@@ -1,14 +1,11 @@
-// @flow
 import path from 'path';
-import gitAdapter from '../git-adapter';
+import gitAdapter from './git-adapter';
 
 describe('gitAdapter()', () => {
-  const fixturesPath = 'src/db/__fixtures__';
-
+  const fixturesPath = 'src/db/fixtures';
   it('should seed with git-repo directory', async () => {
     const workingDir = path.join(fixturesPath, 'git-repo');
     const db = await gitAdapter(workingDir);
-
     expect(db?.ApiSpec.length).toBe(1);
     expect(db?.Environment.length).toBe(2);
     expect(db?.Request.length).toBe(2);
@@ -21,7 +18,6 @@ describe('gitAdapter()', () => {
   it('should seed with git-repo directory with filter', async () => {
     const workingDir = path.join(fixturesPath, 'git-repo');
     const db = await gitAdapter(workingDir, ['Environment']);
-
     expect(db?.ApiSpec.length).toBe(0);
     expect(db?.Environment.length).toBe(2);
     expect(db?.Request.length).toBe(0);
diff --git a/packages/insomnia-inso/src/db/adapters/git-adapter.js b/packages/insomnia-inso/src/db/adapters/git-adapter.ts
similarity index 65%
rename from packages/insomnia-inso/src/db/adapters/git-adapter.js
rename to packages/insomnia-inso/src/db/adapters/git-adapter.ts
index 93b8c64a2c..3feaebd784 100644
--- a/packages/insomnia-inso/src/db/adapters/git-adapter.js
+++ b/packages/insomnia-inso/src/db/adapters/git-adapter.ts
@@ -1,35 +1,35 @@
-// @flow
 import fs from 'fs';
 import YAML from 'yaml';
 import path from 'path';
 import { emptyDb } from '../index';
 import type { Database, DbAdapter } from '../index';
+import { UNKNOWN } from '../../types';
 
 const gitAdapter: DbAdapter = async (dir, filterTypes) => {
-  dir = path.join(dir, '.insomnia');
+  dir = path.join(dir, '.insomnia'); // Sanity check - do model directories exist?
 
-  // Sanity check - do model directories exist?
   if (!fs.existsSync(path.join(dir, 'Workspace'))) {
     return null;
   }
 
   const db = emptyDb();
 
-  const readAndInsertDoc = async (type: $Keys<Database>, fileName: string): Promise<void> => {
+  const readAndInsertDoc = async (
+    type: keyof Database,
+    fileName: string,
+  ): Promise<void> => {
     // Get contents of each file in type dir and insert into data
     const contents = await fs.promises.readFile(fileName);
     const obj = YAML.parse(contents.toString());
-
-    // Make flow happy
-    (db[type]: Array<any>).push(obj);
+    (db[type] as UNKNOWN[]).push(obj);
   };
 
-  const types = filterTypes?.length ? filterTypes : Object.keys(db);
-
+  const types = filterTypes?.length ? filterTypes : Object.keys(db) as (keyof Database)[];
   await Promise.all(
-    types.map(async type => {
+    types.map(async t => {
       // Get all files in type dir
-      const typeDir = path.join(dir, type);
+      const typeDir = path.join(dir, t);
+
       if (!fs.existsSync(typeDir)) {
         return;
       }
@@ -37,11 +37,12 @@ const gitAdapter: DbAdapter = async (dir, filterTypes) => {
       const files = await fs.promises.readdir(typeDir);
       return Promise.all(
         // Insert each file from each type
-        files.map(file => readAndInsertDoc(type, path.join(dir, type, file))),
+        files.map(file =>
+          readAndInsertDoc(t, path.join(dir, t, file)),
+        ),
       );
     }),
   );
-
   return db;
 };
 
diff --git a/packages/insomnia-inso/src/db/adapters/ne-db-adapter.js b/packages/insomnia-inso/src/db/adapters/ne-db-adapter.js
deleted file mode 100644
index bdfcda193e..0000000000
--- a/packages/insomnia-inso/src/db/adapters/ne-db-adapter.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// @flow
-import path from 'path';
-import NeDB from 'nedb';
-import type { BaseModel } from '../models/types';
-import type { DbAdapter } from '../index';
-import { emptyDb } from '../index';
-import fs from 'fs';
-
-const neDbAdapter: DbAdapter = async (dir, filterTypes) => {
-  // Sanity check - do db files exist?
-  if (!fs.existsSync(path.join(dir, 'insomnia.Workspace.db'))) {
-    return null;
-  }
-
-  const db = emptyDb();
-
-  const types = filterTypes?.length ? filterTypes : Object.keys(db);
-
-  const promises = types.map(
-    type =>
-      new Promise((resolve, reject) => {
-        const filePath = path.join(dir, `insomnia.${type}.db`);
-        const collection = new NeDB({
-          autoload: true,
-          filename: filePath,
-          corruptAlertThreshold: 0.9,
-        });
-        collection.find({}, (err, docs: Array<BaseModel>) => {
-          if (err) {
-            return reject(err);
-          }
-
-          (db[type]: Array<Object>).push(...docs);
-          resolve();
-        });
-      }),
-  );
-
-  await Promise.all(promises);
-
-  return db;
-};
-
-export default neDbAdapter;
diff --git a/packages/insomnia-inso/src/db/adapters/__tests__/ne-db-adapter.test.js b/packages/insomnia-inso/src/db/adapters/ne-db-adapter.test.ts
similarity index 92%
rename from packages/insomnia-inso/src/db/adapters/__tests__/ne-db-adapter.test.js
rename to packages/insomnia-inso/src/db/adapters/ne-db-adapter.test.ts
index 4a645f3dac..494ed7c409 100644
--- a/packages/insomnia-inso/src/db/adapters/__tests__/ne-db-adapter.test.js
+++ b/packages/insomnia-inso/src/db/adapters/ne-db-adapter.test.ts
@@ -1,14 +1,11 @@
-// @flow
 import path from 'path';
-import neDbAdapter from '../ne-db-adapter';
+import neDbAdapter from './ne-db-adapter';
 
 describe('neDbAdapter()', () => {
-  const fixturesPath = 'src/db/__fixtures__';
-
+  const fixturesPath = 'src/db/fixtures';
   it('should seed with nedb directory', async () => {
     const workingDir = path.join(fixturesPath, 'nedb');
     const db = await neDbAdapter(workingDir);
-
     expect(db?.ApiSpec.length).toBe(2);
     expect(db?.Environment.length).toBe(3);
     expect(db?.Request.length).toBe(2);
@@ -21,7 +18,6 @@ describe('neDbAdapter()', () => {
   it('should seed with nedb directory with filter', async () => {
     const workingDir = path.join(fixturesPath, 'nedb');
     const db = await neDbAdapter(workingDir, ['Environment']);
-
     expect(db?.ApiSpec.length).toBe(0);
     expect(db?.Environment.length).toBe(3);
     expect(db?.Request.length).toBe(0);
diff --git a/packages/insomnia-inso/src/db/adapters/ne-db-adapter.ts b/packages/insomnia-inso/src/db/adapters/ne-db-adapter.ts
new file mode 100644
index 0000000000..91f83a81a0
--- /dev/null
+++ b/packages/insomnia-inso/src/db/adapters/ne-db-adapter.ts
@@ -0,0 +1,38 @@
+import path from 'path';
+import NeDB from 'nedb';
+import type { BaseModel } from '../models/types';
+import { Database, DbAdapter, emptyDb } from '../index';
+import fs from 'fs';
+import { UNKNOWN, UNKNOWN_OBJ } from '../../types';
+
+const neDbAdapter: DbAdapter = async (dir, filterTypes) => {
+  // Sanity check - do db files exist?
+  if (!fs.existsSync(path.join(dir, 'insomnia.Workspace.db'))) {
+    return null;
+  }
+
+  const db = emptyDb();
+  const types = filterTypes?.length ? filterTypes : Object.keys(db) as (keyof Database)[];
+  const promises = types.map(t =>
+    new Promise((resolve, reject) => {
+      const filePath = path.join(dir, `insomnia.${t}.db`);
+      const collection = new NeDB({
+        autoload: true,
+        filename: filePath,
+        corruptAlertThreshold: 0.9,
+      });
+      collection.find({}, (err: UNKNOWN, docs: BaseModel[]) => {
+        if (err) {
+          return reject(err);
+        }
+
+        (db[t] as UNKNOWN_OBJ[]).push(...docs);
+        resolve(null);
+      });
+    }),
+  );
+  await Promise.all(promises);
+  return db;
+};
+
+export default neDbAdapter;
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo-malformed-spec/.insomnia/ApiSpec/spc_46c5a4a40e83445a9bd9d9758b86c16c.yml b/packages/insomnia-inso/src/db/fixtures/git-repo-malformed-spec/.insomnia/ApiSpec/spc_46c5a4a40e83445a9bd9d9758b86c16c.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo-malformed-spec/.insomnia/ApiSpec/spc_46c5a4a40e83445a9bd9d9758b86c16c.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo-malformed-spec/.insomnia/ApiSpec/spc_46c5a4a40e83445a9bd9d9758b86c16c.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo-malformed-spec/.insomnia/Environment/env_ca046a738f001eb3090261a537b1b78f86c2094c.yml b/packages/insomnia-inso/src/db/fixtures/git-repo-malformed-spec/.insomnia/Environment/env_ca046a738f001eb3090261a537b1b78f86c2094c.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo-malformed-spec/.insomnia/Environment/env_ca046a738f001eb3090261a537b1b78f86c2094c.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo-malformed-spec/.insomnia/Environment/env_ca046a738f001eb3090261a537b1b78f86c2094c.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo-malformed-spec/.insomnia/Environment/env_env_ca046a738f001eb3090261a537b1b78f86c2094c_sub.yml b/packages/insomnia-inso/src/db/fixtures/git-repo-malformed-spec/.insomnia/Environment/env_env_ca046a738f001eb3090261a537b1b78f86c2094c_sub.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo-malformed-spec/.insomnia/Environment/env_env_ca046a738f001eb3090261a537b1b78f86c2094c_sub.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo-malformed-spec/.insomnia/Environment/env_env_ca046a738f001eb3090261a537b1b78f86c2094c_sub.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo-malformed-spec/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292a21946b60.yml b/packages/insomnia-inso/src/db/fixtures/git-repo-malformed-spec/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292a21946b60.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo-malformed-spec/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292a21946b60.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo-malformed-spec/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292a21946b60.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo-malformed-spec/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292ab410454b.yml b/packages/insomnia-inso/src/db/fixtures/git-repo-malformed-spec/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292ab410454b.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo-malformed-spec/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292ab410454b.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo-malformed-spec/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292ab410454b.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo-malformed-spec/.insomnia/RequestGroup/fld_wrk_012d4860c7da418a85ffea7406e1292a30baa249.yml b/packages/insomnia-inso/src/db/fixtures/git-repo-malformed-spec/.insomnia/RequestGroup/fld_wrk_012d4860c7da418a85ffea7406e1292a30baa249.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo-malformed-spec/.insomnia/RequestGroup/fld_wrk_012d4860c7da418a85ffea7406e1292a30baa249.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo-malformed-spec/.insomnia/RequestGroup/fld_wrk_012d4860c7da418a85ffea7406e1292a30baa249.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo-malformed-spec/.insomnia/Workspace/wrk_012d4860c7da418a85ffea7406e1292a.yml b/packages/insomnia-inso/src/db/fixtures/git-repo-malformed-spec/.insomnia/Workspace/wrk_012d4860c7da418a85ffea7406e1292a.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo-malformed-spec/.insomnia/Workspace/wrk_012d4860c7da418a85ffea7406e1292a.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo-malformed-spec/.insomnia/Workspace/wrk_012d4860c7da418a85ffea7406e1292a.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/ApiSpec/spc_46c5a4a40e83445a9bd9d9758b86c16c.yml b/packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/ApiSpec/spc_46c5a4a40e83445a9bd9d9758b86c16c.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/ApiSpec/spc_46c5a4a40e83445a9bd9d9758b86c16c.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/ApiSpec/spc_46c5a4a40e83445a9bd9d9758b86c16c.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/Environment/env_ca046a738f001eb3090261a537b1b78f86c2094c.yml b/packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/Environment/env_ca046a738f001eb3090261a537b1b78f86c2094c.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/Environment/env_ca046a738f001eb3090261a537b1b78f86c2094c.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/Environment/env_ca046a738f001eb3090261a537b1b78f86c2094c.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/Environment/env_env_ca046a738f001eb3090261a537b1b78f86c2094c_sub.yml b/packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/Environment/env_env_ca046a738f001eb3090261a537b1b78f86c2094c_sub.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/Environment/env_env_ca046a738f001eb3090261a537b1b78f86c2094c_sub.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/Environment/env_env_ca046a738f001eb3090261a537b1b78f86c2094c_sub.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292a21946b60.yml b/packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292a21946b60.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292a21946b60.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292a21946b60.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292ab410454b.yml b/packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292ab410454b.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292ab410454b.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/Request/req_wrk_012d4860c7da418a85ffea7406e1292ab410454b.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/RequestGroup/fld_wrk_012d4860c7da418a85ffea7406e1292a30baa249.yml b/packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/RequestGroup/fld_wrk_012d4860c7da418a85ffea7406e1292a30baa249.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/RequestGroup/fld_wrk_012d4860c7da418a85ffea7406e1292a30baa249.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/RequestGroup/fld_wrk_012d4860c7da418a85ffea7406e1292a30baa249.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/UnitTest/ut_6b214a8cd07046f2a8f43237ca913c73.yml b/packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/UnitTest/ut_6b214a8cd07046f2a8f43237ca913c73.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/UnitTest/ut_6b214a8cd07046f2a8f43237ca913c73.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/UnitTest/ut_6b214a8cd07046f2a8f43237ca913c73.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/UnitTest/ut_8c0c020fb9e341c2a3162e723445faf1.yml b/packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/UnitTest/ut_8c0c020fb9e341c2a3162e723445faf1.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/UnitTest/ut_8c0c020fb9e341c2a3162e723445faf1.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/UnitTest/ut_8c0c020fb9e341c2a3162e723445faf1.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/UnitTest/ut_8fc42ec7f82a45d09e691ddfe212fd85.yml b/packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/UnitTest/ut_8fc42ec7f82a45d09e691ddfe212fd85.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/UnitTest/ut_8fc42ec7f82a45d09e691ddfe212fd85.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/UnitTest/ut_8fc42ec7f82a45d09e691ddfe212fd85.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/UnitTest/ut_97a197104e83454ebf5f4e0dc0ba4bc6.yml b/packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/UnitTest/ut_97a197104e83454ebf5f4e0dc0ba4bc6.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/UnitTest/ut_97a197104e83454ebf5f4e0dc0ba4bc6.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/UnitTest/ut_97a197104e83454ebf5f4e0dc0ba4bc6.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/UnitTestSuite/uts_7f0f85548b0147f4ba6b5e442d137613.yml b/packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/UnitTestSuite/uts_7f0f85548b0147f4ba6b5e442d137613.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/UnitTestSuite/uts_7f0f85548b0147f4ba6b5e442d137613.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/UnitTestSuite/uts_7f0f85548b0147f4ba6b5e442d137613.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/UnitTestSuite/uts_fe901c6565044f00aa620d3fe47f443f.yml b/packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/UnitTestSuite/uts_fe901c6565044f00aa620d3fe47f443f.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/UnitTestSuite/uts_fe901c6565044f00aa620d3fe47f443f.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/UnitTestSuite/uts_fe901c6565044f00aa620d3fe47f443f.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/Workspace/wrk_012d4860c7da418a85ffea7406e1292a.yml b/packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/Workspace/wrk_012d4860c7da418a85ffea7406e1292a.yml
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/git-repo/.insomnia/Workspace/wrk_012d4860c7da418a85ffea7406e1292a.yml
rename to packages/insomnia-inso/src/db/fixtures/git-repo/.insomnia/Workspace/wrk_012d4860c7da418a85ffea7406e1292a.yml
diff --git a/packages/insomnia-inso/src/db/__fixtures__/nedb/insomnia.ApiSpec.db b/packages/insomnia-inso/src/db/fixtures/nedb/insomnia.ApiSpec.db
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/nedb/insomnia.ApiSpec.db
rename to packages/insomnia-inso/src/db/fixtures/nedb/insomnia.ApiSpec.db
diff --git a/packages/insomnia-inso/src/db/__fixtures__/nedb/insomnia.Environment.db b/packages/insomnia-inso/src/db/fixtures/nedb/insomnia.Environment.db
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/nedb/insomnia.Environment.db
rename to packages/insomnia-inso/src/db/fixtures/nedb/insomnia.Environment.db
diff --git a/packages/insomnia-inso/src/db/__fixtures__/nedb/insomnia.Request.db b/packages/insomnia-inso/src/db/fixtures/nedb/insomnia.Request.db
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/nedb/insomnia.Request.db
rename to packages/insomnia-inso/src/db/fixtures/nedb/insomnia.Request.db
diff --git a/packages/insomnia-inso/src/db/__fixtures__/nedb/insomnia.RequestGroup.db b/packages/insomnia-inso/src/db/fixtures/nedb/insomnia.RequestGroup.db
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/nedb/insomnia.RequestGroup.db
rename to packages/insomnia-inso/src/db/fixtures/nedb/insomnia.RequestGroup.db
diff --git a/packages/insomnia-inso/src/db/__fixtures__/nedb/insomnia.UnitTest.db b/packages/insomnia-inso/src/db/fixtures/nedb/insomnia.UnitTest.db
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/nedb/insomnia.UnitTest.db
rename to packages/insomnia-inso/src/db/fixtures/nedb/insomnia.UnitTest.db
diff --git a/packages/insomnia-inso/src/db/__fixtures__/nedb/insomnia.UnitTestSuite.db b/packages/insomnia-inso/src/db/fixtures/nedb/insomnia.UnitTestSuite.db
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/nedb/insomnia.UnitTestSuite.db
rename to packages/insomnia-inso/src/db/fixtures/nedb/insomnia.UnitTestSuite.db
diff --git a/packages/insomnia-inso/src/db/__fixtures__/nedb/insomnia.Workspace.db b/packages/insomnia-inso/src/db/fixtures/nedb/insomnia.Workspace.db
similarity index 100%
rename from packages/insomnia-inso/src/db/__fixtures__/nedb/insomnia.Workspace.db
rename to packages/insomnia-inso/src/db/fixtures/nedb/insomnia.Workspace.db
diff --git a/packages/insomnia-inso/src/db/__tests__/index.test.js b/packages/insomnia-inso/src/db/index.test.ts
similarity index 74%
rename from packages/insomnia-inso/src/db/__tests__/index.test.js
rename to packages/insomnia-inso/src/db/index.test.ts
index 682f00abf8..45b49e9872 100644
--- a/packages/insomnia-inso/src/db/__tests__/index.test.js
+++ b/packages/insomnia-inso/src/db/index.test.ts
@@ -1,30 +1,31 @@
-// @flow
-
-import { emptyDb, loadDb } from '../index';
-import gitAdapter from '../adapters/git-adapter';
-import neDbAdapter from '../adapters/ne-db-adapter';
-import { globalBeforeAll, globalBeforeEach } from '../../../__jest__/before';
-import logger from '../../logger';
+import { emptyDb, loadDb } from './index';
+import gitAdapter from './adapters/git-adapter';
+import neDbAdapter from './adapters/ne-db-adapter';
+import { globalBeforeAll, globalBeforeEach } from '../jest/before';
+import { logger } from '../logger';
 import path from 'path';
+import { UNKNOWN } from '../types';
 
-jest.mock('../adapters/git-adapter');
-jest.mock('../adapters/ne-db-adapter');
+jest.mock('./adapters/git-adapter');
+jest.mock('./adapters/ne-db-adapter');
 
 describe('loadDb()', () => {
   beforeAll(() => {
     globalBeforeAll();
   });
+
   beforeEach(() => {
     jest.clearAllMocks();
     globalBeforeEach();
   });
 
-  const mock = (mockFn: any) => mockFn;
+  const mock = (mockFn: UNKNOWN) => mockFn;
 
   it('should default to current directory if working dir not defined', async () => {
     mock(gitAdapter).mockResolvedValue(emptyDb());
-    await loadDb({ workingDir: undefined });
-
+    await loadDb({
+      workingDir: undefined,
+    });
     expect(logger.__getLogs().debug).toEqual([
       `Data store configured from git repository at \`${path.resolve('.')}\``,
     ]);
@@ -34,8 +35,10 @@ describe('loadDb()', () => {
 
   it('should load git data from working directory', async () => {
     mock(gitAdapter).mockResolvedValue(emptyDb());
-    await loadDb({ workingDir: 'dir', filterTypes: ['Environment'] });
-
+    await loadDb({
+      workingDir: 'dir',
+      filterTypes: ['Environment'],
+    });
     expect(logger.__getLogs().debug).toEqual([
       `Data store configured from git repository at \`${path.resolve('dir')}\``,
     ]);
@@ -46,8 +49,10 @@ describe('loadDb()', () => {
   it('should load nedb from appDataDir', async () => {
     mock(gitAdapter).mockResolvedValue(emptyDb());
     mock(neDbAdapter).mockResolvedValue(emptyDb());
-    await loadDb({ appDataDir: 'dir', filterTypes: ['Environment'] });
-
+    await loadDb({
+      appDataDir: 'dir',
+      filterTypes: ['Environment'],
+    });
     expect(logger.__getLogs().debug).toEqual([
       `Data store configured from app data directory at \`${path.resolve('dir')}\``,
     ]);
@@ -57,9 +62,9 @@ describe('loadDb()', () => {
 
   it('should not load from git if appDataDir is defined', async () => {
     mock(neDbAdapter).mockResolvedValue(emptyDb());
-
-    await loadDb({ appDataDir: 'dir' });
-
+    await loadDb({
+      appDataDir: 'dir',
+    });
     expect(logger.__getLogs().debug).toEqual([
       `Data store configured from app data directory at \`${path.resolve('dir')}\``,
     ]);
@@ -70,12 +75,10 @@ describe('loadDb()', () => {
   it('should load from neDb if not loaded from git', async () => {
     mock(gitAdapter).mockResolvedValue(null);
     mock(neDbAdapter).mockResolvedValue(emptyDb());
+    await loadDb(); // Cannot assert the full path because it is application data
 
-    await loadDb();
-
-    // Cannot assert the full path because it is application data
     expect(logger.__getLogs().debug).toEqual([
-      expect.stringContaining(`Data store configured from app data directory at`),
+      expect.stringContaining('Data store configured from app data directory at'),
     ]);
     expect(gitAdapter).toHaveBeenCalled();
     expect(neDbAdapter).toHaveBeenCalled();
@@ -84,9 +87,7 @@ describe('loadDb()', () => {
   it('should warn and return empty db if nothing loaded from git or nedb', async () => {
     mock(gitAdapter).mockResolvedValue(null);
     mock(neDbAdapter).mockResolvedValue(null);
-
     const db = await loadDb();
-
     expect(logger.__getLogs().warn).toEqual([
       'No git or app data store found, re-run `inso` with `--verbose` to see tracing information',
     ]);
diff --git a/packages/insomnia-inso/src/db/index.js b/packages/insomnia-inso/src/db/index.ts
similarity index 69%
rename from packages/insomnia-inso/src/db/index.js
rename to packages/insomnia-inso/src/db/index.ts
index 985af21cb1..01d104ad90 100644
--- a/packages/insomnia-inso/src/db/index.js
+++ b/packages/insomnia-inso/src/db/index.ts
@@ -1,4 +1,3 @@
-// @flow
 import type {
   ApiSpec,
   BaseModel,
@@ -11,18 +10,18 @@ import gitAdapter from './adapters/git-adapter';
 import neDbAdapter from './adapters/ne-db-adapter';
 import { getDefaultAppName } from '../util';
 import { getAppDataDir } from '../data-directory';
-import logger from '../logger';
+import { logger } from '../logger';
 import path from 'path';
 
-export type Database = {|
-  ApiSpec: Array<ApiSpec>,
-  Environment: Array<Environment>,
-  Request: Array<BaseModel>,
-  RequestGroup: Array<BaseModel>,
-  Workspace: Array<Workspace>,
-  UnitTestSuite: Array<UnitTestSuite>,
-  UnitTest: Array<UnitTest>,
-|};
+export interface Database {
+  ApiSpec: ApiSpec[];
+  Environment: Environment[];
+  Request: BaseModel[];
+  RequestGroup: BaseModel[];
+  Workspace: Workspace[];
+  UnitTestSuite: UnitTestSuite[];
+  UnitTest: UnitTest[];
+}
 
 export const emptyDb = (): Database => ({
   ApiSpec: [],
@@ -36,36 +35,34 @@ export const emptyDb = (): Database => ({
 
 export type DbAdapter = (
   dir: string,
-  filterTypes?: Array<$Keys<Database>>,
+  filterTypes?: (keyof Database)[],
 ) => Promise<Database | null>;
 
-type Options = {
-  workingDir?: string,
-  appDataDir?: string,
-  filterTypes?: Array<$Keys<Database>>,
-};
+interface Options {
+  workingDir?: string;
+  appDataDir?: string;
+  filterTypes?: (keyof Database)[];
+}
 
 export const loadDb = async ({
   workingDir,
   appDataDir,
   filterTypes,
-}: Options = {}): Promise<Database> => {
-  let db = null;
+}: Options = {}) => {
+  let db: Database | null = null;
 
   // try load from git
   if (!appDataDir) {
     const dir = workingDir || '.';
     db = await gitAdapter(dir, filterTypes);
     db && logger.debug(`Data store configured from git repository at \`${path.resolve(dir)}\``);
-  }
+  } // try load from nedb
 
-  // try load from nedb
   if (!db) {
     const dir = appDataDir || getAppDataDir(getDefaultAppName());
     db = await neDbAdapter(dir, filterTypes);
-    db && logger.debug(`Data store configured from app data directory at \`${path.resolve(dir)}\``);
+    db && logger.debug(`Data store configured from app data directory at \`${path.resolve(dir)}\``); // Try to load from the Designer data dir, if the Core data directory does not exist
 
-    // Try to load from the Designer data dir, if the Core data directory does not exist
     if (!db && !appDataDir) {
       const designerDir = getAppDataDir('Insomnia Designer');
       db = await neDbAdapter(designerDir);
@@ -76,9 +73,8 @@ export const loadDb = async ({
           )}\``,
         );
     }
-  }
+  } // return empty db
 
-  // return empty db
   if (!db) {
     logger.warn(
       'No git or app data store found, re-run `inso` with `--verbose` to see tracing information',
diff --git a/packages/insomnia-inso/src/db/models/__mocks__/enquirer.ts b/packages/insomnia-inso/src/db/models/__mocks__/enquirer.ts
new file mode 100644
index 0000000000..89cac5d01b
--- /dev/null
+++ b/packages/insomnia-inso/src/db/models/__mocks__/enquirer.ts
@@ -0,0 +1,20 @@
+const __constructorMock = jest.fn();
+
+let returnValue = 'test';
+
+module.exports = {
+  __constructorMock,
+  __mockPromptRun: (value: string) => {
+    returnValue = value;
+  },
+  AutoComplete: class {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any -- missing types from enquirer
+    constructor(options: any) {
+      __constructorMock(options);
+    }
+
+    run() {
+      return returnValue;
+    }
+  },
+};
diff --git a/packages/insomnia-inso/src/db/models/__tests__/__snapshots__/api-spec.test.js.snap b/packages/insomnia-inso/src/db/models/__snapshots__/api-spec.test.ts.snap
similarity index 100%
rename from packages/insomnia-inso/src/db/models/__tests__/__snapshots__/api-spec.test.js.snap
rename to packages/insomnia-inso/src/db/models/__snapshots__/api-spec.test.ts.snap
diff --git a/packages/insomnia-inso/src/db/models/__tests__/__snapshots__/environment.test.js.snap b/packages/insomnia-inso/src/db/models/__snapshots__/environment.test.ts.snap
similarity index 100%
rename from packages/insomnia-inso/src/db/models/__tests__/__snapshots__/environment.test.js.snap
rename to packages/insomnia-inso/src/db/models/__snapshots__/environment.test.ts.snap
diff --git a/packages/insomnia-inso/src/db/models/__tests__/__snapshots__/unit-test-suite.test.js.snap b/packages/insomnia-inso/src/db/models/__snapshots__/unit-test-suite.test.ts.snap
similarity index 100%
rename from packages/insomnia-inso/src/db/models/__tests__/__snapshots__/unit-test-suite.test.js.snap
rename to packages/insomnia-inso/src/db/models/__snapshots__/unit-test-suite.test.ts.snap
diff --git a/packages/insomnia-inso/src/db/models/api-spec.js b/packages/insomnia-inso/src/db/models/api-spec.js
deleted file mode 100644
index b0371b337b..0000000000
--- a/packages/insomnia-inso/src/db/models/api-spec.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// @flow
-import type { Database } from '../index';
-import type { ApiSpec } from './types';
-import { ensureSingleOrNone, generateIdIsh, getDbChoice, matchIdIsh } from './util';
-import { AutoComplete } from 'enquirer';
-import logger from '../../logger';
-
-const entity = 'api specification';
-
-export const loadApiSpec = (db: Database, identifier: string): ?ApiSpec => {
-  logger.trace('Load %s with identifier `%s` from data store', entity, identifier);
-  const items = db.ApiSpec.filter(s => matchIdIsh(s, identifier) || s.fileName === identifier);
-  logger.trace('Found %d.', items.length);
-
-  return ensureSingleOrNone(items, entity);
-};
-
-export const promptApiSpec = async (db: Database, ci: boolean): Promise<?ApiSpec> => {
-  if (ci || !db.ApiSpec.length) {
-    return null;
-  }
-
-  const prompt = new AutoComplete({
-    name: 'apiSpec',
-    message: 'Select an API Specification',
-    choices: db.ApiSpec.map(s => getDbChoice(generateIdIsh(s), s.fileName)),
-  });
-
-  logger.trace('Prompt for %s', entity);
-  const [idIsh] = (await prompt.run()).split(' - ').reverse();
-  return loadApiSpec(db, idIsh);
-};
diff --git a/packages/insomnia-inso/src/db/models/__tests__/api-spec.test.js b/packages/insomnia-inso/src/db/models/api-spec.test.ts
similarity index 83%
rename from packages/insomnia-inso/src/db/models/__tests__/api-spec.test.js
rename to packages/insomnia-inso/src/db/models/api-spec.test.ts
index feb2f81e8b..5b62cfc4ab 100644
--- a/packages/insomnia-inso/src/db/models/__tests__/api-spec.test.js
+++ b/packages/insomnia-inso/src/db/models/api-spec.test.ts
@@ -1,32 +1,28 @@
-// @flow
-import type { Database } from '../../index';
-import { emptyDb } from '../../index';
-import type { ApiSpec } from '../types';
-import { generateIdIsh } from '../util';
+import type { Database } from '../index';
+import { emptyDb } from '../index';
+import type { ApiSpec } from './types';
+import { generateIdIsh } from './util';
 import enquirer from 'enquirer';
-import { loadApiSpec, promptApiSpec } from '../api-spec';
+import { loadApiSpec, promptApiSpec } from './api-spec';
 
 jest.mock('enquirer');
 
 describe('apiSpec', () => {
   let db: Database = emptyDb();
 
-  const spec: $Shape<ApiSpec> = {
+  const spec: Partial<ApiSpec> = {
     _id: 'spc_1234567890',
     fileName: 'fileName',
-  };
+  } as ApiSpec;
 
   beforeEach(() => {
     db = emptyDb();
-
-    const dummySpec: $Shape<ApiSpec> = {
+    const dummySpec: Partial<ApiSpec> = {
       _id: 'spc_dummy',
       fileName: 'dummy spec',
-    };
-
+    } as ApiSpec;
     db.ApiSpec.push(spec);
     db.ApiSpec.push(dummySpec);
-
     jest.clearAllMocks();
   });
 
@@ -50,13 +46,11 @@ describe('apiSpec', () => {
       enquirer.__mockPromptRun('fileName - spc_123456');
 
       const result = await promptApiSpec(db, false);
-
       expect(result).toBe(spec);
     });
 
     it('should match snapshot of autocomplete config', async () => {
       await promptApiSpec(db, false);
-
       expect(enquirer.__constructorMock.mock.calls[0][0]).toMatchSnapshot();
     });
   });
@@ -68,14 +62,13 @@ describe('apiSpec', () => {
 
     it.each([generateIdIsh(spec), spec._id, spec.fileName])(
       'should return spec with identifier: %o',
-      identifier => {
+      (identifier) => {
         expect(loadApiSpec(db, identifier)).toBe(spec);
       },
     );
 
     it('should throw error if multiple specs matched', () => {
       db.ApiSpec.push({ ...spec });
-
       expect(() => loadApiSpec(db, spec._id)).toThrowError();
     });
   });
diff --git a/packages/insomnia-inso/src/db/models/api-spec.ts b/packages/insomnia-inso/src/db/models/api-spec.ts
new file mode 100644
index 0000000000..12d825e186
--- /dev/null
+++ b/packages/insomnia-inso/src/db/models/api-spec.ts
@@ -0,0 +1,46 @@
+import type { Database } from '../index';
+import type { ApiSpec } from './types';
+import {
+  ensureSingleOrNone,
+  generateIdIsh,
+  getDbChoice,
+  matchIdIsh,
+} from './util';
+// @ts-expect-error the enquirer types are incomplete https://github.com/enquirer/enquirer/pull/307
+import { AutoComplete } from 'enquirer';
+import { logger } from '../../logger';
+const entity = 'api specification';
+
+export const loadApiSpec = (
+  db: Database,
+  identifier: string,
+): ApiSpec | null | undefined => {
+  logger.trace(
+    'Load %s with identifier `%s` from data store',
+    entity,
+    identifier,
+  );
+  const items = db.ApiSpec.filter(
+    spec => matchIdIsh(spec, identifier) || spec.fileName === identifier,
+  );
+  logger.trace('Found %d.', items.length);
+  return ensureSingleOrNone(items, entity);
+};
+
+export const promptApiSpec = async (
+  db: Database,
+  ci: boolean,
+): Promise<ApiSpec | null | undefined> => {
+  if (ci || !db.ApiSpec.length) {
+    return null;
+  }
+
+  const prompt = new AutoComplete({
+    name: 'apiSpec',
+    message: 'Select an API Specification',
+    choices: db.ApiSpec.map(s => getDbChoice(generateIdIsh(s), s.fileName)),
+  });
+  logger.trace('Prompt for %s', entity);
+  const [idIsh] = (await prompt.run()).split(' - ').reverse();
+  return loadApiSpec(db, idIsh);
+};
diff --git a/packages/insomnia-inso/src/db/models/__tests__/environment.test.js b/packages/insomnia-inso/src/db/models/environment.test.ts
similarity index 81%
rename from packages/insomnia-inso/src/db/models/__tests__/environment.test.js
rename to packages/insomnia-inso/src/db/models/environment.test.ts
index e692bf2cfa..50135bc8c5 100644
--- a/packages/insomnia-inso/src/db/models/__tests__/environment.test.js
+++ b/packages/insomnia-inso/src/db/models/environment.test.ts
@@ -1,55 +1,59 @@
-// @flow
-import type { Database } from '../../index';
-import { emptyDb } from '../../index';
-import type { Environment, Workspace } from '../types';
-import { generateIdIsh } from '../util';
-import enquirer from 'enquirer';
-import { loadEnvironment, promptEnvironment } from '../environment';
-import { globalBeforeAll, globalBeforeEach } from '../../../../__jest__/before';
+import type { Database } from '../index';
+import { emptyDb } from '../index';
+import type { Environment, Workspace } from './types';
+import { generateIdIsh } from './util';
+import _enquirer from 'enquirer';
+import { loadEnvironment, promptEnvironment } from './environment';
+import { globalBeforeAll, globalBeforeEach } from '../../jest/before';
 
 jest.mock('enquirer');
+const enquirer = _enquirer as unknown as jest.Mock & {
+  __mockPromptRun: (str: string) => void;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- missing types from enquirer
+  __constructorMock: jest.Mock;
+};
 
 describe('Environment', () => {
   beforeAll(() => {
     globalBeforeAll();
   });
+
   beforeEach(() => {
     globalBeforeEach();
   });
 
   let db: Database = emptyDb();
 
-  const workspace: $Shape<Workspace> = {
+  const workspace = {
     _id: 'wrk_1234567890',
     name: 'workspace name',
-  };
+  } as Workspace;
 
-  const environment: $Shape<Environment> = {
+  const environment = {
     _id: 'env_1234567890',
     name: 'base env',
     parentId: workspace._id,
-  };
+  } as Environment;
 
-  const subEnvironment: $Shape<Environment> = {
+  const subEnvironment = {
     _id: 'env_env_1234567890',
     name: 'sub env',
     parentId: environment._id,
-  };
+  } as Environment;
 
   beforeEach(() => {
     db = emptyDb();
 
-    const dummySubEnv: $Shape<Environment> = {
+    const dummySubEnv = {
       _id: 'env_env_dummy',
       name: 'dummy sub env',
       parentId: environment._id,
-    };
+    } as Environment;
 
     db.Workspace.push(workspace);
     db.Environment.push(environment);
     db.Environment.push(subEnvironment);
     db.Environment.push(dummySubEnv);
-
     jest.clearAllMocks();
   });
 
@@ -60,7 +64,6 @@ describe('Environment', () => {
 
     it('should return null if no environments exist', () => {
       db.Environment = [];
-
       expect(promptEnvironment(db, false, workspace._id)).resolves.toBeNull();
     });
 
@@ -81,7 +84,6 @@ describe('Environment', () => {
 
     it('should match snapshot of autocomplete config', async () => {
       await promptEnvironment(db, false, workspace._id);
-
       expect(enquirer.__constructorMock.mock.calls[0][0]).toMatchSnapshot();
     });
   });
@@ -89,7 +91,6 @@ describe('Environment', () => {
   describe('loadEnvironment()', () => {
     it('should return null if no environments exist', () => {
       db.Environment = [];
-
       expect(loadEnvironment(db, workspace._id, environment._id)).toBeNull();
     });
 
@@ -104,7 +105,7 @@ describe('Environment', () => {
 
     it.each([generateIdIsh(subEnvironment), subEnvironment._id, subEnvironment.name])(
       'should return the sub environment if matched with id: %s',
-      identifier => {
+      () => {
         expect(loadEnvironment(db, workspace._id, subEnvironment._id)).toBe(subEnvironment);
       },
     );
diff --git a/packages/insomnia-inso/src/db/models/environment.js b/packages/insomnia-inso/src/db/models/environment.ts
similarity index 68%
rename from packages/insomnia-inso/src/db/models/environment.js
rename to packages/insomnia-inso/src/db/models/environment.ts
index 5baedbbb47..45be992d0b 100644
--- a/packages/insomnia-inso/src/db/models/environment.js
+++ b/packages/insomnia-inso/src/db/models/environment.ts
@@ -1,15 +1,17 @@
-// @flow
 import type { Database } from '../index';
 import type { Environment } from './types';
+// @ts-expect-error the enquirer types are incomplete https://github.com/enquirer/enquirer/pull/307
 import { AutoComplete } from 'enquirer';
 import { ensureSingle, generateIdIsh, getDbChoice, matchIdIsh } from './util';
-import logger from '../../logger';
+import { logger } from '../../logger';
 
 const loadBaseEnvironmentForWorkspace = (db: Database, workspaceId: string): Environment => {
-  logger.trace('Load base environment for the workspace `%s` from data store', workspaceId);
+  logger.trace(
+    'Load base environment for the workspace `%s` from data store',
+    workspaceId,
+  );
   const items = db.Environment.filter(e => e.parentId === workspaceId);
   logger.trace('Found %d.', items.length);
-
   return ensureSingle(items, 'base environment');
 };
 
@@ -17,14 +19,16 @@ export const loadEnvironment = (
   db: Database,
   workspaceId: string,
   identifier?: string,
-): ?Environment => {
+): Environment | null | undefined => {
   if (!db.Environment.length) {
     return null;
   }
 
   // Get the sub environments
   const baseWorkspaceEnv = loadBaseEnvironmentForWorkspace(db, workspaceId);
-  const subEnvs = db.Environment.filter(e => e.parentId === baseWorkspaceEnv._id);
+  const subEnvs = db.Environment.filter(
+    env => env.parentId === baseWorkspaceEnv._id,
+  );
 
   // If no identifier, return base environmenmt
   if (!identifier) {
@@ -32,10 +36,14 @@ export const loadEnvironment = (
     return baseWorkspaceEnv;
   }
 
-  logger.trace('Load sub environment with identifier `%s` from data store', identifier);
-  const items = subEnvs.filter(e => matchIdIsh(e, identifier) || e.name === identifier);
+  logger.trace(
+    'Load sub environment with identifier `%s` from data store',
+    identifier,
+  );
+  const items = subEnvs.filter(
+    env => matchIdIsh(env, identifier) || env.name === identifier,
+  );
   logger.trace('Found %d', items.length);
-
   return ensureSingle(items, 'sub environment');
 };
 
@@ -43,14 +51,16 @@ export const promptEnvironment = async (
   db: Database,
   ci: boolean,
   workspaceId: string,
-): Promise<?Environment> => {
+): Promise<Environment | null | undefined> => {
   if (ci || !db.Environment.length) {
     return null;
   }
 
   // Get the sub environments
   const baseWorkspaceEnv = loadBaseEnvironmentForWorkspace(db, workspaceId);
-  const subEnvs = db.Environment.filter(e => e.parentId === baseWorkspaceEnv._id);
+  const subEnvs = db.Environment.filter(
+    e => e.parentId === baseWorkspaceEnv._id,
+  );
 
   if (!subEnvs.length) {
     logger.trace('No sub environments found, using base environment');
@@ -59,10 +69,9 @@ export const promptEnvironment = async (
 
   const prompt = new AutoComplete({
     name: 'environment',
-    message: `Select an environment`,
+    message: 'Select an environment',
     choices: subEnvs.map(e => getDbChoice(generateIdIsh(e, 14), e.name)),
   });
-
   logger.trace('Prompt for environment');
   const [idIsh] = (await prompt.run()).split(' - ').reverse();
   return loadEnvironment(db, workspaceId, idIsh);
diff --git a/packages/insomnia-inso/src/db/models/types.js b/packages/insomnia-inso/src/db/models/types.js
deleted file mode 100644
index 85683946f4..0000000000
--- a/packages/insomnia-inso/src/db/models/types.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// @flow
-
-// Simplified and extracted from insomnia-app/app/models/*
-
-export type BaseModel = {
-  _id: string,
-  type: string,
-  parentId: string,
-};
-
-type BaseApiSpec = {
-  fileName: string,
-  contentType: 'json' | 'yaml',
-  contents: string,
-};
-
-export type ApiSpec = BaseModel & BaseApiSpec;
-
-type BaseUnitTestSuite = {
-  name: string,
-};
-
-export type UnitTestSuite = BaseModel & BaseUnitTestSuite;
-
-type BaseUnitTest = {
-  name: string,
-  code: string,
-  requestId: string | null,
-};
-
-export type UnitTest = BaseModel & BaseUnitTest;
-
-type BaseEnvironment = {
-  name: string,
-  metaSortKey: number,
-};
-
-export type Environment = BaseModel & BaseEnvironment;
-
-type BaseWorkspace = {
-  name: string,
-  description: string,
-};
-
-export type Workspace = BaseModel & BaseWorkspace;
diff --git a/packages/insomnia-inso/src/db/models/types.ts b/packages/insomnia-inso/src/db/models/types.ts
new file mode 100644
index 0000000000..913aff9fc8
--- /dev/null
+++ b/packages/insomnia-inso/src/db/models/types.ts
@@ -0,0 +1,42 @@
+// Simplified and extracted from insomnia-app/app/models/*
+export interface BaseModel {
+    _id: string
+    type: string
+    parentId: string
+}
+
+interface BaseApiSpec {
+    fileName: string
+    contentType: 'json' | 'yaml'
+    contents: string
+}
+
+export type ApiSpec = BaseModel & BaseApiSpec
+
+interface BaseUnitTestSuite {
+    name: string
+}
+
+export type UnitTestSuite = BaseModel & BaseUnitTestSuite
+
+interface BaseUnitTest {
+    name: string
+    code: string
+    requestId: string | null
+}
+
+export type UnitTest = BaseModel & BaseUnitTest
+
+interface BaseEnvironment {
+    name: string
+    metaSortKey: number
+}
+
+export type Environment = BaseModel & BaseEnvironment
+
+interface BaseWorkspace {
+    name: string
+    description: string
+}
+
+export type Workspace = BaseModel & BaseWorkspace
diff --git a/packages/insomnia-inso/src/db/models/__tests__/unit-test-suite.test.js b/packages/insomnia-inso/src/db/models/unit-test-suite.test.ts
similarity index 84%
rename from packages/insomnia-inso/src/db/models/__tests__/unit-test-suite.test.js
rename to packages/insomnia-inso/src/db/models/unit-test-suite.test.ts
index 72abdf67aa..6b5faa8260 100644
--- a/packages/insomnia-inso/src/db/models/__tests__/unit-test-suite.test.js
+++ b/packages/insomnia-inso/src/db/models/unit-test-suite.test.ts
@@ -1,34 +1,33 @@
-// @flow
-import type { Database } from '../../index';
-import { emptyDb } from '../../index';
-import type { ApiSpec, UnitTestSuite, Workspace } from '../types';
+import type { Database } from '../index';
+import { emptyDb } from '../index';
+import type { ApiSpec, UnitTestSuite, Workspace } from './types';
 import enquirer from 'enquirer';
-import { generateIdIsh } from '../util';
-import { loadTestSuites, promptTestSuites } from '../unit-test-suite';
+import { generateIdIsh } from './util';
+import { loadTestSuites, promptTestSuites } from './unit-test-suite';
 
 jest.mock('enquirer');
 
 describe('Unit Test Suite', () => {
   let db: Database = emptyDb();
 
-  const workspace: $Shape<Workspace> = {
+  const workspace: Partial<Workspace> = {
     _id: 'wrk_1234567890',
     name: 'workspace name',
   };
 
-  const spec: $Shape<ApiSpec> = {
+  const spec: Partial<ApiSpec> = {
     _id: 'spc_1234567890',
     fileName: 'spec name',
     parentId: workspace._id,
   };
 
-  const suite1: $Shape<UnitTestSuite> = {
+  const suite1: Partial<UnitTestSuite> = {
     _id: 'uts_1234567890',
     name: 'suite one',
     parentId: workspace._id,
   };
 
-  const suite2: $Shape<UnitTestSuite> = {
+  const suite2: Partial<UnitTestSuite> = {
     _id: 'uts_987654321',
     name: 'suite two',
     parentId: workspace._id,
@@ -36,19 +35,16 @@ describe('Unit Test Suite', () => {
 
   beforeEach(() => {
     db = emptyDb();
-
-    const dummySuite: $Shape<UnitTestSuite> = {
+    const dummySuite: Partial<UnitTestSuite> = {
       _id: 'uts_dummy',
       name: 'dummy suite',
       parentId: 'dummy parent',
     };
-
     db.Workspace.push(workspace);
     db.ApiSpec.push(spec);
     db.UnitTestSuite.push(suite1);
     db.UnitTestSuite.push(suite2);
     db.UnitTestSuite.push(dummySuite);
-
     jest.clearAllMocks();
   });
 
@@ -72,18 +68,15 @@ describe('Unit Test Suite', () => {
       enquirer.__mockPromptRun('suite one - uts_123456');
 
       const result = await promptTestSuites(db, false);
-
       expect(result).toHaveLength(1);
       expect(result).toContain(suite1);
     });
 
     it('should match snapshot of autocomplete config', async () => {
       await promptTestSuites(db, false);
-
       expect(enquirer.__constructorMock.mock.calls[0][0]).toMatchSnapshot();
     });
   });
-
   describe('loadTestSuites()', () => {
     it('should return empty array if no suites matched', () => {
       expect(loadTestSuites(db, 'not-found')).toHaveLength(0);
@@ -91,7 +84,7 @@ describe('Unit Test Suite', () => {
 
     it.each([generateIdIsh(workspace), workspace._id, workspace.name])(
       'should load all suites that match by workspace id: %o',
-      identifier => {
+      (identifier) => {
         const result = loadTestSuites(db, identifier);
         expect(result).toHaveLength(2);
         expect(result).toContain(suite1);
@@ -101,7 +94,7 @@ describe('Unit Test Suite', () => {
 
     it.each([generateIdIsh(spec), spec._id, spec.fileName])(
       'should load all suites that match by apiSpec id: %o',
-      identifier => {
+      (identifier) => {
         const result = loadTestSuites(db, identifier);
         expect(result).toHaveLength(2);
         expect(result).toContain(suite1);
@@ -111,7 +104,7 @@ describe('Unit Test Suite', () => {
 
     it.each([generateIdIsh(suite1), suite1._id, suite1.name])(
       'should load single suite that matches by id: %o',
-      identifier => {
+      (identifier) => {
         const result = loadTestSuites(db, identifier);
         expect(result).toHaveLength(1);
         expect(result).toContain(suite1);
diff --git a/packages/insomnia-inso/src/db/models/unit-test-suite.js b/packages/insomnia-inso/src/db/models/unit-test-suite.ts
similarity index 55%
rename from packages/insomnia-inso/src/db/models/unit-test-suite.js
rename to packages/insomnia-inso/src/db/models/unit-test-suite.ts
index a35f697b3d..34ea81a109 100644
--- a/packages/insomnia-inso/src/db/models/unit-test-suite.js
+++ b/packages/insomnia-inso/src/db/models/unit-test-suite.ts
@@ -1,48 +1,63 @@
-// @flow
 import type { Database } from '../index';
 import type { UnitTestSuite } from './types';
 import { loadApiSpec } from './api-spec';
+// @ts-expect-error the enquirer types are incomplete https://github.com/enquirer/enquirer/pull/307
 import { AutoComplete } from 'enquirer';
 import flattenDeep from 'lodash.flattendeep';
-import { ensureSingleOrNone, generateIdIsh, getDbChoice, matchIdIsh } from './util';
+import {
+  ensureSingleOrNone,
+  generateIdIsh,
+  getDbChoice,
+  matchIdIsh,
+} from './util';
 import { loadWorkspace } from './workspace';
-import logger from '../../logger';
+import { logger } from '../../logger';
 
-export const loadUnitTestSuite = (db: Database, identifier: string): ?UnitTestSuite => {
+export const loadUnitTestSuite = (
+  db: Database,
+  identifier: string,
+): UnitTestSuite | null | undefined => {
   // Identifier is for one specific suite; find it
-  logger.trace('Load unit test suite with identifier `%s` from data store', identifier);
-  const items = db.UnitTestSuite.filter(s => matchIdIsh(s, identifier) || s.name === identifier);
+  logger.trace(
+    'Load unit test suite with identifier `%s` from data store',
+    identifier,
+  );
+  const items = db.UnitTestSuite.filter(
+    suite => matchIdIsh(suite, identifier) || suite.name === identifier,
+  );
   logger.trace('Found %d.', items.length);
-
   return ensureSingleOrNone(items, 'unit test suite');
 };
-
-export const loadTestSuites = (db: Database, identifier: string): Array<UnitTestSuite> => {
+export const loadTestSuites = (
+  db: Database,
+  identifier: string,
+): UnitTestSuite[] => {
   const apiSpec = loadApiSpec(db, identifier);
-  const workspace = loadWorkspace(db, apiSpec?.parentId || identifier);
+  const workspace = loadWorkspace(db, apiSpec?.parentId || identifier); // if identifier is for an apiSpec or a workspace, return all suites for that workspace
 
-  // if identifier is for an apiSpec or a workspace, return all suites for that workspace
   if (workspace) {
     return db.UnitTestSuite.filter(s => s.parentId === workspace._id);
-  }
+  } // load particular suite
 
-  // load particular suite
   const result = loadUnitTestSuite(db, identifier);
   return result ? [result] : [];
 };
-
 export const promptTestSuites = async (
   db: Database,
   ci: boolean,
-): Promise<Array<UnitTestSuite>> => {
+): Promise<UnitTestSuite[]> => {
   if (ci) {
     return [];
   }
 
   const choices = db.ApiSpec.map(spec => [
     getDbChoice(generateIdIsh(spec), spec.fileName),
-    ...db.UnitTestSuite.filter(suite => suite.parentId === spec.parentId).map(suite =>
-      getDbChoice(generateIdIsh(suite), suite.name, { indent: 1 }),
+    ...db.UnitTestSuite.filter(
+      suite => suite.parentId === spec.parentId,
+    ).map(suite =>
+      getDbChoice(generateIdIsh(suite), suite.name, {
+        indent: 1,
+      }),
     ),
   ]);
 
@@ -55,7 +70,6 @@ export const promptTestSuites = async (
     message: 'Select a document or unit test suite',
     choices: flattenDeep(choices),
   });
-
   logger.trace('Prompt for document or test suite');
   const [idIsh] = (await prompt.run()).split(' - ').reverse();
   return loadTestSuites(db, idIsh);
diff --git a/packages/insomnia-inso/src/db/models/util.js b/packages/insomnia-inso/src/db/models/util.js
deleted file mode 100644
index 446e8738ee..0000000000
--- a/packages/insomnia-inso/src/db/models/util.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// @flow
-import type { BaseModel } from './types';
-import { InsoError } from '../../errors';
-
-export const matchIdIsh = ({ _id }: BaseModel, identifier: string) => _id.startsWith(identifier);
-export const generateIdIsh = ({ _id }: BaseModel, length: number = 10) => _id.substr(0, length);
-
-function indent(level: number, code: string, tab: string = '  |'): string {
-  if (!level || level < 0) {
-    return code;
-  }
-
-  const prefix = new Array(level + 1).join(tab);
-  return `${prefix} ${code}`;
-}
-
-export const getDbChoice = (
-  idIsh: string,
-  message: string,
-  config: { indent?: number, hint?: string } = {},
-) => ({
-  name: idIsh,
-  message: indent(config.indent || 0, message),
-  value: `${message} - ${idIsh}`,
-  hint: config.hint || `${idIsh}`,
-});
-
-export const ensureSingleOrNone = <T>(items: Array<T>, entity: string): ?T => {
-  if (items.length === 1) {
-    return items[0];
-  }
-
-  if (items.length === 0) {
-    return null;
-  }
-
-  throw new InsoError(
-    `Expected single or no ${entity} in the data store, but found multiple (${items.length}).`,
-  );
-};
-
-export const ensureSingle = <T>(items: Array<T>, entity: string): T => {
-  if (items.length === 1) {
-    return items[0];
-  }
-
-  if (items.length === 0) {
-    throw new InsoError(`Expected single ${entity} in the data store, but found none.`);
-  }
-
-  throw new InsoError(
-    `Expected single ${entity} in the data store, but found multiple (${items.length}).`,
-  );
-};
diff --git a/packages/insomnia-inso/src/db/models/util.ts b/packages/insomnia-inso/src/db/models/util.ts
new file mode 100644
index 0000000000..8b331e6462
--- /dev/null
+++ b/packages/insomnia-inso/src/db/models/util.ts
@@ -0,0 +1,63 @@
+import type { BaseModel } from './types';
+import { InsoError } from '../../errors';
+
+export const matchIdIsh = ({ _id }: BaseModel, identifier: string) =>
+    _id.startsWith(identifier);
+
+export const generateIdIsh = ({ _id }: BaseModel, length = 10) =>
+    _id.substr(0, length);
+
+function indent(level: number, code: string, tab = '  |'): string {
+    if (!level || level < 0) {
+        return code;
+    }
+
+    const prefix = new Array(level + 1).join(tab);
+    return `${prefix} ${code}`;
+}
+
+export const getDbChoice = (
+    idIsh: string,
+    message: string,
+    config: {
+        indent?: number
+        hint?: string
+    } = {},
+) => ({
+    name: idIsh,
+    message: indent(config.indent || 0, message),
+    value: `${message} - ${idIsh}`,
+    hint: config.hint || `${idIsh}`,
+});
+
+export const ensureSingleOrNone = <T>(
+    items: T[],
+    entity: string,
+): T | null | undefined => {
+    if (items.length === 1) {
+        return items[0];
+    }
+
+    if (items.length === 0) {
+        return null;
+    }
+
+    throw new InsoError(
+        `Expected single or no ${entity} in the data store, but found multiple (${items.length}).`,
+    );
+};
+export const ensureSingle = <T>(items: T[], entity: string): T => {
+    if (items.length === 1) {
+        return items[0];
+    }
+
+    if (items.length === 0) {
+        throw new InsoError(
+            `Expected single ${entity} in the data store, but found none.`,
+        );
+    }
+
+    throw new InsoError(
+        `Expected single ${entity} in the data store, but found multiple (${items.length}).`,
+    );
+};
diff --git a/packages/insomnia-inso/src/db/models/workspace.js b/packages/insomnia-inso/src/db/models/workspace.js
deleted file mode 100644
index 961b154585..0000000000
--- a/packages/insomnia-inso/src/db/models/workspace.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// @flow
-import type { Database } from '../index';
-import type { Workspace } from './types';
-import { ensureSingleOrNone, matchIdIsh } from './util';
-import logger from '../../logger';
-
-export const loadWorkspace = (db: Database, identifier: string): ?Workspace => {
-  logger.trace('Load workspace with identifier `%s` from data store', identifier);
-  const items = db.Workspace.filter(s => matchIdIsh(s, identifier) || s.name === identifier);
-  logger.trace('Found %d.', items.length);
-
-  return ensureSingleOrNone(items, 'workspace');
-};
diff --git a/packages/insomnia-inso/src/db/models/__tests__/workspace.test.js b/packages/insomnia-inso/src/db/models/workspace.test.ts
similarity index 72%
rename from packages/insomnia-inso/src/db/models/__tests__/workspace.test.js
rename to packages/insomnia-inso/src/db/models/workspace.test.ts
index e4efa306fd..da1fff4f02 100644
--- a/packages/insomnia-inso/src/db/models/__tests__/workspace.test.js
+++ b/packages/insomnia-inso/src/db/models/workspace.test.ts
@@ -1,26 +1,22 @@
-// @flow
-import type { Database } from '../../index';
-import { emptyDb } from '../../index';
-import type { Workspace } from '../types';
-import { generateIdIsh } from '../util';
-import { loadWorkspace } from '../workspace';
+import type { Database } from '../index';
+import { emptyDb } from '../index';
+import type { Workspace } from './types';
+import { generateIdIsh } from './util';
+import { loadWorkspace } from './workspace';
 
 describe('workspace', () => {
   let db: Database = emptyDb();
-
-  const workspace: $Shape<Workspace> = {
+  const workspace: Partial<Workspace> = {
     _id: 'wrk_1234567890',
     name: 'workspace name',
   };
 
   beforeEach(() => {
     db = emptyDb();
-
-    const dummyWorkspace: $Shape<Workspace> = {
+    const dummyWorkspace: Partial<Workspace> = {
       _id: 'wrk_dummy',
       name: 'dummy workspace',
     };
-
     db.Workspace.push(workspace);
     db.Workspace.push(dummyWorkspace);
   });
@@ -32,14 +28,13 @@ describe('workspace', () => {
 
     it.each([generateIdIsh(workspace), workspace._id, workspace.name])(
       'should return workspace with identifier: %o',
-      identifier => {
+      (identifier) => {
         expect(loadWorkspace(db, identifier)).toBe(workspace);
       },
     );
 
     it('should throw error if multiple workspace matched', () => {
       db.Workspace.push({ ...workspace });
-
       expect(() => loadWorkspace(db, workspace._id)).toThrowError();
     });
   });
diff --git a/packages/insomnia-inso/src/db/models/workspace.ts b/packages/insomnia-inso/src/db/models/workspace.ts
new file mode 100644
index 0000000000..2de3871a31
--- /dev/null
+++ b/packages/insomnia-inso/src/db/models/workspace.ts
@@ -0,0 +1,15 @@
+import type { Database } from '../index';
+import { ensureSingleOrNone, matchIdIsh } from './util';
+import { logger } from '../../logger';
+
+export const loadWorkspace = (db: Database, identifier: string) => {
+    logger.trace(
+        'Load workspace with identifier `%s` from data store',
+        identifier,
+    );
+    const items = db.Workspace.filter(workspace => (
+      matchIdIsh(workspace, identifier) || workspace.name === identifier
+    ));
+    logger.trace('Found %d.', items.length);
+    return ensureSingleOrNone(items, 'workspace');
+};
diff --git a/packages/insomnia-inso/src/errors.js b/packages/insomnia-inso/src/errors.ts
similarity index 88%
rename from packages/insomnia-inso/src/errors.js
rename to packages/insomnia-inso/src/errors.ts
index d923897692..944a312db1 100644
--- a/packages/insomnia-inso/src/errors.js
+++ b/packages/insomnia-inso/src/errors.ts
@@ -1,9 +1,7 @@
-// @flow
-
-import logger from './logger';
+import { logger } from './logger';
 
 export class InsoError extends Error {
-  cause: ?Error;
+  cause?: Error | null;
 
   constructor(message: string, cause?: Error) {
     super(message);
@@ -19,5 +17,6 @@ export const handleError = (err?: Error) => {
   } else if (err) {
     logger.error(err);
   }
+
   logger.info('To view tracing information, re-run `inso` with `--verbose`');
 };
diff --git a/packages/insomnia-inso/src/fixtures/.insorc-blank.yaml b/packages/insomnia-inso/src/fixtures/.insorc-blank.yaml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/insomnia-inso/src/__fixtures__/.insorc-missing-properties.yaml b/packages/insomnia-inso/src/fixtures/.insorc-missing-properties.yaml
similarity index 100%
rename from packages/insomnia-inso/src/__fixtures__/.insorc-missing-properties.yaml
rename to packages/insomnia-inso/src/fixtures/.insorc-missing-properties.yaml
diff --git a/packages/insomnia-inso/src/__fixtures__/.insorc-with-scripts.yaml b/packages/insomnia-inso/src/fixtures/.insorc-with-scripts.yaml
similarity index 100%
rename from packages/insomnia-inso/src/__fixtures__/.insorc-with-scripts.yaml
rename to packages/insomnia-inso/src/fixtures/.insorc-with-scripts.yaml
diff --git a/packages/insomnia-inso/src/__fixtures__/.insorc.yaml b/packages/insomnia-inso/src/fixtures/.insorc.yaml
similarity index 100%
rename from packages/insomnia-inso/src/__fixtures__/.insorc.yaml
rename to packages/insomnia-inso/src/fixtures/.insorc.yaml
diff --git a/packages/insomnia-inso/src/__tests__/get-options.test.js b/packages/insomnia-inso/src/get-options.test.ts
similarity index 73%
rename from packages/insomnia-inso/src/__tests__/get-options.test.js
rename to packages/insomnia-inso/src/get-options.test.ts
index 202e925f04..b4679e3180 100644
--- a/packages/insomnia-inso/src/__tests__/get-options.test.js
+++ b/packages/insomnia-inso/src/get-options.test.ts
@@ -1,31 +1,28 @@
-// @flow
 import commander from 'commander';
-import getOptions, { extractCommandOptions, loadCosmiConfig } from '../get-options';
+import { getOptions, extractCommandOptions, loadCosmiConfig } from './get-options';
 import path from 'path';
+import { noop } from './util';
 
 jest.unmock('cosmiconfig');
 
-const fixturesDir = path.join('src', '__fixtures__');
+const fixturesDir = path.join('src', 'fixtures');
 
 describe('extractCommandOptions()', () => {
   it('should combine options from all commands into one object', () => {
     const command = new commander.Command('command').exitOverride();
-
     command
       .command('subCommand')
       .option('-s, --subCmd')
-      .action(cmd => {
+      .action((cmd) => {
         expect(extractCommandOptions(cmd)).toEqual({
           global: true,
           subCmd: true,
         });
       });
-
     const parent = new commander.Command()
       .exitOverride()
       .option('-g, --global')
       .addCommand(command);
-
     parent.parse('self inso command subCommand --global --subCmd'.split(' '));
   });
 });
@@ -33,23 +30,26 @@ describe('extractCommandOptions()', () => {
 describe('loadCosmiConfig()', () => {
   it('should load .insorc.yaml config file in fixtures dir', () => {
     const result = loadCosmiConfig(path.join(fixturesDir, '.insorc.yaml'));
-
     expect(result).toEqual({
       __configFile: {
-        options: { appDataDir: 'configFile', workingDir: 'workingDir', ci: true },
-        scripts: { lint: 'inso lint spec' },
+        options: {
+          appDataDir: 'configFile',
+          workingDir: 'workingDir',
+          ci: true,
+        },
+        scripts: {
+          lint: 'inso lint spec',
+        },
         filePath: path.resolve(fixturesDir, '.insorc.yaml'),
       },
     });
-
     expect(result.__configFile?.options?.shouldBeIgnored).toBe(undefined);
   });
 
   it('should return empty object and report error if specified config file not found', () => {
-    const consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
-    const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+    const consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(noop);
+    const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(noop);
     const result = loadCosmiConfig('not-found.yaml');
-
     expect(result).toEqual({});
     expect(consoleLogSpy).toHaveBeenCalledWith('Could not find config file at not-found.yaml.');
     expect(consoleErrorSpy).toHaveBeenCalled();
@@ -74,34 +74,47 @@ describe('loadCosmiConfig()', () => {
 
 describe('getOptions', () => {
   it('should load default options', () => {
-    const commandOptions = { opts: () => ({}) };
-    const defaultOptions = { appDataDir: 'default' };
-
+    const commandOptions = {
+      opts: () => ({}),
+    };
+    const defaultOptions = {
+      appDataDir: 'default',
+    };
     const result = getOptions(commandOptions, defaultOptions);
-
-    expect(result).toEqual({ appDataDir: 'default' });
+    expect(result).toEqual({
+      appDataDir: 'default',
+    });
   });
 
   it('should combine default options with command options, favouring command', () => {
-    const commandOptions = { opts: () => ({ appDataDir: 'command' }) };
-    const defaultOptions = { appDataDir: 'default', anotherDefault: '0' };
-
+    const commandOptions = {
+      opts: () => ({
+        appDataDir: 'command',
+      }),
+    };
+    const defaultOptions = {
+      appDataDir: 'default',
+      anotherDefault: '0',
+    };
     const result = getOptions(commandOptions, defaultOptions);
-
-    expect(result).toEqual({ appDataDir: 'command', anotherDefault: '0' });
+    expect(result).toEqual({
+      appDataDir: 'command',
+      anotherDefault: '0',
+    });
   });
 
   it('should combine config file options with default options, favouring config file', () => {
-    // Will also load src/__fixtures__/.insorc.yaml
+    // Will also load src/fixtures/.insorc.yaml
     const commandOptions = {
       opts: () => ({
         config: path.join(fixturesDir, '.insorc.yaml'),
       }),
     };
-    const defaultOptions = { appDataDir: 'default', anotherDefault: '0' };
-
+    const defaultOptions = {
+      appDataDir: 'default',
+      anotherDefault: '0',
+    };
     const result = getOptions(commandOptions, defaultOptions);
-
     expect(result).toEqual({
       appDataDir: 'configFile',
       workingDir: 'workingDir',
@@ -109,35 +122,39 @@ describe('getOptions', () => {
       anotherDefault: '0',
       config: path.join(fixturesDir, '.insorc.yaml'),
       __configFile: {
-        options: { appDataDir: 'configFile', workingDir: 'workingDir', ci: true },
-        scripts: { lint: 'inso lint spec' },
+        options: {
+          appDataDir: 'configFile',
+          workingDir: 'workingDir',
+          ci: true,
+        },
+        scripts: {
+          lint: 'inso lint spec',
+        },
         filePath: path.resolve(fixturesDir, '.insorc.yaml'),
       },
     });
   });
 
   it('should print error to console if config file not found', () => {
-    const logSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
-    const errSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
-
+    const logSpy = jest.spyOn(console, 'log').mockImplementation(noop);
+    const errSpy = jest.spyOn(console, 'error').mockImplementation(noop);
     const configFilePath = path.join(fixturesDir, '.insorc-not-found.yaml');
-
-    // Will also load src/__fixtures__/.insorc.yaml
+    // Will also load src/fixtures/.insorc.yaml
     const commandOptions = {
       opts: () => ({
         config: configFilePath,
       }),
     };
-    const defaultOptions = { appDataDir: 'default', anotherDefault: '0' };
-
+    const defaultOptions = {
+      appDataDir: 'default',
+      anotherDefault: '0',
+    };
     const result = getOptions(commandOptions, defaultOptions);
-
     expect(result).toEqual({
       appDataDir: 'default',
       anotherDefault: '0',
       config: configFilePath,
     });
-
     expect(logSpy).toHaveBeenCalledWith(`Could not find config file at ${configFilePath}.`);
     expect(errSpy).toHaveBeenCalled();
   });
diff --git a/packages/insomnia-inso/src/get-options.js b/packages/insomnia-inso/src/get-options.ts
similarity index 58%
rename from packages/insomnia-inso/src/get-options.js
rename to packages/insomnia-inso/src/get-options.ts
index 0d928c0b6a..c515f8e22b 100644
--- a/packages/insomnia-inso/src/get-options.js
+++ b/packages/insomnia-inso/src/get-options.ts
@@ -1,24 +1,25 @@
-// @flow
 import { cosmiconfigSync } from 'cosmiconfig';
+import { GenerateConfigOptions } from './commands/generate-config';
+import { UNKNOWN_OBJ } from './types';
 
-type ConfigFileOptions = {
+interface ConfigFileOptions {
   __configFile?: {
-    options?: Object,
-    scripts?: Object,
-    filePath: string,
-  },
-};
+    options?: UNKNOWN_OBJ;
+    scripts?: UNKNOWN_OBJ;
+    filePath: string;
+  };
+}
 
 export type GlobalOptions = {
-  appDataDir?: string,
-  workingDir?: string,
-  ci?: boolean,
-  verbose?: boolean,
-  printOptions?: boolean,
-  config?: string,
+  appDataDir?: string;
+  workingDir?: string;
+  ci?: boolean;
+  verbose?: boolean;
+  printOptions?: boolean;
+  config?: string;
 } & ConfigFileOptions;
 
-const OptionsSupportedInConfigFile: Array<$Keys<GlobalOptions>> = [
+const OptionsSupportedInConfigFile: (keyof GlobalOptions)[] = [
   'appDataDir',
   'workingDir',
   'ci',
@@ -26,22 +27,20 @@ const OptionsSupportedInConfigFile: Array<$Keys<GlobalOptions>> = [
   'printOptions',
 ];
 
-export const loadCosmiConfig = (configFile?: string): ConfigFileOptions => {
+export const loadCosmiConfig = (configFile?: string): Partial<ConfigFileOptions> => {
   try {
     const explorer = cosmiconfigSync('inso');
-
     const results = configFile ? explorer.load(configFile) : explorer.search();
 
     if (results && !results?.isEmpty) {
-      const options = {};
-
+      const options: UNKNOWN_OBJ = {};
       OptionsSupportedInConfigFile.forEach(key => {
         const value = results.config?.options?.[key];
+
         if (value) {
           options[key] = value;
         }
       });
-
       return {
         __configFile: {
           options,
@@ -61,9 +60,14 @@ export const loadCosmiConfig = (configFile?: string): ConfigFileOptions => {
   return {};
 };
 
-export const extractCommandOptions = <T>(cmd: Object): $Shape<T> => {
-  let opts = {};
-  let command = cmd;
+interface CommandObj {
+  parent?: CommandObj;
+  opts: () => GenerateConfigOptions
+}
+
+export const extractCommandOptions = <T extends GenerateConfigOptions>(cmd: CommandObj): Partial<T> => {
+  let opts: Partial<T> = {};
+  let command: CommandObj | undefined = cmd;
 
   do {
     // overwrite options with more specific ones
@@ -74,9 +78,8 @@ export const extractCommandOptions = <T>(cmd: Object): $Shape<T> => {
   return opts;
 };
 
-const getOptions = <T>(cmd: Object, defaultOptions: $Shape<T> = {}): T => {
+export const getOptions = <T extends Partial<GenerateConfigOptions>>(cmd: CommandObj, defaultOptions: Partial<T> = {}): Partial<T> => {
   const commandOptions = extractCommandOptions(cmd);
-
   const { __configFile } = loadCosmiConfig(commandOptions.config);
 
   if (__configFile) {
@@ -88,7 +91,8 @@ const getOptions = <T>(cmd: Object, defaultOptions: $Shape<T> = {}): T => {
     };
   }
 
-  return { ...defaultOptions, ...commandOptions };
+  return {
+    ...defaultOptions,
+    ...commandOptions,
+  };
 };
-
-export default getOptions;
diff --git a/packages/insomnia-inso/src/global.d.ts b/packages/insomnia-inso/src/global.d.ts
new file mode 100644
index 0000000000..695084245a
--- /dev/null
+++ b/packages/insomnia-inso/src/global.d.ts
@@ -0,0 +1,8 @@
+import { Database } from './db';
+
+declare module 'insomnia-send-request' {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- TODO(TSCONVERSION) missing types from insomnia-send-request
+  export function getSendRequestCallbackMemDb(environmentId: string, db: Database): Promise<any>;
+}
+
+export {};
diff --git a/packages/insomnia-inso/src/index.ts b/packages/insomnia-inso/src/index.ts
new file mode 100644
index 0000000000..f8c29a028a
--- /dev/null
+++ b/packages/insomnia-inso/src/index.ts
@@ -0,0 +1 @@
+export { go } from './cli';
diff --git a/packages/insomnia-inso/src/__tests__/inso-snapshot.test.js b/packages/insomnia-inso/src/inso-snapshot.test.ts
similarity index 70%
rename from packages/insomnia-inso/src/__tests__/inso-snapshot.test.js
rename to packages/insomnia-inso/src/inso-snapshot.test.ts
index 3a2f1c3a81..0a853c41b7 100644
--- a/packages/insomnia-inso/src/__tests__/inso-snapshot.test.js
+++ b/packages/insomnia-inso/src/inso-snapshot.test.ts
@@ -1,10 +1,8 @@
-// @flow
 import execa from 'execa';
 import { getBinPathSync } from 'get-bin-path';
 
 // MAKE SURE YOU BUILD THE PROJECT BEFORE RUNNING THESE TESTS.
 // These tests use the executable /bin/inso, which relies on /dist.
-
 describe('Snapshot for', () => {
   it.each([
     '-h',
@@ -20,8 +18,13 @@ describe('Snapshot for', () => {
     'export spec -h',
   ])(
     '"inso %s"',
-    async args => {
-      const { stdout } = await execa(getBinPathSync(), args.split(' '));
+    async (args) => {
+      const binPath = getBinPathSync();
+      if (binPath === undefined) {
+        throw new Error('unable to get binary path');
+      }
+
+      const { stdout } = await execa(binPath, args.split(' '));
       expect(stdout).toMatchSnapshot();
     },
     30000,
diff --git a/packages/insomnia-inso/__mocks__/node-libcurl.js b/packages/insomnia-inso/src/jest/__mocks__/node-libcurl.ts
similarity index 85%
rename from packages/insomnia-inso/__mocks__/node-libcurl.js
rename to packages/insomnia-inso/src/jest/__mocks__/node-libcurl.ts
index bc625e2b76..3d9cd7dda1 100644
--- a/packages/insomnia-inso/__mocks__/node-libcurl.js
+++ b/packages/insomnia-inso/src/jest/__mocks__/node-libcurl.ts
@@ -1,3 +1,3 @@
 // Just do nothing for node-libcurl. It fails to import in CI because it will have been
 // built with Electron headers.
-module.exports = {};
+export {};
diff --git a/packages/insomnia-inso/src/jest/before.ts b/packages/insomnia-inso/src/jest/before.ts
new file mode 100644
index 0000000000..b28347b4c3
--- /dev/null
+++ b/packages/insomnia-inso/src/jest/before.ts
@@ -0,0 +1,35 @@
+import { logType } from 'consola';
+import { logger, LogsByType } from '../logger';
+
+// Taken from https://github.com/unjs/consola/blob/master/types/consola.d.ts#L16
+const logTypes: logType[] = [
+  'silent',
+  'fatal',
+  'error',
+  'warn',
+  'log',
+  'info',
+  'success',
+  'debug',
+  'trace',
+  'verbose',
+  'ready',
+  'start',
+];
+
+export const globalBeforeAll = () => {
+  logger.__getLogs = () => logTypes.reduce((accumulator, level) => {
+      // @ts-expect-error the consola types are incomplete
+      const calls = (logger[level] as jest.Mock).mock.calls.map(call => (
+        call.length === 1 ? call[0] : call
+      ));
+      return {
+        ...accumulator,
+        [level]: calls,
+      };
+    }, {} as LogsByType);
+  };
+
+export const globalBeforeEach = () => {
+  logger.mockTypes(() => jest.fn());
+};
diff --git a/packages/insomnia-inso/__jest__/setup.js b/packages/insomnia-inso/src/jest/setup.ts
similarity index 99%
rename from packages/insomnia-inso/__jest__/setup.js
rename to packages/insomnia-inso/src/jest/setup.ts
index b5da5dddee..28700cd97c 100644
--- a/packages/insomnia-inso/__jest__/setup.js
+++ b/packages/insomnia-inso/src/jest/setup.ts
@@ -1,3 +1,2 @@
 jest.mock('node-libcurl');
-
 process.env.DEFAULT_APP_NAME = process.env.DEFAULT_APP_NAME || 'insomnia-app';
diff --git a/packages/insomnia-inso/src/logger.js b/packages/insomnia-inso/src/logger.js
deleted file mode 100644
index ce822852bd..0000000000
--- a/packages/insomnia-inso/src/logger.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// @flow
-import consola from 'consola';
-
-export const noConsoleLog = async <T>(callback: () => Promise<T>): Promise<T> => {
-  const oldConsoleLog = console.log;
-  (console: Object).log = () => {};
-
-  try {
-    return await callback();
-  } finally {
-    (console: Object).log = oldConsoleLog;
-  }
-};
-
-const logger = consola.create({
-  reporters: [new consola.FancyReporter({ formatOptions: { date: false } })],
-});
-
-export const configureLogger = (verbose: boolean = false, ci: boolean = false) => {
-  logger.level = verbose ? consola.LogLevel.Verbose : consola.LogLevel.Info;
-  ci && logger.setReporters([new consola.BasicReporter()]);
-};
-
-export default logger;
diff --git a/packages/insomnia-inso/src/__tests__/logger.test.js b/packages/insomnia-inso/src/logger.test.ts
similarity index 75%
rename from packages/insomnia-inso/src/__tests__/logger.test.js
rename to packages/insomnia-inso/src/logger.test.ts
index ff19823e89..f0550f8f15 100644
--- a/packages/insomnia-inso/src/__tests__/logger.test.js
+++ b/packages/insomnia-inso/src/logger.test.ts
@@ -1,21 +1,18 @@
-// @flow
-import { noConsoleLog } from '../logger';
-
+import { noConsoleLog } from './logger';
 describe('logger', () => {
   describe('noConsoleLog()', () => {
     const originalConsoleLog = console.log;
+
     afterAll(() => {
-      (console: Object).log = originalConsoleLog;
+      console.log = originalConsoleLog;
     });
 
     it('should overwrite and reset console.log during callback', async () => {
       const consoleLogMock = jest.fn();
-      (console: Object).log = consoleLogMock;
-
+      console.log = consoleLogMock;
       await noConsoleLog(async () => {
         console.log('test');
       });
-
       expect(console.log).toBe(consoleLogMock);
       expect(consoleLogMock).not.toHaveBeenCalled();
     });
diff --git a/packages/insomnia-inso/src/logger.ts b/packages/insomnia-inso/src/logger.ts
new file mode 100644
index 0000000000..7670c36303
--- /dev/null
+++ b/packages/insomnia-inso/src/logger.ts
@@ -0,0 +1,43 @@
+import consola, { LogLevel, FancyReporter, BasicReporter, logType } from 'consola';
+import { noop } from './util';
+
+export const noConsoleLog = async <T>(callback: () => Promise<T>): Promise<T> => {
+  const oldConsoleLog = console.log;
+
+  console.log = noop;
+
+  try {
+    return await callback();
+  } finally {
+    console.log = oldConsoleLog;
+  }
+};
+
+export type LogsByType = {
+  [t in logType]?: string[]
+}
+
+export type ModifiedConsola = ReturnType<typeof consola.create> & { __getLogs: () => LogsByType};
+
+const consolaLogger = consola.create({
+  reporters: [
+    new FancyReporter({
+      formatOptions: {
+        // @ts-expect-error something is wrong here, ultimately these types come from https://nodejs.org/api/util.html#util_util_inspect_object_options and `date` doesn't appear to be one of the options.
+        date: false,
+      },
+    }),
+  ],
+});
+
+(consolaLogger as ModifiedConsola).__getLogs = () => ({});
+
+export const logger = consolaLogger as ModifiedConsola;
+
+export const configureLogger = (verbose = false, ci = false) => {
+  logger.level = verbose ? LogLevel.Verbose : LogLevel.Info;
+
+  if (ci) {
+    logger.setReporters([new BasicReporter()]);
+  }
+};
diff --git a/packages/insomnia-inso/src/openapi-2-kong.d.ts b/packages/insomnia-inso/src/openapi-2-kong.d.ts
new file mode 100644
index 0000000000..27d3c10459
--- /dev/null
+++ b/packages/insomnia-inso/src/openapi-2-kong.d.ts
@@ -0,0 +1,57 @@
+// TODO(TSCONVERSION) remove this when the conversion for o2k is complete
+
+declare module 'openapi-2-kong' {
+  /** TODO(TSCONVERSION) this can be taken from the official types OpenAPIV3.Document */
+  interface OpenAPI3Document {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    [todo: string]: any;
+  }
+
+  export type ConversionResultType = 'kong-declarative-config' | 'kong-for-kubernetes'
+
+  export interface DeclarativeConfigResult {
+    type: 'kong-declarative-config',
+    label: string,
+    documents: Object,
+    warnings: {
+      severity: number,
+      message: string,
+      range: {
+        /* TODO */
+      },
+    }[],
+  }
+
+  export interface KongForKubernetesResult {
+    type: 'kong-for-kubernetes',
+    label: string,
+    documents: Object[],
+    warnings: {
+      severity: number,
+      message: string,
+      range: {
+        /* TODO */
+      },
+    }[],
+  }
+
+  export type ConversionResult = DeclarativeConfigResult | KongForKubernetesResult;
+
+  export function generateFromString(
+    spec: string,
+    type: ConversionResultType,
+    tags?: string[],
+  ): Promise<ConversionResult>
+
+  export function generateFromSpec(
+    spec: OpenAPI3Document,
+    type: ConversionResultType,
+    tags?: string[]
+  ): Promise<ConversionResult>
+
+  export function generate(
+    filename: string,
+    type: ConversionResultType,
+    tags?: string[],
+  ): Promise<ConversionResult>
+}
diff --git a/packages/insomnia-inso/src/types.ts b/packages/insomnia-inso/src/types.ts
new file mode 100644
index 0000000000..b0ca41afc0
--- /dev/null
+++ b/packages/insomnia-inso/src/types.ts
@@ -0,0 +1,8 @@
+/** TypeScript version of "TODO" but for types */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any -- This is a utility type explicitly inteded for the sake of typescript conversions
+export type UNKNOWN = any;
+
+/** TypeScript version of "TODO" but for Objects */
+export interface UNKNOWN_OBJ {
+  [key: string]: UNKNOWN;
+}
diff --git a/packages/insomnia-inso/src/__tests__/util.test.js b/packages/insomnia-inso/src/util.test.ts
similarity index 86%
rename from packages/insomnia-inso/src/__tests__/util.test.js
rename to packages/insomnia-inso/src/util.test.ts
index 767a3efec0..608ac566d5 100644
--- a/packages/insomnia-inso/src/__tests__/util.test.js
+++ b/packages/insomnia-inso/src/util.test.ts
@@ -1,55 +1,51 @@
-// @flow
-import { exit, logErrorExit1, getDefaultAppName, getVersion, isDevelopment } from '../util';
-import * as packageJson from '../../package.json';
-import { globalBeforeAll, globalBeforeEach } from '../../__jest__/before';
-import logger from '../logger';
-import { InsoError } from '../errors';
+import { exit, logErrorExit1, getDefaultAppName, getVersion, isDevelopment, noop } from './util';
+import * as packageJson from '../package.json';
+import { globalBeforeAll, globalBeforeEach } from './jest/before';
+import { logger } from './logger';
+import { InsoError } from './errors';
 
 describe('exit()', () => {
   beforeAll(() => {
     globalBeforeAll();
   });
+
   beforeEach(() => {
     globalBeforeEach();
   });
 
   it('should exit 0 if successful result', async () => {
     const exitSpy = jest.spyOn(process, 'exit').mockImplementation(() => {});
-
-    await exit(new Promise(resolve => resolve(true)));
-
+    await exit(new Promise((resolve) => resolve(true)));
     expect(exitSpy).toHaveBeenCalledWith(0);
   });
 
   it('should exit 1 if unsuccessful result', async () => {
     const exitSpy = jest.spyOn(process, 'exit').mockImplementation(() => {});
-
-    await exit(new Promise(resolve => resolve(false)));
-
+    await exit(new Promise((resolve) => resolve(false)));
     expect(exitSpy).toHaveBeenCalledWith(1);
   });
 
-  it('should exit 1 and print to console and if rejected', async () => {
+  it.only('should exit 1 and print to console if rejected', async () => {
     const exitSpy = jest.spyOn(process, 'exit').mockImplementation(() => {});
-
     const error = new Error('message');
     await exit(new Promise((resolve, reject) => reject(error)));
 
     const logs = logger.__getLogs();
+
     expect(logs.fatal).toEqual([]);
     expect(logs.error).toEqual([error]);
     expect(logs.info).toEqual(['To view tracing information, re-run `inso` with `--verbose`']);
     expect(exitSpy).toHaveBeenCalledWith(1);
   });
 
-  it('should exit 1 and print to console and if rejected with InsoError', async () => {
+  it('should exit 1 and print to console if rejected with InsoError', async () => {
     const exitSpy = jest.spyOn(process, 'exit').mockImplementation(() => {});
-
     const cause = new Error('message');
     const insoError = new InsoError('inso error', cause);
     await exit(new Promise((resolve, reject) => reject(insoError)));
 
     const logs = logger.__getLogs();
+
     expect(logs.fatal).toEqual([insoError.message]);
     expect(logs.error).toEqual([cause]);
     expect(logs.info).toEqual(['To view tracing information, re-run `inso` with `--verbose`']);
@@ -58,11 +54,11 @@ describe('exit()', () => {
 
   it('should exit 1 and print to console and if rejected with InsoError without cause', async () => {
     const exitSpy = jest.spyOn(process, 'exit').mockImplementation(() => {});
-
     const insoError = new InsoError('inso error');
     await exit(new Promise((resolve, reject) => reject(insoError)));
 
     const logs = logger.__getLogs();
+
     expect(logs.fatal).toEqual([insoError.message]);
     expect(logs.error).toEqual([]);
     expect(logs.info).toEqual(['To view tracing information, re-run `inso` with `--verbose`']);
@@ -74,39 +70,37 @@ describe('logErrorExit1()', () => {
   beforeAll(() => {
     globalBeforeAll();
   });
+
   beforeEach(() => {
     globalBeforeEach();
   });
 
   it('should exit 1 and print error to console', async () => {
     const exitSpy = jest.spyOn(process, 'exit').mockImplementation(() => {});
-
     const error = new Error('message');
     await logErrorExit1(error);
 
     const logs = logger.__getLogs();
+
     expect(logs.error).toEqual([error]);
     expect(logs.info).toEqual(['To view tracing information, re-run `inso` with `--verbose`']);
-
     expect(exitSpy).toHaveBeenCalledWith(1);
   });
 
   it('should exit 1', async () => {
     const exitSpy = jest.spyOn(process, 'exit').mockImplementation(() => {});
-
     await logErrorExit1();
 
     const logs = logger.__getLogs();
+
     expect(logs.error).toEqual([]);
     expect(logs.info).toEqual(['To view tracing information, re-run `inso` with `--verbose`']);
-
     expect(exitSpy).toHaveBeenCalledWith(1);
   });
 });
 
 describe('getDefaultAppName()', () => {
   const OLD_ENV = process.env;
-
   beforeEach(() => {
     process.env = { ...OLD_ENV }; // make a copy
   });
@@ -123,7 +117,6 @@ describe('getDefaultAppName()', () => {
 
   it('should throw error if not set', () => {
     process.env.DEFAULT_APP_NAME = '';
-
     expect(getDefaultAppName).toThrowError('Environment variable DEFAULT_APP_NAME is not set.');
   });
 });
@@ -135,10 +128,8 @@ describe('getVersion()', () => {
 
   it('should return dev if running in development', () => {
     const oldNodeEnv = process.env.NODE_ENV;
-
     process.env.NODE_ENV = 'development';
     expect(getVersion()).toBe('dev');
-
     process.env.NODE_ENV = oldNodeEnv;
   });
 });
@@ -146,19 +137,24 @@ describe('getVersion()', () => {
 describe('isDevelopment()', () => {
   it('should return true if NODE_ENV is development', () => {
     const oldNodeEnv = process.env.NODE_ENV;
-
     process.env.NODE_ENV = 'development';
     expect(isDevelopment()).toBe(true);
-
     process.env.NODE_ENV = oldNodeEnv;
   });
 
   it('should return false if NODE_ENV is not development', () => {
     const oldNodeEnv = process.env.NODE_ENV;
-
     process.env.NODE_ENV = 'production';
     expect(isDevelopment()).toBe(false);
-
     process.env.NODE_ENV = oldNodeEnv;
   });
 });
+
+describe('noop()', () => {
+  it('should return nothing', () => {
+    expect(noop()).toBe(undefined);
+
+    // @ts-expect-error -- intentionally testing invalid inputs
+    expect(noop('argument')).toBe(undefined);
+  });
+});
diff --git a/packages/insomnia-inso/src/util.js b/packages/insomnia-inso/src/util.ts
similarity index 51%
rename from packages/insomnia-inso/src/util.js
rename to packages/insomnia-inso/src/util.ts
index e0ee1467a5..80740036f4 100644
--- a/packages/insomnia-inso/src/util.js
+++ b/packages/insomnia-inso/src/util.ts
@@ -1,25 +1,24 @@
-// @flow
-import * as packageJson from '../package.json';
+import packageJson from '../package.json';
 import { handleError } from './errors';
 
-export function getVersion() {
+export const getVersion = () => {
   return isDevelopment() ? 'dev' : packageJson.version;
-}
+};
 
-export function isDevelopment() {
+export const isDevelopment = () => {
   return process.env.NODE_ENV === 'development';
-}
+};
 
-export function logErrorExit1(err?: Error) {
+export const logErrorExit1 = (err?: Error) => {
   handleError(err);
   process.exit(1);
-}
+};
 
-export async function exit(result: Promise<boolean>): Promise<void> {
+export const exit = async (result: Promise<boolean>): Promise<void> => {
   return result.then(r => process.exit(r ? 0 : 1)).catch(logErrorExit1);
-}
+};
 
-export function getDefaultAppName(): string {
+export const getDefaultAppName = (): string => {
   const name = process.env.DEFAULT_APP_NAME;
 
   if (!name) {
@@ -27,4 +26,7 @@ export function getDefaultAppName(): string {
   }
 
   return name;
-}
+};
+
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+export const noop = () => {};
diff --git a/packages/insomnia-inso/src/__tests__/write-file.test.js b/packages/insomnia-inso/src/write-file.test.ts
similarity index 82%
rename from packages/insomnia-inso/src/__tests__/write-file.test.js
rename to packages/insomnia-inso/src/write-file.test.ts
index 9996da3a16..c4e3bc807f 100644
--- a/packages/insomnia-inso/src/__tests__/write-file.test.js
+++ b/packages/insomnia-inso/src/write-file.test.ts
@@ -1,25 +1,21 @@
-// @flow
 import path from 'path';
-import { writeFileWithCliOptions } from '../write-file';
+import { writeFileWithCliOptions } from './write-file';
 import mkdirp from 'mkdirp';
 import fs from 'fs';
-import { InsoError } from '../errors';
+import { InsoError } from './errors';
 import os from 'os';
 
 jest.mock('mkdirp', () => ({
-  sync: jest.fn().mockResolvedValue(),
+  sync: jest.fn().mockResolvedValue(() => {}),
 }));
 
 jest.mock('fs', () => ({
   promises: {
-    writeFile: jest.fn().mockResolvedValue(),
+    writeFile: jest.fn().mockResolvedValue(() => {}),
   },
 }));
 
 describe('writeFileWithCliOptions', () => {
-  // make flow happy
-  const mock = (mockFn: any) => mockFn;
-
   beforeEach(() => {
     jest.resetAllMocks();
   });
@@ -28,68 +24,54 @@ describe('writeFileWithCliOptions', () => {
     const output = 'file.yaml';
     const contents = 'contents';
     const workingDir = undefined;
-
     const promise = writeFileWithCliOptions(output, contents, workingDir);
     await expect(promise).resolves.toBe('file.yaml');
   });
-
   it('should write to absolute output file', async () => {
     const absolutePath = path.join(os.tmpdir(), 'dev', 'file.yaml');
     const output = absolutePath;
     const contents = 'contents';
     const workingDir = undefined;
-
     const promise = writeFileWithCliOptions(output, contents, workingDir);
     await expect(promise).resolves.toBe(absolutePath);
   });
-
   it('should write to absolute output file and ignore working dir', async () => {
     const absolutePath = path.join(os.tmpdir(), 'dev', 'file.yaml');
     const output = absolutePath;
     const contents = 'contents';
     const workingDir = 'working/dir';
-
     const promise = writeFileWithCliOptions(output, contents, workingDir);
     await expect(promise).resolves.toBe(absolutePath);
   });
-
   it('should write to output file under working dir', async () => {
     const output = 'file.yaml';
     const contents = 'contents';
     const workingDir = 'working/dir';
-
     const promise = writeFileWithCliOptions(output, contents, workingDir);
     await expect(promise).resolves.toBe(path.normalize('working/dir/file.yaml'));
   });
-
   it('should ensure the output directory exists', async () => {
     const output = 'output/dir/file.yaml';
     const contents = 'contents';
     const workingDir = 'working/dir';
-
     const result = await writeFileWithCliOptions(output, contents, workingDir);
     expect(result).toEqual(path.normalize('working/dir/output/dir/file.yaml'));
-
     expect(mkdirp.sync).toHaveBeenCalledWith(path.normalize('working/dir/output/dir'));
     expect(fs.promises.writeFile).toHaveBeenCalledWith(
       path.normalize('working/dir/output/dir/file.yaml'),
       contents,
     );
   });
-
   it('should return an error if make directory fails', async () => {
     const error = new Error('mkdir sync error');
-    mock(mkdirp.sync).mockRejectedValue(error);
-
+    (mkdirp.sync as jest.Mock).mockRejectedValue(error);
     const promise = writeFileWithCliOptions('file.yaml', 'contents');
-    await expect(promise).rejects.toThrow(new InsoError(`Failed to write to "file.yaml"`, error));
+    await expect(promise).rejects.toThrow(new InsoError('Failed to write to "file.yaml"', error));
   });
-
   it('should return an error if write file fails', async () => {
     const error = new Error('fs promises writeFile error');
-    mock(fs.promises.writeFile).mockRejectedValue(error);
-
+    (fs.promises.writeFile as jest.Mock).mockRejectedValue(error);
     const promise = writeFileWithCliOptions('file.yaml', 'contents');
-    await expect(promise).rejects.toThrow(new InsoError(`Failed to write to "file.yaml"`, error));
+    await expect(promise).rejects.toThrow(new InsoError('Failed to write to "file.yaml"', error));
   });
 });
diff --git a/packages/insomnia-inso/src/write-file.js b/packages/insomnia-inso/src/write-file.ts
similarity index 98%
rename from packages/insomnia-inso/src/write-file.js
rename to packages/insomnia-inso/src/write-file.ts
index 65613aa3ae..6650636b3d 100644
--- a/packages/insomnia-inso/src/write-file.js
+++ b/packages/insomnia-inso/src/write-file.ts
@@ -1,4 +1,3 @@
-// @flow
 import path from 'path';
 import mkdirp from 'mkdirp';
 import fs from 'fs';
@@ -10,6 +9,7 @@ export async function writeFileWithCliOptions(
   workingDir?: string,
 ): Promise<string> {
   const outputPath = path.isAbsolute(output) ? output : path.join(workingDir || '.', output);
+
   try {
     await mkdirp.sync(path.dirname(outputPath));
     await fs.promises.writeFile(outputPath, contents);
diff --git a/packages/insomnia-inso/tsconfig.build.json b/packages/insomnia-inso/tsconfig.build.json
new file mode 100644
index 0000000000..aa3ded8480
--- /dev/null
+++ b/packages/insomnia-inso/tsconfig.build.json
@@ -0,0 +1,27 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "."
+  },
+  "include": [
+    "src",
+    "package.json",
+    "**/*.d.ts"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist",
+    "src/jest",
+    ".babelrc.js",
+    "jest.config.js",
+    "webpack",
+    "bin",
+    "assets",
+    
+    "**/@types/mocha/*",
+    "**/*.test.ts",
+    "**/__snapshots__/**",
+    "**/__mocks__/*"
+  ]
+}
\ No newline at end of file
diff --git a/packages/insomnia-inso/tsconfig.json b/packages/insomnia-inso/tsconfig.json
new file mode 100644
index 0000000000..ac1a06e911
--- /dev/null
+++ b/packages/insomnia-inso/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "extends": "./tsconfig.build.json",
+  "include": [
+    "src",
+    "package.json",
+    "jest.config.js",
+    "webpack",
+    ".eslintrc.js"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ]
+}
diff --git a/packages/insomnia-inso/webpack/webpack.config.base.js b/packages/insomnia-inso/webpack/webpack.config.base.js
index bf493bbf45..b18c89bcd7 100644
--- a/packages/insomnia-inso/webpack/webpack.config.base.js
+++ b/packages/insomnia-inso/webpack/webpack.config.base.js
@@ -1,26 +1,34 @@
 const path = require('path');
 const nodeExternals = require('webpack-node-externals');
 
+/** @type { import('webpack').Configuration } */
 module.exports = {
-  entry: { index: './src/cli.js' },
+  entry: './src/index.ts',
   target: 'node',
-  devtool: 'source-map',
   output: {
     path: path.resolve(__dirname, '..', 'dist'),
-    filename: '[name].js',
+    filename: 'index.js',
     library: 'insomniacli',
     libraryTarget: 'commonjs2',
   },
   module: {
     rules: [
       {
-        test: /\.js$/,
+        test: /\.tsx?$/,
+        loader: 'ts-loader',
         exclude: [/node_modules/],
-        use: {
-          loader: 'babel-loader',
+        options: {
+          configFile: 'tsconfig.build.json',
         },
       },
     ],
   },
-  externals: [nodeExternals()],
+  resolve: {
+    extensions: ['.js', '.ts'],
+  },
+  externals: [
+    'node-libcurl',
+    'mocha',
+    nodeExternals(),
+  ],
 };
diff --git a/packages/insomnia-inso/webpack/webpack.config.development.js b/packages/insomnia-inso/webpack/webpack.config.development.js
index 30ac016d22..12cd328bcb 100644
--- a/packages/insomnia-inso/webpack/webpack.config.development.js
+++ b/packages/insomnia-inso/webpack/webpack.config.development.js
@@ -1,7 +1,8 @@
 const webpack = require('webpack');
-const {merge} = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const base = require('./webpack.config.base');
 
+/** @type { import('webpack').Configuration } */
 module.exports = merge(base, {
   mode: 'development',
   plugins: [
diff --git a/packages/insomnia-inso/webpack/webpack.config.production.js b/packages/insomnia-inso/webpack/webpack.config.production.js
index b7cee44f68..8a86c69b3a 100644
--- a/packages/insomnia-inso/webpack/webpack.config.production.js
+++ b/packages/insomnia-inso/webpack/webpack.config.production.js
@@ -1,7 +1,8 @@
 const webpack = require('webpack');
-const {merge} = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const base = require('./webpack.config.base');
 
+/** @type { import('webpack').Configuration } */
 module.exports = merge(base, {
   mode: 'production',
   optimization: {
diff --git a/packages/insomnia-prettify/.eslintignore b/packages/insomnia-prettify/.eslintignore
new file mode 100644
index 0000000000..53c37a1660
--- /dev/null
+++ b/packages/insomnia-prettify/.eslintignore
@@ -0,0 +1 @@
+dist
\ No newline at end of file
diff --git a/packages/insomnia-prettify/.eslintrc.js b/packages/insomnia-prettify/.eslintrc.js
new file mode 100644
index 0000000000..17427cb1b2
--- /dev/null
+++ b/packages/insomnia-prettify/.eslintrc.js
@@ -0,0 +1,7 @@
+/** @type { import('eslint').Linter.Config } */
+module.exports = {
+  extends: '../../.eslintrc.js',
+  rules: {
+    '@typescript-eslint/no-use-before-define': 'off', // TSCONVERSION
+  },
+};
diff --git a/packages/insomnia-prettify/index.js b/packages/insomnia-prettify/index.js
deleted file mode 100644
index 61b5753ef8..0000000000
--- a/packages/insomnia-prettify/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-  json: require('./src/json').prettify,
-};
diff --git a/packages/insomnia-prettify/jest.config.js b/packages/insomnia-prettify/jest.config.js
new file mode 100644
index 0000000000..537ce057da
--- /dev/null
+++ b/packages/insomnia-prettify/jest.config.js
@@ -0,0 +1,17 @@
+/** @type { import('@jest/types').Config.InitialOptions } */
+module.exports = {
+  globals: {
+    'ts-jest': {
+      isolatedModules: true,
+    },
+  },
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+  testRegex: ['.+\\.test\\.ts$'],
+  collectCoverage: false,
+  collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  coverageReporters: ['text-summary', 'lcov'],
+};
diff --git a/packages/insomnia-prettify/package-lock.json b/packages/insomnia-prettify/package-lock.json
index 7125320d93..2d22cf8d18 100644
--- a/packages/insomnia-prettify/package-lock.json
+++ b/packages/insomnia-prettify/package-lock.json
@@ -2,4 +2,4870 @@
   "name": "insomnia-prettify",
   "version": "2.2.35",
   "lockfileVersion": 1
+  "requires": true,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.12.13"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.13.11",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.11.tgz",
+      "integrity": "sha512-BwKEkO+2a67DcFeS3RLl0Z3Gs2OvdXewuWjc1Hfokhb5eQWP9YRYH1/+VrVZvql2CfjOiNGqSAFOYt4lsqTHzg==",
+      "dev": true
+    },
+    "@babel/core": {
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.10.tgz",
+      "integrity": "sha512-bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.12.13",
+        "@babel/generator": "^7.13.9",
+        "@babel/helper-compilation-targets": "^7.13.10",
+        "@babel/helper-module-transforms": "^7.13.0",
+        "@babel/helpers": "^7.13.10",
+        "@babel/parser": "^7.13.10",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.0",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.1.2",
+        "lodash": "^4.17.19",
+        "semver": "^6.3.0",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.13.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
+      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.13.0",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz",
+      "integrity": "sha512-/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.13.8",
+        "@babel/helper-validator-option": "^7.12.17",
+        "browserslist": "^4.14.5",
+        "semver": "^6.3.0"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.12.13",
+        "@babel/template": "^7.12.13",
+        "@babel/types": "^7.12.13"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.12.13"
+      }
+    },
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz",
+      "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.13.0"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz",
+      "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.12.13"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz",
+      "integrity": "sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-replace-supers": "^7.13.0",
+        "@babel/helper-simple-access": "^7.12.13",
+        "@babel/helper-split-export-declaration": "^7.12.13",
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.0",
+        "lodash": "^4.17.19"
+      }
+    },
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
+      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.12.13"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+      "dev": true
+    },
+    "@babel/helper-replace-supers": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz",
+      "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.13.0",
+        "@babel/helper-optimise-call-expression": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.0"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz",
+      "integrity": "sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.12.13"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.12.13"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "dev": true
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.12.17",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
+      "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
+      "dev": true
+    },
+    "@babel/helpers": {
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.10.tgz",
+      "integrity": "sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.0"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
+      "integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@babel/parser": {
+      "version": "7.13.11",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.11.tgz",
+      "integrity": "sha512-PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q==",
+      "dev": true
+    },
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      }
+    },
+    "@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz",
+      "integrity": "sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      }
+    },
+    "@babel/template": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.12.13",
+        "@babel/parser": "^7.12.13",
+        "@babel/types": "^7.12.13"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
+      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.12.13",
+        "@babel/generator": "^7.13.0",
+        "@babel/helper-function-name": "^7.12.13",
+        "@babel/helper-split-export-declaration": "^7.12.13",
+        "@babel/parser": "^7.13.0",
+        "@babel/types": "^7.13.0",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.19"
+      }
+    },
+    "@babel/types": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
+      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true
+    },
+    "@cnakazawa/watch": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+      "dev": true,
+      "requires": {
+        "exec-sh": "^0.3.2",
+        "minimist": "^1.2.0"
+      }
+    },
+    "@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      }
+    },
+    "@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true
+    },
+    "@jest/console": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
+      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "slash": "^3.0.0"
+      }
+    },
+    "@jest/core": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
+      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^26.6.2",
+        "@jest/reporters": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-changed-files": "^26.6.2",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-resolve-dependencies": "^26.6.3",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "jest-watcher": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "p-each-series": "^2.1.0",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "@jest/environment": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
+      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
+      "dev": true,
+      "requires": {
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2"
+      }
+    },
+    "@jest/fake-timers": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
+      "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "@sinonjs/fake-timers": "^6.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
+      }
+    },
+    "@jest/globals": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
+      "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "expect": "^26.6.2"
+      }
+    },
+    "@jest/reporters": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
+      "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
+      "dev": true,
+      "requires": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.2.4",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^4.0.3",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.0.2",
+        "jest-haste-map": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "node-notifier": "^8.0.0",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^4.0.1",
+        "terminal-link": "^2.0.0",
+        "v8-to-istanbul": "^7.0.0"
+      }
+    },
+    "@jest/source-map": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
+      "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.4",
+        "source-map": "^0.6.0"
+      }
+    },
+    "@jest/test-result": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
+      "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      }
+    },
+    "@jest/test-sequencer": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
+      "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
+      "dev": true,
+      "requires": {
+        "@jest/test-result": "^26.6.2",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.6.2",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3"
+      }
+    },
+    "@jest/transform": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
+      "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^26.6.2",
+        "babel-plugin-istanbul": "^6.0.0",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-util": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pirates": "^4.0.1",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "^3.0.0"
+      }
+    },
+    "@jest/types": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      }
+    },
+    "@sinonjs/commons": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz",
+      "integrity": "sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==",
+      "dev": true,
+      "requires": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "@sinonjs/fake-timers": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
+      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
+      "dev": true,
+      "requires": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "@types/babel__core": {
+      "version": "7.1.13",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.13.tgz",
+      "integrity": "sha512-CC6amBNND16pTk4K3ZqKIaba6VGKAQs3gMjEY17FVd56oI/ZWt9OhS6riYiWv9s8ENbYUi7p8lgqb0QHQvUKQQ==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "@types/babel__generator": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
+      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@types/babel__template": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
+      "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@types/babel__traverse": {
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz",
+      "integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.3.0"
+      }
+    },
+    "@types/graceful-fs": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
+      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/istanbul-lib-coverage": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+      "dev": true
+    },
+    "@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "@types/istanbul-reports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
+      "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "@types/node": {
+      "version": "14.14.35",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.35.tgz",
+      "integrity": "sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==",
+      "dev": true
+    },
+    "@types/normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "dev": true
+    },
+    "@types/prettier": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.2.3.tgz",
+      "integrity": "sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==",
+      "dev": true
+    },
+    "@types/stack-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
+      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+      "dev": true
+    },
+    "@types/yargs": {
+      "version": "15.0.13",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
+      "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==",
+      "dev": true,
+      "requires": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "@types/yargs-parser": {
+      "version": "20.2.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
+      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
+      "dev": true
+    },
+    "abab": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+      "dev": true
+    },
+    "acorn": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.0.tgz",
+      "integrity": "sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==",
+      "dev": true
+    },
+    "acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
+      "requires": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "dev": true
+        }
+      }
+    },
+    "acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.11.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+          "dev": true
+        }
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "dev": true
+    },
+    "babel-jest": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
+      "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
+      "dev": true,
+      "requires": {
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/babel__core": "^7.1.7",
+        "babel-plugin-istanbul": "^6.0.0",
+        "babel-preset-jest": "^26.6.2",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "slash": "^3.0.0"
+      }
+    },
+    "babel-plugin-istanbul": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
+      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^4.0.0",
+        "test-exclude": "^6.0.0"
+      }
+    },
+    "babel-plugin-jest-hoist": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
+      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.0.0",
+        "@types/babel__traverse": "^7.0.6"
+      }
+    },
+    "babel-preset-current-node-syntax": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "dev": true,
+      "requires": {
+        "@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-import-meta": "^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/plugin-syntax-top-level-await": "^7.8.3"
+      }
+    },
+    "babel-preset-jest": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
+      "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-jest-hoist": "^26.6.2",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true
+    },
+    "browserslist": {
+      "version": "4.16.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
+      "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30001181",
+        "colorette": "^1.2.1",
+        "electron-to-chromium": "^1.3.649",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.70"
+      }
+    },
+    "bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "requires": {
+        "fast-json-stable-stringify": "2.x"
+      }
+    },
+    "bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
+      "requires": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001202",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001202.tgz",
+      "integrity": "sha512-ZcijQNqrcF8JNLjzvEiXqX4JUYxoZa7Pvcsd9UD8Kz4TvhTonOSNRsK+qtvpVL4l6+T1Rh4LFtLfnNWg6BGWCQ==",
+      "dev": true
+    },
+    "capture-exit": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+      "dev": true,
+      "requires": {
+        "rsvp": "^4.8.4"
+      }
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true
+    },
+    "ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
+    },
+    "cjs-module-lexer": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
+      "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
+      "dev": true
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
+    "collect-v8-coverage": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+      "dev": true
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "colorette": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "requires": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
+      }
+    },
+    "cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+      "dev": true
+    },
+    "cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "requires": {
+        "cssom": "~0.3.6"
+      },
+      "dependencies": {
+        "cssom": {
+          "version": "0.3.8",
+          "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+          "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+          "dev": true
+        }
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "dev": true,
+      "requires": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      }
+    },
+    "debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decimal.js": {
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
+      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "dev": true
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true
+    },
+    "diff-sequences": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
+      "dev": true
+    },
+    "domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "dev": true,
+      "requires": {
+        "webidl-conversions": "^5.0.0"
+      },
+      "dependencies": {
+        "webidl-conversions": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+          "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+          "dev": true
+        }
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "electron-to-chromium": {
+      "version": "1.3.691",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.691.tgz",
+      "integrity": "sha512-ZqiO69KImmOGCyoH0icQPU3SndJiW93juEvf63gQngyhODO6SpQIPMTOHldtCs5DS5GMKvAkquk230E2zt2vpw==",
+      "dev": true
+    },
+    "emittery": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
+      "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
+      "dev": true
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "escodegen": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "dev": true,
+      "requires": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "exec-sh": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
+      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+      "dev": true
+    },
+    "execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.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"
+      }
+    },
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "expect": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "ansi-styles": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0"
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "fb-watchman": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
+      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+      "dev": true,
+      "requires": {
+        "bser": "2.1.1"
+      }
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "optional": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
+    "get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
+    },
+    "graceful-fs": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+      "dev": true
+    },
+    "growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
+      "dev": true,
+      "optional": true
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "dev": true
+    },
+    "html-encoding-sniffer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "dev": true,
+      "requires": {
+        "whatwg-encoding": "^1.0.5"
+      }
+    },
+    "html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+      "dev": true
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "import-local": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dev": true,
+      "requires": {
+        "ci-info": "^2.0.0"
+      }
+    },
+    "is-core-module": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "is-docker": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
+      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
+      "dev": true,
+      "optional": true
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-potential-custom-element-name": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
+      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-docker": "^2.0.0"
+      }
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "istanbul-lib-coverage": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
+      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "dev": true
+    },
+    "istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
+      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      }
+    },
+    "istanbul-reports": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
+      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+      "dev": true,
+      "requires": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      }
+    },
+    "jest": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
+      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
+      "dev": true,
+      "requires": {
+        "@jest/core": "^26.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^26.6.3"
+      },
+      "dependencies": {
+        "jest-cli": {
+          "version": "26.6.3",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
+          "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
+          "dev": true,
+          "requires": {
+            "@jest/core": "^26.6.3",
+            "@jest/test-result": "^26.6.2",
+            "@jest/types": "^26.6.2",
+            "chalk": "^4.0.0",
+            "exit": "^0.1.2",
+            "graceful-fs": "^4.2.4",
+            "import-local": "^3.0.2",
+            "is-ci": "^2.0.0",
+            "jest-config": "^26.6.3",
+            "jest-util": "^26.6.2",
+            "jest-validate": "^26.6.2",
+            "prompts": "^2.0.1",
+            "yargs": "^15.4.1"
+          }
+        }
+      }
+    },
+    "jest-changed-files": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
+      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "execa": "^4.0.0",
+        "throat": "^5.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "execa": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+          "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^7.0.0",
+            "get-stream": "^5.0.0",
+            "human-signals": "^1.1.1",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.0",
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "is-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+          "dev": true
+        },
+        "npm-run-path": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.0.0"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "jest-config": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^26.6.3",
+        "@jest/types": "^26.6.2",
+        "babel-jest": "^26.6.3",
+        "chalk": "^4.0.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.4",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-jasmine2": "^26.6.3",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2"
+      }
+    },
+    "jest-diff": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      }
+    },
+    "jest-docblock": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
+      "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
+      "dev": true,
+      "requires": {
+        "detect-newline": "^3.0.0"
+      }
+    },
+    "jest-each": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
+      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2"
+      }
+    },
+    "jest-environment-jsdom": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
+      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jsdom": "^16.4.0"
+      }
+    },
+    "jest-environment-node": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
+      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
+      }
+    },
+    "jest-get-type": {
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+      "dev": true
+    },
+    "jest-haste-map": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "fsevents": "^2.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-regex-util": "^26.0.0",
+        "jest-serializer": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7"
+      }
+    },
+    "jest-jasmine2": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
+      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
+      "dev": true,
+      "requires": {
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "expect": "^26.6.2",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2",
+        "throat": "^5.0.0"
+      }
+    },
+    "jest-leak-detector": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
+      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+      "dev": true,
+      "requires": {
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      }
+    },
+    "jest-matcher-utils": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      }
+    },
+    "jest-message-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.2"
+      }
+    },
+    "jest-mock": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
+      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*"
+      }
+    },
+    "jest-pnp-resolver": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+      "dev": true
+    },
+    "jest-regex-util": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+      "dev": true
+    },
+    "jest-resolve": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^26.6.2",
+        "read-pkg-up": "^7.0.1",
+        "resolve": "^1.18.1",
+        "slash": "^3.0.0"
+      }
+    },
+    "jest-resolve-dependencies": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
+      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-snapshot": "^26.6.2"
+      }
+    },
+    "jest-runner": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
+      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.7.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.6.3",
+        "jest-docblock": "^26.0.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-leak-detector": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "source-map-support": "^0.5.6",
+        "throat": "^5.0.0"
+      }
+    },
+    "jest-runtime": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
+      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/globals": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^0.6.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0",
+        "yargs": "^15.4.1"
+      }
+    },
+    "jest-serializer": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "graceful-fs": "^4.2.4"
+      }
+    },
+    "jest-snapshot": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
+      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^26.6.2",
+        "graceful-fs": "^4.2.4",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^26.6.2",
+        "semver": "^7.3.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
+    "jest-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "is-ci": "^2.0.0",
+        "micromatch": "^4.0.2"
+      }
+    },
+    "jest-validate": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
+      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "camelcase": "^6.0.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "leven": "^3.1.0",
+        "pretty-format": "^26.6.2"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+          "dev": true
+        }
+      }
+    },
+    "jest-watcher": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
+      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
+      "dev": true,
+      "requires": {
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "jest-util": "^26.6.2",
+        "string-length": "^4.0.1"
+      }
+    },
+    "jest-worker": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      }
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
+    "jsdom": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.5.1.tgz",
+      "integrity": "sha512-pF73EOsJgwZekbDHEY5VO/yKXUkab/DuvrQB/ANVizbr6UAHJsDdHXuotZYwkJSGQl1JM+ivXaqY+XBDDL4TiA==",
+      "dev": true,
+      "requires": {
+        "abab": "^2.0.5",
+        "acorn": "^8.0.5",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.1",
+        "domexception": "^2.0.1",
+        "escodegen": "^2.0.0",
+        "html-encoding-sniffer": "^2.0.1",
+        "is-potential-custom-element-name": "^1.0.0",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "request": "^2.88.2",
+        "request-promise-native": "^1.0.9",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0",
+        "ws": "^7.4.4",
+        "xml-name-validator": "^3.0.0"
+      }
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json5": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true
+    },
+    "kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true
+    },
+    "leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "lines-and-columns": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+      "dev": true
+    },
+    "locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^4.1.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
+    "make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.0.0"
+      }
+    },
+    "make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "dev": true,
+      "requires": {
+        "tmpl": "1.0.x"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.1",
+        "picomatch": "^2.0.5"
+      }
+    },
+    "mime-db": {
+      "version": "1.46.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz",
+      "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.29",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz",
+      "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.46.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "dev": true
+    },
+    "node-modules-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
+      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
+      "dev": true
+    },
+    "node-notifier": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "growly": "^1.3.0",
+        "is-wsl": "^2.2.0",
+        "semver": "^7.3.2",
+        "shellwords": "^0.1.1",
+        "uuid": "^8.3.0",
+        "which": "^2.0.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "node-releases": {
+      "version": "1.1.71",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
+      "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+      "dev": true
+    },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
+      }
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "nwsapi": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+      "dev": true
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^2.1.0"
+      }
+    },
+    "optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      }
+    },
+    "p-each-series": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
+      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
+      "dev": true
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "requires": {
+        "p-limit": "^2.2.0"
+      }
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true
+    },
+    "parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      }
+    },
+    "parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true
+    },
+    "pirates": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
+      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
+      "dev": true,
+      "requires": {
+        "node-modules-regexp": "^1.0.0"
+      }
+    },
+    "pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "requires": {
+        "find-up": "^4.0.0"
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "pretty-format": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^17.0.1"
+      }
+    },
+    "prompts": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz",
+      "integrity": "sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==",
+      "dev": true,
+      "requires": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      }
+    },
+    "psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true
+    },
+    "react-is": {
+      "version": "17.0.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz",
+      "integrity": "sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==",
+      "dev": true
+    },
+    "read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "requires": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+          "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+          "dev": true
+        }
+      }
+    },
+    "read-pkg-up": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dev": true,
+      "requires": {
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "dev": true,
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "dev": true
+        }
+      }
+    },
+    "request-promise-core": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.19"
+      }
+    },
+    "request-promise-native": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
+      "dev": true,
+      "requires": {
+        "request-promise-core": "1.1.4",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      },
+      "dependencies": {
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "dev": true,
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        }
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "dev": true,
+      "requires": {
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^5.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "rsvp": {
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+      "dev": true
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "sane": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+      "dev": true,
+      "requires": {
+        "@cnakazawa/watch": "^1.0.3",
+        "anymatch": "^2.0.0",
+        "capture-exit": "^2.0.0",
+        "exec-sh": "^0.3.2",
+        "execa": "^1.0.0",
+        "fb-watchman": "^2.0.0",
+        "micromatch": "^3.1.4",
+        "minimist": "^1.1.1",
+        "walker": "~1.0.5"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          }
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "dev": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        }
+      }
+    },
+    "saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
+      "requires": {
+        "xmlchars": "^2.2.0"
+      }
+    },
+    "semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "shellwords": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+      "dev": true,
+      "optional": true
+    },
+    "signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+      "dev": true
+    },
+    "sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
+    },
+    "slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
+    },
+    "source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "dev": true,
+      "requires": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
+      "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
+      "dev": true
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dev": true,
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+          "dev": true
+        }
+      }
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+      "dev": true
+    },
+    "string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dev": true,
+      "requires": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.0"
+      }
+    },
+    "strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "supports-hyperlinks": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
+      "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      }
+    },
+    "symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
+    },
+    "terminal-link": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^4.2.1",
+        "supports-hyperlinks": "^2.0.0"
+      }
+    },
+    "test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "requires": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "throat": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
+      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
+      "dev": true
+    },
+    "tmpl": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
+      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "tough-cookie": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+      "dev": true,
+      "requires": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
+      }
+    },
+    "tr46": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
+      "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.1"
+      }
+    },
+    "ts-jest": {
+      "version": "26.5.4",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.5.4.tgz",
+      "integrity": "sha512-I5Qsddo+VTm94SukBJ4cPimOoFZsYTeElR2xy6H2TOVs+NsvgYglW8KuQgKoApOKuaU/Ix/vrF9ebFZlb5D2Pg==",
+      "dev": true,
+      "requires": {
+        "bs-logger": "0.x",
+        "buffer-from": "1.x",
+        "fast-json-stable-stringify": "2.x",
+        "jest-util": "^26.1.0",
+        "json5": "2.x",
+        "lodash": "4.x",
+        "make-error": "1.x",
+        "mkdirp": "1.x",
+        "semver": "7.x",
+        "yargs-parser": "20.x"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "20.2.7",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+          "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+          "dev": true
+        }
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
+    "type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true
+    },
+    "typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
+      "requires": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "typescript": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz",
+      "integrity": "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      }
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        }
+      }
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "optional": true
+    },
+    "v8-to-istanbul": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz",
+      "integrity": "sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g==",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
+        }
+      }
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "dev": true,
+      "requires": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "w3c-xmlserializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "dev": true,
+      "requires": {
+        "xml-name-validator": "^3.0.0"
+      }
+    },
+    "walker": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "dev": true,
+      "requires": {
+        "makeerror": "1.0.x"
+      }
+    },
+    "webidl-conversions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "dev": true
+    },
+    "whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dev": true,
+      "requires": {
+        "iconv-lite": "0.4.24"
+      }
+    },
+    "whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "dev": true
+    },
+    "whatwg-url": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz",
+      "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==",
+      "dev": true,
+      "requires": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^2.0.2",
+        "webidl-conversions": "^6.1.0"
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "ws": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
+      "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==",
+      "dev": true
+    },
+    "xml-name-validator": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+      "dev": true
+    },
+    "xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
+    },
+    "y18n": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "requires": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      }
+    },
+    "yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    }
+  }
 }
diff --git a/packages/insomnia-prettify/package.json b/packages/insomnia-prettify/package.json
index 312daaf083..5c008a922e 100644
--- a/packages/insomnia-prettify/package.json
+++ b/packages/insomnia-prettify/package.json
@@ -4,8 +4,20 @@
   "author": "Gregory Schier <greg.schier@konghq.com>",
   "description": "Prettification utilities for Insomnia",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "package.json",
+    "README.md"
+  ],
   "scripts": {
+    "bootstrap": "npm run build",
+    "lint": "eslint . --ext .js,.ts,.tsx",
+    "lint:fix": "npm run lint -- --fix",
+    "clean": "tsc --build tsconfig.build.json --clean",
+    "postclean": "rimraf dist",
+    "build": "tsc --build tsconfig.build.json",
     "test": "jest"
   },
   "gitHead": "e46bf021cf4b4379e31d2b2d9025d476d6839fa1"
diff --git a/packages/insomnia-prettify/src/__fixtures__/escaped-characters-input.json b/packages/insomnia-prettify/src/fixtures/escaped-characters-input.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/escaped-characters-input.json
rename to packages/insomnia-prettify/src/fixtures/escaped-characters-input.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/escaped-characters-output.json b/packages/insomnia-prettify/src/fixtures/escaped-characters-output.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/escaped-characters-output.json
rename to packages/insomnia-prettify/src/fixtures/escaped-characters-output.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/escaped-unicode-input.json b/packages/insomnia-prettify/src/fixtures/escaped-unicode-input.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/escaped-unicode-input.json
rename to packages/insomnia-prettify/src/fixtures/escaped-unicode-input.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/escaped-unicode-output.json b/packages/insomnia-prettify/src/fixtures/escaped-unicode-output.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/escaped-unicode-output.json
rename to packages/insomnia-prettify/src/fixtures/escaped-unicode-output.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/extra-whitespace-input.json b/packages/insomnia-prettify/src/fixtures/extra-whitespace-input.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/extra-whitespace-input.json
rename to packages/insomnia-prettify/src/fixtures/extra-whitespace-input.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/extra-whitespace-output.json b/packages/insomnia-prettify/src/fixtures/extra-whitespace-output.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/extra-whitespace-output.json
rename to packages/insomnia-prettify/src/fixtures/extra-whitespace-output.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/minimal-whitespace-input.json b/packages/insomnia-prettify/src/fixtures/minimal-whitespace-input.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/minimal-whitespace-input.json
rename to packages/insomnia-prettify/src/fixtures/minimal-whitespace-input.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/minimal-whitespace-output.json b/packages/insomnia-prettify/src/fixtures/minimal-whitespace-output.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/minimal-whitespace-output.json
rename to packages/insomnia-prettify/src/fixtures/minimal-whitespace-output.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/nunjucks-input.json b/packages/insomnia-prettify/src/fixtures/nunjucks-input.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/nunjucks-input.json
rename to packages/insomnia-prettify/src/fixtures/nunjucks-input.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/nunjucks-output.json b/packages/insomnia-prettify/src/fixtures/nunjucks-output.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/nunjucks-output.json
rename to packages/insomnia-prettify/src/fixtures/nunjucks-output.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/precision-input.json b/packages/insomnia-prettify/src/fixtures/precision-input.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/precision-input.json
rename to packages/insomnia-prettify/src/fixtures/precision-input.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/precision-output.json b/packages/insomnia-prettify/src/fixtures/precision-output.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/precision-output.json
rename to packages/insomnia-prettify/src/fixtures/precision-output.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/root-array-input.json b/packages/insomnia-prettify/src/fixtures/root-array-input.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/root-array-input.json
rename to packages/insomnia-prettify/src/fixtures/root-array-input.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/root-array-output.json b/packages/insomnia-prettify/src/fixtures/root-array-output.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/root-array-output.json
rename to packages/insomnia-prettify/src/fixtures/root-array-output.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/root-string-input.json b/packages/insomnia-prettify/src/fixtures/root-string-input.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/root-string-input.json
rename to packages/insomnia-prettify/src/fixtures/root-string-input.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/root-string-output.json b/packages/insomnia-prettify/src/fixtures/root-string-output.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/root-string-output.json
rename to packages/insomnia-prettify/src/fixtures/root-string-output.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/trailing-comma-input.json b/packages/insomnia-prettify/src/fixtures/trailing-comma-input.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/trailing-comma-input.json
rename to packages/insomnia-prettify/src/fixtures/trailing-comma-input.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/trailing-comma-output.json b/packages/insomnia-prettify/src/fixtures/trailing-comma-output.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/trailing-comma-output.json
rename to packages/insomnia-prettify/src/fixtures/trailing-comma-output.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/unquoted-strings-input.json b/packages/insomnia-prettify/src/fixtures/unquoted-strings-input.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/unquoted-strings-input.json
rename to packages/insomnia-prettify/src/fixtures/unquoted-strings-input.json
diff --git a/packages/insomnia-prettify/src/__fixtures__/unquoted-strings-output.json b/packages/insomnia-prettify/src/fixtures/unquoted-strings-output.json
similarity index 100%
rename from packages/insomnia-prettify/src/__fixtures__/unquoted-strings-output.json
rename to packages/insomnia-prettify/src/fixtures/unquoted-strings-output.json
diff --git a/packages/insomnia-prettify/src/index.ts b/packages/insomnia-prettify/src/index.ts
new file mode 100644
index 0000000000..4b82096ea2
--- /dev/null
+++ b/packages/insomnia-prettify/src/index.ts
@@ -0,0 +1 @@
+export { prettify as json } from './json';
diff --git a/packages/insomnia-prettify/src/__tests__/json.test.js b/packages/insomnia-prettify/src/json.test.ts
similarity index 78%
rename from packages/insomnia-prettify/src/__tests__/json.test.js
rename to packages/insomnia-prettify/src/json.test.ts
index c46a18c095..39bb7c6b0a 100644
--- a/packages/insomnia-prettify/src/__tests__/json.test.js
+++ b/packages/insomnia-prettify/src/json.test.ts
@@ -1,9 +1,9 @@
-const fs = require('fs');
-const path = require('path');
-const { prettify } = require('../json');
+import fs from 'fs';
+import path from 'path';
+import { prettify } from './json';
 
 describe('prettify()', () => {
-  const basePath = path.join(__dirname, '../__fixtures__');
+  const basePath = path.join(__dirname, './fixtures');
   const files = fs.readdirSync(basePath);
   for (const file of files) {
     if (!file.match(/-input\.json$/)) {
diff --git a/packages/insomnia-prettify/src/json.js b/packages/insomnia-prettify/src/json.ts
similarity index 78%
rename from packages/insomnia-prettify/src/json.js
rename to packages/insomnia-prettify/src/json.ts
index fde47abb61..655d7640f7 100644
--- a/packages/insomnia-prettify/src/json.js
+++ b/packages/insomnia-prettify/src/json.ts
@@ -4,13 +4,23 @@ const STATE_IN_NUN_COM = 'nuncom';
 const STATE_IN_STRING = 'string';
 const STATE_NONE = 'none';
 
-const NUNJUCKS_OPEN_STATES = {
+const NUNJUCKS_OPEN_STATES: {
+  '{{': typeof STATE_IN_NUN_VAR;
+  '{%': typeof STATE_IN_NUN_TAG;
+  '{#': typeof STATE_IN_NUN_COM;
+  [anythingElse: string]: string | undefined;
+} = {
   '{{': STATE_IN_NUN_VAR,
   '{%': STATE_IN_NUN_TAG,
   '{#': STATE_IN_NUN_COM,
 };
 
-const NUNJUCKS_CLOSE_STATES = {
+const NUNJUCKS_CLOSE_STATES: {
+  '}}': typeof STATE_IN_NUN_VAR;
+  '%}': typeof STATE_IN_NUN_TAG;
+  '#}': typeof STATE_IN_NUN_COM;
+  [anythingElse: string]: string | undefined;
+} = {
   '}}': STATE_IN_NUN_VAR,
   '%}': STATE_IN_NUN_TAG,
   '#}': STATE_IN_NUN_COM,
@@ -20,13 +30,8 @@ const NUNJUCKS_CLOSE_STATES = {
  * Format a JSON string without parsing it as JavaScript.
  *
  * Code taken from jsonlint (http://zaa.ch/jsonlint/)
- *
- * @param json
- * @param indentChars
- * @param replaceUnicode
- * @returns {string}
  */
-module.exports.prettify = function(json, indentChars = '\t', replaceUnicode = true) {
+export const prettify = (json?: string, indentChars = '\t', replaceUnicode = true) => {
   if (!json) {
     return '';
   }
@@ -35,7 +40,7 @@ module.exports.prettify = function(json, indentChars = '\t', replaceUnicode = tr
   // we need to convert all escaped unicode characters to proper unicode characters.
   if (replaceUnicode) {
     try {
-      json = _convertUnicode(json);
+      json = convertUnicode(json);
     } catch (err) {
       // Just in case (should never happen)
       console.warn('Prettify failed to handle unicode', err);
@@ -47,9 +52,9 @@ module.exports.prettify = function(json, indentChars = '\t', replaceUnicode = tr
   const tab = indentChars;
   let newJson = '';
   let indentLevel = 0;
-  let currentChar = null;
-  let nextChar = null;
-  let nextTwo = null;
+  let currentChar: string | null = null;
+  let nextChar: string | null = null;
+  let nextTwo: string | null = null;
   let state = STATE_NONE;
 
   for (; i < il; i += 1) {
@@ -79,7 +84,7 @@ module.exports.prettify = function(json, indentChars = '\t', replaceUnicode = tr
         state = STATE_NONE;
         if (closeState === STATE_IN_NUN_COM) {
           // Put comments on their own lines
-          newJson += nextTwo + '\n' + _repeatString(tab, indentLevel);
+          newJson += nextTwo + '\n' + repeatString(tab, indentLevel);
         } else {
           newJson += nextTwo;
         }
@@ -106,7 +111,7 @@ module.exports.prettify = function(json, indentChars = '\t', replaceUnicode = tr
 
     switch (currentChar) {
       case ',':
-        newJson += currentChar + '\n' + _repeatString(tab, indentLevel);
+        newJson += currentChar + '\n' + repeatString(tab, indentLevel);
         continue;
       case '{':
         if (nextChar === '}') {
@@ -114,7 +119,7 @@ module.exports.prettify = function(json, indentChars = '\t', replaceUnicode = tr
           i++;
         } else {
           indentLevel++;
-          newJson += currentChar + '\n' + _repeatString(tab, indentLevel);
+          newJson += currentChar + '\n' + repeatString(tab, indentLevel);
         }
         continue;
       case '[':
@@ -123,16 +128,16 @@ module.exports.prettify = function(json, indentChars = '\t', replaceUnicode = tr
           i++;
         } else {
           indentLevel++;
-          newJson += currentChar + '\n' + _repeatString(tab, indentLevel);
+          newJson += currentChar + '\n' + repeatString(tab, indentLevel);
         }
         continue;
       case '}':
         indentLevel--;
-        newJson += '\n' + _repeatString(tab, indentLevel) + currentChar;
+        newJson += '\n' + repeatString(tab, indentLevel) + currentChar;
         continue;
       case ']':
         indentLevel--;
-        newJson += '\n' + _repeatString(tab, indentLevel) + currentChar;
+        newJson += '\n' + repeatString(tab, indentLevel) + currentChar;
         continue;
       case ':':
         newJson += ': ';
@@ -157,19 +162,15 @@ module.exports.prettify = function(json, indentChars = '\t', replaceUnicode = tr
   return newJson.replace(/^\s*\n/gm, '');
 };
 
-function _repeatString(s, count) {
-  return new Array(count + 1).join(s);
-}
+const repeatString = (str: string, count: number) => {
+  return new Array(count + 1).join(str);
+};
 
 /**
  * Convert escaped unicode characters to real characters. Any JSON parser will do this by
  * default. This is really fast too. Around 25ms for ~2MB of data with LOTS of unicode.
- *
- * @param originalStr
- * @returns {string}
- * @private
  */
-function _convertUnicode(originalStr) {
+const convertUnicode = (originalStr: string) => {
   let m;
   let c;
   let cStr;
@@ -206,4 +207,4 @@ function _convertUnicode(originalStr) {
   convertedStr += originalStr.slice(lastI, originalStr.length);
 
   return convertedStr;
-}
+};
diff --git a/packages/insomnia-prettify/tsconfig.build.json b/packages/insomnia-prettify/tsconfig.build.json
new file mode 100644
index 0000000000..95458e4845
--- /dev/null
+++ b/packages/insomnia-prettify/tsconfig.build.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "dist",
+    "rootDir": "src",
+    "resolveJsonModule": true
+  },
+  "include": [
+    "src"
+  ],
+  "exclude": [
+    "**/*.test.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/insomnia-prettify/tsconfig.json b/packages/insomnia-prettify/tsconfig.json
new file mode 100644
index 0000000000..93486d850b
--- /dev/null
+++ b/packages/insomnia-prettify/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.build.json",
+  "compilerOptions": {
+    "composite": false,
+    "rootDir": "."
+  },
+  "include": [
+    "src",
+    "jest.config.js",
+    ".eslintrc.js"
+  ],
+  "exclude": [
+    "dist"
+  ]
+}
diff --git a/packages/insomnia-send-request/package.json b/packages/insomnia-send-request/package.json
index 5204e7dd4c..6e4e61d1e6 100644
--- a/packages/insomnia-send-request/package.json
+++ b/packages/insomnia-send-request/package.json
@@ -3,6 +3,7 @@
   "license": "Apache-2.0",
   "version": "2.2.35",
   "main": "dist/index.js",
+  "types": "dist/send-request/index.d.ts",
   "dependencies": {
     "@stoplight/spectral": "^5.4.0",
     "analytics-node": "^4.0.1",
diff --git a/packages/insomnia-smoke-test/core/app.test.js b/packages/insomnia-smoke-test/core/app.test.js
index 5e204c006e..9a3ab68743 100644
--- a/packages/insomnia-smoke-test/core/app.test.js
+++ b/packages/insomnia-smoke-test/core/app.test.js
@@ -45,7 +45,7 @@ describe('Application launch', function() {
   });
 
   it.each([true, false])(
-    'imports swagger 2 and sends request: new workspace=%s ',
+    'imports swagger 2 and sends request - new workspace=%s ',
     async newWorkspace => {
       await client.correctlyLaunched(app);
       await onboarding.skipOnboardingFlow(app);
@@ -191,7 +191,8 @@ describe('Application launch', function() {
   //  2. sending basic auth will succeed
   //  3. sending basic auth with special characters encoded with IS0-8859-1 will succeed
   //  4. sending while basic auth is disabled within insomnnia will fail
-  it('sends request with basic authentication', async () => {
+  // TODO(TSCONVERSION) - this test fails fairly readily after TS conversion, needs investigation
+  it.skip('sends request with basic authentication', async () => {
     const url = 'http://127.0.0.1:4010/auth/basic';
     const { latin1, utf8 } = basicAuthCreds;
 
diff --git a/packages/insomnia-smoke-test/modules/debug.js b/packages/insomnia-smoke-test/modules/debug.js
index ecc658079e..aa355561e5 100644
--- a/packages/insomnia-smoke-test/modules/debug.js
+++ b/packages/insomnia-smoke-test/modules/debug.js
@@ -170,6 +170,7 @@ export const typeBasicAuthUsernameAndPassword = async (app, username, password,
   const usernameEditor = await app.client.react$('OneLineEditor', {
     props: { id: 'username' },
   });
+  await usernameEditor.waitForExist();
   await usernameEditor.click();
 
   // Wait for the username editor field to update
@@ -183,6 +184,7 @@ export const typeBasicAuthUsernameAndPassword = async (app, username, password,
   const passwordEditor = await app.client.react$('OneLineEditor', {
     props: { id: 'password' },
   });
+  await passwordEditor.waitForExist();
   await passwordEditor.click();
 
   // Allow username changes to persist and wait for
diff --git a/packages/insomnia-smoke-test/modules/dropdown.js b/packages/insomnia-smoke-test/modules/dropdown.js
index 2f93eac277..8025636c13 100644
--- a/packages/insomnia-smoke-test/modules/dropdown.js
+++ b/packages/insomnia-smoke-test/modules/dropdown.js
@@ -1,19 +1,17 @@
 import findAsync from './find-async';
 
-const findDropdownItemWithText = async (parent, text, fromComponentLibrary) => {
+const findDropdownItemWithText = async (parent, text) => {
   let item;
   await parent.waitUntil(async () => {
-    const items = fromComponentLibrary
-      ? await parent.$$('button[class^=dropdown-item]')
-      : await parent.react$$('DropdownItem');
+    const items = await parent.react$$('DropdownItem');
     item = await findAsync(items, async i => (await i.getText()) === text);
     return !!item;
   });
   return item;
 };
 
-export const clickDropdownItemByText = async (parent, text, fromComponentLibrary = false) => {
-  const item = await findDropdownItemWithText(parent, text, fromComponentLibrary);
+export const clickDropdownItemByText = async (parent, text) => {
+  const item = await findDropdownItemWithText(parent, text);
   await item.waitForDisplayed();
   await item.click();
 };
diff --git a/packages/insomnia-smoke-test/modules/home.js b/packages/insomnia-smoke-test/modules/home.js
index ff2a11c98a..791e0cc9f6 100644
--- a/packages/insomnia-smoke-test/modules/home.js
+++ b/packages/insomnia-smoke-test/modules/home.js
@@ -16,10 +16,10 @@ export const expectDocumentWithTitle = async (app, title) => {
 export const findCardWithTitle = async (app, text) => {
   let card;
   await app.client.waitUntil(async () => {
-    const items = await app.client.$$('.document-listing__body div[class^=card__StyledCard]');
+    const cards = await app.client.react$$('Card');
     card = await findAsync(
-      items,
-      async i => (await i.$('div[class^=card__CardBody] .title').then(e => e.getText())) === text,
+      cards,
+      async i => (await i.react$('CardBody').then(e => e.$('.title')).then(e => e.getText())) === text,
     );
     return !!card;
   });
@@ -58,7 +58,7 @@ const openCreateDropdown = async app => {
 export const createNewCollection = async (app, prefix = 'coll') => {
   await openCreateDropdown(app);
 
-  await dropdown.clickDropdownItemByText(app.client, 'Request Collection', true);
+  await dropdown.clickDropdownItemByText(app.client, 'Request Collection');
 
   const collectionName = `${prefix}-${faker.lorem.slug()}`;
   await modal.waitUntilOpened(app, { title: 'Create New Request Collection' });
@@ -70,7 +70,7 @@ export const createNewCollection = async (app, prefix = 'coll') => {
 export const createNewDocument = async (app, prefix = 'doc') => {
   await openCreateDropdown(app);
 
-  await dropdown.clickDropdownItemByText(app.client, 'Design Document', true);
+  await dropdown.clickDropdownItemByText(app.client, 'Design Document');
 
   const documentName = `${prefix}-${faker.lorem.slug()}`;
   await modal.waitUntilOpened(app, { title: 'Create New Design Document' });
@@ -82,5 +82,5 @@ export const createNewDocument = async (app, prefix = 'doc') => {
 export const importFromClipboard = async app => {
   await openCreateDropdown(app);
 
-  await dropdown.clickDropdownItemByText(app.client, 'Clipboard', true);
+  await dropdown.clickDropdownItemByText(app.client, 'Clipboard');
 };
diff --git a/packages/insomnia-smoke-test/package-lock.json b/packages/insomnia-smoke-test/package-lock.json
index 5de2a36fd6..7e638b876d 100644
--- a/packages/insomnia-smoke-test/package-lock.json
+++ b/packages/insomnia-smoke-test/package-lock.json
@@ -13,45 +13,132 @@
         "@babel/highlight": "^7.10.4"
       }
     },
+    "@babel/compat-data": {
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz",
+      "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==",
+      "dev": true
+    },
     "@babel/core": {
-      "version": "7.11.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.4.tgz",
-      "integrity": "sha512-5deljj5HlqRXN+5oJTY7Zs37iH3z3b++KjiKtIsJy1NrjOOVSEaJHEetLBhyu0aQOSNNZ/0IuEAan9GzRuDXHg==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.0.tgz",
+      "integrity": "sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.11.4",
-        "@babel/helper-module-transforms": "^7.11.0",
-        "@babel/helpers": "^7.10.4",
-        "@babel/parser": "^7.11.4",
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.11.0",
-        "@babel/types": "^7.11.0",
+        "@babel/code-frame": "^7.12.13",
+        "@babel/generator": "^7.14.0",
+        "@babel/helper-compilation-targets": "^7.13.16",
+        "@babel/helper-module-transforms": "^7.14.0",
+        "@babel/helpers": "^7.14.0",
+        "@babel/parser": "^7.14.0",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.14.0",
+        "@babel/types": "^7.14.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.1",
+        "gensync": "^1.0.0-beta.2",
         "json5": "^2.1.2",
-        "lodash": "^4.17.19",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
+        "semver": "^6.3.0",
         "source-map": "^0.5.0"
       },
       "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.12.13"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
     "@babel/generator": {
-      "version": "7.11.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.4.tgz",
-      "integrity": "sha512-Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g==",
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz",
+      "integrity": "sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.11.0",
+        "@babel/types": "^7.14.1",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       },
@@ -64,103 +151,131 @@
         }
       }
     },
-    "@babel/helper-function-name": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+    "@babel/helper-compilation-targets": {
+      "version": "7.13.16",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz",
+      "integrity": "sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/compat-data": "^7.13.15",
+        "@babel/helper-validator-option": "^7.12.17",
+        "browserslist": "^4.14.5",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.12.13",
+        "@babel/template": "^7.12.13",
+        "@babel/types": "^7.12.13"
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.12.13"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-      "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz",
+      "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.11.0"
+        "@babel/types": "^7.13.12"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-      "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
+      "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.13.12"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-      "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz",
+      "integrity": "sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4",
-        "@babel/helper-simple-access": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.11.0",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.11.0",
-        "lodash": "^4.17.19"
+        "@babel/helper-module-imports": "^7.13.12",
+        "@babel/helper-replace-supers": "^7.13.12",
+        "@babel/helper-simple-access": "^7.13.12",
+        "@babel/helper-split-export-declaration": "^7.12.13",
+        "@babel/helper-validator-identifier": "^7.14.0",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.14.0",
+        "@babel/types": "^7.14.0"
+      },
+      "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        }
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
-      "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
+      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.12.13"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
       "dev": true
     },
     "@babel/helper-replace-supers": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-      "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz",
+      "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.10.4",
-        "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-member-expression-to-functions": "^7.13.12",
+        "@babel/helper-optimise-call-expression": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.12"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-      "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz",
+      "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.13.12"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-      "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.11.0"
+        "@babel/types": "^7.12.13"
       }
     },
     "@babel/helper-validator-identifier": {
@@ -169,15 +284,21 @@
       "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
       "dev": true
     },
+    "@babel/helper-validator-option": {
+      "version": "7.12.17",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
+      "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
+      "dev": true
+    },
     "@babel/helpers": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
-      "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz",
+      "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.14.0",
+        "@babel/types": "^7.14.0"
       }
     },
     "@babel/highlight": {
@@ -244,9 +365,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.11.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz",
-      "integrity": "sha512-MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA==",
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.1.tgz",
+      "integrity": "sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==",
       "dev": true
     },
     "@babel/plugin-syntax-async-generators": {
@@ -268,12 +389,12 @@
       }
     },
     "@babel/plugin-syntax-class-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
-      "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-syntax-import-meta": {
@@ -348,43 +469,214 @@
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz",
+      "integrity": "sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.12.13"
+      }
+    },
+    "@babel/template": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.12.13",
+        "@babel/parser": "^7.12.13",
+        "@babel/types": "^7.12.13"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.12.13"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "@babel/traverse": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-      "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
+      "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.11.0",
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.11.0",
-        "@babel/parser": "^7.11.0",
-        "@babel/types": "^7.11.0",
+        "@babel/code-frame": "^7.12.13",
+        "@babel/generator": "^7.14.0",
+        "@babel/helper-function-name": "^7.12.13",
+        "@babel/helper-split-export-declaration": "^7.12.13",
+        "@babel/parser": "^7.14.0",
+        "@babel/types": "^7.14.0",
         "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
+        "globals": "^11.1.0"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.12.13",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.12.13"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+          "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "@babel/types": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-      "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz",
+      "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "lodash": "^4.17.19",
+        "@babel/helper-validator-identifier": "^7.14.0",
         "to-fast-properties": "^2.0.0"
+      },
+      "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+          "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+          "dev": true
+        }
       }
     },
     "@bcoe/v8-coverage": {
@@ -434,54 +726,54 @@
       }
     },
     "@istanbuljs/schema": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
-      "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true
     },
     "@jest/console": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.3.0.tgz",
-      "integrity": "sha512-/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
+      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^26.3.0",
-        "jest-util": "^26.3.0",
+        "jest-message-util": "^26.6.2",
+        "jest-util": "^26.6.2",
         "slash": "^3.0.0"
       }
     },
     "@jest/core": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.4.2.tgz",
-      "integrity": "sha512-sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
+      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.3.0",
-        "@jest/reporters": "^26.4.1",
-        "@jest/test-result": "^26.3.0",
-        "@jest/transform": "^26.3.0",
-        "@jest/types": "^26.3.0",
+        "@jest/console": "^26.6.2",
+        "@jest/reporters": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^26.3.0",
-        "jest-config": "^26.4.2",
-        "jest-haste-map": "^26.3.0",
-        "jest-message-util": "^26.3.0",
+        "jest-changed-files": "^26.6.2",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.4.0",
-        "jest-resolve-dependencies": "^26.4.2",
-        "jest-runner": "^26.4.2",
-        "jest-runtime": "^26.4.2",
-        "jest-snapshot": "^26.4.2",
-        "jest-util": "^26.3.0",
-        "jest-validate": "^26.4.2",
-        "jest-watcher": "^26.3.0",
+        "jest-resolve": "^26.6.2",
+        "jest-resolve-dependencies": "^26.6.3",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "jest-watcher": "^26.6.2",
         "micromatch": "^4.0.2",
         "p-each-series": "^2.1.0",
         "rimraf": "^3.0.0",
@@ -490,53 +782,53 @@
       }
     },
     "@jest/environment": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.3.0.tgz",
-      "integrity": "sha512-EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
+      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^26.3.0",
-        "@jest/types": "^26.3.0",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.3.0"
+        "jest-mock": "^26.6.2"
       }
     },
     "@jest/fake-timers": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.3.0.tgz",
-      "integrity": "sha512-ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
+      "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.2",
         "@sinonjs/fake-timers": "^6.0.1",
         "@types/node": "*",
-        "jest-message-util": "^26.3.0",
-        "jest-mock": "^26.3.0",
-        "jest-util": "^26.3.0"
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
       }
     },
     "@jest/globals": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.4.2.tgz",
-      "integrity": "sha512-Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
+      "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^26.3.0",
-        "@jest/types": "^26.3.0",
-        "expect": "^26.4.2"
+        "@jest/environment": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "expect": "^26.6.2"
       }
     },
     "@jest/reporters": {
-      "version": "26.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.4.1.tgz",
-      "integrity": "sha512-aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
+      "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^26.3.0",
-        "@jest/test-result": "^26.3.0",
-        "@jest/transform": "^26.3.0",
-        "@jest/types": "^26.3.0",
+        "@jest/console": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
@@ -547,22 +839,22 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^26.3.0",
-        "jest-resolve": "^26.4.0",
-        "jest-util": "^26.3.0",
-        "jest-worker": "^26.3.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "node-notifier": "^8.0.0",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
         "string-length": "^4.0.1",
         "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^5.0.1"
+        "v8-to-istanbul": "^7.0.0"
       }
     },
     "@jest/source-map": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.3.0.tgz",
-      "integrity": "sha512-hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
+      "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
       "dev": true,
       "requires": {
         "callsites": "^3.0.0",
@@ -571,46 +863,46 @@
       }
     },
     "@jest/test-result": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.3.0.tgz",
-      "integrity": "sha512-a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
+      "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.3.0",
-        "@jest/types": "^26.3.0",
+        "@jest/console": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz",
-      "integrity": "sha512-83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
+      "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^26.3.0",
+        "@jest/test-result": "^26.6.2",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.3.0",
-        "jest-runner": "^26.4.2",
-        "jest-runtime": "^26.4.2"
+        "jest-haste-map": "^26.6.2",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3"
       }
     },
     "@jest/transform": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.3.0.tgz",
-      "integrity": "sha512-Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
+      "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.2",
         "babel-plugin-istanbul": "^6.0.0",
         "chalk": "^4.0.0",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.3.0",
+        "jest-haste-map": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-util": "^26.3.0",
+        "jest-util": "^26.6.2",
         "micromatch": "^4.0.2",
         "pirates": "^4.0.1",
         "slash": "^3.0.0",
@@ -619,9 +911,9 @@
       }
     },
     "@jest/types": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz",
-      "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -638,9 +930,9 @@
       "dev": true
     },
     "@sinonjs/commons": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
-      "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
       "dev": true,
       "requires": {
         "type-detect": "4.0.8"
@@ -665,9 +957,9 @@
       }
     },
     "@types/babel__core": {
-      "version": "7.1.9",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz",
-      "integrity": "sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw==",
+      "version": "7.1.14",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz",
+      "integrity": "sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -678,18 +970,18 @@
       }
     },
     "@types/babel__generator": {
-      "version": "7.6.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz",
-      "integrity": "sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
+      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0"
       }
     },
     "@types/babel__template": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
-      "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
+      "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -697,9 +989,9 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.0.13",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.13.tgz",
-      "integrity": "sha512-i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ==",
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz",
+      "integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.3.0"
@@ -724,9 +1016,9 @@
       "dev": true
     },
     "@types/graceful-fs": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
-      "integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
+      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -784,9 +1076,9 @@
       "dev": true
     },
     "@types/prettier": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.0.2.tgz",
-      "integrity": "sha512-IkVfat549ggtkZUthUzEX49562eGikhSYeVGX97SkMFn+sTZrgRewXjQ4tPKFPCykZHkX1Zfd9OoELGqKU2jJA==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.2.3.tgz",
+      "integrity": "sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==",
       "dev": true
     },
     "@types/puppeteer": {
@@ -808,24 +1100,24 @@
       }
     },
     "@types/stack-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
-      "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
+      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
       "dev": true
     },
     "@types/yargs": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-      "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
+      "version": "15.0.13",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
+      "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
-      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
+      "version": "20.2.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
+      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
       "dev": true
     },
     "@types/yauzl": {
@@ -886,9 +1178,9 @@
       }
     },
     "abab": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz",
-      "integrity": "sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
       "dev": true
     },
     "accepts": {
@@ -902,9 +1194,9 @@
       }
     },
     "acorn": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
-      "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz",
+      "integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==",
       "dev": true
     },
     "acorn-globals": {
@@ -915,6 +1207,14 @@
       "requires": {
         "acorn": "^7.1.1",
         "acorn-walk": "^7.1.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "dev": true
+        }
       }
     },
     "acorn-walk": {
@@ -942,18 +1242,18 @@
       }
     },
     "ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
       "requires": {
-        "type-fest": "^0.11.0"
+        "type-fest": "^0.21.3"
       },
       "dependencies": {
         "type-fest": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+          "version": "0.21.3",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+          "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
           "dev": true
         }
       }
@@ -975,9 +1275,9 @@
       }
     },
     "anymatch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
       "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
@@ -1125,16 +1425,16 @@
       "dev": true
     },
     "babel-jest": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.3.0.tgz",
-      "integrity": "sha512-sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
+      "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^26.3.0",
-        "@jest/types": "^26.3.0",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/babel__core": "^7.1.7",
         "babel-plugin-istanbul": "^6.0.0",
-        "babel-preset-jest": "^26.3.0",
+        "babel-preset-jest": "^26.6.2",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "slash": "^3.0.0"
@@ -1154,9 +1454,9 @@
       }
     },
     "babel-plugin-jest-hoist": {
-      "version": "26.2.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz",
-      "integrity": "sha512-B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
+      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.3.3",
@@ -1166,9 +1466,9 @@
       }
     },
     "babel-preset-current-node-syntax": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz",
-      "integrity": "sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
       "dev": true,
       "requires": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
@@ -1181,17 +1481,18 @@
         "@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/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
       }
     },
     "babel-preset-jest": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz",
-      "integrity": "sha512-5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
+      "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
       "dev": true,
       "requires": {
-        "babel-plugin-jest-hoist": "^26.2.0",
-        "babel-preset-current-node-syntax": "^0.1.3"
+        "babel-plugin-jest-hoist": "^26.6.2",
+        "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
     "balanced-match": {
@@ -1363,6 +1664,19 @@
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
       "dev": true
     },
+    "browserslist": {
+      "version": "4.16.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30001219",
+        "colorette": "^1.2.2",
+        "electron-to-chromium": "^1.3.723",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.71"
+      }
+    },
     "bser": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
@@ -1467,6 +1781,12 @@
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
+    "caniuse-lite": {
+      "version": "1.0.30001223",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz",
+      "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==",
+      "dev": true
+    },
     "capture-exit": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
@@ -1535,6 +1855,12 @@
       "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
       "dev": true
     },
+    "cjs-module-lexer": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
+      "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
+      "dev": true
+    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -1615,6 +1941,12 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "colorette": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+      "dev": true
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -2101,9 +2433,9 @@
       "dev": true
     },
     "decimal.js": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz",
-      "integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==",
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
+      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
       "dev": true
     },
     "decode-uri-component": {
@@ -2250,9 +2582,9 @@
       "dev": true
     },
     "diff-sequences": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.3.0.tgz",
-      "integrity": "sha512-5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
       "dev": true
     },
     "domexception": {
@@ -2304,10 +2636,16 @@
         "extract-zip": "^2.0.0"
       }
     },
+    "electron-to-chromium": {
+      "version": "1.3.727",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz",
+      "integrity": "sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg==",
+      "dev": true
+    },
     "emittery": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz",
-      "integrity": "sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
+      "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
       "dev": true
     },
     "emoji-regex": {
@@ -2353,6 +2691,12 @@
       "dev": true,
       "optional": true
     },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -2366,13 +2710,13 @@
       "dev": true
     },
     "escodegen": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
       "dev": true,
       "requires": {
         "esprima": "^4.0.1",
-        "estraverse": "^4.2.0",
+        "estraverse": "^5.2.0",
         "esutils": "^2.0.2",
         "optionator": "^0.8.1",
         "source-map": "~0.6.1"
@@ -2385,9 +2729,9 @@
       "dev": true
     },
     "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
       "dev": true
     },
     "esutils": {
@@ -2403,9 +2747,9 @@
       "dev": true
     },
     "exec-sh": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
-      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
+      "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
       "dev": true
     },
     "execa": {
@@ -2496,16 +2840,16 @@
       }
     },
     "expect": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.4.2.tgz",
-      "integrity": "sha512-IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.2",
         "ansi-styles": "^4.0.0",
         "jest-get-type": "^26.3.0",
-        "jest-matcher-utils": "^26.4.2",
-        "jest-message-util": "^26.3.0",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
         "jest-regex-util": "^26.0.0"
       }
     },
@@ -2861,16 +3205,22 @@
       "dev": true
     },
     "fsevents": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "dev": true,
       "optional": true
     },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
     "gensync": {
-      "version": "1.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true
     },
     "get-bin-path": {
@@ -3047,6 +3397,15 @@
         "har-schema": "^2.0.0"
       }
     },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
     "has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -3244,12 +3603,6 @@
       "dev": true,
       "optional": true
     },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-      "dev": true
-    },
     "ipaddr.js": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
@@ -3297,6 +3650,15 @@
         "ci-info": "^2.0.0"
       }
     },
+    "is-core-module": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz",
+      "integrity": "sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -3382,9 +3744,9 @@
       }
     },
     "is-potential-custom-element-name": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
-      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true
     },
     "is-stream": {
@@ -3497,65 +3859,54 @@
       }
     },
     "jest": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-26.4.2.tgz",
-      "integrity": "sha512-LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
+      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
       "dev": true,
       "requires": {
-        "@jest/core": "^26.4.2",
+        "@jest/core": "^26.6.3",
         "import-local": "^3.0.2",
-        "jest-cli": "^26.4.2"
+        "jest-cli": "^26.6.3"
       },
       "dependencies": {
         "jest-cli": {
-          "version": "26.4.2",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.4.2.tgz",
-          "integrity": "sha512-zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw==",
+          "version": "26.6.3",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
+          "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
           "dev": true,
           "requires": {
-            "@jest/core": "^26.4.2",
-            "@jest/test-result": "^26.3.0",
-            "@jest/types": "^26.3.0",
+            "@jest/core": "^26.6.3",
+            "@jest/test-result": "^26.6.2",
+            "@jest/types": "^26.6.2",
             "chalk": "^4.0.0",
             "exit": "^0.1.2",
             "graceful-fs": "^4.2.4",
             "import-local": "^3.0.2",
             "is-ci": "^2.0.0",
-            "jest-config": "^26.4.2",
-            "jest-util": "^26.3.0",
-            "jest-validate": "^26.4.2",
+            "jest-config": "^26.6.3",
+            "jest-util": "^26.6.2",
+            "jest-validate": "^26.6.2",
             "prompts": "^2.0.1",
-            "yargs": "^15.3.1"
+            "yargs": "^15.4.1"
           }
         }
       }
     },
     "jest-changed-files": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.3.0.tgz",
-      "integrity": "sha512-1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
+      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.2",
         "execa": "^4.0.0",
         "throat": "^5.0.0"
       },
       "dependencies": {
-        "cross-spawn": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
         "execa": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz",
-          "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+          "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
           "dev": true,
           "requires": {
             "cross-spawn": "^7.0.0",
@@ -3577,90 +3928,45 @@
           "requires": {
             "pump": "^3.0.0"
           }
-        },
-        "is-stream": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-          "dev": true
-        },
-        "npm-run-path": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.0.0"
-          }
-        },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
-        },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-          "dev": true
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
         }
       }
     },
     "jest-config": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.4.2.tgz",
-      "integrity": "sha512-QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^26.4.2",
-        "@jest/types": "^26.3.0",
-        "babel-jest": "^26.3.0",
+        "@jest/test-sequencer": "^26.6.3",
+        "@jest/types": "^26.6.2",
+        "babel-jest": "^26.6.3",
         "chalk": "^4.0.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.1",
         "graceful-fs": "^4.2.4",
-        "jest-environment-jsdom": "^26.3.0",
-        "jest-environment-node": "^26.3.0",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "jest-jasmine2": "^26.4.2",
+        "jest-jasmine2": "^26.6.3",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.4.0",
-        "jest-util": "^26.3.0",
-        "jest-validate": "^26.4.2",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
         "micromatch": "^4.0.2",
-        "pretty-format": "^26.4.2"
+        "pretty-format": "^26.6.2"
       }
     },
     "jest-diff": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.4.2.tgz",
-      "integrity": "sha512-6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^26.3.0",
+        "diff-sequences": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.4.2"
+        "pretty-format": "^26.6.2"
       }
     },
     "jest-docblock": {
@@ -3673,45 +3979,45 @@
       }
     },
     "jest-each": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.4.2.tgz",
-      "integrity": "sha512-p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
+      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
         "jest-get-type": "^26.3.0",
-        "jest-util": "^26.3.0",
-        "pretty-format": "^26.4.2"
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2"
       }
     },
     "jest-environment-jsdom": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz",
-      "integrity": "sha512-zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
+      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^26.3.0",
-        "@jest/fake-timers": "^26.3.0",
-        "@jest/types": "^26.3.0",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.3.0",
-        "jest-util": "^26.3.0",
-        "jsdom": "^16.2.2"
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jsdom": "^16.4.0"
       }
     },
     "jest-environment-node": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.3.0.tgz",
-      "integrity": "sha512-c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
+      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^26.3.0",
-        "@jest/fake-timers": "^26.3.0",
-        "@jest/types": "^26.3.0",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.3.0",
-        "jest-util": "^26.3.0"
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
       }
     },
     "jest-get-type": {
@@ -3721,12 +4027,12 @@
       "dev": true
     },
     "jest-haste-map": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.3.0.tgz",
-      "integrity": "sha512-DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.2",
         "@types/graceful-fs": "^4.1.2",
         "@types/node": "*",
         "anymatch": "^3.0.3",
@@ -3734,85 +4040,86 @@
         "fsevents": "^2.1.2",
         "graceful-fs": "^4.2.4",
         "jest-regex-util": "^26.0.0",
-        "jest-serializer": "^26.3.0",
-        "jest-util": "^26.3.0",
-        "jest-worker": "^26.3.0",
+        "jest-serializer": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "micromatch": "^4.0.2",
         "sane": "^4.0.3",
         "walker": "^1.0.7"
       }
     },
     "jest-jasmine2": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz",
-      "integrity": "sha512-z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
+      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
       "dev": true,
       "requires": {
         "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^26.3.0",
-        "@jest/source-map": "^26.3.0",
-        "@jest/test-result": "^26.3.0",
-        "@jest/types": "^26.3.0",
+        "@jest/environment": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "expect": "^26.4.2",
+        "expect": "^26.6.2",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^26.4.2",
-        "jest-matcher-utils": "^26.4.2",
-        "jest-message-util": "^26.3.0",
-        "jest-runtime": "^26.4.2",
-        "jest-snapshot": "^26.4.2",
-        "jest-util": "^26.3.0",
-        "pretty-format": "^26.4.2",
+        "jest-each": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2",
         "throat": "^5.0.0"
       }
     },
     "jest-leak-detector": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz",
-      "integrity": "sha512-akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
+      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
       "dev": true,
       "requires": {
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.4.2"
+        "pretty-format": "^26.6.2"
       }
     },
     "jest-matcher-utils": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz",
-      "integrity": "sha512-KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^26.4.2",
+        "jest-diff": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.4.2"
+        "pretty-format": "^26.6.2"
       }
     },
     "jest-message-util": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.3.0.tgz",
-      "integrity": "sha512-xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^26.3.0",
-        "@types/stack-utils": "^1.0.1",
+        "@jest/types": "^26.6.2",
+        "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.2"
       }
     },
     "jest-mock": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.3.0.tgz",
-      "integrity": "sha512-PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
+      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.2",
         "@types/node": "*"
       }
     },
@@ -3829,98 +4136,111 @@
       "dev": true
     },
     "jest-resolve": {
-      "version": "26.4.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.4.0.tgz",
-      "integrity": "sha512-bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^26.3.0",
+        "jest-util": "^26.6.2",
         "read-pkg-up": "^7.0.1",
-        "resolve": "^1.17.0",
+        "resolve": "^1.18.1",
         "slash": "^3.0.0"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+          "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.2.0",
+            "path-parse": "^1.0.6"
+          }
+        }
       }
     },
     "jest-resolve-dependencies": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz",
-      "integrity": "sha512-ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
+      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-snapshot": "^26.4.2"
+        "jest-snapshot": "^26.6.2"
       }
     },
     "jest-runner": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.4.2.tgz",
-      "integrity": "sha512-FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
+      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.3.0",
-        "@jest/environment": "^26.3.0",
-        "@jest/test-result": "^26.3.0",
-        "@jest/types": "^26.3.0",
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.7.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^26.4.2",
+        "jest-config": "^26.6.3",
         "jest-docblock": "^26.0.0",
-        "jest-haste-map": "^26.3.0",
-        "jest-leak-detector": "^26.4.2",
-        "jest-message-util": "^26.3.0",
-        "jest-resolve": "^26.4.0",
-        "jest-runtime": "^26.4.2",
-        "jest-util": "^26.3.0",
-        "jest-worker": "^26.3.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-leak-detector": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "source-map-support": "^0.5.6",
         "throat": "^5.0.0"
       }
     },
     "jest-runtime": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.4.2.tgz",
-      "integrity": "sha512-4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ==",
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
+      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.3.0",
-        "@jest/environment": "^26.3.0",
-        "@jest/fake-timers": "^26.3.0",
-        "@jest/globals": "^26.4.2",
-        "@jest/source-map": "^26.3.0",
-        "@jest/test-result": "^26.3.0",
-        "@jest/transform": "^26.3.0",
-        "@jest/types": "^26.3.0",
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/globals": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/yargs": "^15.0.0",
         "chalk": "^4.0.0",
+        "cjs-module-lexer": "^0.6.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^26.4.2",
-        "jest-haste-map": "^26.3.0",
-        "jest-message-util": "^26.3.0",
-        "jest-mock": "^26.3.0",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.4.0",
-        "jest-snapshot": "^26.4.2",
-        "jest-util": "^26.3.0",
-        "jest-validate": "^26.4.2",
+        "jest-resolve": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0",
-        "yargs": "^15.3.1"
+        "yargs": "^15.4.1"
       }
     },
     "jest-serializer": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.3.0.tgz",
-      "integrity": "sha512-IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -3928,43 +4248,47 @@
       }
     },
     "jest-snapshot": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.4.2.tgz",
-      "integrity": "sha512-N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
+      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0",
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.2",
+        "@types/babel__traverse": "^7.0.4",
         "@types/prettier": "^2.0.0",
         "chalk": "^4.0.0",
-        "expect": "^26.4.2",
+        "expect": "^26.6.2",
         "graceful-fs": "^4.2.4",
-        "jest-diff": "^26.4.2",
+        "jest-diff": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "jest-haste-map": "^26.3.0",
-        "jest-matcher-utils": "^26.4.2",
-        "jest-message-util": "^26.3.0",
-        "jest-resolve": "^26.4.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^26.4.2",
+        "pretty-format": "^26.6.2",
         "semver": "^7.3.2"
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-          "dev": true
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
         }
       }
     },
     "jest-util": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.3.0.tgz",
-      "integrity": "sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
@@ -3973,46 +4297,46 @@
       }
     },
     "jest-validate": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.4.2.tgz",
-      "integrity": "sha512-blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
+      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.2",
         "camelcase": "^6.0.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^26.3.0",
         "leven": "^3.1.0",
-        "pretty-format": "^26.4.2"
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "camelcase": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
-          "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
           "dev": true
         }
       }
     },
     "jest-watcher": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.3.0.tgz",
-      "integrity": "sha512-XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
+      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^26.3.0",
-        "@jest/types": "^26.3.0",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^26.3.0",
+        "jest-util": "^26.6.2",
         "string-length": "^4.0.1"
       }
     },
     "jest-worker": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz",
-      "integrity": "sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -4027,9 +4351,9 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -4043,37 +4367,45 @@
       "dev": true
     },
     "jsdom": {
-      "version": "16.4.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz",
-      "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==",
+      "version": "16.5.3",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.5.3.tgz",
+      "integrity": "sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA==",
       "dev": true,
       "requires": {
-        "abab": "^2.0.3",
-        "acorn": "^7.1.1",
+        "abab": "^2.0.5",
+        "acorn": "^8.1.0",
         "acorn-globals": "^6.0.0",
         "cssom": "^0.4.4",
-        "cssstyle": "^2.2.0",
+        "cssstyle": "^2.3.0",
         "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.0",
+        "decimal.js": "^10.2.1",
         "domexception": "^2.0.1",
-        "escodegen": "^1.14.1",
+        "escodegen": "^2.0.0",
         "html-encoding-sniffer": "^2.0.1",
         "is-potential-custom-element-name": "^1.0.0",
         "nwsapi": "^2.2.0",
-        "parse5": "5.1.1",
+        "parse5": "6.0.1",
         "request": "^2.88.2",
-        "request-promise-native": "^1.0.8",
-        "saxes": "^5.0.0",
+        "request-promise-native": "^1.0.9",
+        "saxes": "^5.0.1",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^3.0.1",
+        "tough-cookie": "^4.0.0",
         "w3c-hr-time": "^1.0.2",
         "w3c-xmlserializer": "^2.0.0",
         "webidl-conversions": "^6.1.0",
         "whatwg-encoding": "^1.0.5",
         "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0",
-        "ws": "^7.2.3",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.4",
         "xml-name-validator": "^3.0.0"
+      },
+      "dependencies": {
+        "ws": {
+          "version": "7.4.5",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
+          "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==",
+          "dev": true
+        }
       }
     },
     "jsesc": {
@@ -4119,9 +4451,9 @@
       "dev": true
     },
     "json5": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
       "dev": true,
       "requires": {
         "minimist": "^1.2.5"
@@ -4301,12 +4633,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-      "dev": true
-    },
     "lodash.union": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
@@ -4337,6 +4663,15 @@
       "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
       "dev": true
     },
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
     "make-dir": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
@@ -4428,13 +4763,13 @@
       "dev": true
     },
     "micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
       "dev": true,
       "requires": {
         "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
+        "picomatch": "^2.2.3"
       }
     },
     "mime": {
@@ -4574,9 +4909,9 @@
       "dev": true
     },
     "node-notifier": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz",
-      "integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -4589,11 +4924,14 @@
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "dev": true,
-          "optional": true
+          "optional": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
         },
         "which": {
           "version": "2.0.2",
@@ -4607,6 +4945,12 @@
         }
       }
     },
+    "node-releases": {
+      "version": "1.1.71",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
+      "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+      "dev": true
+    },
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -4767,9 +5111,9 @@
       "dev": true
     },
     "p-each-series": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
-      "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
+      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
       "dev": true
     },
     "p-finally": {
@@ -4815,9 +5159,9 @@
       }
     },
     "parse5": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
       "dev": true
     },
     "parseurl": {
@@ -4875,9 +5219,9 @@
       "dev": true
     },
     "picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+      "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
       "dev": true
     },
     "pify": {
@@ -4923,15 +5267,15 @@
       "dev": true
     },
     "pretty-format": {
-      "version": "26.4.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.2.tgz",
-      "integrity": "sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.2",
         "ansi-regex": "^5.0.0",
         "ansi-styles": "^4.0.0",
-        "react-is": "^16.12.0"
+        "react-is": "^17.0.1"
       }
     },
     "process-nextick-args": {
@@ -4947,13 +5291,13 @@
       "dev": true
     },
     "prompts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
+      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.4"
+        "sisteransi": "^1.0.5"
       }
     },
     "proto-list": {
@@ -5052,9 +5396,9 @@
       }
     },
     "react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
     "read-pkg": {
@@ -5125,9 +5469,9 @@
       "dev": true
     },
     "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
       "dev": true
     },
     "repeat-string": {
@@ -5919,9 +6263,9 @@
       }
     },
     "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
       "dev": true
     },
     "spawn-command": {
@@ -6023,9 +6367,9 @@
       }
     },
     "stack-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-      "integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^2.0.0"
@@ -6073,9 +6417,9 @@
       "dev": true
     },
     "string-length": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
-      "integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
       "requires": {
         "char-regex": "^1.0.2",
@@ -6083,9 +6427,9 @@
       }
     },
     "string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
       "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
@@ -6148,9 +6492,9 @@
       }
     },
     "supports-hyperlinks": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
-      "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
       "dev": true,
       "requires": {
         "has-flag": "^4.0.0",
@@ -6287,14 +6631,14 @@
       "dev": true
     },
     "tough-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
       "dev": true,
       "requires": {
-        "ip-regex": "^2.1.0",
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
       }
     },
     "tr46": {
@@ -6524,9 +6868,9 @@
       "dev": true
     },
     "v8-to-istanbul": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz",
-      "integrity": "sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
+      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -6778,22 +7122,14 @@
       "dev": true
     },
     "whatwg-url": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.1.0.tgz",
-      "integrity": "sha512-vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.5.0.tgz",
+      "integrity": "sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg==",
       "dev": true,
       "requires": {
-        "lodash.sortby": "^4.7.0",
+        "lodash": "^4.7.0",
         "tr46": "^2.0.2",
-        "webidl-conversions": "^5.0.0"
-      },
-      "dependencies": {
-        "webidl-conversions": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-          "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-          "dev": true
-        }
+        "webidl-conversions": "^6.1.0"
       }
     },
     "which": {
@@ -6897,6 +7233,12 @@
       "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
       "dev": true
     },
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "yargs": {
       "version": "15.4.1",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
diff --git a/packages/insomnia-smoke-test/package.json b/packages/insomnia-smoke-test/package.json
index 592f9caed6..2246be4ccd 100644
--- a/packages/insomnia-smoke-test/package.json
+++ b/packages/insomnia-smoke-test/package.json
@@ -27,7 +27,7 @@
     "express-basic-auth": "^1.2.0",
     "faker": "^5.1.0",
     "get-bin-path": "^5.1.0",
-    "jest": "^26.4.2",
+    "jest": "^26.6.3",
     "mkdirp": "^1.0.4",
     "spectron": "^11.1.0",
     "spectron-keys": "0.0.1",
diff --git a/packages/insomnia-testing/.babelrc b/packages/insomnia-testing/.babelrc
deleted file mode 100644
index ff98aba32a..0000000000
--- a/packages/insomnia-testing/.babelrc
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "targets": {
-          "node": "12"
-        }
-      }
-    ],
-    "@babel/preset-flow"
-  ],
-  "plugins": [
-    ["@babel/plugin-proposal-optional-chaining"]
-  ]
-}
diff --git a/packages/insomnia-testing/.eslintignore b/packages/insomnia-testing/.eslintignore
new file mode 100644
index 0000000000..05ca5ce1f2
--- /dev/null
+++ b/packages/insomnia-testing/.eslintignore
@@ -0,0 +1,2 @@
+**/fixtures
+dist
diff --git a/packages/insomnia-testing/.eslintrc.js b/packages/insomnia-testing/.eslintrc.js
new file mode 100644
index 0000000000..17427cb1b2
--- /dev/null
+++ b/packages/insomnia-testing/.eslintrc.js
@@ -0,0 +1,7 @@
+/** @type { import('eslint').Linter.Config } */
+module.exports = {
+  extends: '../../.eslintrc.js',
+  rules: {
+    '@typescript-eslint/no-use-before-define': 'off', // TSCONVERSION
+  },
+};
diff --git a/packages/insomnia-testing/.flowconfig b/packages/insomnia-testing/.flowconfig
deleted file mode 100644
index 31844c1c7c..0000000000
--- a/packages/insomnia-testing/.flowconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[ignore]
-.*/node_modules/.*
-.*/__fixtures__/.*
-./.cache
-./dist
-
-[include]
-
-[libs]
-./flow-typed
-
-[options]
-esproposal.optional_chaining=enable
-
-[lints]
diff --git a/packages/insomnia-testing/flow-typed/axios.js b/packages/insomnia-testing/flow-typed/axios.js
deleted file mode 100644
index 7f42f1380c..0000000000
--- a/packages/insomnia-testing/flow-typed/axios.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// @flow
-
-declare module 'axios' {
-  declare module.exports: *;
-}
-
-declare module 'axios/lib/adapters/http' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-testing/flow-typed/chai.js b/packages/insomnia-testing/flow-typed/chai.js
deleted file mode 100644
index f397116051..0000000000
--- a/packages/insomnia-testing/flow-typed/chai.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'chai' {
-  declare module.exports: *;
-}
diff --git a/packages/insomnia-testing/flow-typed/jest.js b/packages/insomnia-testing/flow-typed/jest.js
deleted file mode 100644
index 2ad13d02b9..0000000000
--- a/packages/insomnia-testing/flow-typed/jest.js
+++ /dev/null
@@ -1,1186 +0,0 @@
-type JestMockFn<TArguments: $ReadOnlyArray<*>, TReturn> = {
-  (...args: TArguments): TReturn,
-  /**
-   * An object for introspecting mock calls
-   */
-  mock: {
-    /**
-     * An array that represents all calls that have been made into this mock
-     * function. Each call is represented by an array of arguments that were
-     * passed during the call.
-     */
-    calls: Array<TArguments>,
-    /**
-     * An array that contains all the object instances that have been
-     * instantiated from this mock function.
-     */
-    instances: Array<TReturn>,
-    /**
-     * An array that contains all the object results that have been
-     * returned by this mock function call
-     */
-    results: Array<{
-      isThrow: boolean,
-      value: TReturn,
-      ...
-    }>,
-    ...
-  },
-  /**
-   * Resets all information stored in the mockFn.mock.calls and
-   * mockFn.mock.instances arrays. Often this is useful when you want to clean
-   * up a mock's usage data between two assertions.
-   */
-  mockClear(): void,
-  /**
-   * Resets all information stored in the mock. This is useful when you want to
-   * completely restore a mock back to its initial state.
-   */
-  mockReset(): void,
-  /**
-   * Removes the mock and restores the initial implementation. This is useful
-   * when you want to mock functions in certain test cases and restore the
-   * original implementation in others. Beware that mockFn.mockRestore only
-   * works when mock was created with jest.spyOn. Thus you have to take care of
-   * restoration yourself when manually assigning jest.fn().
-   */
-  mockRestore(): void,
-  /**
-   * Accepts a function that should be used as the implementation of the mock.
-   * The mock itself will still record all calls that go into and instances
-   * that come from itself -- the only difference is that the implementation
-   * will also be executed when the mock is called.
-   */
-  mockImplementation(fn: (...args: TArguments) => TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Accepts a function that will be used as an implementation of the mock for
-   * one call to the mocked function. Can be chained so that multiple function
-   * calls produce different results.
-   */
-  mockImplementationOnce(fn: (...args: TArguments) => TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Accepts a string to use in test result output in place of "jest.fn()" to
-   * indicate which mock function is being referenced.
-   */
-  mockName(name: string): JestMockFn<TArguments, TReturn>,
-  /**
-   * Just a simple sugar function for returning `this`
-   */
-  mockReturnThis(): void,
-  /**
-   * Accepts a value that will be returned whenever the mock function is called.
-   */
-  mockReturnValue(value: TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Sugar for only returning a value once inside your mock
-   */
-  mockReturnValueOnce(value: TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Sugar for jest.fn().mockImplementation(() => Promise.resolve(value))
-   */
-  mockResolvedValue(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
-  /**
-   * Sugar for jest.fn().mockImplementationOnce(() => Promise.resolve(value))
-   */
-  mockResolvedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
-  /**
-   * Sugar for jest.fn().mockImplementation(() => Promise.reject(value))
-   */
-  mockRejectedValue(value: TReturn): JestMockFn<TArguments, Promise<any>>,
-  /**
-   * Sugar for jest.fn().mockImplementationOnce(() => Promise.reject(value))
-   */
-  mockRejectedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<any>>,
-  ...
-};
-
-type JestAsymmetricEqualityType = {
-  /**
-   * A custom Jasmine equality tester
-   */
-  asymmetricMatch(value: mixed): boolean,
-  ...
-};
-
-type JestCallsType = {
-  allArgs(): mixed,
-  all(): mixed,
-  any(): boolean,
-  count(): number,
-  first(): mixed,
-  mostRecent(): mixed,
-  reset(): void,
-  ...
-};
-
-type JestClockType = {
-  install(): void,
-  mockDate(date: Date): void,
-  tick(milliseconds?: number): void,
-  uninstall(): void,
-  ...
-};
-
-type JestMatcherResult = {
-  message?: string | (() => string),
-  pass: boolean,
-  ...
-};
-
-type JestMatcher = (
-  received: any,
-  ...actual: Array<any>
-) => JestMatcherResult | Promise<JestMatcherResult>;
-
-type JestPromiseType = {
-  /**
-   * Use rejects to unwrap the reason of a rejected promise so any other
-   * matcher can be chained. If the promise is fulfilled the assertion fails.
-   */
-  rejects: JestExpectType,
-  /**
-   * Use resolves to unwrap the value of a fulfilled promise so any other
-   * matcher can be chained. If the promise is rejected the assertion fails.
-   */
-  resolves: JestExpectType,
-  ...
-};
-
-/**
- * Jest allows functions and classes to be used as test names in test() and
- * describe()
- */
-type JestTestName = string | Function;
-
-/**
- *  Plugin: jest-styled-components
- */
-
-type JestStyledComponentsMatcherValue =
-  | string
-  | JestAsymmetricEqualityType
-  | RegExp
-  | typeof undefined;
-
-type JestStyledComponentsMatcherOptions = {
-  media?: string,
-  modifier?: string,
-  supports?: string,
-  ...
-};
-
-type JestStyledComponentsMatchersType = {
-  toHaveStyleRule(
-    property: string,
-    value: JestStyledComponentsMatcherValue,
-    options?: JestStyledComponentsMatcherOptions,
-  ): void,
-  ...
-};
-
-/**
- *  Plugin: jest-enzyme
- */
-type EnzymeMatchersType = {
-  // 5.x
-  toBeEmpty(): void,
-  toBePresent(): void,
-  // 6.x
-  toBeChecked(): void,
-  toBeDisabled(): void,
-  toBeEmptyRender(): void,
-  toContainMatchingElement(selector: string): void,
-  toContainMatchingElements(n: number, selector: string): void,
-  toContainExactlyOneMatchingElement(selector: string): void,
-  toContainReact(element: React$Element<any>): void,
-  toExist(): void,
-  toHaveClassName(className: string): void,
-  toHaveHTML(html: string): void,
-  toHaveProp: ((propKey: string, propValue?: any) => void) & ((props: { ... }) => void),
-  toHaveRef(refName: string): void,
-  toHaveState: ((stateKey: string, stateValue?: any) => void) & ((state: { ... }) => void),
-  toHaveStyle: ((styleKey: string, styleValue?: any) => void) & ((style: { ... }) => void),
-  toHaveTagName(tagName: string): void,
-  toHaveText(text: string): void,
-  toHaveValue(value: any): void,
-  toIncludeText(text: string): void,
-  toMatchElement(
-    element: React$Element<any>,
-    options?: {| ignoreProps?: boolean, verbose?: boolean |},
-  ): void,
-  toMatchSelector(selector: string): void,
-  // 7.x
-  toHaveDisplayName(name: string): void,
-  ...
-};
-
-// DOM testing library extensions (jest-dom)
-// https://github.com/testing-library/jest-dom
-type DomTestingLibraryType = {
-  /**
-   * @deprecated
-   */
-  toBeInTheDOM(container?: HTMLElement): void,
-  toBeInTheDocument(): void,
-  toBeVisible(): void,
-  toBeEmpty(): void,
-  toBeDisabled(): void,
-  toBeEnabled(): void,
-  toBeInvalid(): void,
-  toBeRequired(): void,
-  toBeValid(): void,
-  toContainElement(element: HTMLElement | null): void,
-  toContainHTML(htmlText: string): void,
-  toHaveAttribute(attr: string, value?: any): void,
-  toHaveClass(...classNames: string[]): void,
-  toHaveFocus(): void,
-  toHaveFormValues(expectedValues: { [name: string]: any, ... }): void,
-  toHaveStyle(css: string): void,
-  toHaveTextContent(text: string | RegExp, options?: { normalizeWhitespace: boolean, ... }): void,
-  toHaveValue(value?: string | string[] | number): void,
-  ...
-};
-
-// Jest JQuery Matchers: https://github.com/unindented/custom-jquery-matchers
-type JestJQueryMatchersType = {
-  toExist(): void,
-  toHaveLength(len: number): void,
-  toHaveId(id: string): void,
-  toHaveClass(className: string): void,
-  toHaveTag(tag: string): void,
-  toHaveAttr(key: string, val?: any): void,
-  toHaveProp(key: string, val?: any): void,
-  toHaveText(text: string | RegExp): void,
-  toHaveData(key: string, val?: any): void,
-  toHaveValue(val: any): void,
-  toHaveCss(css: { [key: string]: any, ... }): void,
-  toBeChecked(): void,
-  toBeDisabled(): void,
-  toBeEmpty(): void,
-  toBeHidden(): void,
-  toBeSelected(): void,
-  toBeVisible(): void,
-  toBeFocused(): void,
-  toBeInDom(): void,
-  toBeMatchedBy(sel: string): void,
-  toHaveDescendant(sel: string): void,
-  toHaveDescendantWithText(sel: string, text: string | RegExp): void,
-  ...
-};
-
-// Jest Extended Matchers: https://github.com/jest-community/jest-extended
-type JestExtendedMatchersType = {
-  /**
-   * Note: Currently unimplemented
-   * Passing assertion
-   *
-   * @param {String} message
-   */
-  //  pass(message: string): void;
-
-  /**
-   * Note: Currently unimplemented
-   * Failing assertion
-   *
-   * @param {String} message
-   */
-  //  fail(message: string): void;
-
-  /**
-   * Use .toBeEmpty when checking if a String '', Array [] or Object {} is empty.
-   */
-  toBeEmpty(): void,
-  /**
-   * Use .toBeOneOf when checking if a value is a member of a given Array.
-   * @param {Array.<*>} members
-   */
-  toBeOneOf(members: any[]): void,
-  /**
-   * Use `.toBeNil` when checking a value is `null` or `undefined`.
-   */
-  toBeNil(): void,
-  /**
-   * Use `.toSatisfy` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean`.
-   * @param {Function} predicate
-   */
-  toSatisfy(predicate: (n: any) => boolean): void,
-  /**
-   * Use `.toBeArray` when checking if a value is an `Array`.
-   */
-  toBeArray(): void,
-  /**
-   * Use `.toBeArrayOfSize` when checking if a value is an `Array` of size x.
-   * @param {Number} x
-   */
-  toBeArrayOfSize(x: number): void,
-  /**
-   * Use `.toIncludeAllMembers` when checking if an `Array` contains all of the same members of a given set.
-   * @param {Array.<*>} members
-   */
-  toIncludeAllMembers(members: any[]): void,
-  /**
-   * Use `.toIncludeAnyMembers` when checking if an `Array` contains any of the members of a given set.
-   * @param {Array.<*>} members
-   */
-  toIncludeAnyMembers(members: any[]): void,
-  /**
-   * Use `.toSatisfyAll` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean` for all values in an array.
-   * @param {Function} predicate
-   */
-  toSatisfyAll(predicate: (n: any) => boolean): void,
-  /**
-   * Use `.toBeBoolean` when checking if a value is a `Boolean`.
-   */
-  toBeBoolean(): void,
-  /**
-   * Use `.toBeTrue` when checking a value is equal (===) to `true`.
-   */
-  toBeTrue(): void,
-  /**
-   * Use `.toBeFalse` when checking a value is equal (===) to `false`.
-   */
-  toBeFalse(): void,
-  /**
-   * Use .toBeDate when checking if a value is a Date.
-   */
-  toBeDate(): void,
-  /**
-   * Use `.toBeFunction` when checking if a value is a `Function`.
-   */
-  toBeFunction(): void,
-  /**
-   * Use `.toHaveBeenCalledBefore` when checking if a `Mock` was called before another `Mock`.
-   *
-   * Note: Required Jest version >22
-   * Note: Your mock functions will have to be asynchronous to cause the timestamps inside of Jest to occur in a differentJS event loop, otherwise the mock timestamps will all be the same
-   *
-   * @param {Mock} mock
-   */
-  toHaveBeenCalledBefore(mock: JestMockFn<any, any>): void,
-  /**
-   * Use `.toBeNumber` when checking if a value is a `Number`.
-   */
-  toBeNumber(): void,
-  /**
-   * Use `.toBeNaN` when checking a value is `NaN`.
-   */
-  toBeNaN(): void,
-  /**
-   * Use `.toBeFinite` when checking if a value is a `Number`, not `NaN` or `Infinity`.
-   */
-  toBeFinite(): void,
-  /**
-   * Use `.toBePositive` when checking if a value is a positive `Number`.
-   */
-  toBePositive(): void,
-  /**
-   * Use `.toBeNegative` when checking if a value is a negative `Number`.
-   */
-  toBeNegative(): void,
-  /**
-   * Use `.toBeEven` when checking if a value is an even `Number`.
-   */
-  toBeEven(): void,
-  /**
-   * Use `.toBeOdd` when checking if a value is an odd `Number`.
-   */
-  toBeOdd(): void,
-  /**
-   * Use `.toBeWithin` when checking if a number is in between the given bounds of: start (inclusive) and end (exclusive).
-   *
-   * @param {Number} start
-   * @param {Number} end
-   */
-  toBeWithin(start: number, end: number): void,
-  /**
-   * Use `.toBeObject` when checking if a value is an `Object`.
-   */
-  toBeObject(): void,
-  /**
-   * Use `.toContainKey` when checking if an object contains the provided key.
-   *
-   * @param {String} key
-   */
-  toContainKey(key: string): void,
-  /**
-   * Use `.toContainKeys` when checking if an object has all of the provided keys.
-   *
-   * @param {Array.<String>} keys
-   */
-  toContainKeys(keys: string[]): void,
-  /**
-   * Use `.toContainAllKeys` when checking if an object only contains all of the provided keys.
-   *
-   * @param {Array.<String>} keys
-   */
-  toContainAllKeys(keys: string[]): void,
-  /**
-   * Use `.toContainAnyKeys` when checking if an object contains at least one of the provided keys.
-   *
-   * @param {Array.<String>} keys
-   */
-  toContainAnyKeys(keys: string[]): void,
-  /**
-   * Use `.toContainValue` when checking if an object contains the provided value.
-   *
-   * @param {*} value
-   */
-  toContainValue(value: any): void,
-  /**
-   * Use `.toContainValues` when checking if an object contains all of the provided values.
-   *
-   * @param {Array.<*>} values
-   */
-  toContainValues(values: any[]): void,
-  /**
-   * Use `.toContainAllValues` when checking if an object only contains all of the provided values.
-   *
-   * @param {Array.<*>} values
-   */
-  toContainAllValues(values: any[]): void,
-  /**
-   * Use `.toContainAnyValues` when checking if an object contains at least one of the provided values.
-   *
-   * @param {Array.<*>} values
-   */
-  toContainAnyValues(values: any[]): void,
-  /**
-   * Use `.toContainEntry` when checking if an object contains the provided entry.
-   *
-   * @param {Array.<String, String>} entry
-   */
-  toContainEntry(entry: [string, string]): void,
-  /**
-   * Use `.toContainEntries` when checking if an object contains all of the provided entries.
-   *
-   * @param {Array.<Array.<String, String>>} entries
-   */
-  toContainEntries(entries: [string, string][]): void,
-  /**
-   * Use `.toContainAllEntries` when checking if an object only contains all of the provided entries.
-   *
-   * @param {Array.<Array.<String, String>>} entries
-   */
-  toContainAllEntries(entries: [string, string][]): void,
-  /**
-   * Use `.toContainAnyEntries` when checking if an object contains at least one of the provided entries.
-   *
-   * @param {Array.<Array.<String, String>>} entries
-   */
-  toContainAnyEntries(entries: [string, string][]): void,
-  /**
-   * Use `.toBeExtensible` when checking if an object is extensible.
-   */
-  toBeExtensible(): void,
-  /**
-   * Use `.toBeFrozen` when checking if an object is frozen.
-   */
-  toBeFrozen(): void,
-  /**
-   * Use `.toBeSealed` when checking if an object is sealed.
-   */
-  toBeSealed(): void,
-  /**
-   * Use `.toBeString` when checking if a value is a `String`.
-   */
-  toBeString(): void,
-  /**
-   * Use `.toEqualCaseInsensitive` when checking if a string is equal (===) to another ignoring the casing of both strings.
-   *
-   * @param {String} string
-   */
-  toEqualCaseInsensitive(string: string): void,
-  /**
-   * Use `.toStartWith` when checking if a `String` starts with a given `String` prefix.
-   *
-   * @param {String} prefix
-   */
-  toStartWith(prefix: string): void,
-  /**
-   * Use `.toEndWith` when checking if a `String` ends with a given `String` suffix.
-   *
-   * @param {String} suffix
-   */
-  toEndWith(suffix: string): void,
-  /**
-   * Use `.toInclude` when checking if a `String` includes the given `String` substring.
-   *
-   * @param {String} substring
-   */
-  toInclude(substring: string): void,
-  /**
-   * Use `.toIncludeRepeated` when checking if a `String` includes the given `String` substring the correct number of times.
-   *
-   * @param {String} substring
-   * @param {Number} times
-   */
-  toIncludeRepeated(substring: string, times: number): void,
-  /**
-   * Use `.toIncludeMultiple` when checking if a `String` includes all of the given substrings.
-   *
-   * @param {Array.<String>} substring
-   */
-  toIncludeMultiple(substring: string[]): void,
-  ...
-};
-
-interface JestExpectType {
-  not: JestExpectType &
-    EnzymeMatchersType &
-    DomTestingLibraryType &
-    JestJQueryMatchersType &
-    JestStyledComponentsMatchersType &
-    JestExtendedMatchersType;
-
-  /**
-   * If you have a mock function, you can use .lastCalledWith to test what
-   * arguments it was last called with.
-   */
-  lastCalledWith(...args: Array<any>): void;
-
-  /**
-   * toBe just checks that a value is what you expect. It uses === to check
-   * strict equality.
-   */
-  toBe(value: any): void;
-
-  /**
-   * Use .toBeCalledWith to ensure that a mock function was called with
-   * specific arguments.
-   */
-  toBeCalledWith(...args: Array<any>): void;
-
-  /**
-   * Using exact equality with floating point numbers is a bad idea. Rounding
-   * means that intuitive things fail.
-   */
-  toBeCloseTo(num: number, delta: any): void;
-
-  /**
-   * Use .toBeDefined to check that a variable is not undefined.
-   */
-  toBeDefined(): void;
-
-  /**
-   * Use .toBeFalsy when you don't care what a value is, you just want to
-   * ensure a value is false in a boolean context.
-   */
-  toBeFalsy(): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeGreaterThan.
-   */
-  toBeGreaterThan(number: number): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeGreaterThanOrEqual.
-   */
-  toBeGreaterThanOrEqual(number: number): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeLessThan.
-   */
-  toBeLessThan(number: number): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeLessThanOrEqual.
-   */
-  toBeLessThanOrEqual(number: number): void;
-
-  /**
-   * Use .toBeInstanceOf(Class) to check that an object is an instance of a
-   * class.
-   */
-  toBeInstanceOf(cls: Class<*>): void;
-
-  /**
-   * .toBeNull() is the same as .toBe(null) but the error messages are a bit
-   * nicer.
-   */
-  toBeNull(): void;
-
-  /**
-   * Use .toBeTruthy when you don't care what a value is, you just want to
-   * ensure a value is true in a boolean context.
-   */
-  toBeTruthy(): void;
-
-  /**
-   * Use .toBeUndefined to check that a variable is undefined.
-   */
-  toBeUndefined(): void;
-
-  /**
-   * Use .toContain when you want to check that an item is in a list. For
-   * testing the items in the list, this uses ===, a strict equality check.
-   */
-  toContain(item: any): void;
-
-  /**
-   * Use .toContainEqual when you want to check that an item is in a list. For
-   * testing the items in the list, this matcher recursively checks the
-   * equality of all fields, rather than checking for object identity.
-   */
-  toContainEqual(item: any): void;
-
-  /**
-   * Use .toEqual when you want to check that two objects have the same value.
-   * This matcher recursively checks the equality of all fields, rather than
-   * checking for object identity.
-   */
-  toEqual(value: any): void;
-
-  /**
-   * Use .toHaveBeenCalled to ensure that a mock function got called.
-   */
-  toHaveBeenCalled(): void;
-
-  toBeCalled(): void;
-
-  /**
-   * Use .toHaveBeenCalledTimes to ensure that a mock function got called exact
-   * number of times.
-   */
-  toHaveBeenCalledTimes(number: number): void;
-
-  toBeCalledTimes(number: number): void;
-
-  /**
-   *
-   */
-  toHaveBeenNthCalledWith(nthCall: number, ...args: Array<any>): void;
-
-  nthCalledWith(nthCall: number, ...args: Array<any>): void;
-
-  /**
-   *
-   */
-  toHaveReturned(): void;
-
-  toReturn(): void;
-
-  /**
-   *
-   */
-  toHaveReturnedTimes(number: number): void;
-
-  toReturnTimes(number: number): void;
-
-  /**
-   *
-   */
-  toHaveReturnedWith(value: any): void;
-
-  toReturnWith(value: any): void;
-
-  /**
-   *
-   */
-  toHaveLastReturnedWith(value: any): void;
-
-  lastReturnedWith(value: any): void;
-
-  /**
-   *
-   */
-  toHaveNthReturnedWith(nthCall: number, value: any): void;
-
-  nthReturnedWith(nthCall: number, value: any): void;
-
-  /**
-   * Use .toHaveBeenCalledWith to ensure that a mock function was called with
-   * specific arguments.
-   */
-  toHaveBeenCalledWith(...args: Array<any>): void;
-
-  toBeCalledWith(...args: Array<any>): void;
-
-  /**
-   * Use .toHaveBeenLastCalledWith to ensure that a mock function was last called
-   * with specific arguments.
-   */
-  toHaveBeenLastCalledWith(...args: Array<any>): void;
-
-  lastCalledWith(...args: Array<any>): void;
-
-  /**
-   * Check that an object has a .length property and it is set to a certain
-   * numeric value.
-   */
-  toHaveLength(number: number): void;
-
-  /**
-   *
-   */
-  toHaveProperty(propPath: string | $ReadOnlyArray<string>, value?: any): void;
-
-  /**
-   * Use .toMatch to check that a string matches a regular expression or string.
-   */
-  toMatch(regexpOrString: RegExp | string): void;
-
-  /**
-   * Use .toMatchObject to check that a javascript object matches a subset of the properties of an object.
-   */
-  toMatchObject(object: Object | Array<Object>): void;
-
-  /**
-   * Use .toStrictEqual to check that a javascript object matches a subset of the properties of an object.
-   */
-  toStrictEqual(value: any): void;
-
-  /**
-   * This ensures that an Object matches the most recent snapshot.
-   */
-  toMatchSnapshot(propertyMatchers?: any, name?: string): void;
-
-  /**
-   * This ensures that an Object matches the most recent snapshot.
-   */
-  toMatchSnapshot(name: string): void;
-
-  toMatchInlineSnapshot(snapshot?: string): void;
-
-  toMatchInlineSnapshot(propertyMatchers?: any, snapshot?: string): void;
-
-  /**
-   * Use .toThrow to test that a function throws when it is called.
-   * If you want to test that a specific error gets thrown, you can provide an
-   * argument to toThrow. The argument can be a string for the error message,
-   * a class for the error, or a regex that should match the error.
-   *
-   * Alias: .toThrowError
-   */
-  toThrow(message?: string | Error | Class<Error> | RegExp): void;
-
-  toThrowError(message?: string | Error | Class<Error> | RegExp): void;
-
-  /**
-   * Use .toThrowErrorMatchingSnapshot to test that a function throws a error
-   * matching the most recent snapshot when it is called.
-   */
-  toThrowErrorMatchingSnapshot(): void;
-
-  toThrowErrorMatchingInlineSnapshot(snapshot?: string): void;
-}
-
-type JestObjectType = {
-  /**
-   *  Disables automatic mocking in the module loader.
-   *
-   *  After this method is called, all `require()`s will return the real
-   *  versions of each module (rather than a mocked version).
-   */
-  disableAutomock(): JestObjectType,
-  /**
-   * An un-hoisted version of disableAutomock
-   */
-  autoMockOff(): JestObjectType,
-  /**
-   * Enables automatic mocking in the module loader.
-   */
-  enableAutomock(): JestObjectType,
-  /**
-   * An un-hoisted version of enableAutomock
-   */
-  autoMockOn(): JestObjectType,
-  /**
-   * Clears the mock.calls and mock.instances properties of all mocks.
-   * Equivalent to calling .mockClear() on every mocked function.
-   */
-  clearAllMocks(): JestObjectType,
-  /**
-   * Resets the state of all mocks. Equivalent to calling .mockReset() on every
-   * mocked function.
-   */
-  resetAllMocks(): JestObjectType,
-  /**
-   * Restores all mocks back to their original value.
-   */
-  restoreAllMocks(): JestObjectType,
-  /**
-   * Removes any pending timers from the timer system.
-   */
-  clearAllTimers(): void,
-  /**
-   * Returns the number of fake timers still left to run.
-   */
-  getTimerCount(): number,
-  /**
-   * The same as `mock` but not moved to the top of the expectation by
-   * babel-jest.
-   */
-  doMock(moduleName: string, moduleFactory?: any): JestObjectType,
-  /**
-   * The same as `unmock` but not moved to the top of the expectation by
-   * babel-jest.
-   */
-  dontMock(moduleName: string): JestObjectType,
-  /**
-   * Returns a new, unused mock function. Optionally takes a mock
-   * implementation.
-   */
-  fn<TArguments: $ReadOnlyArray<*>, TReturn>(
-    implementation?: (...args: TArguments) => TReturn,
-  ): JestMockFn<TArguments, TReturn>,
-  /**
-   * Determines if the given function is a mocked function.
-   */
-  isMockFunction(fn: Function): boolean,
-  /**
-   * Given the name of a module, use the automatic mocking system to generate a
-   * mocked version of the module for you.
-   */
-  genMockFromModule(moduleName: string): any,
-  /**
-   * Mocks a module with an auto-mocked version when it is being required.
-   *
-   * The second argument can be used to specify an explicit module factory that
-   * is being run instead of using Jest's automocking feature.
-   *
-   * The third argument can be used to create virtual mocks -- mocks of modules
-   * that don't exist anywhere in the system.
-   */
-  mock(moduleName: string, moduleFactory?: any, options?: Object): JestObjectType,
-  /**
-   * Returns the actual module instead of a mock, bypassing all checks on
-   * whether the module should receive a mock implementation or not.
-   */
-  requireActual(moduleName: string): any,
-  /**
-   * Returns a mock module instead of the actual module, bypassing all checks
-   * on whether the module should be required normally or not.
-   */
-  requireMock(moduleName: string): any,
-  /**
-   * Resets the module registry - the cache of all required modules. This is
-   * useful to isolate modules where local state might conflict between tests.
-   */
-  resetModules(): JestObjectType,
-  /**
-   * Creates a sandbox registry for the modules that are loaded inside the
-   * callback function. This is useful to isolate specific modules for every
-   * test so that local module state doesn't conflict between tests.
-   */
-  isolateModules(fn: () => void): JestObjectType,
-  /**
-   * Exhausts the micro-task queue (usually interfaced in node via
-   * process.nextTick).
-   */
-  runAllTicks(): void,
-  /**
-   * Exhausts the macro-task queue (i.e., all tasks queued by setTimeout(),
-   * setInterval(), and setImmediate()).
-   */
-  runAllTimers(): void,
-  /**
-   * Exhausts all tasks queued by setImmediate().
-   */
-  runAllImmediates(): void,
-  /**
-   * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-   * or setInterval() and setImmediate()).
-   */
-  advanceTimersByTime(msToRun: number): void,
-  /**
-   * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-   * or setInterval() and setImmediate()).
-   *
-   * Renamed to `advanceTimersByTime`.
-   */
-  runTimersToTime(msToRun: number): void,
-  /**
-   * Executes only the macro-tasks that are currently pending (i.e., only the
-   * tasks that have been queued by setTimeout() or setInterval() up to this
-   * point)
-   */
-  runOnlyPendingTimers(): void,
-  /**
-   * Explicitly supplies the mock object that the module system should return
-   * for the specified module. Note: It is recommended to use jest.mock()
-   * instead.
-   */
-  setMock(moduleName: string, moduleExports: any): JestObjectType,
-  /**
-   * Indicates that the module system should never return a mocked version of
-   * the specified module from require() (e.g. that it should always return the
-   * real module).
-   */
-  unmock(moduleName: string): JestObjectType,
-  /**
-   * Instructs Jest to use fake versions of the standard timer functions
-   * (setTimeout, setInterval, clearTimeout, clearInterval, nextTick,
-   * setImmediate and clearImmediate).
-   */
-  useFakeTimers(): JestObjectType,
-  /**
-   * Instructs Jest to use the real versions of the standard timer functions.
-   */
-  useRealTimers(): JestObjectType,
-  /**
-   * Creates a mock function similar to jest.fn but also tracks calls to
-   * object[methodName].
-   */
-  spyOn(object: Object, methodName: string, accessType?: 'get' | 'set'): JestMockFn<any, any>,
-  /**
-   * Set the default timeout interval for tests and before/after hooks in milliseconds.
-   * Note: The default timeout interval is 5 seconds if this method is not called.
-   */
-  setTimeout(timeout: number): JestObjectType,
-  ...
-};
-
-type JestSpyType = { calls: JestCallsType, ... };
-
-type JestDoneFn = {|
-  (): void,
-  fail: (error: Error) => void,
-|};
-
-/** Runs this function after every test inside this context */
-declare function afterEach(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** Runs this function before every test inside this context */
-declare function beforeEach(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** Runs this function after all tests have finished inside this context */
-declare function afterAll(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** Runs this function before any tests have started inside this context */
-declare function beforeAll(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** A context for grouping tests together */
-declare var describe: {
-  /**
-   * Creates a block that groups together several related tests in one "test suite"
-   */
-  (name: JestTestName, fn: () => void): void,
-  /**
-   * Only run this describe block
-   */
-  only(name: JestTestName, fn: () => void): void,
-  /**
-   * Skip running this describe block
-   */
-  skip(name: JestTestName, fn: () => void): void,
-  /**
-   * each runs this test against array of argument arrays per each run
-   *
-   * @param {table} table of Test
-   */
-  each(
-    ...table: Array<Array<mixed> | mixed> | [Array<string>, string]
-  ): (name: JestTestName, fn?: (...args: Array<any>) => ?Promise<mixed>, timeout?: number) => void,
-  ...
-};
-
-/** An individual test unit */
-declare var it: {
-  /**
-   * An individual test unit
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  (name: JestTestName, fn?: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void,
-  /**
-   * Only run this test
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  only: {|
-    (name: JestTestName, fn?: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void,
-    each(
-      ...table: Array<Array<mixed> | mixed> | [Array<string>, string]
-    ): (
-      name: JestTestName,
-      fn?: (...args: Array<any>) => ?Promise<mixed>,
-      timeout?: number,
-    ) => void,
-  |},
-  /**
-   * Skip running this test
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  skip(name: JestTestName, fn?: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void,
-  /**
-   * Highlight planned tests in the summary output
-   *
-   * @param {String} Name of Test to do
-   */
-  todo(name: string): void,
-  /**
-   * Run the test concurrently
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  concurrent(
-    name: JestTestName,
-    fn?: (done: JestDoneFn) => ?Promise<mixed>,
-    timeout?: number,
-  ): void,
-  /**
-   * each runs this test against array of argument arrays per each run
-   *
-   * @param {table} table of Test
-   */
-  each(
-    ...table: Array<Array<mixed> | mixed> | [Array<string>, string]
-  ): (name: JestTestName, fn?: (...args: Array<any>) => ?Promise<mixed>, timeout?: number) => void,
-  ...
-};
-
-declare function fit(
-  name: JestTestName,
-  fn: (done: JestDoneFn) => ?Promise<mixed>,
-  timeout?: number,
-): void;
-
-/** An individual test unit */
-declare var test: typeof it;
-/** A disabled group of tests */
-declare var xdescribe: typeof describe;
-/** A focused group of tests */
-declare var fdescribe: typeof describe;
-/** A disabled individual test */
-declare var xit: typeof it;
-/** A disabled individual test */
-declare var xtest: typeof it;
-
-type JestPrettyFormatColors = {
-  comment: {
-    close: string,
-    open: string,
-    ...
-  },
-  content: {
-    close: string,
-    open: string,
-    ...
-  },
-  prop: {
-    close: string,
-    open: string,
-    ...
-  },
-  tag: {
-    close: string,
-    open: string,
-    ...
-  },
-  value: {
-    close: string,
-    open: string,
-    ...
-  },
-  ...
-};
-
-type JestPrettyFormatIndent = string => string;
-type JestPrettyFormatRefs = Array<any>;
-type JestPrettyFormatPrint = any => string;
-type JestPrettyFormatStringOrNull = string | null;
-
-type JestPrettyFormatOptions = {|
-  callToJSON: boolean,
-  edgeSpacing: string,
-  escapeRegex: boolean,
-  highlight: boolean,
-  indent: number,
-  maxDepth: number,
-  min: boolean,
-  plugins: JestPrettyFormatPlugins,
-  printFunctionName: boolean,
-  spacing: string,
-  theme: {|
-    comment: string,
-    content: string,
-    prop: string,
-    tag: string,
-    value: string,
-  |},
-|};
-
-type JestPrettyFormatPlugin = {
-  print: (
-    val: any,
-    serialize: JestPrettyFormatPrint,
-    indent: JestPrettyFormatIndent,
-    opts: JestPrettyFormatOptions,
-    colors: JestPrettyFormatColors,
-  ) => string,
-  test: any => boolean,
-  ...
-};
-
-type JestPrettyFormatPlugins = Array<JestPrettyFormatPlugin>;
-
-/** The expect function is used every time you want to test a value */
-declare var expect: {
-  /** The object that you want to make assertions against */
-  (
-    value: any,
-  ): JestExpectType &
-    JestPromiseType &
-    EnzymeMatchersType &
-    DomTestingLibraryType &
-    JestJQueryMatchersType &
-    JestStyledComponentsMatchersType &
-    JestExtendedMatchersType,
-  /** Add additional Jasmine matchers to Jest's roster */
-  extend(matchers: { [name: string]: JestMatcher, ... }): void,
-  /** Add a module that formats application-specific data structures. */
-  addSnapshotSerializer(pluginModule: JestPrettyFormatPlugin): void,
-  assertions(expectedAssertions: number): void,
-  hasAssertions(): void,
-  any(value: mixed): JestAsymmetricEqualityType,
-  anything(): any,
-  arrayContaining(value: Array<mixed>): Array<mixed>,
-  objectContaining(value: Object): Object,
-  /** Matches any received string that contains the exact expected string. */
-  stringContaining(value: string): string,
-  stringMatching(value: string | RegExp): string,
-  not: {
-    arrayContaining: (value: $ReadOnlyArray<mixed>) => Array<mixed>,
-    objectContaining: (value: { ... }) => Object,
-    stringContaining: (value: string) => string,
-    stringMatching: (value: string | RegExp) => string,
-    ...
-  },
-  ...
-};
-
-// TODO handle return type
-// http://jasmine.github.io/2.4/introduction.html#section-Spies
-declare function spyOn(value: mixed, method: string): Object;
-
-/** Holds all functions related to manipulating test runner */
-declare var jest: JestObjectType;
-
-/**
- * The global Jasmine object, this is generally not exposed as the public API,
- * using features inside here could break in later versions of Jest.
- */
-declare var jasmine: {
-  DEFAULT_TIMEOUT_INTERVAL: number,
-  any(value: mixed): JestAsymmetricEqualityType,
-  anything(): any,
-  arrayContaining(value: Array<mixed>): Array<mixed>,
-  clock(): JestClockType,
-  createSpy(name: string): JestSpyType,
-  createSpyObj(
-    baseName: string,
-    methodNames: Array<string>,
-  ): { [methodName: string]: JestSpyType, ... },
-  objectContaining(value: Object): Object,
-  stringMatching(value: string): string,
-  ...
-};
diff --git a/packages/insomnia-testing/flow-typed/mkdirp.js b/packages/insomnia-testing/flow-typed/mkdirp.js
deleted file mode 100644
index 92b7dbbfcb..0000000000
--- a/packages/insomnia-testing/flow-typed/mkdirp.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// @flow
-
-declare module 'mkdirp' {
-  declare module.exports: {
-    sync: (path: string) => string | null,
-  };
-}
diff --git a/packages/insomnia-testing/flow-typed/mocha.js b/packages/insomnia-testing/flow-typed/mocha.js
deleted file mode 100644
index c0905f4bbb..0000000000
--- a/packages/insomnia-testing/flow-typed/mocha.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// @flow
-
-declare class Mocha {
-  constructor(options?: { global?: Array<string>, bail?: boolean }): Mocha;
-  static Runner: {
-    constants: Object;
-  };
-  static reporters: {
-    Base: Object;
-    JSON: Object;
-    Spec: Object;
-    List: Object;
-    Dot: Object;
-    Min: Object;
-    Progress: Object;
-  };
-  files: Array<string>,
-  reporter(reporter: Object, options: Object): void;
-  addFile(filename: string): void;
-  run(callback: (failures: number) => void): Object;
-}
-
-declare module 'mocha' {
-  declare module.exports: typeof Mocha;
-}
diff --git a/packages/insomnia-testing/index.js b/packages/insomnia-testing/index.js
deleted file mode 100644
index 78b664f145..0000000000
--- a/packages/insomnia-testing/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// @flow
-export { generate, generateToFile } from './src/generate';
-export { runTests, runTestsCli } from './src/run';
diff --git a/packages/insomnia-testing/jest.config.js b/packages/insomnia-testing/jest.config.js
new file mode 100644
index 0000000000..31aa926f2b
--- /dev/null
+++ b/packages/insomnia-testing/jest.config.js
@@ -0,0 +1,20 @@
+/** @type { import('@jest/types').Config.InitialOptions } */
+module.exports = {
+  globals: {
+    'ts-jest': {
+      isolatedModules: true,
+    },
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+  testMatch: [
+    '**/*.test.ts',
+  ],
+  verbose: false,
+  resetMocks: true,
+  resetModules: true,
+  collectCoverage: false,
+};
diff --git a/packages/insomnia-testing/package-lock.json b/packages/insomnia-testing/package-lock.json
index 50a43df30d..28e5c52c9a 100644
--- a/packages/insomnia-testing/package-lock.json
+++ b/packages/insomnia-testing/package-lock.json
@@ -4,641 +4,60 @@
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
-		"@babel/code-frame": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz",
-			"integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==",
-			"dev": true,
-			"requires": {
-				"@babel/highlight": "^7.10.3"
-			}
-		},
-		"@babel/core": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.3.tgz",
-			"integrity": "sha512-5YqWxYE3pyhIi84L84YcwjeEgS+fa7ZjK6IBVGTjDVfm64njkR2lfDhVR5OudLk8x2GK59YoSyVv+L/03k1q9w==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.10.3",
-				"@babel/generator": "^7.10.3",
-				"@babel/helper-module-transforms": "^7.10.1",
-				"@babel/helpers": "^7.10.1",
-				"@babel/parser": "^7.10.3",
-				"@babel/template": "^7.10.3",
-				"@babel/traverse": "^7.10.3",
-				"@babel/types": "^7.10.3",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.1",
-				"json5": "^2.1.2",
-				"lodash": "^4.17.13",
-				"resolve": "^1.3.2",
-				"semver": "^5.4.1",
-				"source-map": "^0.5.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				}
-			}
-		},
-		"@babel/generator": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz",
-			"integrity": "sha512-drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.10.3",
-				"jsesc": "^2.5.1",
-				"lodash": "^4.17.13",
-				"source-map": "^0.5.0"
-			}
-		},
-		"@babel/helper-function-name": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz",
-			"integrity": "sha512-FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-get-function-arity": "^7.10.3",
-				"@babel/template": "^7.10.3",
-				"@babel/types": "^7.10.3"
-			}
-		},
-		"@babel/helper-get-function-arity": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz",
-			"integrity": "sha512-iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.10.3"
-			}
-		},
-		"@babel/helper-member-expression-to-functions": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.3.tgz",
-			"integrity": "sha512-q7+37c4EPLSjNb2NmWOjNwj0+BOyYlssuQ58kHEWk1Z78K5i8vTUsteq78HMieRPQSl/NtpQyJfdjt3qZ5V2vw==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.10.3"
-			}
-		},
-		"@babel/helper-module-imports": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.3.tgz",
-			"integrity": "sha512-Jtqw5M9pahLSUWA+76nhK9OG8nwYXzhQzVIGFoNaHnXF/r4l7kz4Fl0UAW7B6mqC5myoJiBP5/YQlXQTMfHI9w==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.10.3"
-			}
-		},
-		"@babel/helper-module-transforms": {
-			"version": "7.10.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz",
-			"integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==",
-			"dev": true,
-			"requires": {
-				"@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-optimise-call-expression": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.3.tgz",
-			"integrity": "sha512-kT2R3VBH/cnSz+yChKpaKRJQJWxdGoc6SjioRId2wkeV3bK0wLLioFpJROrX0U4xr/NmxSSAWT/9Ih5snwIIzg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.10.3"
-			}
-		},
-		"@babel/helper-plugin-utils": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz",
-			"integrity": "sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g==",
+		"@types/anymatch": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",
+			"integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==",
 			"dev": true
 		},
-		"@babel/helper-replace-supers": {
-			"version": "7.10.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz",
-			"integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==",
-			"dev": true,
-			"requires": {
-				"@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": {
-			"version": "7.10.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz",
-			"integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==",
-			"dev": true,
-			"requires": {
-				"@babel/template": "^7.10.1",
-				"@babel/types": "^7.10.1"
-			}
-		},
-		"@babel/helper-split-export-declaration": {
-			"version": "7.10.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-			"integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.10.1"
-			}
-		},
-		"@babel/helper-validator-identifier": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz",
-			"integrity": "sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==",
+		"@types/chai": {
+			"version": "4.2.15",
+			"resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.15.tgz",
+			"integrity": "sha512-rYff6FI+ZTKAPkJUoyz7Udq3GaoDZnxYDEvdEdFZASiA7PoErltHezDishqQiSDWrGxvxmplH304jyzQmjp0AQ==",
 			"dev": true
 		},
-		"@babel/helpers": {
-			"version": "7.10.1",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz",
-			"integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==",
+		"@types/mkdirp": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.1.tgz",
+			"integrity": "sha512-HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q==",
 			"dev": true,
 			"requires": {
-				"@babel/template": "^7.10.1",
-				"@babel/traverse": "^7.10.1",
-				"@babel/types": "^7.10.1"
+				"@types/node": "*"
 			}
 		},
-		"@babel/highlight": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz",
-			"integrity": "sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-validator-identifier": "^7.10.3",
-				"chalk": "^2.0.0",
-				"js-tokens": "^4.0.0"
-			}
-		},
-		"@babel/parser": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz",
-			"integrity": "sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==",
+		"@types/mocha": {
+			"version": "8.2.1",
+			"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.1.tgz",
+			"integrity": "sha512-NysN+bNqj6E0Hv4CTGWSlPzMW6vTKjDpOteycDkV4IWBsO+PU48JonrPzV9ODjiI2XrjmA05KInLgF5ivZ/YGQ==",
 			"dev": true
 		},
-		"@babel/plugin-proposal-optional-chaining": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.3.tgz",
-			"integrity": "sha512-yyG3n9dJ1vZ6v5sfmIlMMZ8azQoqx/5/nZTSWX1td6L1H1bsjzA8TInDChpafCZiJkeOFzp/PtrfigAQXxI1Ng==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.3",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-async-generators": {
-			"version": "7.8.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-bigint": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-class-properties": {
-			"version": "7.10.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz",
-			"integrity": "sha512-Gf2Yx/iRs1JREDtVZ56OrjjgFHCaldpTnuy9BHla10qyVT3YkIIGEtoDWhyop0ksu1GvNjHIoYRBqm3zoR1jyQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.1"
-			}
-		},
-		"@babel/plugin-syntax-import-meta": {
-			"version": "7.10.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.1.tgz",
-			"integrity": "sha512-ypC4jwfIVF72og0dgvEcFRdOM2V9Qm1tu7RGmdZOlhsccyK0wisXmMObGuWEOd5jQ+K9wcIgSNftCpk2vkjUfQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.1"
-			}
-		},
-		"@babel/plugin-syntax-json-strings": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-logical-assignment-operators": {
-			"version": "7.10.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.1.tgz",
-			"integrity": "sha512-XyHIFa9kdrgJS91CUH+ccPVTnJShr8nLGc5bG2IhGXv5p1Rd+8BleGE5yzIg2Nc1QZAdHDa0Qp4m6066OL96Iw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.1"
-			}
-		},
-		"@babel/plugin-syntax-nullish-coalescing-operator": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-numeric-separator": {
-			"version": "7.10.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz",
-			"integrity": "sha512-uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.1"
-			}
-		},
-		"@babel/plugin-syntax-object-rest-spread": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-optional-catch-binding": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/plugin-syntax-optional-chaining": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			}
-		},
-		"@babel/template": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz",
-			"integrity": "sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.10.3",
-				"@babel/parser": "^7.10.3",
-				"@babel/types": "^7.10.3"
-			}
-		},
-		"@babel/traverse": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.3.tgz",
-			"integrity": "sha512-qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.10.3",
-				"@babel/generator": "^7.10.3",
-				"@babel/helper-function-name": "^7.10.3",
-				"@babel/helper-split-export-declaration": "^7.10.1",
-				"@babel/parser": "^7.10.3",
-				"@babel/types": "^7.10.3",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0",
-				"lodash": "^4.17.13"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				}
-			}
-		},
-		"@babel/types": {
-			"version": "7.10.3",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz",
-			"integrity": "sha512-nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-validator-identifier": "^7.10.3",
-				"lodash": "^4.17.13",
-				"to-fast-properties": "^2.0.0"
-			}
-		},
-		"@bcoe/v8-coverage": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+		"@types/node": {
+			"version": "14.0.14",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.14.tgz",
+			"integrity": "sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==",
 			"dev": true
 		},
-		"@cnakazawa/watch": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
-			"integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
-			"dev": true,
-			"requires": {
-				"exec-sh": "^0.3.2",
-				"minimist": "^1.2.0"
-			}
-		},
-		"@istanbuljs/load-nyc-config": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-			"dev": true,
-			"requires": {
-				"camelcase": "^5.3.1",
-				"find-up": "^4.1.0",
-				"get-package-type": "^0.1.0",
-				"js-yaml": "^3.13.1",
-				"resolve-from": "^5.0.0"
-			}
-		},
-		"@istanbuljs/schema": {
+		"@types/source-list-map": {
 			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
-			"integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
+			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
+			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
 			"dev": true
 		},
-		"@jest/console": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/console/-/console-26.1.0.tgz",
-			"integrity": "sha512-+0lpTHMd/8pJp+Nd4lyip+/Iyf2dZJvcCqrlkeZQoQid+JlThA4M9vxHtheyrQ99jJTMQam+es4BcvZ5W5cC3A==",
+		"@types/tapable": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz",
+			"integrity": "sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==",
+			"dev": true
+		},
+		"@types/uglify-js": {
+			"version": "3.13.0",
+			"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.0.tgz",
+			"integrity": "sha512-EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "^26.1.0",
-				"chalk": "^4.0.0",
-				"jest-message-util": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"slash": "^3.0.0"
+				"source-map": "^0.6.1"
 			},
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"@jest/core": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/core/-/core-26.1.0.tgz",
-			"integrity": "sha512-zyizYmDJOOVke4OO/De//aiv8b07OwZzL2cfsvWF3q9YssfpcKfcnZAwDY8f+A76xXSMMYe8i/f/LPocLlByfw==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^26.1.0",
-				"@jest/reporters": "^26.1.0",
-				"@jest/test-result": "^26.1.0",
-				"@jest/transform": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.4",
-				"jest-changed-files": "^26.1.0",
-				"jest-config": "^26.1.0",
-				"jest-haste-map": "^26.1.0",
-				"jest-message-util": "^26.1.0",
-				"jest-regex-util": "^26.0.0",
-				"jest-resolve": "^26.1.0",
-				"jest-resolve-dependencies": "^26.1.0",
-				"jest-runner": "^26.1.0",
-				"jest-runtime": "^26.1.0",
-				"jest-snapshot": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"jest-validate": "^26.1.0",
-				"jest-watcher": "^26.1.0",
-				"micromatch": "^4.0.2",
-				"p-each-series": "^2.1.0",
-				"rimraf": "^3.0.0",
-				"slash": "^3.0.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-					"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-					"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.0"
-					}
-				}
-			}
-		},
-		"@jest/environment": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.1.0.tgz",
-			"integrity": "sha512-86+DNcGongbX7ai/KE/S3/NcUVZfrwvFzOOWX/W+OOTvTds7j07LtC+MgGydH5c8Ri3uIrvdmVgd1xFD5zt/xA==",
-			"dev": true,
-			"requires": {
-				"@jest/fake-timers": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"jest-mock": "^26.1.0"
-			}
-		},
-		"@jest/fake-timers": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.1.0.tgz",
-			"integrity": "sha512-Y5F3kBVWxhau3TJ825iuWy++BAuQzK/xEa+wD9vDH3RytW9f2DbMVodfUQC54rZDX3POqdxCgcKdgcOL0rYUpA==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"@sinonjs/fake-timers": "^6.0.1",
-				"jest-message-util": "^26.1.0",
-				"jest-mock": "^26.1.0",
-				"jest-util": "^26.1.0"
-			}
-		},
-		"@jest/globals": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.1.0.tgz",
-			"integrity": "sha512-MKiHPNaT+ZoG85oMaYUmGHEqu98y3WO2yeIDJrs2sJqHhYOy3Z6F7F/luzFomRQ8SQ1wEkmahFAz2291Iv8EAw==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"expect": "^26.1.0"
-			}
-		},
-		"@jest/reporters": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.1.0.tgz",
-			"integrity": "sha512-SVAysur9FOIojJbF4wLP0TybmqwDkdnFxHSPzHMMIYyBtldCW9gG+Q5xWjpMFyErDiwlRuPyMSJSU64A67Pazg==",
-			"dev": true,
-			"requires": {
-				"@bcoe/v8-coverage": "^0.2.3",
-				"@jest/console": "^26.1.0",
-				"@jest/test-result": "^26.1.0",
-				"@jest/transform": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"chalk": "^4.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"exit": "^0.1.2",
-				"glob": "^7.1.2",
-				"graceful-fs": "^4.2.4",
-				"istanbul-lib-coverage": "^3.0.0",
-				"istanbul-lib-instrument": "^4.0.3",
-				"istanbul-lib-report": "^3.0.0",
-				"istanbul-lib-source-maps": "^4.0.0",
-				"istanbul-reports": "^3.0.2",
-				"jest-haste-map": "^26.1.0",
-				"jest-resolve": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"jest-worker": "^26.1.0",
-				"node-notifier": "^7.0.0",
-				"slash": "^3.0.0",
-				"source-map": "^0.6.0",
-				"string-length": "^4.0.1",
-				"terminal-link": "^2.0.0",
-				"v8-to-istanbul": "^4.1.3"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -647,14 +66,17 @@
 				}
 			}
 		},
-		"@jest/source-map": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.1.0.tgz",
-			"integrity": "sha512-XYRPYx4eEVX15cMT9mstnO7hkHP3krNtKfxUYd8L7gbtia8JvZZ6bMzSwa6IQJENbudTwKMw5R1BePRD+bkEmA==",
+		"@types/webpack": {
+			"version": "4.41.26",
+			"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.26.tgz",
+			"integrity": "sha512-7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA==",
 			"dev": true,
 			"requires": {
-				"callsites": "^3.0.0",
-				"graceful-fs": "^4.2.4",
+				"@types/anymatch": "*",
+				"@types/node": "*",
+				"@types/tapable": "*",
+				"@types/uglify-js": "*",
+				"@types/webpack-sources": "*",
 				"source-map": "^0.6.0"
 			},
 			"dependencies": {
@@ -666,283 +88,29 @@
 				}
 			}
 		},
-		"@jest/test-result": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.1.0.tgz",
-			"integrity": "sha512-Xz44mhXph93EYMA8aYDz+75mFbarTV/d/x0yMdI3tfSRs/vh4CqSxgzVmCps1fPkHDCtn0tU8IH9iCKgGeGpfw==",
+		"@types/webpack-sources": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.0.tgz",
+			"integrity": "sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==",
 			"dev": true,
 			"requires": {
-				"@jest/console": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"collect-v8-coverage": "^1.0.0"
-			}
-		},
-		"@jest/test-sequencer": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.1.0.tgz",
-			"integrity": "sha512-Z/hcK+rTq56E6sBwMoQhSRDVjqrGtj1y14e2bIgcowARaIE1SgOanwx6gvY4Q9gTKMoZQXbXvptji+q5GYxa6Q==",
-			"dev": true,
-			"requires": {
-				"@jest/test-result": "^26.1.0",
-				"graceful-fs": "^4.2.4",
-				"jest-haste-map": "^26.1.0",
-				"jest-runner": "^26.1.0",
-				"jest-runtime": "^26.1.0"
-			}
-		},
-		"@jest/transform": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.1.0.tgz",
-			"integrity": "sha512-ICPm6sUXmZJieq45ix28k0s+d/z2E8CHDsq+WwtWI6kW8m7I8kPqarSEcUN86entHQ570ZBRci5OWaKL0wlAWw==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.1.0",
-				"@jest/types": "^26.1.0",
-				"babel-plugin-istanbul": "^6.0.0",
-				"chalk": "^4.0.0",
-				"convert-source-map": "^1.4.0",
-				"fast-json-stable-stringify": "^2.0.0",
-				"graceful-fs": "^4.2.4",
-				"jest-haste-map": "^26.1.0",
-				"jest-regex-util": "^26.0.0",
-				"jest-util": "^26.1.0",
-				"micromatch": "^4.0.2",
-				"pirates": "^4.0.1",
-				"slash": "^3.0.0",
-				"source-map": "^0.6.1",
-				"write-file-atomic": "^3.0.0"
+				"@types/node": "*",
+				"@types/source-list-map": "*",
+				"source-map": "^0.7.3"
 			},
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
 				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
 					"dev": true
 				}
 			}
 		},
-		"@jest/types": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-26.1.0.tgz",
-			"integrity": "sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==",
-			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^1.1.1",
-				"@types/yargs": "^15.0.0",
-				"chalk": "^4.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"@sinonjs/commons": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.0.tgz",
-			"integrity": "sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==",
-			"dev": true,
-			"requires": {
-				"type-detect": "4.0.8"
-			}
-		},
-		"@sinonjs/fake-timers": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
-			"integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
-			"dev": true,
-			"requires": {
-				"@sinonjs/commons": "^1.7.0"
-			}
-		},
-		"@types/babel__core": {
-			"version": "7.1.9",
-			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz",
-			"integrity": "sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw==",
-			"dev": true,
-			"requires": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0",
-				"@types/babel__generator": "*",
-				"@types/babel__template": "*",
-				"@types/babel__traverse": "*"
-			}
-		},
-		"@types/babel__generator": {
-			"version": "7.6.1",
-			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz",
-			"integrity": "sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@types/babel__template": {
-			"version": "7.0.2",
-			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
-			"integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
-			"dev": true,
-			"requires": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@types/babel__traverse": {
-			"version": "7.0.12",
-			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.12.tgz",
-			"integrity": "sha512-t4CoEokHTfcyfb4hUaF9oOHu9RmmNWnm1CP0YmMqOOfClKascOmvlEM736vlqeScuGvBDsHkf8R2INd4DWreQA==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.3.0"
-			}
-		},
-		"@types/color-name": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-			"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-			"dev": true
-		},
-		"@types/graceful-fs": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
-			"integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/istanbul-lib-coverage": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-			"integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
-			"dev": true
-		},
-		"@types/istanbul-lib-report": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-coverage": "*"
-			}
-		},
-		"@types/istanbul-reports": {
+		"@ungap/promise-all-settled": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
-			"integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
-			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-coverage": "*",
-				"@types/istanbul-lib-report": "*"
-			}
-		},
-		"@types/node": {
-			"version": "14.0.14",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.14.tgz",
-			"integrity": "sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==",
-			"dev": true
-		},
-		"@types/normalize-package-data": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-			"integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
-			"dev": true
-		},
-		"@types/prettier": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.0.1.tgz",
-			"integrity": "sha512-boy4xPNEtiw6N3abRhBi/e7hNvy3Tt8E9ZRAQrwAGzoCGZS/1wjo9KY7JHhnfnEsG5wSjDbymCozUM9a3ea7OQ==",
-			"dev": true
-		},
-		"@types/stack-utils": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
-			"integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
-			"dev": true
-		},
-		"@types/yargs": {
-			"version": "15.0.5",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-			"integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-			"dev": true,
-			"requires": {
-				"@types/yargs-parser": "*"
-			}
-		},
-		"@types/yargs-parser": {
-			"version": "15.0.0",
-			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
-			"integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
-			"dev": true
+			"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+			"integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="
 		},
 		"@webassemblyjs/ast": {
 			"version": "1.9.0",
@@ -1131,34 +299,6 @@
 			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
 			"dev": true
 		},
-		"abab": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
-			"integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==",
-			"dev": true
-		},
-		"acorn": {
-			"version": "7.3.1",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
-			"integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==",
-			"dev": true
-		},
-		"acorn-globals": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-			"integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-			"dev": true,
-			"requires": {
-				"acorn": "^7.1.1",
-				"acorn-walk": "^7.1.1"
-			}
-		},
-		"acorn-walk": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-			"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-			"dev": true
-		},
 		"ajv": {
 			"version": "6.12.2",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
@@ -1188,23 +328,6 @@
 			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
 			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="
 		},
-		"ansi-escapes": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-			"integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-			"dev": true,
-			"requires": {
-				"type-fest": "^0.11.0"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "0.11.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-					"integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-					"dev": true
-				}
-			}
-		},
 		"ansi-regex": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -1214,6 +337,7 @@
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
 			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"dev": true,
 			"requires": {
 				"color-convert": "^1.9.0"
 			}
@@ -1233,14 +357,6 @@
 			"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
 			"dev": true
 		},
-		"argparse": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-			"requires": {
-				"sprintf-js": "~1.0.2"
-			}
-		},
 		"arr-diff": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -1265,26 +381,6 @@
 			"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
 			"dev": true
 		},
-		"array.prototype.map": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz",
-			"integrity": "sha512-Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw==",
-			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.0-next.1",
-				"es-array-method-boxes-properly": "^1.0.0",
-				"is-string": "^1.0.4"
-			}
-		},
-		"asn1": {
-			"version": "0.2.4",
-			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-			"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-			"dev": true,
-			"requires": {
-				"safer-buffer": "~2.1.0"
-			}
-		},
 		"asn1.js": {
 			"version": "4.10.1",
 			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
@@ -1331,12 +427,6 @@
 				}
 			}
 		},
-		"assert-plus": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-			"dev": true
-		},
 		"assertion-error": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
@@ -1355,30 +445,12 @@
 			"dev": true,
 			"optional": true
 		},
-		"asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-			"dev": true
-		},
 		"atob": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
 			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
 			"dev": true
 		},
-		"aws-sign2": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-			"dev": true
-		},
-		"aws4": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
-			"integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==",
-			"dev": true
-		},
 		"axios": {
 			"version": "0.21.1",
 			"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
@@ -1387,113 +459,6 @@
 				"follow-redirects": "^1.10.0"
 			}
 		},
-		"babel-jest": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.1.0.tgz",
-			"integrity": "sha512-Nkqgtfe7j6PxLO6TnCQQlkMm8wdTdnIF8xrdpooHCuD5hXRzVEPbPneTJKknH5Dsv3L8ip9unHDAp48YQ54Dkg==",
-			"dev": true,
-			"requires": {
-				"@jest/transform": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"@types/babel__core": "^7.1.7",
-				"babel-plugin-istanbul": "^6.0.0",
-				"babel-preset-jest": "^26.1.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.4",
-				"slash": "^3.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"babel-plugin-istanbul": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
-			"integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-instrument": "^4.0.0",
-				"test-exclude": "^6.0.0"
-			}
-		},
-		"babel-plugin-jest-hoist": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.1.0.tgz",
-			"integrity": "sha512-qhqLVkkSlqmC83bdMhM8WW4Z9tB+JkjqAqlbbohS9sJLT5Ha2vfzuKqg5yenXrAjOPG2YC0WiXdH3a9PvB+YYw==",
-			"dev": true,
-			"requires": {
-				"@babel/template": "^7.3.3",
-				"@babel/types": "^7.3.3",
-				"@types/babel__core": "^7.0.0",
-				"@types/babel__traverse": "^7.0.6"
-			}
-		},
-		"babel-preset-current-node-syntax": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz",
-			"integrity": "sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ==",
-			"dev": true,
-			"requires": {
-				"@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-import-meta": "^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": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.1.0.tgz",
-			"integrity": "sha512-na9qCqFksknlEj5iSdw1ehMVR06LCCTkZLGKeEtxDDdhg8xpUF09m29Kvh1pRbZ07h7AQ5ttLYUwpXL4tO6w7w==",
-			"dev": true,
-			"requires": {
-				"babel-plugin-jest-hoist": "^26.1.0",
-				"babel-preset-current-node-syntax": "^0.1.2"
-			}
-		},
 		"balanced-match": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -1560,15 +525,6 @@
 			"integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
 			"dev": true
 		},
-		"bcrypt-pbkdf": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-			"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-			"dev": true,
-			"requires": {
-				"tweetnacl": "^0.14.3"
-			}
-		},
 		"big.js": {
 			"version": "5.2.2",
 			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -1625,12 +581,6 @@
 			"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
 			"dev": true
 		},
-		"browser-process-hrtime": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-			"dev": true
-		},
 		"browser-stdout": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
@@ -1736,15 +686,6 @@
 				"pako": "~1.0.5"
 			}
 		},
-		"bser": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-			"dev": true,
-			"requires": {
-				"node-int64": "^0.4.0"
-			}
-		},
 		"buffer": {
 			"version": "4.9.2",
 			"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
@@ -1842,42 +783,22 @@
 				"unset-value": "^1.0.0"
 			}
 		},
-		"callsites": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-			"dev": true
-		},
 		"camelcase": {
 			"version": "5.3.1",
 			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-		},
-		"capture-exit": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
-			"integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
-			"dev": true,
-			"requires": {
-				"rsvp": "^4.8.4"
-			}
-		},
-		"caseless": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
 			"dev": true
 		},
 		"chai": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
-			"integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+			"version": "4.3.4",
+			"resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz",
+			"integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==",
 			"requires": {
 				"assertion-error": "^1.1.0",
 				"check-error": "^1.0.2",
 				"deep-eql": "^3.0.1",
 				"get-func-name": "^2.0.0",
-				"pathval": "^1.1.0",
+				"pathval": "^1.1.1",
 				"type-detect": "^4.0.5"
 			}
 		},
@@ -1885,6 +806,7 @@
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
 			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
 			"requires": {
 				"ansi-styles": "^3.2.1",
 				"escape-string-regexp": "^1.0.5",
@@ -1895,36 +817,39 @@
 					"version": "5.5.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
 					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"dev": true,
 					"requires": {
 						"has-flag": "^3.0.0"
 					}
 				}
 			}
 		},
-		"char-regex": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-			"dev": true
-		},
 		"check-error": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
 			"integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII="
 		},
 		"chokidar": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz",
-			"integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==",
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+			"integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
 			"requires": {
 				"anymatch": "~3.1.1",
 				"braces": "~3.0.2",
-				"fsevents": "~2.1.2",
+				"fsevents": "~2.3.1",
 				"glob-parent": "~5.1.0",
 				"is-binary-path": "~2.1.0",
 				"is-glob": "~4.0.1",
 				"normalize-path": "~3.0.0",
-				"readdirp": "~3.3.0"
+				"readdirp": "~3.5.0"
+			},
+			"dependencies": {
+				"fsevents": {
+					"version": "2.3.2",
+					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+					"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+					"optional": true
+				}
 			}
 		},
 		"chownr": {
@@ -1942,12 +867,6 @@
 				"tslib": "^1.9.0"
 			}
 		},
-		"ci-info": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-			"integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-			"dev": true
-		},
 		"cipher-base": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -1985,6 +904,7 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
 			"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+			"dev": true,
 			"requires": {
 				"string-width": "^3.1.0",
 				"strip-ansi": "^5.2.0",
@@ -1994,12 +914,14 @@
 				"ansi-regex": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
 				},
 				"string-width": {
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
 					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
 					"requires": {
 						"emoji-regex": "^7.0.1",
 						"is-fullwidth-code-point": "^2.0.0",
@@ -2010,24 +932,13 @@
 					"version": "5.2.0",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
 					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
 					"requires": {
 						"ansi-regex": "^4.1.0"
 					}
 				}
 			}
 		},
-		"co": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-			"dev": true
-		},
-		"collect-v8-coverage": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-			"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-			"dev": true
-		},
 		"collection-visit": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -2042,6 +953,7 @@
 			"version": "1.9.3",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
 			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"dev": true,
 			"requires": {
 				"color-name": "1.1.3"
 			}
@@ -2049,16 +961,8 @@
 		"color-name": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-		},
-		"combined-stream": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-			"dev": true,
-			"requires": {
-				"delayed-stream": "~1.0.0"
-			}
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"dev": true
 		},
 		"commander": {
 			"version": "2.20.3",
@@ -2107,15 +1011,6 @@
 			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
 			"dev": true
 		},
-		"convert-source-map": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-			"integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-			"dev": true,
-			"requires": {
-				"safe-buffer": "~5.1.1"
-			}
-		},
 		"copy-concurrently": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
@@ -2250,64 +1145,31 @@
 				"randomfill": "^1.0.3"
 			}
 		},
-		"cssom": {
-			"version": "0.4.4",
-			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-			"integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
-			"dev": true
-		},
-		"cssstyle": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-			"integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-			"dev": true,
-			"requires": {
-				"cssom": "~0.3.6"
-			},
-			"dependencies": {
-				"cssom": {
-					"version": "0.3.8",
-					"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-					"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-					"dev": true
-				}
-			}
-		},
 		"cyclist": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
 			"integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
 			"dev": true
 		},
-		"dashdash": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-			"dev": true,
+		"debug": {
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+			"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
 			"requires": {
-				"assert-plus": "^1.0.0"
-			}
-		},
-		"data-urls": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-			"integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-			"dev": true,
-			"requires": {
-				"abab": "^2.0.3",
-				"whatwg-mimetype": "^2.3.0",
-				"whatwg-url": "^8.0.0"
+				"ms": "2.1.2"
+			},
+			"dependencies": {
+				"ms": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+				}
 			}
 		},
 		"decamelize": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-		},
-		"decimal.js": {
-			"version": "10.2.0",
-			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz",
-			"integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==",
+			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
 			"dev": true
 		},
 		"decode-uri-component": {
@@ -2324,26 +1186,6 @@
 				"type-detect": "^4.0.0"
 			}
 		},
-		"deep-is": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-			"dev": true
-		},
-		"deepmerge": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-			"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-			"dev": true
-		},
-		"define-properties": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-			"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-			"requires": {
-				"object-keys": "^1.0.12"
-			}
-		},
 		"define-property": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -2385,12 +1227,6 @@
 				}
 			}
 		},
-		"delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-			"dev": true
-		},
 		"des.js": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
@@ -2407,22 +1243,10 @@
 			"integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
 			"dev": true
 		},
-		"detect-newline": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-			"dev": true
-		},
 		"diff": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
-		},
-		"diff-sequences": {
-			"version": "26.0.0",
-			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.0.0.tgz",
-			"integrity": "sha512-JC/eHYEC3aSS0vZGjuoc4vHA0yAQTzhQQldXMeMF+JlxLGJlCO38Gma82NV9gk1jGFz8mDzUMeaKXvjRRdJ2dg==",
-			"dev": true
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+			"integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="
 		},
 		"diffie-hellman": {
 			"version": "5.0.3",
@@ -2449,23 +1273,6 @@
 			"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
 			"dev": true
 		},
-		"domexception": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-			"integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
-			"dev": true,
-			"requires": {
-				"webidl-conversions": "^5.0.0"
-			},
-			"dependencies": {
-				"webidl-conversions": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-					"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-					"dev": true
-				}
-			}
-		},
 		"duplexify": {
 			"version": "3.7.1",
 			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -2478,16 +1285,6 @@
 				"stream-shift": "^1.0.0"
 			}
 		},
-		"ecc-jsbn": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-			"dev": true,
-			"requires": {
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.1.0"
-			}
-		},
 		"elliptic": {
 			"version": "6.5.3",
 			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
@@ -2514,7 +1311,8 @@
 		"emoji-regex": {
 			"version": "7.0.3",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-			"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+			"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+			"dev": true
 		},
 		"emojis-list": {
 			"version": "3.0.0",
@@ -2563,88 +1361,16 @@
 				"prr": "~1.0.1"
 			}
 		},
-		"error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-			"dev": true,
-			"requires": {
-				"is-arrayish": "^0.2.1"
-			}
-		},
-		"es-abstract": {
-			"version": "1.17.6",
-			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-			"integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-			"requires": {
-				"es-to-primitive": "^1.2.1",
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.1",
-				"is-callable": "^1.2.0",
-				"is-regex": "^1.1.0",
-				"object-inspect": "^1.7.0",
-				"object-keys": "^1.1.1",
-				"object.assign": "^4.1.0",
-				"string.prototype.trimend": "^1.0.1",
-				"string.prototype.trimstart": "^1.0.1"
-			}
-		},
-		"es-array-method-boxes-properly": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-			"integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="
-		},
-		"es-get-iterator": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz",
-			"integrity": "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==",
-			"requires": {
-				"es-abstract": "^1.17.4",
-				"has-symbols": "^1.0.1",
-				"is-arguments": "^1.0.4",
-				"is-map": "^2.0.1",
-				"is-set": "^2.0.1",
-				"is-string": "^1.0.5",
-				"isarray": "^2.0.5"
-			}
-		},
-		"es-to-primitive": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-			"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-			"requires": {
-				"is-callable": "^1.1.4",
-				"is-date-object": "^1.0.1",
-				"is-symbol": "^1.0.2"
-			}
+		"escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
 		},
 		"escape-string-regexp": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-		},
-		"escodegen": {
-			"version": "1.14.3",
-			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-			"integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
-			"dev": true,
-			"requires": {
-				"esprima": "^4.0.1",
-				"estraverse": "^4.2.0",
-				"esutils": "^2.0.2",
-				"optionator": "^0.8.1",
-				"source-map": "~0.6.1"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true,
-					"optional": true
-				}
-			}
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"dev": true
 		},
 		"eslint-scope": {
 			"version": "4.0.3",
@@ -2656,11 +1382,6 @@
 				"estraverse": "^4.1.1"
 			}
 		},
-		"esprima": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-		},
 		"esrecurse": {
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
@@ -2676,12 +1397,6 @@
 			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
 			"dev": true
 		},
-		"esutils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-			"dev": true
-		},
 		"events": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
@@ -2698,33 +1413,6 @@
 				"safe-buffer": "^5.1.1"
 			}
 		},
-		"exec-sh": {
-			"version": "0.3.4",
-			"resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
-			"integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
-			"dev": true
-		},
-		"execa": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-			"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-			"dev": true,
-			"requires": {
-				"cross-spawn": "^6.0.0",
-				"get-stream": "^4.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"
-			}
-		},
-		"exit": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-			"dev": true
-		},
 		"expand-brackets": {
 			"version": "2.1.4",
 			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -2778,53 +1466,6 @@
 				"homedir-polyfill": "^1.0.1"
 			}
 		},
-		"expect": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/expect/-/expect-26.1.0.tgz",
-			"integrity": "sha512-QbH4LZXDsno9AACrN9eM0zfnby9G+OsdNgZUohjg/P0mLy1O+/bzTAJGT6VSIjVCe8yKM6SzEl/ckEOFBT7Vnw==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"ansi-styles": "^4.0.0",
-				"jest-get-type": "^26.0.0",
-				"jest-matcher-utils": "^26.1.0",
-				"jest-message-util": "^26.1.0",
-				"jest-regex-util": "^26.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-			"dev": true
-		},
 		"extend-shallow": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
@@ -2911,12 +1552,6 @@
 				}
 			}
 		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"dev": true
-		},
 		"fast-deep-equal": {
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -2929,21 +1564,6 @@
 			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
 			"dev": true
 		},
-		"fast-levenshtein": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-			"dev": true
-		},
-		"fb-watchman": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-			"integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
-			"dev": true,
-			"requires": {
-				"bser": "2.1.1"
-			}
-		},
 		"figgy-pudding": {
 			"version": "3.5.2",
 			"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
@@ -3031,15 +1651,6 @@
 				}
 			}
 		},
-		"find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"requires": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
-			}
-		},
 		"findup-sync": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
@@ -3164,12 +1775,9 @@
 			}
 		},
 		"flat": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
-			"integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
-			"requires": {
-				"is-buffer": "~2.0.3"
-			}
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="
 		},
 		"flush-write-stream": {
 			"version": "1.1.1",
@@ -3192,23 +1800,6 @@
 			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
 			"dev": true
 		},
-		"forever-agent": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-			"dev": true
-		},
-		"form-data": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-			"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-			"dev": true,
-			"requires": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.6",
-				"mime-types": "^2.1.12"
-			}
-		},
 		"fragment-cache": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -3249,19 +1840,9 @@
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
 			"integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+			"dev": true,
 			"optional": true
 		},
-		"function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-		},
-		"gensync": {
-			"version": "1.0.0-beta.1",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-			"integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
-			"dev": true
-		},
 		"get-caller-file": {
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -3272,36 +1853,12 @@
 			"resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
 			"integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE="
 		},
-		"get-package-type": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-			"dev": true
-		},
-		"get-stream": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-			"dev": true,
-			"requires": {
-				"pump": "^3.0.0"
-			}
-		},
 		"get-value": {
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
 			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
 			"dev": true
 		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
-		},
 		"glob": {
 			"version": "7.1.6",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
@@ -3378,12 +1935,6 @@
 				}
 			}
 		},
-		"globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true
-		},
 		"graceful-fs": {
 			"version": "4.2.4",
 			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
@@ -3395,46 +1946,11 @@
 			"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
 			"integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="
 		},
-		"growly": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-			"integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
-			"dev": true,
-			"optional": true
-		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-			"dev": true
-		},
-		"har-validator": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-			"dev": true,
-			"requires": {
-				"ajv": "^6.5.5",
-				"har-schema": "^2.0.0"
-			}
-		},
-		"has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-			"requires": {
-				"function-bind": "^1.1.1"
-			}
-		},
 		"has-flag": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-		},
-		"has-symbols": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-			"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"dev": true
 		},
 		"has-value": {
 			"version": "1.0.0",
@@ -3559,59 +2075,12 @@
 				"parse-passwd": "^1.0.0"
 			}
 		},
-		"hosted-git-info": {
-			"version": "2.8.8",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-			"integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
-			"dev": true
-		},
-		"html-encoding-sniffer": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-			"integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
-			"dev": true,
-			"requires": {
-				"whatwg-encoding": "^1.0.5"
-			}
-		},
-		"html-escaper": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-			"dev": true
-		},
-		"http-signature": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0",
-				"jsprim": "^1.2.2",
-				"sshpk": "^1.7.0"
-			}
-		},
 		"https-browserify": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
 			"integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
 			"dev": true
 		},
-		"human-signals": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-			"integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-			"dev": true
-		},
-		"iconv-lite": {
-			"version": "0.4.24",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-			"dev": true,
-			"requires": {
-				"safer-buffer": ">= 2.1.2 < 3"
-			}
-		},
 		"ieee754": {
 			"version": "1.1.13",
 			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
@@ -3624,16 +2093,6 @@
 			"integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
 			"dev": true
 		},
-		"import-local": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-			"integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
-			"dev": true,
-			"requires": {
-				"pkg-dir": "^4.2.0",
-				"resolve-cwd": "^3.0.0"
-			}
-		},
 		"imurmurhash": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -3672,12 +2131,6 @@
 			"integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
 			"dev": true
 		},
-		"ip-regex": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-			"integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-			"dev": true
-		},
 		"is-accessor-descriptor": {
 			"version": "0.1.6",
 			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
@@ -3704,17 +2157,6 @@
 				}
 			}
 		},
-		"is-arguments": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-			"integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
-		},
-		"is-arrayish": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-			"dev": true
-		},
 		"is-binary-path": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -3723,25 +2165,6 @@
 				"binary-extensions": "^2.0.0"
 			}
 		},
-		"is-buffer": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-			"integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
-		},
-		"is-callable": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-			"integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="
-		},
-		"is-ci": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-			"integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-			"dev": true,
-			"requires": {
-				"ci-info": "^2.0.0"
-			}
-		},
 		"is-data-descriptor": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -3768,11 +2191,6 @@
 				}
 			}
 		},
-		"is-date-object": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-			"integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
-		},
 		"is-descriptor": {
 			"version": "0.1.6",
 			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -3792,13 +2210,6 @@
 				}
 			}
 		},
-		"is-docker": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz",
-			"integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==",
-			"dev": true,
-			"optional": true
-		},
 		"is-extendable": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -3815,12 +2226,6 @@
 			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
 			"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
 		},
-		"is-generator-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-			"dev": true
-		},
 		"is-glob": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
@@ -3829,16 +2234,16 @@
 				"is-extglob": "^2.1.1"
 			}
 		},
-		"is-map": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz",
-			"integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw=="
-		},
 		"is-number": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
 			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
 		},
+		"is-plain-obj": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="
+		},
 		"is-plain-object": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -3848,71 +2253,12 @@
 				"isobject": "^3.0.1"
 			}
 		},
-		"is-potential-custom-element-name": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
-			"integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
-			"dev": true
-		},
-		"is-regex": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-			"integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-			"requires": {
-				"has-symbols": "^1.0.1"
-			}
-		},
-		"is-set": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz",
-			"integrity": "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA=="
-		},
-		"is-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-			"dev": true
-		},
-		"is-string": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-			"integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="
-		},
-		"is-symbol": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-			"integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-			"requires": {
-				"has-symbols": "^1.0.1"
-			}
-		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-			"dev": true
-		},
 		"is-windows": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
 			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
 			"dev": true
 		},
-		"is-wsl": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"is-docker": "^2.0.0"
-			}
-		},
-		"isarray": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-		},
 		"isexe": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -3924,1442 +2270,33 @@
 			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
 			"dev": true
 		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-			"dev": true
-		},
-		"istanbul-lib-coverage": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-			"integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-			"dev": true
-		},
-		"istanbul-lib-instrument": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-			"integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.7.5",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-coverage": "^3.0.0",
-				"semver": "^6.3.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
-			}
-		},
-		"istanbul-lib-report": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-			"integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-			"dev": true,
-			"requires": {
-				"istanbul-lib-coverage": "^3.0.0",
-				"make-dir": "^3.0.0",
-				"supports-color": "^7.1.0"
-			}
-		},
-		"istanbul-lib-source-maps": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-			"integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.1.1",
-				"istanbul-lib-coverage": "^3.0.0",
-				"source-map": "^0.6.1"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
-			}
-		},
-		"istanbul-reports": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-			"integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
-			"dev": true,
-			"requires": {
-				"html-escaper": "^2.0.0",
-				"istanbul-lib-report": "^3.0.0"
-			}
-		},
-		"iterate-iterator": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz",
-			"integrity": "sha512-3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw=="
-		},
-		"iterate-value": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz",
-			"integrity": "sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==",
-			"requires": {
-				"es-get-iterator": "^1.0.2",
-				"iterate-iterator": "^1.0.1"
-			}
-		},
-		"jest": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest/-/jest-26.1.0.tgz",
-			"integrity": "sha512-LIti8jppw5BcQvmNJe4w2g1N/3V68HUfAv9zDVm7v+VAtQulGhH0LnmmiVkbNE4M4I43Bj2fXPiBGKt26k9tHw==",
-			"dev": true,
-			"requires": {
-				"@jest/core": "^26.1.0",
-				"import-local": "^3.0.2",
-				"jest-cli": "^26.1.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-					"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cliui": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-					"integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.0",
-						"wrap-ansi": "^6.2.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"jest-cli": {
-					"version": "26.1.0",
-					"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.1.0.tgz",
-					"integrity": "sha512-Imumvjgi3rU7stq6SJ1JUEMaV5aAgJYXIs0jPqdUnF47N/Tk83EXfmtvNKQ+SnFVI6t6mDOvfM3aA9Sg6kQPSw==",
-					"dev": true,
-					"requires": {
-						"@jest/core": "^26.1.0",
-						"@jest/test-result": "^26.1.0",
-						"@jest/types": "^26.1.0",
-						"chalk": "^4.0.0",
-						"exit": "^0.1.2",
-						"graceful-fs": "^4.2.4",
-						"import-local": "^3.0.2",
-						"is-ci": "^2.0.0",
-						"jest-config": "^26.1.0",
-						"jest-util": "^26.1.0",
-						"jest-validate": "^26.1.0",
-						"prompts": "^2.0.1",
-						"yargs": "^15.3.1"
-					}
-				},
-				"string-width": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-					"integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-					"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "6.2.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-					"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"yargs": {
-					"version": "15.3.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
-					"integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
-					"dev": true,
-					"requires": {
-						"cliui": "^6.0.0",
-						"decamelize": "^1.2.0",
-						"find-up": "^4.1.0",
-						"get-caller-file": "^2.0.1",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^2.0.0",
-						"set-blocking": "^2.0.0",
-						"string-width": "^4.2.0",
-						"which-module": "^2.0.0",
-						"y18n": "^4.0.0",
-						"yargs-parser": "^18.1.1"
-					}
-				},
-				"yargs-parser": {
-					"version": "18.1.3",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-					"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^5.0.0",
-						"decamelize": "^1.2.0"
-					}
-				}
-			}
-		},
-		"jest-changed-files": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.1.0.tgz",
-			"integrity": "sha512-HS5MIJp3B8t0NRKGMCZkcDUZo36mVRvrDETl81aqljT1S9tqiHRSpyoOvWg9ZilzZG9TDisDNaN1IXm54fLRZw==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"execa": "^4.0.0",
-				"throat": "^5.0.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"execa": {
-					"version": "4.0.2",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-4.0.2.tgz",
-					"integrity": "sha512-QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.0",
-						"get-stream": "^5.0.0",
-						"human-signals": "^1.1.1",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.0",
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-					"integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"is-stream": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-					"integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				}
-			}
-		},
-		"jest-config": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.1.0.tgz",
-			"integrity": "sha512-ONTGeoMbAwGCdq4WuKkMcdMoyfs5CLzHEkzFOlVvcDXufZSaIWh/OXMLa2fwKXiOaFcqEw8qFr4VOKJQfn4CVw==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.1.0",
-				"@jest/test-sequencer": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"babel-jest": "^26.1.0",
-				"chalk": "^4.0.0",
-				"deepmerge": "^4.2.2",
-				"glob": "^7.1.1",
-				"graceful-fs": "^4.2.4",
-				"jest-environment-jsdom": "^26.1.0",
-				"jest-environment-node": "^26.1.0",
-				"jest-get-type": "^26.0.0",
-				"jest-jasmine2": "^26.1.0",
-				"jest-regex-util": "^26.0.0",
-				"jest-resolve": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"jest-validate": "^26.1.0",
-				"micromatch": "^4.0.2",
-				"pretty-format": "^26.1.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"jest-diff": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.1.0.tgz",
-			"integrity": "sha512-GZpIcom339y0OXznsEKjtkfKxNdg7bVbEofK8Q6MnevTIiR1jNhDWKhRX6X0SDXJlwn3dy59nZ1z55fLkAqPWg==",
-			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0",
-				"diff-sequences": "^26.0.0",
-				"jest-get-type": "^26.0.0",
-				"pretty-format": "^26.1.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"jest-docblock": {
-			"version": "26.0.0",
-			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
-			"integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
-			"dev": true,
-			"requires": {
-				"detect-newline": "^3.0.0"
-			}
-		},
-		"jest-each": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.1.0.tgz",
-			"integrity": "sha512-lYiSo4Igr81q6QRsVQq9LIkJW0hZcKxkIkHzNeTMPENYYDw/W/Raq28iJ0sLlNFYz2qxxeLnc5K2gQoFYlu2bA==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^26.0.0",
-				"jest-util": "^26.1.0",
-				"pretty-format": "^26.1.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"jest-environment-jsdom": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.1.0.tgz",
-			"integrity": "sha512-dWfiJ+spunVAwzXbdVqPH1LbuJW/kDL+FyqgA5YzquisHqTi0g9hquKif9xKm7c1bKBj6wbmJuDkeMCnxZEpUw==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^26.1.0",
-				"@jest/fake-timers": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"jest-mock": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"jsdom": "^16.2.2"
-			}
-		},
-		"jest-environment-node": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.1.0.tgz",
-			"integrity": "sha512-DNm5x1aQH0iRAe9UYAkZenuzuJ69VKzDCAYISFHQ5i9e+2Tbeu2ONGY7YStubCLH8a1wdKBgqScYw85+ySxqxg==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^26.1.0",
-				"@jest/fake-timers": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"jest-mock": "^26.1.0",
-				"jest-util": "^26.1.0"
-			}
-		},
-		"jest-get-type": {
-			"version": "26.0.0",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz",
-			"integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==",
-			"dev": true
-		},
-		"jest-haste-map": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.1.0.tgz",
-			"integrity": "sha512-WeBS54xCIz9twzkEdm6+vJBXgRBQfdbbXD0dk8lJh7gLihopABlJmIQFdWSDDtuDe4PRiObsjZSUjbJ1uhWEpA==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"@types/graceful-fs": "^4.1.2",
-				"anymatch": "^3.0.3",
-				"fb-watchman": "^2.0.0",
-				"fsevents": "^2.1.2",
-				"graceful-fs": "^4.2.4",
-				"jest-serializer": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"jest-worker": "^26.1.0",
-				"micromatch": "^4.0.2",
-				"sane": "^4.0.3",
-				"walker": "^1.0.7",
-				"which": "^2.0.2"
-			}
-		},
-		"jest-jasmine2": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.1.0.tgz",
-			"integrity": "sha512-1IPtoDKOAG+MeBrKvvuxxGPJb35MTTRSDglNdWWCndCB3TIVzbLThRBkwH9P081vXLgiJHZY8Bz3yzFS803xqQ==",
-			"dev": true,
-			"requires": {
-				"@babel/traverse": "^7.1.0",
-				"@jest/environment": "^26.1.0",
-				"@jest/source-map": "^26.1.0",
-				"@jest/test-result": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"chalk": "^4.0.0",
-				"co": "^4.6.0",
-				"expect": "^26.1.0",
-				"is-generator-fn": "^2.0.0",
-				"jest-each": "^26.1.0",
-				"jest-matcher-utils": "^26.1.0",
-				"jest-message-util": "^26.1.0",
-				"jest-runtime": "^26.1.0",
-				"jest-snapshot": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"pretty-format": "^26.1.0",
-				"throat": "^5.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"jest-leak-detector": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.1.0.tgz",
-			"integrity": "sha512-dsMnKF+4BVOZwvQDlgn3MG+Ns4JuLv8jNvXH56bgqrrboyCbI1rQg6EI5rs+8IYagVcfVP2yZFKfWNZy0rK0Hw==",
-			"dev": true,
-			"requires": {
-				"jest-get-type": "^26.0.0",
-				"pretty-format": "^26.1.0"
-			}
-		},
-		"jest-matcher-utils": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.1.0.tgz",
-			"integrity": "sha512-PW9JtItbYvES/xLn5mYxjMd+Rk+/kIt88EfH3N7w9KeOrHWaHrdYPnVHndGbsFGRJ2d5gKtwggCvkqbFDoouQA==",
-			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0",
-				"jest-diff": "^26.1.0",
-				"jest-get-type": "^26.0.0",
-				"pretty-format": "^26.1.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"jest-message-util": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.1.0.tgz",
-			"integrity": "sha512-dY0+UlldiAJwNDJ08SF0HdF32g9PkbF2NRK/+2iMPU40O6q+iSn1lgog/u0UH8ksWoPv0+gNq8cjhYO2MFtT0g==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@jest/types": "^26.1.0",
-				"@types/stack-utils": "^1.0.1",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.4",
-				"micromatch": "^4.0.2",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.2"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"jest-mock": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.1.0.tgz",
-			"integrity": "sha512-1Rm8EIJ3ZFA8yCIie92UbxZWj9SuVmUGcyhLHyAhY6WI3NIct38nVcfOPWhJteqSn8V8e3xOMha9Ojfazfpovw==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0"
-			}
-		},
-		"jest-pnp-resolver": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-			"integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-			"dev": true
-		},
-		"jest-regex-util": {
-			"version": "26.0.0",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
-			"integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
-			"dev": true
-		},
-		"jest-resolve": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.1.0.tgz",
-			"integrity": "sha512-KsY1JV9FeVgEmwIISbZZN83RNGJ1CC+XUCikf/ZWJBX/tO4a4NvA21YixokhdR9UnmPKKAC4LafVixJBrwlmfg==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.4",
-				"jest-pnp-resolver": "^1.2.1",
-				"jest-util": "^26.1.0",
-				"read-pkg-up": "^7.0.1",
-				"resolve": "^1.17.0",
-				"slash": "^3.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"jest-resolve-dependencies": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.1.0.tgz",
-			"integrity": "sha512-fQVEPHHQ1JjHRDxzlLU/buuQ9om+hqW6Vo928aa4b4yvq4ZHBtRSDsLdKQLuCqn5CkTVpYZ7ARh2fbA8WkRE6g==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"jest-regex-util": "^26.0.0",
-				"jest-snapshot": "^26.1.0"
-			}
-		},
-		"jest-runner": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.1.0.tgz",
-			"integrity": "sha512-elvP7y0fVDREnfqit0zAxiXkDRSw6dgCkzPCf1XvIMnSDZ8yogmSKJf192dpOgnUVykmQXwYYJnCx641uLTgcw==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^26.1.0",
-				"@jest/environment": "^26.1.0",
-				"@jest/test-result": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"chalk": "^4.0.0",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.4",
-				"jest-config": "^26.1.0",
-				"jest-docblock": "^26.0.0",
-				"jest-haste-map": "^26.1.0",
-				"jest-jasmine2": "^26.1.0",
-				"jest-leak-detector": "^26.1.0",
-				"jest-message-util": "^26.1.0",
-				"jest-resolve": "^26.1.0",
-				"jest-runtime": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"jest-worker": "^26.1.0",
-				"source-map-support": "^0.5.6",
-				"throat": "^5.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"jest-runtime": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.1.0.tgz",
-			"integrity": "sha512-1qiYN+EZLmG1QV2wdEBRf+Ci8i3VSfIYLF02U18PiUDrMbhfpN/EAMMkJtT02jgJUoaEOpHAIXG6zS3QRMzRmA==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^26.1.0",
-				"@jest/environment": "^26.1.0",
-				"@jest/fake-timers": "^26.1.0",
-				"@jest/globals": "^26.1.0",
-				"@jest/source-map": "^26.1.0",
-				"@jest/test-result": "^26.1.0",
-				"@jest/transform": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"@types/yargs": "^15.0.0",
-				"chalk": "^4.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"exit": "^0.1.2",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.4",
-				"jest-config": "^26.1.0",
-				"jest-haste-map": "^26.1.0",
-				"jest-message-util": "^26.1.0",
-				"jest-mock": "^26.1.0",
-				"jest-regex-util": "^26.0.0",
-				"jest-resolve": "^26.1.0",
-				"jest-snapshot": "^26.1.0",
-				"jest-util": "^26.1.0",
-				"jest-validate": "^26.1.0",
-				"slash": "^3.0.0",
-				"strip-bom": "^4.0.0",
-				"yargs": "^15.3.1"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-					"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cliui": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-					"integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.0",
-						"wrap-ansi": "^6.2.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-					"integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-					"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "6.2.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-					"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"yargs": {
-					"version": "15.3.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
-					"integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
-					"dev": true,
-					"requires": {
-						"cliui": "^6.0.0",
-						"decamelize": "^1.2.0",
-						"find-up": "^4.1.0",
-						"get-caller-file": "^2.0.1",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^2.0.0",
-						"set-blocking": "^2.0.0",
-						"string-width": "^4.2.0",
-						"which-module": "^2.0.0",
-						"y18n": "^4.0.0",
-						"yargs-parser": "^18.1.1"
-					}
-				},
-				"yargs-parser": {
-					"version": "18.1.3",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-					"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^5.0.0",
-						"decamelize": "^1.2.0"
-					}
-				}
-			}
-		},
-		"jest-serializer": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.1.0.tgz",
-			"integrity": "sha512-eqZOQG/0+MHmr25b2Z86g7+Kzd5dG9dhCiUoyUNJPgiqi38DqbDEOlHcNijyfZoj74soGBohKBZuJFS18YTJ5w==",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.2.4"
-			}
-		},
-		"jest-snapshot": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.1.0.tgz",
-			"integrity": "sha512-YhSbU7eMTVQO/iRbNs8j0mKRxGp4plo7sJ3GzOQ0IYjvsBiwg0T1o0zGQAYepza7lYHuPTrG5J2yDd0CE2YxSw==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0",
-				"@jest/types": "^26.1.0",
-				"@types/prettier": "^2.0.0",
-				"chalk": "^4.0.0",
-				"expect": "^26.1.0",
-				"graceful-fs": "^4.2.4",
-				"jest-diff": "^26.1.0",
-				"jest-get-type": "^26.0.0",
-				"jest-haste-map": "^26.1.0",
-				"jest-matcher-utils": "^26.1.0",
-				"jest-message-util": "^26.1.0",
-				"jest-resolve": "^26.1.0",
-				"natural-compare": "^1.4.0",
-				"pretty-format": "^26.1.0",
-				"semver": "^7.3.2"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"semver": {
-					"version": "7.3.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-					"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-					"dev": true
-				}
-			}
-		},
-		"jest-util": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.1.0.tgz",
-			"integrity": "sha512-rNMOwFQevljfNGvbzNQAxdmXQ+NawW/J72dmddsK0E8vgxXCMtwQ/EH0BiWEIxh0hhMcTsxwAxINt7Lh46Uzbg==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.4",
-				"is-ci": "^2.0.0",
-				"micromatch": "^4.0.2"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"jest-validate": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.1.0.tgz",
-			"integrity": "sha512-WPApOOnXsiwhZtmkDsxnpye+XLb/tUISP+H6cHjfUIXvlG+eKwP+isnivsxlHCPaO9Q5wvbhloIBkdF3qUn+Nw==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"camelcase": "^6.0.0",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^26.0.0",
-				"leven": "^3.1.0",
-				"pretty-format": "^26.1.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"camelcase": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
-					"integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"jest-watcher": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.1.0.tgz",
-			"integrity": "sha512-ffEOhJl2EvAIki613oPsSG11usqnGUzIiK7MMX6hE4422aXOcVEG3ySCTDFLn1+LZNXGPE8tuJxhp8OBJ1pgzQ==",
-			"dev": true,
-			"requires": {
-				"@jest/test-result": "^26.1.0",
-				"@jest/types": "^26.1.0",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"jest-util": "^26.1.0",
-				"string-length": "^4.0.1"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
-		"jest-worker": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.1.0.tgz",
-			"integrity": "sha512-Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ==",
-			"dev": true,
-			"requires": {
-				"merge-stream": "^2.0.0",
-				"supports-color": "^7.0.0"
-			}
-		},
-		"js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-			"dev": true
-		},
-		"js-yaml": {
-			"version": "3.13.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-			"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-			"requires": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
-			}
-		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"dev": true
-		},
-		"jsdom": {
-			"version": "16.2.2",
-			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.2.2.tgz",
-			"integrity": "sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg==",
-			"dev": true,
-			"requires": {
-				"abab": "^2.0.3",
-				"acorn": "^7.1.1",
-				"acorn-globals": "^6.0.0",
-				"cssom": "^0.4.4",
-				"cssstyle": "^2.2.0",
-				"data-urls": "^2.0.0",
-				"decimal.js": "^10.2.0",
-				"domexception": "^2.0.1",
-				"escodegen": "^1.14.1",
-				"html-encoding-sniffer": "^2.0.1",
-				"is-potential-custom-element-name": "^1.0.0",
-				"nwsapi": "^2.2.0",
-				"parse5": "5.1.1",
-				"request": "^2.88.2",
-				"request-promise-native": "^1.0.8",
-				"saxes": "^5.0.0",
-				"symbol-tree": "^3.2.4",
-				"tough-cookie": "^3.0.1",
-				"w3c-hr-time": "^1.0.2",
-				"w3c-xmlserializer": "^2.0.0",
-				"webidl-conversions": "^6.0.0",
-				"whatwg-encoding": "^1.0.5",
-				"whatwg-mimetype": "^2.3.0",
-				"whatwg-url": "^8.0.0",
-				"ws": "^7.2.3",
-				"xml-name-validator": "^3.0.0"
-			}
-		},
-		"jsesc": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-			"dev": true
-		},
 		"json-parse-better-errors": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
 			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
 			"dev": true
 		},
-		"json-schema": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-			"dev": true
-		},
 		"json-schema-traverse": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
 			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
 			"dev": true
 		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-			"dev": true
-		},
 		"json5": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-			"integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
 			"dev": true,
 			"requires": {
 				"minimist": "^1.2.5"
 			}
 		},
-		"jsprim": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.2.3",
-				"verror": "1.10.0"
-			}
-		},
 		"kind-of": {
 			"version": "6.0.3",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
 			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
 			"dev": true
 		},
-		"kleur": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-			"dev": true
-		},
-		"leven": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-			"dev": true
-		},
-		"levn": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-			"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "~1.1.2",
-				"type-check": "~0.3.2"
-			}
-		},
-		"lines-and-columns": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-			"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-			"dev": true
-		},
 		"loader-runner": {
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
@@ -5388,31 +2325,44 @@
 				}
 			}
 		},
-		"locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"requires": {
-				"p-locate": "^4.1.0"
-			}
-		},
-		"lodash": {
-			"version": "4.17.15",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-			"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
-		},
-		"lodash.sortby": {
-			"version": "4.7.0",
-			"resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-			"integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-			"dev": true
-		},
 		"log-symbols": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-			"integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+			"integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
 			"requires": {
-				"chalk": "^2.4.2"
+				"chalk": "^4.0.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+					"requires": {
+						"color-convert": "^2.0.1"
+					}
+				},
+				"chalk": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+					"requires": {
+						"ansi-styles": "^4.1.0",
+						"supports-color": "^7.1.0"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"color-name": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+				}
 			}
 		},
 		"lru-cache": {
@@ -5424,32 +2374,6 @@
 				"yallist": "^3.0.2"
 			}
 		},
-		"make-dir": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-			"dev": true,
-			"requires": {
-				"semver": "^6.0.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
-			}
-		},
-		"makeerror": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-			"integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
-			"dev": true,
-			"requires": {
-				"tmpl": "1.0.x"
-			}
-		},
 		"map-cache": {
 			"version": "0.2.2",
 			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -5486,20 +2410,22 @@
 				"readable-stream": "^2.0.1"
 			}
 		},
-		"merge-stream": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-			"dev": true
-		},
 		"micromatch": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-			"integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
 			"dev": true,
 			"requires": {
 				"braces": "^3.0.1",
-				"picomatch": "^2.0.5"
+				"picomatch": "^2.2.3"
+			},
+			"dependencies": {
+				"picomatch": {
+					"version": "2.2.3",
+					"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+					"integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+					"dev": true
+				}
 			}
 		},
 		"miller-rabin": {
@@ -5520,27 +2446,6 @@
 				}
 			}
 		},
-		"mime-db": {
-			"version": "1.44.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
-			"integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
-			"dev": true
-		},
-		"mime-types": {
-			"version": "2.1.27",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
-			"integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
-			"dev": true,
-			"requires": {
-				"mime-db": "1.44.0"
-			}
-		},
-		"mimic-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"dev": true
-		},
 		"minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -5612,49 +2517,203 @@
 			"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
 		},
 		"mocha": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/mocha/-/mocha-8.0.1.tgz",
-			"integrity": "sha512-vefaXfdYI8+Yo8nPZQQi0QO2o+5q9UIMX1jZ1XMmK3+4+CQjc7+B0hPdUeglXiTlr8IHMVRo63IhO9Mzt6fxOg==",
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-8.3.2.tgz",
+			"integrity": "sha512-UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg==",
 			"requires": {
+				"@ungap/promise-all-settled": "1.1.2",
 				"ansi-colors": "4.1.1",
 				"browser-stdout": "1.3.1",
-				"chokidar": "3.3.1",
-				"debug": "3.2.6",
-				"diff": "4.0.2",
-				"escape-string-regexp": "1.0.5",
-				"find-up": "4.1.0",
+				"chokidar": "3.5.1",
+				"debug": "4.3.1",
+				"diff": "5.0.0",
+				"escape-string-regexp": "4.0.0",
+				"find-up": "5.0.0",
 				"glob": "7.1.6",
 				"growl": "1.10.5",
 				"he": "1.2.0",
-				"js-yaml": "3.13.1",
-				"log-symbols": "3.0.0",
+				"js-yaml": "4.0.0",
+				"log-symbols": "4.0.0",
 				"minimatch": "3.0.4",
-				"ms": "2.1.2",
-				"object.assign": "4.1.0",
-				"promise.allsettled": "1.0.2",
-				"serialize-javascript": "3.0.0",
-				"strip-json-comments": "3.0.1",
-				"supports-color": "7.1.0",
+				"ms": "2.1.3",
+				"nanoid": "3.1.20",
+				"serialize-javascript": "5.0.1",
+				"strip-json-comments": "3.1.1",
+				"supports-color": "8.1.1",
 				"which": "2.0.2",
 				"wide-align": "1.1.3",
-				"workerpool": "6.0.0",
-				"yargs": "13.3.2",
-				"yargs-parser": "13.1.2",
-				"yargs-unparser": "1.6.0"
+				"workerpool": "6.1.0",
+				"yargs": "16.2.0",
+				"yargs-parser": "20.2.4",
+				"yargs-unparser": "2.0.0"
 			},
 			"dependencies": {
-				"debug": {
-					"version": "3.2.6",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+				"ansi-regex": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+					"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+				},
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 					"requires": {
-						"ms": "^2.1.1"
+						"color-convert": "^2.0.1"
+					}
+				},
+				"argparse": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+				},
+				"cliui": {
+					"version": "7.0.4",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+					"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+					"requires": {
+						"string-width": "^4.2.0",
+						"strip-ansi": "^6.0.0",
+						"wrap-ansi": "^7.0.0"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"color-name": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+				},
+				"emoji-regex": {
+					"version": "8.0.0",
+					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+				},
+				"escape-string-regexp": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
+				},
+				"find-up": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+					"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+					"requires": {
+						"locate-path": "^6.0.0",
+						"path-exists": "^4.0.0"
+					}
+				},
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+				},
+				"is-fullwidth-code-point": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+				},
+				"js-yaml": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
+					"integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
+					"requires": {
+						"argparse": "^2.0.1"
+					}
+				},
+				"locate-path": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+					"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+					"requires": {
+						"p-locate": "^5.0.0"
 					}
 				},
 				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+					"version": "2.1.3",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+					"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+				},
+				"p-limit": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+					"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+					"requires": {
+						"yocto-queue": "^0.1.0"
+					}
+				},
+				"p-locate": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+					"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+					"requires": {
+						"p-limit": "^3.0.2"
+					}
+				},
+				"string-width": {
+					"version": "4.2.2",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+					"integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+					"requires": {
+						"emoji-regex": "^8.0.0",
+						"is-fullwidth-code-point": "^3.0.0",
+						"strip-ansi": "^6.0.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+					"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+					"requires": {
+						"ansi-regex": "^5.0.0"
+					}
+				},
+				"supports-color": {
+					"version": "8.1.1",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				},
+				"wrap-ansi": {
+					"version": "7.0.0",
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+					"requires": {
+						"ansi-styles": "^4.0.0",
+						"string-width": "^4.1.0",
+						"strip-ansi": "^6.0.0"
+					}
+				},
+				"y18n": {
+					"version": "5.0.5",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
+					"integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg=="
+				},
+				"yargs": {
+					"version": "16.2.0",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+					"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+					"requires": {
+						"cliui": "^7.0.2",
+						"escalade": "^3.1.1",
+						"get-caller-file": "^2.0.5",
+						"require-directory": "^2.1.1",
+						"string-width": "^4.2.0",
+						"y18n": "^5.0.5",
+						"yargs-parser": "^20.2.2"
+					}
+				},
+				"yargs-parser": {
+					"version": "20.2.4",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+					"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA=="
 				}
 			}
 		},
@@ -5705,6 +2764,11 @@
 			"dev": true,
 			"optional": true
 		},
+		"nanoid": {
+			"version": "3.1.20",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
+			"integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="
+		},
 		"nanomatch": {
 			"version": "1.2.13",
 			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -5724,12 +2788,6 @@
 				"to-regex": "^3.0.1"
 			}
 		},
-		"natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-			"dev": true
-		},
 		"neo-async": {
 			"version": "2.6.1",
 			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
@@ -5742,12 +2800,6 @@
 			"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
 			"dev": true
 		},
-		"node-int64": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-			"integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-			"dev": true
-		},
 		"node-libs-browser": {
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
@@ -5787,74 +2839,11 @@
 				}
 			}
 		},
-		"node-modules-regexp": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-			"integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-			"dev": true
-		},
-		"node-notifier": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.1.tgz",
-			"integrity": "sha512-VkzhierE7DBmQEElhTGJIoiZa1oqRijOtgOlsXg32KrJRXsPy0NXFBqWGW/wTswnJlDCs5viRYaqWguqzsKcmg==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"growly": "^1.3.0",
-				"is-wsl": "^2.1.1",
-				"semver": "^7.2.1",
-				"shellwords": "^0.1.1",
-				"uuid": "^7.0.3",
-				"which": "^2.0.2"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "7.3.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-					"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-					"dev": true,
-					"optional": true
-				}
-			}
-		},
-		"normalize-package-data": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-			"dev": true,
-			"requires": {
-				"hosted-git-info": "^2.1.4",
-				"resolve": "^1.10.0",
-				"semver": "2 || 3 || 4 || 5",
-				"validate-npm-package-license": "^3.0.1"
-			}
-		},
 		"normalize-path": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
 			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
 		},
-		"npm-run-path": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-			"integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-			"dev": true,
-			"requires": {
-				"path-key": "^2.0.0"
-			}
-		},
-		"nwsapi": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-			"integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-			"dev": true
-		},
-		"oauth-sign": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-			"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-			"dev": true
-		},
 		"object-assign": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -5898,16 +2887,6 @@
 				}
 			}
 		},
-		"object-inspect": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-			"integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
-		},
-		"object-keys": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-		},
 		"object-visit": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -5917,17 +2896,6 @@
 				"isobject": "^3.0.0"
 			}
 		},
-		"object.assign": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-			"integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-			"requires": {
-				"define-properties": "^1.1.2",
-				"function-bind": "^1.1.1",
-				"has-symbols": "^1.0.0",
-				"object-keys": "^1.0.11"
-			}
-		},
 		"object.pick": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -5945,67 +2913,26 @@
 				"wrappy": "1"
 			}
 		},
-		"onetime": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-			"integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-			"dev": true,
-			"requires": {
-				"mimic-fn": "^2.1.0"
-			}
-		},
-		"optionator": {
-			"version": "0.8.3",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-			"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-			"dev": true,
-			"requires": {
-				"deep-is": "~0.1.3",
-				"fast-levenshtein": "~2.0.6",
-				"levn": "~0.3.0",
-				"prelude-ls": "~1.1.2",
-				"type-check": "~0.3.2",
-				"word-wrap": "~1.2.3"
-			}
-		},
 		"os-browserify": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
 			"integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
 			"dev": true
 		},
-		"p-each-series": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
-			"integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==",
-			"dev": true
-		},
-		"p-finally": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-			"integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-			"dev": true
-		},
 		"p-limit": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
 			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
 			"requires": {
 				"p-try": "^2.0.0"
 			}
 		},
-		"p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"requires": {
-				"p-limit": "^2.2.0"
-			}
-		},
 		"p-try": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"dev": true
 		},
 		"pako": {
 			"version": "1.0.11",
@@ -6038,30 +2965,12 @@
 				"safe-buffer": "^5.1.1"
 			}
 		},
-		"parse-json": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-			"integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"error-ex": "^1.3.1",
-				"json-parse-better-errors": "^1.0.1",
-				"lines-and-columns": "^1.1.6"
-			}
-		},
 		"parse-passwd": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
 			"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
 			"dev": true
 		},
-		"parse5": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-			"integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
-			"dev": true
-		},
 		"pascalcase": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -6097,16 +3006,10 @@
 			"integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
 			"dev": true
 		},
-		"path-parse": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-			"dev": true
-		},
 		"pathval": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
-			"integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA="
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+			"integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="
 		},
 		"pbkdf2": {
 			"version": "3.1.1",
@@ -6121,12 +3024,6 @@
 				"sha.js": "^2.4.8"
 			}
 		},
-		"performance-now": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-			"dev": true
-		},
 		"picomatch": {
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
@@ -6138,81 +3035,12 @@
 			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
 			"dev": true
 		},
-		"pirates": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-			"integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-			"dev": true,
-			"requires": {
-				"node-modules-regexp": "^1.0.0"
-			}
-		},
-		"pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-			"dev": true,
-			"requires": {
-				"find-up": "^4.0.0"
-			}
-		},
 		"posix-character-classes": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
 			"integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
 			"dev": true
 		},
-		"prelude-ls": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-			"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-			"dev": true
-		},
-		"pretty-format": {
-			"version": "26.1.0",
-			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.1.0.tgz",
-			"integrity": "sha512-GmeO1PEYdM+non4BKCj+XsPJjFOJIPnsLewqhDVoqY1xo0yNmDas7tC2XwpMrRAHR3MaE2hPo37deX5OisJ2Wg==",
-			"dev": true,
-			"requires": {
-				"@jest/types": "^26.1.0",
-				"ansi-regex": "^5.0.0",
-				"ansi-styles": "^4.0.0",
-				"react-is": "^16.12.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-					"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-					"dev": true,
-					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				}
-			}
-		},
 		"process": {
 			"version": "0.11.10",
 			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -6231,40 +3059,12 @@
 			"integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
 			"dev": true
 		},
-		"promise.allsettled": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz",
-			"integrity": "sha512-UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg==",
-			"requires": {
-				"array.prototype.map": "^1.0.1",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.0-next.1",
-				"function-bind": "^1.1.1",
-				"iterate-value": "^1.0.0"
-			}
-		},
-		"prompts": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-			"integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
-			"dev": true,
-			"requires": {
-				"kleur": "^3.0.3",
-				"sisteransi": "^1.0.4"
-			}
-		},
 		"prr": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
 			"integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
 			"dev": true
 		},
-		"psl": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-			"dev": true
-		},
 		"public-encrypt": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
@@ -6326,12 +3126,6 @@
 			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
 			"dev": true
 		},
-		"qs": {
-			"version": "6.5.2",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-			"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-			"dev": true
-		},
 		"querystring": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -6348,7 +3142,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
 			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-			"dev": true,
 			"requires": {
 				"safe-buffer": "^5.1.0"
 			}
@@ -6363,43 +3156,6 @@
 				"safe-buffer": "^5.1.0"
 			}
 		},
-		"react-is": {
-			"version": "16.13.1",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-			"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-			"dev": true
-		},
-		"read-pkg": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-			"dev": true,
-			"requires": {
-				"@types/normalize-package-data": "^2.4.0",
-				"normalize-package-data": "^2.5.0",
-				"parse-json": "^5.0.0",
-				"type-fest": "^0.6.0"
-			},
-			"dependencies": {
-				"type-fest": {
-					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-					"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-					"dev": true
-				}
-			}
-		},
-		"read-pkg-up": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-			"dev": true,
-			"requires": {
-				"find-up": "^4.1.0",
-				"read-pkg": "^5.2.0",
-				"type-fest": "^0.8.1"
-			}
-		},
 		"readable-stream": {
 			"version": "2.3.7",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -6424,11 +3180,11 @@
 			}
 		},
 		"readdirp": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz",
-			"integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==",
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+			"integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
 			"requires": {
-				"picomatch": "^2.0.7"
+				"picomatch": "^2.2.1"
 			}
 		},
 		"regex-not": {
@@ -6445,7 +3201,8 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
 			"integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"repeat-element": {
 			"version": "1.1.3",
@@ -6459,84 +3216,6 @@
 			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
 			"dev": true
 		},
-		"request": {
-			"version": "2.88.2",
-			"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-			"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-			"dev": true,
-			"requires": {
-				"aws-sign2": "~0.7.0",
-				"aws4": "^1.8.0",
-				"caseless": "~0.12.0",
-				"combined-stream": "~1.0.6",
-				"extend": "~3.0.2",
-				"forever-agent": "~0.6.1",
-				"form-data": "~2.3.2",
-				"har-validator": "~5.1.3",
-				"http-signature": "~1.2.0",
-				"is-typedarray": "~1.0.0",
-				"isstream": "~0.1.2",
-				"json-stringify-safe": "~5.0.1",
-				"mime-types": "~2.1.19",
-				"oauth-sign": "~0.9.0",
-				"performance-now": "^2.1.0",
-				"qs": "~6.5.2",
-				"safe-buffer": "^5.1.2",
-				"tough-cookie": "~2.5.0",
-				"tunnel-agent": "^0.6.0",
-				"uuid": "^3.3.2"
-			},
-			"dependencies": {
-				"tough-cookie": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-					"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-					"dev": true,
-					"requires": {
-						"psl": "^1.1.28",
-						"punycode": "^2.1.1"
-					}
-				},
-				"uuid": {
-					"version": "3.4.0",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-					"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-					"dev": true
-				}
-			}
-		},
-		"request-promise-core": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
-			"integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.17.15"
-			}
-		},
-		"request-promise-native": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
-			"integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
-			"dev": true,
-			"requires": {
-				"request-promise-core": "1.1.3",
-				"stealthy-require": "^1.1.1",
-				"tough-cookie": "^2.3.3"
-			},
-			"dependencies": {
-				"tough-cookie": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-					"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-					"dev": true,
-					"requires": {
-						"psl": "^1.1.28",
-						"punycode": "^2.1.1"
-					}
-				}
-			}
-		},
 		"require-directory": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -6545,25 +3224,8 @@
 		"require-main-filename": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-			"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
-		},
-		"resolve": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-			"dev": true,
-			"requires": {
-				"path-parse": "^1.0.6"
-			}
-		},
-		"resolve-cwd": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-			"dev": true,
-			"requires": {
-				"resolve-from": "^5.0.0"
-			}
+			"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+			"dev": true
 		},
 		"resolve-dir": {
 			"version": "1.0.1",
@@ -6588,12 +3250,6 @@
 				}
 			}
 		},
-		"resolve-from": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-			"dev": true
-		},
 		"resolve-url": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -6606,15 +3262,6 @@
 			"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
 			"dev": true
 		},
-		"rimraf": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-			"dev": true,
-			"requires": {
-				"glob": "^7.1.3"
-			}
-		},
 		"ripemd160": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@@ -6625,12 +3272,6 @@
 				"inherits": "^2.0.1"
 			}
 		},
-		"rsvp": {
-			"version": "4.8.5",
-			"resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
-			"integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
-			"dev": true
-		},
 		"run-queue": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
@@ -6643,8 +3284,7 @@
 		"safe-buffer": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-			"dev": true
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 		},
 		"safe-regex": {
 			"version": "1.1.0",
@@ -6655,168 +3295,6 @@
 				"ret": "~0.1.10"
 			}
 		},
-		"safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-			"dev": true
-		},
-		"sane": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
-			"integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
-			"dev": true,
-			"requires": {
-				"@cnakazawa/watch": "^1.0.3",
-				"anymatch": "^2.0.0",
-				"capture-exit": "^2.0.0",
-				"exec-sh": "^0.3.2",
-				"execa": "^1.0.0",
-				"fb-watchman": "^2.0.0",
-				"micromatch": "^3.1.4",
-				"minimist": "^1.1.1",
-				"walker": "~1.0.5"
-			},
-			"dependencies": {
-				"anymatch": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-					"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-					"dev": true,
-					"requires": {
-						"micromatch": "^3.1.4",
-						"normalize-path": "^2.1.1"
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"fill-range": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-					"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-					"dev": true,
-					"requires": {
-						"extend-shallow": "^2.0.1",
-						"is-number": "^3.0.0",
-						"repeat-string": "^1.6.1",
-						"to-regex-range": "^2.1.0"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"is-buffer": {
-					"version": "1.1.6",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-					"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-					"dev": true
-				},
-				"is-number": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-							"dev": true,
-							"requires": {
-								"is-buffer": "^1.1.5"
-							}
-						}
-					}
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
-					}
-				},
-				"normalize-path": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-					"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-					"dev": true,
-					"requires": {
-						"remove-trailing-separator": "^1.0.1"
-					}
-				},
-				"to-regex-range": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-					"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-					"dev": true,
-					"requires": {
-						"is-number": "^3.0.0",
-						"repeat-string": "^1.6.1"
-					}
-				}
-			}
-		},
-		"saxes": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-			"integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-			"dev": true,
-			"requires": {
-				"xmlchars": "^2.2.0"
-			}
-		},
 		"schema-utils": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -6835,14 +3313,18 @@
 			"dev": true
 		},
 		"serialize-javascript": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz",
-			"integrity": "sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw=="
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+			"integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+			"requires": {
+				"randombytes": "^2.1.0"
+			}
 		},
 		"set-blocking": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+			"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+			"dev": true
 		},
 		"set-value": {
 			"version": "2.0.1",
@@ -6898,31 +3380,6 @@
 			"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
 			"dev": true
 		},
-		"shellwords": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-			"integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
-			"dev": true,
-			"optional": true
-		},
-		"signal-exit": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-			"integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
-			"dev": true
-		},
-		"sisteransi": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-			"dev": true
-		},
-		"slash": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-			"dev": true
-		},
 		"snapdragon": {
 			"version": "0.8.2",
 			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -7094,38 +3551,6 @@
 			"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
 			"dev": true
 		},
-		"spdx-correct": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-			"dev": true,
-			"requires": {
-				"spdx-expression-parse": "^3.0.0",
-				"spdx-license-ids": "^3.0.0"
-			}
-		},
-		"spdx-exceptions": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-			"dev": true
-		},
-		"spdx-expression-parse": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-			"dev": true,
-			"requires": {
-				"spdx-exceptions": "^2.1.0",
-				"spdx-license-ids": "^3.0.0"
-			}
-		},
-		"spdx-license-ids": {
-			"version": "3.0.5",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-			"integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
-			"dev": true
-		},
 		"split-string": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -7135,28 +3560,6 @@
 				"extend-shallow": "^3.0.0"
 			}
 		},
-		"sprintf-js": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-		},
-		"sshpk": {
-			"version": "1.16.1",
-			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-			"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-			"dev": true,
-			"requires": {
-				"asn1": "~0.2.3",
-				"assert-plus": "^1.0.0",
-				"bcrypt-pbkdf": "^1.0.0",
-				"dashdash": "^1.12.0",
-				"ecc-jsbn": "~0.1.1",
-				"getpass": "^0.1.1",
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.0.2",
-				"tweetnacl": "~0.14.0"
-			}
-		},
 		"ssri": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
@@ -7166,23 +3569,6 @@
 				"figgy-pudding": "^3.5.1"
 			}
 		},
-		"stack-utils": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz",
-			"integrity": "sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==",
-			"dev": true,
-			"requires": {
-				"escape-string-regexp": "^2.0.0"
-			},
-			"dependencies": {
-				"escape-string-regexp": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-					"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-					"dev": true
-				}
-			}
-		},
 		"static-extend": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -7204,12 +3590,6 @@
 				}
 			}
 		},
-		"stealthy-require": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-			"integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-			"dev": true
-		},
 		"stream-browserify": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
@@ -7249,33 +3629,6 @@
 			"integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
 			"dev": true
 		},
-		"string-length": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
-			"integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
-			"dev": true,
-			"requires": {
-				"char-regex": "^1.0.2",
-				"strip-ansi": "^6.0.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-					"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-					"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.0"
-					}
-				}
-			}
-		},
 		"string-width": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -7285,24 +3638,6 @@
 				"strip-ansi": "^4.0.0"
 			}
 		},
-		"string.prototype.trimend": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-			"integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
-			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.5"
-			}
-		},
-		"string.prototype.trimstart": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-			"integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
-			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.5"
-			}
-		},
 		"string_decoder": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -7320,28 +3655,10 @@
 				"ansi-regex": "^3.0.0"
 			}
 		},
-		"strip-bom": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-			"dev": true
-		},
-		"strip-eof": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-			"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-			"dev": true
-		},
-		"strip-final-newline": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-			"dev": true
-		},
 		"strip-json-comments": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
-			"integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
 		},
 		"supports-color": {
 			"version": "7.1.0",
@@ -7358,46 +3675,12 @@
 				}
 			}
 		},
-		"supports-hyperlinks": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
-			"integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
-			"dev": true,
-			"requires": {
-				"has-flag": "^4.0.0",
-				"supports-color": "^7.0.0"
-			},
-			"dependencies": {
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				}
-			}
-		},
-		"symbol-tree": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-			"dev": true
-		},
 		"tapable": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
 			"integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
 			"dev": true
 		},
-		"terminal-link": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-			"integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-			"dev": true,
-			"requires": {
-				"ansi-escapes": "^4.2.1",
-				"supports-hyperlinks": "^2.0.0"
-			}
-		},
 		"terser": {
 			"version": "4.8.0",
 			"resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
@@ -7457,23 +3740,6 @@
 				}
 			}
 		},
-		"test-exclude": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-			"dev": true,
-			"requires": {
-				"@istanbuljs/schema": "^0.1.2",
-				"glob": "^7.1.4",
-				"minimatch": "^3.0.4"
-			}
-		},
-		"throat": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
-			"integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
-			"dev": true
-		},
 		"through2": {
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
@@ -7493,24 +3759,12 @@
 				"setimmediate": "^1.0.4"
 			}
 		},
-		"tmpl": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-			"integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
-			"dev": true
-		},
 		"to-arraybuffer": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
 			"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
 			"dev": true
 		},
-		"to-fast-properties": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-			"dev": true
-		},
 		"to-object-path": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
@@ -7557,24 +3811,88 @@
 				"is-number": "^7.0.0"
 			}
 		},
-		"tough-cookie": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-			"integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+		"ts-loader": {
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.2.0.tgz",
+			"integrity": "sha512-ebXBFrNyMSmbWgjnb3WBloUBK+VSx1xckaXsMXxlZRDqce/OPdYBVN5efB0W3V0defq0Gcy4YuzvPGqRgjj85A==",
 			"dev": true,
 			"requires": {
-				"ip-regex": "^2.1.0",
-				"psl": "^1.1.28",
-				"punycode": "^2.1.1"
-			}
-		},
-		"tr46": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
-			"integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
-			"dev": true,
-			"requires": {
-				"punycode": "^2.1.1"
+				"chalk": "^4.1.0",
+				"enhanced-resolve": "^4.0.0",
+				"loader-utils": "^2.0.0",
+				"micromatch": "^4.0.0",
+				"semver": "^7.3.4"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^2.0.1"
+					}
+				},
+				"chalk": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+					"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^4.1.0",
+						"supports-color": "^7.1.0"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"dev": true,
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"color-name": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+					"dev": true
+				},
+				"loader-utils": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+					"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+					"dev": true,
+					"requires": {
+						"big.js": "^5.2.2",
+						"emojis-list": "^3.0.0",
+						"json5": "^2.1.2"
+					}
+				},
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
+				}
 			}
 		},
 		"tslib": {
@@ -7589,56 +3907,17 @@
 			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
 			"dev": true
 		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"dev": true,
-			"requires": {
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"dev": true
-		},
-		"type-check": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "~1.1.2"
-			}
-		},
 		"type-detect": {
 			"version": "4.0.8",
 			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
 			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
 		},
-		"type-fest": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-			"dev": true
-		},
 		"typedarray": {
 			"version": "0.0.6",
 			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
 			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
 			"dev": true
 		},
-		"typedarray-to-buffer": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-			"dev": true,
-			"requires": {
-				"is-typedarray": "^1.0.0"
-			}
-		},
 		"union-value": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -7784,92 +4063,18 @@
 			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
 			"dev": true
 		},
-		"uuid": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-			"integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
-			"dev": true,
-			"optional": true
-		},
 		"v8-compile-cache": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
 			"integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
 			"dev": true
 		},
-		"v8-to-istanbul": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz",
-			"integrity": "sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ==",
-			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-coverage": "^2.0.1",
-				"convert-source-map": "^1.6.0",
-				"source-map": "^0.7.3"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				}
-			}
-		},
-		"validate-npm-package-license": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-			"dev": true,
-			"requires": {
-				"spdx-correct": "^3.0.0",
-				"spdx-expression-parse": "^3.0.0"
-			}
-		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0",
-				"core-util-is": "1.0.2",
-				"extsprintf": "^1.2.0"
-			}
-		},
 		"vm-browserify": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
 			"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
 			"dev": true
 		},
-		"w3c-hr-time": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-			"integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-			"dev": true,
-			"requires": {
-				"browser-process-hrtime": "^1.0.0"
-			}
-		},
-		"w3c-xmlserializer": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-			"integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-			"dev": true,
-			"requires": {
-				"xml-name-validator": "^3.0.0"
-			}
-		},
-		"walker": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-			"integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
-			"dev": true,
-			"requires": {
-				"makeerror": "1.0.x"
-			}
-		},
 		"watchpack": {
 			"version": "1.7.2",
 			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
@@ -8148,12 +4353,6 @@
 				}
 			}
 		},
-		"webidl-conversions": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-			"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-			"dev": true
-		},
 		"webpack": {
 			"version": "4.43.0",
 			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
@@ -8427,40 +4626,6 @@
 				}
 			}
 		},
-		"whatwg-encoding": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-			"integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-			"dev": true,
-			"requires": {
-				"iconv-lite": "0.4.24"
-			}
-		},
-		"whatwg-mimetype": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-			"integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-			"dev": true
-		},
-		"whatwg-url": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.1.0.tgz",
-			"integrity": "sha512-vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw==",
-			"dev": true,
-			"requires": {
-				"lodash.sortby": "^4.7.0",
-				"tr46": "^2.0.2",
-				"webidl-conversions": "^5.0.0"
-			},
-			"dependencies": {
-				"webidl-conversions": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-					"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-					"dev": true
-				}
-			}
-		},
 		"which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -8472,7 +4637,8 @@
 		"which-module": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-			"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+			"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+			"dev": true
 		},
 		"wide-align": {
 			"version": "1.1.3",
@@ -8482,12 +4648,6 @@
 				"string-width": "^1.0.2 || 2"
 			}
 		},
-		"word-wrap": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-			"dev": true
-		},
 		"worker-farm": {
 			"version": "1.7.0",
 			"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
@@ -8498,14 +4658,15 @@
 			}
 		},
 		"workerpool": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.0.tgz",
-			"integrity": "sha512-fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA=="
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz",
+			"integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg=="
 		},
 		"wrap-ansi": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
 			"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+			"dev": true,
 			"requires": {
 				"ansi-styles": "^3.2.0",
 				"string-width": "^3.0.0",
@@ -8515,12 +4676,14 @@
 				"ansi-regex": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
 				},
 				"string-width": {
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
 					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
 					"requires": {
 						"emoji-regex": "^7.0.1",
 						"is-fullwidth-code-point": "^2.0.0",
@@ -8531,6 +4694,7 @@
 					"version": "5.2.0",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
 					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
 					"requires": {
 						"ansi-regex": "^4.1.0"
 					}
@@ -8542,36 +4706,6 @@
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
 			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
 		},
-		"write-file-atomic": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-			"dev": true,
-			"requires": {
-				"imurmurhash": "^0.1.4",
-				"is-typedarray": "^1.0.0",
-				"signal-exit": "^3.0.2",
-				"typedarray-to-buffer": "^3.1.5"
-			}
-		},
-		"ws": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz",
-			"integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==",
-			"dev": true
-		},
-		"xml-name-validator": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-			"dev": true
-		},
-		"xmlchars": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-			"dev": true
-		},
 		"xtend": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -8581,7 +4715,8 @@
 		"y18n": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-			"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
+			"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+			"dev": true
 		},
 		"yallist": {
 			"version": "3.1.1",
@@ -8593,6 +4728,7 @@
 			"version": "13.3.2",
 			"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
 			"integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+			"dev": true,
 			"requires": {
 				"cliui": "^5.0.0",
 				"find-up": "^3.0.0",
@@ -8609,12 +4745,14 @@
 				"ansi-regex": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
 				},
 				"find-up": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
 					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+					"dev": true,
 					"requires": {
 						"locate-path": "^3.0.0"
 					}
@@ -8623,6 +4761,7 @@
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
 					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+					"dev": true,
 					"requires": {
 						"p-locate": "^3.0.0",
 						"path-exists": "^3.0.0"
@@ -8632,6 +4771,7 @@
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
 					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+					"dev": true,
 					"requires": {
 						"p-limit": "^2.0.0"
 					}
@@ -8639,12 +4779,14 @@
 				"path-exists": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-					"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+					"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+					"dev": true
 				},
 				"string-width": {
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
 					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
 					"requires": {
 						"emoji-regex": "^7.0.1",
 						"is-fullwidth-code-point": "^2.0.0",
@@ -8655,6 +4797,7 @@
 					"version": "5.2.0",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
 					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
 					"requires": {
 						"ansi-regex": "^4.1.0"
 					}
@@ -8665,20 +4808,39 @@
 			"version": "13.1.2",
 			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
 			"integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+			"dev": true,
 			"requires": {
 				"camelcase": "^5.0.0",
 				"decamelize": "^1.2.0"
 			}
 		},
 		"yargs-unparser": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
-			"integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+			"integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
 			"requires": {
-				"flat": "^4.1.0",
-				"lodash": "^4.17.15",
-				"yargs": "^13.3.0"
+				"camelcase": "^6.0.0",
+				"decamelize": "^4.0.0",
+				"flat": "^5.0.2",
+				"is-plain-obj": "^2.1.0"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "6.2.0",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+					"integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="
+				},
+				"decamelize": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+					"integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="
+				}
 			}
+		},
+		"yocto-queue": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
 		}
 	}
 }
diff --git a/packages/insomnia-testing/package.json b/packages/insomnia-testing/package.json
index e3210d411a..b9eaa342fd 100644
--- a/packages/insomnia-testing/package.json
+++ b/packages/insomnia-testing/package.json
@@ -3,35 +3,32 @@
   "license": "Apache-2.0",
   "version": "2.2.35",
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "typecheck": "flow check",
+    "bootstrap": "npm run build",
+    "lint": "eslint . --ext .js,.ts,.tsx",
+    "lint:fix": "npm run lint -- --fix",
+    "clean": "tsc --build tsconfig.build.json --clean",
+    "postclean": "rimraf dist",
     "test": "jest",
     "build": "webpack --config webpack.config.js --display errors-only",
     "watch": "npm run build -- --watch",
-    "bootstrap": "npm run build",
     "prepublish": "npm run build"
   },
-  "jest": {
-    "testEnvironment": "node",
-    "testMatch": [
-      "**/__tests__/**/*.test.js"
-    ],
-    "verbose": false,
-    "resetMocks": true,
-    "resetModules": true
-  },
   "devDependencies": {
-    "@babel/core": "^7.9.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-    "jest": "^26.0.1",
+    "@types/mkdirp": "^1.0.1",
+    "@types/chai": "^4.2.15",
+    "@types/mocha": "^8.2.1",
+    "@types/webpack": "^4.41.26",
+    "ts-loader": "^8.2.0",
     "webpack": "^4.42.1",
     "webpack-cli": "^3.3.11"
   },
   "dependencies": {
     "axios": "^0.21.1",
-    "chai": "^4.2.0",
     "mkdirp": "^1.0.4",
-    "mocha": "^8.0.1"
+    "chai": "^4.3.4",
+    "mocha": "^8.3.2"
   },
   "gitHead": "d91e6735a76295166545a42c170328da4ab70dd3"
 }
diff --git a/packages/insomnia-testing/src/__mocks__/axios.js b/packages/insomnia-testing/src/__mocks__/axios.js
deleted file mode 100644
index 8a56a4bfce..0000000000
--- a/packages/insomnia-testing/src/__mocks__/axios.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const axios = jest.genMockFromModule('axios');
-
-const mockResponses = {};
-
-function key(method, url) {
-  return `${method.toLowerCase()}:${url.toLowerCase()}`;
-}
-
-axios.__setResponse = (method, url, resp) => {
-  mockResponses[key(method, url)] = resp;
-};
-
-axios.request = async function({ method, url }) {
-  const k = key(method, url);
-  const resp = mockResponses[k];
-  if (!resp) {
-    throw new Error(
-      `Could not find mock axios response for ${k}. Options are [${Object.keys(mockResponses).join(
-        ', ',
-      )}]`,
-    );
-  }
-
-  return Promise.resolve(resp);
-};
-
-module.exports = axios;
diff --git a/packages/insomnia-testing/src/__mocks__/axios.ts b/packages/insomnia-testing/src/__mocks__/axios.ts
new file mode 100644
index 0000000000..51ce41477d
--- /dev/null
+++ b/packages/insomnia-testing/src/__mocks__/axios.ts
@@ -0,0 +1,47 @@
+import type { AxiosStatic, Method, AxiosResponse, AxiosRequestConfig } from 'axios';
+
+const mockResponses: { [key: string]: AxiosResponse } = {};
+
+const key = (method?: Method, url?: string) => (
+  `${method?.toLowerCase()}:${url?.toLowerCase()}`
+);
+
+type SetResponse = <T>(method?: Method, url?: string, response?: AxiosResponse<T>) => void;
+
+const axios = jest.genMockFromModule<AxiosStatic & { __setResponse: SetResponse }>('axios');
+
+const __setResponse: SetResponse = (method, url, response) => {
+  if (!method) {
+    return;
+  }
+  if (!url) {
+    return;
+  }
+  if (!response) {
+    return;
+  }
+
+  mockResponses[key(method, url)] = response;
+};
+
+axios.__setResponse = __setResponse;
+
+const request = async <T, U = AxiosResponse<T>>({ method, url }: AxiosRequestConfig) => {
+  const k = key(method, url);
+  const resp = mockResponses[k] as unknown as U;
+  if (!resp) {
+    throw new Error(
+      `Could not find mock axios response for ${k}. Options are [${Object.keys(mockResponses).join(
+        ', ',
+      )}]`,
+    );
+  }
+
+  return Promise.resolve<U>(resp);
+};
+
+axios.request = request;
+
+export type AxiosMock = typeof axios;
+
+export default axios;
diff --git a/packages/insomnia-testing/src/generate/__fixtures__/01_empty.input.json b/packages/insomnia-testing/src/generate/fixtures/01_empty.input.json
similarity index 100%
rename from packages/insomnia-testing/src/generate/__fixtures__/01_empty.input.json
rename to packages/insomnia-testing/src/generate/fixtures/01_empty.input.json
diff --git a/packages/insomnia-testing/src/generate/__fixtures__/01_empty.output.js b/packages/insomnia-testing/src/generate/fixtures/01_empty.output.js
similarity index 100%
rename from packages/insomnia-testing/src/generate/__fixtures__/01_empty.output.js
rename to packages/insomnia-testing/src/generate/fixtures/01_empty.output.js
diff --git a/packages/insomnia-testing/src/generate/__fixtures__/02_empty-suite.input.json b/packages/insomnia-testing/src/generate/fixtures/02_empty-suite.input.json
similarity index 100%
rename from packages/insomnia-testing/src/generate/__fixtures__/02_empty-suite.input.json
rename to packages/insomnia-testing/src/generate/fixtures/02_empty-suite.input.json
diff --git a/packages/insomnia-testing/src/generate/__fixtures__/02_empty-suite.output.js b/packages/insomnia-testing/src/generate/fixtures/02_empty-suite.output.js
similarity index 100%
rename from packages/insomnia-testing/src/generate/__fixtures__/02_empty-suite.output.js
rename to packages/insomnia-testing/src/generate/fixtures/02_empty-suite.output.js
diff --git a/packages/insomnia-testing/src/generate/__fixtures__/03_basic-suite.input.json b/packages/insomnia-testing/src/generate/fixtures/03_basic-suite.input.json
similarity index 100%
rename from packages/insomnia-testing/src/generate/__fixtures__/03_basic-suite.input.json
rename to packages/insomnia-testing/src/generate/fixtures/03_basic-suite.input.json
diff --git a/packages/insomnia-testing/src/generate/__fixtures__/03_basic-suite.output.js b/packages/insomnia-testing/src/generate/fixtures/03_basic-suite.output.js
similarity index 100%
rename from packages/insomnia-testing/src/generate/__fixtures__/03_basic-suite.output.js
rename to packages/insomnia-testing/src/generate/fixtures/03_basic-suite.output.js
diff --git a/packages/insomnia-testing/src/generate/__fixtures__/04_nested-suite.input.json b/packages/insomnia-testing/src/generate/fixtures/04_nested-suite.input.json
similarity index 100%
rename from packages/insomnia-testing/src/generate/__fixtures__/04_nested-suite.input.json
rename to packages/insomnia-testing/src/generate/fixtures/04_nested-suite.input.json
diff --git a/packages/insomnia-testing/src/generate/__fixtures__/04_nested-suite.output.js b/packages/insomnia-testing/src/generate/fixtures/04_nested-suite.output.js
similarity index 100%
rename from packages/insomnia-testing/src/generate/__fixtures__/04_nested-suite.output.js
rename to packages/insomnia-testing/src/generate/fixtures/04_nested-suite.output.js
diff --git a/packages/insomnia-testing/src/generate/__fixtures__/05_complex-suite.input.json b/packages/insomnia-testing/src/generate/fixtures/05_complex-suite.input.json
similarity index 100%
rename from packages/insomnia-testing/src/generate/__fixtures__/05_complex-suite.input.json
rename to packages/insomnia-testing/src/generate/fixtures/05_complex-suite.input.json
diff --git a/packages/insomnia-testing/src/generate/__fixtures__/05_complex-suite.output.js b/packages/insomnia-testing/src/generate/fixtures/05_complex-suite.output.js
similarity index 100%
rename from packages/insomnia-testing/src/generate/__fixtures__/05_complex-suite.output.js
rename to packages/insomnia-testing/src/generate/fixtures/05_complex-suite.output.js
diff --git a/packages/insomnia-testing/src/generate/__tests__/fixtures.test.js b/packages/insomnia-testing/src/generate/generate.test.ts
similarity index 63%
rename from packages/insomnia-testing/src/generate/__tests__/fixtures.test.js
rename to packages/insomnia-testing/src/generate/generate.test.ts
index 0e34d554b4..a5a0977936 100644
--- a/packages/insomnia-testing/src/generate/__tests__/fixtures.test.js
+++ b/packages/insomnia-testing/src/generate/generate.test.ts
@@ -1,10 +1,9 @@
-// @flow
-import { generate } from '../index';
-import fs from 'fs';
-import path from 'path';
+import { generate } from './generate';
+import { readdirSync, readFileSync } from 'fs';
+import { join } from 'path';
 
-const fixturesPath = path.join(__dirname, '../__fixtures__');
-const fixtures = fs.readdirSync(fixturesPath);
+const fixturesPath = join(__dirname, 'fixtures');
+const fixtures = readdirSync(fixturesPath);
 
 describe('fixtures', () => {
   for (const input of fixtures) {
@@ -22,13 +21,10 @@ describe('fixtures', () => {
     it(`Generate ${input}`, async () => {
       expect(typeof input).toBe('string');
       expect(typeof output).toBe('string');
-
-      const inputContents = fs.readFileSync(path.join(fixturesPath, input), 'utf8');
-      const outputContents = fs.readFileSync(path.join(fixturesPath, output), 'utf8');
-
+      const inputContents = readFileSync(join(fixturesPath, input), 'utf8');
+      const outputContents = readFileSync(join(fixturesPath, output), 'utf8');
       expect(typeof inputContents).toBe('string');
       expect(typeof outputContents).toBe('string');
-
       const expected = generate(JSON.parse(inputContents));
       expect(expected.trim()).toBe(outputContents.trim());
     });
diff --git a/packages/insomnia-testing/src/generate/index.js b/packages/insomnia-testing/src/generate/generate.ts
similarity index 57%
rename from packages/insomnia-testing/src/generate/index.js
rename to packages/insomnia-testing/src/generate/generate.ts
index cd77c42de5..0f4d57e39c 100644
--- a/packages/insomnia-testing/src/generate/index.js
+++ b/packages/insomnia-testing/src/generate/generate.ts
@@ -1,40 +1,41 @@
-// @flow
-
 import { escapeJsStr, indent } from './util';
-import fs from 'fs';
+import { writeFile } from 'fs';
 
-export type Test = {
-  name: string,
-  code: string,
-  defaultRequestId: string | null,
-};
+export interface Test {
+  name: string
+  code: string
+  defaultRequestId: string | null
+}
 
-export type TestSuite = {
-  name: string,
-  suites: Array<TestSuite>,
-  tests?: Array<Test>,
-};
+export interface TestSuite {
+  name: string
+  suites: TestSuite[]
+  tests?: Test[]
+}
 
-export function generate(suites: Array<TestSuite>): string {
-  const lines = [];
-
-  lines.push(`const { expect } = chai;`);
-  lines.push('');
-  lines.push('// Clear active request before test starts (will be set inside test)');
-  lines.push(`beforeEach(() => insomnia.clearActiveRequest());`);
-  lines.push('');
+export const generate = (suites: TestSuite[]) => {
+  const lines = [
+    'const { expect } = chai;',
+    '',
+    '// Clear active request before test starts (will be set inside test)',
+    'beforeEach(() => insomnia.clearActiveRequest());',
+    '',
+  ];
 
   for (const s of suites || []) {
     lines.push(...generateSuiteLines(0, s));
   }
 
   return lines.join('\n');
-}
+};
 
-export async function generateToFile(filepath: string, suites: Array<TestSuite>): Promise<void> {
-  return new Promise((resolve, reject) => {
+export const generateToFile = async (
+  filepath: string,
+  suites: TestSuite[],
+) => {
+  return new Promise<void>((resolve, reject) => {
     const js = generate(suites);
-    return fs.writeFile(filepath, js, err => {
+    return writeFile(filepath, js, err => {
       if (err) {
         reject(err);
       } else {
@@ -42,17 +43,20 @@ export async function generateToFile(filepath: string, suites: Array<TestSuite>)
       }
     });
   });
-}
+};
 
-function generateSuiteLines(n: number, suite: ?TestSuite): Array<string> {
+const generateSuiteLines = (
+  n: number,
+  suite?: TestSuite | null,
+) => {
   if (!suite) {
     return [];
   }
 
-  const lines = [];
+  const lines: string[] = [];
   lines.push(indent(n, `describe('${escapeJsStr(suite.name)}', () => {`));
-
   const suites = suite.suites || [];
+
   for (let i = 0; i < suites.length; i++) {
     if (i !== 0) {
       lines.push('');
@@ -62,6 +66,7 @@ function generateSuiteLines(n: number, suite: ?TestSuite): Array<string> {
   }
 
   const tests = suite.tests || [];
+
   for (let i = 0; i < tests.length; i++) {
     // Add blank like if
     // - it's the first test
@@ -73,32 +78,34 @@ function generateSuiteLines(n: number, suite: ?TestSuite): Array<string> {
     lines.push(...generateTestLines(n + 1, tests[i]));
   }
 
-  lines.push(indent(n, `});`));
+  lines.push(indent(n, '});'));
   return lines;
-}
+};
 
-function generateTestLines(n: number, test: ?Test): Array<string> {
+const generateTestLines = (n: number, test?: Test | null) => {
   if (!test) {
     return [];
   }
 
-  const lines = [];
+  const lines: string[] = [];
 
   // Define test it() block (all test cases are async by default)
   lines.push(indent(n, `it('${escapeJsStr(test.name)}', async () => {`));
 
   // Add helper variables that are necessary
   const { defaultRequestId } = test;
+
   if (typeof defaultRequestId === 'string') {
     lines.push(indent(n, '// Set active request on global insomnia object'));
-    lines.push(indent(n, `insomnia.setActiveRequestId('${defaultRequestId}');`));
+    lines.push(
+      indent(n, `insomnia.setActiveRequestId('${defaultRequestId}');`),
+    );
   }
 
   // Add user-defined test source
   test.code && lines.push(indent(n + 1, test.code));
 
   // Close the it() block
-  lines.push(indent(n, `});`));
-
+  lines.push(indent(n, '});'));
   return lines;
-}
+};
diff --git a/packages/insomnia-testing/src/generate/index.ts b/packages/insomnia-testing/src/generate/index.ts
new file mode 100644
index 0000000000..d674df71dd
--- /dev/null
+++ b/packages/insomnia-testing/src/generate/index.ts
@@ -0,0 +1,6 @@
+export {
+  Test,
+  TestSuite,
+  generate,
+  generateToFile,
+} from './generate';
diff --git a/packages/insomnia-testing/src/generate/__tests__/util.test.js b/packages/insomnia-testing/src/generate/util.test.ts
similarity index 68%
rename from packages/insomnia-testing/src/generate/__tests__/util.test.js
rename to packages/insomnia-testing/src/generate/util.test.ts
index ab0a45fc86..aa30b9f5bb 100644
--- a/packages/insomnia-testing/src/generate/__tests__/util.test.js
+++ b/packages/insomnia-testing/src/generate/util.test.ts
@@ -1,6 +1,4 @@
-// @flow
-
-import { escapeJsStr, indent } from '../util';
+import { escapeJsStr, indent } from './util';
 
 describe('util', () => {
   describe('indent()', () => {
@@ -15,8 +13,10 @@ describe('util', () => {
     });
 
     it('indents multi-line blocks', () => {
-      const text = `function greet() {\n  console.log('Hello World!');\n}`;
-      expect(indent(1, text)).toBe(`  function greet() {\n    console.log('Hello World!');\n  }`);
+      const text = 'function greet() {\n  console.log(\'Hello World!\');\n}';
+      expect(indent(1, text)).toBe(
+        '  function greet() {\n    console.log(\'Hello World!\');\n  }',
+      );
     });
   });
 
@@ -24,7 +24,9 @@ describe('util', () => {
     it('does not escape something without quotes', () => {
       expect(escapeJsStr('Hello World')).toBe('Hello World');
     });
+
     it('escapes something with quotes', () => {
+      // eslint-disable-next-line @typescript-eslint/quotes -- want to test both quote styles
       expect(escapeJsStr(`"Hello" 'World'`)).toBe(`"Hello" \\'World\\'`);
     });
   });
diff --git a/packages/insomnia-testing/src/generate/util.js b/packages/insomnia-testing/src/generate/util.ts
similarity index 50%
rename from packages/insomnia-testing/src/generate/util.js
rename to packages/insomnia-testing/src/generate/util.ts
index 8dd0ac75f7..45733eb9bf 100644
--- a/packages/insomnia-testing/src/generate/util.js
+++ b/packages/insomnia-testing/src/generate/util.ts
@@ -1,10 +1,8 @@
-// @flow
+export const escapeJsStr = (s: string) => {
+  return s.replace(/'/g, '\\\'');
+};
 
-export function escapeJsStr(s: string): string {
-  return s.replace(/'/g, `\\'`);
-}
-
-export function indent(level: number, code: string, tab: string = '  '): string {
+export const indent = (level: number, code: string) => {
   if (!level || level < 0) {
     return code;
   }
@@ -14,4 +12,4 @@ export function indent(level: number, code: string, tab: string = '  '): string
     .split('\n')
     .map(line => prefix + line)
     .join('\n');
-}
+};
diff --git a/packages/insomnia-testing/src/index.ts b/packages/insomnia-testing/src/index.ts
new file mode 100644
index 0000000000..7ae5eb02d8
--- /dev/null
+++ b/packages/insomnia-testing/src/index.ts
@@ -0,0 +1,12 @@
+export {
+  Test,
+  TestSuite,
+  generate,
+  generateToFile,
+} from './generate';
+
+export {
+  runTests,
+  runTestsCli,
+  TestResults,
+} from './run';
diff --git a/packages/insomnia-testing/src/__tests__/integration.test.js b/packages/insomnia-testing/src/integration/integration.test.ts
similarity index 76%
rename from packages/insomnia-testing/src/__tests__/integration.test.js
rename to packages/insomnia-testing/src/integration/integration.test.ts
index ca5c8c47a3..bded97cd59 100644
--- a/packages/insomnia-testing/src/__tests__/integration.test.js
+++ b/packages/insomnia-testing/src/integration/integration.test.ts
@@ -1,20 +1,23 @@
-// @flow
-import axios from 'axios';
 import { generate } from '../generate';
 import { runTests } from '../run';
+import _axios from 'axios';
+import { AxiosMock } from '../__mocks__/axios';
+
+const axios = _axios as AxiosMock;
 
 jest.mock('axios');
 
 describe('integration', () => {
   it('generates and runs basic tests', async () => {
-    const testSrc = await generate([
+    const testSrc = generate([
       {
         name: 'Example TestSuite',
         suites: [],
         tests: [
           {
             name: 'should return -1 when the value is not present',
-            code: 'expect([1, 2, 3].indexOf(4)).to.equal(-1);\nexpect(true).to.equal(true);',
+            code:
+              'expect([1, 2, 3].indexOf(4)).to.equal(-1);\nexpect(true).to.equal(true);',
             defaultRequestId: null,
           },
           {
@@ -25,23 +28,22 @@ describe('integration', () => {
         ],
       },
     ]);
-
     const { stats } = await runTests(testSrc);
-
     expect(stats.tests).toBe(2);
     expect(stats.failures).toBe(0);
     expect(stats.passes).toBe(2);
   });
 
   it('generates and runs more than once', async () => {
-    const testSrc = await generate([
+    const testSrc = generate([
       {
         name: 'Example TestSuite',
         suites: [],
         tests: [
           {
             name: 'should return -1 when the value is not present',
-            code: 'expect([1, 2, 3].indexOf(4)).to.equal(-1);\nexpect(true).to.be.true;',
+            code:
+              'expect([1, 2, 3].indexOf(4)).to.equal(-1);\nexpect(true).to.be.true;',
             defaultRequestId: null,
           },
           {
@@ -52,13 +54,11 @@ describe('integration', () => {
         ],
       },
     ]);
-
     const { stats, failures } = await runTests(testSrc);
     expect(failures).toEqual([]);
     expect(stats.tests).toBe(2);
     expect(stats.failures).toBe(0);
     expect(stats.passes).toBe(2);
-
     const { stats: stats2 } = await runTests(testSrc);
     expect(failures).toEqual([]);
     expect(stats2.tests).toBe(2);
@@ -67,14 +67,15 @@ describe('integration', () => {
   });
 
   it('generates and runs more than once', async () => {
-    const testSrc = await generate([
+    const testSrc = generate([
       {
         name: 'Example TestSuite',
         suites: [],
         tests: [
           {
             name: 'should return -1 when the value is not present',
-            code: 'expect([1, 2, 3].indexOf(4)).to.equal(-1);\nexpect(true).to.be.true;',
+            code:
+              'expect([1, 2, 3].indexOf(4)).to.equal(-1);\nexpect(true).to.be.true;',
             defaultRequestId: null,
           },
           {
@@ -85,13 +86,11 @@ describe('integration', () => {
         ],
       },
     ]);
-
     const { stats, failures } = await runTests(testSrc);
     expect(failures).toEqual([]);
     expect(stats.tests).toBe(2);
     expect(stats.failures).toBe(0);
     expect(stats.passes).toBe(2);
-
     const { stats: stats2, failures: failures2 } = await runTests(testSrc);
     expect(failures2).toEqual([]);
     expect(stats2.tests).toBe(2);
@@ -102,16 +101,27 @@ describe('integration', () => {
   it('sends an HTTP request', async () => {
     axios.__setResponse('GET', '200.insomnia.rest', {
       status: 200,
-      headers: { 'content-type': 'application/json' },
-      data: { foo: 'bar' },
+      headers: {
+        'content-type': 'application/json',
+      },
+      data: {
+        foo: 'bar',
+      },
+      statusText: '',
+      config: {},
     });
 
     axios.__setResponse('GET', '301.insomnia.rest', {
       status: 301,
-      headers: { location: '/blog' },
+      headers: {
+        location: '/blog',
+      },
+      data: undefined,
+      statusText: '',
+      config: {},
     });
 
-    const testSrc = await generate([
+    const testSrc = generate([
       {
         name: 'Example TestSuite',
         suites: [],
@@ -120,16 +130,16 @@ describe('integration', () => {
             name: 'Tests referencing request by ID',
             defaultRequestId: null,
             code: [
-              `const resp = await insomnia.send('req_123');`,
-              `expect(resp.status).to.equal(301);`,
+              'const resp = await insomnia.send(\'req_123\');',
+              'expect(resp.status).to.equal(301);',
             ].join('\n'),
           },
           {
             name: 'Tests referencing default request',
             defaultRequestId: 'req_123',
             code: [
-              `const resp = await insomnia.send();`,
-              `expect(resp.status).to.equal(301);`,
+              'const resp = await insomnia.send();',
+              'expect(resp.status).to.equal(301);',
             ].join('\n'),
           },
         ],
diff --git a/packages/insomnia-testing/src/run/entities.ts b/packages/insomnia-testing/src/run/entities.ts
new file mode 100644
index 0000000000..f52de6bcca
--- /dev/null
+++ b/packages/insomnia-testing/src/run/entities.ts
@@ -0,0 +1,32 @@
+import { Stats } from 'mocha';
+
+interface TestErr {
+  generatedMessage: boolean;
+  name: string;
+  code: string;
+  actual: string;
+  expected: string;
+  operator: string;
+}
+
+interface NodeErr {
+  message: string;
+  stack: string;
+}
+
+export interface TestResult {
+  title: string;
+  fullTitle: string;
+  file?: string;
+  duration?: number;
+  currentRetry: number;
+  err: TestErr | NodeErr | {};
+}
+
+export interface TestResults {
+  failures: TestResult[];
+  passes: TestResult[];
+  pending: TestResult[];
+  stats: Stats;
+  tests: TestResult[];
+}
diff --git a/packages/insomnia-testing/src/run/index.js b/packages/insomnia-testing/src/run/index.js
deleted file mode 100644
index 9f7539838e..0000000000
--- a/packages/insomnia-testing/src/run/index.js
+++ /dev/null
@@ -1,144 +0,0 @@
-// @flow
-
-import Mocha from 'mocha';
-import chai from 'chai';
-import os from 'os';
-import fs from 'fs';
-import mkdirp from 'mkdirp';
-import path from 'path';
-import { JavaScriptReporter } from './java-script-reporter';
-import type { InsomniaOptions } from './insomnia';
-import Insomnia from './insomnia';
-
-type TestErr = {
-  generatedMessage: boolean,
-  name: string,
-  code: string,
-  actual: string,
-  expected: string,
-  operator: string,
-};
-
-type NodeErr = {
-  message: string,
-  stack: string,
-};
-
-type TestResult = {
-  title: string,
-  fullTitle: string,
-  file: string,
-  duration: number,
-  currentRetry: number,
-  err: TestErr | NodeErr | {},
-};
-
-export type TestResults = {
-  stats: {
-    suites: number,
-    tests: number,
-    passes: number,
-    pending: number,
-    failures: number,
-    start: Date,
-    end: Date,
-    duration: number,
-  },
-  tests: Array<TestResult>,
-  pending: Array<TestResult>,
-  failures: Array<TestResult>,
-  passes: Array<TestResult>,
-};
-
-type Reporter = 'dot' | 'list' | 'spec' | 'min' | 'progress';
-
-async function runInternal<T>(
-  testSrc: string | Array<string>,
-  options: InsomniaOptions,
-  reporter: Reporter | Function,
-  extractResult: (runner: Object) => T,
-): Promise<T> {
-  return new Promise((resolve, reject) => {
-    const { bail, keepFile, testFilter } = options;
-    // Add global `insomnia` helper.
-    // This is the only way to add new globals to the Mocha environment as far
-    // as I can tell
-    global.insomnia = new Insomnia(options);
-    global.chai = chai;
-
-    const mocha = new Mocha({
-      timeout: 5000,
-      global: ['insomnia', 'chai'],
-      bail,
-      reporter,
-      fgrep: testFilter,
-    });
-
-    const sources = Array.isArray(testSrc) ? testSrc : [testSrc];
-    for (const src of sources) {
-      mocha.addFile(writeTempFile(src));
-    }
-
-    try {
-      const runner = mocha.run(() => {
-        resolve(extractResult(runner));
-
-        // Remove global since we don't need it anymore
-        delete global.insomnia;
-        delete global.chai;
-
-        if (keepFile && mocha.files.length) {
-          console.log(`Test files: ${JSON.stringify(mocha.files)}.`);
-          return;
-        }
-
-        // Clean up temp files
-        for (const f of mocha.files) {
-          fs.unlink(f, err => {
-            if (err) {
-              console.log('Failed to clean up test file', f, err);
-            }
-          });
-        }
-      });
-    } catch (err) {
-      reject(err);
-    }
-  });
-}
-
-/**
- * Copy test to tmp dir and return the file path
- * @param src - source code to write to file
- */
-function writeTempFile(src: string): string {
-  const root = path.join(os.tmpdir(), 'insomnia-testing');
-  mkdirp.sync(root);
-  const p = path.join(root, `${Math.random()}-test.js`);
-  fs.writeFileSync(p, src);
-  return p;
-}
-
-type CliOptions = InsomniaOptions & {
-  reporter?: Reporter,
-};
-
-/**
- * Run a test file using Mocha
- */
-export async function runTestsCli(
-  testSrc: string | Array<string>,
-  { reporter, ...options }: CliOptions = {},
-): Promise<boolean> {
-  return await runInternal(testSrc, options, reporter, runner => !runner.stats.failures);
-}
-
-/**
- * Run a test file using Mocha and returns JS results
- */
-export async function runTests(
-  testSrc: string | Array<string>,
-  options: InsomniaOptions = {},
-): Promise<TestResults> {
-  return await runInternal(testSrc, options, JavaScriptReporter, runner => runner.testResults);
-}
diff --git a/packages/insomnia-testing/src/run/index.ts b/packages/insomnia-testing/src/run/index.ts
new file mode 100644
index 0000000000..a8fdceb23d
--- /dev/null
+++ b/packages/insomnia-testing/src/run/index.ts
@@ -0,0 +1,8 @@
+export {
+  runTests,
+  runTestsCli,
+} from './run';
+
+export {
+  TestResults,
+} from './entities';
diff --git a/packages/insomnia-testing/src/run/insomnia.js b/packages/insomnia-testing/src/run/insomnia.js
deleted file mode 100644
index 298226ff3b..0000000000
--- a/packages/insomnia-testing/src/run/insomnia.js
+++ /dev/null
@@ -1,120 +0,0 @@
-// @flow
-import axios from 'axios';
-
-export type Request = {
-  _id: string,
-  url?: string,
-  method?: string,
-  body?: {
-    text?: string,
-  },
-  headers?: Array<{
-    name: string,
-    value: string,
-    description?: string,
-    disabled?: boolean,
-  }>,
-};
-
-export type Response = {
-  status: number,
-  statusText: string,
-  data: Object,
-  headers: {
-    [string]: string,
-  },
-};
-
-type SendRequestCallback = (requestId: string) => Promise<$Shape<Response>>;
-
-export type InsomniaOptions = {
-  requests?: Array<$Shape<Request>>,
-  sendRequest?: SendRequestCallback,
-  bail?: boolean,
-  keepFile?: boolean,
-  testFilter?: string,
-};
-
-/**
- * An instance of Insomnia will be exposed as a global variable during
- * tests, and will provide a bunch of utility functions for sending
- * requests, etc.
- */
-export default class Insomnia {
-  requests: Array<$Shape<Request>>;
-  activeRequestId: string | null;
-  activeEnvironmentId: string | null;
-  sendRequest: SendRequestCallback | null;
-
-  constructor(options: InsomniaOptions = {}) {
-    this.requests = options.requests || [];
-    this.sendRequest = options.sendRequest || null;
-
-    // Things that are set per test
-    this.activeRequestId = null;
-  }
-
-  setActiveRequestId(id: string): void {
-    this.activeRequestId = id;
-  }
-
-  clearActiveRequest(): void {
-    this.activeRequestId = null;
-  }
-
-  /**
-   *
-   * @param reqId - request ID to send. Specifying nothing will send the active request
-   * @returns {Promise<{headers: *, data: *, statusText: (string|string), status: *}>}
-   */
-  async send(reqId: string | null = null): Promise<Response> {
-    // Default to active request if nothing is specified
-    reqId = reqId || this.activeRequestId;
-
-    const { sendRequest } = this;
-    if (typeof sendRequest === 'function' && typeof reqId === 'string') {
-      return sendRequest(reqId);
-    }
-
-    const req = this.requests.find(r => r._id === reqId);
-
-    if (!req) {
-      throw new Error('Request not provided to test');
-    }
-
-    const axiosHeaders = {};
-    for (const h of req.headers || []) {
-      if (h.disabled) {
-        continue;
-      }
-
-      axiosHeaders[h.name] = h.value;
-    }
-
-    const options = {
-      url: req.url || '',
-      method: req.method || 'GET',
-      data: req.body ? req.body.text : null,
-      headers: axiosHeaders,
-
-      // Don't follow redirects,
-      maxRedirects: 0,
-
-      // Don't throw errors on status != 200
-      validateStatus: () => true,
-
-      // Force NodeJS adapter or Electron will default to XMLHttpRequest
-      adapter: require('axios/lib/adapters/http'),
-    };
-
-    const resp = await axios.request(options);
-    console.log('[tests] Received response', { response: resp });
-
-    return {
-      status: resp.status,
-      statusText: resp.statusText,
-      data: resp.data,
-      headers: resp.headers,
-    };
-  }
-}
diff --git a/packages/insomnia-testing/src/run/insomnia.ts b/packages/insomnia-testing/src/run/insomnia.ts
new file mode 100644
index 0000000000..0ff135f218
--- /dev/null
+++ b/packages/insomnia-testing/src/run/insomnia.ts
@@ -0,0 +1,124 @@
+import axios, { Method } from 'axios';
+
+// @ts-expect-error we're pulling straight out of the lib here in a way that is not intended, but axios does not directly expose this adapter
+import httpAdapter from 'axios/lib/adapters/http';
+
+export interface Request {
+  _id: string;
+  url?: string;
+  method?: string;
+  body?: {
+    text?: string;
+  };
+  headers?: {
+    name: string;
+    value: string;
+    description?: string;
+    disabled?: boolean;
+  }[];
+}
+
+export interface Response {
+  status: number;
+  statusText: string;
+  data: {
+    [key: string]: unknown;
+  };
+  headers: {
+    [key: string]: string;
+  };
+}
+
+export type SendRequestCallback = (requestId: string) => Promise<Response>;
+
+export interface InsomniaOptions {
+  requests?: Request[];
+  sendRequest?: SendRequestCallback;
+  bail?: boolean;
+  keepFile?: boolean;
+  testFilter?: string;
+}
+
+/**
+ * An instance of Insomnia will be exposed as a global variable during
+ * tests, and will provide a bunch of utility functions for sending
+ * requests, etc.
+ */
+export default class Insomnia {
+  requests: Request[];
+  activeRequestId: string | null;
+  activeEnvironmentId: string | null = null;
+  sendRequest: SendRequestCallback | null;
+
+  constructor(options: InsomniaOptions = {}) {
+    this.requests = options.requests || [];
+    this.sendRequest = options.sendRequest || null; // Things that are set per test
+
+    this.activeRequestId = null;
+  }
+
+  setActiveRequestId(id: string): void {
+    this.activeRequestId = id;
+  }
+
+  clearActiveRequest(): void {
+    this.activeRequestId = null;
+  }
+
+  /**
+   *
+   * @param reqId - request ID to send. Specifying nothing will send the active request
+   * @returns {Promise<{headers: *, data: *, statusText: (string|string), status: *}>}
+   */
+  async send(reqId: string | null = null): Promise<Response> {
+    // Default to active request if nothing is specified
+    reqId = reqId || this.activeRequestId;
+    const { sendRequest } = this;
+
+    if (typeof sendRequest === 'function' && typeof reqId === 'string') {
+      return sendRequest(reqId);
+    }
+
+    const request = this.requests.find(request => request._id === reqId);
+
+    if (!request) {
+      throw new Error('Request not provided to test');
+    }
+
+    const { headers, url = '', method, body } = request;
+
+    const axiosHeaders = headers?.reduce((accumulator, { disabled, name, value }) => {
+      return {
+        ...accumulator,
+        ...(disabled ? {} : { [name]: value }),
+      };
+    });
+
+    const response = await axios.request({
+      url,
+      method: (method as Method) || 'GET',
+      data: body?.text,
+      headers: axiosHeaders,
+
+      // Don't follow redirects,
+      maxRedirects: 0,
+
+      // Don't throw errors on status != 200
+      validateStatus: () => true,
+
+      // Force NodeJS adapter or Electron will default to XMLHttpRequest
+      adapter: httpAdapter,
+    });
+
+    console.log('[tests] Received response', {
+      response: response,
+    });
+
+    return {
+      status: response.status,
+      statusText: response.statusText,
+      data: response.data,
+      headers: response.headers,
+    };
+  }
+}
diff --git a/packages/insomnia-testing/src/run/java-script-reporter.js b/packages/insomnia-testing/src/run/java-script-reporter.js
deleted file mode 100644
index b44c0cb8f4..0000000000
--- a/packages/insomnia-testing/src/run/java-script-reporter.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * NOTE: This is a straight copy of the default Mocha JSON reporter, except
- * stdout logging is removed.
- *
- * https://github.com/mochajs/mocha/blob/9d4a8ec2d22ee154aecb1f8eeb25af8e6309faa8/lib/reporters/json.js
- */
-import Mocha from 'mocha';
-
-export function JavaScriptReporter(runner, options) {
-  Mocha.reporters.Base.call(this, runner, options);
-
-  const self = this;
-  const tests = [];
-  const pending = [];
-  const failures = [];
-  const passes = [];
-
-  runner.on(Mocha.Runner.constants.EVENT_TEST_END, function(test) {
-    tests.push(test);
-  });
-
-  runner.on(Mocha.Runner.constants.EVENT_TEST_PASS, function(test) {
-    passes.push(test);
-  });
-
-  runner.on(Mocha.Runner.constants.EVENT_TEST_FAIL, function(test) {
-    failures.push(test);
-  });
-
-  runner.on(Mocha.Runner.constants.EVENT_TEST_PENDING, function(test) {
-    pending.push(test);
-  });
-
-  runner.once(Mocha.Runner.constants.EVENT_RUN_END, function() {
-    runner.testResults = {
-      stats: self.stats,
-      tests: tests.map(clean),
-      pending: pending.map(clean),
-      failures: failures.map(clean),
-      passes: passes.map(clean),
-    };
-
-    // This is the main change from the original JSONReporter
-    // process.stdout.write(JSON.stringify(obj, null, 2));
-  });
-}
-
-/**
- * Return a plain-object representation of `test`
- * free of cyclic properties etc.
- *
- * @private
- * @param {Object} test
- * @return {Object}
- */
-function clean(test) {
-  let err = test.err || {};
-  if (err instanceof Error) {
-    err = errorJSON(err);
-  }
-
-  return {
-    title: test.title,
-    fullTitle: test.fullTitle(),
-    file: test.file,
-    duration: test.duration,
-    currentRetry: test.currentRetry(),
-    err: cleanCycles(err),
-  };
-}
-
-/**
- * Replaces any circular references inside `obj` with '[object Object]'
- *
- * @private
- * @param {Object} obj
- * @return {Object}
- */
-function cleanCycles(obj) {
-  const cache = [];
-  return JSON.parse(
-    JSON.stringify(obj, function(key, value) {
-      if (typeof value === 'object' && value !== null) {
-        if (cache.indexOf(value) !== -1) {
-          // Instead of going in a circle, we'll print [object Object]
-          return '' + value;
-        }
-        cache.push(value);
-      }
-
-      return value;
-    }),
-  );
-}
-
-/**
- * Transform an Error object into a JSON object.
- *
- * @private
- * @param {Error} err
- * @return {Object}
- */
-function errorJSON(err) {
-  const res = {};
-  Object.getOwnPropertyNames(err).forEach(function(key) {
-    res[key] = err[key];
-  }, err);
-  return res;
-}
-
-JavaScriptReporter.description = 'single JS object';
diff --git a/packages/insomnia-testing/src/run/javascript-reporter.ts b/packages/insomnia-testing/src/run/javascript-reporter.ts
new file mode 100644
index 0000000000..bca7a8c382
--- /dev/null
+++ b/packages/insomnia-testing/src/run/javascript-reporter.ts
@@ -0,0 +1,105 @@
+/**
+ * NOTE: This is a straight copy of the default Mocha JSON reporter, except stdout logging is removed.
+ *
+ * https://github.com/mochajs/mocha/blob/9d4a8ec2d22ee154aecb1f8eeb25af8e6309faa8/lib/reporters/json.js
+ */
+import Mocha, { MochaOptions, Runner, Test, reporters, Runnable } from 'mocha';
+import { TestResult, TestResults } from './entities';
+
+export class JavaScriptReporter extends reporters.Base {
+  description = 'single JS object';
+
+  constructor(runner: Runner & { testResults?: TestResults }, options: MochaOptions) {
+    super(runner, options);
+
+    Mocha.reporters.Base.call(this, runner, options);
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    const self = this;
+    const tests: Test[] = [];
+    const pending: Test[] = [];
+    const failures: Test[] = [];
+    const passes: Test[] = [];
+
+    runner.on(Mocha.Runner.constants.EVENT_TEST_END, test => {
+      tests.push(test);
+    });
+
+    runner.on(Mocha.Runner.constants.EVENT_TEST_PASS, test => {
+      passes.push(test);
+    });
+
+    runner.on(Mocha.Runner.constants.EVENT_TEST_FAIL, test => {
+      failures.push(test);
+    });
+
+    runner.on(Mocha.Runner.constants.EVENT_TEST_PENDING, test => {
+      pending.push(test);
+    });
+
+    runner.once(Mocha.Runner.constants.EVENT_RUN_END, () => {
+      runner.testResults = {
+        stats: self.stats,
+        tests: tests.map(clean),
+        pending: pending.map(clean),
+        failures: failures.map(clean),
+        passes: passes.map(clean),
+      };
+      // This is the main change from the original JSONReporter
+      // process.stdout.write(JSON.stringify(obj, null, 2));
+    });
+  }
+}
+
+/**
+ * Return a plain-object representation of `test` free of cyclic properties etc.
+ */
+const clean = (runnable: Runnable): TestResult => {
+  // @ts-expect-error this is what the source code originally had in mocha so I am not changing it
+  let err = runnable.err || {};
+  if (err instanceof Error) {
+    err = errorJSON(err);
+  }
+
+  return {
+    title: runnable.title,
+    fullTitle: runnable.fullTitle(),
+    file: runnable.file,
+    duration: runnable.duration,
+    // @ts-expect-error this is what the source code originally had in mocha so I am not changing it
+    currentRetry: runnable.currentRetry(),
+    err: cleanCycles(err),
+  };
+};
+
+/**
+ * Replaces any circular references inside `obj` with '[object Object]'
+ */
+const cleanCycles = (obj: Error) => {
+  const cache: JSON[] = [];
+  return JSON.parse(
+    JSON.stringify(obj, (_, value) => {
+      if (typeof value === 'object' && value !== null) {
+        if (cache.indexOf(value) !== -1) {
+          // Instead of going in a circle, we'll print [object Object]
+          return '' + value;
+        }
+
+        cache.push(value);
+      }
+
+      return value;
+    }),
+  );
+};
+
+/**
+ * Transform an Error object into a JSON object.
+ */
+const errorJSON = (error: Error) => {
+  return (Object.getOwnPropertyNames(error) as (keyof Error)[]).reduce((accumulator, key) => {
+    return {
+      ...accumulator,
+      [key]: error[key],
+    };
+  }, {});
+};
diff --git a/packages/insomnia-testing/src/run/__tests__/index.test.js b/packages/insomnia-testing/src/run/run.test.ts
similarity index 76%
rename from packages/insomnia-testing/src/run/__tests__/index.test.js
rename to packages/insomnia-testing/src/run/run.test.ts
index f14a679ce9..f302482b04 100644
--- a/packages/insomnia-testing/src/run/__tests__/index.test.js
+++ b/packages/insomnia-testing/src/run/run.test.ts
@@ -1,7 +1,6 @@
-// @flow
-
-import type { TestResults } from '../index';
-import { runTests } from '../index';
+import { runTests } from './run';
+import { TestResults } from './entities';
+import { SendRequestCallback } from './insomnia';
 
 const exampleTest = `
 const { expect } = chai;
@@ -50,17 +49,29 @@ describe('run', () => {
   });
 
   it('calls sendRequest() callback', async () => {
-    const sendRequest = jest.fn(() => Promise.resolve({ status: 200 }));
-    const { stats }: TestResults = await runTests(exampleTestWithRequest, {
-      requests: [{ _id: 'req_123' }],
-      sendRequest,
-    });
+    const sendRequest = jest.fn(() =>
+      Promise.resolve({
+        status: 200,
+      }),
+    ) as unknown as SendRequestCallback;
+    const { stats }: TestResults = await runTests(
+      exampleTestWithRequest,
+      {
+        requests: [
+          {
+            _id: 'req_123',
+          },
+        ],
+        sendRequest,
+      },
+    );
     expect(sendRequest).toHaveBeenCalledWith('req_123');
     expect(stats.passes).toBe(1);
   });
 
   it('throws on invalid JavaScript', async () => {
     let err;
+
     try {
       await runTests('this is invalid');
     } catch (e) {
diff --git a/packages/insomnia-testing/src/run/run.ts b/packages/insomnia-testing/src/run/run.ts
new file mode 100644
index 0000000000..3af21be934
--- /dev/null
+++ b/packages/insomnia-testing/src/run/run.ts
@@ -0,0 +1,113 @@
+import Mocha, { Reporter, ReporterConstructor } from 'mocha';
+import chai from 'chai';
+import { tmpdir } from 'os';
+import { writeFileSync, unlink } from 'fs';
+import { sync } from 'mkdirp';
+import { join } from 'path';
+import { JavaScriptReporter } from './javascript-reporter';
+import Insomnia, { InsomniaOptions } from './insomnia';
+
+declare global {
+  namespace NodeJS {
+    interface Global {
+      insomnia?: Insomnia;
+      chai?: typeof chai;
+    }
+  }
+}
+
+const runInternal = async <T>(
+  testSrc: string | string[],
+  options: InsomniaOptions,
+  reporter: Reporter | ReporterConstructor = 'spec',
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- type not available, and postponing anyway until the impending move to all jest (and no mocha)
+  extractResult: (runner: { [key: string]: any }) => T,
+): Promise<T> => new Promise((resolve, reject) => {
+  const { bail, keepFile, testFilter } = options;
+
+  // Add global `insomnia` helper.
+  // This is the only way to add new globals to the Mocha environment as far as I can tell
+  global.insomnia = new Insomnia(options);
+  global.chai = chai;
+
+  const mocha: Mocha = new Mocha({
+    timeout: 5000,
+    globals: ['insomnia', 'chai'],
+    bail,
+    reporter,
+    // @ts-expect-error https://github.com/DefinitelyTyped/DefinitelyTyped/pull/51770
+    fgrep: testFilter,
+  });
+
+  const sources = Array.isArray(testSrc) ? testSrc : [testSrc];
+  sources.forEach(source => {
+    mocha.addFile(writeTempFile(source));
+  });
+
+  try {
+    const runner = mocha.run(() => {
+      resolve(extractResult(runner));
+
+      // Remove global since we don't need it anymore
+      delete global.insomnia;
+      delete global.chai;
+
+      if (keepFile && mocha.files.length) {
+        console.log(`Test files: ${JSON.stringify(mocha.files)}.`);
+        return;
+      }
+
+      // Clean up temp files
+      mocha.files.forEach(file => {
+        unlink(file, err => {
+          if (err) {
+            console.log('Failed to clean up test file', file, err);
+          }
+        });
+      });
+    });
+  } catch (err) {
+    reject(err);
+  }
+});
+
+/**
+ * Copy test to tmp dir and return the file path
+ */
+const writeTempFile = (sourceCode: string) => {
+  const root = join(tmpdir(), 'insomnia-testing');
+  sync(root);
+  const path = join(root, `${Math.random()}-test.ts`);
+  writeFileSync(path, sourceCode);
+  return path;
+};
+
+type CliOptions = InsomniaOptions & {
+  reporter?: Reporter
+}
+
+/**
+ * Run a test file using Mocha
+ */
+export const runTestsCli = async (
+  testSrc: string | string[],
+  { reporter, ...options }: CliOptions = {},
+) => runInternal(
+  testSrc,
+  options,
+  reporter,
+  runner => !runner.stats.failures,
+);
+
+/**
+ * Run a test file using Mocha and returns JS results
+ */
+export const runTests = async <T>(
+  testSrc: string | string[],
+  options: InsomniaOptions = {},
+) => runInternal<T>(
+  testSrc,
+  options,
+  JavaScriptReporter,
+  runner => runner.testResults,
+);
diff --git a/packages/insomnia-testing/tsconfig.build.json b/packages/insomnia-testing/tsconfig.build.json
new file mode 100644
index 0000000000..74aeb31219
--- /dev/null
+++ b/packages/insomnia-testing/tsconfig.build.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src",
+    "types": ["node"]
+  },
+  "include": [
+    "src"
+  ],
+  "exclude": [
+    "**/fixtures",
+    "**/__mocks__",
+    "**/*.test.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/insomnia-testing/tsconfig.json b/packages/insomnia-testing/tsconfig.json
new file mode 100644
index 0000000000..4778757644
--- /dev/null
+++ b/packages/insomnia-testing/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.build.json",
+  "compilerOptions": {
+    "rootDir": "."
+  },
+  "include": [
+    "src",
+    ".eslintrc.js",
+    "jest.config.js",
+    "webpack.config.js"
+  ],
+  "exclude": [
+    "dist"
+  ]
+}
diff --git a/packages/insomnia-testing/webpack.config.js b/packages/insomnia-testing/webpack.config.js
index cf154d23b4..6a489f9700 100644
--- a/packages/insomnia-testing/webpack.config.js
+++ b/packages/insomnia-testing/webpack.config.js
@@ -1,7 +1,8 @@
 const path = require('path');
 
+/** @type { import('webpack').Configuration } */
 module.exports = {
-  entry: { index: './index.js' },
+  entry: { index: './src/index.ts' },
   target: 'node',
   mode: 'production',
   devtool: 'source-map',
@@ -14,19 +15,21 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.js$/,
-        exclude: /node_modules/,
-        use: {
-          loader: 'babel-loader',
+        test: /\.tsx?$/,
+        loader: 'ts-loader',
+        exclude: [/node_modules/],
+        options: {
+          configFile: 'tsconfig.build.json',
         },
       },
     ],
   },
+  resolve: {
+    extensions: ['.ts', '.js'],
+  },
   externals: [
-    // Don't bundle Mocha because it needs to use require() to
-    // load tests. If it's bundled in the Webpack build, it will
-    // try to use Webpack's require() function and fail to
-    // import the test file because it lives outside the bundle.
+    // Don't bundle Mocha because it needs to use require() to load tests.
+    // If it's bundled in the Webpack build, it will try to use Webpack's require() function and fail to import the test file because it lives outside the bundle.
     'mocha',
   ],
 };
diff --git a/packages/insomnia-url/.eslintignore b/packages/insomnia-url/.eslintignore
new file mode 100644
index 0000000000..53c37a1660
--- /dev/null
+++ b/packages/insomnia-url/.eslintignore
@@ -0,0 +1 @@
+dist
\ No newline at end of file
diff --git a/packages/insomnia-url/.eslintrc.js b/packages/insomnia-url/.eslintrc.js
new file mode 100644
index 0000000000..17427cb1b2
--- /dev/null
+++ b/packages/insomnia-url/.eslintrc.js
@@ -0,0 +1,7 @@
+/** @type { import('eslint').Linter.Config } */
+module.exports = {
+  extends: '../../.eslintrc.js',
+  rules: {
+    '@typescript-eslint/no-use-before-define': 'off', // TSCONVERSION
+  },
+};
diff --git a/packages/insomnia-url/index.js b/packages/insomnia-url/index.js
deleted file mode 100644
index c69e160632..0000000000
--- a/packages/insomnia-url/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const protocol = require('./src/protocol');
-const querystring = require('./src/querystring');
-
-module.exports = {
-  setDefaultProtocol: protocol.setDefaultProtocol,
-  smartEncodeUrl: querystring.smartEncodeUrl,
-  joinUrlAndQueryString: querystring.joinUrlAndQueryString,
-  extractQueryStringFromUrl: querystring.extractQueryStringFromUrl,
-  deconstructQueryStringToParams: querystring.deconstructQueryStringToParams,
-  buildQueryParameter: querystring.buildQueryParameter,
-  buildQueryStringFromParams: querystring.buildQueryStringFromParams,
-};
diff --git a/packages/insomnia-url/jest.config.js b/packages/insomnia-url/jest.config.js
new file mode 100644
index 0000000000..537ce057da
--- /dev/null
+++ b/packages/insomnia-url/jest.config.js
@@ -0,0 +1,17 @@
+/** @type { import('@jest/types').Config.InitialOptions } */
+module.exports = {
+  globals: {
+    'ts-jest': {
+      isolatedModules: true,
+    },
+  },
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+  testRegex: ['.+\\.test\\.ts$'],
+  collectCoverage: false,
+  collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  coverageReporters: ['text-summary', 'lcov'],
+};
diff --git a/packages/insomnia-url/package-lock.json b/packages/insomnia-url/package-lock.json
index da4959e83b..6306c05974 100644
--- a/packages/insomnia-url/package-lock.json
+++ b/packages/insomnia-url/package-lock.json
@@ -2,4 +2,4870 @@
   "name": "insomnia-url",
   "version": "2.2.35",
   "lockfileVersion": 1
+  "requires": true,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.12.13"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.13.11",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.11.tgz",
+      "integrity": "sha512-BwKEkO+2a67DcFeS3RLl0Z3Gs2OvdXewuWjc1Hfokhb5eQWP9YRYH1/+VrVZvql2CfjOiNGqSAFOYt4lsqTHzg==",
+      "dev": true
+    },
+    "@babel/core": {
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.10.tgz",
+      "integrity": "sha512-bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.12.13",
+        "@babel/generator": "^7.13.9",
+        "@babel/helper-compilation-targets": "^7.13.10",
+        "@babel/helper-module-transforms": "^7.13.0",
+        "@babel/helpers": "^7.13.10",
+        "@babel/parser": "^7.13.10",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.0",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.1.2",
+        "lodash": "^4.17.19",
+        "semver": "^6.3.0",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.13.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
+      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.13.0",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz",
+      "integrity": "sha512-/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.13.8",
+        "@babel/helper-validator-option": "^7.12.17",
+        "browserslist": "^4.14.5",
+        "semver": "^6.3.0"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.12.13",
+        "@babel/template": "^7.12.13",
+        "@babel/types": "^7.12.13"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.12.13"
+      }
+    },
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz",
+      "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.13.0"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz",
+      "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.12.13"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz",
+      "integrity": "sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-replace-supers": "^7.13.0",
+        "@babel/helper-simple-access": "^7.12.13",
+        "@babel/helper-split-export-declaration": "^7.12.13",
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.0",
+        "lodash": "^4.17.19"
+      }
+    },
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
+      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.12.13"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+      "dev": true
+    },
+    "@babel/helper-replace-supers": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz",
+      "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.13.0",
+        "@babel/helper-optimise-call-expression": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.0"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz",
+      "integrity": "sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.12.13"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.12.13"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "dev": true
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.12.17",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
+      "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
+      "dev": true
+    },
+    "@babel/helpers": {
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.10.tgz",
+      "integrity": "sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.0"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
+      "integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@babel/parser": {
+      "version": "7.13.11",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.11.tgz",
+      "integrity": "sha512-PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q==",
+      "dev": true
+    },
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      }
+    },
+    "@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz",
+      "integrity": "sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      }
+    },
+    "@babel/template": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.12.13",
+        "@babel/parser": "^7.12.13",
+        "@babel/types": "^7.12.13"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
+      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.12.13",
+        "@babel/generator": "^7.13.0",
+        "@babel/helper-function-name": "^7.12.13",
+        "@babel/helper-split-export-declaration": "^7.12.13",
+        "@babel/parser": "^7.13.0",
+        "@babel/types": "^7.13.0",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.19"
+      }
+    },
+    "@babel/types": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
+      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true
+    },
+    "@cnakazawa/watch": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+      "dev": true,
+      "requires": {
+        "exec-sh": "^0.3.2",
+        "minimist": "^1.2.0"
+      }
+    },
+    "@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      }
+    },
+    "@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true
+    },
+    "@jest/console": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
+      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "slash": "^3.0.0"
+      }
+    },
+    "@jest/core": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
+      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^26.6.2",
+        "@jest/reporters": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-changed-files": "^26.6.2",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-resolve-dependencies": "^26.6.3",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "jest-watcher": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "p-each-series": "^2.1.0",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "@jest/environment": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
+      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
+      "dev": true,
+      "requires": {
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2"
+      }
+    },
+    "@jest/fake-timers": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
+      "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "@sinonjs/fake-timers": "^6.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
+      }
+    },
+    "@jest/globals": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
+      "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "expect": "^26.6.2"
+      }
+    },
+    "@jest/reporters": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
+      "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
+      "dev": true,
+      "requires": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.2.4",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^4.0.3",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.0.2",
+        "jest-haste-map": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "node-notifier": "^8.0.0",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^4.0.1",
+        "terminal-link": "^2.0.0",
+        "v8-to-istanbul": "^7.0.0"
+      }
+    },
+    "@jest/source-map": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
+      "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.4",
+        "source-map": "^0.6.0"
+      }
+    },
+    "@jest/test-result": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
+      "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      }
+    },
+    "@jest/test-sequencer": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
+      "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
+      "dev": true,
+      "requires": {
+        "@jest/test-result": "^26.6.2",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.6.2",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3"
+      }
+    },
+    "@jest/transform": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
+      "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^26.6.2",
+        "babel-plugin-istanbul": "^6.0.0",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-util": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pirates": "^4.0.1",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "^3.0.0"
+      }
+    },
+    "@jest/types": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      }
+    },
+    "@sinonjs/commons": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz",
+      "integrity": "sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==",
+      "dev": true,
+      "requires": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "@sinonjs/fake-timers": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
+      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
+      "dev": true,
+      "requires": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "@types/babel__core": {
+      "version": "7.1.13",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.13.tgz",
+      "integrity": "sha512-CC6amBNND16pTk4K3ZqKIaba6VGKAQs3gMjEY17FVd56oI/ZWt9OhS6riYiWv9s8ENbYUi7p8lgqb0QHQvUKQQ==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "@types/babel__generator": {
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
+      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@types/babel__template": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
+      "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@types/babel__traverse": {
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz",
+      "integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.3.0"
+      }
+    },
+    "@types/graceful-fs": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
+      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/istanbul-lib-coverage": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+      "dev": true
+    },
+    "@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "@types/istanbul-reports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
+      "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "@types/node": {
+      "version": "14.14.35",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.35.tgz",
+      "integrity": "sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==",
+      "dev": true
+    },
+    "@types/normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "dev": true
+    },
+    "@types/prettier": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.2.3.tgz",
+      "integrity": "sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==",
+      "dev": true
+    },
+    "@types/stack-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
+      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+      "dev": true
+    },
+    "@types/yargs": {
+      "version": "15.0.13",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
+      "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==",
+      "dev": true,
+      "requires": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "@types/yargs-parser": {
+      "version": "20.2.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
+      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
+      "dev": true
+    },
+    "abab": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+      "dev": true
+    },
+    "acorn": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.0.tgz",
+      "integrity": "sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==",
+      "dev": true
+    },
+    "acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
+      "requires": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "dev": true
+        }
+      }
+    },
+    "acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.11.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+          "dev": true
+        }
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "dev": true
+    },
+    "babel-jest": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
+      "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
+      "dev": true,
+      "requires": {
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/babel__core": "^7.1.7",
+        "babel-plugin-istanbul": "^6.0.0",
+        "babel-preset-jest": "^26.6.2",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "slash": "^3.0.0"
+      }
+    },
+    "babel-plugin-istanbul": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
+      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^4.0.0",
+        "test-exclude": "^6.0.0"
+      }
+    },
+    "babel-plugin-jest-hoist": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
+      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.0.0",
+        "@types/babel__traverse": "^7.0.6"
+      }
+    },
+    "babel-preset-current-node-syntax": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "dev": true,
+      "requires": {
+        "@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-import-meta": "^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/plugin-syntax-top-level-await": "^7.8.3"
+      }
+    },
+    "babel-preset-jest": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
+      "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-jest-hoist": "^26.6.2",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true
+    },
+    "browserslist": {
+      "version": "4.16.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
+      "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30001181",
+        "colorette": "^1.2.1",
+        "electron-to-chromium": "^1.3.649",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.70"
+      }
+    },
+    "bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "requires": {
+        "fast-json-stable-stringify": "2.x"
+      }
+    },
+    "bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
+      "requires": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001202",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001202.tgz",
+      "integrity": "sha512-ZcijQNqrcF8JNLjzvEiXqX4JUYxoZa7Pvcsd9UD8Kz4TvhTonOSNRsK+qtvpVL4l6+T1Rh4LFtLfnNWg6BGWCQ==",
+      "dev": true
+    },
+    "capture-exit": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+      "dev": true,
+      "requires": {
+        "rsvp": "^4.8.4"
+      }
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true
+    },
+    "ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
+    },
+    "cjs-module-lexer": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
+      "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
+      "dev": true
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
+    "collect-v8-coverage": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+      "dev": true
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "colorette": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "requires": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
+      }
+    },
+    "cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+      "dev": true
+    },
+    "cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "requires": {
+        "cssom": "~0.3.6"
+      },
+      "dependencies": {
+        "cssom": {
+          "version": "0.3.8",
+          "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+          "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+          "dev": true
+        }
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "dev": true,
+      "requires": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      }
+    },
+    "debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decimal.js": {
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
+      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "dev": true
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true
+    },
+    "diff-sequences": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
+      "dev": true
+    },
+    "domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "dev": true,
+      "requires": {
+        "webidl-conversions": "^5.0.0"
+      },
+      "dependencies": {
+        "webidl-conversions": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+          "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+          "dev": true
+        }
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "electron-to-chromium": {
+      "version": "1.3.691",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.691.tgz",
+      "integrity": "sha512-ZqiO69KImmOGCyoH0icQPU3SndJiW93juEvf63gQngyhODO6SpQIPMTOHldtCs5DS5GMKvAkquk230E2zt2vpw==",
+      "dev": true
+    },
+    "emittery": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
+      "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
+      "dev": true
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "escodegen": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "dev": true,
+      "requires": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "exec-sh": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
+      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+      "dev": true
+    },
+    "execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.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"
+      }
+    },
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "expect": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "ansi-styles": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0"
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "fb-watchman": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
+      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+      "dev": true,
+      "requires": {
+        "bser": "2.1.1"
+      }
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "optional": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
+    "get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
+    },
+    "graceful-fs": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+      "dev": true
+    },
+    "growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
+      "dev": true,
+      "optional": true
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "dev": true
+    },
+    "html-encoding-sniffer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "dev": true,
+      "requires": {
+        "whatwg-encoding": "^1.0.5"
+      }
+    },
+    "html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+      "dev": true
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "import-local": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dev": true,
+      "requires": {
+        "ci-info": "^2.0.0"
+      }
+    },
+    "is-core-module": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "is-docker": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
+      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
+      "dev": true,
+      "optional": true
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-potential-custom-element-name": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
+      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-docker": "^2.0.0"
+      }
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "istanbul-lib-coverage": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
+      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "dev": true
+    },
+    "istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
+      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      }
+    },
+    "istanbul-reports": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
+      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+      "dev": true,
+      "requires": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      }
+    },
+    "jest": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
+      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
+      "dev": true,
+      "requires": {
+        "@jest/core": "^26.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^26.6.3"
+      },
+      "dependencies": {
+        "jest-cli": {
+          "version": "26.6.3",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
+          "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
+          "dev": true,
+          "requires": {
+            "@jest/core": "^26.6.3",
+            "@jest/test-result": "^26.6.2",
+            "@jest/types": "^26.6.2",
+            "chalk": "^4.0.0",
+            "exit": "^0.1.2",
+            "graceful-fs": "^4.2.4",
+            "import-local": "^3.0.2",
+            "is-ci": "^2.0.0",
+            "jest-config": "^26.6.3",
+            "jest-util": "^26.6.2",
+            "jest-validate": "^26.6.2",
+            "prompts": "^2.0.1",
+            "yargs": "^15.4.1"
+          }
+        }
+      }
+    },
+    "jest-changed-files": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
+      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "execa": "^4.0.0",
+        "throat": "^5.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "execa": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+          "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^7.0.0",
+            "get-stream": "^5.0.0",
+            "human-signals": "^1.1.1",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.0",
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "is-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+          "dev": true
+        },
+        "npm-run-path": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.0.0"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "jest-config": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^26.6.3",
+        "@jest/types": "^26.6.2",
+        "babel-jest": "^26.6.3",
+        "chalk": "^4.0.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.4",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-jasmine2": "^26.6.3",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2"
+      }
+    },
+    "jest-diff": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      }
+    },
+    "jest-docblock": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
+      "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
+      "dev": true,
+      "requires": {
+        "detect-newline": "^3.0.0"
+      }
+    },
+    "jest-each": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
+      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2"
+      }
+    },
+    "jest-environment-jsdom": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
+      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jsdom": "^16.4.0"
+      }
+    },
+    "jest-environment-node": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
+      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
+      }
+    },
+    "jest-get-type": {
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+      "dev": true
+    },
+    "jest-haste-map": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "fsevents": "^2.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-regex-util": "^26.0.0",
+        "jest-serializer": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7"
+      }
+    },
+    "jest-jasmine2": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
+      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
+      "dev": true,
+      "requires": {
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "expect": "^26.6.2",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2",
+        "throat": "^5.0.0"
+      }
+    },
+    "jest-leak-detector": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
+      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+      "dev": true,
+      "requires": {
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      }
+    },
+    "jest-matcher-utils": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      }
+    },
+    "jest-message-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.2"
+      }
+    },
+    "jest-mock": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
+      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*"
+      }
+    },
+    "jest-pnp-resolver": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+      "dev": true
+    },
+    "jest-regex-util": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+      "dev": true
+    },
+    "jest-resolve": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^26.6.2",
+        "read-pkg-up": "^7.0.1",
+        "resolve": "^1.18.1",
+        "slash": "^3.0.0"
+      }
+    },
+    "jest-resolve-dependencies": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
+      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-snapshot": "^26.6.2"
+      }
+    },
+    "jest-runner": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
+      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.7.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.6.3",
+        "jest-docblock": "^26.0.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-leak-detector": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "source-map-support": "^0.5.6",
+        "throat": "^5.0.0"
+      }
+    },
+    "jest-runtime": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
+      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/globals": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^0.6.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0",
+        "yargs": "^15.4.1"
+      }
+    },
+    "jest-serializer": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "graceful-fs": "^4.2.4"
+      }
+    },
+    "jest-snapshot": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
+      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^26.6.2",
+        "graceful-fs": "^4.2.4",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^26.6.2",
+        "semver": "^7.3.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
+    "jest-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "is-ci": "^2.0.0",
+        "micromatch": "^4.0.2"
+      }
+    },
+    "jest-validate": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
+      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "camelcase": "^6.0.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "leven": "^3.1.0",
+        "pretty-format": "^26.6.2"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+          "dev": true
+        }
+      }
+    },
+    "jest-watcher": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
+      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
+      "dev": true,
+      "requires": {
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "jest-util": "^26.6.2",
+        "string-length": "^4.0.1"
+      }
+    },
+    "jest-worker": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      }
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
+    "jsdom": {
+      "version": "16.5.1",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.5.1.tgz",
+      "integrity": "sha512-pF73EOsJgwZekbDHEY5VO/yKXUkab/DuvrQB/ANVizbr6UAHJsDdHXuotZYwkJSGQl1JM+ivXaqY+XBDDL4TiA==",
+      "dev": true,
+      "requires": {
+        "abab": "^2.0.5",
+        "acorn": "^8.0.5",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.1",
+        "domexception": "^2.0.1",
+        "escodegen": "^2.0.0",
+        "html-encoding-sniffer": "^2.0.1",
+        "is-potential-custom-element-name": "^1.0.0",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "request": "^2.88.2",
+        "request-promise-native": "^1.0.9",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0",
+        "ws": "^7.4.4",
+        "xml-name-validator": "^3.0.0"
+      }
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json5": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true
+    },
+    "kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true
+    },
+    "leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "lines-and-columns": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+      "dev": true
+    },
+    "locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^4.1.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
+    "make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.0.0"
+      }
+    },
+    "make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "dev": true,
+      "requires": {
+        "tmpl": "1.0.x"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.1",
+        "picomatch": "^2.0.5"
+      }
+    },
+    "mime-db": {
+      "version": "1.46.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz",
+      "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.29",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz",
+      "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.46.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "dev": true
+    },
+    "node-modules-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
+      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
+      "dev": true
+    },
+    "node-notifier": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "growly": "^1.3.0",
+        "is-wsl": "^2.2.0",
+        "semver": "^7.3.2",
+        "shellwords": "^0.1.1",
+        "uuid": "^8.3.0",
+        "which": "^2.0.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "node-releases": {
+      "version": "1.1.71",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
+      "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+      "dev": true
+    },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
+      }
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "nwsapi": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+      "dev": true
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^2.1.0"
+      }
+    },
+    "optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      }
+    },
+    "p-each-series": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
+      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
+      "dev": true
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "requires": {
+        "p-limit": "^2.2.0"
+      }
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true
+    },
+    "parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      }
+    },
+    "parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true
+    },
+    "pirates": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
+      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
+      "dev": true,
+      "requires": {
+        "node-modules-regexp": "^1.0.0"
+      }
+    },
+    "pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "requires": {
+        "find-up": "^4.0.0"
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "pretty-format": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^17.0.1"
+      }
+    },
+    "prompts": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz",
+      "integrity": "sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==",
+      "dev": true,
+      "requires": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      }
+    },
+    "psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true
+    },
+    "react-is": {
+      "version": "17.0.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz",
+      "integrity": "sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==",
+      "dev": true
+    },
+    "read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "requires": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+          "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+          "dev": true
+        }
+      }
+    },
+    "read-pkg-up": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dev": true,
+      "requires": {
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "dev": true,
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "dev": true
+        }
+      }
+    },
+    "request-promise-core": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.19"
+      }
+    },
+    "request-promise-native": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
+      "dev": true,
+      "requires": {
+        "request-promise-core": "1.1.4",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      },
+      "dependencies": {
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "dev": true,
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        }
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "dev": true,
+      "requires": {
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^5.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "rsvp": {
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+      "dev": true
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "sane": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+      "dev": true,
+      "requires": {
+        "@cnakazawa/watch": "^1.0.3",
+        "anymatch": "^2.0.0",
+        "capture-exit": "^2.0.0",
+        "exec-sh": "^0.3.2",
+        "execa": "^1.0.0",
+        "fb-watchman": "^2.0.0",
+        "micromatch": "^3.1.4",
+        "minimist": "^1.1.1",
+        "walker": "~1.0.5"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          }
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "dev": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        }
+      }
+    },
+    "saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
+      "requires": {
+        "xmlchars": "^2.2.0"
+      }
+    },
+    "semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "shellwords": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+      "dev": true,
+      "optional": true
+    },
+    "signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+      "dev": true
+    },
+    "sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
+    },
+    "slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
+    },
+    "source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "dev": true,
+      "requires": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
+      "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
+      "dev": true
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dev": true,
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+          "dev": true
+        }
+      }
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+      "dev": true
+    },
+    "string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dev": true,
+      "requires": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.0"
+      }
+    },
+    "strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "supports-hyperlinks": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
+      "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      }
+    },
+    "symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
+    },
+    "terminal-link": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^4.2.1",
+        "supports-hyperlinks": "^2.0.0"
+      }
+    },
+    "test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "requires": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "throat": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
+      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
+      "dev": true
+    },
+    "tmpl": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
+      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "tough-cookie": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+      "dev": true,
+      "requires": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
+      }
+    },
+    "tr46": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
+      "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.1"
+      }
+    },
+    "ts-jest": {
+      "version": "26.5.4",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.5.4.tgz",
+      "integrity": "sha512-I5Qsddo+VTm94SukBJ4cPimOoFZsYTeElR2xy6H2TOVs+NsvgYglW8KuQgKoApOKuaU/Ix/vrF9ebFZlb5D2Pg==",
+      "dev": true,
+      "requires": {
+        "bs-logger": "0.x",
+        "buffer-from": "1.x",
+        "fast-json-stable-stringify": "2.x",
+        "jest-util": "^26.1.0",
+        "json5": "2.x",
+        "lodash": "4.x",
+        "make-error": "1.x",
+        "mkdirp": "1.x",
+        "semver": "7.x",
+        "yargs-parser": "20.x"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "20.2.7",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+          "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+          "dev": true
+        }
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
+    "type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true
+    },
+    "typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
+      "requires": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "typescript": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz",
+      "integrity": "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      }
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        }
+      }
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "optional": true
+    },
+    "v8-to-istanbul": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz",
+      "integrity": "sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g==",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
+        }
+      }
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "dev": true,
+      "requires": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "w3c-xmlserializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "dev": true,
+      "requires": {
+        "xml-name-validator": "^3.0.0"
+      }
+    },
+    "walker": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "dev": true,
+      "requires": {
+        "makeerror": "1.0.x"
+      }
+    },
+    "webidl-conversions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "dev": true
+    },
+    "whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dev": true,
+      "requires": {
+        "iconv-lite": "0.4.24"
+      }
+    },
+    "whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "dev": true
+    },
+    "whatwg-url": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz",
+      "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==",
+      "dev": true,
+      "requires": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^2.0.2",
+        "webidl-conversions": "^6.1.0"
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "ws": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
+      "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==",
+      "dev": true
+    },
+    "xml-name-validator": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+      "dev": true
+    },
+    "xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
+    },
+    "y18n": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "requires": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      }
+    },
+    "yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    }
+  }
 }
diff --git a/packages/insomnia-url/package.json b/packages/insomnia-url/package.json
index dc0132150f..4b5f97e8d0 100644
--- a/packages/insomnia-url/package.json
+++ b/packages/insomnia-url/package.json
@@ -4,8 +4,20 @@
   "author": "Gregory Schier <greg.schier@konghq.com>",
   "description": "URL Utilities",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "package.json",
+    "READEM.md"
+  ],
   "scripts": {
+    "bootstrap": "npm run build",
+    "lint": "eslint . --ext .js,.ts,.tsx",
+    "lint:fix": "npm run lint -- --fix",
+    "clean": "tsc --build tsconfig.build.json --clean",
+    "postclean": "rimraf dist",
+    "build": "tsc --build tsconfig.build.json",
     "test": "jest --silent"
   },
   "gitHead": "e46bf021cf4b4379e31d2b2d9025d476d6839fa1"
diff --git a/packages/insomnia-url/src/index.ts b/packages/insomnia-url/src/index.ts
new file mode 100644
index 0000000000..ecfed6e2a5
--- /dev/null
+++ b/packages/insomnia-url/src/index.ts
@@ -0,0 +1,11 @@
+export { setDefaultProtocol } from './protocol';
+
+export {
+  joinUrlAndQueryString,
+  extractQueryStringFromUrl,
+  buildQueryParameter,
+  buildQueryStringFromParams,
+  deconstructQueryStringToParams,
+  smartEncodeUrl,
+  flexibleEncodeComponent,
+} from './querystring';
diff --git a/packages/insomnia-url/src/__tests__/protocol.test.js b/packages/insomnia-url/src/protocol.test.ts
similarity index 94%
rename from packages/insomnia-url/src/__tests__/protocol.test.js
rename to packages/insomnia-url/src/protocol.test.ts
index 7b871e5c85..5b9f4e0555 100644
--- a/packages/insomnia-url/src/__tests__/protocol.test.js
+++ b/packages/insomnia-url/src/protocol.test.ts
@@ -1,4 +1,4 @@
-const { setDefaultProtocol } = require('../protocol');
+import { setDefaultProtocol } from './protocol';
 
 describe('setDefaultProtocol()', () => {
   it('no-ops on empty url', () => {
diff --git a/packages/insomnia-url/src/protocol.js b/packages/insomnia-url/src/protocol.ts
similarity index 65%
rename from packages/insomnia-url/src/protocol.js
rename to packages/insomnia-url/src/protocol.ts
index 1576382816..37030e1d69 100644
--- a/packages/insomnia-url/src/protocol.js
+++ b/packages/insomnia-url/src/protocol.ts
@@ -1,10 +1,9 @@
 /**
  * Set a default protocol for a URL
- * @param url {string} - URL to set protocol on
- * @param [defaultProto='http:'] {string} - default protocol
- * @returns {string}
+ * @param url URL to set protocol on
+ * @param [defaultProto='http:'] default protocol
  */
-module.exports.setDefaultProtocol = function(url, defaultProto) {
+export const setDefaultProtocol = (url: string, defaultProto?: string) => {
   const trimmedUrl = url.trim();
   defaultProto = defaultProto || 'http:';
 
diff --git a/packages/insomnia-url/src/__tests__/querystring.test.js b/packages/insomnia-url/src/querystring.test.ts
similarity index 97%
rename from packages/insomnia-url/src/__tests__/querystring.test.js
rename to packages/insomnia-url/src/querystring.test.ts
index 3233d8ba1f..4ea67447a8 100644
--- a/packages/insomnia-url/src/__tests__/querystring.test.js
+++ b/packages/insomnia-url/src/querystring.test.ts
@@ -1,15 +1,14 @@
-const querystring = require('../querystring');
-const { getJoiner } = querystring._internal;
-const {
+import {
+  getJoiner,
   joinUrlAndQueryString,
   buildQueryParameter,
   buildQueryStringFromParams,
   deconstructQueryStringToParams,
   smartEncodeUrl,
-} = querystring;
+} from './querystring';
 
 describe('querystring', () => {
-  describe('_getJoiner()', () => {
+  describe('getJoiner()', () => {
     it('gets joiner for bare URL', () => {
       const joiner = getJoiner('http://google.com');
       expect(joiner).toBe('?');
diff --git a/packages/insomnia-url/src/querystring.js b/packages/insomnia-url/src/querystring.ts
similarity index 69%
rename from packages/insomnia-url/src/querystring.js
rename to packages/insomnia-url/src/querystring.ts
index 8ab05c30bc..cc75a4bb86 100644
--- a/packages/insomnia-url/src/querystring.js
+++ b/packages/insomnia-url/src/querystring.ts
@@ -1,16 +1,18 @@
-const { parse: urlParse, format: urlFormat } = require('url');
-const { setDefaultProtocol } = require('./protocol');
+import { parse as urlParse, format as urlFormat } from 'url';
+import { setDefaultProtocol } from './protocol';
 
 const ESCAPE_REGEX_MATCH = /[-[\]/{}()*+?.\\^$|]/g;
 const URL_PATH_CHARACTER_WHITELIST = '+,;@=:';
 
+export const getJoiner = (url: string) => {
+  url = url || '';
+  return url.indexOf('?') === -1 ? '?' : '&';
+};
+
 /**
  * Join querystring to URL
- * @param url {string}
- * @param qs {string}
- * @returns {string}
  */
-module.exports.joinUrlAndQueryString = function(url, qs) {
+export const joinUrlAndQueryString = (url: string, qs: string) => {
   if (!qs) {
     return url;
   }
@@ -23,17 +25,15 @@ module.exports.joinUrlAndQueryString = function(url, qs) {
 
   // TODO: Make this work with URLs that have a #hash component
   const baseUrl = base || '';
-  const joiner = _getJoiner(base);
+  const joiner = getJoiner(base);
   const hash = hashes.length ? `#${hashes.join('#')}` : '';
   return `${baseUrl}${joiner}${qs}${hash}`;
 };
 
 /**
  * Extract querystring from URL
- * @param url {string}
- * @returns {string}
  */
-module.exports.extractQueryStringFromUrl = function(url) {
+export const extractQueryStringFromUrl = (url: string) => {
   if (!url) {
     return '';
   }
@@ -50,11 +50,13 @@ module.exports.extractQueryStringFromUrl = function(url) {
 
 /**
  * Build a querystring parameter from a param object
- * @param param <{name: string, value: string}>
- * @param [strict=true] {boolean}
- * @returns {string}
  */
-module.exports.buildQueryParameter = function(param, strict) {
+export const buildQueryParameter = (
+  param: { name?: string; value?: string | number },
+
+  /** allow empty names and values */
+  strict?: boolean,
+) => {
   strict = strict === undefined ? true : strict;
 
   // Skip non-name ones in strict mode
@@ -64,32 +66,34 @@ module.exports.buildQueryParameter = function(param, strict) {
 
   // Cast number values to strings
   if (typeof param.value === 'number') {
-    param.value += '';
+    param.value = String(param.value);
   }
 
   if (!strict || param.value) {
     // Don't encode ',' in values
-    const value = module.exports.flexibleEncodeComponent(param.value || '').replace(/%2C/gi, ',');
-    const name = module.exports.flexibleEncodeComponent(param.name || '');
+    const value = flexibleEncodeComponent(param.value || '').replace(/%2C/gi, ',');
+    const name = flexibleEncodeComponent(param.name || '');
 
     return `${name}=${value}`;
   } else {
-    return module.exports.flexibleEncodeComponent(param.name);
+    return flexibleEncodeComponent(param.name);
   }
 };
 
 /**
  * Build a querystring from a list of name/value pairs
- * @param parameters {{name: string, value: string}[]}
- * @param [strict=true] {boolean} - allow empty names and values
- * @returns {string}
  */
-module.exports.buildQueryStringFromParams = function(parameters, strict) {
+export const buildQueryStringFromParams = (
+  parameters: { name: string; value?: string }[],
+
+  /** allow empty names and values */
+  strict?: boolean,
+) => {
   strict = strict === undefined ? true : strict;
   const items = [];
 
   for (const param of parameters) {
-    const built = module.exports.buildQueryParameter(param, strict);
+    const built = buildQueryParameter(param, strict);
 
     if (!built) {
       continue;
@@ -107,9 +111,14 @@ module.exports.buildQueryStringFromParams = function(parameters, strict) {
  * @param [strict=true] {boolean} - allow empty names and values
  * @returns {{name: string, value: string}[]}
  */
-module.exports.deconstructQueryStringToParams = function(qs, strict) {
+export const deconstructQueryStringToParams = (
+  qs: string,
+
+  /** allow empty names and values */
+  strict?: boolean,
+) => {
   strict = strict === undefined ? true : strict;
-  const pairs = [];
+  const pairs: { name: string; value: string }[] = [];
 
   if (!qs) {
     return pairs;
@@ -150,11 +159,10 @@ module.exports.deconstructQueryStringToParams = function(qs, strict) {
 
 /**
  * Automatically encode the path and querystring components
- * @param url {string} - url to encode
- * @param [encode=true] - enable encoding
- * @returns {string}
+ * @param url url to encode
+ * @param encode enable encoding
  */
-module.exports.smartEncodeUrl = function(url, encode) {
+export const smartEncodeUrl = (url: string, encode?: boolean) => {
   // Default autoEncode = true if not passed
   encode = encode === undefined ? true : encode;
 
@@ -173,7 +181,7 @@ module.exports.smartEncodeUrl = function(url, encode) {
     if (parsedUrl.pathname) {
       const segments = parsedUrl.pathname.split('/');
       parsedUrl.pathname = segments
-        .map(s => module.exports.flexibleEncodeComponent(s, URL_PATH_CHARACTER_WHITELIST))
+        .map(s => flexibleEncodeComponent(s, URL_PATH_CHARACTER_WHITELIST))
         .join('/');
     }
 
@@ -182,16 +190,16 @@ module.exports.smartEncodeUrl = function(url, encode) {
     // ~~~~~~~~~~~~~~ //
 
     if (parsedUrl.query) {
-      const qsParams = module.exports.deconstructQueryStringToParams(parsedUrl.query);
+      const qsParams = deconstructQueryStringToParams(parsedUrl.query);
       const encodedQsParams = [];
       for (const { name, value } of qsParams) {
         encodedQsParams.push({
-          name: module.exports.flexibleEncodeComponent(name),
-          value: module.exports.flexibleEncodeComponent(value),
+          name: flexibleEncodeComponent(name),
+          value: flexibleEncodeComponent(value),
         });
       }
 
-      parsedUrl.query = module.exports.buildQueryStringFromParams(encodedQsParams);
+      parsedUrl.query = buildQueryStringFromParams(encodedQsParams);
       parsedUrl.search = `?${parsedUrl.query}`;
     }
 
@@ -200,13 +208,11 @@ module.exports.smartEncodeUrl = function(url, encode) {
 };
 
 /**
- * URL encode a string in a module.exports.flexible way
- * @param str {string} - string to encode
- * @param [ignore=''] {string} - characters to ignore
- * @returns {string}
+ * URL encode a string in a flexible way
+ * @param str string to encode
+ * @param ignore characters to ignore
  */
-module.exports.flexibleEncodeComponent = function(str, ignore) {
-  ignore = ignore || '';
+export const flexibleEncodeComponent = (str = '', ignore = '') => {
   // Sometimes spaces screw things up because of url.parse
   str = str.replace(/%20/g, ' ');
 
@@ -242,12 +248,3 @@ module.exports.flexibleEncodeComponent = function(str, ignore) {
 
   return str;
 };
-
-function _getJoiner(url) {
-  url = url || '';
-  return url.indexOf('?') === -1 ? '?' : '&';
-}
-
-module.exports._internal = {
-  getJoiner: _getJoiner,
-};
diff --git a/packages/insomnia-url/tsconfig.build.json b/packages/insomnia-url/tsconfig.build.json
new file mode 100644
index 0000000000..95458e4845
--- /dev/null
+++ b/packages/insomnia-url/tsconfig.build.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "dist",
+    "rootDir": "src",
+    "resolveJsonModule": true
+  },
+  "include": [
+    "src"
+  ],
+  "exclude": [
+    "**/*.test.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/insomnia-url/tsconfig.json b/packages/insomnia-url/tsconfig.json
new file mode 100644
index 0000000000..93486d850b
--- /dev/null
+++ b/packages/insomnia-url/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.build.json",
+  "compilerOptions": {
+    "composite": false,
+    "rootDir": "."
+  },
+  "include": [
+    "src",
+    "jest.config.js",
+    ".eslintrc.js"
+  ],
+  "exclude": [
+    "dist"
+  ]
+}
diff --git a/packages/insomnia-xpath/.eslintignore b/packages/insomnia-xpath/.eslintignore
new file mode 100644
index 0000000000..53c37a1660
--- /dev/null
+++ b/packages/insomnia-xpath/.eslintignore
@@ -0,0 +1 @@
+dist
\ No newline at end of file
diff --git a/packages/insomnia-xpath/__tests__/index.test.js b/packages/insomnia-xpath/__tests__/index.test.js
deleted file mode 100644
index ff85299c5f..0000000000
--- a/packages/insomnia-xpath/__tests__/index.test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-const { query } = require('..');
-
-function q(description, args, result) {
-  it(description, () => {
-    expect(query(...args)).toEqual(result);
-  });
-}
-
-describe('query()', () => {
-  q('handles missing query', ['<foo><bar></bar></foo>'], []);
-
-  q(
-    'handles basic query',
-    ['<x><y>foo</y><y>bar</y></x>', '//y'],
-    [
-      { inner: 'foo', outer: '<y>foo</y>' },
-      { inner: 'bar', outer: '<y>bar</y>' },
-    ],
-  );
-
-  q(
-    'handles attribute query',
-    ['<x><y foo="bar">foo</y><y hi="there">bar</y></x>', '//*[@foo="bar"]'],
-    [{ inner: 'foo', outer: '<y foo="bar">foo</y>' }],
-  );
-
-  q(
-    'handles string query',
-    ['<x><y>foo</y><y>bar</y></x>', 'substring(//y[1], 2)'],
-    [{ inner: 'oo', outer: 'oo' }],
-  );
-
-  it('handles invalid query', () => {
-    expect(() => query('<hi>there</hi>', '//[]')).toThrowError('Invalid XPath query: //[]');
-  });
-});
diff --git a/packages/insomnia-xpath/index.js b/packages/insomnia-xpath/index.js
deleted file mode 100644
index 9bb09e1cef..0000000000
--- a/packages/insomnia-xpath/index.js
+++ /dev/null
@@ -1,45 +0,0 @@
-const xpath = require('xpath');
-const { DOMParser } = require('xmldom');
-
-/**
- * Query an XML blob with XPath
- * @param xml {string}
- * @param query {string}
- * @returns {Array<{outer: string, inner: string}>}
- */
-module.exports.query = function(xml, query) {
-  const dom = new DOMParser().parseFromString(xml);
-  let rawResults = [];
-
-  try {
-    rawResults = xpath.select(query, dom);
-  } catch (err) {
-    throw new Error(`Invalid XPath query: ${query}`);
-  }
-
-  const results = [];
-
-  // Functions return plain strings
-  if (typeof rawResults === 'string') {
-    results.push({
-      outer: rawResults,
-      inner: rawResults,
-    });
-  } else {
-    for (const result of rawResults || []) {
-      if (result.constructor.name === 'Attr') {
-        results.push({
-          outer: result.toString().trim(),
-          inner: result.nodeValue,
-        });
-      } else if (result.constructor.name === 'Element') {
-        results.push({
-          outer: result.toString().trim(),
-          inner: result.childNodes.toString(),
-        });
-      }
-    }
-  }
-
-  return results;
-};
diff --git a/packages/insomnia-xpath/jest.config.js b/packages/insomnia-xpath/jest.config.js
new file mode 100644
index 0000000000..537ce057da
--- /dev/null
+++ b/packages/insomnia-xpath/jest.config.js
@@ -0,0 +1,17 @@
+/** @type { import('@jest/types').Config.InitialOptions } */
+module.exports = {
+  globals: {
+    'ts-jest': {
+      isolatedModules: true,
+    },
+  },
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+  testRegex: ['.+\\.test\\.ts$'],
+  collectCoverage: false,
+  collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  coverageReporters: ['text-summary', 'lcov'],
+};
diff --git a/packages/insomnia-xpath/package-lock.json b/packages/insomnia-xpath/package-lock.json
index 83a45388bb..2cd3666623 100644
--- a/packages/insomnia-xpath/package-lock.json
+++ b/packages/insomnia-xpath/package-lock.json
@@ -4,6 +4,12 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@types/xmldom": {
+      "version": "0.1.30",
+      "resolved": "https://registry.npmjs.org/@types/xmldom/-/xmldom-0.1.30.tgz",
+      "integrity": "sha512-edqgAFXMEtVvaBZ3YnhamvmrHjoYpuxETmnb0lbTZmf/dXpAsO9ZKotUO4K2rn2SIZBDFCMOuA7fOe0H6dRZcA==",
+      "dev": true
+    },
     "xmldom": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
diff --git a/packages/insomnia-xpath/package.json b/packages/insomnia-xpath/package.json
index 1142841925..d463e69d50 100644
--- a/packages/insomnia-xpath/package.json
+++ b/packages/insomnia-xpath/package.json
@@ -4,10 +4,25 @@
   "author": "Gregory Schier <greg.schier@konghq.com>",
   "description": "Query XML using XPath",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "package.json",
+    "README.md"
+  ],
   "scripts": {
+    "bootstrap": "npm run build",
+    "lint": "eslint . --ext .js,.ts,.tsx",
+    "lint:fix": "npm run lint -- --fix",
+    "clean": "tsc --build tsconfig.build.json --clean",
+    "postclean": "rimraf dist",
+    "build": "tsc --build tsconfig.build.json",
     "test": "jest --silent"
   },
+  "devDependencies": {
+    "@types/xmldom": "0.1.30"
+  },
   "dependencies": {
     "insomnia-cookies": "2.2.35",
     "xmldom": "^0.5.0",
diff --git a/packages/insomnia-xpath/src/index.ts b/packages/insomnia-xpath/src/index.ts
new file mode 100644
index 0000000000..4cc0bfe8e4
--- /dev/null
+++ b/packages/insomnia-xpath/src/index.ts
@@ -0,0 +1 @@
+export { query } from './query';
diff --git a/packages/insomnia-xpath/src/query.test.ts b/packages/insomnia-xpath/src/query.test.ts
new file mode 100644
index 0000000000..4c54046f49
--- /dev/null
+++ b/packages/insomnia-xpath/src/query.test.ts
@@ -0,0 +1,34 @@
+import { query } from './query';
+
+describe('query()', () => {
+  it('handles missing query', () => {
+    expect(() => {
+      query('<foo><bar></bar></foo>');
+    }).toThrowError('Must pass an XPath query.');
+  });
+
+  it('handles basic query', () => {
+    expect(query('<x><y>foo</y><y>bar</y></x>', '//y')).toEqual([
+      { inner: 'foo', outer: '<y>foo</y>' },
+      { inner: 'bar', outer: '<y>bar</y>' },
+    ]);
+  });
+
+  it('handles attribute query', () => {
+    expect(query('<x><y foo="bar">foo</y><y hi="there">bar</y></x>', '//*[@foo="bar"]')).toEqual([
+      { inner: 'foo', outer: '<y foo="bar">foo</y>' },
+    ]);
+  });
+
+  it('handles string query', () => {
+    expect(query('<x><y>foo</y><y>bar</y></x>', 'substring(//y[1], 2)')).toEqual([
+      { inner: 'oo', outer: 'oo' },
+    ]);
+  });
+
+  it('handles invalid query', () => {
+    expect(() => {
+      query('<hi>there</hi>', '//[]');
+    }).toThrowError('Invalid XPath query: //[]');
+  });
+});
diff --git a/packages/insomnia-xpath/src/query.ts b/packages/insomnia-xpath/src/query.ts
new file mode 100644
index 0000000000..ae443580bf
--- /dev/null
+++ b/packages/insomnia-xpath/src/query.ts
@@ -0,0 +1,53 @@
+import xpath, { SelectedValue } from 'xpath';
+import { DOMParser } from 'xmldom';
+
+/**
+ * Query an XML blob with XPath
+ */
+export const query = (xml: string, query?: string) => {
+  const dom = new DOMParser().parseFromString(xml);
+  let selectedValues: SelectedValue[] = [];
+
+  if (query === undefined) {
+    throw new Error('Must pass an XPath query.');
+  }
+
+  try {
+    selectedValues = xpath.select(query, dom);
+  } catch (err) {
+    throw new Error(`Invalid XPath query: ${query}`);
+  }
+
+  const output = [];
+
+  // Functions return plain strings
+  if (typeof selectedValues === 'string') {
+    output.push({
+      outer: selectedValues,
+      inner: selectedValues,
+    });
+  } else {
+    for (const selectedValue of selectedValues || []) {
+      switch (selectedValue.constructor.name) {
+        case 'Attr':
+          output.push({
+            outer: (selectedValue as Attr).toString().trim(),
+            inner: (selectedValue as Attr).nodeValue,
+          });
+          break;
+
+        case 'Element':
+          output.push({
+            outer: (selectedValue as Node).toString().trim(),
+            inner: (selectedValue as Node).childNodes.toString(),
+          });
+          break;
+
+        default:
+          break;
+      }
+    }
+  }
+
+  return output;
+};
diff --git a/packages/insomnia-xpath/tsconfig.build.json b/packages/insomnia-xpath/tsconfig.build.json
new file mode 100644
index 0000000000..95458e4845
--- /dev/null
+++ b/packages/insomnia-xpath/tsconfig.build.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "dist",
+    "rootDir": "src",
+    "resolveJsonModule": true
+  },
+  "include": [
+    "src"
+  ],
+  "exclude": [
+    "**/*.test.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/insomnia-xpath/tsconfig.json b/packages/insomnia-xpath/tsconfig.json
new file mode 100644
index 0000000000..56e28e57d8
--- /dev/null
+++ b/packages/insomnia-xpath/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig.build.json",
+  "compilerOptions": {
+    "rootDir": "."
+  },
+  "include": [
+    "src",
+    "jest.config.js"
+  ],
+  "exclude": [
+    "dist"
+  ]
+}
\ No newline at end of file
diff --git a/packages/openapi-2-kong/.babelrc b/packages/openapi-2-kong/.babelrc
deleted file mode 100644
index ff98aba32a..0000000000
--- a/packages/openapi-2-kong/.babelrc
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "targets": {
-          "node": "12"
-        }
-      }
-    ],
-    "@babel/preset-flow"
-  ],
-  "plugins": [
-    ["@babel/plugin-proposal-optional-chaining"]
-  ]
-}
diff --git a/packages/openapi-2-kong/.eslintignore b/packages/openapi-2-kong/.eslintignore
new file mode 100644
index 0000000000..53c37a1660
--- /dev/null
+++ b/packages/openapi-2-kong/.eslintignore
@@ -0,0 +1 @@
+dist
\ No newline at end of file
diff --git a/packages/openapi-2-kong/.eslintrc.js b/packages/openapi-2-kong/.eslintrc.js
new file mode 100644
index 0000000000..aec693fc8d
--- /dev/null
+++ b/packages/openapi-2-kong/.eslintrc.js
@@ -0,0 +1,10 @@
+/** @type { import('eslint').Linter.Config } */
+module.exports = {
+  extends: '../../.eslintrc.js',
+  rules: {
+    camelcase: 'off',
+    '@typescript-eslint/no-explicit-any': 'off', // TSCONVERSION
+    '@typescript-eslint/no-empty-interface': 'off', // TSCONVERSION
+    '@typescript-eslint/no-use-before-define': 'off', // TSCONVERSION
+  },
+};
diff --git a/packages/openapi-2-kong/.flowconfig b/packages/openapi-2-kong/.flowconfig
deleted file mode 100644
index 2de99bfa77..0000000000
--- a/packages/openapi-2-kong/.flowconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-[ignore]
-.*/node_modules/.*
-.*/__fixtures__/.*
-./.cache
-./dist
-
-[include]
-
-[libs]
-./flow-typed
-./types
-
-[options]
-esproposal.optional_chaining=enable
-
-[lints]
diff --git a/packages/openapi-2-kong/flow-typed/jest.js b/packages/openapi-2-kong/flow-typed/jest.js
deleted file mode 100644
index 2ad13d02b9..0000000000
--- a/packages/openapi-2-kong/flow-typed/jest.js
+++ /dev/null
@@ -1,1186 +0,0 @@
-type JestMockFn<TArguments: $ReadOnlyArray<*>, TReturn> = {
-  (...args: TArguments): TReturn,
-  /**
-   * An object for introspecting mock calls
-   */
-  mock: {
-    /**
-     * An array that represents all calls that have been made into this mock
-     * function. Each call is represented by an array of arguments that were
-     * passed during the call.
-     */
-    calls: Array<TArguments>,
-    /**
-     * An array that contains all the object instances that have been
-     * instantiated from this mock function.
-     */
-    instances: Array<TReturn>,
-    /**
-     * An array that contains all the object results that have been
-     * returned by this mock function call
-     */
-    results: Array<{
-      isThrow: boolean,
-      value: TReturn,
-      ...
-    }>,
-    ...
-  },
-  /**
-   * Resets all information stored in the mockFn.mock.calls and
-   * mockFn.mock.instances arrays. Often this is useful when you want to clean
-   * up a mock's usage data between two assertions.
-   */
-  mockClear(): void,
-  /**
-   * Resets all information stored in the mock. This is useful when you want to
-   * completely restore a mock back to its initial state.
-   */
-  mockReset(): void,
-  /**
-   * Removes the mock and restores the initial implementation. This is useful
-   * when you want to mock functions in certain test cases and restore the
-   * original implementation in others. Beware that mockFn.mockRestore only
-   * works when mock was created with jest.spyOn. Thus you have to take care of
-   * restoration yourself when manually assigning jest.fn().
-   */
-  mockRestore(): void,
-  /**
-   * Accepts a function that should be used as the implementation of the mock.
-   * The mock itself will still record all calls that go into and instances
-   * that come from itself -- the only difference is that the implementation
-   * will also be executed when the mock is called.
-   */
-  mockImplementation(fn: (...args: TArguments) => TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Accepts a function that will be used as an implementation of the mock for
-   * one call to the mocked function. Can be chained so that multiple function
-   * calls produce different results.
-   */
-  mockImplementationOnce(fn: (...args: TArguments) => TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Accepts a string to use in test result output in place of "jest.fn()" to
-   * indicate which mock function is being referenced.
-   */
-  mockName(name: string): JestMockFn<TArguments, TReturn>,
-  /**
-   * Just a simple sugar function for returning `this`
-   */
-  mockReturnThis(): void,
-  /**
-   * Accepts a value that will be returned whenever the mock function is called.
-   */
-  mockReturnValue(value: TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Sugar for only returning a value once inside your mock
-   */
-  mockReturnValueOnce(value: TReturn): JestMockFn<TArguments, TReturn>,
-  /**
-   * Sugar for jest.fn().mockImplementation(() => Promise.resolve(value))
-   */
-  mockResolvedValue(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
-  /**
-   * Sugar for jest.fn().mockImplementationOnce(() => Promise.resolve(value))
-   */
-  mockResolvedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<TReturn>>,
-  /**
-   * Sugar for jest.fn().mockImplementation(() => Promise.reject(value))
-   */
-  mockRejectedValue(value: TReturn): JestMockFn<TArguments, Promise<any>>,
-  /**
-   * Sugar for jest.fn().mockImplementationOnce(() => Promise.reject(value))
-   */
-  mockRejectedValueOnce(value: TReturn): JestMockFn<TArguments, Promise<any>>,
-  ...
-};
-
-type JestAsymmetricEqualityType = {
-  /**
-   * A custom Jasmine equality tester
-   */
-  asymmetricMatch(value: mixed): boolean,
-  ...
-};
-
-type JestCallsType = {
-  allArgs(): mixed,
-  all(): mixed,
-  any(): boolean,
-  count(): number,
-  first(): mixed,
-  mostRecent(): mixed,
-  reset(): void,
-  ...
-};
-
-type JestClockType = {
-  install(): void,
-  mockDate(date: Date): void,
-  tick(milliseconds?: number): void,
-  uninstall(): void,
-  ...
-};
-
-type JestMatcherResult = {
-  message?: string | (() => string),
-  pass: boolean,
-  ...
-};
-
-type JestMatcher = (
-  received: any,
-  ...actual: Array<any>
-) => JestMatcherResult | Promise<JestMatcherResult>;
-
-type JestPromiseType = {
-  /**
-   * Use rejects to unwrap the reason of a rejected promise so any other
-   * matcher can be chained. If the promise is fulfilled the assertion fails.
-   */
-  rejects: JestExpectType,
-  /**
-   * Use resolves to unwrap the value of a fulfilled promise so any other
-   * matcher can be chained. If the promise is rejected the assertion fails.
-   */
-  resolves: JestExpectType,
-  ...
-};
-
-/**
- * Jest allows functions and classes to be used as test names in test() and
- * describe()
- */
-type JestTestName = string | Function;
-
-/**
- *  Plugin: jest-styled-components
- */
-
-type JestStyledComponentsMatcherValue =
-  | string
-  | JestAsymmetricEqualityType
-  | RegExp
-  | typeof undefined;
-
-type JestStyledComponentsMatcherOptions = {
-  media?: string,
-  modifier?: string,
-  supports?: string,
-  ...
-};
-
-type JestStyledComponentsMatchersType = {
-  toHaveStyleRule(
-    property: string,
-    value: JestStyledComponentsMatcherValue,
-    options?: JestStyledComponentsMatcherOptions,
-  ): void,
-  ...
-};
-
-/**
- *  Plugin: jest-enzyme
- */
-type EnzymeMatchersType = {
-  // 5.x
-  toBeEmpty(): void,
-  toBePresent(): void,
-  // 6.x
-  toBeChecked(): void,
-  toBeDisabled(): void,
-  toBeEmptyRender(): void,
-  toContainMatchingElement(selector: string): void,
-  toContainMatchingElements(n: number, selector: string): void,
-  toContainExactlyOneMatchingElement(selector: string): void,
-  toContainReact(element: React$Element<any>): void,
-  toExist(): void,
-  toHaveClassName(className: string): void,
-  toHaveHTML(html: string): void,
-  toHaveProp: ((propKey: string, propValue?: any) => void) & ((props: { ... }) => void),
-  toHaveRef(refName: string): void,
-  toHaveState: ((stateKey: string, stateValue?: any) => void) & ((state: { ... }) => void),
-  toHaveStyle: ((styleKey: string, styleValue?: any) => void) & ((style: { ... }) => void),
-  toHaveTagName(tagName: string): void,
-  toHaveText(text: string): void,
-  toHaveValue(value: any): void,
-  toIncludeText(text: string): void,
-  toMatchElement(
-    element: React$Element<any>,
-    options?: {| ignoreProps?: boolean, verbose?: boolean |},
-  ): void,
-  toMatchSelector(selector: string): void,
-  // 7.x
-  toHaveDisplayName(name: string): void,
-  ...
-};
-
-// DOM testing library extensions (jest-dom)
-// https://github.com/testing-library/jest-dom
-type DomTestingLibraryType = {
-  /**
-   * @deprecated
-   */
-  toBeInTheDOM(container?: HTMLElement): void,
-  toBeInTheDocument(): void,
-  toBeVisible(): void,
-  toBeEmpty(): void,
-  toBeDisabled(): void,
-  toBeEnabled(): void,
-  toBeInvalid(): void,
-  toBeRequired(): void,
-  toBeValid(): void,
-  toContainElement(element: HTMLElement | null): void,
-  toContainHTML(htmlText: string): void,
-  toHaveAttribute(attr: string, value?: any): void,
-  toHaveClass(...classNames: string[]): void,
-  toHaveFocus(): void,
-  toHaveFormValues(expectedValues: { [name: string]: any, ... }): void,
-  toHaveStyle(css: string): void,
-  toHaveTextContent(text: string | RegExp, options?: { normalizeWhitespace: boolean, ... }): void,
-  toHaveValue(value?: string | string[] | number): void,
-  ...
-};
-
-// Jest JQuery Matchers: https://github.com/unindented/custom-jquery-matchers
-type JestJQueryMatchersType = {
-  toExist(): void,
-  toHaveLength(len: number): void,
-  toHaveId(id: string): void,
-  toHaveClass(className: string): void,
-  toHaveTag(tag: string): void,
-  toHaveAttr(key: string, val?: any): void,
-  toHaveProp(key: string, val?: any): void,
-  toHaveText(text: string | RegExp): void,
-  toHaveData(key: string, val?: any): void,
-  toHaveValue(val: any): void,
-  toHaveCss(css: { [key: string]: any, ... }): void,
-  toBeChecked(): void,
-  toBeDisabled(): void,
-  toBeEmpty(): void,
-  toBeHidden(): void,
-  toBeSelected(): void,
-  toBeVisible(): void,
-  toBeFocused(): void,
-  toBeInDom(): void,
-  toBeMatchedBy(sel: string): void,
-  toHaveDescendant(sel: string): void,
-  toHaveDescendantWithText(sel: string, text: string | RegExp): void,
-  ...
-};
-
-// Jest Extended Matchers: https://github.com/jest-community/jest-extended
-type JestExtendedMatchersType = {
-  /**
-   * Note: Currently unimplemented
-   * Passing assertion
-   *
-   * @param {String} message
-   */
-  //  pass(message: string): void;
-
-  /**
-   * Note: Currently unimplemented
-   * Failing assertion
-   *
-   * @param {String} message
-   */
-  //  fail(message: string): void;
-
-  /**
-   * Use .toBeEmpty when checking if a String '', Array [] or Object {} is empty.
-   */
-  toBeEmpty(): void,
-  /**
-   * Use .toBeOneOf when checking if a value is a member of a given Array.
-   * @param {Array.<*>} members
-   */
-  toBeOneOf(members: any[]): void,
-  /**
-   * Use `.toBeNil` when checking a value is `null` or `undefined`.
-   */
-  toBeNil(): void,
-  /**
-   * Use `.toSatisfy` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean`.
-   * @param {Function} predicate
-   */
-  toSatisfy(predicate: (n: any) => boolean): void,
-  /**
-   * Use `.toBeArray` when checking if a value is an `Array`.
-   */
-  toBeArray(): void,
-  /**
-   * Use `.toBeArrayOfSize` when checking if a value is an `Array` of size x.
-   * @param {Number} x
-   */
-  toBeArrayOfSize(x: number): void,
-  /**
-   * Use `.toIncludeAllMembers` when checking if an `Array` contains all of the same members of a given set.
-   * @param {Array.<*>} members
-   */
-  toIncludeAllMembers(members: any[]): void,
-  /**
-   * Use `.toIncludeAnyMembers` when checking if an `Array` contains any of the members of a given set.
-   * @param {Array.<*>} members
-   */
-  toIncludeAnyMembers(members: any[]): void,
-  /**
-   * Use `.toSatisfyAll` when you want to use a custom matcher by supplying a predicate function that returns a `Boolean` for all values in an array.
-   * @param {Function} predicate
-   */
-  toSatisfyAll(predicate: (n: any) => boolean): void,
-  /**
-   * Use `.toBeBoolean` when checking if a value is a `Boolean`.
-   */
-  toBeBoolean(): void,
-  /**
-   * Use `.toBeTrue` when checking a value is equal (===) to `true`.
-   */
-  toBeTrue(): void,
-  /**
-   * Use `.toBeFalse` when checking a value is equal (===) to `false`.
-   */
-  toBeFalse(): void,
-  /**
-   * Use .toBeDate when checking if a value is a Date.
-   */
-  toBeDate(): void,
-  /**
-   * Use `.toBeFunction` when checking if a value is a `Function`.
-   */
-  toBeFunction(): void,
-  /**
-   * Use `.toHaveBeenCalledBefore` when checking if a `Mock` was called before another `Mock`.
-   *
-   * Note: Required Jest version >22
-   * Note: Your mock functions will have to be asynchronous to cause the timestamps inside of Jest to occur in a differentJS event loop, otherwise the mock timestamps will all be the same
-   *
-   * @param {Mock} mock
-   */
-  toHaveBeenCalledBefore(mock: JestMockFn<any, any>): void,
-  /**
-   * Use `.toBeNumber` when checking if a value is a `Number`.
-   */
-  toBeNumber(): void,
-  /**
-   * Use `.toBeNaN` when checking a value is `NaN`.
-   */
-  toBeNaN(): void,
-  /**
-   * Use `.toBeFinite` when checking if a value is a `Number`, not `NaN` or `Infinity`.
-   */
-  toBeFinite(): void,
-  /**
-   * Use `.toBePositive` when checking if a value is a positive `Number`.
-   */
-  toBePositive(): void,
-  /**
-   * Use `.toBeNegative` when checking if a value is a negative `Number`.
-   */
-  toBeNegative(): void,
-  /**
-   * Use `.toBeEven` when checking if a value is an even `Number`.
-   */
-  toBeEven(): void,
-  /**
-   * Use `.toBeOdd` when checking if a value is an odd `Number`.
-   */
-  toBeOdd(): void,
-  /**
-   * Use `.toBeWithin` when checking if a number is in between the given bounds of: start (inclusive) and end (exclusive).
-   *
-   * @param {Number} start
-   * @param {Number} end
-   */
-  toBeWithin(start: number, end: number): void,
-  /**
-   * Use `.toBeObject` when checking if a value is an `Object`.
-   */
-  toBeObject(): void,
-  /**
-   * Use `.toContainKey` when checking if an object contains the provided key.
-   *
-   * @param {String} key
-   */
-  toContainKey(key: string): void,
-  /**
-   * Use `.toContainKeys` when checking if an object has all of the provided keys.
-   *
-   * @param {Array.<String>} keys
-   */
-  toContainKeys(keys: string[]): void,
-  /**
-   * Use `.toContainAllKeys` when checking if an object only contains all of the provided keys.
-   *
-   * @param {Array.<String>} keys
-   */
-  toContainAllKeys(keys: string[]): void,
-  /**
-   * Use `.toContainAnyKeys` when checking if an object contains at least one of the provided keys.
-   *
-   * @param {Array.<String>} keys
-   */
-  toContainAnyKeys(keys: string[]): void,
-  /**
-   * Use `.toContainValue` when checking if an object contains the provided value.
-   *
-   * @param {*} value
-   */
-  toContainValue(value: any): void,
-  /**
-   * Use `.toContainValues` when checking if an object contains all of the provided values.
-   *
-   * @param {Array.<*>} values
-   */
-  toContainValues(values: any[]): void,
-  /**
-   * Use `.toContainAllValues` when checking if an object only contains all of the provided values.
-   *
-   * @param {Array.<*>} values
-   */
-  toContainAllValues(values: any[]): void,
-  /**
-   * Use `.toContainAnyValues` when checking if an object contains at least one of the provided values.
-   *
-   * @param {Array.<*>} values
-   */
-  toContainAnyValues(values: any[]): void,
-  /**
-   * Use `.toContainEntry` when checking if an object contains the provided entry.
-   *
-   * @param {Array.<String, String>} entry
-   */
-  toContainEntry(entry: [string, string]): void,
-  /**
-   * Use `.toContainEntries` when checking if an object contains all of the provided entries.
-   *
-   * @param {Array.<Array.<String, String>>} entries
-   */
-  toContainEntries(entries: [string, string][]): void,
-  /**
-   * Use `.toContainAllEntries` when checking if an object only contains all of the provided entries.
-   *
-   * @param {Array.<Array.<String, String>>} entries
-   */
-  toContainAllEntries(entries: [string, string][]): void,
-  /**
-   * Use `.toContainAnyEntries` when checking if an object contains at least one of the provided entries.
-   *
-   * @param {Array.<Array.<String, String>>} entries
-   */
-  toContainAnyEntries(entries: [string, string][]): void,
-  /**
-   * Use `.toBeExtensible` when checking if an object is extensible.
-   */
-  toBeExtensible(): void,
-  /**
-   * Use `.toBeFrozen` when checking if an object is frozen.
-   */
-  toBeFrozen(): void,
-  /**
-   * Use `.toBeSealed` when checking if an object is sealed.
-   */
-  toBeSealed(): void,
-  /**
-   * Use `.toBeString` when checking if a value is a `String`.
-   */
-  toBeString(): void,
-  /**
-   * Use `.toEqualCaseInsensitive` when checking if a string is equal (===) to another ignoring the casing of both strings.
-   *
-   * @param {String} string
-   */
-  toEqualCaseInsensitive(string: string): void,
-  /**
-   * Use `.toStartWith` when checking if a `String` starts with a given `String` prefix.
-   *
-   * @param {String} prefix
-   */
-  toStartWith(prefix: string): void,
-  /**
-   * Use `.toEndWith` when checking if a `String` ends with a given `String` suffix.
-   *
-   * @param {String} suffix
-   */
-  toEndWith(suffix: string): void,
-  /**
-   * Use `.toInclude` when checking if a `String` includes the given `String` substring.
-   *
-   * @param {String} substring
-   */
-  toInclude(substring: string): void,
-  /**
-   * Use `.toIncludeRepeated` when checking if a `String` includes the given `String` substring the correct number of times.
-   *
-   * @param {String} substring
-   * @param {Number} times
-   */
-  toIncludeRepeated(substring: string, times: number): void,
-  /**
-   * Use `.toIncludeMultiple` when checking if a `String` includes all of the given substrings.
-   *
-   * @param {Array.<String>} substring
-   */
-  toIncludeMultiple(substring: string[]): void,
-  ...
-};
-
-interface JestExpectType {
-  not: JestExpectType &
-    EnzymeMatchersType &
-    DomTestingLibraryType &
-    JestJQueryMatchersType &
-    JestStyledComponentsMatchersType &
-    JestExtendedMatchersType;
-
-  /**
-   * If you have a mock function, you can use .lastCalledWith to test what
-   * arguments it was last called with.
-   */
-  lastCalledWith(...args: Array<any>): void;
-
-  /**
-   * toBe just checks that a value is what you expect. It uses === to check
-   * strict equality.
-   */
-  toBe(value: any): void;
-
-  /**
-   * Use .toBeCalledWith to ensure that a mock function was called with
-   * specific arguments.
-   */
-  toBeCalledWith(...args: Array<any>): void;
-
-  /**
-   * Using exact equality with floating point numbers is a bad idea. Rounding
-   * means that intuitive things fail.
-   */
-  toBeCloseTo(num: number, delta: any): void;
-
-  /**
-   * Use .toBeDefined to check that a variable is not undefined.
-   */
-  toBeDefined(): void;
-
-  /**
-   * Use .toBeFalsy when you don't care what a value is, you just want to
-   * ensure a value is false in a boolean context.
-   */
-  toBeFalsy(): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeGreaterThan.
-   */
-  toBeGreaterThan(number: number): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeGreaterThanOrEqual.
-   */
-  toBeGreaterThanOrEqual(number: number): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeLessThan.
-   */
-  toBeLessThan(number: number): void;
-
-  /**
-   * To compare floating point numbers, you can use toBeLessThanOrEqual.
-   */
-  toBeLessThanOrEqual(number: number): void;
-
-  /**
-   * Use .toBeInstanceOf(Class) to check that an object is an instance of a
-   * class.
-   */
-  toBeInstanceOf(cls: Class<*>): void;
-
-  /**
-   * .toBeNull() is the same as .toBe(null) but the error messages are a bit
-   * nicer.
-   */
-  toBeNull(): void;
-
-  /**
-   * Use .toBeTruthy when you don't care what a value is, you just want to
-   * ensure a value is true in a boolean context.
-   */
-  toBeTruthy(): void;
-
-  /**
-   * Use .toBeUndefined to check that a variable is undefined.
-   */
-  toBeUndefined(): void;
-
-  /**
-   * Use .toContain when you want to check that an item is in a list. For
-   * testing the items in the list, this uses ===, a strict equality check.
-   */
-  toContain(item: any): void;
-
-  /**
-   * Use .toContainEqual when you want to check that an item is in a list. For
-   * testing the items in the list, this matcher recursively checks the
-   * equality of all fields, rather than checking for object identity.
-   */
-  toContainEqual(item: any): void;
-
-  /**
-   * Use .toEqual when you want to check that two objects have the same value.
-   * This matcher recursively checks the equality of all fields, rather than
-   * checking for object identity.
-   */
-  toEqual(value: any): void;
-
-  /**
-   * Use .toHaveBeenCalled to ensure that a mock function got called.
-   */
-  toHaveBeenCalled(): void;
-
-  toBeCalled(): void;
-
-  /**
-   * Use .toHaveBeenCalledTimes to ensure that a mock function got called exact
-   * number of times.
-   */
-  toHaveBeenCalledTimes(number: number): void;
-
-  toBeCalledTimes(number: number): void;
-
-  /**
-   *
-   */
-  toHaveBeenNthCalledWith(nthCall: number, ...args: Array<any>): void;
-
-  nthCalledWith(nthCall: number, ...args: Array<any>): void;
-
-  /**
-   *
-   */
-  toHaveReturned(): void;
-
-  toReturn(): void;
-
-  /**
-   *
-   */
-  toHaveReturnedTimes(number: number): void;
-
-  toReturnTimes(number: number): void;
-
-  /**
-   *
-   */
-  toHaveReturnedWith(value: any): void;
-
-  toReturnWith(value: any): void;
-
-  /**
-   *
-   */
-  toHaveLastReturnedWith(value: any): void;
-
-  lastReturnedWith(value: any): void;
-
-  /**
-   *
-   */
-  toHaveNthReturnedWith(nthCall: number, value: any): void;
-
-  nthReturnedWith(nthCall: number, value: any): void;
-
-  /**
-   * Use .toHaveBeenCalledWith to ensure that a mock function was called with
-   * specific arguments.
-   */
-  toHaveBeenCalledWith(...args: Array<any>): void;
-
-  toBeCalledWith(...args: Array<any>): void;
-
-  /**
-   * Use .toHaveBeenLastCalledWith to ensure that a mock function was last called
-   * with specific arguments.
-   */
-  toHaveBeenLastCalledWith(...args: Array<any>): void;
-
-  lastCalledWith(...args: Array<any>): void;
-
-  /**
-   * Check that an object has a .length property and it is set to a certain
-   * numeric value.
-   */
-  toHaveLength(number: number): void;
-
-  /**
-   *
-   */
-  toHaveProperty(propPath: string | $ReadOnlyArray<string>, value?: any): void;
-
-  /**
-   * Use .toMatch to check that a string matches a regular expression or string.
-   */
-  toMatch(regexpOrString: RegExp | string): void;
-
-  /**
-   * Use .toMatchObject to check that a javascript object matches a subset of the properties of an object.
-   */
-  toMatchObject(object: Object | Array<Object>): void;
-
-  /**
-   * Use .toStrictEqual to check that a javascript object matches a subset of the properties of an object.
-   */
-  toStrictEqual(value: any): void;
-
-  /**
-   * This ensures that an Object matches the most recent snapshot.
-   */
-  toMatchSnapshot(propertyMatchers?: any, name?: string): void;
-
-  /**
-   * This ensures that an Object matches the most recent snapshot.
-   */
-  toMatchSnapshot(name: string): void;
-
-  toMatchInlineSnapshot(snapshot?: string): void;
-
-  toMatchInlineSnapshot(propertyMatchers?: any, snapshot?: string): void;
-
-  /**
-   * Use .toThrow to test that a function throws when it is called.
-   * If you want to test that a specific error gets thrown, you can provide an
-   * argument to toThrow. The argument can be a string for the error message,
-   * a class for the error, or a regex that should match the error.
-   *
-   * Alias: .toThrowError
-   */
-  toThrow(message?: string | Error | Class<Error> | RegExp): void;
-
-  toThrowError(message?: string | Error | Class<Error> | RegExp): void;
-
-  /**
-   * Use .toThrowErrorMatchingSnapshot to test that a function throws a error
-   * matching the most recent snapshot when it is called.
-   */
-  toThrowErrorMatchingSnapshot(): void;
-
-  toThrowErrorMatchingInlineSnapshot(snapshot?: string): void;
-}
-
-type JestObjectType = {
-  /**
-   *  Disables automatic mocking in the module loader.
-   *
-   *  After this method is called, all `require()`s will return the real
-   *  versions of each module (rather than a mocked version).
-   */
-  disableAutomock(): JestObjectType,
-  /**
-   * An un-hoisted version of disableAutomock
-   */
-  autoMockOff(): JestObjectType,
-  /**
-   * Enables automatic mocking in the module loader.
-   */
-  enableAutomock(): JestObjectType,
-  /**
-   * An un-hoisted version of enableAutomock
-   */
-  autoMockOn(): JestObjectType,
-  /**
-   * Clears the mock.calls and mock.instances properties of all mocks.
-   * Equivalent to calling .mockClear() on every mocked function.
-   */
-  clearAllMocks(): JestObjectType,
-  /**
-   * Resets the state of all mocks. Equivalent to calling .mockReset() on every
-   * mocked function.
-   */
-  resetAllMocks(): JestObjectType,
-  /**
-   * Restores all mocks back to their original value.
-   */
-  restoreAllMocks(): JestObjectType,
-  /**
-   * Removes any pending timers from the timer system.
-   */
-  clearAllTimers(): void,
-  /**
-   * Returns the number of fake timers still left to run.
-   */
-  getTimerCount(): number,
-  /**
-   * The same as `mock` but not moved to the top of the expectation by
-   * babel-jest.
-   */
-  doMock(moduleName: string, moduleFactory?: any): JestObjectType,
-  /**
-   * The same as `unmock` but not moved to the top of the expectation by
-   * babel-jest.
-   */
-  dontMock(moduleName: string): JestObjectType,
-  /**
-   * Returns a new, unused mock function. Optionally takes a mock
-   * implementation.
-   */
-  fn<TArguments: $ReadOnlyArray<*>, TReturn>(
-    implementation?: (...args: TArguments) => TReturn,
-  ): JestMockFn<TArguments, TReturn>,
-  /**
-   * Determines if the given function is a mocked function.
-   */
-  isMockFunction(fn: Function): boolean,
-  /**
-   * Given the name of a module, use the automatic mocking system to generate a
-   * mocked version of the module for you.
-   */
-  genMockFromModule(moduleName: string): any,
-  /**
-   * Mocks a module with an auto-mocked version when it is being required.
-   *
-   * The second argument can be used to specify an explicit module factory that
-   * is being run instead of using Jest's automocking feature.
-   *
-   * The third argument can be used to create virtual mocks -- mocks of modules
-   * that don't exist anywhere in the system.
-   */
-  mock(moduleName: string, moduleFactory?: any, options?: Object): JestObjectType,
-  /**
-   * Returns the actual module instead of a mock, bypassing all checks on
-   * whether the module should receive a mock implementation or not.
-   */
-  requireActual(moduleName: string): any,
-  /**
-   * Returns a mock module instead of the actual module, bypassing all checks
-   * on whether the module should be required normally or not.
-   */
-  requireMock(moduleName: string): any,
-  /**
-   * Resets the module registry - the cache of all required modules. This is
-   * useful to isolate modules where local state might conflict between tests.
-   */
-  resetModules(): JestObjectType,
-  /**
-   * Creates a sandbox registry for the modules that are loaded inside the
-   * callback function. This is useful to isolate specific modules for every
-   * test so that local module state doesn't conflict between tests.
-   */
-  isolateModules(fn: () => void): JestObjectType,
-  /**
-   * Exhausts the micro-task queue (usually interfaced in node via
-   * process.nextTick).
-   */
-  runAllTicks(): void,
-  /**
-   * Exhausts the macro-task queue (i.e., all tasks queued by setTimeout(),
-   * setInterval(), and setImmediate()).
-   */
-  runAllTimers(): void,
-  /**
-   * Exhausts all tasks queued by setImmediate().
-   */
-  runAllImmediates(): void,
-  /**
-   * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-   * or setInterval() and setImmediate()).
-   */
-  advanceTimersByTime(msToRun: number): void,
-  /**
-   * Executes only the macro task queue (i.e. all tasks queued by setTimeout()
-   * or setInterval() and setImmediate()).
-   *
-   * Renamed to `advanceTimersByTime`.
-   */
-  runTimersToTime(msToRun: number): void,
-  /**
-   * Executes only the macro-tasks that are currently pending (i.e., only the
-   * tasks that have been queued by setTimeout() or setInterval() up to this
-   * point)
-   */
-  runOnlyPendingTimers(): void,
-  /**
-   * Explicitly supplies the mock object that the module system should return
-   * for the specified module. Note: It is recommended to use jest.mock()
-   * instead.
-   */
-  setMock(moduleName: string, moduleExports: any): JestObjectType,
-  /**
-   * Indicates that the module system should never return a mocked version of
-   * the specified module from require() (e.g. that it should always return the
-   * real module).
-   */
-  unmock(moduleName: string): JestObjectType,
-  /**
-   * Instructs Jest to use fake versions of the standard timer functions
-   * (setTimeout, setInterval, clearTimeout, clearInterval, nextTick,
-   * setImmediate and clearImmediate).
-   */
-  useFakeTimers(): JestObjectType,
-  /**
-   * Instructs Jest to use the real versions of the standard timer functions.
-   */
-  useRealTimers(): JestObjectType,
-  /**
-   * Creates a mock function similar to jest.fn but also tracks calls to
-   * object[methodName].
-   */
-  spyOn(object: Object, methodName: string, accessType?: 'get' | 'set'): JestMockFn<any, any>,
-  /**
-   * Set the default timeout interval for tests and before/after hooks in milliseconds.
-   * Note: The default timeout interval is 5 seconds if this method is not called.
-   */
-  setTimeout(timeout: number): JestObjectType,
-  ...
-};
-
-type JestSpyType = { calls: JestCallsType, ... };
-
-type JestDoneFn = {|
-  (): void,
-  fail: (error: Error) => void,
-|};
-
-/** Runs this function after every test inside this context */
-declare function afterEach(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** Runs this function before every test inside this context */
-declare function beforeEach(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** Runs this function after all tests have finished inside this context */
-declare function afterAll(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** Runs this function before any tests have started inside this context */
-declare function beforeAll(fn: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void;
-
-/** A context for grouping tests together */
-declare var describe: {
-  /**
-   * Creates a block that groups together several related tests in one "test suite"
-   */
-  (name: JestTestName, fn: () => void): void,
-  /**
-   * Only run this describe block
-   */
-  only(name: JestTestName, fn: () => void): void,
-  /**
-   * Skip running this describe block
-   */
-  skip(name: JestTestName, fn: () => void): void,
-  /**
-   * each runs this test against array of argument arrays per each run
-   *
-   * @param {table} table of Test
-   */
-  each(
-    ...table: Array<Array<mixed> | mixed> | [Array<string>, string]
-  ): (name: JestTestName, fn?: (...args: Array<any>) => ?Promise<mixed>, timeout?: number) => void,
-  ...
-};
-
-/** An individual test unit */
-declare var it: {
-  /**
-   * An individual test unit
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  (name: JestTestName, fn?: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void,
-  /**
-   * Only run this test
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  only: {|
-    (name: JestTestName, fn?: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void,
-    each(
-      ...table: Array<Array<mixed> | mixed> | [Array<string>, string]
-    ): (
-      name: JestTestName,
-      fn?: (...args: Array<any>) => ?Promise<mixed>,
-      timeout?: number,
-    ) => void,
-  |},
-  /**
-   * Skip running this test
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  skip(name: JestTestName, fn?: (done: JestDoneFn) => ?Promise<mixed>, timeout?: number): void,
-  /**
-   * Highlight planned tests in the summary output
-   *
-   * @param {String} Name of Test to do
-   */
-  todo(name: string): void,
-  /**
-   * Run the test concurrently
-   *
-   * @param {JestTestName} Name of Test
-   * @param {Function} Test
-   * @param {number} Timeout for the test, in milliseconds.
-   */
-  concurrent(
-    name: JestTestName,
-    fn?: (done: JestDoneFn) => ?Promise<mixed>,
-    timeout?: number,
-  ): void,
-  /**
-   * each runs this test against array of argument arrays per each run
-   *
-   * @param {table} table of Test
-   */
-  each(
-    ...table: Array<Array<mixed> | mixed> | [Array<string>, string]
-  ): (name: JestTestName, fn?: (...args: Array<any>) => ?Promise<mixed>, timeout?: number) => void,
-  ...
-};
-
-declare function fit(
-  name: JestTestName,
-  fn: (done: JestDoneFn) => ?Promise<mixed>,
-  timeout?: number,
-): void;
-
-/** An individual test unit */
-declare var test: typeof it;
-/** A disabled group of tests */
-declare var xdescribe: typeof describe;
-/** A focused group of tests */
-declare var fdescribe: typeof describe;
-/** A disabled individual test */
-declare var xit: typeof it;
-/** A disabled individual test */
-declare var xtest: typeof it;
-
-type JestPrettyFormatColors = {
-  comment: {
-    close: string,
-    open: string,
-    ...
-  },
-  content: {
-    close: string,
-    open: string,
-    ...
-  },
-  prop: {
-    close: string,
-    open: string,
-    ...
-  },
-  tag: {
-    close: string,
-    open: string,
-    ...
-  },
-  value: {
-    close: string,
-    open: string,
-    ...
-  },
-  ...
-};
-
-type JestPrettyFormatIndent = string => string;
-type JestPrettyFormatRefs = Array<any>;
-type JestPrettyFormatPrint = any => string;
-type JestPrettyFormatStringOrNull = string | null;
-
-type JestPrettyFormatOptions = {|
-  callToJSON: boolean,
-  edgeSpacing: string,
-  escapeRegex: boolean,
-  highlight: boolean,
-  indent: number,
-  maxDepth: number,
-  min: boolean,
-  plugins: JestPrettyFormatPlugins,
-  printFunctionName: boolean,
-  spacing: string,
-  theme: {|
-    comment: string,
-    content: string,
-    prop: string,
-    tag: string,
-    value: string,
-  |},
-|};
-
-type JestPrettyFormatPlugin = {
-  print: (
-    val: any,
-    serialize: JestPrettyFormatPrint,
-    indent: JestPrettyFormatIndent,
-    opts: JestPrettyFormatOptions,
-    colors: JestPrettyFormatColors,
-  ) => string,
-  test: any => boolean,
-  ...
-};
-
-type JestPrettyFormatPlugins = Array<JestPrettyFormatPlugin>;
-
-/** The expect function is used every time you want to test a value */
-declare var expect: {
-  /** The object that you want to make assertions against */
-  (
-    value: any,
-  ): JestExpectType &
-    JestPromiseType &
-    EnzymeMatchersType &
-    DomTestingLibraryType &
-    JestJQueryMatchersType &
-    JestStyledComponentsMatchersType &
-    JestExtendedMatchersType,
-  /** Add additional Jasmine matchers to Jest's roster */
-  extend(matchers: { [name: string]: JestMatcher, ... }): void,
-  /** Add a module that formats application-specific data structures. */
-  addSnapshotSerializer(pluginModule: JestPrettyFormatPlugin): void,
-  assertions(expectedAssertions: number): void,
-  hasAssertions(): void,
-  any(value: mixed): JestAsymmetricEqualityType,
-  anything(): any,
-  arrayContaining(value: Array<mixed>): Array<mixed>,
-  objectContaining(value: Object): Object,
-  /** Matches any received string that contains the exact expected string. */
-  stringContaining(value: string): string,
-  stringMatching(value: string | RegExp): string,
-  not: {
-    arrayContaining: (value: $ReadOnlyArray<mixed>) => Array<mixed>,
-    objectContaining: (value: { ... }) => Object,
-    stringContaining: (value: string) => string,
-    stringMatching: (value: string | RegExp) => string,
-    ...
-  },
-  ...
-};
-
-// TODO handle return type
-// http://jasmine.github.io/2.4/introduction.html#section-Spies
-declare function spyOn(value: mixed, method: string): Object;
-
-/** Holds all functions related to manipulating test runner */
-declare var jest: JestObjectType;
-
-/**
- * The global Jasmine object, this is generally not exposed as the public API,
- * using features inside here could break in later versions of Jest.
- */
-declare var jasmine: {
-  DEFAULT_TIMEOUT_INTERVAL: number,
-  any(value: mixed): JestAsymmetricEqualityType,
-  anything(): any,
-  arrayContaining(value: Array<mixed>): Array<mixed>,
-  clock(): JestClockType,
-  createSpy(name: string): JestSpyType,
-  createSpyObj(
-    baseName: string,
-    methodNames: Array<string>,
-  ): { [methodName: string]: JestSpyType, ... },
-  objectContaining(value: Object): Object,
-  stringMatching(value: string): string,
-  ...
-};
diff --git a/packages/openapi-2-kong/flow-typed/slugify.js b/packages/openapi-2-kong/flow-typed/slugify.js
deleted file mode 100644
index ffe8455340..0000000000
--- a/packages/openapi-2-kong/flow-typed/slugify.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'slugify' {
-  declare module.exports: (str: string, options: Object) => string;
-}
diff --git a/packages/openapi-2-kong/flow-typed/swagger-parser.js b/packages/openapi-2-kong/flow-typed/swagger-parser.js
deleted file mode 100644
index 89939a5a67..0000000000
--- a/packages/openapi-2-kong/flow-typed/swagger-parser.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// @flow
-
-declare module 'swagger-parser' {
-  declare module.exports: {
-    dereference: any => Promise<any>,
-    YAML: {
-      parse: any => any,
-      dereference: string => any,
-    },
-  };
-}
diff --git a/packages/openapi-2-kong/flow-typed/url-join.js b/packages/openapi-2-kong/flow-typed/url-join.js
deleted file mode 100644
index 1b9a82cf3c..0000000000
--- a/packages/openapi-2-kong/flow-typed/url-join.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-declare module 'url-join' {
-  declare module.exports: *;
-}
diff --git a/packages/openapi-2-kong/jest.config.js b/packages/openapi-2-kong/jest.config.js
new file mode 100644
index 0000000000..a96ee54100
--- /dev/null
+++ b/packages/openapi-2-kong/jest.config.js
@@ -0,0 +1,19 @@
+/** @type { import('@jest/types').Config.InitialOptions } */
+module.exports = {
+  globals: {
+    'ts-jest': {
+      isolatedModules: true,
+    },
+  },
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+  testRegex: ['.+\\.test\\.ts$'],
+  collectCoverage: false,
+  resetMocks: true,
+  resetModules: true,
+  collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  coverageReporters: ['text-summary', 'lcov'],
+};
diff --git a/packages/openapi-2-kong/package-lock.json b/packages/openapi-2-kong/package-lock.json
index 71fc0f0f1e..53f6863922 100644
--- a/packages/openapi-2-kong/package-lock.json
+++ b/packages/openapi-2-kong/package-lock.json
@@ -241,16 +241,6 @@
       "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
       "dev": true
     },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz",
-      "integrity": "sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
-      }
-    },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
@@ -1259,6 +1249,21 @@
       "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
       "dev": true
     },
+    "@types/url-join": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/url-join/-/url-join-4.0.0.tgz",
+      "integrity": "sha512-awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw==",
+      "dev": true
+    },
+    "@types/yaml": {
+      "version": "1.9.7",
+      "resolved": "https://registry.npmjs.org/@types/yaml/-/yaml-1.9.7.tgz",
+      "integrity": "sha512-8WMXRDD1D+wCohjfslHDgICd2JtMATZU8CkhH8LVJqcJs6dyYj5TGptzP8wApbmEullGBSsCEzzap73DQ1HJaA==",
+      "dev": true,
+      "requires": {
+        "yaml": "*"
+      }
+    },
     "@types/yargs": {
       "version": "15.0.13",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
@@ -1274,193 +1279,6 @@
       "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
       "dev": true
     },
-    "@webassemblyjs/ast": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
-      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0"
-      }
-    },
-    "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
-      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-api-error": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
-      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-buffer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
-      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-code-frame": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
-      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "@webassemblyjs/helper-fsm": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
-      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-module-context": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
-      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0"
-      }
-    },
-    "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
-      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-wasm-section": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
-      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0"
-      }
-    },
-    "@webassemblyjs/ieee754": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
-      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
-      "dev": true,
-      "requires": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "@webassemblyjs/leb128": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
-      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
-      "dev": true,
-      "requires": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/utf8": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
-      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
-      "dev": true
-    },
-    "@webassemblyjs/wasm-edit": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
-      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/helper-wasm-section": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-opt": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "@webassemblyjs/wasm-gen": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
-      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
-      }
-    },
-    "@webassemblyjs/wasm-opt": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
-      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0"
-      }
-    },
-    "@webassemblyjs/wasm-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
-      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
-      }
-    },
-    "@webassemblyjs/wast-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
-      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-code-frame": "1.9.0",
-        "@webassemblyjs/helper-fsm": "1.9.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/wast-printer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
-      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
     "abab": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
@@ -1489,30 +1307,6 @@
       "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
       "dev": true
     },
-    "ajv": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^2.0.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ajv-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true
-    },
-    "ajv-keywords": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
-      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
-      "dev": true
-    },
     "ansi-escapes": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
@@ -1566,12 +1360,6 @@
         }
       }
     },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
-    },
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -1613,44 +1401,6 @@
         "safer-buffer": "~2.1.0"
       }
     },
-    "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        },
-        "util": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.1"
-          }
-        }
-      }
-    },
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
@@ -1663,12 +1413,6 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true
     },
-    "async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
-    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -1882,12 +1626,6 @@
         }
       }
     },
-    "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
-      "dev": true
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -1897,30 +1635,6 @@
         "tweetnacl": "^0.14.3"
       }
     },
-    "big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true
-    },
-    "binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true
-    },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-      "dev": true
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1960,97 +1674,12 @@
         }
       }
     },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
     "browser-process-hrtime": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
       "dev": true
     },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
-      }
-    },
-    "browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "requires": {
-        "pako": "~1.0.5"
-      },
-      "dependencies": {
-        "pako": {
-          "version": "1.0.10",
-          "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
-          "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
-          "dev": true
-        }
-      }
-    },
     "bser": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
@@ -2060,58 +1689,12 @@
         "node-int64": "^0.4.0"
       }
     },
-    "buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
       "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
       "dev": true
     },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "cacache": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "infer-owner": "^1.0.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
-      }
-    },
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -2178,57 +1761,12 @@
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
       "dev": true
     },
-    "chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "requires": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "fsevents": "^1.2.7",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      }
-    },
-    "chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "chrome-trace-event": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
-      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
     "ci-info": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
       "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
       "dev": true
     },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "cjs-module-lexer": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
@@ -2258,34 +1796,6 @@
         }
       }
     },
-    "cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-      "dev": true,
-      "requires": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -2335,13 +1845,8 @@
     "commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "optional": true
     },
     "component-emitter": {
       "version": "1.3.0",
@@ -2355,30 +1860,6 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
     "convert-source-map": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
@@ -2388,20 +1869,6 @@
         "safe-buffer": "~5.1.1"
       }
     },
-    "copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
-      }
-    },
     "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
@@ -2414,43 +1881,6 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
       "dev": true
     },
-    "create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
-      }
-    },
-    "create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
     "cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -2464,25 +1894,6 @@
         "which": "^1.2.9"
       }
     },
-    "crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      }
-    },
     "cssom": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
@@ -2506,12 +1917,6 @@
         }
       }
     },
-    "cyclist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
-      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
-      "dev": true
-    },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -2618,22 +2023,6 @@
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
       "dev": true
     },
-    "des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-      "dev": true
-    },
     "detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
@@ -2646,23 +2035,6 @@
       "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
       "dev": true
     },
-    "diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true
-    },
     "domexception": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
@@ -2680,18 +2052,6 @@
         }
       }
     },
-    "duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -2702,39 +2062,12 @@
         "safer-buffer": "^2.1.0"
       }
     },
-    "elliptic": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
-      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
-      }
-    },
     "emittery": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
       "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
       "dev": true
     },
-    "emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true
-    },
     "end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -2744,38 +2077,6 @@
         "once": "^1.4.0"
       }
     },
-    "enhanced-resolve": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
-      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.5.0",
-        "tapable": "^1.0.0"
-      },
-      "dependencies": {
-        "memory-fs": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-          "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-          "dev": true,
-          "requires": {
-            "errno": "^0.1.3",
-            "readable-stream": "^2.0.1"
-          }
-        }
-      }
-    },
-    "errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-      "dev": true,
-      "requires": {
-        "prr": "~1.0.1"
-      }
-    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -2804,30 +2105,11 @@
         "source-map": "~0.6.1"
       }
     },
-    "eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
-    "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.1.0"
-      }
-    },
     "estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
@@ -2840,22 +2122,6 @@
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true
     },
-    "events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
-      "dev": true
-    },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
     "exec-sh": {
       "version": "0.3.4",
       "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
@@ -2933,15 +2199,6 @@
         }
       }
     },
-    "expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "^1.0.1"
-      }
-    },
     "expect": {
       "version": "26.6.2",
       "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
@@ -3080,12 +2337,6 @@
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
       "dev": true
     },
-    "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
-    },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -3107,12 +2358,6 @@
         "bser": "2.1.1"
       }
     },
-    "figgy-pudding": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
-      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
-      "dev": true
-    },
     "fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -3136,59 +2381,6 @@
         }
       }
     },
-    "find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "dev": true,
-      "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "dependencies": {
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        }
-      }
-    },
-    "find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^3.0.0"
-      }
-    },
-    "findup-sync": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
-      "dev": true,
-      "requires": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      }
-    },
-    "flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -3221,576 +2413,12 @@
         "map-cache": "^0.2.2"
       }
     },
-    "from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "fs-write-stream-atomic": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
-      }
-    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "fsevents": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
-      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nan": "^2.12.1",
-        "node-pre-gyp": "^0.12.0"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "chownr": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "debug": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "deep-extend": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "fs-minipass": {
-          "version": "1.2.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.2.1"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
-        "ignore-walk": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimatch": "^3.0.4"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minipass": {
-          "version": "2.3.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          }
-        },
-        "minizlib": {
-          "version": "1.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.2.1"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "needle": {
-          "version": "2.3.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "^4.1.0",
-            "iconv-lite": "^0.4.4",
-            "sax": "^1.2.4"
-          }
-        },
-        "node-pre-gyp": {
-          "version": "0.12.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "^1.0.2",
-            "mkdirp": "^0.5.1",
-            "needle": "^2.2.1",
-            "nopt": "^4.0.1",
-            "npm-packlist": "^1.1.6",
-            "npmlog": "^4.0.2",
-            "rc": "^1.2.7",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^4"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "npm-packlist": {
-          "version": "1.4.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sax": {
-          "version": "1.2.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "5.7.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "4.4.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.4",
-            "minizlib": "^1.1.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "wide-align": {
-          "version": "1.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "^1.0.2 || 2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "yallist": {
-          "version": "3.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -3853,74 +2481,12 @@
         "path-is-absolute": "^1.0.0"
       }
     },
-    "glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      },
-      "dependencies": {
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
-      }
-    },
-    "global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
-      "requires": {
-        "global-prefix": "^3.0.0"
-      },
-      "dependencies": {
-        "global-prefix": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-          "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-          "dev": true,
-          "requires": {
-            "ini": "^1.3.5",
-            "kind-of": "^6.0.2",
-            "which": "^1.3.1"
-          }
-        }
-      }
-    },
-    "global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      }
-    },
     "globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true
     },
-    "graceful-fs": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
-      "dev": true
-    },
     "growly": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
@@ -4011,46 +2577,6 @@
         }
       }
     },
-    "hash-base": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
-      "requires": {
-        "parse-passwd": "^1.0.0"
-      }
-    },
     "hosted-git-info": {
       "version": "2.8.8",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
@@ -4083,12 +2609,6 @@
         "sshpk": "^1.7.0"
       }
     },
-    "https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-      "dev": true
-    },
     "human-signals": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
@@ -4104,51 +2624,12 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
-    "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "dev": true
-    },
-    "iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
-      "dev": true
-    },
-    "import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-      "dev": true,
-      "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
-      },
-      "dependencies": {
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        }
-      }
-    },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
     },
-    "infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "dev": true
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -4165,24 +2646,6 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "interpret": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
-      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
-      "dev": true
-    },
-    "invert-kv": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-      "dev": true
-    },
     "ip-regex": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
@@ -4215,15 +2678,6 @@
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
       "dev": true
     },
-    "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^1.0.0"
-      }
-    },
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
@@ -4300,33 +2754,12 @@
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
       "dev": true
     },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true
-    },
     "is-generator-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true
     },
-    "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
     "is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -4380,12 +2813,6 @@
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true
     },
-    "is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-      "dev": true
-    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -6119,12 +4546,6 @@
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
     "json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -6159,15 +4580,6 @@
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
       "dev": true
     },
-    "json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.0"
-      }
-    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -6192,15 +4604,6 @@
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true
     },
-    "lcid": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^2.0.0"
-      }
-    },
     "leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -6223,33 +4626,6 @@
       "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
       "dev": true
     },
-    "loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-      "dev": true
-    },
-    "loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      }
-    },
-    "locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      }
-    },
     "lodash": {
       "version": "4.17.15",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
@@ -6272,25 +4648,6 @@
       "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
       "dev": true
     },
-    "lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "requires": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "requires": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      }
-    },
     "makeerror": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
@@ -6300,15 +4657,6 @@
         "tmpl": "1.0.x"
       }
     },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dev": true,
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -6324,46 +4672,6 @@
         "object-visit": "^1.0.0"
       }
     },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "mem": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-      "dev": true,
-      "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^2.0.0",
-        "p-is-promise": "^2.0.0"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-          "dev": true
-        }
-      }
-    },
-    "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
     "merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -6391,16 +4699,6 @@
         "to-regex": "^3.0.2"
       }
     },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      }
-    },
     "mime-db": {
       "version": "1.45.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz",
@@ -6422,18 +4720,6 @@
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true
     },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -6449,24 +4735,6 @@
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
       "dev": true
     },
-    "mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "dev": true,
-      "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      }
-    },
     "mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
@@ -6488,50 +4756,12 @@
         }
       }
     },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
-      }
-    },
-    "move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
-      }
-    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "nan": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
-      "dev": true,
-      "optional": true
-    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -6557,12 +4787,6 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
-      "dev": true
-    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -6575,45 +4799,6 @@
       "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
       "dev": true
     },
-    "node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        }
-      }
-    },
     "node-modules-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
@@ -6723,12 +4908,6 @@
       "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
       "dev": true
     },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
-    },
     "object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
@@ -6807,9 +4986,9 @@
       "integrity": "sha512-KtMWcK2VtOS+nD8RKSIyScJsj8JrmVWcIX7Kjx4xEHijFYuvMTDON8WfeKOgeSb4uNG6UsqLj5Na7nKbSav9RQ=="
     },
     "openapi-types": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.5.tgz",
-      "integrity": "sha512-11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-8.0.0.tgz",
+      "integrity": "sha512-dcHYyCDOAy4QQTrur5Sn1L3lPVspB7rd04Rw/Q7AsMvfV797IiWgmKziFCbq8VhnBoREU/SPPSBDxtK9Biwa1g=="
     },
     "optionator": {
       "version": "0.8.3",
@@ -6825,29 +5004,6 @@
         "word-wrap": "~1.2.3"
       }
     },
-    "os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
-    "os-locale": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-      "dev": true,
-      "requires": {
-        "execa": "^1.0.0",
-        "lcid": "^2.0.0",
-        "mem": "^4.0.0"
-      }
-    },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
-      "dev": true
-    },
     "p-each-series": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
@@ -6860,12 +5016,6 @@
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
       "dev": true
     },
-    "p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
-      "dev": true
-    },
     "p-limit": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
@@ -6875,46 +5025,12 @@
         "p-try": "^2.0.0"
       }
     },
-    "p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^2.0.0"
-      }
-    },
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true
     },
-    "parallel-transform": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
-      "dev": true,
-      "requires": {
-        "cyclist": "^1.0.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      }
-    },
-    "parse-asn1": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
-      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
-      "dev": true,
-      "requires": {
-        "asn1.js": "^4.0.0",
-        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
     "parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -6927,12 +5043,6 @@
         "lines-and-columns": "^1.1.6"
       }
     },
-    "parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-      "dev": true
-    },
     "parse5": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
@@ -6945,24 +5055,6 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
-    "path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true
-    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -6981,19 +5073,6 @@
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
-    "pbkdf2": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
-      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
-      "dev": true,
-      "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -7006,12 +5085,6 @@
       "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
       "dev": true
     },
-    "pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true
-    },
     "pirates": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
@@ -7116,24 +5189,6 @@
         }
       }
     },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
-      "dev": true
-    },
     "prompts": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz",
@@ -7144,32 +5199,12 @@
         "sisteransi": "^1.0.5"
       }
     },
-    "prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "dev": true
-    },
     "psl": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
       "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
-    "public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
     "pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -7180,29 +5215,6 @@
         "once": "^1.3.1"
       }
     },
-    "pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        }
-      }
-    },
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -7215,37 +5227,6 @@
       "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
       "dev": true
     },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "dev": true
-    },
-    "querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true
-    },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
     "react-is": {
       "version": "17.0.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz",
@@ -7316,35 +5297,15 @@
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
           "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
         }
       }
     },
-    "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "dev": true,
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      }
-    },
     "regenerator-runtime": {
       "version": "0.13.3",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
@@ -7485,44 +5446,6 @@
         "path-parse": "^1.0.6"
       }
     },
-    "resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-      "dev": true,
-      "requires": {
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      },
-      "dependencies": {
-        "global-modules": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-          "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-          "dev": true,
-          "requires": {
-            "global-prefix": "^1.0.1",
-            "is-windows": "^1.0.1",
-            "resolve-dir": "^1.0.0"
-          }
-        }
-      }
-    },
-    "resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "dev": true
-    },
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -7535,40 +5458,12 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
-    "rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
     "rsvp": {
       "version": "4.8.5",
       "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
       "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
       "dev": true
     },
-    "run-queue": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1"
-      }
-    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -7616,29 +5511,12 @@
         "xmlchars": "^2.2.0"
       }
     },
-    "schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      }
-    },
     "semver": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true
     },
-    "serialize-javascript": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
-      "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
-      "dev": true
-    },
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -7668,22 +5546,6 @@
         }
       }
     },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -7857,12 +5719,6 @@
         }
       }
     },
-    "source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -7961,15 +5817,6 @@
         "tweetnacl": "~0.14.0"
       }
     },
-    "ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-      "dev": true,
-      "requires": {
-        "figgy-pudding": "^3.5.1"
-      }
-    },
     "stack-utils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
@@ -8014,45 +5861,6 @@
       "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
       "dev": true
     },
-    "stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
     "string-length": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
@@ -8063,43 +5871,6 @@
         "strip-ansi": "^6.0.0"
       }
     },
-    "string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "strip-ansi": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -8180,6 +5951,13 @@
         "openapi-types": "^1.3.5",
         "swagger-methods": "^2.0.1",
         "z-schema": "^4.1.1"
+      },
+      "dependencies": {
+        "openapi-types": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.5.tgz",
+          "integrity": "sha512-11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="
+        }
       }
     },
     "symbol-tree": {
@@ -8188,12 +5966,6 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "dev": true
     },
-    "tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-      "dev": true
-    },
     "terminal-link": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
@@ -8204,36 +5976,6 @@
         "supports-hyperlinks": "^2.0.0"
       }
     },
-    "terser-webpack-plugin": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz",
-      "integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==",
-      "dev": true,
-      "requires": {
-        "cacache": "^12.0.2",
-        "find-cache-dir": "^2.1.0",
-        "is-wsl": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^2.1.2",
-        "source-map": "^0.6.1",
-        "terser": "^4.1.2",
-        "webpack-sources": "^1.4.0",
-        "worker-farm": "^1.7.0"
-      },
-      "dependencies": {
-        "terser": {
-          "version": "4.6.7",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.7.tgz",
-          "integrity": "sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g==",
-          "dev": true,
-          "requires": {
-            "commander": "^2.20.0",
-            "source-map": "~0.6.1",
-            "source-map-support": "~0.5.12"
-          }
-        }
-      }
-    },
     "test-exclude": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
@@ -8251,37 +5993,12 @@
       "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
       "dev": true
     },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
-      "dev": true,
-      "requires": {
-        "setimmediate": "^1.0.4"
-      }
-    },
     "tmpl": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
       "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
       "dev": true
     },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -8350,18 +6067,6 @@
         "punycode": "^2.1.1"
       }
     },
-    "tslib": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
-      "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
-      "dev": true
-    },
-    "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -8393,15 +6098,9 @@
       "dev": true
     },
     "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.0.2.tgz",
+      "integrity": "sha512-a720oz3Kjbp3ll0zkeN9qjRhO7I34MKMhPGQiQJAmaZQZQ1lo+NWThK322f7sXV+kTg9B1Ybt16KgBXWgteT8w==",
       "dev": true
     },
     "typedarray-to-buffer": {
@@ -8425,24 +6124,6 @@
         "set-value": "^2.0.1"
       }
     },
-    "unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dev": true,
-      "requires": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -8483,12 +6164,6 @@
         }
       }
     },
-    "upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true
-    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -8504,24 +6179,6 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-          "dev": true
-        }
-      }
-    },
     "url-join": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
@@ -8533,29 +6190,6 @@
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
-    "util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        }
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
     "uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -8608,12 +6242,6 @@
         "extsprintf": "^1.2.0"
       }
     },
-    "vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
     "w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@@ -8641,180 +6269,12 @@
         "makeerror": "1.0.x"
       }
     },
-    "watchpack": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
-      "dev": true,
-      "requires": {
-        "chokidar": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
-      }
-    },
     "webidl-conversions": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
       "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
       "dev": true
     },
-    "webpack": {
-      "version": "4.42.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz",
-      "integrity": "sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/wasm-edit": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "acorn": "^6.2.1",
-        "ajv": "^6.10.2",
-        "ajv-keywords": "^3.4.1",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.3",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.4.0",
-        "loader-utils": "^1.2.3",
-        "memory-fs": "^0.4.1",
-        "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.3",
-        "neo-async": "^2.6.1",
-        "node-libs-browser": "^2.2.1",
-        "schema-utils": "^1.0.0",
-        "tapable": "^1.1.3",
-        "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.6.0",
-        "webpack-sources": "^1.4.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
-          "dev": true
-        },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
-          "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        }
-      }
-    },
-    "webpack-cli": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz",
-      "integrity": "sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==",
-      "dev": true,
-      "requires": {
-        "chalk": "2.4.2",
-        "cross-spawn": "6.0.5",
-        "enhanced-resolve": "4.1.0",
-        "findup-sync": "3.0.0",
-        "global-modules": "2.0.0",
-        "import-local": "2.0.0",
-        "interpret": "1.2.0",
-        "loader-utils": "1.2.3",
-        "supports-color": "6.1.0",
-        "v8-compile-cache": "2.0.3",
-        "yargs": "13.2.4"
-      },
-      "dependencies": {
-        "emojis-list": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-          "dev": true
-        },
-        "enhanced-resolve": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
-          "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "memory-fs": "^0.4.0",
-            "tapable": "^1.0.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^2.0.0",
-            "json5": "^1.0.1"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
-        "v8-compile-cache": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
-          "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "13.2.4",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
-          "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
-          "dev": true,
-          "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "os-locale": "^3.1.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-        }
-      }
-    },
-    "webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
     "whatwg-encoding": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
@@ -8862,43 +6322,6 @@
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
       "dev": true
     },
-    "worker-farm": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-      "dev": true,
-      "requires": {
-        "errno": "~0.1.7"
-      }
-    },
-    "wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -8935,24 +6358,12 @@
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
-    },
     "y18n": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
       "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
       "dev": true
     },
-    "yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
     "yaml": {
       "version": "1.7.2",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.7.2.tgz",
diff --git a/packages/openapi-2-kong/package.json b/packages/openapi-2-kong/package.json
index 990c212310..e412459489 100644
--- a/packages/openapi-2-kong/package.json
+++ b/packages/openapi-2-kong/package.json
@@ -3,33 +3,29 @@
   "license": "Apache-2.0",
   "version": "2.2.35",
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "typecheck": "flow check",
-    "test": "jest",
-    "build": "webpack --config webpack.config.js --display errors-only",
     "bootstrap": "npm run build",
+    "lint": "eslint . --ext .js,.ts,.tsx",
+    "lint:fix": "npm run lint -- --fix",
+    "clean": "tsc --build tsconfig.build.json --clean",
+    "postclean": "rimraf dist",
+    "build": "tsc --build tsconfig.build.json",
+    "test": "jest",
     "prepublish": "npm run build"
   },
-  "jest": {
-    "testMatch": [
-      "**/__tests__/**/*.test.js"
-    ],
-    "verbose": false,
-    "resetMocks": true,
-    "resetModules": true
-  },
   "dependencies": {
+    "openapi-types": "^8.0.0",
     "slugify": "^1.3.6",
     "swagger-parser": "^8.0.3",
     "url-join": "^4.0.1",
     "yaml": "^1.7.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.9.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-    "jest": "^26.6.3",
-    "webpack": "^4.42.1",
-    "webpack-cli": "^3.3.11"
+    "@types/url-join": "^4.0.0",
+    "@types/yaml": "^1.9.7",
+    "type-fest": "^1.0.2",
+    "jest": "^26.6.3"
   },
   "repository": {
     "type": "git",
diff --git a/packages/openapi-2-kong/src/__tests__/common.test.js b/packages/openapi-2-kong/src/common.test.ts
similarity index 68%
rename from packages/openapi-2-kong/src/__tests__/common.test.js
rename to packages/openapi-2-kong/src/common.test.ts
index 7f7d861feb..7378743b2f 100644
--- a/packages/openapi-2-kong/src/__tests__/common.test.js
+++ b/packages/openapi-2-kong/src/common.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import {
   distinctByProperty,
   fillServerVariables,
@@ -9,12 +8,14 @@ import {
   getPluginNameFromKey,
   getSecurity,
   getServers,
+  HttpMethodType,
   isHttpMethodKey,
   isPluginKey,
   parseUrl,
   pathVariablesToRegex,
-} from '../common';
-import { parseSpec } from '../index';
+} from './common';
+import { parseSpec } from './generate';
+import { OpenApi3Spec, OA3Operation, OA3Server } from './types/openapi3';
 
 describe('common', () => {
   const spec: OpenApi3Spec = {
@@ -23,7 +24,11 @@ describe('common', () => {
       version: '1.0.0',
       title: 'Swagger Petstore',
     },
-    servers: [{ url: 'https://server1.com/path' }],
+    servers: [
+      {
+        url: 'https://server1.com/path',
+      },
+    ],
     paths: {},
   };
 
@@ -34,14 +39,8 @@ describe('common', () => {
           description: 'test',
         },
       };
-
-      const api = {
-        ...spec,
-        paths,
-      };
-
+      const api = { ...spec, paths };
       const result = getPaths(api);
-
       expect(result).toBe(paths);
     });
   });
@@ -53,10 +52,18 @@ describe('common', () => {
         version: '1.0.0',
         title: 'Swagger Petstore',
       },
-      servers: [{ url: 'https://server1.com/path' }],
+      servers: [
+        {
+          url: 'https://server1.com/path',
+        },
+      ],
       paths: {
         '/': {
-          servers: [{ url: 'https://server2.com/path' }],
+          servers: [
+            {
+              url: 'https://server2.com/path',
+            },
+          ],
         },
       },
     };
@@ -64,25 +71,41 @@ describe('common', () => {
     it('returns path item servers', async () => {
       const s = await parseSpec(spec);
       const result = getServers(s.paths['/']);
-      expect(result).toEqual([{ url: 'https://server2.com/path' }]);
+      expect(result).toEqual([
+        {
+          url: 'https://server2.com/path',
+        },
+      ]);
     });
 
     it('returns api servers', async () => {
       const s = await parseSpec(spec);
       const result = getServers(s);
-      expect(result).toEqual([{ url: 'https://server1.com/path' }]);
+      expect(result).toEqual([
+        {
+          url: 'https://server1.com/path',
+        },
+      ]);
     });
   });
 
   describe('getSecurity()', () => {
     it('returns security from operation', () => {
       const operation: OA3Operation = {
-        security: [{ petstoreAuth: [] }],
+        security: [
+          {
+            petstoreAuth: [],
+          },
+        ],
+        // @ts-expect-error -- TSCONVERSION not sure, but this appears to be wrong maybe?
         responses: {},
       };
-
       const result = getSecurity(operation);
-      expect(result).toEqual([{ petstoreAuth: [] }]);
+      expect(result).toEqual([
+        {
+          petstoreAuth: [],
+        },
+      ]);
     });
 
     it('returns security from api', () => {
@@ -92,33 +115,64 @@ describe('common', () => {
           version: '1.0.0',
           title: 'Swagger Petstore',
         },
-        servers: [{ url: 'https://server1.com/path' }],
+        servers: [
+          {
+            url: 'https://server1.com/path',
+          },
+        ],
         paths: {
           '/': {
             post: {
-              security: [{ petstoreAuth: [] }],
+              security: [
+                {
+                  petstoreAuth: [],
+                },
+              ],
               responses: {},
             },
           },
         },
-        security: [{ anotherAuth: [] }],
+        security: [
+          {
+            anotherAuth: [],
+          },
+        ],
         components: {
           securitySchemes: {
-            petstoreAuth: { type: 'http', scheme: 'basic', name: 'name' },
-            anotherAuth: { type: 'http', scheme: 'basic', name: 'another-name' },
+            petstoreAuth: {
+              type: 'http',
+              scheme: 'basic',
+              name: 'name',
+            },
+            anotherAuth: {
+              type: 'http',
+              scheme: 'basic',
+              name: 'another-name',
+            },
           },
         },
       };
       const result = getSecurity(spec);
-      expect(result).toEqual([{ anotherAuth: [] }]);
+      expect(result).toEqual([
+        {
+          anotherAuth: [],
+        },
+      ]);
     });
   });
 
   describe('getName()', () => {
     const spec = {
       openapi: '3.0.0',
-      info: { version: '1.0.0', title: 'Swagger Petstore' },
-      servers: [{ url: 'https://server1.com/path' }],
+      info: {
+        version: '1.0.0',
+        title: 'Swagger Petstore',
+      },
+      servers: [
+        {
+          url: 'https://server1.com/path',
+        },
+      ],
       paths: {},
     };
 
@@ -135,17 +189,24 @@ describe('common', () => {
     });
 
     it('openapi object without anything', async () => {
-      const s = await parseSpec({ ...spec, info: { version: '1.0.0' } });
+      const s = await parseSpec({
+        ...spec,
+        info: {
+          version: '1.0.0',
+        },
+      });
       const result = getName(s);
       expect(result).toBe('openapi');
-
       const result2 = getName(s, 'Another Default');
       expect(result2).toBe('Another_Default');
     });
 
     it('works with slugify options', () => {
       const p = { ...spec, 'x-kong-name': 'This Needs Slugify' };
-      const result = getName(p, '', { replacement: '?', lower: true });
+      const result = getName(p, '', {
+        replacement: '?',
+        lower: true,
+      });
       expect(result).toBe('this?needs?slugify');
     });
   });
@@ -156,32 +217,52 @@ describe('common', () => {
       expect(generateSlug('foo bar')).toBe('foo_bar');
       expect(generateSlug('foo, bar')).toBe('foo_bar');
       expect(generateSlug('Foo Bar')).toBe('Foo_Bar');
-      expect(generateSlug('foo bar', { replacement: '?' })).toBe('foo?bar');
-      expect(generateSlug('FOO Bar', { lower: true })).toBe('foo_bar');
+      expect(
+        generateSlug('foo bar', {
+          replacement: '?',
+        }),
+      ).toBe('foo?bar');
+      expect(
+        generateSlug('FOO Bar', {
+          lower: true,
+        }),
+      ).toBe('foo_bar');
     });
   });
 
   describe('fillServerVariables()', () => {
     it('parses basic url', () => {
-      const server = { url: 'https://swagger.io/v1' };
+      const server = {
+        url: 'https://swagger.io/v1',
+      };
       expect(fillServerVariables(server)).toBe('https://swagger.io/v1');
     });
 
     it('replaces variables', () => {
       const server = {
         url: 'https://{subdomain}.swagger.io/v1',
-        variables: { subdomain: { default: 'petstore' } },
+        variables: {
+          subdomain: {
+            default: 'petstore',
+          },
+        },
       };
       expect(fillServerVariables(server)).toBe('https://petstore.swagger.io/v1');
     });
 
     it('fails with no default value', () => {
-      const server: Object = {
+      const server: OA3Server = {
         url: 'https://{subdomain}.swagger.io/v1',
-        variables: { subdomain: { enum: ['petstore'] } },
+        variables: {
+          // @ts-expect-error intentionally missing a required value
+          subdomain: {
+            enum: ['petstore'],
+          },
+        },
       };
 
       const fn = () => fillServerVariables(server);
+
       expect(fn).toThrowError('Server variable "subdomain" missing default value');
     });
   });
@@ -208,16 +289,28 @@ describe('common', () => {
     it('should be true if key is prefixed by x-kong-plugin-', () => {
       expect(isPluginKey('x-kong-plugin-name')).toBe(true);
     });
+
     it('should be false if key is not prefixed by x-kong-plugin-', () => {
       expect(isPluginKey('x-kong-name')).toBe(false);
     });
   });
 
-  const methods = ['get', 'put', 'post', 'options', 'delete', 'head', 'patch', 'trace'];
+  const methods: HttpMethodType[] = [
+    'GET',
+    'PUT',
+    'POST',
+    'DELETE',
+    'OPTIONS',
+    'HEAD',
+    'PATCH',
+    'TRACE',
+  ];
+
   describe('isHttpMethodKey()', () => {
     it.each(methods)('should be true for %o', method => {
       expect(isHttpMethodKey(method)).toBe(true);
     });
+
     it('should be false for non http method key', () => {
       expect(isHttpMethodKey('test')).toBe(false);
     });
@@ -264,29 +357,49 @@ describe('common', () => {
     });
 
     it('should remove objects with the same property selector - removes 2/4', () => {
-      const item1 = { name: 'a', value: 'first' };
-      const item2 = { name: 'a', value: 'second' };
-      const item3 = { name: 'b', value: 'third' };
-      const item4 = { name: 'b', value: 'fourth' };
+      const item1 = {
+        name: 'a',
+        value: 'first',
+      };
+      const item2 = {
+        name: 'a',
+        value: 'second',
+      };
+      const item3 = {
+        name: 'b',
+        value: 'third',
+      };
+      const item4 = {
+        name: 'b',
+        value: 'fourth',
+      };
       const items = [item1, item2, item3, item4];
-
       // distinct by the name property
       const filtered = distinctByProperty(items, i => i.name);
-
       // Should remove item2 and item4
       expect(filtered).toEqual([item1, item3]);
     });
 
     it('should remove objects with the same property selector - removes none', () => {
-      const item1 = { name: 'a', value: 'first' };
-      const item2 = { name: 'a', value: 'second' };
-      const item3 = { name: 'b', value: 'third' };
-      const item4 = { name: 'b', value: 'fourth' };
+      const item1 = {
+        name: 'a',
+        value: 'first',
+      };
+      const item2 = {
+        name: 'a',
+        value: 'second',
+      };
+      const item3 = {
+        name: 'b',
+        value: 'third',
+      };
+      const item4 = {
+        name: 'b',
+        value: 'fourth',
+      };
       const items = [item1, item2, item3, item4];
-
       // distinct by the value property
       const filtered = distinctByProperty(items, i => i.value);
-
       // Should remove no items
       expect(filtered).toEqual(items);
     });
diff --git a/packages/openapi-2-kong/src/common.js b/packages/openapi-2-kong/src/common.ts
similarity index 80%
rename from packages/openapi-2-kong/src/common.js
rename to packages/openapi-2-kong/src/common.ts
index a87a1d10b8..0a8aa473b6 100644
--- a/packages/openapi-2-kong/src/common.js
+++ b/packages/openapi-2-kong/src/common.ts
@@ -1,8 +1,15 @@
-// @flow
 import url from 'url';
 import slugify from 'slugify';
+import {
+  OpenApi3Spec,
+  OA3PathItem,
+  OA3Server,
+  OA3Paths,
+  OA3Operation,
+  OA3SecurityRequirement,
+} from './types/openapi3';
 
-export function getServers(obj: OpenApi3Spec | OA3PathItem): Array<OA3Server> {
+export function getServers(obj: OpenApi3Spec | OA3PathItem): OA3Server[] {
   return obj.servers || [];
 }
 
@@ -10,7 +17,7 @@ export function getPaths(obj: OpenApi3Spec): OA3Paths {
   return obj.paths || {};
 }
 
-export function getAllServers(api: OpenApi3Spec): Array<OA3Server> {
+export function getAllServers(api: OpenApi3Spec): OA3Server[] {
   const servers = getServers(api);
 
   for (const p of Object.keys(api.paths)) {
@@ -24,14 +31,14 @@ export function getAllServers(api: OpenApi3Spec): Array<OA3Server> {
 
 export function getSecurity(
   obj: OpenApi3Spec | OA3Operation | null,
-): Array<OA3SecurityRequirement> {
+): OA3SecurityRequirement[] {
   return obj?.security || [];
 }
 
-type SlugifyOptions = {
-  replacement?: string,
-  lower?: boolean,
-};
+interface SlugifyOptions {
+  replacement?: string;
+  lower?: boolean;
+}
 
 export function getName(
   api: OpenApi3Spec,
@@ -40,20 +47,15 @@ export function getName(
   isKubernetes?: boolean,
 ): string {
   let rawName = '';
-
   // Get $.info.x-kubernetes-ingress-metadata.name
   rawName = isKubernetes && api.info?.['x-kubernetes-ingress-metadata']?.name;
-
   // Get $.x-kong-name
   rawName = rawName || api['x-kong-name'];
-
   // Get $.info.title
   rawName = rawName || api.info?.title;
-
   // Make sure the name is a string
   const defaultName = defaultValue || 'openapi';
   const name = typeof rawName === 'string' && rawName ? rawName : defaultName;
-
   // Sluggify
   return generateSlug(name, slugifyOptions);
 }
@@ -91,11 +93,13 @@ export const HttpMethod = {
   head: 'HEAD',
   patch: 'PATCH',
   trace: 'TRACE',
-};
+} as const;
 
-export function isHttpMethodKey(key: string): boolean {
+export type HttpMethodType = typeof HttpMethod[keyof typeof HttpMethod];
+
+export function isHttpMethodKey(key: string): key is HttpMethodType {
   const uppercaseKey = key.toUpperCase();
-  return Object.values(HttpMethod).some(m => m === uppercaseKey);
+  return Object.values(HttpMethod).some(method => method === uppercaseKey);
 }
 
 export function getMethodAnnotationName(method: HttpMethodType): string {
@@ -104,14 +108,14 @@ export function getMethodAnnotationName(method: HttpMethodType): string {
 
 export function parseUrl(
   urlStr: string,
-): {|
-  host: string,
-  hostname: string,
-  port: string,
-  protocol: string,
-  pathname: string,
-|} {
-  const parsed: Object = url.parse(urlStr);
+): {
+  host: string;
+  hostname: string;
+  port: string;
+  protocol: string;
+  pathname: string;
+} {
+  const parsed = url.parse(urlStr);
 
   if (!parsed.port && parsed.protocol === 'https:') {
     parsed.port = '443';
@@ -132,11 +136,11 @@ export function parseUrl(
 
 export function fillServerVariables(server: OA3Server): string {
   let finalUrl = server.url;
-
   const variables = server.variables || {};
 
   for (const name of Object.keys(variables)) {
     const defaultValue = variables[name].default;
+
     if (!defaultValue) {
       throw new Error(`Server variable "${name}" missing default value`);
     }
@@ -150,17 +154,17 @@ export function fillServerVariables(server: OA3Server): string {
 export function joinPath(p1: string, p2: string): string {
   p1 = p1.replace(/\/$/, '');
   p2 = p2.replace(/^\//, '');
-
   return `${p1}/${p2}`;
 }
 
 // Select first unique instance of an array item depending on the property selector
-export function distinctByProperty<T>(arr: Array<T>, propertySelector: (item: T) => any): Array<T> {
-  const result: Array<T> = [];
+export function distinctByProperty<T>(arr: T[], propertySelector: (item: T) => any): T[] {
+  const result: T[] = [];
   const set = new Set();
 
   for (const item of arr.filter(i => i)) {
     const selector = propertySelector(item);
+
     if (set.has(selector)) {
       continue;
     }
@@ -168,5 +172,6 @@ export function distinctByProperty<T>(arr: Array<T>, propertySelector: (item: T)
     set.add(selector);
     result.push(item);
   }
+
   return result;
 }
diff --git a/packages/openapi-2-kong/src/declarative-config/index.js b/packages/openapi-2-kong/src/declarative-config/generate.ts
similarity index 86%
rename from packages/openapi-2-kong/src/declarative-config/index.js
rename to packages/openapi-2-kong/src/declarative-config/generate.ts
index 85507f231c..cfeeedfb8e 100644
--- a/packages/openapi-2-kong/src/declarative-config/index.js
+++ b/packages/openapi-2-kong/src/declarative-config/generate.ts
@@ -1,12 +1,14 @@
-// @flow
+import { OpenApi3Spec } from '../types/openapi3';
+import { DeclarativeConfigResult } from '../types/outputs';
 import { generateServices } from './services';
 import { generateUpstreams } from './upstreams';
 
 export function generateDeclarativeConfigFromSpec(
   api: OpenApi3Spec,
-  tags: Array<string>,
+  tags: string[],
 ): DeclarativeConfigResult {
   let document = null;
+
   try {
     document = {
       _format_version: '1.1',
diff --git a/packages/openapi-2-kong/src/declarative-config/index.ts b/packages/openapi-2-kong/src/declarative-config/index.ts
new file mode 100644
index 0000000000..0f25784d93
--- /dev/null
+++ b/packages/openapi-2-kong/src/declarative-config/index.ts
@@ -0,0 +1 @@
+export { generateDeclarativeConfigFromSpec } from './generate';
diff --git a/packages/openapi-2-kong/src/declarative-config/__tests__/names.test.js b/packages/openapi-2-kong/src/declarative-config/names.test.ts
similarity index 79%
rename from packages/openapi-2-kong/src/declarative-config/__tests__/names.test.js
rename to packages/openapi-2-kong/src/declarative-config/names.test.ts
index 5a88d5747e..c3a40e4d12 100644
--- a/packages/openapi-2-kong/src/declarative-config/__tests__/names.test.js
+++ b/packages/openapi-2-kong/src/declarative-config/names.test.ts
@@ -1,10 +1,17 @@
-// @flow
-import { generateRouteName } from '../services';
+import { OA3PathItem, OpenApi3Spec } from '../types/openapi3';
+import { generateRouteName } from './services';
 
 const api: OpenApi3Spec = {
   openapi: '3.0',
-  info: { version: '1.0', title: 'Nebulo 9' },
-  servers: [{ url: 'https://example.com/api' }],
+  info: {
+    version: '1.0',
+    title: 'Nebulo 9',
+  },
+  servers: [
+    {
+      url: 'https://example.com/api',
+    },
+  ],
   paths: {},
 };
 
@@ -26,7 +33,7 @@ const compare = (expected: string, pathItem: OA3PathItem) => {
 };
 
 describe('names', () => {
-  it(`api.paths[path][method]['x-kong-name'] is highest priority`, () => {
+  it("api.paths[path][method]['x-kong-name'] is highest priority", () => {
     compare('Nebulo_9-method_smash', {
       'x-kong-name': 'pathItem-smash',
       post: {
@@ -45,7 +52,7 @@ describe('names', () => {
     });
   });
 
-  it(`api.paths[path]['x-kong-name'] is third priority`, () => {
+  it("api.paths[path]['x-kong-name'] is third priority", () => {
     compare('Nebulo_9-pathItem_smash-post', {
       'x-kong-name': 'pathItem-smash',
       post: {},
diff --git a/packages/openapi-2-kong/src/declarative-config/__tests__/plugins.test.js b/packages/openapi-2-kong/src/declarative-config/plugins.test.ts
similarity index 87%
rename from packages/openapi-2-kong/src/declarative-config/__tests__/plugins.test.js
rename to packages/openapi-2-kong/src/declarative-config/plugins.test.ts
index 052aa57d32..f3e67e2f8b 100644
--- a/packages/openapi-2-kong/src/declarative-config/__tests__/plugins.test.js
+++ b/packages/openapi-2-kong/src/declarative-config/plugins.test.ts
@@ -1,8 +1,8 @@
-// @flow
-
-import { generateGlobalPlugins, generateRequestValidatorPlugin } from '../plugins';
+import { generateGlobalPlugins, generateRequestValidatorPlugin } from './plugins';
+import { OpenApi3Spec, OA3Operation, OA3Parameter } from '../types/openapi3';
 
 const tags = ['Tag'];
+
 describe('plugins', () => {
   describe('generateGlobalPlugins()', () => {
     it('generates plugin given a spec with a plugin attached', async () => {
@@ -15,8 +15,11 @@ describe('plugins', () => {
         paths: {},
         'x-kong-plugin-request-validator': {
           enabled: false,
-          config: { verbose_response: true },
+          config: {
+            verbose_response: true,
+          },
         },
+        // @ts-expect-error -- TSCONVERSION needs work for generic for XKongPluginUnknown
         'x-kong-plugin-abcd': {
           config: {
             some_config: ['something'],
@@ -29,11 +32,11 @@ describe('plugins', () => {
           },
         },
       };
-
       const result = generateGlobalPlugins(api, ['Tag']);
       expect(result.plugins).toEqual([
         {
-          name: 'abcd', // name from plugin tag
+          name: 'abcd',
+          // name from plugin tag
           tags: ['Tag'],
           config: {
             some_config: ['something'],
@@ -57,7 +60,6 @@ describe('plugins', () => {
           name: 'request-validator',
         },
       ]);
-
       expect(result.requestValidatorPlugin).toEqual({
         config: {
           verbose_response: true,
@@ -66,7 +68,6 @@ describe('plugins', () => {
       });
     });
   });
-
   describe('generateRequestValidatorPlugin()', () => {
     const parameterSchema = [
       {
@@ -89,16 +90,16 @@ describe('plugins', () => {
           allowed_content_types: ['application/json'],
         },
       };
-
       const operation = {};
-
       const generated = generateRequestValidatorPlugin(plugin, operation, tags);
-
       expect(generated).toStrictEqual({
         name: 'request-validator',
         enabled: plugin.enabled,
         tags: ['Tag'],
-        config: { version: 'draft4', ...plugin.config },
+        config: {
+          version: 'draft4',
+          ...plugin.config,
+        },
       });
     });
 
@@ -107,23 +108,21 @@ describe('plugins', () => {
         enabled: true,
         config: {
           parameter_schema: [parameterSchema],
-          body_schema: '[{"name":{"type": "string", "required": true}}]',
-          // The following properties are missing
+          body_schema: '[{"name":{"type": "string", "required": true}}]', // The following properties are missing
           // verbose_response: true,
           // allowed_content_types: ['application/json'],
         },
       };
-
       const operation = {};
-
       const generated = generateRequestValidatorPlugin(plugin, operation, tags);
-
       expect(generated).toStrictEqual({
         name: 'request-validator',
         enabled: plugin.enabled,
         tags: ['Tag'],
-
-        config: { version: 'draft4', ...plugin.config },
+        config: {
+          version: 'draft4',
+          ...plugin.config,
+        },
       });
     });
 
@@ -133,10 +132,14 @@ describe('plugins', () => {
           enabled: true,
           config: {},
         };
-
         const generated1 = generateRequestValidatorPlugin(plugin, {}, tags);
-        const generated2 = generateRequestValidatorPlugin(plugin, { parameters: [] }, tags);
-
+        const generated2 = generateRequestValidatorPlugin(
+          plugin,
+          {
+            parameters: [],
+          },
+          tags,
+        );
         expect(generated1.config).toStrictEqual({
           version: 'draft4',
           body_schema: '{}',
@@ -151,24 +154,24 @@ describe('plugins', () => {
         const plugin = {
           config: {},
         };
-
-        const param = {
+        const param: OA3Parameter = {
           in: 'query',
           explode: true,
           required: false,
           name: 'some_name',
           schema: {
-            anyOf: [{ type: 'string' }],
+            anyOf: [
+              {
+                type: 'string',
+              },
+            ],
           },
           style: 'form',
         };
-
         const operation: OA3Operation = {
           parameters: [param],
         };
-
         const generated = generateRequestValidatorPlugin(plugin, operation, tags);
-
         expect(generated.config).toStrictEqual({
           version: 'draft4',
           parameter_schema: [
@@ -186,7 +189,6 @@ describe('plugins', () => {
 
       it('should return default if operation parameter schema not defined on any parameters', () => {
         const plugin = {};
-
         const operation: OA3Operation = {
           parameters: [
             {
@@ -195,9 +197,7 @@ describe('plugins', () => {
             },
           ],
         };
-
         const generated = generateRequestValidatorPlugin(plugin, operation, tags);
-
         expect(generated.config).toStrictEqual({
           version: 'draft4',
           parameter_schema: [
@@ -214,27 +214,31 @@ describe('plugins', () => {
       });
 
       it('should ignore parameters without schema', () => {
-        const plugin = {};
-        const paramWithSchema = {
+        const paramWithSchema: OA3Parameter = {
           in: 'query',
           explode: true,
           required: false,
           name: 'some_name',
           schema: {
-            anyOf: [{ type: 'string' }],
+            anyOf: [
+              {
+                type: 'string',
+              },
+            ],
           },
           style: 'form',
         };
-        const paramWithoutSchema = {
+        const paramWithoutSchema: OA3Parameter = {
           in: 'query',
           name: 'some_name',
         };
         const operation: OA3Operation = {
-          parameters: [paramWithSchema, paramWithoutSchema],
+          parameters: [
+            paramWithSchema,
+            paramWithoutSchema,
+          ],
         };
-
-        const generated = generateRequestValidatorPlugin(plugin, operation, tags);
-
+        const generated = generateRequestValidatorPlugin({}, operation, tags);
         expect(generated.config).toStrictEqual({
           version: 'draft4',
           parameter_schema: [
@@ -258,17 +262,13 @@ describe('plugins', () => {
         });
       });
     });
-
     describe('body_schema and allowed_content_types', () => {
       it('should not add body_schema or allowed_content_types if no body present', () => {
         const plugin = {
           config: {},
         };
-
         const operation = {};
-
         const generated = generateRequestValidatorPlugin(plugin, operation, tags);
-
         expect(generated.config).toStrictEqual({
           version: 'draft4',
           body_schema: '{}',
@@ -277,16 +277,19 @@ describe('plugins', () => {
 
       it('should return default if no operation request body content defined', () => {
         const plugin = {};
-
         const defaultReqVal = {
           version: 'draft4',
           body_schema: '{}',
         };
-
-        const op1 = { requestBody: {} };
-        const op2 = { requestBody: { $ref: 'non-existent' } };
+        const op1 = {
+          requestBody: {},
+        };
+        const op2 = {
+          requestBody: {
+            $ref: 'non-existent',
+          },
+        };
         const op3 = {};
-
         expect(generateRequestValidatorPlugin(plugin, op1, tags).config).toStrictEqual(
           defaultReqVal,
         );
@@ -300,7 +303,6 @@ describe('plugins', () => {
 
       it('should add non-json media types to allowed content types and not add body schema', () => {
         const plugin = {};
-
         const operation: OA3Operation = {
           requestBody: {
             content: {
@@ -309,9 +311,7 @@ describe('plugins', () => {
             },
           },
         };
-
         const generated = generateRequestValidatorPlugin(plugin, operation, tags);
-
         expect(generated.config).toStrictEqual({
           version: 'draft4',
           body_schema: '{}',
@@ -321,7 +321,6 @@ describe('plugins', () => {
 
       it('should add body_schema and allowed content types', () => {
         const plugin = {};
-
         const schemaXml = {
           type: 'Object',
           properties: {
@@ -331,7 +330,6 @@ describe('plugins', () => {
             },
           },
         };
-
         const schemaJson = {
           type: 'Object',
           properties: {
@@ -341,7 +339,6 @@ describe('plugins', () => {
             },
           },
         };
-
         const operation: OA3Operation = {
           requestBody: {
             content: {
@@ -354,9 +351,7 @@ describe('plugins', () => {
             },
           },
         };
-
         const generated = generateRequestValidatorPlugin(plugin, operation, tags);
-
         expect(generated.config).toStrictEqual({
           version: 'draft4',
           body_schema: JSON.stringify(schemaJson),
@@ -367,9 +362,7 @@ describe('plugins', () => {
       it('should default body_schema if no schema is defined or generated', () => {
         const plugin = {};
         const operation = {};
-
         const generated = generateRequestValidatorPlugin(plugin, operation, tags);
-
         expect(generated.config).toStrictEqual({
           version: 'draft4',
           body_schema: '{}',
diff --git a/packages/openapi-2-kong/src/declarative-config/plugins.js b/packages/openapi-2-kong/src/declarative-config/plugins.ts
similarity index 72%
rename from packages/openapi-2-kong/src/declarative-config/plugins.js
rename to packages/openapi-2-kong/src/declarative-config/plugins.ts
index 9864a36929..08af523d5d 100644
--- a/packages/openapi-2-kong/src/declarative-config/plugins.js
+++ b/packages/openapi-2-kong/src/declarative-config/plugins.ts
@@ -1,15 +1,14 @@
-// @flow
-
 import { distinctByProperty, getPluginNameFromKey, isPluginKey } from '../common';
+import { DCPlugin, DCPluginConfig } from '../types/declarative-config';
+import { OA3Operation, OpenApi3Spec, OA3PathItem } from '../types/openapi3';
 
 export function isRequestValidatorPluginKey(key: string): boolean {
   return key.match(/-request-validator$/) != null;
 }
 
-export function generatePlugins(item: Object, tags: Array<string>): Array<DCPlugin> {
-  // When generating plugins, ignore the request validator plugin
-  // because it is handled at the operation level
-  const pluginFilter = ([key, _]) => isPluginKey(key) && !isRequestValidatorPluginKey(key);
+export function generatePlugins(item: Record<string, any>, tags: string[]): DCPlugin[] {
+  // When generating plugins, ignore the request validator plugin because it is handled at the operation level
+  const pluginFilter = ([key]: [string, any]) => isPluginKey(key) && !isRequestValidatorPluginKey(key);
 
   // Server plugins should load from the api spec root and from the server
   return Object.entries(item)
@@ -17,7 +16,10 @@ export function generatePlugins(item: Object, tags: Array<string>): Array<DCPlug
     .map(e => generatePlugin(e, tags));
 }
 
-function generatePlugin([key, value]: [string, Object], tags: Array<string>): DCPlugin {
+function generatePlugin(
+  [key, value]: [string, Record<string, any>],
+  tags: string[],
+): DCPlugin {
   const plugin: DCPlugin = {
     name: value.name || getPluginNameFromKey(key),
   };
@@ -28,11 +30,10 @@ function generatePlugin([key, value]: [string, Object], tags: Array<string>): DC
 
   // Add tags to plugins while appending defaults tags
   plugin.tags = [...tags, ...(value.tags ?? [])];
-
   return plugin;
 }
 
-/*
+/**
   This is valid config to allow all content to pass
   See: https://github.com/Kong/kong-plugin-enterprise-request-validator/pull/34/files#diff-1a1d2d5ce801cc1cfb2aa91ae15686d81ef900af1dbef00f004677bc727bfd3cR284
  */
@@ -45,17 +46,21 @@ const DEFAULT_PARAM_STYLE = {
   path: 'simple',
 };
 
-function generateParameterSchema(operation?: OA3Operation): Array<Object> | typeof undefined {
+function generateParameterSchema(
+  operation?: OA3Operation,
+): Record<string, any>[] | undefined {
   let parameterSchema;
 
   if (operation?.parameters?.length) {
     parameterSchema = [];
+
     for (const p of operation.parameters) {
       // The following is valid config to allow all content to pass, in the case where schema is not defined
       let schema;
-      if ((p: Object).schema) {
-        schema = JSON.stringify((p: Object).schema);
-      } else if ((p: Object).content) {
+
+      if ((p as Record<string, any>).schema) {
+        schema = JSON.stringify((p as Record<string, any>).schema);
+      } else if ((p as Record<string, any>).content) {
         // only parameters defined with a schema (not content) are supported
         schema = ALLOW_ALL_SCHEMA;
       } else {
@@ -63,17 +68,19 @@ function generateParameterSchema(operation?: OA3Operation): Array<Object> | type
         schema = ALLOW_ALL_SCHEMA;
       }
 
-      const paramStyle = (p: Object).style ?? DEFAULT_PARAM_STYLE[(p: Object).in];
+      const paramStyle =
+        (p as Record<string, any>).style ?? DEFAULT_PARAM_STYLE[(p as Record<string, any>).in];
+
       if (typeof paramStyle === 'undefined') {
-        const name = (p: Object).name;
+        const name = (p as Record<string, any>).name;
         throw new Error(`invalid 'in' property (parameter '${name}')`);
       }
 
       parameterSchema.push({
-        in: (p: Object).in,
-        explode: !!(p: Object).explode,
-        required: !!(p: Object).required,
-        name: (p: Object).name,
+        in: (p as Record<string, any>).in,
+        explode: !!(p as Record<string, any>).explode,
+        required: !!(p as Record<string, any>).required,
+        name: (p as Record<string, any>).name,
         schema,
         style: paramStyle,
       });
@@ -86,32 +93,35 @@ function generateParameterSchema(operation?: OA3Operation): Array<Object> | type
 function generateBodyOptions(
   operation?: OA3Operation,
 ): {
-  bodySchema: string | typeof undefined,
-  allowedContentTypes: Array<string> | typeof undefined,
+  bodySchema: string | typeof undefined;
+  allowedContentTypes: string[] | typeof undefined;
 } {
   let bodySchema;
   let allowedContentTypes;
+  const bodyContent = (operation?.requestBody as Record<string, any>)?.content;
 
-  const bodyContent = (operation?.requestBody: Object)?.content;
   if (bodyContent) {
     const jsonContentType = 'application/json';
-
     allowedContentTypes = Object.keys(bodyContent);
+
     if (allowedContentTypes.includes(jsonContentType)) {
       const item = bodyContent[jsonContentType];
       bodySchema = JSON.stringify(item.schema);
     }
   }
 
-  return { bodySchema, allowedContentTypes };
+  return {
+    bodySchema,
+    allowedContentTypes,
+  };
 }
 
 export function generateRequestValidatorPlugin(
-  plugin: Object,
+  plugin: Record<string, any>,
   operation: OA3Operation | typeof undefined,
-  tags: Array<string>,
+  tags: string[],
 ): DCPlugin {
-  const config: { [string]: Object } = {
+  const config: DCPluginConfig = {
     version: 'draft4', // Fixed version
   };
 
@@ -119,7 +129,6 @@ export function generateRequestValidatorPlugin(
 
   // Use original or generated parameter_schema
   const parameterSchema = pluginConfig.parameter_schema ?? generateParameterSchema(operation);
-
   const generated = generateBodyOptions(operation);
 
   // Use original or generated body_schema
@@ -141,6 +150,7 @@ export function generateRequestValidatorPlugin(
 
   // Use original or generated allowed_content_types
   const allowedContentTypes = pluginConfig.allowed_content_types ?? generated.allowedContentTypes;
+
   if (allowedContentTypes !== undefined) {
     config.allowed_content_types = allowedContentTypes;
   }
@@ -160,14 +170,18 @@ export function generateRequestValidatorPlugin(
 
 export function generateGlobalPlugins(
   api: OpenApi3Spec,
-  tags: Array<string>,
-): { plugins: Array<DCPlugin>, requestValidatorPlugin?: Object } {
+  tags: string[],
+): {
+  plugins: DCPlugin[];
+  requestValidatorPlugin?: Record<string, any>;
+} {
   const globalPlugins = generatePlugins(api, tags);
-
   const requestValidatorPlugin = getRequestValidatorPluginDirective(api);
+
   if (requestValidatorPlugin) {
     globalPlugins.push(generateRequestValidatorPlugin(requestValidatorPlugin, undefined, tags));
   }
+
   return {
     // Server plugins take precedence over global plugins
     plugins: distinctByProperty<DCPlugin>(globalPlugins, plugin => plugin.name),
@@ -175,23 +189,22 @@ export function generateGlobalPlugins(
   };
 }
 
-export function generatePathPlugins(pathItem: OA3PathItem, tags: Array<string>): Array<DCPlugin> {
+export function generatePathPlugins(pathItem: OA3PathItem, tags: string[]): DCPlugin[] {
   return generatePlugins(pathItem, tags);
 }
 
 export function generateOperationPlugins(
   operation: OA3Operation,
-  pathPlugins: Array<DCPlugin>,
-  parentValidatorPlugin?: Object,
-  tags: Array<string>,
-): Array<DCPlugin> {
-  const operationPlugins: Array<DCPlugin> = generatePlugins(operation, tags);
-
+  pathPlugins: DCPlugin[],
+  parentValidatorPlugin?: Record<string, any>,
+  tags?: string[],
+): DCPlugin[] {
+  const operationPlugins: DCPlugin[] = generatePlugins(operation, tags);
   // Check if validator plugin exists on the operation
   const operationValidatorPlugin = getRequestValidatorPluginDirective(operation);
-
   // Use the operation or parent validator plugin, or skip if neither exist
   const validatorPluginToUse = operationValidatorPlugin || parentValidatorPlugin;
+
   if (validatorPluginToUse) {
     operationPlugins.push(generateRequestValidatorPlugin(validatorPluginToUse, operation, tags));
   }
@@ -200,11 +213,10 @@ export function generateOperationPlugins(
   return distinctByProperty<DCPlugin>([...operationPlugins, ...pathPlugins], plugin => plugin.name);
 }
 
-export function getRequestValidatorPluginDirective(obj: Object): Object | null {
-  const key = Object.keys(obj)
-    .filter(isPluginKey)
-    .find(isRequestValidatorPluginKey);
-
+export function getRequestValidatorPluginDirective(
+  obj: Record<string, any>,
+): Record<string, any> | null {
+  const key = Object.keys(obj).filter(isPluginKey).find(isRequestValidatorPluginKey);
   // If the key is defined but is blank (therefore should be fully generated) then default to {}
   return key ? obj[key] || {} : null;
 }
diff --git a/packages/openapi-2-kong/src/declarative-config/__tests__/security-plugins.test.js b/packages/openapi-2-kong/src/declarative-config/security-plugins.test.ts
similarity index 60%
rename from packages/openapi-2-kong/src/declarative-config/__tests__/security-plugins.test.js
rename to packages/openapi-2-kong/src/declarative-config/security-plugins.test.ts
index fef5abbbbb..d4b111ebe3 100644
--- a/packages/openapi-2-kong/src/declarative-config/__tests__/security-plugins.test.js
+++ b/packages/openapi-2-kong/src/declarative-config/security-plugins.test.ts
@@ -1,9 +1,10 @@
-import { generateSecurityPlugin } from '../security-plugins';
+import { OA3SecurityScheme } from '../types/openapi3';
+import { generateSecurityPlugin } from './security-plugins';
 
 describe('security-plugins', () => {
   describe('generateSecurityPlugin()', () => {
     it('generates apikey plugin', async () => {
-      const scheme = {
+      const scheme: OA3SecurityScheme = {
         type: 'apiKey',
         in: 'header',
         name: 'x-api-key',
@@ -18,8 +19,10 @@ describe('security-plugins', () => {
         },
       });
     });
+
     it('generates apikey plugin with funny casing', async () => {
-      const scheme = {
+      const scheme: OA3SecurityScheme = {
+        // @ts-expect-error -- this is intentionally using strange casing.  Yes, technically speaking the type of OA3SecurityScheme['type'] should be `string`, but we really only support strange casing like this for backwards compat.  We want the types to reflect the API we're aiming for, even though we're technically a bit more permissive.
         type: 'ApIKeY',
         in: 'header',
         name: 'x-api-key',
diff --git a/packages/openapi-2-kong/src/declarative-config/security-plugins.js b/packages/openapi-2-kong/src/declarative-config/security-plugins.ts
similarity index 60%
rename from packages/openapi-2-kong/src/declarative-config/security-plugins.js
rename to packages/openapi-2-kong/src/declarative-config/security-plugins.ts
index f712ca8df6..979f1820b9 100644
--- a/packages/openapi-2-kong/src/declarative-config/security-plugins.js
+++ b/packages/openapi-2-kong/src/declarative-config/security-plugins.ts
@@ -1,26 +1,25 @@
-// @flow
-
 import { getSecurity } from '../common';
+import { DCPlugin } from '../types/declarative-config';
+import { OA3Operation, OpenApi3Spec, OA3SecurityScheme, OA3SecuritySchemeApiKey, OA3SecuritySchemeHttp, OA3SecuritySchemeOpenIdConnect } from '../types/openapi3';
 
 export function generateSecurityPlugins(
   op: OA3Operation | null,
   api: OpenApi3Spec,
-  tags: Array<string>,
-): Array<DCPlugin> {
+  tags: string[],
+): DCPlugin[] {
   const plugins = [];
   const components = api.components || {};
   const securitySchemes = components.securitySchemes || {};
-
   const security = op ? getSecurity(op) : getSecurity(api);
+
   for (const securityItem of security || []) {
     for (const name of Object.keys(securityItem)) {
-      const scheme: OA3SecurityScheme = securitySchemes[name] || {};
+      const scheme = (securitySchemes[name] || {}) as OA3SecurityScheme;
       const args = securityItem[name];
+      const plugin = generateSecurityPlugin(scheme, args, tags);
 
-      const p = generateSecurityPlugin(scheme, args, tags);
-
-      if (p) {
-        plugins.push(p);
+      if (plugin) {
+        plugins.push(plugin);
       }
     }
   }
@@ -32,13 +31,16 @@ export function generateApiKeySecurityPlugin(scheme: OA3SecuritySchemeApiKey): D
   if (!['query', 'header', 'cookie'].includes(scheme.in)) {
     throw new Error(`a ${scheme.type} object expects valid "in" property. Got ${scheme.in}`);
   }
+
   if (!scheme.name) {
     throw new Error(`a ${scheme.type} object expects valid "name" property. Got ${scheme.name}`);
   }
 
   return {
     name: 'key-auth',
-    config: { key_names: [scheme.name] },
+    config: {
+      key_names: [scheme.name],
+    },
   };
 }
 
@@ -47,12 +49,14 @@ export function generateHttpSecurityPlugin(scheme: OA3SecuritySchemeHttp): DCPlu
     throw new Error(`Only "basic" http scheme supported. got ${scheme.scheme}`);
   }
 
-  return { name: 'basic-auth' };
+  return {
+    name: 'basic-auth',
+  };
 }
 
 export function generateOpenIdConnectSecurityPlugin(
   scheme: OA3SecuritySchemeOpenIdConnect,
-  args: Array<any>,
+  args: string[],
 ): DCPlugin {
   if (!scheme.openIdConnectUrl) {
     throw new Error(`invalid "openIdConnectUrl" property. Got ${scheme.openIdConnectUrl}`);
@@ -67,10 +71,7 @@ export function generateOpenIdConnectSecurityPlugin(
   };
 }
 
-export function generateOAuth2SecurityPlugin(
-  scheme: OA3SecuritySchemeOAuth2,
-  args: ?Array<any>,
-): DCPlugin {
+export function generateOAuth2SecurityPlugin(): DCPlugin {
   return {
     config: {
       auth_methods: ['client_credentials'],
@@ -80,41 +81,47 @@ export function generateOAuth2SecurityPlugin(
 }
 
 export function generateSecurityPlugin(
-  scheme: OA3SecurityScheme,
-  args: Array<any>,
-  tags: Array<string>,
+  scheme: OA3SecurityScheme | null,
+  args: string[],
+  tags: string[],
 ): DCPlugin | null {
   let plugin: DCPlugin | null = null;
 
-  // Flow doesn't like this (hence the "any" casting) but we're
-  // comparing the scheme type in a more flexible way to favor
-  // usability
-  const type = (scheme.type || '').toLowerCase();
-
   // Generate base plugin
-  if (type === 'apikey') {
-    plugin = generateApiKeySecurityPlugin((scheme: any));
-  } else if (type === 'http') {
-    plugin = generateHttpSecurityPlugin((scheme: any));
-  } else if (type === 'openidconnect') {
-    plugin = generateOpenIdConnectSecurityPlugin((scheme: any), args);
-  } else if (type === 'oauth2') {
-    plugin = generateOAuth2SecurityPlugin((scheme: any));
-  } else {
-    return null;
+  switch (scheme.type.toLowerCase()) {
+    case 'apikey':
+      plugin = generateApiKeySecurityPlugin(scheme as OA3SecuritySchemeApiKey);
+      break;
+
+    case 'http':
+      plugin = generateHttpSecurityPlugin(scheme as OA3SecuritySchemeHttp);
+      break;
+
+    case 'openidconnect':
+      plugin = generateOpenIdConnectSecurityPlugin(scheme as OA3SecuritySchemeOpenIdConnect, args);
+      break;
+
+    case 'oauth2':
+      plugin = generateOAuth2SecurityPlugin();
+      break;
+
+    default:
+      return null;
   }
 
   // Add additional plugin configuration from x-kong-security-* property
   // Only search for the matching key
   // i.e. OAuth2 security with x-kong-security-basic-auth should not match
-  const kongSecurity = (scheme: Object)[`x-kong-security-${plugin.name}`] ?? {};
+  const kongSecurity = (scheme as Record<string, any>)[`x-kong-security-${plugin.name}`] ?? {};
 
   if (kongSecurity.config) {
     plugin.config = kongSecurity.config;
   }
 
   // Add global tags
-  plugin.tags = [...tags, ...(kongSecurity.tags ?? [])];
-
+  plugin.tags = [
+    ...tags,
+    ...(kongSecurity.tags ?? []),
+  ];
   return plugin;
 }
diff --git a/packages/openapi-2-kong/src/declarative-config/__tests__/services.test.js b/packages/openapi-2-kong/src/declarative-config/services.test.ts
similarity index 81%
rename from packages/openapi-2-kong/src/declarative-config/__tests__/services.test.js
rename to packages/openapi-2-kong/src/declarative-config/services.test.ts
index 8d1584a037..14e9b0b954 100644
--- a/packages/openapi-2-kong/src/declarative-config/__tests__/services.test.js
+++ b/packages/openapi-2-kong/src/declarative-config/services.test.ts
@@ -1,6 +1,5 @@
-// @flow
-import { generateServices } from '../services';
-import { parseSpec } from '../../index';
+import { generateServices } from './services';
+import { parseSpec } from '../generate';
 import { getSpec } from './utils';
 
 const xKongPluginRequestValidator = 'x-kong-plugin-request-validator';
@@ -55,27 +54,27 @@ describe('services', () => {
     it('fails with no servers', async () => {
       const spec = getSpec();
       delete spec.servers;
-
       const api = await parseSpec(spec);
+
       const fn = () => generateServices(api, ['Tag']);
+
       expect(fn).toThrowError('no servers defined in spec');
     });
 
     it('throws for a root level x-kong-route-default', async () => {
       const spec = getSpec();
       spec[xKongRouteDefaults] = 'foo';
-
       const api = await parseSpec(spec);
+
       const fn = () => generateServices(api, ['Tag']);
-      expect(fn).toThrowError(`expected root-level 'x-kong-route-defaults' to be an object`);
+
+      expect(fn).toThrowError('expected root-level \'x-kong-route-defaults\' to be an object');
     });
 
     it('ignores null for a root level x-kong-route-default', async () => {
       const spec = getSpec();
       spec[xKongRouteDefaults] = null;
-
       const specResult = getSpecResult();
-
       const api = await parseSpec(spec);
       expect(generateServices(api, ['Tag'])).toEqual([specResult]);
     });
@@ -83,18 +82,17 @@ describe('services', () => {
     it('throws for a paths level x-kong-route-default', async () => {
       const spec = getSpec();
       spec.paths['/cats'][xKongRouteDefaults] = 'foo';
-
       const api = await parseSpec(spec);
+
       const fn = () => generateServices(api, ['Tag']);
-      expect(fn).toThrowError(`expected 'x-kong-route-defaults' to be an object (at path '/cats')`);
+
+      expect(fn).toThrowError('expected \'x-kong-route-defaults\' to be an object (at path \'/cats\')');
     });
 
     it('ignores null for a paths level x-kong-route-default', async () => {
       const spec = getSpec();
       spec.paths['/cats'][xKongRouteDefaults] = null;
-
       const specResult = getSpecResult();
-
       const api = await parseSpec(spec);
       expect(generateServices(api, ['Tag'])).toEqual([specResult]);
     });
@@ -102,59 +100,65 @@ describe('services', () => {
     it('throws for an operation level x-kong-route-default', async () => {
       const spec = getSpec();
       spec.paths['/cats'].post[xKongRouteDefaults] = 'foo';
-
       const api = await parseSpec(spec);
+
       const fn = () => generateServices(api, ['Tag']);
+
       expect(fn).toThrowError(
-        `expected 'x-kong-route-defaults' to be an object (at operation 'post' of path '/cats')`,
+        'expected \'x-kong-route-defaults\' to be an object (at operation \'post\' of path \'/cats\')',
       );
     });
 
     it('ignores null for an operation level x-kong-route-default', async () => {
       const spec = getSpec();
       spec.paths['/cats'].post[xKongRouteDefaults] = null;
-
       const specResult = getSpecResult();
-
       const api = await parseSpec(spec);
       expect(generateServices(api, ['Tag'])).toEqual([specResult]);
     });
   });
-
   describe('generateServices()', () => {
     it('generates generic service with paths', async () => {
       const spec = getSpec();
-
       const specResult = getSpecResult();
-
       const api = await parseSpec(spec);
       expect(generateServices(api, ['Tag'])).toEqual([specResult]);
     });
 
     it('generates routes with request validator plugin from operation over path over global', async () => {
       const spec = getSpec();
-
       // global req validator plugin
-      spec[xKongPluginRequestValidator] = { config: { parameter_schema: 'global' } };
-
+      spec[xKongPluginRequestValidator] = {
+        config: {
+          parameter_schema: 'global',
+        },
+      };
       // path req validator plugin
-      spec.paths['/cats'][xKongPluginRequestValidator] = { config: { parameter_schema: 'path' } };
+      spec.paths['/cats'][xKongPluginRequestValidator] = {
+        config: {
+          parameter_schema: 'path',
+        },
+      };
       spec.paths['/cats'].get = {};
-
       // operation req validator plugin
       spec.paths['/cats'].post[xKongPluginRequestValidator] = {
-        config: { parameter_schema: 'operation' },
+        config: {
+          parameter_schema: 'operation',
+        },
       };
-
       // operation req validator plugin
       spec.paths['/dogs'].post[xKongPluginRequestValidator] = {
-        config: { parameter_schema: 'operation' },
+        config: {
+          parameter_schema: 'operation',
+        },
       };
-
       const specResult = getSpecResult();
       specResult.plugins = [
         {
-          config: { version: 'draft4', parameter_schema: 'global' },
+          config: {
+            version: 'draft4',
+            parameter_schema: 'global',
+          },
           enabled: true,
           tags: ['Tag'],
           name: 'request-validator',
@@ -170,10 +174,12 @@ describe('services', () => {
           plugins: [
             {
               // should have operation plugin
-              config: { version: 'draft4', parameter_schema: 'operation' },
+              config: {
+                version: 'draft4',
+                parameter_schema: 'operation',
+              },
               enabled: true,
               tags: ['Tag'],
-
               name: 'request-validator',
             },
           ],
@@ -187,10 +193,12 @@ describe('services', () => {
           plugins: [
             {
               // should apply path plugin
-              config: { version: 'draft4', parameter_schema: 'path' },
+              config: {
+                version: 'draft4',
+                parameter_schema: 'path',
+              },
               enabled: true,
               tags: ['Tag'],
-
               name: 'request-validator',
             },
           ],
@@ -204,10 +212,12 @@ describe('services', () => {
           plugins: [
             {
               // should apply global plugin
-              config: { version: 'draft4', parameter_schema: 'global' },
+              config: {
+                version: 'draft4',
+                parameter_schema: 'global',
+              },
               enabled: true,
               tags: ['Tag'],
-
               name: 'request-validator',
             },
           ],
@@ -221,7 +231,10 @@ describe('services', () => {
           plugins: [
             {
               // should have operation plugin
-              config: { version: 'draft4', parameter_schema: 'operation' },
+              config: {
+                version: 'draft4',
+                parameter_schema: 'operation',
+              },
               enabled: true,
               tags: ['Tag'],
               name: 'request-validator',
@@ -237,7 +250,10 @@ describe('services', () => {
           plugins: [
             {
               // should apply global plugin
-              config: { version: 'draft4', parameter_schema: 'global' },
+              config: {
+                version: 'draft4',
+                parameter_schema: 'global',
+              },
               enabled: true,
               tags: ['Tag'],
               name: 'request-validator',
@@ -245,8 +261,7 @@ describe('services', () => {
           ],
         },
       ];
-
-      const api: OpenApi3Spec = await parseSpec(spec);
+      const api = await parseSpec(spec);
       expect(generateServices(api, ['Tag'])).toEqual([specResult]);
     });
 
@@ -270,7 +285,6 @@ describe('services', () => {
           },
         },
       };
-
       const specResult = getSpecResult();
       specResult.routes = [
         {
@@ -284,7 +298,9 @@ describe('services', () => {
               name: 'key-auth',
               tags: ['Tag'],
               // should apply path plugin
-              config: { key_names: ['path'] },
+              config: {
+                key_names: ['path'],
+              },
             },
           ],
         },
@@ -299,13 +315,14 @@ describe('services', () => {
               name: 'key-auth',
               tags: ['Tag'],
               // should apply path plugin
-              config: { key_names: ['operation'] },
+              config: {
+                key_names: ['operation'],
+              },
             },
           ],
         },
       ];
-
-      const api: OpenApi3Spec = await parseSpec(spec);
+      const api = await parseSpec(spec);
       expect(generateServices(api, ['Tag'])).toEqual([specResult]);
     });
 
@@ -315,16 +332,19 @@ describe('services', () => {
         {
           url: 'https://{customerId}.saas-app.com:{port}/v2',
           variables: {
-            customerId: { default: 'demo' },
-            port: { enum: ['443', '8443'], default: '8443' },
+            customerId: {
+              default: 'demo',
+            },
+            port: {
+              enum: ['443', '8443'],
+              default: '8443',
+            },
           },
         },
       ];
-
       const specResult = getSpecResult();
       specResult.port = 8443;
       specResult.path = '/v2';
-
       const api = await parseSpec(spec);
       expect(generateServices(api, ['Tag'])).toEqual([specResult]);
     });
@@ -334,12 +354,10 @@ describe('services', () => {
         level: 'root',
         rootLevel: true,
       };
-
       const pathLevel = {
         level: 'path',
         pathLevel: true,
       };
-
       const operationLevel = {
         level: 'operation',
         operationLevel: true,
@@ -348,13 +366,8 @@ describe('services', () => {
       it('root level', async () => {
         const spec = getSpec();
         spec[xKongRouteDefaults] = rootLevel;
-
         const specResult = getSpecResult();
-        specResult.routes = specResult.routes.map(route => ({
-          ...route,
-          ...rootLevel,
-        }));
-
+        specResult.routes = specResult.routes.map(route => ({ ...route, ...rootLevel }));
         const api = await parseSpec(spec);
         expect(generateServices(api, ['Tag'])).toEqual([specResult]);
       });
@@ -362,17 +375,9 @@ describe('services', () => {
       it('path level', async () => {
         const spec = getSpec();
         spec.paths['/dogs'][xKongRouteDefaults] = pathLevel;
-
         const specResult = getSpecResult();
-        specResult.routes[1] = {
-          ...specResult.routes[1],
-          ...pathLevel,
-        };
-        specResult.routes[2] = {
-          ...specResult.routes[2],
-          ...pathLevel,
-        };
-
+        specResult.routes[1] = { ...specResult.routes[1], ...pathLevel };
+        specResult.routes[2] = { ...specResult.routes[2], ...pathLevel };
         const api = await parseSpec(spec);
         expect(generateServices(api, ['Tag'])).toEqual([specResult]);
       });
@@ -380,50 +385,33 @@ describe('services', () => {
       it('operation level', async () => {
         const spec = getSpec();
         spec.paths['/dogs'].get[xKongRouteDefaults] = operationLevel;
-
         const specResult = getSpecResult();
-        specResult.routes[1] = {
-          ...specResult.routes[1],
-          ...operationLevel,
-        };
-
+        specResult.routes[1] = { ...specResult.routes[1], ...operationLevel };
         const api = await parseSpec(spec);
         expect(generateServices(api, ['Tag'])).toEqual([specResult]);
       });
 
       it('will select (but not merge) the operation level over the root level', async () => {
         const spec = getSpec();
-
         spec[xKongRouteDefaults] = rootLevel;
         spec.paths['/cats'].post[xKongRouteDefaults] = operationLevel;
-
         const specResult = getSpecResult();
         specResult.routes = specResult.routes.map(route => ({
           ...route,
           // $FlowFixMe
           ...(route.paths[0] === '/cats$' ? operationLevel : rootLevel),
         }));
-
         const api = await parseSpec(spec);
         expect(generateServices(api, ['Tag'])).toEqual([specResult]);
       });
 
       it('will select (but not merge) the operation level over the path level', async () => {
         const spec = getSpec();
-
         spec.paths['/dogs'][xKongRouteDefaults] = pathLevel;
         spec.paths['/dogs'].post[xKongRouteDefaults] = operationLevel;
-
         const specResult = getSpecResult();
-        specResult.routes[1] = {
-          ...specResult.routes[1],
-          ...pathLevel,
-        };
-        specResult.routes[2] = {
-          ...specResult.routes[2],
-          ...operationLevel,
-        };
-
+        specResult.routes[1] = { ...specResult.routes[1], ...pathLevel };
+        specResult.routes[2] = { ...specResult.routes[2], ...operationLevel };
         const api = await parseSpec(spec);
         expect(generateServices(api, ['Tag'])).toEqual([specResult]);
       });
@@ -432,40 +420,35 @@ describe('services', () => {
         const spec = getSpec();
         spec[xKongRouteDefaults] = rootLevel;
         spec.paths['/cats'][xKongRouteDefaults] = pathLevel;
-
         const specResult = getSpecResult();
         specResult.routes = specResult.routes.map(route => ({
           ...route,
           // $FlowFixMe
           ...(route.paths[0] === '/cats$' ? pathLevel : rootLevel),
         }));
-
         const api = await parseSpec(spec);
         expect(generateServices(api, ['Tag'])).toEqual([specResult]);
       });
 
       it('allows overriding strip_path at the path level', async () => {
         const spec = getSpec();
-        spec.paths['/cats'][xKongRouteDefaults] = { strip_path: true };
-
+        spec.paths['/cats'][xKongRouteDefaults] = {
+          strip_path: true,
+        };
         const specResult = getSpecResult();
         const cats = specResult.routes.find(route => route.paths[0] === '/cats$');
         cats.strip_path = true;
-
         const api = await parseSpec(spec);
         expect(generateServices(api, ['Tag'])).toEqual([specResult]);
       });
 
       it('allows overriding `strip_path` from `x-kong-route-defaults` at the root', async () => {
         const spec = getSpec();
-        spec[xKongRouteDefaults] = { strip_path: true };
-
-        const specResult = getSpecResult();
-        specResult.routes = specResult.routes.map(route => ({
-          ...route,
+        spec[xKongRouteDefaults] = {
           strip_path: true,
-        }));
-
+        };
+        const specResult = getSpecResult();
+        specResult.routes = specResult.routes.map(route => ({ ...route, strip_path: true }));
         const api = await parseSpec(spec);
         expect(generateServices(api, ['Tag'])).toEqual([specResult]);
       });
diff --git a/packages/openapi-2-kong/src/declarative-config/services.js b/packages/openapi-2-kong/src/declarative-config/services.ts
similarity index 88%
rename from packages/openapi-2-kong/src/declarative-config/services.js
rename to packages/openapi-2-kong/src/declarative-config/services.ts
index c87ddf9e6d..508cd4aeac 100644
--- a/packages/openapi-2-kong/src/declarative-config/services.js
+++ b/packages/openapi-2-kong/src/declarative-config/services.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import {
   fillServerVariables,
   generateSlug,
@@ -9,7 +7,6 @@ import {
   HttpMethod,
   parseUrl,
 } from '../common';
-
 import { generateSecurityPlugins } from './security-plugins';
 import {
   generateOperationPlugins,
@@ -17,8 +14,10 @@ import {
   generateGlobalPlugins,
   getRequestValidatorPluginDirective,
 } from './plugins';
+import { DCService, DCRoute } from '../types/declarative-config';
+import { OpenApi3Spec, OA3Server, OA3PathItem, OA3Operation } from '../types/openapi3';
 
-export function generateServices(api: OpenApi3Spec, tags: Array<string>): Array<DCService> {
+export function generateServices(api: OpenApi3Spec, tags: string[]) {
   const servers = getAllServers(api);
 
   if (servers.length === 0) {
@@ -30,24 +29,19 @@ export function generateServices(api: OpenApi3Spec, tags: Array<string>): Array<
   return [service];
 }
 
-export function generateService(
-  server: OA3Server,
-  api: OpenApi3Spec,
-  tags: Array<string>,
-): DCService {
+export function generateService(server: OA3Server, api: OpenApi3Spec, tags: string[]) {
   const serverUrl = fillServerVariables(server);
   const name = getName(api);
   const parsedUrl = parseUrl(serverUrl);
-
   // Service plugins
   const globalPlugins = generateGlobalPlugins(api, tags);
-
   // x-kong-service-defaults is free format so we do not want type checking.
   // If added, it would tightly couple these objects to Kong, and that would make future maintenance a lot harder.
   // $FlowFixMe
   const serviceDefaults = api['x-kong-service-defaults'] || {};
+
   if (typeof serviceDefaults !== 'object') {
-    throw new Error(`expected 'x-kong-service-defaults' to be an object`);
+    throw new Error('expected \'x-kong-service-defaults\' to be an object');
   }
 
   const service: DCService = {
@@ -55,26 +49,28 @@ export function generateService(
     name,
     // remove semicolon i.e. convert `https:` to `https`
     protocol: parsedUrl.protocol.substring(0, parsedUrl.protocol.length - 1),
-    host: name, // not a hostname, but the Upstream name
+    host: name,
+    // not a hostname, but the Upstream name
     port: Number(parsedUrl.port || '80'),
     path: parsedUrl.pathname,
     plugins: globalPlugins.plugins,
     routes: [],
     tags,
   };
-
   // x-kong-route-defaults is free format so we do not want type checking.
   // If added, it would tightly couple these objects to Kong, and that would make future maintenance a lot harder.
   // $FlowFixMe
   const routeDefaultsRoot = api['x-kong-route-defaults'] || {};
+
   if (typeof routeDefaultsRoot !== 'object') {
-    throw new Error(`expected root-level 'x-kong-route-defaults' to be an object`);
+    throw new Error('expected root-level \'x-kong-route-defaults\' to be an object');
   }
 
   for (const routePath of Object.keys(api.paths)) {
     const pathItem: OA3PathItem = api.paths[routePath];
     // $FlowFixMe
     const routeDefaultsPath = api.paths[routePath]['x-kong-route-defaults'] || routeDefaultsRoot;
+
     if (typeof routeDefaultsPath !== 'object') {
       throw new Error(`expected 'x-kong-route-defaults' to be an object (at path '${routePath}')`);
     }
@@ -96,9 +92,10 @@ export function generateService(
         continue;
       }
 
-      const operation: ?OA3Operation = pathItem[method];
+      const operation: OA3Operation | null | undefined = pathItem[method];
       // $FlowFixMe
       const routeDefaultsOperation = pathItem[method]['x-kong-route-defaults'] || routeDefaultsPath;
+
       if (typeof routeDefaultsOperation !== 'object') {
         throw new Error(
           `expected 'x-kong-route-defaults' to be an object (at operation '${method}' of path '${routePath}')`,
@@ -112,7 +109,6 @@ export function generateService(
 
       // Create the base route object
       const fullPathRegex = pathVariablesToRegex(routePath);
-
       // $FlowFixMe
       const route: DCRoute = {
         ...routeDefaultsOperation,
@@ -152,8 +148,8 @@ export function generateService(
 export function generateRouteName(
   api: OpenApi3Spec,
   routePath: string,
-  method: $Keys<typeof HttpMethod>,
-): string {
+  method: keyof typeof HttpMethod,
+) {
   const name = getName(api);
   const pathItem = api.paths[routePath];
 
diff --git a/packages/openapi-2-kong/src/declarative-config/__tests__/upstreams.test.js b/packages/openapi-2-kong/src/declarative-config/upstreams.test.ts
similarity index 89%
rename from packages/openapi-2-kong/src/declarative-config/__tests__/upstreams.test.js
rename to packages/openapi-2-kong/src/declarative-config/upstreams.test.ts
index b1437505d0..21a84cf1cf 100644
--- a/packages/openapi-2-kong/src/declarative-config/__tests__/upstreams.test.js
+++ b/packages/openapi-2-kong/src/declarative-config/upstreams.test.ts
@@ -1,5 +1,5 @@
 import { parseSpec } from '../..';
-import { generateUpstreams } from '../upstreams';
+import { generateUpstreams } from './upstreams';
 import { getSpec } from './utils';
 
 const xKongUpstreamDefaults = 'x-kong-upstream-defaults';
@@ -21,9 +21,7 @@ const getSpecResult = () =>
 describe('upstreams', () => {
   it('generates an upstream', async () => {
     const spec = getSpec();
-
     const specResult = getSpecResult();
-
     const api = await parseSpec(spec);
     expect(generateUpstreams(api, ['Tag'])).toEqual([specResult]);
   });
@@ -31,18 +29,17 @@ describe('upstreams', () => {
   it('throws for a root level x-kong-route-default', async () => {
     const spec = getSpec();
     spec[xKongUpstreamDefaults] = 'foo';
-
     const api = await parseSpec(spec);
+
     const fn = () => generateUpstreams(api, ['Tag']);
-    expect(fn).toThrowError(`expected 'x-kong-upstream-defaults' to be an object`);
+
+    expect(fn).toThrowError('expected \'x-kong-upstream-defaults\' to be an object');
   });
 
   it('ignores null for a root level x-kong-route-default', async () => {
     const spec = getSpec();
     spec[xKongUpstreamDefaults] = null;
-
     const specResult = getSpecResult();
-
     const api = await parseSpec(spec);
     expect(generateUpstreams(api, ['Tag'])).toEqual([specResult]);
   });
diff --git a/packages/openapi-2-kong/src/declarative-config/upstreams.js b/packages/openapi-2-kong/src/declarative-config/upstreams.ts
similarity index 72%
rename from packages/openapi-2-kong/src/declarative-config/upstreams.js
rename to packages/openapi-2-kong/src/declarative-config/upstreams.ts
index 546e2becdd..ce8a7c22e6 100644
--- a/packages/openapi-2-kong/src/declarative-config/upstreams.js
+++ b/packages/openapi-2-kong/src/declarative-config/upstreams.ts
@@ -1,8 +1,8 @@
-// @flow
-
 import { getName, parseUrl, fillServerVariables } from '../common';
+import { DCUpstream } from '../types/declarative-config';
+import { OpenApi3Spec } from '../types/openapi3';
 
-export function generateUpstreams(api: OpenApi3Spec, tags: Array<string>) {
+export function generateUpstreams(api: OpenApi3Spec, tags: string[]) {
   const servers = api.servers || [];
 
   if (servers.length === 0) {
@@ -10,12 +10,11 @@ export function generateUpstreams(api: OpenApi3Spec, tags: Array<string>) {
   }
 
   // x-kong-upstream-defaults is free format so we do not want type checking.
-  // If added, it would tightly couple these objects to Kong, and that would
-  // make future maintenance a lot harder.
-  // $FlowFixMe
+  // If added, it would tightly couple these objects to Kong, and that would make future maintenance a lot harder.
   const upstreamDefaults = api['x-kong-upstream-defaults'] || {};
+
   if (typeof upstreamDefaults !== 'object') {
-    throw new Error(`expected 'x-kong-upstream-defaults' to be an object`);
+    throw new Error("expected 'x-kong-upstream-defaults' to be an object");
   }
 
   const upstream: DCUpstream = {
diff --git a/packages/openapi-2-kong/src/declarative-config/__tests__/utils.js b/packages/openapi-2-kong/src/declarative-config/utils.ts
similarity index 68%
rename from packages/openapi-2-kong/src/declarative-config/__tests__/utils.js
rename to packages/openapi-2-kong/src/declarative-config/utils.ts
index b35eed5d11..1ded84e3a6 100644
--- a/packages/openapi-2-kong/src/declarative-config/__tests__/utils.js
+++ b/packages/openapi-2-kong/src/declarative-config/utils.ts
@@ -3,8 +3,15 @@ export const getSpec = () =>
   JSON.parse(
     JSON.stringify({
       openapi: '3.0',
-      info: { version: '1.0', title: 'My API' },
-      servers: [{ url: 'https://server1.com/path' }],
+      info: {
+        version: '1.0',
+        title: 'My API',
+      },
+      servers: [
+        {
+          url: 'https://server1.com/path',
+        },
+      ],
       paths: {
         '/cats': {
           'x-kong-name': 'Cat stuff',
@@ -14,7 +21,9 @@ export const getSpec = () =>
         '/dogs': {
           summary: 'Dog stuff',
           get: {},
-          post: { summary: 'Ignored summary' },
+          post: {
+            summary: 'Ignored summary',
+          },
         },
         '/birds/{id}': {
           get: {},
diff --git a/packages/openapi-2-kong/src/__tests__/fixtures.test.js b/packages/openapi-2-kong/src/fixtures.test.ts
similarity index 80%
rename from packages/openapi-2-kong/src/__tests__/fixtures.test.js
rename to packages/openapi-2-kong/src/fixtures.test.ts
index 61352219cc..1cf044df1a 100644
--- a/packages/openapi-2-kong/src/__tests__/fixtures.test.js
+++ b/packages/openapi-2-kong/src/fixtures.test.ts
@@ -1,25 +1,25 @@
 import fs from 'fs';
 import path from 'path';
-import { generate } from '../index';
+import { generate } from './generate';
+import { DCRoute, DeclarativeConfig } from './types/declarative-config';
 
 describe('fixtures', () => {
-  const root = path.join(__dirname, '../__fixtures__/');
-
+  const root = path.join(__dirname, './fixtures/');
   const fileBases = fs.readdirSync(root).filter(name => !name.includes('.expected'));
 
   for (const fileBase of fileBases) {
     const inputPath = path.join(root, fileBase);
     const expectedBase = `${path.parse(fileBase).name}.expected.json`;
     const expectedPath = path.join(root, expectedBase);
-
     const expected = fs.readFileSync(expectedPath, 'utf8');
 
     it(`converts ${fileBase}`, async () => {
       const result = await generate(inputPath, 'kong-declarative-config');
+      // @ts-expect-error -- TSCONVERSION
       expect(result.documents.length).toBe(1);
-
       const document = result.documents[0];
-      const expectedObj = JSON.parse(expected);
+
+      const expectedObj = JSON.parse(expected) as DeclarativeConfig;
 
       // Make matching friendlier
       for (const service of expectedObj.services || []) {
@@ -35,7 +35,7 @@ describe('fixtures', () => {
   }
 });
 
-function _sortRoutes(routes) {
+function _sortRoutes(routes: DCRoute[]) {
   return routes.sort((a, b) => {
     let aCompare = a.paths[0];
     let bCompare = b.paths[0];
diff --git a/packages/openapi-2-kong/src/__fixtures__/api-with-examples.expected.json b/packages/openapi-2-kong/src/fixtures/api-with-examples.expected.json
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/api-with-examples.expected.json
rename to packages/openapi-2-kong/src/fixtures/api-with-examples.expected.json
diff --git a/packages/openapi-2-kong/src/__fixtures__/api-with-examples.yaml b/packages/openapi-2-kong/src/fixtures/api-with-examples.yaml
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/api-with-examples.yaml
rename to packages/openapi-2-kong/src/fixtures/api-with-examples.yaml
diff --git a/packages/openapi-2-kong/src/__fixtures__/callback-example.expected.json b/packages/openapi-2-kong/src/fixtures/callback-example.expected.json
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/callback-example.expected.json
rename to packages/openapi-2-kong/src/fixtures/callback-example.expected.json
diff --git a/packages/openapi-2-kong/src/__fixtures__/callback-example.yaml b/packages/openapi-2-kong/src/fixtures/callback-example.yaml
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/callback-example.yaml
rename to packages/openapi-2-kong/src/fixtures/callback-example.yaml
diff --git a/packages/openapi-2-kong/src/__fixtures__/httpbin.expected.json b/packages/openapi-2-kong/src/fixtures/httpbin.expected.json
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/httpbin.expected.json
rename to packages/openapi-2-kong/src/fixtures/httpbin.expected.json
diff --git a/packages/openapi-2-kong/src/__fixtures__/httpbin.yaml b/packages/openapi-2-kong/src/fixtures/httpbin.yaml
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/httpbin.yaml
rename to packages/openapi-2-kong/src/fixtures/httpbin.yaml
diff --git a/packages/openapi-2-kong/src/__fixtures__/link-example.expected.json b/packages/openapi-2-kong/src/fixtures/link-example.expected.json
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/link-example.expected.json
rename to packages/openapi-2-kong/src/fixtures/link-example.expected.json
diff --git a/packages/openapi-2-kong/src/__fixtures__/link-example.yaml b/packages/openapi-2-kong/src/fixtures/link-example.yaml
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/link-example.yaml
rename to packages/openapi-2-kong/src/fixtures/link-example.yaml
diff --git a/packages/openapi-2-kong/src/__fixtures__/no-targets-example.expected.json b/packages/openapi-2-kong/src/fixtures/no-targets-example.expected.json
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/no-targets-example.expected.json
rename to packages/openapi-2-kong/src/fixtures/no-targets-example.expected.json
diff --git a/packages/openapi-2-kong/src/__fixtures__/no-targets-example.yaml b/packages/openapi-2-kong/src/fixtures/no-targets-example.yaml
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/no-targets-example.yaml
rename to packages/openapi-2-kong/src/fixtures/no-targets-example.yaml
diff --git a/packages/openapi-2-kong/src/__fixtures__/petstore-expanded.expected.json b/packages/openapi-2-kong/src/fixtures/petstore-expanded.expected.json
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/petstore-expanded.expected.json
rename to packages/openapi-2-kong/src/fixtures/petstore-expanded.expected.json
diff --git a/packages/openapi-2-kong/src/__fixtures__/petstore-expanded.yaml b/packages/openapi-2-kong/src/fixtures/petstore-expanded.yaml
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/petstore-expanded.yaml
rename to packages/openapi-2-kong/src/fixtures/petstore-expanded.yaml
diff --git a/packages/openapi-2-kong/src/__fixtures__/petstore.expected.json b/packages/openapi-2-kong/src/fixtures/petstore.expected.json
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/petstore.expected.json
rename to packages/openapi-2-kong/src/fixtures/petstore.expected.json
diff --git a/packages/openapi-2-kong/src/__fixtures__/petstore.yaml b/packages/openapi-2-kong/src/fixtures/petstore.yaml
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/petstore.yaml
rename to packages/openapi-2-kong/src/fixtures/petstore.yaml
diff --git a/packages/openapi-2-kong/src/__fixtures__/request-validator-plugin.expected.json b/packages/openapi-2-kong/src/fixtures/request-validator-plugin.expected.json
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/request-validator-plugin.expected.json
rename to packages/openapi-2-kong/src/fixtures/request-validator-plugin.expected.json
diff --git a/packages/openapi-2-kong/src/__fixtures__/request-validator-plugin.yaml b/packages/openapi-2-kong/src/fixtures/request-validator-plugin.yaml
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/request-validator-plugin.yaml
rename to packages/openapi-2-kong/src/fixtures/request-validator-plugin.yaml
diff --git a/packages/openapi-2-kong/src/__fixtures__/security.expected.json b/packages/openapi-2-kong/src/fixtures/security.expected.json
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/security.expected.json
rename to packages/openapi-2-kong/src/fixtures/security.expected.json
diff --git a/packages/openapi-2-kong/src/__fixtures__/security.yaml b/packages/openapi-2-kong/src/fixtures/security.yaml
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/security.yaml
rename to packages/openapi-2-kong/src/fixtures/security.yaml
diff --git a/packages/openapi-2-kong/src/__fixtures__/uspto.expected.json b/packages/openapi-2-kong/src/fixtures/uspto.expected.json
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/uspto.expected.json
rename to packages/openapi-2-kong/src/fixtures/uspto.expected.json
diff --git a/packages/openapi-2-kong/src/__fixtures__/uspto.yaml b/packages/openapi-2-kong/src/fixtures/uspto.yaml
similarity index 100%
rename from packages/openapi-2-kong/src/__fixtures__/uspto.yaml
rename to packages/openapi-2-kong/src/fixtures/uspto.yaml
diff --git a/packages/openapi-2-kong/src/__tests__/index.test.js b/packages/openapi-2-kong/src/generate.test.ts
similarity index 80%
rename from packages/openapi-2-kong/src/__tests__/index.test.js
rename to packages/openapi-2-kong/src/generate.test.ts
index 67ab00f001..a61f624060 100644
--- a/packages/openapi-2-kong/src/__tests__/index.test.js
+++ b/packages/openapi-2-kong/src/generate.test.ts
@@ -1,4 +1,4 @@
-import { generate, generateFromString, parseSpec } from '../index';
+import { generate, generateFromString, parseSpec } from './generate';
 import YAML from 'yaml';
 import path from 'path';
 import fs from 'fs';
@@ -6,8 +6,9 @@ import fs from 'fs';
 describe('index', () => {
   describe('generate()', () => {
     it('generates DC from file', async () => {
-      const p = path.join(__dirname, '../__fixtures__/uspto.yaml');
+      const p = path.join(__dirname, './fixtures/uspto.yaml');
       const {
+        // @ts-expect-error -- TSCONVERSION
         documents: [dc],
       } = await generate(p, 'kong-declarative-config');
       expect(dc._format_version).toBe('1.1');
@@ -16,7 +17,7 @@ describe('index', () => {
     });
 
     it('generates DC from file with extra tags', async () => {
-      const p = path.join(__dirname, '../__fixtures__/uspto.yaml');
+      const p = path.join(__dirname, './fixtures/uspto.yaml');
       const {
         documents: [dc],
       } = await generate(p, 'kong-declarative-config', ['MyTag']);
@@ -28,7 +29,7 @@ describe('index', () => {
 
   describe('generateFromString()', () => {
     it('generates DC from string', async () => {
-      const s = fs.readFileSync(path.join(__dirname, '../__fixtures__/uspto.yaml'), 'utf8');
+      const s = fs.readFileSync(path.join(__dirname, './fixtures/uspto.yaml'), 'utf8');
       const {
         documents: [dc],
       } = await generateFromString(s, 'kong-declarative-config');
@@ -39,7 +40,7 @@ describe('index', () => {
   describe('generateFromSpec()', () => {
     it('generates DC from spec', async () => {
       const s = YAML.parse(
-        fs.readFileSync(path.join(__dirname, '../__fixtures__/uspto.yaml'), 'utf8'),
+        fs.readFileSync(path.join(__dirname, './fixtures/uspto.yaml'), 'utf8'),
       );
       const {
         documents: [dc],
@@ -64,11 +65,14 @@ describe('index', () => {
       },
       components: {
         schemas: {
-          dog: { name: { type: 'string' } },
+          dog: {
+            name: {
+              type: 'string',
+            },
+          },
         },
       },
     };
-
     const specResolved = {
       openapi: '3.0.0',
       components: spec.components,
@@ -78,7 +82,9 @@ describe('index', () => {
           post: {
             responses: {
               200: {
-                name: { type: 'string' },
+                name: {
+                  type: 'string',
+                },
               },
             },
           },
diff --git a/packages/openapi-2-kong/src/index.js b/packages/openapi-2-kong/src/generate.ts
similarity index 68%
rename from packages/openapi-2-kong/src/index.js
rename to packages/openapi-2-kong/src/generate.ts
index 150b8acf8f..c115b348c6 100644
--- a/packages/openapi-2-kong/src/index.js
+++ b/packages/openapi-2-kong/src/generate.ts
@@ -1,18 +1,20 @@
-// @flow
 import fs from 'fs';
 import path from 'path';
 import { generateDeclarativeConfigFromSpec } from './declarative-config';
 import { generateKongForKubernetesConfigFromSpec } from './kubernetes';
 import SwaggerParser from 'swagger-parser';
+import { OpenApi3Spec } from './types/openapi3';
+import { ConversionResultType, ConversionResult } from './types/outputs';
+import { parse as YAMLparse } from 'yaml';
 
 const defaultTags = ['OAS3_import'];
 
 export async function generate(
   specPath: string,
   type: ConversionResultType,
-  tags: Array<string> = [],
-): Promise<ConversionResult> {
-  return new Promise((resolve, reject) => {
+  tags: string[] = [],
+) {
+  return new Promise<ConversionResult>((resolve, reject) => {
     fs.readFile(path.resolve(specPath), 'utf8', (err, contents) => {
       if (err != null) {
         reject(err);
@@ -29,45 +31,45 @@ export async function generate(
 export async function generateFromString(
   specStr: string,
   type: ConversionResultType,
-  tags: Array<string> = [],
-): Promise<ConversionResult> {
-  const api: OpenApi3Spec = await parseSpec(specStr);
+  tags: string[] = [],
+) {
+  const api = await parseSpec(specStr);
   return generateFromSpec(api, type, tags);
 }
 
 export function generateFromSpec(
   api: OpenApi3Spec,
   type: ConversionResultType,
-  tags: Array<string> = [],
-): ConversionResult {
+  tags: string[] = [],
+) {
   const allTags = [...defaultTags, ...tags];
 
   switch (type) {
     case 'kong-declarative-config':
       return generateDeclarativeConfigFromSpec(api, allTags);
+
     case 'kong-for-kubernetes':
-      return generateKongForKubernetesConfigFromSpec(api, allTags);
+      return generateKongForKubernetesConfigFromSpec(api);
+
     default:
       throw new Error(`Unsupported output type "${type}"`);
   }
 }
 
-export async function parseSpec(spec: string | Object): Promise<OpenApi3Spec> {
+export async function parseSpec(spec: string | Record<string, any>) {
   let api: OpenApi3Spec;
 
   if (typeof spec === 'string') {
     try {
       api = JSON.parse(spec);
     } catch (err) {
-      api = SwaggerParser.YAML.parse(spec);
+      api = YAMLparse(spec);
     }
   } else {
     api = JSON.parse(JSON.stringify(spec));
   }
 
-  // Ensure it has some required properties to make parsing
-  // a bit less strict
-
+  // Ensure it has some required properties to make parsing a bit less strict
   if (!api.info) {
     api.info = {};
   }
@@ -76,5 +78,6 @@ export async function parseSpec(spec: string | Object): Promise<OpenApi3Spec> {
     api.openapi = '3.0.0';
   }
 
-  return SwaggerParser.dereference(api);
+  // @ts-expect-error -- TSCONVERSION
+  return SwaggerParser.dereference(api) as Promise<OpenApi3Spec>;
 }
diff --git a/packages/openapi-2-kong/src/index.ts b/packages/openapi-2-kong/src/index.ts
new file mode 100644
index 0000000000..cf90bc8484
--- /dev/null
+++ b/packages/openapi-2-kong/src/index.ts
@@ -0,0 +1,6 @@
+export {
+  generate,
+  generateFromString,
+  generateFromSpec,
+  parseSpec,
+} from './generate';
diff --git a/packages/openapi-2-kong/src/kubernetes/__tests__/index.test.js b/packages/openapi-2-kong/src/kubernetes/generate.test.ts
similarity index 84%
rename from packages/openapi-2-kong/src/kubernetes/__tests__/index.test.js
rename to packages/openapi-2-kong/src/kubernetes/generate.test.ts
index f3606cafb0..c2f1fb8070 100644
--- a/packages/openapi-2-kong/src/kubernetes/__tests__/index.test.js
+++ b/packages/openapi-2-kong/src/kubernetes/generate.test.ts
@@ -1,5 +1,5 @@
-// @flow
-import { parseSpec } from '../../index';
+import { parseSpec } from '../generate';
+import { OA3Server, OpenApi3Spec } from '../types/openapi3';
 import {
   generateKongForKubernetesConfigFromSpec,
   generateMetadataAnnotations,
@@ -8,7 +8,7 @@ import {
   generateServiceName,
   generateServicePath,
   generateServicePort,
-} from '../index';
+} from './generate';
 import {
   dummyName,
   dummyPluginDoc,
@@ -19,12 +19,15 @@ import {
   methodDoc,
   pluginDummy,
   pluginKeyAuth,
-} from './util/plugin-helpers';
+} from './plugin-helpers';
 
 describe('index', () => {
   const spec: OpenApi3Spec = {
     openapi: '3.0',
-    info: { version: '1.0', title: 'My API' },
+    info: {
+      version: '1.0',
+      title: 'My API',
+    },
     servers: [
       {
         url: 'http://api.insomnia.rest',
@@ -32,26 +35,24 @@ describe('index', () => {
     ],
     paths: {},
   };
-
   describe('getSpecName()', () => {
     it('with info.title', async () => {
-      const api: OpenApi3Spec = await parseSpec({ ...spec });
+      const api = await parseSpec({ ...spec });
       expect(getSpecName(api)).toBe('my-api');
     });
 
     it('no name', async () => {
-      const api: OpenApi3Spec = await parseSpec({ ...spec, info: undefined });
+      const api = await parseSpec({ ...spec, info: undefined });
       expect(getSpecName(api)).toBe('openapi');
     });
 
     it('with x-kong-name', () => {
       const api: OpenApi3Spec = { ...spec, 'x-kong-name': 'kong-name' };
-
       expect(getSpecName(api)).toBe('kong-name');
     });
 
     it('with x-kubernetes-ingress-metadata.name', async () => {
-      const api: OpenApi3Spec = await parseSpec({
+      const api = await parseSpec({
         ...spec,
         'x-kong-name': 'Kong Name',
         info: {
@@ -63,10 +64,9 @@ describe('index', () => {
       expect(getSpecName(api)).toBe('k8s-name');
     });
   });
-
   describe('generateMetadataAnnotations()', () => {
     it('gets annotations from x-kubernetes-ingress-metadata', async () => {
-      const api: OpenApi3Spec = await parseSpec({
+      const api = await parseSpec({
         ...spec,
         info: {
           'x-kubernetes-ingress-metadata': {
@@ -77,9 +77,9 @@ describe('index', () => {
           },
         },
       });
-
-      const result = generateMetadataAnnotations(api, { pluginNames: [] });
-
+      const result = generateMetadataAnnotations(api, {
+        pluginNames: [],
+      });
       expect(result).toEqual({
         'kubernetes.io/ingress.class': 'kong',
         'nginx.ingress.kubernetes.io/rewrite-target': '/',
@@ -87,12 +87,18 @@ describe('index', () => {
     });
 
     it('gets only core annotation(s)', () => {
-      const result = generateMetadataAnnotations(spec, { pluginNames: [] });
-      expect(result).toEqual({ 'kubernetes.io/ingress.class': 'kong' });
+      const result = generateMetadataAnnotations(spec, {
+        pluginNames: [],
+      });
+      expect(result).toEqual({
+        'kubernetes.io/ingress.class': 'kong',
+      });
     });
 
     it('gets plugin annotations correctly', () => {
-      const result = generateMetadataAnnotations(spec, { pluginNames: ['one', 'two'] });
+      const result = generateMetadataAnnotations(spec, {
+        pluginNames: ['one', 'two'],
+      });
       expect(result).toEqual({
         'kubernetes.io/ingress.class': 'kong',
         'konghq.com/plugins': 'one, two',
@@ -100,7 +106,10 @@ describe('index', () => {
     });
 
     it('gets override annotation correctly', () => {
-      const result = generateMetadataAnnotations(spec, { pluginNames: [], overrideName: 'name' });
+      const result = generateMetadataAnnotations(spec, {
+        pluginNames: [],
+        overrideName: 'name',
+      });
       expect(result).toEqual({
         'kubernetes.io/ingress.class': 'kong',
         'konghq.com/override': 'name',
@@ -111,7 +120,6 @@ describe('index', () => {
       const originalAnnotations = {
         'nginx.ingress.kubernetes.io/rewrite-target': '/',
       };
-
       const api: OpenApi3Spec = {
         ...spec,
         info: {
@@ -132,17 +140,17 @@ describe('index', () => {
         'konghq.com/plugins': 'one, two',
         'konghq.com/override': 'name',
       });
-
       // Should not modify source metadata annotations object
       expect(api.info['x-kubernetes-ingress-metadata']?.annotations).toStrictEqual(
         originalAnnotations,
       );
     });
   });
-
   describe('generateServiceName()', () => {
     it('defaults to ingress name', () => {
-      const server: OA3Server = { url: 'https://insomnia.rest' };
+      const server: OA3Server = {
+        url: 'https://insomnia.rest',
+      };
       expect(generateServiceName(server, 'my-api', 0)).toBe('my-api-service-0');
       expect(generateServiceName(server, 'my-api', 3)).toBe('my-api-service-3');
     });
@@ -170,19 +178,22 @@ describe('index', () => {
       expect(generateServiceName(server, 'my-api', 0)).toBe('s-name');
     });
   });
-
   describe('generateServicePort()', () => {
     it('uses default 80 for http and https', () => {
-      const server = { url: 'http://api.insomnia.rest' };
+      const server = {
+        url: 'http://api.insomnia.rest',
+      };
       expect(generateServicePort(server)).toEqual(80);
       server.url = 'https://api.insomnia.rest';
       expect(generateServicePort(server)).toEqual(80);
     });
 
     it('uses default 443 when tls configured ', () => {
-      const server = {
+      const server: OA3Server = {
         url: 'https://api.insomnia.rest',
-        'x-kubernetes-tls': { secretName: 'tls-secret' },
+        'x-kubernetes-tls': {
+          secretName: 'tls-secret',
+        },
       };
       expect(generateServicePort(server)).toEqual(443);
     });
@@ -190,10 +201,19 @@ describe('index', () => {
     it('uses 443 if any port is 443 when tls configured ', () => {
       const server: OA3Server = {
         url: 'https://api.insomnia.rest',
-        'x-kubernetes-tls': { secretName: 'tls-secret' },
+        'x-kubernetes-tls': {
+          secretName: 'tls-secret',
+        },
         'x-kubernetes-service': {
           spec: {
-            ports: [{ port: 212 }, { port: 443 }],
+            ports: [
+              {
+                port: 212,
+              },
+              {
+                port: 443,
+              },
+            ],
           },
         },
       };
@@ -209,7 +229,14 @@ describe('index', () => {
         },
         'x-kubernetes-service': {
           spec: {
-            ports: [{ port: 212 }, { port: 322 }],
+            ports: [
+              {
+                port: 212,
+              },
+              {
+                port: 322,
+              },
+            ],
           },
         },
       };
@@ -221,14 +248,20 @@ describe('index', () => {
         url: 'https://api.insomnia.rest',
         'x-kubernetes-service': {
           spec: {
-            ports: [{ port: 212 }, { port: 322 }],
+            ports: [
+              {
+                port: 212,
+              },
+              {
+                port: 322,
+              },
+            ],
           },
         },
       };
       expect(generateServicePort(server)).toEqual(212);
     });
   });
-
   describe('generateServicePath()', () => {
     it.each(['', '/'])(
       'returns undefined if base path is [%o] and no specific path exists',
@@ -261,11 +294,15 @@ describe('index', () => {
       expect(result).toBe('/api/v1/.*/.*/path');
     });
   });
-
   describe('generateRulesForServer()', () => {
     it('handles basic server at root', () => {
-      const result = generateRulesForServer(0, { url: 'http://api.insomnia.rest' }, 'my-ingress');
-
+      const result = generateRulesForServer(
+        0,
+        {
+          url: 'http://api.insomnia.rest',
+        },
+        'my-ingress',
+      );
       expect(result).toStrictEqual({
         host: 'api.insomnia.rest',
         http: {
@@ -284,10 +321,11 @@ describe('index', () => {
     it('handles basic server with base path', () => {
       const result = generateRulesForServer(
         0,
-        { url: 'http://api.insomnia.rest/v1' },
+        {
+          url: 'http://api.insomnia.rest/v1',
+        },
         'my-ingress',
       );
-
       expect(result).toEqual({
         host: 'api.insomnia.rest',
         http: {
@@ -307,11 +345,12 @@ describe('index', () => {
     it('handles server with specific path', () => {
       const result = generateRulesForServer(
         1,
-        { url: 'http://api.insomnia.rest/v1' },
+        {
+          url: 'http://api.insomnia.rest/v1',
+        },
         'my-ingress',
         ['/{parameter}/{another}/path'],
       );
-
       expect(result).toEqual({
         host: 'api.insomnia.rest',
         http: {
@@ -331,11 +370,12 @@ describe('index', () => {
     it('handles server with no paths', () => {
       const result = generateRulesForServer(
         1,
-        { url: 'http://api.insomnia.rest/v1' },
+        {
+          url: 'http://api.insomnia.rest/v1',
+        },
         'my-ingress',
         [],
       );
-
       expect(result).toEqual({
         host: 'api.insomnia.rest',
         http: {
@@ -363,7 +403,6 @@ describe('index', () => {
         },
         'my-ingress',
       );
-
       expect(result).toEqual({
         host: 'api.insomnia.rest',
         tls: {
@@ -382,9 +421,10 @@ describe('index', () => {
     });
 
     it('handles server url with protocol variable - no default', () => {
-      const server = { url: '{protocol}://api.insomnia.rest/v1' };
+      const server = {
+        url: '{protocol}://api.insomnia.rest/v1',
+      };
       const result = generateRulesForServer(1, server, 'my-ingress', []);
-
       expect(result).toEqual({
         host: 'api.insomnia.rest',
         http: {
@@ -399,17 +439,19 @@ describe('index', () => {
           ],
         },
       });
-
       expect(server.url).toBe('http://api.insomnia.rest/v1');
     });
 
     it('handles server url with protocol variable - with default', () => {
       const server = {
         url: '{protocol}://api.insomnia.rest/v1',
-        variables: { protocol: { default: 'https' } },
+        variables: {
+          protocol: {
+            default: 'https',
+          },
+        },
       };
       const result = generateRulesForServer(1, server, 'my-ingress', []);
-
       expect(result).toEqual({
         host: 'api.insomnia.rest',
         http: {
@@ -424,7 +466,6 @@ describe('index', () => {
           ],
         },
       });
-
       expect(server.url).toBe('https://api.insomnia.rest/v1');
     });
 
@@ -438,7 +479,6 @@ describe('index', () => {
         },
       };
       const result = generateRulesForServer(1, server, 'my-ingress', []);
-
       expect(result).toEqual({
         host: 'api.insomnia.rest',
         http: {
@@ -453,21 +493,13 @@ describe('index', () => {
           ],
         },
       });
-
       expect(server.url).toBe('http://api.insomnia.rest/.*/v1');
     });
   });
-
   describe('generateKongForKubernetesConfigFromSpec()', () => {
     it('handles global plugins', async () => {
-      const api: OpenApi3Spec = await parseSpec({
-        ...spec,
-        ...pluginKeyAuth,
-        ...pluginDummy,
-      });
-
-      const result = generateKongForKubernetesConfigFromSpec(api, []);
-
+      const api = await parseSpec({ ...spec, ...pluginKeyAuth, ...pluginDummy });
+      const result = generateKongForKubernetesConfigFromSpec(api);
       expect(result.documents).toStrictEqual([
         keyAuthPluginDoc('g0'),
         dummyPluginDoc('g1'),
@@ -481,7 +513,7 @@ describe('index', () => {
     });
 
     it('handles global and server plugins', async () => {
-      const api: OpenApi3Spec = await parseSpec({
+      const api = await parseSpec({
         ...spec,
         ...pluginKeyAuth,
         servers: [
@@ -499,9 +531,7 @@ describe('index', () => {
           },
         ],
       });
-
-      const result = generateKongForKubernetesConfigFromSpec(api, []);
-
+      const result = generateKongForKubernetesConfigFromSpec(api);
       expect(result.documents).toStrictEqual([
         keyAuthPluginDoc('g0'),
         keyAuthPluginDoc('s1'),
@@ -519,23 +549,16 @@ describe('index', () => {
     });
 
     it('handles global and path plugins', async () => {
-      const api: OpenApi3Spec = await parseSpec({
+      const api = await parseSpec({
         ...spec,
         ...pluginKeyAuth,
         paths: {
           '/no-plugin': {},
-          '/plugin-0': {
-            ...pluginKeyAuth,
-          },
-          '/plugin-1': {
-            ...pluginKeyAuth,
-            ...pluginDummy,
-          },
+          '/plugin-0': { ...pluginKeyAuth },
+          '/plugin-1': { ...pluginKeyAuth, ...pluginDummy },
         },
       });
-
-      const result = generateKongForKubernetesConfigFromSpec(api, []);
-
+      const result = generateKongForKubernetesConfigFromSpec(api);
       expect(result.documents).toStrictEqual([
         keyAuthPluginDoc('g0'),
         keyAuthPluginDoc('p1'),
@@ -554,25 +577,18 @@ describe('index', () => {
     });
 
     it('handles global and method plugins', async () => {
-      const api: OpenApi3Spec = await parseSpec({
+      const api = await parseSpec({
         ...spec,
         ...pluginKeyAuth,
         paths: {
           '/path': {
             GET: {},
-            PUT: {
-              ...pluginKeyAuth,
-            },
-            POST: {
-              ...pluginKeyAuth,
-              ...pluginDummy,
-            },
+            PUT: { ...pluginKeyAuth },
+            POST: { ...pluginKeyAuth, ...pluginDummy },
           },
         },
       });
-
-      const result = generateKongForKubernetesConfigFromSpec(api, []);
-
+      const result = generateKongForKubernetesConfigFromSpec(api);
       expect(result.documents).toStrictEqual([
         methodDoc('get'),
         methodDoc('put'),
diff --git a/packages/openapi-2-kong/src/kubernetes/index.js b/packages/openapi-2-kong/src/kubernetes/generate.ts
similarity index 79%
rename from packages/openapi-2-kong/src/kubernetes/index.js
rename to packages/openapi-2-kong/src/kubernetes/generate.ts
index a0604dacb4..80f6213f6c 100644
--- a/packages/openapi-2-kong/src/kubernetes/index.js
+++ b/packages/openapi-2-kong/src/kubernetes/generate.ts
@@ -1,14 +1,18 @@
-// @flow
-
-import { getMethodAnnotationName, getName, parseUrl } from '../common';
+import { getMethodAnnotationName, getName, HttpMethodType, parseUrl } from '../common';
 import urlJoin from 'url-join';
 import { flattenPluginDocuments, getPlugins, prioritizePlugins } from './plugins';
 import { pathVariablesToWildcard, resolveUrlVariables } from './variables';
+import { IndexIncrement } from '../types/k8plugins';
+import { KubernetesConfig, KubernetesMethodConfig, K8sMetadata, K8sAnnotations, K8sIngressRule, K8sPath } from '../types/kubernetes-config';
+import { OpenApi3Spec, OA3Server } from '../types/openapi3';
+import { KongForKubernetesResult } from '../types/outputs';
 
-export function generateKongForKubernetesConfigFromSpec(
-  api: OpenApi3Spec,
-  tags: Array<string>,
-): KongForKubernetesResult {
+interface CustomAnnotations {
+  pluginNames: string[];
+  overrideName?: string;
+}
+
+export function generateKongForKubernetesConfigFromSpec(api: OpenApi3Spec): KongForKubernetesResult {
   const specName = getSpecName(api);
 
   // Extract global, server, and path plugins upfront
@@ -16,9 +20,9 @@ export function generateKongForKubernetesConfigFromSpec(
 
   // Initialize document collections
   const ingressDocuments = [];
-
   const methodsThatNeedKongIngressDocuments: Set<HttpMethodType> = new Set<HttpMethodType>();
   let _iterator = 0;
+
   const increment = (): number => _iterator++;
 
   // Iterate all global servers
@@ -29,13 +33,12 @@ export function generateKongForKubernetesConfigFromSpec(
       pp.operations.forEach(o => {
         // Prioritize plugins for doc
         const pluginsForDoc = prioritizePlugins(plugins.global, sp.plugins, pp.plugins, o.plugins);
-
         // Identify custom annotations
         const annotations: CustomAnnotations = {
           pluginNames: pluginsForDoc.map(x => x.metadata.name),
         };
-
         const method = o.method;
+
         if (method) {
           annotations.overrideName = getMethodAnnotationName(method);
           methodsThatNeedKongIngressDocuments.add(method);
@@ -43,7 +46,6 @@ export function generateKongForKubernetesConfigFromSpec(
 
         // Create metadata
         const metadata = generateMetadata(api, annotations, increment, specName);
-
         // Generate Kong ingress document for a server and path in the doc
         const doc: KubernetesConfig = {
           apiVersion: 'extensions/v1beta1',
@@ -53,7 +55,6 @@ export function generateKongForKubernetesConfigFromSpec(
             rules: [generateRulesForServer(serverIndex, sp.server, specName, [pp.path])],
           },
         };
-
         ingressDocuments.push(doc);
       });
     });
@@ -62,16 +63,17 @@ export function generateKongForKubernetesConfigFromSpec(
   const methodDocuments = Array.from(methodsThatNeedKongIngressDocuments).map(
     generateK8sMethodDocuments,
   );
+
   const pluginDocuments = flattenPluginDocuments(plugins);
 
   const documents = [...methodDocuments, ...pluginDocuments, ...ingressDocuments];
 
-  return ({
+  return {
     type: 'kong-for-kubernetes',
     label: 'Kong for Kubernetes',
     documents,
     warnings: [],
-  }: KongForKubernetesResult);
+  } as KongForKubernetesResult;
 }
 
 function generateK8sMethodDocuments(method: HttpMethodType): KubernetesMethodConfig {
@@ -99,13 +101,16 @@ function generateMetadata(
   };
 }
 
-type CustomAnnotations = {
-  pluginNames: Array<string>,
-  overrideName?: string,
-};
-
 export function getSpecName(api: OpenApi3Spec): string {
-  return getName(api, 'openapi', { lower: true, replacement: '-' }, true);
+  return getName(
+    api,
+    'openapi',
+    {
+      lower: true,
+      replacement: '-',
+    },
+    true,
+  );
 }
 
 export function generateMetadataAnnotations(
@@ -114,8 +119,9 @@ export function generateMetadataAnnotations(
 ): K8sAnnotations {
   // This annotation is required by kong-ingress-controller
   // https://github.com/Kong/kubernetes-ingress-controller/blob/main/docs/references/annotations.md#kubernetesioingressclass
-  const coreAnnotations = { 'kubernetes.io/ingress.class': 'kong' };
-
+  const coreAnnotations: K8sAnnotations = {
+    'kubernetes.io/ingress.class': 'kong',
+  };
   const metadata = api.info?.['x-kubernetes-ingress-metadata'];
 
   // Only continue if metadata annotations, or plugins, or overrides exist
@@ -131,7 +137,11 @@ export function generateMetadataAnnotations(
     }
 
     const originalAnnotations = metadata?.annotations || {};
-    return { ...originalAnnotations, ...customAnnotations, ...coreAnnotations };
+    return {
+      ...originalAnnotations,
+      ...customAnnotations,
+      ...coreAnnotations,
+    };
   }
 
   return coreAnnotations;
@@ -141,27 +151,36 @@ export function generateRulesForServer(
   index: number,
   server: OA3Server,
   specName: string,
-  paths?: Array<string>,
+  paths?: string[],
 ): K8sIngressRule {
   // Resolve serverUrl variables and update the source object so it only needs to be done once per server loop.
   server.url = resolveUrlVariables(server.url, server.variables);
-
   const { hostname, pathname } = parseUrl(server.url);
   const serviceName = generateServiceName(server, specName, index);
   const servicePort = generateServicePort(server);
-  const backend = { serviceName, servicePort };
+  const backend = {
+    serviceName,
+    servicePort,
+  };
+  const pathsToUse: string[] = (paths?.length && paths) || ['']; // Make flow happy
 
-  const pathsToUse: Array<string> = (paths?.length && paths) || ['']; // Make flow happy
-  const k8sPaths: Array<K8sPath> = pathsToUse.map(p => {
+  const k8sPaths: K8sPath[] = pathsToUse.map(p => {
     const path = generateServicePath(pathname, p);
-
-    return path ? { path, backend } : { backend };
+    return path
+      ? {
+          path,
+          backend,
+        }
+      : {
+          backend,
+        };
   });
-
   const tlsConfig = generateTlsConfig(server);
+
   if (tlsConfig) {
     return {
       host: hostname,
+      // @ts-expect-error -- TSCONVERSION This appears broken.  sometimes `tls` contains the secretName and sometimes it's one level up.
       tls: {
         paths: k8sPaths,
         ...tlsConfig,
@@ -171,19 +190,23 @@ export function generateRulesForServer(
 
   return {
     host: hostname,
-    http: { paths: k8sPaths },
+    http: {
+      paths: k8sPaths,
+    },
   };
 }
 
 export function generateServiceName(server: OA3Server, specName: string, index: number): string {
   // x-kubernetes-backend.serviceName
   const serviceName = server['x-kubernetes-backend']?.serviceName;
+
   if (serviceName) {
     return serviceName;
   }
 
   // x-kubernetes-service.metadata.name
   const metadataName = server['x-kubernetes-service']?.metadata?.name;
+
   if (metadataName) {
     return metadataName;
   }
@@ -192,13 +215,14 @@ export function generateServiceName(server: OA3Server, specName: string, index:
   return `${specName}-service-${index}`;
 }
 
-export function generateTlsConfig(server: OA3Server): Object | null {
+export function generateTlsConfig(server: OA3Server) {
   return server['x-kubernetes-tls'] || null;
 }
 
 export function generateServicePort(server: OA3Server): number {
   // x-kubernetes-backend.servicePort
   const backend = server['x-kubernetes-backend'];
+
   if (backend && typeof backend.servicePort === 'number') {
     return backend.servicePort;
   }
@@ -220,15 +244,15 @@ export function generateServicePort(server: OA3Server): number {
 
 export function generateServicePath(
   serverBasePath: string,
-  specificPath: string = '',
+  specificPath = '',
 ): string | typeof undefined {
   const shouldExtractPath = specificPath || (serverBasePath && serverBasePath !== '/');
+
   if (!shouldExtractPath) {
     return undefined;
   }
 
   const fullPath = urlJoin(serverBasePath, specificPath, specificPath ? '' : '.*');
   const pathname = pathVariablesToWildcard(fullPath);
-
   return pathname;
 }
diff --git a/packages/openapi-2-kong/src/kubernetes/index.ts b/packages/openapi-2-kong/src/kubernetes/index.ts
new file mode 100644
index 0000000000..7d858086e0
--- /dev/null
+++ b/packages/openapi-2-kong/src/kubernetes/index.ts
@@ -0,0 +1,10 @@
+export {
+  generateKongForKubernetesConfigFromSpec,
+  generateMetadataAnnotations,
+  generateRulesForServer,
+  generateServiceName,
+  generateServicePath,
+  generateServicePort,
+  generateTlsConfig,
+  getSpecName,
+} from './generate';
diff --git a/packages/openapi-2-kong/src/kubernetes/__tests__/util/plugin-helpers.js b/packages/openapi-2-kong/src/kubernetes/plugin-helpers.ts
similarity index 71%
rename from packages/openapi-2-kong/src/kubernetes/__tests__/util/plugin-helpers.js
rename to packages/openapi-2-kong/src/kubernetes/plugin-helpers.ts
index 2ef24f8dac..8858f2fae5 100644
--- a/packages/openapi-2-kong/src/kubernetes/__tests__/util/plugin-helpers.js
+++ b/packages/openapi-2-kong/src/kubernetes/plugin-helpers.ts
@@ -1,6 +1,7 @@
-// @flow
+import { KubernetesPluginConfig } from '../types/kubernetes-config';
+import { XKongPluginKeyAuth, XKongPluginUnknown } from '../types/openapi3';
 
-export const pluginKeyAuth = {
+export const pluginKeyAuth: XKongPluginKeyAuth = {
   'x-kong-plugin-key-auth': {
     name: 'key-auth',
     config: {
@@ -10,14 +11,17 @@ export const pluginKeyAuth = {
     },
   },
 };
-export const pluginDummy = {
+
+export const pluginDummy: XKongPluginUnknown<{ foo: 'bar' }> = {
   'x-kong-plugin-dummy-thing': {
     name: 'dummy-thing',
-    config: { foo: 'bar' },
+    config: {
+      foo: 'bar',
+    },
   },
 };
 
-export const pluginDocWithName = (name: string, pluginType: string) => ({
+export const pluginDocWithName = (name: string, pluginType: string): KubernetesPluginConfig => ({
   apiVersion: 'configuration.konghq.com/v1',
   kind: 'KongPlugin',
   metadata: {
@@ -25,6 +29,7 @@ export const pluginDocWithName = (name: string, pluginType: string) => ({
   },
   plugin: pluginType,
 });
+
 export const keyAuthPluginDoc = (suffix: string) => ({
   apiVersion: 'configuration.konghq.com/v1',
   config: {
@@ -38,15 +43,19 @@ export const keyAuthPluginDoc = (suffix: string) => ({
   },
   plugin: 'key-auth',
 });
-export const dummyPluginDoc = (suffix: string) => ({
+
+export const dummyPluginDoc = (suffix: string): KubernetesPluginConfig => ({
   apiVersion: 'configuration.konghq.com/v1',
-  config: { foo: 'bar' },
+  config: {
+    foo: 'bar',
+  },
   kind: 'KongPlugin',
   metadata: {
     name: dummyName(suffix),
   },
   plugin: 'dummy-thing',
 });
+
 export const methodDoc = (method: string) => ({
   apiVersion: 'configuration.konghq.com/v1',
   kind: 'KongIngress',
@@ -59,17 +68,28 @@ export const methodDoc = (method: string) => ({
 });
 
 export const keyAuthName = (suffix: string) => `add-key-auth-${suffix}`;
+
 export const dummyName = (suffix: string) => `add-dummy-thing-${suffix}`;
 
 export const ingressDoc = (
   index: number,
-  plugins: Array<string>,
+  plugins: string[],
   host: string,
   serviceName: string,
-  path: ?string,
+  path?: string | null,
 ) => {
-  const backend = { serviceName, servicePort: 80 };
-  const paths = path ? { path, backend } : { backend };
+  const backend = {
+    serviceName,
+    servicePort: 80,
+  };
+  const paths = path
+    ? {
+        path,
+        backend,
+      }
+    : {
+        backend,
+      };
   return {
     apiVersion: 'extensions/v1beta1',
     kind: 'Ingress',
@@ -95,11 +115,11 @@ export const ingressDoc = (
 
 export const ingressDocWithOverride = (
   index: number,
-  plugins: Array<string>,
+  plugins: string[],
   override: string,
   host: string,
   serviceName: string,
-  path: ?string,
+  path?: string | null,
 ) => ({
   apiVersion: 'extensions/v1beta1',
   kind: 'Ingress',
@@ -116,7 +136,15 @@ export const ingressDocWithOverride = (
       {
         host,
         http: {
-          paths: [{ backend: { serviceName, servicePort: 80 }, path }],
+          paths: [
+            {
+              backend: {
+                serviceName,
+                servicePort: 80,
+              },
+              path,
+            },
+          ],
         },
       },
     ],
diff --git a/packages/openapi-2-kong/src/kubernetes/__tests__/plugins.test.js b/packages/openapi-2-kong/src/kubernetes/plugins.test.ts
similarity index 88%
rename from packages/openapi-2-kong/src/kubernetes/__tests__/plugins.test.js
rename to packages/openapi-2-kong/src/kubernetes/plugins.test.ts
index 96cc62e8d5..e1bfa033be 100644
--- a/packages/openapi-2-kong/src/kubernetes/__tests__/plugins.test.js
+++ b/packages/openapi-2-kong/src/kubernetes/plugins.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import {
   flattenPluginDocuments,
   generateK8PluginConfig,
@@ -11,26 +9,40 @@ import {
   normalizeOperationPlugins,
   normalizePathPlugins,
   prioritizePlugins,
-} from '../plugins';
-import { HttpMethod } from '../../common';
+} from './plugins';
+import { HttpMethod } from '../common';
 import {
   dummyPluginDoc,
   keyAuthPluginDoc,
   pluginDocWithName,
   pluginDummy,
   pluginKeyAuth,
-} from './util/plugin-helpers';
+} from './plugin-helpers';
+import { PathPlugin, OperationPlugin } from '../types/k8plugins';
+import { OpenApi3Spec, OA3Server, OA3Paths, OA3PathItem, OA3Components } from '../types/openapi3';
 
 describe('plugins', () => {
   let _iterator = 0;
+
   const increment = () => _iterator++;
 
-  const blankOperation = { method: null, plugins: [] };
-  const blankPath = { path: '', plugins: [], operations: [blankOperation] };
+  const blankOperation = {
+    method: null,
+    plugins: [],
+  };
+
+  const blankPath = {
+    path: '',
+    plugins: [],
+    operations: [blankOperation],
+  };
 
   const spec: OpenApi3Spec = {
     openapi: '3.0',
-    info: { version: '1.0', title: 'My API' },
+    info: {
+      version: '1.0',
+      title: 'My API',
+    },
     servers: [
       {
         url: 'http://api.insomnia.rest',
@@ -39,8 +51,9 @@ describe('plugins', () => {
     paths: {},
   };
 
-  const components = {
+  const components: OA3Components = {
     securitySchemes: {
+      // @ts-expect-error -- TSCONVERSION
       really_basic: {
         type: 'http',
         scheme: 'basic',
@@ -57,6 +70,7 @@ describe('plugins', () => {
       },
       petstore_oauth2: {
         type: 'oauth2',
+        // @ts-expect-error -- TSCONVERSION
         flows: {
           clientCredentials: {
             tokenUrl: 'http://example.org/api/oauth/dialog',
@@ -67,6 +81,7 @@ describe('plugins', () => {
           },
         },
       },
+      // @ts-expect-error -- TSCONVERSION
       petstore_openid: {
         type: 'openIdConnect',
         openIdConnectUrl: 'http://example.org/oid-discovery',
@@ -81,19 +96,17 @@ describe('plugins', () => {
   describe('getPlugins()', () => {
     it('should return expected result if no plugins on spec', () => {
       const result = getPlugins(spec);
-
       const globalPlugins = result.global;
       expect(globalPlugins).toHaveLength(0);
-
       expect(result.servers).toEqual([
         {
           server: spec.servers?.[0],
           plugins: [],
         },
       ]);
-
       expect(result.paths).toEqual([blankPath]);
     });
+
     it('should return expected result if plugins on global, server, path, and operation', () => {
       const api: OpenApi3Spec = {
         ...spec,
@@ -113,21 +126,17 @@ describe('plugins', () => {
           },
         },
       };
-
       const result = getPlugins(api);
-
       const globalPlugins = result.global;
       expect(globalPlugins).toEqual([keyAuthPluginDoc('g0')]);
-
       const serverPlugins = result.servers[0].plugins;
       expect(serverPlugins).toEqual([keyAuthPluginDoc('s1')]);
-
       const pathPlugins = result.paths[0].plugins;
       expect(pathPlugins).toEqual([keyAuthPluginDoc('p2')]);
-
       const operationPlugins = result.paths[0].operations[0].plugins;
       expect(operationPlugins).toEqual([keyAuthPluginDoc('m3')]);
     });
+
     it('should throw error if no servers on api', () => {
       const action = () => getPlugins({ ...spec, servers: [] });
 
@@ -140,25 +149,19 @@ describe('plugins', () => {
       const result = getGlobalPlugins(spec, increment);
       expect(result).toHaveLength(0);
     });
-    it('returns single plugin doc', () => {
-      const api: OpenApi3Spec = {
-        ...spec,
-        ...pluginKeyAuth,
-      };
 
+    it('returns single plugin doc', () => {
+      const api: OpenApi3Spec = { ...spec, ...pluginKeyAuth };
       const result = getGlobalPlugins(api, increment);
       expect(result).toEqual([keyAuthPluginDoc('g0')]);
     });
-    it('returns multiple plugin docs', () => {
-      const api: OpenApi3Spec = {
-        ...spec,
-        ...pluginKeyAuth,
-        ...pluginDummy,
-      };
 
+    it('returns multiple plugin docs', () => {
+      const api: OpenApi3Spec = { ...spec, ...pluginKeyAuth, ...pluginDummy };
       const result = getGlobalPlugins(api, increment);
       expect(result).toEqual([keyAuthPluginDoc('g0'), dummyPluginDoc('g1')]);
     });
+
     it('returns security plugin doc', () => {
       const pluginSecurity = {
         security: [
@@ -202,31 +205,33 @@ describe('plugins', () => {
           },
         },
       };
-
-      // TODO: Cannot be typed as OpenApi3Spec because the security schemes types don't align to the data in components
-      const api: Object = {
+      const api: OpenApi3Spec = {
         ...spec,
         ...pluginDummy,
         ...pluginSecurity,
         components,
       };
-
       const result = getGlobalPlugins(api, increment);
-
       expect(result).toEqual([
         dummyPluginDoc('g0'),
         {
           apiVersion: 'configuration.konghq.com/v1',
           kind: 'KongPlugin',
           plugin: 'basic-auth',
-          metadata: { name: 'add-basic-auth-g1' },
+          metadata: {
+            name: 'add-basic-auth-g1',
+          },
         },
         {
           apiVersion: 'configuration.konghq.com/v1',
           kind: 'KongPlugin',
           plugin: 'key-auth',
-          metadata: { name: 'add-key-auth-g2' },
-          config: { key_names: ['api_key_by_you'] },
+          metadata: {
+            name: 'add-key-auth-g2',
+          },
+          config: {
+            key_names: ['api_key_by_you'],
+          },
         },
       ]);
     });
@@ -243,24 +248,13 @@ describe('plugins', () => {
     it('returns no plugins for servers', () => {
       const servers = [server0, server1];
       const result = getServerPlugins(servers, increment);
-
       expect(result).toHaveLength(2);
       result.forEach(s => expect(s.plugins).toHaveLength(0));
     });
+
     it('returns plugins from each server', () => {
-      const servers = [
-        {
-          ...server0,
-        },
-        {
-          ...server1,
-          ...pluginKeyAuth,
-          ...pluginDummy,
-        },
-      ];
-
+      const servers = [{ ...server0 }, { ...server1, ...pluginKeyAuth, ...pluginDummy }];
       const result = getServerPlugins(servers, increment);
-
       expect(result).toHaveLength(2);
       expect(result[0].plugins).toEqual([]);
       expect(result[1].plugins).toEqual([keyAuthPluginDoc('s0'), dummyPluginDoc('s1')]);
@@ -271,9 +265,9 @@ describe('plugins', () => {
     it('should return normalized result if no paths', () => {
       const paths: OA3Paths = {};
       const result = getPathPlugins(paths, increment, spec);
-
       expect(result).toEqual([blankPath]);
     });
+
     it('should return normalized result if no path and operation plugins', () => {
       const paths: OA3Paths = {
         '/path': {
@@ -283,44 +277,35 @@ describe('plugins', () => {
           },
         },
       };
-
       const result = getPathPlugins(paths, increment, spec);
-
       expect(result).toEqual([blankPath]);
     });
+
     it('should handle plugins existing on path', () => {
       const paths: OA3Paths = {
         '/path-no-plugin': {},
-        '/path': {
-          ...pluginDummy,
-        },
+        '/path': { ...pluginDummy },
       };
-
       const result = getPathPlugins(paths, increment, spec);
-
       expect(result).toHaveLength(2);
       const first = result[0];
       expect(first.path).toBe('/path-no-plugin');
       expect(first.plugins).toHaveLength(0);
       expect(first.operations).toEqual([blankOperation]);
-
       const second = result[1];
       expect(second.path).toBe('/path');
       expect(second.plugins).toEqual([dummyPluginDoc('p0')]);
       expect(second.operations).toEqual([blankOperation]);
     });
+
     it('should handle plugins existing on operation and not on path', () => {
       const paths: OA3Paths = {
         '/path': {
-          get: {
-            ...pluginDummy,
-          },
+          get: { ...pluginDummy },
           put: {},
         },
       };
-
       const result = getPathPlugins(paths, increment, spec);
-
       expect(result).toHaveLength(1);
       expect(result[0].plugins).toHaveLength(0);
       expect(result[0].operations).toEqual([
@@ -334,24 +319,14 @@ describe('plugins', () => {
         },
       ]);
     });
+
     it('should handle plugins existing on path and operation', () => {
       const paths: OA3Paths = {
-        '/path-0': {
-          ...pluginKeyAuth,
-          get: {
-            ...pluginDummy,
-          },
-        },
-        '/path-1': {
-          ...pluginDummy,
-          put: {},
-        },
+        '/path-0': { ...pluginKeyAuth, get: { ...pluginDummy } },
+        '/path-1': { ...pluginDummy, put: {} },
       };
-
       const result = getPathPlugins(paths, increment, spec);
-
       expect(result).toHaveLength(2);
-
       const path0 = result[0];
       expect(path0.path).toBe('/path-0');
       expect(path0.plugins).toEqual([keyAuthPluginDoc('p0')]);
@@ -361,7 +336,6 @@ describe('plugins', () => {
           plugins: [dummyPluginDoc('m1')],
         },
       ]);
-
       const path1 = result[1];
       expect(path1.path).toBe('/path-1');
       expect(path1.plugins).toEqual([dummyPluginDoc('p2')]);
@@ -371,66 +345,51 @@ describe('plugins', () => {
 
   describe('getOperationPlugins()', () => {
     it('should return normalized result if no plugins', () => {
-      const pathItem = { description: 'test' };
+      const pathItem = {
+        description: 'test',
+      };
       const result = getOperationPlugins(pathItem, increment, spec);
-
       expect(result).toEqual([blankOperation]);
     });
+
     it('should return plugins for all operations on path', () => {
-      const pathItem = {
+      const pathItem: OA3PathItem = {
+        // @ts-expect-error -- TSCONVERSION appears to be a genuine error.  this actually passes 'GET' but I think 'get' is expected.
         [HttpMethod.get]: {},
-        [HttpMethod.put]: {
-          ...pluginKeyAuth,
-          ...pluginDummy,
-        },
-        [HttpMethod.post]: {
-          ...pluginDummy,
-        },
+        [HttpMethod.put]: { ...pluginKeyAuth, ...pluginDummy },
+        [HttpMethod.post]: { ...pluginDummy },
       };
-
       const result = getOperationPlugins(pathItem, increment, spec);
-
       expect(result).toHaveLength(3);
-
       const get = result[0];
       expect(get.method).toBe(HttpMethod.get);
       expect(get.plugins).toHaveLength(0);
-
       const put = result[1];
       expect(put.method).toBe(HttpMethod.put);
       expect(put.plugins).toEqual([keyAuthPluginDoc('m0'), dummyPluginDoc('m1')]);
-
       const post = result[2];
       expect(post.method).toBe(HttpMethod.post);
       expect(post.plugins).toEqual([dummyPluginDoc('m2')]);
     });
+
     it.each(Object.values(HttpMethod))(
       'should extract method plugins for %o from path item',
       methodName => {
         const pathItem = {
-          [methodName]: {
-            ...pluginKeyAuth,
-            ...pluginDummy,
-          },
+          [methodName]: { ...pluginKeyAuth, ...pluginDummy },
         };
-
         const result = getOperationPlugins(pathItem, increment, spec);
-
         expect(result).toHaveLength(1);
-
         const first = result[0];
         expect(first.method).toBe(methodName);
         expect(first.plugins).toEqual([keyAuthPluginDoc('m0'), dummyPluginDoc('m1')]);
       },
     );
-    it('should return security plugin from operation', () => {
-      // TODO: Cannot be typed as OpenApi3Spec because the security schemes types don't align to the data in components
-      const api: Object = {
-        ...spec,
-        components,
-      };
 
+    it('should return security plugin from operation', () => {
+      const api: OpenApi3Spec = { ...spec, components };
       const pathItem: OA3PathItem = {
+        // @ts-expect-error -- TSCONVERSION appears to be a genuine error.  this actually passes 'GET' but I think 'get' is expected.
         [HttpMethod.get]: {
           security: [
             {
@@ -440,22 +399,26 @@ describe('plugins', () => {
           ],
         },
       };
-
       const result = getOperationPlugins(pathItem, increment, api);
-
       expect(result[0].plugins).toEqual([
         {
           apiVersion: 'configuration.konghq.com/v1',
           kind: 'KongPlugin',
           plugin: 'basic-auth',
-          metadata: { name: 'add-basic-auth-m0' },
+          metadata: {
+            name: 'add-basic-auth-m0',
+          },
         },
         {
           apiVersion: 'configuration.konghq.com/v1',
           kind: 'KongPlugin',
           plugin: 'key-auth',
-          metadata: { name: 'add-key-auth-m1' },
-          config: { key_names: ['api_key_by_you'] },
+          metadata: {
+            name: 'add-key-auth-m1',
+          },
+          config: {
+            key_names: ['api_key_by_you'],
+          },
         },
       ]);
     });
@@ -465,14 +428,14 @@ describe('plugins', () => {
     it('should return empty array if no plugin keys found and not increment', () => {
       const incrementMock = jest.fn().mockReturnValue(0);
       const result = generateK8PluginConfig(spec, 's', incrementMock);
-
       expect(result).toHaveLength(0);
       expect(incrementMock).not.toHaveBeenCalled();
     });
+
     it('should attach config onto plugin if it exists and increment', () => {
       const incrementMock = jest.fn().mockReturnValue(0);
+      // @ts-expect-error -- TSCONVERSION not sure, but this is intentionally different maybe?
       const result = generateK8PluginConfig({ ...spec, ...pluginKeyAuth }, 'greg', incrementMock);
-
       expect(result).toEqual([keyAuthPluginDoc('greg0')]);
       expect(incrementMock).toHaveBeenCalledTimes(1);
     });
@@ -480,7 +443,7 @@ describe('plugins', () => {
 
   describe('normalizePathPlugins()', () => {
     it('should return source array if a path with plugins exists', () => {
-      const source: PathPlugins = [
+      const source: PathPlugin[] = [
         {
           path: '/path-with-plugin',
           plugins: [dummyPluginDoc('p0')],
@@ -492,11 +455,11 @@ describe('plugins', () => {
           operations: [blankOperation],
         },
       ];
-
       expect(normalizePathPlugins(source)).toEqual(source);
     });
+
     it('should return source array if an operation with plugins exist', () => {
-      const source: PathPlugins = [
+      const source: PathPlugin[] = [
         {
           path: '/path',
           plugins: [],
@@ -512,11 +475,11 @@ describe('plugins', () => {
           ],
         },
       ];
-
       expect(normalizePathPlugins(source)).toEqual(source);
     });
+
     it('should return blank path if no plugins exist on path or operations', () => {
-      const source: PathPlugins = [
+      const source: PathPlugin[] = [
         {
           path: '/path-0',
           plugins: [],
@@ -528,14 +491,13 @@ describe('plugins', () => {
           operations: [blankOperation],
         },
       ];
-
       expect(normalizePathPlugins(source)).toEqual([blankPath]);
     });
   });
 
   describe('normalizeOperationPlugins()', () => {
     it('should return source array if operation plugins exist', () => {
-      const source: OperationPlugins = [
+      const source: OperationPlugin[] = [
         {
           method: HttpMethod.get,
           plugins: [],
@@ -545,11 +507,11 @@ describe('plugins', () => {
           plugins: [dummyPluginDoc('p0')],
         },
       ];
-
       expect(normalizeOperationPlugins(source)).toEqual(source);
     });
+
     it('should return blank operation if no plugins exist on operations', () => {
-      const source: OperationPlugins = [
+      const source: OperationPlugin[] = [
         {
           method: HttpMethod.get,
           plugins: [],
@@ -559,7 +521,6 @@ describe('plugins', () => {
           plugins: [],
         },
       ];
-
       expect(normalizeOperationPlugins(source)).toEqual([blankOperation]);
     });
   });
@@ -576,18 +537,11 @@ describe('plugins', () => {
           },
         ],
         paths: {
-          '/path': {
-            ...pluginKeyAuth,
-            get: {
-              ...pluginKeyAuth,
-            },
-          },
+          '/path': { ...pluginKeyAuth, get: { ...pluginKeyAuth } },
         },
       };
-
       const plugins = getPlugins(api);
       const flattened = flattenPluginDocuments(plugins);
-
       expect(flattened).toEqual([
         keyAuthPluginDoc('g0'),
         keyAuthPluginDoc('s1'),
@@ -603,7 +557,6 @@ describe('plugins', () => {
       const server = [];
       const path = [];
       const operation = [];
-
       const result = prioritizePlugins(global, server, path, operation);
       expect(result).toHaveLength(0);
     });
@@ -613,12 +566,10 @@ describe('plugins', () => {
       const p2 = pluginDocWithName('p2', 'custom-plugin-2');
       const p3 = pluginDocWithName('p3', 'custom-plugin-3');
       const p4 = pluginDocWithName('p4', 'custom-plugin-4');
-
       const global = [p1];
       const server = [p2];
       const path = [p3];
       const operation = [p4];
-
       const result = prioritizePlugins(global, server, path, operation);
       expect(result).toEqual([...operation, ...path, ...server, ...global]);
     });
@@ -629,12 +580,10 @@ describe('plugins', () => {
       const p2 = pluginDocWithName('p2', pluginType);
       const p3 = pluginDocWithName('p3', pluginType);
       const p4 = pluginDocWithName('p4', pluginType);
-
       const global = [p1];
       const server = [p2];
       const path = [p3];
       const operation = [p4];
-
       const result = prioritizePlugins(global, server, path, operation);
       expect(result).toEqual([...operation]);
     });
@@ -644,12 +593,10 @@ describe('plugins', () => {
       const p1 = pluginDocWithName('p1', pluginType);
       const p2 = pluginDocWithName('p2', pluginType);
       const p3 = pluginDocWithName('p3', pluginType);
-
       const global = [p1];
       const server = [p2];
       const path = [p3];
       const operation = [];
-
       const result = prioritizePlugins(global, server, path, operation);
       expect(result).toEqual([...path]);
     });
@@ -658,12 +605,10 @@ describe('plugins', () => {
       const pluginType = 'custom-plugin';
       const p1 = pluginDocWithName('p1', pluginType);
       const p2 = pluginDocWithName('p2', pluginType);
-
       const global = [p1];
       const server = [p2];
       const path = [];
       const operation = [];
-
       const result = prioritizePlugins(global, server, path, operation);
       expect(result).toEqual([...server]);
     });
@@ -673,30 +618,24 @@ describe('plugins', () => {
       const typeS = 'custom-plugin-2';
       const typeP = 'custom-plugin-3';
       const typeO = 'custom-plugin-4';
-
       // Note: the variable naming below is [applied-to][resolved-from]
       // IE: po implies it is applied to a path, but that plugin type should be resolved by the operation
       // Therefore, the result should only contain gg, ss, pp and oo. The others are duplicates
       // of the same plugin type and should be filtered out due to prioritization.
       const gg = pluginDocWithName('gg', typeG);
-
       const gs = pluginDocWithName('gs', typeS);
       const ss = pluginDocWithName('ss', typeS);
-
       const gp = pluginDocWithName('gp', typeP);
       const sp = pluginDocWithName('sp', typeP);
       const pp = pluginDocWithName('pp', typeP);
-
       const go = pluginDocWithName('go', typeO);
       const so = pluginDocWithName('so', typeO);
       const po = pluginDocWithName('po', typeO);
       const oo = pluginDocWithName('oo', typeO);
-
       const global = [gg, gs, gp, go];
       const server = [ss, sp, so];
       const path = [pp, po];
       const operation = [oo];
-
       const result = prioritizePlugins(global, server, path, operation);
       expect(result).toEqual([oo, pp, ss, gg]);
     });
diff --git a/packages/openapi-2-kong/src/kubernetes/plugins.js b/packages/openapi-2-kong/src/kubernetes/plugins.ts
similarity index 72%
rename from packages/openapi-2-kong/src/kubernetes/plugins.js
rename to packages/openapi-2-kong/src/kubernetes/plugins.ts
index 2a18d0b358..be9241a6ec 100644
--- a/packages/openapi-2-kong/src/kubernetes/plugins.js
+++ b/packages/openapi-2-kong/src/kubernetes/plugins.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import {
   distinctByProperty,
   getPaths,
@@ -9,29 +7,31 @@ import {
   isPluginKey,
 } from '../common';
 import { generateSecurityPlugins } from '../declarative-config/security-plugins';
+import { DCPlugin } from '../types/declarative-config';
+import { Plugins, IndexIncrement, ServerPlugin, PathPlugin, OperationPlugin } from '../types/k8plugins';
+import { KubernetesPluginConfig } from '../types/kubernetes-config';
+import { OpenApi3Spec, OA3Server, OA3Paths, OA3PathItem } from '../types/openapi3';
+import { ValueOf } from 'type-fest';
 
-export function flattenPluginDocuments(plugins: Plugins): Array<KubernetesPluginConfig> {
-  const all: Array<KubernetesPluginConfig> = [];
-
+export function flattenPluginDocuments(plugins: Plugins): KubernetesPluginConfig[] {
+  const all: KubernetesPluginConfig[] = [];
   const { global, servers, paths } = plugins;
-
   all.push(...global);
   servers.forEach(s => {
     all.push(...s.plugins);
   });
   paths.forEach(s => {
     all.push(...s.plugins);
-
     s.operations.forEach(o => {
       all.push(...o.plugins);
     });
   });
-
   return all;
 }
 
 export function getPlugins(api: OpenApi3Spec): Plugins {
   let _iterator = 0;
+
   const increment = (): number => _iterator++;
 
   const servers = getServers(api);
@@ -42,7 +42,6 @@ export function getPlugins(api: OpenApi3Spec): Plugins {
   }
 
   const paths = getPaths(api);
-
   return {
     global: getGlobalPlugins(api, increment),
     servers: getServerPlugins(servers, increment),
@@ -54,10 +53,10 @@ export function getPlugins(api: OpenApi3Spec): Plugins {
 // not much we can do about it. If we end up needing this again, it should be factored
 // out to a higher-level.
 export function mapDcPluginsToK8Plugins(
-  dcPlugins: Array<DCPlugin>,
+  dcPlugins: DCPlugin[],
   suffix: string,
   increment: IndexIncrement,
-): Array<KubernetesPluginConfig> {
+) {
   return dcPlugins.map(dcPlugin => {
     const k8sPlugin: KubernetesPluginConfig = {
       apiVersion: 'configuration.konghq.com/v1',
@@ -76,10 +75,7 @@ export function mapDcPluginsToK8Plugins(
   });
 }
 
-export function getGlobalPlugins(
-  api: OpenApi3Spec,
-  increment: IndexIncrement,
-): Array<KubernetesPluginConfig> {
+export function getGlobalPlugins(api: OpenApi3Spec, increment: IndexIncrement) {
   const pluginNameSuffix = PluginNameSuffix.global;
   const globalK8Plugins = generateK8PluginConfig(api, pluginNameSuffix, increment);
   const securityPlugins = mapDcPluginsToK8Plugins(
@@ -87,35 +83,28 @@ export function getGlobalPlugins(
     pluginNameSuffix,
     increment,
   );
-
   return [...globalK8Plugins, ...securityPlugins];
 }
 
 export function getServerPlugins(
-  servers: Array<OA3Server>,
+  servers: OA3Server[],
   increment: IndexIncrement,
-): ServerPlugins {
-  return servers.map(server => ({
+) {
+  return servers.map<ServerPlugin>(server => ({
     server,
     plugins: generateK8PluginConfig(server, PluginNameSuffix.server, increment),
   }));
 }
 
-export function getPathPlugins(
-  paths: OA3Paths,
-  increment: IndexIncrement,
-  api: OpenApi3Spec,
-): PathPlugins {
-  const pathPlugins = Object.keys(paths).map(path => {
+export function getPathPlugins(paths: OA3Paths, increment: IndexIncrement, api: OpenApi3Spec) {
+  const pathPlugins: PathPlugin[] = Object.keys(paths).map(path => {
     const pathItem = paths[path];
-
     return {
       path,
       plugins: generateK8PluginConfig(pathItem, PluginNameSuffix.path, increment),
       operations: normalizeOperationPlugins(getOperationPlugins(pathItem, increment, api)),
     };
   });
-
   return normalizePathPlugins(pathPlugins);
 }
 
@@ -123,13 +112,12 @@ export function getOperationPlugins(
   pathItem: OA3PathItem,
   increment: IndexIncrement,
   api: OpenApi3Spec,
-): OperationPlugins {
-  const operationPlugins = Object.keys(pathItem)
+) {
+  const operationPlugins: OperationPlugin[] = Object.keys(pathItem)
     .filter(isHttpMethodKey)
     .map(key => {
       // We know this will always, only be OA3Operation (because of the filter above), but Flow doesn't know that...
-      const operation: Object = pathItem[key];
-
+      const operation: Record<string, any> = pathItem[key];
       const pluginNameSuffix = PluginNameSuffix.operation;
       const opPlugins = generateK8PluginConfig(operation, pluginNameSuffix, increment);
       const securityPlugins = mapDcPluginsToK8Plugins(
@@ -137,7 +125,6 @@ export function getOperationPlugins(
         pluginNameSuffix,
         increment,
       );
-
       return {
         method: key,
         plugins: [...opPlugins, ...securityPlugins],
@@ -153,21 +140,20 @@ const PluginNameSuffix = {
   server: 's',
   path: 'p',
   operation: 'm',
-};
+} as const;
 
-type PluginNameSuffixKeys = $Values<typeof PluginNameSuffix>;
+type PluginNameSuffixKeys = ValueOf<typeof PluginNameSuffix>;
 
 export function generateK8PluginConfig(
-  obj: Object,
+  obj: Record<string, any>,
   pluginNameSuffix: PluginNameSuffixKeys,
   increment: IndexIncrement,
-): Array<KubernetesPluginConfig> {
-  const plugins: Array<KubernetesPluginConfig> = [];
+) {
+  const plugins: KubernetesPluginConfig[] = [];
 
   for (const key of Object.keys(obj).filter(isPluginKey)) {
     const pData = obj[key];
     const name = pData.name || getPluginNameFromKey(key);
-
     const p: KubernetesPluginConfig = {
       apiVersion: 'configuration.konghq.com/v1',
       kind: 'KongPlugin',
@@ -187,30 +173,37 @@ export function generateK8PluginConfig(
   return plugins;
 }
 
-const blankOperation = { method: null, plugins: [] };
-const blankPath = { path: '', plugins: [], operations: [blankOperation] };
+const blankOperation: OperationPlugin = {
+  method: null,
+  plugins: [],
+};
 
-export function normalizePathPlugins(pathPlugins: PathPlugins): PathPlugins {
-  const pluginsExist = pathPlugins.some(
-    p => p.plugins.length || p.operations.some(o => o.plugins.length),
-  );
+const blankPath: PathPlugin = {
+  path: '',
+  plugins: [],
+  operations: [blankOperation],
+};
+
+export function normalizePathPlugins(pathPlugins: PathPlugin[]) {
+  const pluginsExist = pathPlugins.some(p => (
+    p.plugins.length || p.operations.some(o => o.plugins.length)
+  ));
   return pluginsExist ? pathPlugins : [blankPath];
 }
 
-export function normalizeOperationPlugins(operationPlugins: OperationPlugins): OperationPlugins {
+export function normalizeOperationPlugins(operationPlugins: OperationPlugin[]) {
   const pluginsExist = operationPlugins.some(o => o.plugins.length);
   return pluginsExist ? operationPlugins : [blankOperation];
 }
 
 export function prioritizePlugins(
-  global: Array<KubernetesPluginConfig>,
-  server: Array<KubernetesPluginConfig>,
-  path: Array<KubernetesPluginConfig>,
-  operation: Array<KubernetesPluginConfig>,
-): Array<KubernetesPluginConfig> {
+  global: KubernetesPluginConfig[],
+  server: KubernetesPluginConfig[],
+  path: KubernetesPluginConfig[],
+  operation: KubernetesPluginConfig[],
+) {
   // Order in priority: operation > path > server > global
-  const plugins: Array<KubernetesPluginConfig> = [...operation, ...path, ...server, ...global];
-
+  const plugins: KubernetesPluginConfig[] = [...operation, ...path, ...server, ...global];
   // Select first of each type of plugin
   return distinctByProperty(plugins, p => p.plugin);
 }
diff --git a/packages/openapi-2-kong/src/kubernetes/__tests__/variables.test.js b/packages/openapi-2-kong/src/kubernetes/variables.test.ts
similarity index 95%
rename from packages/openapi-2-kong/src/kubernetes/__tests__/variables.test.js
rename to packages/openapi-2-kong/src/kubernetes/variables.test.ts
index 9c07450866..aa80b003de 100644
--- a/packages/openapi-2-kong/src/kubernetes/__tests__/variables.test.js
+++ b/packages/openapi-2-kong/src/kubernetes/variables.test.ts
@@ -1,6 +1,5 @@
-// @flow
-
-import { resolveUrlVariables, resolveVariables, pathVariablesToWildcard } from '../variables';
+import { OA3Variables } from '../types/openapi3';
+import { resolveUrlVariables, resolveVariables, pathVariablesToWildcard } from './variables';
 
 describe('variables', () => {
   describe('resolveVariables()', () => {
@@ -11,13 +10,11 @@ describe('variables', () => {
     it('should return source str if no match', () => {
       const noVarSrc = 'test';
       const result = resolveVariables(noVarSrc, regExp, fallback);
-
       expect(result).toBe(noVarSrc);
     });
 
     it('should return fallback in place of variable if no default found', () => {
       const result = resolveVariables(str, regExp, fallback);
-
       expect(result).toBe('hello-fallback-world');
     });
 
@@ -27,24 +24,23 @@ describe('variables', () => {
           default: 'bar',
         },
       };
-
       const result = resolveVariables(str, regExp, fallback, variables);
-
       expect(result).toBe('hello-bar-world');
     });
 
     it('should return defaults in place of multiple variables', () => {
       const variables: OA3Variables = {
-        var1: { default: 'darkness' },
-        var2: { default: 'old' },
+        var1: {
+          default: 'darkness',
+        },
+        var2: {
+          default: 'old',
+        },
       };
-
       const result = resolveVariables('hello-{var1}-my-{var2}-friend', regExp, fallback, variables);
-
       expect(result).toBe('hello-darkness-my-old-friend');
     });
   });
-
   describe('resolveUrlVariables()', () => {
     it('should return original url if no variables', () => {
       const url = 'http://api.insomnia.rest';
@@ -88,7 +84,6 @@ describe('variables', () => {
           default: 'old',
         },
       };
-
       expect(resolveUrlVariables(url, variables)).toBe(
         'http://api.insomnia.rest/hello/.*/my/old/friend/',
       );
@@ -101,11 +96,9 @@ describe('variables', () => {
           default: 'old',
         },
       };
-
       expect(resolveUrlVariables(partial, variables)).toBe('/hello/.*/my/old/friend');
     });
   });
-
   describe('pathVariablesToWildcard()', () => {
     it('converts variables to .* wildcard', function() {
       expect(pathVariablesToWildcard('/foo/{bar}/{baz}')).toBe('/foo/.*/.*');
diff --git a/packages/openapi-2-kong/src/kubernetes/variables.js b/packages/openapi-2-kong/src/kubernetes/variables.ts
similarity index 95%
rename from packages/openapi-2-kong/src/kubernetes/variables.js
rename to packages/openapi-2-kong/src/kubernetes/variables.ts
index 0daf90df0c..f8fe1d904f 100644
--- a/packages/openapi-2-kong/src/kubernetes/variables.js
+++ b/packages/openapi-2-kong/src/kubernetes/variables.ts
@@ -1,15 +1,14 @@
-// @flow
+import { OA3Variables } from '../types/openapi3';
 
 const protocolSearchValue = /{([^}]+)}(?=:\/\/)/g; // positive lookahead for ://
+
 const pathSearchValue = /{([^}]+)}(?!:\/\/)/g; // negative lookahead for ://
 
 export function resolveUrlVariables(url: string, variables?: OA3Variables): string {
   const protocolResolved = resolveVariables(url, protocolSearchValue, 'http', variables);
   const pathResolved = resolveVariables(protocolResolved, pathSearchValue, '.*', variables);
-
   return pathResolved;
 }
-
 export function resolveVariables(
   str: string,
   regExp: RegExp,
@@ -24,14 +23,12 @@ export function resolveVariables(
     // https://stackoverflow.com/a/27753327
     const [replace, name] = regExp.exec(str) || [];
     const value = variables?.[name]?.default || fallback;
-
     shouldContinue = !!name;
     resolved = replace ? resolved.replace(replace, value) : resolved;
   } while (shouldContinue);
 
   return resolved;
 }
-
 export function pathVariablesToWildcard(p: string): string {
   return p.replace(pathSearchValue, '.*');
 }
diff --git a/packages/openapi-2-kong/src/types/declarative-config.ts b/packages/openapi-2-kong/src/types/declarative-config.ts
new file mode 100644
index 0000000000..1da8d0af41
--- /dev/null
+++ b/packages/openapi-2-kong/src/types/declarative-config.ts
@@ -0,0 +1,56 @@
+export interface DCPluginConfig {
+  allowed_content_types?: string;
+  auth_methods?: string[];
+  body_schema?: string;
+  issuer?: string;
+  key_names?: string[];
+  parameter_schema?: string;
+  scopes_required?: string[];
+  verbose_response?: boolean;
+  version?: 'draft4',
+}
+
+export interface DCPlugin {
+  name: string;
+  enabled?: boolean;
+  tags?: string[];
+  config?: DCPluginConfig;
+}
+
+export interface DCRoute {
+  methods: string[];
+  // eslint-disable-next-line camelcase -- this is defined by a spec that is out of our control
+  strip_path: boolean;
+  tags: string[];
+  name: string;
+  paths: string[];
+  plugins?: DCPlugin[];
+}
+
+export interface DCService {
+  name: string;
+  protocol: string;
+  host: string;
+  port: number;
+  path: string;
+  routes: DCRoute[];
+  tags: string[];
+  plugins?: DCPlugin[];
+}
+
+export interface DCTarget {
+  target: string;
+  tags?: string[];
+}
+
+export interface DCUpstream {
+  name: string;
+  tags: string[];
+  targets: DCTarget[];
+}
+
+export interface DeclarativeConfig {
+  _format_version: '1.1';
+  services: DCService[];
+  upstreams: DCUpstream[];
+}
diff --git a/packages/openapi-2-kong/src/types/k8plugins.ts b/packages/openapi-2-kong/src/types/k8plugins.ts
new file mode 100644
index 0000000000..45f78055c8
--- /dev/null
+++ b/packages/openapi-2-kong/src/types/k8plugins.ts
@@ -0,0 +1,27 @@
+import { HttpMethodType } from '../common';
+import { KubernetesPluginConfig } from './kubernetes-config';
+import { OA3Server } from './openapi3';
+
+export interface OperationPlugin {
+  method?: HttpMethodType | null;
+  plugins: KubernetesPluginConfig[];
+}
+
+export interface PathPlugin {
+  path: string;
+  plugins: KubernetesPluginConfig[];
+  operations: OperationPlugin[];
+}
+
+export interface ServerPlugin {
+  server: OA3Server;
+  plugins: KubernetesPluginConfig[];
+}
+
+export interface Plugins {
+  global: KubernetesPluginConfig[];
+  servers: ServerPlugin[];
+  paths: PathPlugin[];
+}
+
+export type IndexIncrement = () => number;
diff --git a/packages/openapi-2-kong/src/types/kubernetes-config.ts b/packages/openapi-2-kong/src/types/kubernetes-config.ts
new file mode 100644
index 0000000000..5a2284c4df
--- /dev/null
+++ b/packages/openapi-2-kong/src/types/kubernetes-config.ts
@@ -0,0 +1,67 @@
+import { HttpMethodType } from '../common';
+
+export interface K8sAnnotations {
+  'kubernetes.io/ingress.class': 'kong';
+  [key: string]: string;
+}
+
+export interface K8sMetadata {
+  name: string;
+  annotations: K8sAnnotations;
+}
+
+export interface K8sBackend {
+  serviceName: string;
+  servicePort: number;
+}
+
+export interface K8sPath {
+  path?: string;
+  backend: K8sBackend;
+}
+
+export interface K8sIngressRule {
+  host: string;
+  tls?: {
+    paths: K8sPath[];
+    tls?: {
+      secretName: string;
+    };
+  };
+  http?: {
+    paths: K8sPath[];
+  };
+}
+
+export interface K8sSpec {
+  rules: K8sIngressRule[];
+}
+
+export interface KubernetesMethodConfig {
+  apiVersion: 'configuration.konghq.com/v1';
+  kind: 'KongIngress';
+  metadata: {
+    name: string;
+  };
+  route: {
+    methods: HttpMethodType[];
+  };
+}
+
+export interface KubernetesPluginConfig {
+  apiVersion: 'configuration.konghq.com/v1';
+  kind: 'KongPlugin';
+  metadata: {
+    name: string;
+    global?: boolean;
+  };
+  config?: Record<string, any>;
+  plugin: string;
+}
+
+export interface KubernetesConfig {
+  apiVersion: 'extensions/v1beta1';
+  kind: 'Ingress';
+  metadata: K8sMetadata;
+  spec: K8sSpec;
+}
diff --git a/packages/openapi-2-kong/src/types/openapi3.ts b/packages/openapi-2-kong/src/types/openapi3.ts
new file mode 100644
index 0000000000..8c716bbd1c
--- /dev/null
+++ b/packages/openapi-2-kong/src/types/openapi3.ts
@@ -0,0 +1,248 @@
+import { DCRoute } from './declarative-config';
+import { K8sIngressRule } from './kubernetes-config';
+
+export interface XKongName {
+  'x-kong-name'?: string;
+}
+
+export interface XKongRouteDefaults {
+  'x-kong-route-defaults'?: DCRoute;
+}
+
+export interface XKongPluginRequestValidator {
+  'x-kong-plugin-request-validator'?: {
+    enabled: boolean;
+    config: {
+      verbose_response: boolean,
+    }
+  }
+}
+
+export type XKongPluginUnknown<Config = any> = Record<`x-kong-plugin-${string}`, {
+  enabled?: boolean;
+  name?: string;
+  config: Record<string, Config>;
+}>
+
+export interface XKongPluginKeyAuth {
+  'x-kong-plugin-key-auth'?: {
+    name: 'key-auth';
+    config: {
+      key_names: string[];
+      key_in_body?: boolean;
+      hide_credentials?: boolean;
+    };
+  };
+}
+
+export interface StripPath {
+  // eslint-disable-next-line camelcase -- this is defined by a spec that is out of our control
+  strip_path?: boolean;
+}
+
+export interface OA3Info {
+  title?: string;
+  version?: string;
+  description?: string;
+  termsOfService?: string;
+  contact?: {
+    name?: string;
+    url?: string;
+    email?: string;
+  };
+  license?: {
+    name: string;
+    url?: string;
+  };
+  'x-kubernetes-ingress-metadata'?: {
+    name?: string;
+    annotations?: Record<string, any>;
+  };
+}
+
+export interface OA3ExternalDocs {
+  url: string;
+  description?: string;
+}
+
+export interface OA3Parameter {
+  name: string;
+  in: 'query' | 'header' | 'path' | 'cookie';
+  description?: string;
+  required?: boolean;
+  deprecated?: boolean;
+  allowEmptyValue?: boolean;
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  schema?: Record<string, any>;
+  content?: Record<string, any>;
+  explode?: boolean;
+}
+
+export interface OA3RequestBody {
+  content?: Record<string, any>; // TODO
+}
+
+export interface OA3SecurityRequirement {}
+
+export interface OA3Reference {
+  $ref: string;
+}
+
+export interface OA3ServerKubernetesTLS {
+  'x-kubernetes-tls'?: K8sIngressRule
+}
+
+export interface OA3ServerKubernetesBackend {
+  'x-kubernetes-backend'?: {
+    serviceName: string;
+    servicePort: number;
+  }
+}
+
+export interface OA3ServerKubernetesService {
+  'x-kubernetes-service'?: {
+    spec?: {
+      ports?: {
+        port: number;
+      }[];
+    };
+    metadata?: {
+      name: string;
+   };
+  };
+}
+
+export type OA3Variables = Record<string, {
+  default: string;
+  enum?: string[];
+  description?: string;
+}>;
+
+export type OA3Server = {
+  url: string;
+  description?: string;
+  variables?: OA3Variables;
+} & OA3ServerKubernetesTLS
+  & OA3ServerKubernetesBackend
+  & OA3ServerKubernetesService;
+
+export type OA3Operation = {
+  description?: string;
+  summary?: string;
+  tags?: string[];
+  externalDocs?: OA3ExternalDocs;
+  operationId?: string;
+  parameters?: (OA3Parameter | OA3Reference)[];
+  requestBody?: OA3RequestBody | OA3Reference;
+  deprecated?: boolean;
+  security?: OA3SecurityRequirement[];
+  servers?: OA3Server[];
+} & XKongName
+  & XKongPluginKeyAuth
+  ;
+
+export type OA3PathItem = {
+  $ref?: string;
+  summary?: string;
+  description?: string;
+  servers?: OA3Server[];
+  parameters?: OA3Reference | OA3Parameter;
+  get?: OA3Operation;
+  put?: OA3Operation;
+  post?: OA3Operation;
+  delete?: OA3Operation;
+  options?: OA3Operation;
+  head?: OA3Operation;
+  patch?: OA3Operation;
+  trace?: OA3Operation;
+} & XKongName
+  & XKongRouteDefaults
+  ;
+
+export type OA3Paths = Record<string, OA3PathItem>
+  & StripPath
+  & XKongRouteDefaults
+  ;
+
+export interface OA3SecuritySchemeApiKey {
+  type: 'apiKey';
+  name: string;
+  in: 'query' | 'header' | 'cookie';
+  description?: string;
+}
+
+export interface OA3SecuritySchemeHttp {
+  type: 'http';
+  name: string;
+  scheme: string;
+  bearerFormat?: string;
+  description?: string;
+}
+
+export interface OA3SecuritySchemeOpenIdConnect {
+  type: 'openIdConnect';
+  name: string;
+  openIdConnectUrl: string;
+  description?: string;
+}
+
+export interface OA3SecuritySchemeOAuth2Flow {
+  authorizationUrl?: string;
+  tokenUrl?: string;
+  refreshUrl?: string;
+  scopes: Record<string, string>;
+}
+
+export interface OA3SecuritySchemeOAuth2 {
+  type: 'oauth2';
+  name: string;
+  flows: {
+    implicit: OA3SecuritySchemeOAuth2Flow;
+    password: OA3SecuritySchemeOAuth2Flow;
+    clientCredentials: OA3SecuritySchemeOAuth2Flow;
+    authorizationCode: OA3SecuritySchemeOAuth2Flow;
+  };
+  description?: string;
+}
+
+export type OA3SecurityScheme =
+  | OA3SecuritySchemeApiKey
+  | OA3SecuritySchemeHttp
+  | OA3SecuritySchemeOpenIdConnect
+  | OA3SecuritySchemeOAuth2;
+
+export interface OA3Example {}
+
+export interface OA3Schema {}
+
+export interface OA3Header {
+  description?: string;
+  required?: boolean;
+  deprecated?: boolean;
+  allowEmptyValue?: boolean;
+}
+
+export interface OA3Components {
+  schemas?: Record<string, OA3Schema | OA3Reference>;
+  parameters?: Record<string, OA3Parameter | OA3Reference>;
+  headers?: Record<string, OA3Header | OA3Reference>;
+  requestBodies?: Record<string, OA3RequestBody | OA3Reference>;
+  examples?: Record<string, OA3Example | OA3Reference>;
+  securitySchemes?: Record<string, OA3SecurityScheme | OA3Reference>;
+}
+
+export type OpenApi3Spec = {
+  openapi: string;
+  info: OA3Info;
+  paths: OA3Paths;
+  servers?: OA3Server[];
+  components?: OA3Components;
+  security?: OA3SecurityRequirement[];
+  tags?: string[];
+  externalDocs?: OA3ExternalDocs;
+} & XKongName
+  & XKongPluginKeyAuth
+  & XKongPluginRequestValidator
+  & XKongPluginUnknown
+  & XKongRouteDefaults
+  ;
diff --git a/packages/openapi-2-kong/src/types/outputs.ts b/packages/openapi-2-kong/src/types/outputs.ts
new file mode 100644
index 0000000000..315b660c75
--- /dev/null
+++ b/packages/openapi-2-kong/src/types/outputs.ts
@@ -0,0 +1,32 @@
+import { DeclarativeConfig } from './declarative-config';
+import {
+  KubernetesConfig,
+  KubernetesMethodConfig,
+  KubernetesPluginConfig,
+} from './kubernetes-config';
+
+export type ConversionResultType = 'kong-declarative-config' | 'kong-for-kubernetes';
+
+export interface DeclarativeConfigResult {
+  type: 'kong-declarative-config';
+  label: string;
+  documents: DeclarativeConfig;
+  warnings: {
+    severity: number;
+    message: string;
+    range: {};
+  }[];
+}
+
+export interface KongForKubernetesResult {
+  type: 'kong-for-kubernetes';
+  label: string;
+  documents: (KubernetesConfig | KubernetesPluginConfig | KubernetesMethodConfig)[];
+  warnings: {
+    severity: number;
+    message: string;
+    range: {};
+  }[];
+}
+
+export type ConversionResult = DeclarativeConfigResult | KongForKubernetesResult;
diff --git a/packages/openapi-2-kong/tsconfig.build.json b/packages/openapi-2-kong/tsconfig.build.json
new file mode 100644
index 0000000000..3f237603fb
--- /dev/null
+++ b/packages/openapi-2-kong/tsconfig.build.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "dist",
+    "rootDir": "src",
+    "resolveJsonModule": true,
+    "strict": false
+  },
+  "include": [
+    "src"
+  ],
+  "exclude": [
+    "**/*.test.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/openapi-2-kong/tsconfig.json b/packages/openapi-2-kong/tsconfig.json
new file mode 100644
index 0000000000..43bc835b07
--- /dev/null
+++ b/packages/openapi-2-kong/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.build.json",
+  "compilerOptions": {
+    "composite": false,
+    "rootDir": "."
+  },
+  "include": [
+    "src",
+    "jest.config.js",
+    ".eslintrc.js"
+  ],
+  "exclude": [
+    "dist"
+  ]
+}
\ No newline at end of file
diff --git a/packages/openapi-2-kong/types/declarative-config.flow.js b/packages/openapi-2-kong/types/declarative-config.flow.js
deleted file mode 100644
index c13090bd01..0000000000
--- a/packages/openapi-2-kong/types/declarative-config.flow.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// @flow
-
-declare type DCPlugin = {|
-  name: string,
-  enabled?: boolean,
-  tags?: Array<string>,
-  config?: {
-    [string]: Object,
-  },
-|};
-
-declare type DCRoute = {|
-  methods: Array<string>,
-  strip_path: boolean,
-  tags: Array<string>,
-  name: string,
-  paths: Array<string>,
-  plugins?: Array<DCPlugin>,
-|};
-
-declare type DCService = {|
-  name: string,
-  protocol: string,
-  host: string,
-  port: number,
-  path: string,
-  routes: Array<DCRoute>,
-  tags: Array<string>,
-  plugins?: Array<DCPlugin>,
-|};
-
-declare type DCTarget = {|
-  target: string,
-  tags: Array<string>,
-|};
-
-declare type DCUpstream = {|
-  name: string,
-  tags: Array<string>,
-  targets: Array<DCTarget>,
-|};
-
-declare type DeclarativeConfig = {|
-  _format_version: '1.1',
-  services: Array<DCService>,
-  upstreams: Array<DCUpstream>,
-|};
diff --git a/packages/openapi-2-kong/types/k8plugins.flow.js b/packages/openapi-2-kong/types/k8plugins.flow.js
deleted file mode 100644
index 95ecad9da0..0000000000
--- a/packages/openapi-2-kong/types/k8plugins.flow.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// @flow
-
-declare type OperationPlugins = Array<{
-  method: ?HttpMethodType,
-  plugins: Array<KubernetesPluginConfig>,
-}>;
-
-declare type PathPlugins = Array<{
-  path: string,
-  plugins: Array<KubernetesPluginConfig>,
-  operations: OperationPlugins,
-}>;
-
-declare type ServerPlugins = Array<{
-  server: OA3Server,
-  plugins: Array<KubernetesPluginConfig>,
-}>;
-
-declare type Plugins = {
-  global: Array<KubernetesPluginConfig>,
-  servers: ServerPlugins,
-  paths: PathPlugins,
-};
-
-declare type IndexIncrement = () => number;
diff --git a/packages/openapi-2-kong/types/kubernetes-config.flow.js b/packages/openapi-2-kong/types/kubernetes-config.flow.js
deleted file mode 100644
index ea3ef68f17..0000000000
--- a/packages/openapi-2-kong/types/kubernetes-config.flow.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// @flow
-
-declare type K8sAnnotations = {
-  'kubernetes.io/ingress.class': 'kong',
-  [string]: string,
-};
-
-declare type K8sMetadata = {
-  name: string,
-  annotations: K8sAnnotations,
-};
-
-declare type K8sBackend = {
-  serviceName: string,
-  servicePort: number,
-};
-
-declare type K8sPath = {
-  path?: string,
-  backend: K8sBackend,
-};
-
-declare type K8sIngressRule = {
-  host: string,
-  tls?: { paths: Array<K8sPath>, tls: { secretName: string } },
-  http?: { paths: Array<K8SPath> },
-};
-
-declare type K8sIngressRules = Array<K8sIngressRule>;
-
-declare type K8sSpec = {
-  rules: K8sIngressRules,
-};
-
-declare type KubernetesMethodConfig = {
-  apiVersion: 'configuration.konghq.com/v1',
-  kind: 'KongIngress',
-  metadata: {
-    name: string,
-  },
-  route: {
-    methods: Array<HttpMethodType>,
-  },
-};
-
-declare type KubernetesPluginConfig = {
-  apiVersion: 'configuration.konghq.com/v1',
-  kind: 'KongPlugin',
-  metadata: {
-    name: string,
-    global?: boolean,
-  },
-  config?: { [string]: any },
-  plugin: string,
-};
-
-declare type KubernetesConfig = {|
-  apiVersion: 'extensions/v1beta1',
-  kind: 'Ingress',
-  metadata: K8sMetadata,
-  spec: K8sSpec,
-|};
diff --git a/packages/openapi-2-kong/types/openapi3.flow.js b/packages/openapi-2-kong/types/openapi3.flow.js
deleted file mode 100644
index 71dfc30d1d..0000000000
--- a/packages/openapi-2-kong/types/openapi3.flow.js
+++ /dev/null
@@ -1,240 +0,0 @@
-// @flow
-
-declare type XKongName = {
-  'x-kong-name'?: string,
-};
-
-declare type XKongRouteDefaults = {
-  'x-kong-route-defaults'?: DCRoute,
-};
-
-declare type StripPath = {
-  strip_path?: boolean,
-};
-
-declare type OA3Info = {|
-  title: string,
-  version: string,
-  description?: string,
-  termsOfService?: string,
-  contact?: {|
-    name?: string,
-    url?: string,
-    email?: string,
-  |},
-  license?: {|
-    name: string,
-    url?: string,
-  |},
-  'x-kubernetes-ingress-metadata'?: {|
-    name?: string,
-    annotations?: Object,
-  |},
-|};
-
-declare type OA3ExternalDocs = {|
-  url: string,
-  description?: string,
-|};
-
-declare type OA3Parameter = {|
-  name: string,
-  in: 'query' | 'header' | 'path' | 'cookie',
-  description?: string,
-  required?: boolean,
-  deprecated?: boolean,
-  allowEmptyValue?: boolean,
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject',
-  schema?: Object,
-  content?: Object,
-  explode?: boolean,
-|};
-
-declare type OA3RequestBody = {|
-  content?: Object,
-  // TODO
-|};
-
-declare type OA3SecurityRequirement = {
-  // TODO
-};
-
-declare type OA3Operation = {
-  description?: string,
-  summary?: string,
-  tags?: Array<string>,
-  externalDocs?: OA3ExternalDocs,
-  operationId?: string,
-  parameters?: Array<OA3Parameter | OA3Reference>,
-  requestBody?: OA3RequestBody | OA3Reference,
-  deprecated?: boolean,
-  security?: Array<OA3SecurityRequirement>,
-  servers?: Array<OA3Server>,
-} & XKongName;
-
-declare type OA3Reference = {|
-  $ref: string,
-|};
-
-declare type OA3Server = {
-  url: string,
-  description?: string,
-  variables?: OA3Variables,
-} & OA3ServerKubernetesProperties;
-
-// Improving typing of this
-declare type OA3ServerKubernetesProperties = {
-  'x-kubernetes-backend'?: {|
-    serviceName: string,
-    servicePort: number,
-  |},
-  'x-kubernetes-service'?: {|
-    spec?: {|
-      ports?: Array<{|
-        port: number,
-      |}>,
-    |},
-    metadata?: {|
-      name: string,
-    |},
-  |},
-  'x-kubernetes-tls'?: Object,
-};
-
-declare type OA3Variables = {
-  [string]: {
-    default: string,
-    enum?: Array<string>,
-    description?: string,
-  },
-};
-
-declare type OA3PathItem = {
-  $ref?: string,
-  summary?: string,
-  description?: string,
-  servers?: Array<OA3Server>,
-  parameters?: OA3Reference | OA3Parameter,
-  get?: OA3Operation,
-  put?: OA3Operation,
-  post?: OA3Operation,
-  delete?: OA3Operation,
-  options?: OA3Operation,
-  head?: OA3Operation,
-  patch?: OA3Operation,
-  trace?: OA3Operation,
-} & XKongName &
-  XKongRouteDefaults;
-
-declare type OA3Paths = {
-  [string]: OA3PathItem,
-} & StripPath &
-  XKongRouteDefaults;
-
-declare type OA3SecuritySchemeApiKey = {|
-  type: 'apiKey',
-  name: string,
-  in: 'query' | 'header' | 'cookie',
-  description?: string,
-|};
-
-declare type OA3SecuritySchemeHttp = {|
-  type: 'http',
-  name: string,
-  scheme: string,
-  bearerFormat?: string,
-  description?: string,
-|};
-
-declare type OA3SecuritySchemeOpenIdConnect = {|
-  type: 'openIdConnect',
-  name: string,
-  openIdConnectUrl: string,
-  description?: string,
-|};
-
-declare type OA3SecuritySchemeOAuth2Flow = {|
-  authorizationUrl?: string,
-  tokenUrl?: string,
-  refreshUrl?: string,
-  scopes: { [string]: string },
-|};
-
-declare type OA3SecuritySchemeOAuth2 = {|
-  type: 'oauth2',
-  name: string,
-  flows: {
-    implicit: OA3SecuritySchemeOAuth2Flow,
-    password: OA3SecuritySchemeOAuth2Flow,
-    clientCredentials: OA3SecuritySchemeOAuth2Flow,
-    authorizationCode: OA3SecuritySchemeOAuth2Flow,
-  },
-  description?: string,
-|};
-
-declare type OA3SecurityScheme =
-  | OA3SecuritySchemeApiKey
-  | OA3SecuritySchemeHttp
-  | OA3SecuritySchemeOpenIdConnect
-  | OA3SecuritySchemeOAuth2;
-
-declare type OA3Example = {|
-  // TODO
-|};
-
-declare type OA3Schema = {
-  // TODO
-};
-
-declare type OA3Header = {|
-  description?: string,
-  required?: boolean,
-  deprecated?: boolean,
-  allowEmptyValue?: boolean,
-|};
-
-declare type OA3Components = {|
-  schemas?: {
-    [string]: OA3Schema | OA3Reference,
-  },
-  parameters?: {
-    [string]: OA3Parameter | OA3Reference,
-  },
-  headers?: {
-    [string]: OA3Header | OA3Reference,
-  },
-  requestBodies?: {
-    [string]: OA3RequestBody | OA3Reference,
-  },
-  examples?: {
-    [string]: OA3Example | OA3Reference,
-  },
-  securitySchemes?: {
-    [string]: OA3SecurityScheme | OA3Reference,
-  },
-|};
-
-declare type OpenApi3Spec = {
-  openapi: string,
-  info: OA3Info,
-  paths: OA3Paths,
-  servers?: Array<OA3Server>,
-  components?: OA3Components,
-  security?: Array<OA3SecurityRequirement>,
-  tags?: Array<string>,
-  externalDocs?: OA3ExternalDocs,
-} & XKongName &
-  XKongRouteDefaults;
-
-const HttpMethod = {
-  get: 'GET',
-  put: 'PUT',
-  post: 'POST',
-  delete: 'DELETE',
-  options: 'OPTIONS',
-  head: 'HEAD',
-  patch: 'PATCH',
-  trace: 'TRACE',
-};
-
-declare type HttpMethodType = $Values<typeof HttpMethod>;
diff --git a/packages/openapi-2-kong/types/outputs.flow.js b/packages/openapi-2-kong/types/outputs.flow.js
deleted file mode 100644
index 627b5af2b0..0000000000
--- a/packages/openapi-2-kong/types/outputs.flow.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// @flow
-
-declare type ConversionResultType = 'kong-declarative-config' | 'kong-for-kubernetes';
-
-declare type DeclarativeConfigResult = {
-  type: 'kong-declarative-config',
-  label: string,
-  documents: DeclarativeConfig,
-  warnings: Array<{
-    severity: number,
-    message: string,
-    range: {
-      /* TODO */
-    },
-  }>,
-};
-
-declare type KongForKubernetesResult = {
-  type: 'kong-for-kubernetes',
-  label: string,
-  documents: Array<KubernetesConfig | KubernetesPluginConfig | KubernetesMethodConfig>,
-  warnings: Array<{
-    severity: number,
-    message: string,
-    range: {
-      /* TODO */
-    },
-  }>,
-};
-
-declare type ConversionResult = DeclarativeConfigResult | KongForKubernetesResult;
diff --git a/packages/openapi-2-kong/webpack.config.js b/packages/openapi-2-kong/webpack.config.js
deleted file mode 100644
index 559591e8fb..0000000000
--- a/packages/openapi-2-kong/webpack.config.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const path = require('path');
-
-module.exports = {
-  entry: { index: './src/index.js' },
-  target: 'node',
-  mode: 'production',
-  devtool: 'source-map',
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    filename: '[name].js',
-    library: 'openapi2kong',
-    libraryTarget: 'commonjs2',
-  },
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        exclude: /node_modules/,
-        use: {
-          loader: 'babel-loader',
-        },
-      },
-    ],
-  },
-};
diff --git a/plugins/insomnia-plugin-kong-bundle/package-lock.json b/plugins/insomnia-plugin-kong-bundle/package-lock.json
index 30a967ac6b..2aa3c8dceb 100644
--- a/plugins/insomnia-plugin-kong-bundle/package-lock.json
+++ b/plugins/insomnia-plugin-kong-bundle/package-lock.json
@@ -356,8 +356,8 @@
       "requires": {
         "autobind-decorator": "^2.4.0",
         "insomnia-components": "^2.2.6",
-        "react": "^16.13.1",
-        "react-dom": "^16.13.1",
+        "react": "^16.8.3",
+        "react-dom": "^16.8.3",
         "url-join": "^4.0.1"
       }
     },
diff --git a/plugins/insomnia-plugin-kong-portal/package-lock.json b/plugins/insomnia-plugin-kong-portal/package-lock.json
index 9c4a9f5330..e3f2b5c35a 100644
--- a/plugins/insomnia-plugin-kong-portal/package-lock.json
+++ b/plugins/insomnia-plugin-kong-portal/package-lock.json
@@ -1120,6 +1120,27 @@
 				"to-fast-properties": "^2.0.0"
 			}
 		},
+		"@emotion/is-prop-valid": {
+			"version": "0.8.8",
+			"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
+			"integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
+			"dev": true,
+			"requires": {
+				"@emotion/memoize": "0.7.4"
+			}
+		},
+		"@emotion/memoize": {
+			"version": "0.7.4",
+			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
+			"integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==",
+			"dev": true
+		},
+		"@emotion/unitless": {
+			"version": "0.7.5",
+			"resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
+			"integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==",
+			"dev": true
+		},
 		"@webassemblyjs/ast": {
 			"version": "1.9.0",
 			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
@@ -1474,6 +1495,24 @@
 				"object.assign": "^4.1.0"
 			}
 		},
+		"babel-plugin-styled-components": {
+			"version": "1.12.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz",
+			"integrity": "sha512-FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-annotate-as-pure": "^7.0.0",
+				"@babel/helper-module-imports": "^7.0.0",
+				"babel-plugin-syntax-jsx": "^6.18.0",
+				"lodash": "^4.17.11"
+			}
+		},
+		"babel-plugin-syntax-jsx": {
+			"version": "6.18.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+			"integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
+			"dev": true
+		},
 		"balanced-match": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -1778,6 +1817,12 @@
 			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
 			"dev": true
 		},
+		"camelize": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
+			"integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=",
+			"dev": true
+		},
 		"caniuse-lite": {
 			"version": "1.0.30001045",
 			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001045.tgz",
@@ -2069,6 +2114,23 @@
 				"randomfill": "^1.0.3"
 			}
 		},
+		"css-color-keywords": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
+			"integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=",
+			"dev": true
+		},
+		"css-to-react-native": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.3.2.tgz",
+			"integrity": "sha512-VOFaeZA053BqvvvqIA8c9n0+9vFppVBAHCp6JgFTtTMU3Mzi+XnelJ9XC9ul3BqFzZyQ5N+H0SnwsWT2Ebchxw==",
+			"dev": true,
+			"requires": {
+				"camelize": "^1.0.0",
+				"css-color-keywords": "^1.0.0",
+				"postcss-value-parser": "^3.3.0"
+			}
+		},
 		"cyclist": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
@@ -3574,6 +3636,12 @@
 			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
 			"dev": true
 		},
+		"is-what": {
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
+			"integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
+			"dev": true
+		},
 		"is-windows": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -3785,6 +3853,12 @@
 				"p-is-promise": "^2.0.0"
 			}
 		},
+		"memoize-one": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
+			"integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==",
+			"dev": true
+		},
 		"memory-fs": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -3795,6 +3869,15 @@
 				"readable-stream": "^2.0.1"
 			}
 		},
+		"merge-anything": {
+			"version": "2.4.4",
+			"resolved": "https://registry.npmjs.org/merge-anything/-/merge-anything-2.4.4.tgz",
+			"integrity": "sha512-l5XlriUDJKQT12bH+rVhAHjwIuXWdAIecGwsYjv2LJo+dA1AeRTmeQS+3QBpO6lEthBMDi2IUMpLC1yyRvGlwQ==",
+			"dev": true,
+			"requires": {
+				"is-what": "^3.3.1"
+			}
+		},
 		"micromatch": {
 			"version": "3.1.10",
 			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -4333,6 +4416,12 @@
 			"integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
 			"dev": true
 		},
+		"postcss-value-parser": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+			"dev": true
+		},
 		"private": {
 			"version": "0.1.8",
 			"resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
@@ -5106,6 +5195,39 @@
 			"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
 			"dev": true
 		},
+		"styled-components": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/styled-components/-/styled-components-4.4.1.tgz",
+			"integrity": "sha512-RNqj14kYzw++6Sr38n7197xG33ipEOktGElty4I70IKzQF1jzaD1U4xQ+Ny/i03UUhHlC5NWEO+d8olRCDji6g==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-module-imports": "^7.0.0",
+				"@babel/traverse": "^7.0.0",
+				"@emotion/is-prop-valid": "^0.8.1",
+				"@emotion/unitless": "^0.7.0",
+				"babel-plugin-styled-components": ">= 1",
+				"css-to-react-native": "^2.2.2",
+				"memoize-one": "^5.0.0",
+				"merge-anything": "^2.2.4",
+				"prop-types": "^15.5.4",
+				"react-is": "^16.6.0",
+				"stylis": "^3.5.0",
+				"stylis-rule-sheet": "^0.0.10",
+				"supports-color": "^5.5.0"
+			}
+		},
+		"stylis": {
+			"version": "3.5.4",
+			"resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz",
+			"integrity": "sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==",
+			"dev": true
+		},
+		"stylis-rule-sheet": {
+			"version": "0.0.10",
+			"resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz",
+			"integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==",
+			"dev": true
+		},
 		"supports-color": {
 			"version": "5.5.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
diff --git a/plugins/insomnia-plugin-kong-portal/package.json b/plugins/insomnia-plugin-kong-portal/package.json
index 08111de75c..c823825c75 100644
--- a/plugins/insomnia-plugin-kong-portal/package.json
+++ b/plugins/insomnia-plugin-kong-portal/package.json
@@ -21,8 +21,9 @@
     "@babel/preset-react": "^7.9.4",
     "autobind-decorator": "^2.4.0",
     "insomnia-components": "2.2.35",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1",
+    "react": "^16.8.3",
+    "react-dom": "^16.8.3",
+    "styled-components": "^4.4.1",
     "url-join": "^4.0.1",
     "webpack": "^4.42.1",
     "webpack-cli": "^3.3.11"
diff --git a/scripts/check-version.js b/scripts/check-version.js
index 40593db985..3c926e81a5 100644
--- a/scripts/check-version.js
+++ b/scripts/check-version.js
@@ -1,3 +1,4 @@
+// TODO(TSCONVERSION) convert to TypeScript and update package.json to use ts-node
 const fs = require('fs');
 
 const GREEN_FG = '\x1b[32m';
diff --git a/scripts/convert-to-typescript b/scripts/convert-to-typescript
new file mode 100755
index 0000000000..1455215dc5
--- /dev/null
+++ b/scripts/convert-to-typescript
@@ -0,0 +1,64 @@
+#! /bin/bash
+export INSOMNIA_ROOT="$HOME/src/github.com/Kong/insomnia"
+export CODE_LOCATION="$INSOMNIA_ROOT/packages/insomnia-app/app"
+
+echo "
+**/bin/*
+**/build/*
+**/dist/*
+**/__fixtures__/*
+**/flow-typed/*
+*.md
+**/__snapshots__/
+**/*.less
+**/*.css
+" > "$INSOMNIA_ROOT/.prettierignore"
+
+echo '
+{
+  "bracketSpacing": true,
+  "jsxBracketSameLine": true,
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "arrowParens": "avoid",
+  "trailingComma": "all",
+  "printWidth": 100
+}
+' > "$INSOMNIA_ROOT/.prettierrc"
+
+cd "$INSOMNIA_ROOT" || return
+
+npm install --save-dev typescript@4.2.3
+
+# run flow-to-ts, which messes up formatting
+npx @khanacademy/flow-to-ts@0.5.1 \
+  --prettier=off \ # flow-to-ts uses pretter 2.2 and our codebase has been using prettier 1.5 \
+  --write \
+  --delete-source "$CODE_LOCATION/*.js" \
+  "$CODE_LOCATION/**/**/**/**/**/**/*.js"
+  
+# run prettier
+npx prettier@2.2.1 \
+  --config="$INSOMNIA_ROOT/.prettierrc" \
+  --ignore-path="$INSOMNIA_ROOT/.prettierignore" \
+  --write \
+  "$CODE_LOCATION/**"
+rm .prettierignore
+rm .prettierrc
+
+# then run eslint to try and fix some of the things in the previous step.
+npm install --save-dev eslint-plugin-jest-formatting
+export ESLINTRC="$INSOMNIA_ROOT/.eslintrc.js"
+export ESLINT="$INSOMNIA_ROOT/node_modules/.bin/eslint \
+  --ext .ts,.tsx,.js \
+  --fix \
+  --plugin filenames
+  --plugin jest-formatting
+  --no-eslintrc \
+  --parser=@typescript-eslint/parser \
+  $CODE_LOCATION"
+
+$ESLINT --rule 'space-before-function-paren: ["error", { "anonymous": "never", "named": "never", "asyncArrow": "always" }]'
+
+$ESLINT --rule 'jest-formatting/padding-around-test-blocks: "error"'
\ No newline at end of file
diff --git a/tsconfig.base.json b/tsconfig.base.json
new file mode 100644
index 0000000000..178ee276d0
--- /dev/null
+++ b/tsconfig.base.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
+    "allowUnreachableCode": false,
+    "allowUnusedLabels": false,
+    "allowJs": true,
+    "checkJs": true,
+    "declaration": true,
+    "declarationMap": true,
+    "esModuleInterop": true,
+    "lib": ["DOM", "ES2019"],
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noImplicitReturns": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "pretty": true,
+    "resolveJsonModule": true,
+    "sourceMap": true,
+    "strict": true,
+    "target": "ES2019",
+    "types": ["node", "jest"]
+  }
+}
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
new file mode 100644
index 0000000000..9d94533a30
--- /dev/null
+++ b/tsconfig.eslint.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.base.json",
+  "include": [
+    ".eslintrc.js",
+    "jest.config.js"
+  ]
+}
\ No newline at end of file